diff options
Diffstat (limited to 'pkgs')
339 files changed, 3062 insertions, 3208 deletions
diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix deleted file mode 100644 index f5887e870db6e..0000000000000 --- a/pkgs/applications/audio/gnaural/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, libsndfile, portaudio }: - -stdenv.mkDerivation rec { - name = "gnaural-1.0.20110606"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 libsndfile portaudio ]; - src = fetchurl { - url = "mirror://sourceforge/gnaural/Gnaural/${name}.tar.gz"; - sha256 = "0p9rasz1jmxf16vnpj17g3vzdjygcyz3l6nmbq6wr402l61f1vy5"; - }; - meta = with stdenv.lib; - { description = "Auditory binaural-beat generator"; - homepage = http://gnaural.sourceforge.net/; - license = licenses.gpl2; - maintainers = [ maintainers.ehmry ]; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index b972aae7de807..1d6bc33cc5544 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.11"; + version = "3.10.12"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "15f5z3cnch9lpzbz73l4wjykv9n74y8djz5db53la2ql4ihaxfz9"; + sha256 = "0q95am079gg01dkivr972mm2k87y8z296a9yf7amzsf9hxfycdra"; }; patches = [ diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/applications/audio/muse/default.nix index 372c8faf773d5..f1fad05beced4 100644 --- a/pkgs/applications/audio/muse/default.nix +++ b/pkgs/applications/audio/muse/default.nix @@ -1,7 +1,9 @@ { stdenv , fetchFromGitHub , libjack2 -, qt5 +, wrapQtAppsHook +, qtsvg +, qttools , cmake , libsndfile , libsamplerate @@ -13,7 +15,6 @@ , dssi , liblo , pkgconfig -, gitAndTools }: stdenv.mkDerivation { @@ -45,14 +46,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig - gitAndTools.gitFull + wrapQtAppsHook + qttools + cmake ]; buildInputs = [ libjack2 - qt5.qtsvg - qt5.qttools - cmake + qtsvg libsndfile libsamplerate ladspaH @@ -65,15 +66,4 @@ stdenv.mkDerivation { ]; sourceRoot = "source/muse3"; - - buildPhase = '' - cd .. - bash compile_muse.sh - ''; - - installPhase = '' - mkdir $out - cd build - make install - ''; } diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 58eb5462ef84b..c95177cd3821e 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.36"; + version = "0.37"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1ssmk1p43gjhcqi86sh6b7csqpwwpf3hs32cmnylv6pmbcwbs69h"; + sha256 = "1b0vd0h49kjg4nxjfjrcg8gzplz93ryr6xyfha2pvhlrzdd2d1lj"; }; buildInputs = [ glib ncurses mpd_clientlib boost ] diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 573dca518e3a9..597cf68f4d09e 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gettext ]; - checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ]; + checkInputs = [ gdk-pixbuf ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]); buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] ++ (if xineBackend then [ xineLib ] else with gst_all_1; @@ -33,13 +33,23 @@ python3.pkgs.buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; + pytestFlags = stdenv.lib.optionals (xineBackend || !withGstPlugins) [ + "--ignore=tests/plugin/test_replaygain.py" + ] ++ [ + # upstream does actually not enforce source code linting + "--ignore=tests/quality" + # build failure on Arch Linux + # https://github.com/NixOS/nixpkgs/pull/77796#issuecomment-575841355 + "--ignore=tests/test_operon.py" + ]; + checkPhase = '' runHook preCheck - env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" \ + env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS" \ HOME=$(mktemp -d) \ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - py.test${stdenv.lib.optionalString (xineBackend || !withGstPlugins) " --ignore=tests/plugin/test_replaygain.py"} + py.test $pytestFlags runHook postCheck ''; @@ -65,6 +75,5 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ coroa sauyon ]; homepage = https://quodlibet.readthedocs.io/en/latest/; - broken = true; }; } diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index bae9cef715015..f4087506daa32 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 = "20191215"; + version = "20200114"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "1mwfvhsvc0qgjyiwd8pmmam1mav43lmv39fljhmj9yri558v5g1c"; + sha256 = "02f8wnsl9wg7pgf4sshr0hdjfjkwln870ffgjmb01nqk37v7hiyn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/blockchains/bitcoin-gold.nix b/pkgs/applications/blockchains/bitcoin-gold.nix new file mode 100644 index 0000000000000..7205e882c3145 --- /dev/null +++ b/pkgs/applications/blockchains/bitcoin-gold.nix @@ -0,0 +1,70 @@ +{ stdenv +, fetchFromGitHub +, openssl +, boost +, libevent +, autoreconfHook +, db4 +, pkgconfig +, protobuf +, hexdump +, zeromq +, libsodium +, withGui +, qtbase ? null +, qttools ? null +, wrapQtAppsHook ? null +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + + pname = "bitcoin" + toString (optional (!withGui) "d") + "-gold"; + version = "0.15.2"; + + src = fetchFromGitHub { + owner = "BTCGPU"; + repo = "BTCGPU"; + rev = "v${version}"; + sha256 = "0grd1cd8d2nsrxl27la85kcan09z73fn70ncr9km4iccaj5pg12h"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + hexdump + ] ++ optionals withGui [ + wrapQtAppsHook + ]; + + buildInputs = [ + openssl + boost + libevent + db4 + zeromq + libsodium + ] ++ optionals withGui [ + qtbase + qttools + protobuf + ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--with-boost-libdir=${boost.out}/lib" + ] ++ optionals withGui [ + "--with-gui=qt5" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" + ]; + + meta = { + description = "BTG is a cryptocurrency with Bitcoin fundamentals, mined on common GPUs instead of specialty ASICs"; + homepage = "https://bitcoingold.org/"; + license = licenses.mit; + maintainers = [ maintainers.mmahut ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 34cfe868c0b33..f7f0aaf603ef0 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.9"; + version = "1.9.10"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "00fhqn0b9grqz8iigzbijg7b1va58vccjb15fpy6yfr301z3ib1q"; + sha256 = "0pm8gfr4g7rbax6vzxv6lklpx83mxghah7fyvpk3jqvm1mq299ln"; }; - modSha256 = "1rn1x3qc23wfcx9c61sw1sc6iqwvv2b9pv006lk1az4zbwh09dbm"; + modSha256 = "0zar9nvx2nk6kyijp8df3y2rzxvg0mccj6b3skhzf8y9c27hvrsg"; subPackages = [ "cmd/abigen" diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix index 403c559ee2f1f..470772665413f 100644 --- a/pkgs/applications/blockchains/litecoin.nix +++ b/pkgs/applications/blockchains/litecoin.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchFromGitHub +{ stdenv, mkDerivation, fetchFromGitHub , pkgconfig, autoreconfHook , openssl, db48, boost, zlib, miniupnpc -, glib, protobuf, utillinux, qt4, qrencode +, glib, protobuf, utillinux, qrencode , AppKit , withGui ? true, libevent +, qtbase, qttools +, zeromq }: with stdenv.lib; -stdenv.mkDerivation rec { +mkDerivation rec { name = "litecoin" + (toString (optional (!withGui) "d")) + "-" + version; version = "0.17.1"; @@ -21,13 +23,15 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; - buildInputs = [ openssl db48 boost zlib + buildInputs = [ openssl db48 boost zlib zeromq miniupnpc glib protobuf utillinux libevent ] ++ optionals stdenv.isDarwin [ AppKit ] - ++ optionals withGui [ qt4 qrencode ]; + ++ optionals withGui [ qtbase qttools qrencode ]; configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; + ++ optionals withGui [ + "--with-gui=qt5" + "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 4bea91885795f..60d00b7fbc7af 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "1nsm4d3vdx90szqd78a8mjq65xc9m5ipd35cqrlx3c3ny900sqxg"; }; betaVersion = { - version = "3.6.0.18"; # "Android Studio 3.6 RC 1" - build = "192.6071332"; - sha256Hash = "0xpcihr5xxr9l1kv6aflywshs8fww3s7di0g98mz475whhxwzf3q"; + version = "3.6.0.19"; # "Android Studio 3.6 RC 2" + build = "192.6165589"; + sha256Hash = "1d47nfhzb0apfzin4bg5bck4jjid3jipm5s4n36r7fh20lpx93z5"; }; latestVersion = { # canary & dev version = "4.0.0.9"; # "Android Studio 4.0 Canary 9" diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix index ef3635aa8d296..eee5a69655583 100644 --- a/pkgs/applications/editors/hexdino/default.nix +++ b/pkgs/applications/editors/hexdino/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, rustPlatform, ncurses }: -rustPlatform.buildRustPackage rec { - name = "hexdino-${version}"; + +rustPlatform.buildRustPackage { + pname = "hexdino"; version = "0.1.0"; src = fetchFromGitHub { diff --git a/pkgs/applications/editors/uberwriter/default.nix b/pkgs/applications/editors/uberwriter/default.nix index ac3fb920da053..48ebc79e70503 100644 --- a/pkgs/applications/editors/uberwriter/default.nix +++ b/pkgs/applications/editors/uberwriter/default.nix @@ -2,7 +2,7 @@ , wrapGAppsHook, pkgconfig, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive -, haskellPackages}: +, shared-mime-info, haskellPackages}: let pythonEnv = pythonPackages.python.withPackages(p: with p; @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "uberwriter"; - version = "unstable-2019-11-29"; + version = "unstable-2020-01-24"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "7606a55389f8516d9fed7927fa50ff8822ee9e38"; - sha256 = "0ky001vs9nfvqf05h4q7fl0n8vsgim59z22i66a8sw6bqipv62sg"; + rev = "0647b413407eb8789a25c353602c4ac979dc342a"; + sha256 = "19z52fpbf0p7dzx7q0r5pk3nn0c8z69g1hv6db0cqp61cqv5z95q"; }; nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils @@ -41,6 +41,7 @@ in stdenv.mkDerivation rec { --prefix PYTHONPATH : "$out/lib/python${pythonEnv.pythonVersion}/site-packages/" --prefix PATH : "${texliveDist}/bin" --prefix PATH : "${haskellPackages.pandoc-citeproc}/bin" + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" ) ''; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 1a47a35574938..d0351e98ee01c 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { # libraries. These reside in build/lib, and are not found by # default. preBuild = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib ''; enableParallelBuilding = true; @@ -55,11 +55,11 @@ mkDerivation rec { # so we need to put the correct sitePackages (with numpy) back on the path postInstall = '' wrapProgram $out/bin/paraview \ - --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" wrapProgram $out/bin/pvbatch \ - --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" wrapProgram $out/bin/pvpython \ - --set PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" + --prefix PYTHONPATH "${python.pkgs.numpy}/${python.sitePackages}" ''; meta = { diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 7c4e6ff8c3d7b..20a754ba98ae6 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; # headers are just two and very small preConfigure = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:"`pwd`/build/src + export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}"`pwd`/build/src '' else '' - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}"`pwd`/build/src ''; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/gpxlab/default.nix b/pkgs/applications/misc/gpxlab/default.nix index b4778f9f4f8be..3b432ff66b128 100644 --- a/pkgs/applications/misc/gpxlab/default.nix +++ b/pkgs/applications/misc/gpxlab/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, qttools, qttranslations }: +{ stdenv, mkDerivation, lib, fetchFromGitHub, qmake, qttools, qttranslations }: mkDerivation rec { pname = "gpxlab"; @@ -18,6 +18,12 @@ mkDerivation rec { lrelease GPXLab/locale/*.ts ''; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv GPXLab/GPXLab.app $out/Applications + wrapQtApp $out/Applications/GPXLab.app/Contents/MacOS/GPXLab + ''; + enableParallelBuilding = true; meta = with lib; { @@ -29,6 +35,6 @@ mkDerivation rec { ''; license = licenses.gpl3; maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 9a4e765a1d67f..d3d732f410fec 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -1,14 +1,14 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, qttools }: +{ stdenv, mkDerivation, lib, fetchFromGitHub, qmake, qttools }: mkDerivation rec { pname = "gpxsee"; - version = "7.19"; + version = "7.20"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0mfmj0g6q6p2i6bd64ik1hq2l1ddqxnc6i9m30dnfl4v1zyvlc38"; + sha256 = "08scvhhdadzz9iydhpkn2k618bgw26z09y6nydi3hi8fc3xfnb8d"; }; nativeBuildInputs = [ qmake ]; @@ -18,6 +18,12 @@ mkDerivation rec { lrelease lang/*.ts ''; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv GPXSee.app $out/Applications + wrapQtApp $out/Applications/GPXSee.app/Contents/MacOS/GPXSee + ''; + enableParallelBuilding = true; meta = with lib; { @@ -29,6 +35,6 @@ mkDerivation rec { ''; license = licenses.gpl3; maintainers = with maintainers; [ womfoo sikmir ]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 69ca6a8376400..a1015c880df4c 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.62.2"; + version = "0.63.2"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1rdfx5gv0q64ivyg0ilb96p5nksip9cj75fmvw0bjky9w6i07yd9"; + sha256 = "1fylsx2isvims0xwcj831b1zcwsmd3igrnxjad44rhl2k3anq8vm"; }; - modSha256 = "0dwv5qnglv00jj7vlps76zlfpkzsplf93401j2l03xfvmvadifrs"; + modSha256 = "0h95r3m6ca60dn1bllnw127nbfnkdjld94c3nyrzlwdczl2iaiyf"; buildFlags = [ "-tags" "extended" ]; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 6900f305c0f8a..188e902614fad 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -21,14 +21,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.15.1"; + version = "0.16.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0y25w8123rjd6f5875mk8yv7mdr75mgswl3sh6zixm7b9r771s9p"; + sha256 = "1bszyddar0g1gdz67h8rd3gbrdhi6ahjg7j14cjiqxm1938z9ajf"; }; buildInputs = [ diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index a44cccf9a9d1d..fa500989cac92 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch -, poppler, libpthreadstubs, gstreamer, gst-plugins-base, librsvg, pcre, gobject-introspection, wrapGAppsHook }: +, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { name = "${product}-${version}"; @@ -19,8 +19,15 @@ stdenv.mkDerivation rec { gobject-introspection wrapGAppsHook ]; - buildInputs = [ gstreamer gst-plugins-base gtk3 libgee poppler - libpthreadstubs librsvg pcre ]; + + buildInputs = [ + gtk3 libgee poppler + libpthreadstubs librsvg pcre + gstreamer + gst-plugins-base + (gst-plugins-good.override { gtkSupport = true; }) + gst-libav + ]; cmakeFlags = stdenv.lib.optional stdenv.isDarwin "-DMOVIES=OFF"; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index b8160a682e647..ec69f3d233f4f 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -60,8 +60,22 @@ mkChromiumDerivation (base: rec { meta = { description = "An open source web browser from Google"; - homepage = http://www.chromium.org/; - maintainers = with maintainers; [ bendlas thefloweringash ]; + longDescription = '' + Chromium is an open source web browser from Google that aims to build a + safer, faster, and more stable way for all Internet users to experience + the web. It has a minimalist user interface and provides the vast majority + of source code for Google Chrome (which has some additional features). + ''; + homepage = https://www.chromium.org/; + maintainers = with maintainers; [ bendlas thefloweringash primeos ]; + # 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 []; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 85f3aa824c368..73163c82ea782 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 = "1fbs6llrhm9jkzmk3v3a84d9is6g96kysy91hvpb0bw8f7anl969"; - sha256bin64 = "026gb4ypgidywvs4a031d0alv6fdphmlfybvgir4a73z8q263s26"; - version = "80.0.3987.16"; + sha256 = "07h3znqb1r8hgcxzm5f04xkj2r66s1rhixqyyxi4hadf7qjx02n7"; + sha256bin64 = "0r7706gxdqws8dm5859869p5h8gas6f65qz674rk18l8dbg40fzw"; + version = "80.0.3987.66"; }; dev = { - sha256 = "1bczkk2q4fk1vgx34d9qgzqz7gsf89h6gd16apwcy6063lmrsizz"; - sha256bin64 = "1ywi3x7rc4vwsg20lci37bw97873j3vvbxxv7m2nlh4nqcs5655q"; - version = "81.0.4000.3"; + sha256 = "1sm1ndq4y2d4fs4y9d5k4dcs6q2pqilv7b0ffx2nlazdrr73la3n"; + sha256bin64 = "0kr49hvk0c6pmxpm94fscxvdd6whxz1x7ic27xk86csjpjz6s5dg"; + version = "81.0.4033.2"; }; stable = { - sha256 = "1wafhpnaqwmmks4rs6x9m2b4jz4m4h27jch6gy71rk4hsy5hx5jd"; - sha256bin64 = "1dl43a94xd7vkx8mnp3ccgq18y624fffcfnfjhxgfc02c0c6an9l"; - version = "79.0.3945.117"; + sha256 = "183vz3lf1588cr9s5vlnj65qvbmz36s8cg8k7dvr64cxmcqk86an"; + sha256bin64 = "1550fs4n3lgvb80hij2yq13zkw0bjih210ylpd74n1mw9yw4ygk1"; + version = "79.0.3945.130"; }; } diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 267f25f8bb580..e3b82152e6fa5 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -67,7 +67,7 @@ in rec { }; kops_1_15 = mkKops { - version = "1.15.0"; - sha256 = "0sjas8pn0njl767b1y15g7cci2q3kxkxwmgr0wvs7vi3n1s1sf9d"; + version = "1.15.1"; + sha256 = "0iq2bqq6zv6sk2psar33c3smnz79rk5v623qx4kr5h47wnqvrfvj"; }; } diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index f1b809009ad56..8bb38230d5c1a 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.46.0"; + version = "3.46.3"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "0v7656p7b6w88a96wj8058b13yxbwi186l092i9whrisngnv2pnf"; + sha256 = "15bkg9qs07h4pzkxba1gymp8f264dk0zrzd9brx48fcwm7qbzigi"; }; configureFlags = [ diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 3baa1352a809d..0b0491ffb8617 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake flex bison makeWrapper ]; buildInputs = [ openssl libedit qt4 nettools iproute ]; + postPatch = '' + # fix build with bison3 + sed -i 's/define "parser_class_name"/define parser_class_name/' source/iked/conf.parse.yy + ''; + configurePhase = '' mkdir -p $out/{bin,sbin,lib} cmake -DQTGUI=YES -DETCDIR=$out/etc -DLIBDIR=$out/lib -DSBINDIR=$out/sbin -DBINDIR=$out/bin \ diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 5a133dec83ddc..8928814e96701 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -2,7 +2,8 @@ , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon -, libnotify, libsoup, libgee +, libnotify, libsoup, libgee, utillinux, libselinux, libsepol, libpsl, brotli +, librsvg, libsignal-protocol-c , libgcrypt , epoxy , at-spi2-core @@ -14,15 +15,15 @@ , icu }: -stdenv.mkDerivation { - name = "dino-unstable-2019-10-28"; +stdenv.mkDerivation rec { + pname = "dino"; + version = "0.1.0"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "388cc56674487e7b9e339637369fc55f0e271daf"; - sha256 = "1v8rnjbzi8qhwb1fv787byxk8ygfs16z2j64h0s6sd3asr4n0kz1"; - fetchSubmodules = true; + rev = "v${version}"; + sha256 = "1k5cgj5n8s40i71wqdh6m1q0njl45ichfdbbywx9rga5hljz1c54"; }; nativeBuildInputs = [ @@ -51,21 +52,27 @@ stdenv.mkDerivation { pcre xorg.libxcb xorg.libpthreadstubs + xorg.libXtst libXdmcp libxkbcommon epoxy at-spi2-core dbus icu + utillinux + libselinux + libsepol + libpsl + brotli + libsignal-protocol-c + librsvg ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Modern Jabber/XMPP Client using GTK/Vala"; homepage = https://github.com/dino/dino; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 qyliss ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index e1a40c06d18fa..f4ade07672614 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -18,12 +18,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.9.8"; + version = "1.9.9"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1rq3180l4ly0n0jj08cxy9l2d07scwp9hasmliva2xspyv7i9ksd"; + sha256 = "08bxlqiapj9yqj9ywni33n5k7n3ckgfhv200snjqyqy9waqph1i6"; }; postPatch = '' @@ -31,6 +31,8 @@ mkDerivation rec { --replace '"appindicator3"' '"${libappindicator-gtk3}/lib/libappindicator3.so"' substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \ --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"' + substituteInPlace Telegram/CMakeLists.txt \ + --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' ''; # We want to run wrapProgram manually (with additional parameters) @@ -79,19 +81,6 @@ mkDerivation rec { # Both of these packages are included in this PR (kotatogram-desktop): # https://github.com/NixOS/nixpkgs/pull/75210 - installPhase = '' - install -Dm755 bin/telegram-desktop $out/bin/telegram-desktop - - mkdir -p $out/share/{kservices5,applications,metainfo} - sed "s,/usr/bin,$out/bin,g" "../lib/xdg/tg.protocol" > "$out/share/kservices5/tg.protocol" - install -m444 "../lib/xdg/telegramdesktop.desktop" "$out/share/applications/telegram-desktop.desktop" - install -m644 "../lib/xdg/telegramdesktop.appdata.xml" "$out/share/metainfo/telegramdesktop.metainfo.xml" - - for icon_size in 16 32 48 64 128 256 512; do - install -Dm644 "../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram.png" - done - ''; - postFixup = '' # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 7dd3792a3cb3a..263cf23c17ff3 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "hexchat"; - version = "2.14.2"; + version = "2.14.3"; src = fetchFromGitHub { owner = "hexchat"; repo = "hexchat"; rev = "v${version}"; - sha256 = "1kz81xfis0bw2cfd6ndw32jdzdl5azk9ixqj4a3lginmlj6fs45a"; + sha256 = "08kvp0dcn3bvmlqcfp9312075bwkqkpa8m7zybr88pfp210gfl85"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -24,14 +24,6 @@ stdenv.mkDerivation rec { isocodes ]; - patches = [ - #https://github.com/hexchat/hexchat/issues/2237 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/hexchat/raw/8a08a0c8a8da503b18f2fbb15194c5f3728a689a/f/0001-Python-plugin-Call-EndInterpreter-when-deinit-ing-th.patch"; - sha256 = "1199dj3wvjqj6h5vlm7lzhaax84j9ki6an8y8fs4rww27iq0lk8g"; - }) - ]; - #hexchat and hexchat-text loads enchant spell checking library at run time and so it needs to have route to the path postPatch = '' sed -i "s,libenchant-2.so.2,${enchant2}/lib/libenchant-2.so.2,g" src/fe-gtk/sexy-spell-entry.c diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index e89a36eade072..f62ab292d669d 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { preConfigure = '' # autotools check tries to dlopen libpython as a requirement for the python plugin - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${python}/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${python}/lib ''; postPatch = '' diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index d54e8eca78e4a..2333d47d82023 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quiterss"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = version; - sha256 = "1dmfag5hmy4jac20nizwgd92w8h2hdl2ch57hvw5hmjyfckn9rpj"; + sha256 = "06m5mhzxvv8q2adaqcrar3sx2c1hc89h2i0qfjxmirfc5z67hdw2"; }; nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index a4deda99f5b2c..f6ec85f3c2cf0 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -30,17 +30,6 @@ let versionInfo = let supportedVersions = { - "19.3.0" = { - major = "19"; - minor = "3"; - patch = "0"; - x64hash = "0mhpp29ca3dw9hx72i0qawdq35wcc7qzgxwzlx4aicwnm1gbil5c"; - x86hash = "1hxgj5lk5ghbpssbqjd404qr84gls967vwrh8ww5hg3pn86kyf8w"; - x64suffix = "5"; - x86suffix = "5"; - homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1903.html; - }; - "19.6.0" = { major = "19"; minor = "6"; @@ -60,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-latest1.html; + homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1908.html; }; "19.10.0" = { @@ -93,7 +82,7 @@ let # The lifespans of Citrix products can be found here: # https://www.citrix.com/support/product-lifecycle/milestones/receiver.html deprecatedVersions = let - versions = [ ]; + versions = [ "19.3.0" ]; in lib.listToAttrs (lib.forEach versions diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 963a896dd512f..476b1128b9450 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { # 80 - test-gnc-module-scm-module (Failed) # 81 - test-gnc-module-scm-multi (Failed) preCheck = '' - export LD_LIBRARY_PATH=$PWD/lib:$PWD/lib/gnucash:$PWD/lib/gnucash/test:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=$PWD/lib:$PWD/lib/gnucash:$PWD/lib/gnucash/test''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH export NIX_CFLAGS_LINK="-lgtest -lgtest_main" ''; doCheck = false; diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index bc297b791f62a..900f0ed7c04ae 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.08"; + version = "4.1.08.51"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0jbk03w0wfvd9lxh1wdazim9gwxm1lkhc5xzi3h8ag7h9zx58jq0"; + sha256 = "0wki9d19q8rkjxcd3dz3k0a395gmbnji4fxlhw6dpcyqpfw88fcs"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio diff --git a/pkgs/applications/science/biology/seaview/default.nix b/pkgs/applications/science/biology/seaview/default.nix index 69dece88c2769..fea8da41d70af 100644 --- a/pkgs/applications/science/biology/seaview/default.nix +++ b/pkgs/applications/science/biology/seaview/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, coreutils, fltk, libjpeg }: stdenv.mkDerivation rec { - version = "4.7"; + version = "5.0"; pname = "seaview"; src = fetchurl { url = "ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/seaview_${version}.tar.gz"; - sha256 = "0fhyq7dcn0izhwcfin9ajsr7kmmsqm9f1np1rmhzg4digfwqb29n"; + sha256 = "0gzjqf5mm91pa1drwxvz229bv6l995npdggngszh6z6j4pfh8j7c"; }; buildInputs = [ fltk libjpeg ]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index c940fd4ac3422..c47d055a32bad 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,20 +2,16 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.024"; + version = "4.026"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "0nmjazdv36ksjp8ys48c1grlzkd6yx3zhcd9y165d4sjm3m1pffs"; + sha256 = "1b4zxwgd780yxql11r2333qhl7ki5jxh9jxlyhv9xqml9aq8myva"; }; enableParallelBuilding = true; buildInputs = [ perl flex bison ]; - postInstall = '' - sed -i -e '3a\#!/usr/bin/env perl' -e '1,3d' $out/bin/{verilator,verilator_coverage,verilator_profcfunc} - ''; - meta = { description = "Fast and robust (System)Verilog simulator/compiler"; homepage = "https://www.veripool.org/wiki/verilator"; diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index 854a62a5538d1..fa7c3dd5e95f2 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ott"; - version = "0.29"; + version = "0.30"; src = fetchFromGitHub { owner = "ott-lang"; repo = "ott"; rev = version; - sha256 = "0saznk2mjbhp3j57imy2p2j0938026bw5m5gqbj59vcvk1rwwl22"; + sha256 = "16bxfnm30z94x36vr8vs6zd6fj55vnb7aypjl6hf7clk42040brc"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix index 167ab9275faf3..51c93f197e4f8 100644 --- a/pkgs/applications/science/math/pcalc/default.nix +++ b/pkgs/applications/science/math/pcalc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, bison2, flex }: +{ stdenv, fetchgit, bison, flex }: with stdenv.lib; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ "DESTDIR= BINDIR=$(out)/bin" ]; - buildInputs = [ bison2 flex ]; + buildInputs = [ bison flex ]; meta = { homepage = http://pcalc.sourceforge.net/; diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 00397239876b3..68e0d134ace20 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -177,7 +177,7 @@ writeTextFile rec { export SAGE_EXTCODE='${sagelib.src}/src/ext' # for find_library - export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [stdenv.cc.libc singular]}:$DYLD_LIBRARY_PATH" + export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [stdenv.cc.libc singular]}''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" ''; } // { lib = sagelib; # equivalent of `passthru`, which `writeTextFile` doesn't support diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 045a77cea27f4..04115399c1a7a 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.6"; + version = "2.2.8"; src = fetchurl { url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "1cagkkz1pjl0pdf85w1qkwhx0afi3kxm1vnmfavq1zqhss7fc57i"; + sha256 = "1al1imdrknvbcy8k113xysc14lln4msbv281bf0kx7p73wz59mv3"; }; buildInputs = [ gfortran sqlite lhapdf rivet ]; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index acfb30cd7c53e..c6e046ea45bc0 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -135,6 +135,10 @@ let git-test = callPackage ./git-test { }; + git-workspace = callPackage ./git-workspace { + inherit (darwin.apple_sdk.frameworks) Security; + }; + git2cl = callPackage ./git2cl { }; gitFastExport = callPackage ./fast-export { }; 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 new file mode 100644 index 0000000000000..3a72f38903e6d --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "git-workspace"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "orf"; + repo = pname; + rev = "v${version}"; + sha256 = "01qxm00c5wqpy1clrvjr44v7cg4nqawaf5a6qnvvgswvis4kakzr"; + }; + + cargoSha256 = "16rkmk888alfvq8nsggi26vck1c7ya0fa5j7gv219g5py4gw2n34"; + + verifyCargoDeps = true; + + buildInputs = with stdenv; lib.optional isDarwin Security; + + meta = with stdenv.lib; { + description = "Sync personal and work git repositories from multiple providers"; + homepage = "https://github.com/orf/git-workspace"; + license = with licenses; [ mit ]; + platforms = platforms.all; + maintainers = with maintainers; [ misuzu ]; + }; +} 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 7c46d26bf5b31..c9775f14081bc 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.24.1"; + version = "2.25.0"; 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 = "0ql5z31vgl7b785gwrf00m129mg7zi9pa65n12ij3mpxx3f28gvj"; + sha256 = "1l58v42aazj0x9276gk8r9mwyl9pgp9w99aakz4xfhzv7wd2jq60"; }; outputs = [ "out" ]; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index c28d900dd9f15..00bdb370aae4e 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { cd "$sourceRoot" patchPhase - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libXext}/lib" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${libXext}/lib" ${stdenv.shell} bootStrap.bash \ --with-core \ ${if withQT then "--with-qt" else "--without-qt"} \ diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 586779252b635..9554105f20c21 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "13.5.0"; + version = "13.5.1"; pname = "mediathekview"; src = fetchurl { url = "https://download.mediathekview.de/stabil/MediathekView-${version}-linux.tar.gz"; - sha256 = "0n05w2d6sh03rjms7m9b5nj84cl16gkrc9nsn53kvldglmqmmrac"; + sha256 = "0fixr6drim0wmh4q44zikcla4mrnm44nm95d5naqsgx6idalddrc"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 4736dedcb84fd..7ccf0e24762a0 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 = "42.0.0"; + version = "43.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0bjb1cx1sj61yhpraqryhxma4wiz0yl3asnbsv9hvq730v07hg0b"; + sha256 = "0ra9kgvhh5yhbr0hsia1va5lw45zr4kdwcdjhas5ljjyj75mlyxc"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index ce22d8bed2799..cf10bd223a14e 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.0"; + version = "1.3.1"; pname = "streamlink"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = version; - sha256 = "0f4qwwa5pxd4igvxq1qadqpphazlbs3c3cr29ybks2x5wajrvwah"; + sha256 = "0scc0mzvy56b1l6iyvrzb28l8vzrxpfkn4lcwr8nnyjb7ams2xms"; }; checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix deleted file mode 100644 index af4721516eca5..0000000000000 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ /dev/null @@ -1,261 +0,0 @@ -{ stdenv, callPackage, fetchurl, fetchpatch, fetchgit -, ocaml-ng -, withInternalQemu ? true -, withInternalTraditionalQemu ? true -, withInternalSeabios ? true -, withSeabios ? !withInternalSeabios, seabios ? null -, withInternalOVMF ? false # FIXME: tricky to build -, withOVMF ? false, OVMF -, withLibHVM ? true - -# qemu -, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir -, alsaLib -, ... } @ args: - -assert withInternalSeabios -> !withSeabios; -assert withInternalOVMF -> !withOVMF; - -with stdenv.lib; - -# Patching XEN? Check the XSAs at -# https://xenbits.xen.org/xsa/ -# and try applying all the ones we don't have yet. - -let - xsaPatch = { name , sha256 }: (fetchpatch { - url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; - inherit sha256; - }); - - qemuDeps = [ - udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir - alsaLib - ]; - - xsa = import ./xsa-patches.nix { inherit fetchpatch; }; -in - -callPackage (import ./generic.nix (rec { - version = "4.5.5"; - - meta = { - knownVulnerabilities = [ "Security support ended in January 2018" ]; - }; - - src = fetchurl { - url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; - sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2"; - }; - - # Sources needed to build tools and firmwares. - xenfiles = optionalAttrs withInternalQemu { - qemu-xen = { - src = fetchgit { - url = https://xenbits.xen.org/git-http/qemu-xen.git; - rev = "refs/tags/qemu-xen-${version}"; - sha256 = "014s755slmsc7xzy7qhk9i3kbjr2grxb5yznjp71dl6xxfvnday2"; - }; - buildInputs = qemuDeps; - patches = [ - (xsaPatch { - name = "197-4.5-qemuu"; - sha256 = "09gp980qdlfpfmxy0nk7ncyaa024jnrpzx9gpq2kah21xygy5myx"; - }) - (xsaPatch { - name = "208-qemuu-4.7"; - sha256 = "0z9b1whr8rp2riwq7wndzcnd7vw1ckwx0vbk098k2pcflrzppgrb"; - }) - (xsaPatch { - name = "209-qemuu/0001-display-cirrus-ignore-source-pitch-value-as-needed-i"; - sha256 = "1xvxzsrsq05fj6szjlpbgg4ia3cw54dn5g7xzq1n1dymbhv606m0"; - }) - (xsaPatch { - name = "209-qemuu/0002-cirrus-add-blit_is_unsafe-call-to-cirrus_bitblt_cput"; - sha256 = "0avxqs9922qjfsxxlk7bh10432a526j2yyykhags8dk1bzxkpxwv"; - }) - (xsaPatch { - name = "211-qemuu-4.6"; - sha256 = "1g090xs8ca8676vyi78b99z5yjdliw6mxkr521b8kimhf8crx4yg"; - }) - (xsaPatch { - name = "216-qemuu-4.5"; - sha256 = "0nh5akbal93czia1gh1pzvwq7gc4zwiyr1hbyk1m6wwdmqv6ph61"; - }) - ]; - meta.description = "Xen's fork of upstream Qemu"; - }; - } // optionalAttrs withInternalTraditionalQemu { - qemu-xen-traditional = { - src = fetchgit { - url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; - rev = "refs/tags/xen-${version}"; - sha256 = "0n0ycxlf1wgdjkdl8l2w1i0zzssk55dfv67x8i6b2ima01r0k93r"; - }; - buildInputs = qemuDeps; - patches = [ - (xsaPatch { - name = "197-4.5-qemut"; - sha256 = "17l7npw00gyhqzzaqamwm9cawfvzm90zh6jjyy95dmqbh7smvy79"; - }) - (xsaPatch { - name = "199-trad"; - sha256 = "0dfw6ciycw9a9s97sbnilnzhipnzmdm9f7xcfngdjfic8cqdcv42"; - }) - (xsaPatch { - name = "208-qemut"; - sha256 = "0960vhchixp60j9h2lawgbgzf6mpcdk440kblk25a37bd6172l54"; - }) - (xsaPatch { - name = "209-qemut"; - sha256 = "1hq8ghfzw6c47pb5vf9ngxwgs8slhbbw6cq7gk0nam44rwvz743r"; - }) - (xsaPatch { - name = "211-qemut-4.5"; - sha256 = "1z3phabvqmxv4b5923fx63hwdg4v1fnl15zbl88873ybqn0hp50f"; - }) - ]; - postPatch = '' - substituteInPlace xen-hooks.mak \ - --replace /usr/include/pci ${pciutils}/include/pci - ''; - meta.description = "Xen's fork of upstream Qemu that uses old device model"; - }; - } // optionalAttrs withInternalSeabios { - "firmware/seabios-dir-remote" = { - src = fetchgit { - url = https://xenbits.xen.org/git-http/seabios.git; - rev = "e51488c5f8800a52ac5c8da7a31b85cca5cc95d2"; - #rev = "rel-1.7.5"; - sha256 = "0jk54ybhmw97pzyhpm6jr2x99f702kbn0ipxv5qxcbynflgdazyb"; - }; - patches = [ ./0000-qemu-seabios-enable-ATA_DMA.patch ]; - meta.description = "Xen's fork of Seabios"; - }; - } // optionalAttrs withInternalOVMF { - "firmware/ovmf-dir-remote" = { - src = fetchgit { - url = https://xenbits.xen.org/git-http/ovmf.git; - rev = "cb9a7ebabcd6b8a49dc0854b2f9592d732b5afbd"; - sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcq"; - }; - meta.description = "Xen's fork of OVMF"; - }; - } // { - # TODO: patch Xen to make this optional? - "firmware/etherboot/ipxe.git" = { - src = fetchgit { - url = https://git.ipxe.org/ipxe.git; - rev = "9a93db3f0947484e30e753bbd61a10b17336e20e"; - sha256 = "1ga3h1b34q0cl9azj7j9nswn7mfcs3cgfjdihrm5zkp2xw2hpvr6"; - }; - meta.description = "Xen's fork of iPXE"; - }; - } // optionalAttrs withLibHVM { - xen-libhvm-dir-remote = { - src = fetchgit { - name = "xen-libhvm"; - url = https://github.com/ts468/xen-libhvm; - rev = "442dcc4f6f4e374a51e4613532468bd6b48bdf63"; - sha256 = "9ba97c39a00a54c154785716aa06691d312c99be498ebbc00dc3769968178ba8"; - }; - buildPhase = '' - make - cd biospt - cc -Wall -g -D_LINUX -Wstrict-prototypes biospt.c -o biospt -I../libhvm -L../libhvm -lxenhvm - ''; - installPhase = '' - make install - cp biospt/biospt $out/bin/ - ''; - meta = { - description = '' - Helper library for reading ACPI and SMBIOS firmware values - from the host system for use with the HVM guest firmware - pass-through feature in Xen''; - license = licenses.bsd2; - }; - }; - }; - - configureFlags = [] - ++ optional (!withInternalQemu) "--with-system-qemu" # use qemu from PATH - ++ optional (withInternalTraditionalQemu) "--enable-qemu-traditional" - ++ optional (!withInternalTraditionalQemu) "--disable-qemu-traditional" - - ++ optional (withSeabios) "--with-system-seabios=${seabios}" - ++ optional (!withInternalSeabios && !withSeabios) "--disable-seabios" - - ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" - ++ optional (withInternalOVMF) "--enable-ovmf"; - - patches = with xsa; flatten [ - ./0001-libxl-Spice-image-compression-setting-support-for-up.patch - ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch - ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch - XSA_190 - XSA_191 - XSA_192 - XSA_193 - XSA_195 - XSA_196 - XSA_198 - XSA_200 - XSA_202_45 - XSA_204_45 - XSA_206_45 - XSA_207 - XSA_212 - XSA_213_45 - XSA_214 - XSA_215 - XSA_217_45 - XSA_218_45 - XSA_219_45 - XSA_220_45 - XSA_221 - XSA_222_45 - XSA_223 - XSA_224_45 - XSA_227_45 - XSA_230 - XSA_231_45 - XSA_232 - XSA_233 - XSA_234_45 - XSA_235_45 - XSA_236_45 - XSA_237_45 - XSA_238_45 - XSA_239_45 - XSA_240_45 - XSA_241 - XSA_242 - XSA_243_45 - XSA_244_45 - XSA_245 - XSA_246_45 - XSA_247_45 - XSA_248_45 - XSA_249 - XSA_250_45 - XSA_251_45 - ]; - - # Fix build on Glibc 2.24. - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - - postPatch = '' - # Avoid a glibc >= 2.25 deprecation warnings that get fatal via -Werror. - sed 1i'#include <sys/sysmacros.h>' \ - -i tools/blktap2/control/tap-ctl-allocate.c \ - -i tools/libxl/libxl_device.c - ''; - - passthru = { - qemu-system-i386 = if withInternalQemu - then "lib/xen/bin/qemu-system-i386" - else throw "this xen has no qemu builtin"; - }; - -})) ({ ocamlPackages = ocaml-ng.ocamlPackages_4_02; } // args) diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix index 791a3b91818a9..e30006fbcc1ac 100644 --- a/pkgs/applications/virtualization/xen/packages.nix +++ b/pkgs/applications/virtualization/xen/packages.nix @@ -1,62 +1,11 @@ { callPackage -, stdenv, overrideCC, gcc49 +, stdenv, overrideCC }: # TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim # light] for each ./<version>.nix. rec { - - xen_4_5-vanilla = callPackage ./4.5.nix { - # At the very least included seabios and etherboot need gcc49, - # so we have to build all of it with gcc49. - stdenv = overrideCC stdenv gcc49; - - meta = { - description = "vanilla"; - longDescription = '' - Vanilla version of Xen. Uses forks of Qemu and Seabios bundled - with Xen. This gives vanilla experince, but wastes space and - build time: typical NixOS setup that runs lots of VMs will - build three different versions of Qemu when using this (two - forks and upstream). - ''; - }; - }; - - xen_4_5-slim = xen_4_5-vanilla.override { - withInternalQemu = false; - withInternalTraditionalQemu = true; - withInternalSeabios = false; - withSeabios = true; - - meta = { - description = "slim"; - longDescription = '' - Slimmed-down version of Xen that reuses nixpkgs packages as - much as possible. Different parts may get out of sync, but - this builds faster and uses less space than vanilla. Use with - `qemu_xen` from nixpkgs. - ''; - }; - }; - - xen_4_5-light = xen_4_5-vanilla.override { - withInternalQemu = false; - withInternalTraditionalQemu = false; - withInternalSeabios = false; - withSeabios = true; - - meta = { - description = "light"; - longDescription = '' - Slimmed-down version of Xen without `qemu-traditional` (you - don't need it if you don't know what it is). Use with - `qemu_xen-light` from nixpkgs. - ''; - }; - }; - xen_4_8-vanilla = callPackage ./4.8.nix { meta = { description = "vanilla"; diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index 5fcbff26b1544..7e68de8393fd2 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -3,6 +3,7 @@ , fltk, gtk , libX11, libXext, libICE , dbus +, fetchpatch }: stdenv.mkDerivation rec { @@ -16,6 +17,13 @@ stdenv.mkDerivation rec { sha256 = "1j7vkx1ig4kzwffdxnkqv3kld9qi3sam4w2nhq18waqjsi8xl5gz"; }; + patches = [ + (fetchpatch { + url = "https://salsa.debian.org/debian/afterstep/raw/master/debian/patches/44-Fix-build-with-gcc-5.patch"; + sha256 = "1vipy2lzzd2gqrsqk85pwgcdhargy815fxlbn57hsm45zglc3lj4"; + }) + ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjpeg libtiff libpng freetype fltk gtk libX11 libXext libICE dbus dbus ]; diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 295b17eec67c8..8de43d5a9195d 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -52,7 +52,7 @@ let etcProfile = writeText "profile" '' export PS1='${name}-chrootenv:\u@\h:\w\$ ' export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' - export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" export TZDIR='/etc/zoneinfo' diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 3fcae13e20d7b..509b7e2a7e182 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -315,7 +315,7 @@ rec { runCommand "${name}-granular-docker-layers" { inherit maxLayers; paths = referencesByPopularity overallClosure; - nativeBuildInputs = [ jshon rsync tarsum ]; + nativeBuildInputs = [ jshon rsync tarsum moreutils ]; enableParallelBuilding = true; } '' @@ -335,7 +335,8 @@ rec { cat $paths ${lib.concatMapStringsSep " " (path: "| grep -v ${path}") (closures ++ [ overallClosure ])} } - paths | head -n $((maxLayers - 1)) | cat -n | xargs -P$NIX_BUILD_CORES -n2 ${storePathToLayer} + # We need to sponge to avoid grep broken pipe error when maxLayers == 1 + paths | sponge | head -n $((maxLayers - 1)) | cat -n | xargs -r -P$NIX_BUILD_CORES -n2 ${storePathToLayer} if [ $(paths | wc -l) -ge $maxLayers ]; then paths | tail -n+$maxLayers | xargs ${storePathToLayer} $maxLayers fi @@ -544,6 +545,9 @@ rec { # believe the actual maximum is 128. maxLayers ? 100 }: + assert + (lib.assertMsg (maxLayers > 1) + "the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})"); let baseName = baseNameOf name; contentsEnv = symlinkJoin { diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index d7d1a6933100b..a1f71d35793ce 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -238,4 +238,12 @@ rec { config.Cmd = [ "${pkgs.hello}/bin/hello" ]; }; + # 15. Create a layered image with only 2 layers + two-layered-image = pkgs.dockerTools.buildLayeredImage { + name = "two-layered-image"; + tag = "latest"; + config.Cmd = [ "${pkgs.hello}/bin/hello" ]; + contents = [ pkgs.bash pkgs.hello ]; + maxLayers = 2; + }; } diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index efc538f0fd618..c146ffef5ff6e 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -137,16 +137,7 @@ in '' CRATENAME=$(echo ${crateName} | sed -e "s/\(.*\)-sys$/\U\1/") grep -P "^cargo:(?!(rustc-|warning=|rerun-if-changed=|rerun-if-env-changed))" target/build/${crateName}.opt \ | sed -e "s/cargo:\([^=]*\)=\(.*\)/export DEP_$(echo $CRATENAME)_\U\1\E=\2/" > target/env - set -e - if [[ -n "$(ls target/build/${crateName}.out)" ]]; then - - if [[ -e "${libPath}" ]]; then - cp -r target/build/${crateName}.out/* $(dirname ${libPath}) #*/ - else - cp -r target/build/${crateName}.out/* src #*/ - fi - fi fi runHook postConfigure '' diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 2885b2aef5100..569b48d25aeaf 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -23,7 +23,7 @@ let lib.strings.replaceStrings ["-"] ["_"] crateRenames.${dep.crateName} else extern; - in (if lib.any (x: x == "lib") dep.crateType then + in (if lib.any (x: x == "lib" || x == "rlib") dep.crateType then " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}.rlib" else " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") 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 aefa279fc5e9a..6aad02992c1b9 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -1,17 +1,17 @@ { lib, buildRustCrate, runCommand, writeTextFile, symlinkJoin, callPackage, releaseTools }: let mkCrate = args: let - p = { - crateName = "nixtestcrate"; - version = "0.1.0"; - authors = [ "Test <test@example.com>" ]; - } // args; - in buildRustCrate p; + p = { + crateName = "nixtestcrate"; + version = "0.1.0"; + authors = [ "Test <test@example.com>" ]; + } // args; + in buildRustCrate p; - mkFile = destination: text: writeTextFile { - name = "src"; - destination = "/${destination}"; - inherit text; + mkFile = destination: text: writeTextFile { + name = "src"; + destination = "/${destination}"; + inherit text; }; mkBin = name: mkFile name '' @@ -185,7 +185,41 @@ let "test tests_bar ... ok" ]; }; - + linkAgainstRlibCrate = { + crateName = "foo"; + src = mkFile "src/main.rs" '' + extern crate somerlib; + fn main() {} + ''; + dependencies = [ + (mkCrate { + crateName = "somerlib"; + type = [ "rlib" ]; + src = mkLib "src/lib.rs"; + }) + ]; + }; + # Regression test for https://github.com/NixOS/nixpkgs/issues/74071 + # Whenevever a build.rs file is generating files those should not be overlayed onto the actual source dir + buildRsOutDirOverlay = { + src = symlinkJoin { + name = "buildrs-out-dir-overlay"; + paths = [ + (mkLib "src/lib.rs") + (mkFile "build.rs" '' + use std::env; + use std::ffi::OsString; + use std::fs; + use std::path::Path; + fn main() { + let out_dir = env::var_os("OUT_DIR").expect("OUT_DIR not set"); + let out_file = Path::new(&out_dir).join("lib.rs"); + fs::write(out_file, "invalid rust code!").expect("failed to write lib.rs"); + } + '') + ]; + }; + }; }; brotliCrates = (callPackage ./brotli-crates.nix {}); in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // { diff --git a/pkgs/build-support/setup-hooks/make-symlinks-relative.sh b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh new file mode 100644 index 0000000000000..0608d3ca81c4e --- /dev/null +++ b/pkgs/build-support/setup-hooks/make-symlinks-relative.sh @@ -0,0 +1,28 @@ +fixupOutputHooks+=(_makeSymlinksRelative) + +# For every symlink in $output that refers to another file in $output +# ensure that the symlink is relative. This removes references to the output +# has from the resulting store paths and thus the NAR files. +_makeSymlinksRelative() { + local symlinkTarget + + if [ -n "${dontRewriteSymlinks-}" ]; then + return 0 + fi + + while IFS= read -r -d $'\0' f; do + symlinkTarget=$(readlink "$f") + if [[ "$symlinkTarget"/ != "$prefix"/* ]]; then + # skip this symlink as it doesn't point to $prefix + continue + fi + + if [ ! -e "$symlinkTarget" ]; then + echo "the symlink $f is broken, it points to $symlinkTarget (which is missing)" + fi + + echo "rewriting symlink $f to be relative to $prefix" + ln -snrf "$symlinkTarget" "$f" + + done < <(find $prefix -type l -print0) +} diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index b7ae27aac6898..8bfde381633cf 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -2,17 +2,19 @@ stdenv.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2019-09-15"; + version = "2020-01-29"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "4e1b6c693615bc2c7c7a11df6f4b90f2e6fb67db"; - sha256 = "1vp1wp4fgmy5af8z8nb3m6wgmb6wbwlvx5smf9dxfcn254hdg8g0"; + rev = version; + sha256 = "0g6qiry4gzkr48xn4qi8sdna0hi3982sywskz9adkzqcznir542h"; }; nativeBuildInputs = [ gtk3 ]; + dontDropIconThemeCache = true; + installPhase = '' patchShebangs install.sh mkdir -p $out/share/icons @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A colorful design icon theme for linux desktops"; - homepage = https://github.com/vinceliuice/Qogir-icon-theme; + homepage = "https://github.com/vinceliuice/Qogir-icon-theme"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix new file mode 100644 index 0000000000000..6be0ab73641e5 --- /dev/null +++ b/pkgs/data/misc/spdx-license-list-data/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "spdx-license-list-data"; + version = "3.7"; + + src = fetchFromGitHub { + owner = "spdx"; + repo = "license-list-data"; + rev = "v${version}"; + sha256 = "1zll1d4apqh762iplzcm90v3yp3b36whc3vqx1vlmjgdrfss9jhn"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + install -vDt $out/json json/licenses.json + ''; + + meta = { + description = "Various data formats for the SPDX License List"; + homepage = "https://github.com/spdx/license-list-data"; + license = lib.licenses.cc0; + }; +} diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix new file mode 100644 index 0000000000000..79c4023152f56 --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -0,0 +1,124 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, autoreconfHook +, glib +, gettext +, cinnamon-desktop +, intltool +, libxslt +, gtk3 +, libnotify +, gnome-menus +, libxml2 +, systemd +, upower +, cinnamon-settings-daemon +, colord +, polkit +, ibus +, libpulseaudio +, isocodes +, kerberos +, libxkbfile +, cinnamon-menus +, dbus-glib +, libgnomekbd +, libxklavier +, networkmanager +, libwacom +, gnome3 +, libtool +, wrapGAppsHook +, tzdata +, glibc +, networkmanagerapplet +, modemmanager +, xorg +, gdk-pixbuf +, cups +}: + +stdenv.mkDerivation rec { + pname = "cinnamon-control-center"; + version = "4.4.0"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "1rxm5n2prh182rxvjs7psxgjddikrjr8492j22060gmyvq55n7kc"; + }; + + configureFlags = [ "--enable-systemd" ]; + + buildInputs = [ + gtk3 + glib + cinnamon-desktop + libnotify + cinnamon-menus + libxml2 + dbus-glib + systemd + polkit + libgnomekbd + libxklavier + colord + cinnamon-settings-daemon + libwacom + gnome3.gnome-online-accounts + tzdata + networkmanager + networkmanagerapplet + modemmanager + xorg.libXxf86misc + xorg.libxkbfile + gdk-pixbuf + cups + ]; + + /* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/" + ./panels/datetime/tz.h:32:# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" + ./panels/datetime/tz.h:34:# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" */ + + postPatch = '' + patchShebangs ./autogen.sh + sed 's|TZ_DIR "/usr/share/zoneinfo/"|TZ_DIR "${tzdata}/share/zoneinfo/"|g' -i ./panels/datetime/test-timezone.c + sed 's|TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"|TZ_DATA_FILE "${tzdata}/share/zoneinfo/zone.tab"|g' -i ./panels/datetime/tz.h + sed 's|"/usr/share/i18n/locales/"|"${glibc}/share/i18n/locales/"|g' -i panels/datetime/test-endianess.c + ''; + + autoreconfPhase = '' + NOCONFIGURE=1 bash ./autogen.sh + ''; + + # it needs to have access to that file, otherwise we can't run tests after build + + preBuild = '' + mkdir -p $out/share/cinnamon-control-center/ + ln -s $PWD/panels/datetime $out/share/cinnamon-control-center/ + ''; + + preInstall = '' + rm -rfv $out + ''; + + nativeBuildInputs = [ + pkgconfig + autoreconfHook + wrapGAppsHook + gettext + intltool + libxslt + libtool + ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/linuxmint/cinnamon-control-center"; + description = "A collection of configuration plugins used in cinnamon-settings"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index b077ad184769e..44b81e85c682f 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -1,6 +1,7 @@ { pkgs, lib }: lib.makeScope pkgs.newScope (self: with self; { + cinnamon-control-center = callPackage ./cinnamon-control-center { }; cinnamon-desktop = callPackage ./cinnamon-desktop { }; cinnamon-menus = callPackage ./cinnamon-menus { }; cinnamon-translations = callPackage ./cinnamon-translations { }; diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix index 5d0d04bfb764d..62931dfcd811d 100644 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -228,8 +228,8 @@ mkDerivation rec { ]; preBuild = '' - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${zlib}/lib"; - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${libX11}/lib"; + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${zlib}/lib"; + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${libX11}/lib"; ''; dontWrapQtApps = true; diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 183e72565d3d9..b4b271fb38f30 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { preConfigure = '' # allow ecore_con to find libcurl.so, which is a runtime dependency (it is dlopened) - export LD_LIBRARY_PATH="${curl.out}/lib:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="${curl.out}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" source "$setupHook" ''; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix index 453a4459fddb1..44c4469c5656d 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprint/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl -, libgnomecups, bison2, flex }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, gettext, libxml2, intltool, libart_lgpl +, libgnomecups, bison, flex }: stdenv.mkDerivation rec { name = "libgnomeprint-2.18.8"; @@ -9,10 +9,17 @@ stdenv.mkDerivation rec { sha256 = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691"; }; - patches = [ ./bug653388.patch ]; + patches = [ + ./bug653388.patch + # Fix compatibility with bison 3 + (fetchpatch { + url = "https://github.com/pld-linux/libgnomeprint/raw/54c0f9c3675b86c53f6d77a5bc526ce9ef0e38cd/bison3.patch"; + sha256 = "1sp04jbv34i1gcwf377hhmwdsmqzig70dd06rjz1isb6zwh4y01l"; + }) + ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison2 flex ]; + buildInputs = [ gtk2 gettext intltool libart_lgpl libgnomecups bison flex ]; propagatedBuildInputs = [ libxml2 ]; 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 6c293cb55b9dc..d0273f0fac1d8 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.34.2"; + version = "3.34.3"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16z85y6hhazcrp5ngw47w4x9r0j8zrj7awv5im58hhp0xs19zf1y"; + sha256 = "1af3f218i5h3df81xkjdij0n9knsw355fsmhzdrfh1bflxfarpyj"; }; patches = [ diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index bfe216c6ad397..7beb2cba9c50e 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, buildPythonApplication, fetchFromGitHub -, bottle, click, colorama +{ stdenv, lib, buildPythonApplication, fetchFromGitHub, fetchpatch +, bottle, click, colorama, semantic-version , lockfile, pyserial, requests -, pytest, semantic-version, tox, tabulate -, git +, tabulate, pyelftools, marshmallow +, pytest, tox, jsondiff +, git, spdx-license-list-data }: let @@ -39,6 +40,7 @@ let "test_pkgmanifest.py::test_packages" ]) ++ (map (e: "--ignore=tests/${e}") [ "commands/test_boards.py" + "commands/test_check.py" "commands/test_platform.py" "commands/test_update.py" "test_maintenance.py" @@ -47,25 +49,25 @@ let in buildPythonApplication rec { pname = "platformio"; - version = "4.0.3"; + version = "4.1.0"; # 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 = "1naaa53cc7n7zyqggqjvvgkcq8cyzngdf904y9ag0x1vvb70f8j9"; + sha256 = "10v9jw1zjfqr3wl6kills3cfp0ky7xbm1gc3z0n57wrqbc6cmz95"; }; propagatedBuildInputs = [ bottle click colorama git lockfile pyserial requests semantic-version - tabulate + tabulate pyelftools marshmallow ]; HOME = "/tmp"; - checkInputs = [ pytest tox ]; + checkInputs = [ pytest tox jsondiff ]; checkPhase = '' runHook preCheck @@ -75,7 +77,20 @@ in buildPythonApplication rec { runHook postCheck ''; - patches = [ ./fix-searchpath.patch ]; + 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 + ]; + + postPatch = '' + substitute platformio/package/manifest/schema.py platformio/package/manifest/schema.py \ + --subst-var-by SPDX_LICENSE_LIST_DATA '${spdx-license-list-data}' + ''; meta = with stdenv.lib; { broken = stdenv.isAarch64; diff --git a/pkgs/development/arduino/platformio/fix-searchpath.patch b/pkgs/development/arduino/platformio/fix-searchpath.patch index 1570cae1b193a..46e84d15a82f7 100644 --- a/pkgs/development/arduino/platformio/fix-searchpath.patch +++ b/pkgs/development/arduino/platformio/fix-searchpath.patch @@ -1,11 +1,13 @@ ---- ./platformio/proc.py-old 2017-09-29 01:20:08.174548250 +0200 -+++ ./platformio/proc.py 2017-09-29 01:19:48.410485308 +0200 -@@ -164,7 +164,7 @@ - isdir(join(p, "click")) or isdir(join(p, "platformio"))) +diff --git a/platformio/proc.py b/platformio/proc.py +index 80e50201..15cee5a5 100644 +--- a/platformio/proc.py ++++ b/platformio/proc.py +@@ -167,7 +167,7 @@ def copy_pythonpath_to_osenv(): + conditions.append(isdir(join(p, "click")) or isdir(join(p, "platformio"))) if all(conditions): _PYTHONPATH.append(p) -- os.environ['PYTHONPATH'] = os.pathsep.join(_PYTHONPATH) -+ os.environ['PYTHONPATH'] = os.pathsep.join(sys.path) +- os.environ["PYTHONPATH"] = os.pathsep.join(_PYTHONPATH) ++ os.environ["PYTHONPATH"] = os.pathsep.join(sys.path) - def get_serialports(filter_hwid=False): + def where_is_program(program, envpath=None): diff --git a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch new file mode 100644 index 0000000000000..90251d668bc74 --- /dev/null +++ b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch @@ -0,0 +1,16 @@ +diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py +index f1d68e08..9b7b1da8 100644 +--- a/platformio/package/manifest/schema.py ++++ b/platformio/package/manifest/schema.py +@@ -174,9 +174,5 @@ class ManifestSchema(Schema): + @staticmethod + @memoized(expire="1h") + def load_spdx_licenses(): +- r = requests.get( +- "https://raw.githubusercontent.com/spdx/license-list-data" +- "/v3.7/json/licenses.json" +- ) +- r.raise_for_status() +- return r.json() ++ import json ++ return json.load(open("@SPDX_LICENSE_LIST_DATA@/json/licenses.json")) diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 031f7b5dda728..96062a5730047 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -36,35 +36,35 @@ let buildMix = callPackage ./build-mix.nix {}; # BEAM-based languages. - elixir = elixir_1_9; + elixir = elixir_1_10; - elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix { + elixir_1_10 = lib.callElixir ../interpreters/elixir/1.10.nix { inherit rebar erlang; debugInfo = true; }; - elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix { + elixir_1_9 = lib.callElixir ../interpreters/elixir/1.9.nix { inherit rebar erlang; debugInfo = true; }; - elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { + elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix { inherit rebar erlang; debugInfo = true; }; - elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix { + elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix { inherit rebar erlang; debugInfo = true; }; - elixir_1_5 = lib.callElixir ../interpreters/elixir/1.5.nix { + elixir_1_6 = lib.callElixir ../interpreters/elixir/1.6.nix { inherit rebar erlang; debugInfo = true; }; # Remove old versions of elixir, when the supports fades out: - # https://hexdocs.pm/elixir/compatibility-and-deprecations.html + # https://hexdocs.pm/elixir/compatibility-and-deprecations.html lfe = lfe_1_2; lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; }; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 03a914695a063..1246434434822 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -58,16 +58,17 @@ let outputs = [ "out" "lib" "bin" ]; - # we are almost able to run the full test suite now postPatch = '' substituteInPlace src/crystal/system/unix/time.cr \ --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo ln -s spec/compiler spec/std + mkdir /tmp/crystal substituteInPlace spec/std/file_spec.cr \ --replace '/bin/ls' '${coreutils}/bin/ls' \ - --replace '/usr/share' '/tmp/test' + --replace '/usr/share' '/tmp/crystal' \ + --replace '/usr' '/tmp' substituteInPlace spec/std/process_spec.cr \ --replace '/bin/cat' '${coreutils}/bin/cat' \ @@ -76,8 +77,23 @@ let --replace '"env"' '"${coreutils}/bin/env"' \ --replace '"/usr"' '"/tmp"' + substituteInPlace spec/std/socket/tcp_server_spec.cr \ + --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "' + substituteInPlace spec/std/system_spec.cr \ --replace '`hostname`' '`${nettools}/bin/hostname`' + + # See https://github.com/crystal-lang/crystal/pull/8640 + substituteInPlace spec/std/http/cookie_spec.cr \ + --replace '01 Jan 2020' '01 Jan #{Time.utc.year + 2}' + + # See https://github.com/crystal-lang/crystal/issues/8629 + substituteInPlace spec/std/socket/udp_socket_spec.cr \ + --replace 'it "joins and transmits to multicast groups"' 'pending "joins and transmits to multicast groups"' + + # See https://github.com/crystal-lang/crystal/pull/8699 + substituteInPlace spec/std/xml/xml_spec.cr \ + --replace 'it "handles errors"' 'pending "handles errors"' ''; buildInputs = commonBuildInputs extraBuildInputs; @@ -189,6 +205,24 @@ in rec { }; }; + 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 = { + x86_64-linux = "0r8salf572xrnr4m6ll9q5hz6jj8q7ff1rljlhmqb1r26a8mi2ih"; + i686-linux = "0hridnis5vvrswflx0q67xfg5hryhz6ivlwrb9n4pryj5d1gwjrr"; + x86_64-darwin = "1dgxgv0s3swkc5cwawzgpbc6bcd2nx4hjxc7iw2h907y1vgmbipz"; + }; + }; + crystal_0_25 = generic { version = "0.25.1"; sha256 = "15xmbkalsdk9qpc6wfpkly3sifgw6a4ai5jzlv78dh3jp7glmgyl"; @@ -228,18 +262,16 @@ in rec { version = "0.31.1"; sha256 = "1dswxa32w16gnc6yjym12xj7ibg0g6zk3ngvl76lwdjqb1h6lwz8"; doCheck = false; # 5 checks are failing now - binary = crystal_0_30; + binary = binaryCrystal_0_30; }; crystal_0_32 = generic { - version = "255bfc5fa925b95b72e34b26ad997fb2b3f83059"; - sha256 = "1dgk36cj5lwhs1c4zp0s1c9hjk0h3vljq6zwhlnzkl1xs7cgzim1"; - doCheck = false; # 5 checks are failing now - binary = crystal_0_31; - extraBuildInputs = [ readline ]; + version = "0.32.1"; + sha256 = "120ndi3nhh2r52hjvhwfb49cdggr1bzdq6b8xg7irzavhjinfza6"; + binary = binaryCrystal_0_31; }; - crystal = crystal_0_31; + crystal = crystal_0_32; crystal2nix = callPackage ./crystal2nix.nix {}; } diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 6531316fa12b4..c3b16293204a1 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -2,8 +2,6 @@ , callPackage , fetchurl , gcc48 -, gcc49 -, gcc5 , gcc6 , gcc7 }: @@ -29,14 +27,14 @@ in rec { version = "7.0.28"; url = "http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run"; sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi"; - gcc = gcc49; + gcc = gcc6; }; cudatoolkit_7_5 = common { version = "7.5.18"; url = "http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run"; sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88"; - gcc = gcc49; + gcc = gcc6; }; cudatoolkit_8 = common { @@ -49,7 +47,7 @@ in rec { sha256 = "1iaz5rrsnsb1p99qiqvxn6j3ksc7ry8xlr397kqcjzxqbljbqn9d"; }) ]; - gcc = gcc5; + gcc = gcc6; }; cudatoolkit_9_0 = common { diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 2f85fc4b7e8cb..b287a8551f3c1 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -61,7 +61,13 @@ let majorVersion = "4"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; patches = - [ ../use-source-date-epoch.patch ../parallel-bconfig.patch ./parallel-strsignal.patch ] + [ ../use-source-date-epoch.patch ../parallel-bconfig.patch ./parallel-strsignal.patch + (fetchpatch { + name = "avoid-ustat-glibc-2.28.patch"; + url = "https://gitweb.gentoo.org/proj/gcc-patches.git/plain/4.9.4/gentoo/100_all_avoid-ustat-glibc-2.28.patch?id=55fcb515620a8f7d3bb77eba938aa0fcf0d67c96"; + sha256 = "0b32sb4psv5lq0ij9fwhi1b4pjbwdjnv24nqprsk14dsc6xmi1g0"; + }) + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langFortran ../gfortran-driving.patch diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix deleted file mode 100644 index f68ddc81f81f0..0000000000000 --- a/pkgs/development/compilers/gcc/5/default.nix +++ /dev/null @@ -1,328 +0,0 @@ -{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs -, langC ? true, langCC ? true, langFortran ? false -, langObjC ? stdenv.targetPlatform.isDarwin -, langObjCpp ? stdenv.targetPlatform.isDarwin -, langJava ? false -, langGo ? false -, profiledCompiler ? false -, staticCompiler ? false -, enableShared ? true -, enableLTO ? true -, texinfo ? null -, perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which -, libelf # optional, for link-time optimizations (LTO) -, isl ? null # optional, for the Graphite optimization framework. -, zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null -, gtk2 ? null, libart_lgpl ? null -, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null -, libXrender ? null, xorgproto ? null -, libXrandr ? null, libXi ? null -, x11Support ? langJava -, 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 -}: - -assert langJava -> zip != null && unzip != null - && zlib != null && boehmgc != null - && perl != null; # for `--enable-java-home' - -# 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; - -# threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; - -with stdenv.lib; -with builtins; - -let majorVersion = "5"; - version = "${majorVersion}.5.0"; - - inherit (stdenv) buildPlatform hostPlatform targetPlatform; - - patches = - [ ../use-source-date-epoch.patch ] - ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch - ++ optional noSysDirs ../no-sys-dirs.patch - ++ optional langFortran ../gfortran-driving.patch - ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch - ++ optional stdenv.hostPlatform.isMusl (fetchpatch { - url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff; - sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm"; - }) - ++ 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 = "074bl5n27d1ksa31pvzj4vd8xd46r118k0w94gdv3s1vydg7mah0"; - }); - - javaEcj = fetchurl { - # The `$(top_srcdir)/ecj.jar' file is automatically picked up at - # `configure' time. - - # XXX: Eventually we might want to take it from upstream. - url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; - sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; - }; - - # 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; - sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; - }; - - xlibs = [ - libX11 libXt libSM libICE libXtst libXrender libXrandr libXi - xorgproto - ]; - - javaAwtGtk = langJava && x11Support; - - /* 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 - -# We need all these X libraries when building AWT with GTK. -assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; - -stdenv.mkDerivation ({ - pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; - inherit version; - - builder = ../builder.sh; - - src = fetchurl { - url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "11zd1hgzkli3b2v70qsm2hyqppngd4616qc96lmm9zl2kl9yl32k"; - }; - - 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 = - 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 null; - - inherit noSysDirs staticCompiler langJava crossStageStatic - libcCross crossMingw; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig); - - # 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) - ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) - - # 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) - ; - - 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 langJava 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 - langJava javaAwtGtk javaAntlr javaEcj - 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; - - doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - - 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. - # - # Note: When building the Java AWT GTK peer, the build system doesn't honor - # `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add - # them to $CPATH and $LIBRARY_PATH in this case. - # - # 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 - ++ optional langJava boehmgc - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - )); - - LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([] - ++ optional (zlib != null) zlib - ++ optional langJava boehmgc - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - )); - - inherit - (import ../common/extra-target-flags.nix { - inherit stdenv crossStageStatic libcCross threadsCross; - }) - EXTRA_TARGET_FLAGS - EXTRA_TARGET_LDFLAGS - ; - - passthru = { - inherit langC langCC langObjC langObjCpp 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, Java, and Ada, as well - as libraries for these languages (libstdc++, libgcj, 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; [ peti ]; - - platforms = - stdenv.lib.platforms.linux ++ - stdenv.lib.platforms.freebsd ++ - stdenv.lib.platforms.illumos ++ - stdenv.lib.platforms.darwin; - badPlatforms = [ "x86_64-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/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 0b28b61a27b21..44c079af9263a 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -29,7 +29,7 @@ in llvmPackages.stdenv.mkDerivation { # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. preBuild = '' - export LD_LIBRARY_PATH="$(pwd)/lib:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$(pwd)/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix index a90fbe6ae8376..5bdd3731207ee 100644 --- a/pkgs/development/compilers/llvm/4/clang/default.nix +++ b/pkgs/development/compilers/llvm/4/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python3 , fixDarwinDylibNames , enableManpages ? false }: @@ -19,8 +19,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - nativeBuildInputs = [ cmake python ] - ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + nativeBuildInputs = [ cmake python3 ] + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; buildInputs = [ libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix index 9651dbb72f4d7..2f457880db106 100644 --- a/pkgs/development/compilers/llvm/4/default.nix +++ b/pkgs/development/compilers/llvm/4/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook -, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith +, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -17,7 +17,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "1dhmp7ccfpr42bmvk3kp37ngjpf3a9m5d4kkpsn7d00hzi7fdl9m"; tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { llvm = callPackage ./llvm.nix { @@ -29,12 +29,12 @@ let llvm-manpages = lowPrio (tools.llvm.override { enableManpages = true; - python = pkgs.python; # don't use python-boot + python3 = pkgs.python3; # don't use python-boot }); clang-manpages = lowPrio (tools.clang-unwrapped.override { enableManpages = true; - python = pkgs.python; # don't use python-boot + python3 = pkgs.python3; # don't use python-boot }); libclang = tools.clang-unwrapped.lib; @@ -57,7 +57,7 @@ let }); libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { stdenv = overrideCC stdenv buildLlvmTools.clang; diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix index 0213741e3e064..264342701ae96 100644 --- a/pkgs/development/compilers/llvm/4/libc++/default.nix +++ b/pkgs/development/compilers/llvm/4/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation { pname = "libc++"; @@ -31,7 +31,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/4/lldb.nix b/pkgs/development/compilers/llvm/4/lldb.nix index 8adf11abddda3..7f6231278e6ca 100644 --- a/pkgs/development/compilers/llvm/4/lldb.nix +++ b/pkgs/development/compilers/llvm/4/lldb.nix @@ -9,7 +9,7 @@ , libxml2 , llvm , clang-unwrapped -, python +, python3 , version , darwin }: @@ -31,7 +31,7 @@ stdenv.mkDerivation { cmake/modules/LLDBStandalone.cmake ''; - nativeBuildInputs = [ cmake python which swig ]; + nativeBuildInputs = [ cmake python3 which swig ]; buildInputs = [ ncurses zlib libedit libxml2 llvm ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/development/compilers/llvm/4/llvm.nix b/pkgs/development/compilers/llvm/4/llvm.nix index 317a5ea06f48b..0d3ce1614ded1 100644 --- a/pkgs/development/compilers/llvm/4/llvm.nix +++ b/pkgs/development/compilers/llvm/4/llvm.nix @@ -2,7 +2,7 @@ , fetch , fetchpatch , cmake -, python +, python3 , libffi , libbfd , libxml2 @@ -40,8 +40,8 @@ stdenv.mkDerivation ({ outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; - nativeBuildInputs = [ cmake python ] - ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + nativeBuildInputs = [ cmake python3 ] + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; buildInputs = [ libxml2 libffi ]; @@ -143,7 +143,7 @@ stdenv.mkDerivation ({ ''; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib ''; postInstall = stdenv.lib.optionalString enableSharedLibraries '' diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index 6695609b8ecdf..e391ce046dbc0 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3 , fixDarwinDylibNames , enableManpages ? false }: @@ -19,8 +19,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - nativeBuildInputs = [ cmake python ] - ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + nativeBuildInputs = [ cmake python3 ] + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; buildInputs = [ libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/5/compiler-rt.nix b/pkgs/development/compilers/llvm/5/compiler-rt.nix index c87b0f235961d..0282591b6e202 100644 --- a/pkgs/development/compilers/llvm/5/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/5/compiler-rt.nix @@ -1,11 +1,11 @@ -{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }: +{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: with stdenv.lib; stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy"; - nativeBuildInputs = [ cmake python llvm ]; + nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; configureFlags = [ diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index 6807240df81e0..05f4dbf6aa065 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook -, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith +, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -16,7 +16,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3"; tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -36,12 +36,12 @@ let llvm-manpages = lowPrio (tools.llvm.override { enableManpages = true; - python = pkgs.python; # don't use python-boot + python3 = pkgs.python3; # don't use python-boot }); clang-manpages = lowPrio (tools.clang-unwrapped.override { enableManpages = true; - python = pkgs.python; # don't use python-boot + python3 = pkgs.python3; # don't use python-boot }); libclang = tools.clang-unwrapped.lib; @@ -74,7 +74,7 @@ let }); libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { compiler-rt = callPackage ./compiler-rt.nix {}; diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index 03d8a2085d0b7..b02e09a83a81e 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation { pname = "libc++"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index cce44c7e50f9e..a91a7e4354ef1 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -9,7 +9,7 @@ , libxml2 , llvm , clang-unwrapped -, python +, python3 , version , darwin }: @@ -30,7 +30,7 @@ stdenv.mkDerivation { cmake/modules/LLDBStandalone.cmake ''; - nativeBuildInputs = [ cmake python which swig ]; + nativeBuildInputs = [ cmake python3 which swig ]; buildInputs = [ ncurses zlib libedit libxml2 llvm ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index d26af8438e73e..2ce17765d633a 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -2,7 +2,7 @@ , fetch , fetchpatch , cmake -, python +, python3 , libffi , libbfd , libxml2 @@ -37,8 +37,8 @@ stdenv.mkDerivation ({ outputs = [ "out" "python" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; - nativeBuildInputs = [ cmake python ] - ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + nativeBuildInputs = [ cmake python3 ] + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; buildInputs = [ libxml2 libffi ]; @@ -119,7 +119,7 @@ stdenv.mkDerivation ({ ''; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib ''; postInstall = '' diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index d093379b3c995..9374fc0bda9f5 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3 , fixDarwinDylibNames , enableManpages ? false }: @@ -19,8 +19,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - nativeBuildInputs = [ cmake python ] - ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + nativeBuildInputs = [ cmake python3 ] + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; buildInputs = [ libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index 4cf79e79569ca..b3b6e86fc525f 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -1,11 +1,11 @@ -{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }: +{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: with stdenv.lib; stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "1fcr3jn24yr8lh36nc0c4ikli4744i2q9m1ik67p1jymwwaixkgl"; - nativeBuildInputs = [ cmake python llvm ]; + nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; configureFlags = [ diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index ae51c19ec728b..d4745930ed3f3 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook -, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith +, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith , buildLlvmTools # tools, but from the previous stage, for cross , targetLlvmLibraries # libraries, but from the next stage, for cross }: @@ -16,7 +16,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "1w8ml7fyn4vyxmy59n2qm4r1k1kgwgwkaldp6m45fdv4g0kkfbhd"; tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -36,12 +36,12 @@ let llvm-manpages = lowPrio (tools.llvm.override { enableManpages = true; - python = pkgs.python; # don't use python-boot + python3 = pkgs.python3; # don't use python-boot }); clang-manpages = lowPrio (tools.clang-unwrapped.override { enableManpages = true; - python = pkgs.python; # don't use python-boot + python3 = pkgs.python3; # don't use python-boot }); libclang = tools.clang-unwrapped.lib; @@ -74,7 +74,7 @@ let }); libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { compiler-rt = callPackage ./compiler-rt.nix {}; diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 658068cbfaff1..831c6c9c70027 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version }: +{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }: stdenv.mkDerivation { pname = "libc++"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index d3db8082c9636..30d72d944264f 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -9,7 +9,7 @@ , libxml2 , llvm , clang-unwrapped -, python +, python3 , version , darwin }: @@ -30,7 +30,7 @@ stdenv.mkDerivation { cmake/modules/LLDBStandalone.cmake ''; - nativeBuildInputs = [ cmake python which swig ]; + nativeBuildInputs = [ cmake python3 which swig ]; buildInputs = [ ncurses zlib libedit libxml2 llvm ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index c6d2c09c2df60..80acd3fa2fe1c 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -1,7 +1,7 @@ { stdenv , fetch , cmake -, python +, python3 , libffi , libbfd , libxml2 @@ -40,8 +40,8 @@ stdenv.mkDerivation ({ outputs = [ "out" "python" ] ++ optional enableSharedLibraries "lib"; - nativeBuildInputs = [ cmake python ] - ++ optional enableManpages python.pkgs.sphinx; + nativeBuildInputs = [ cmake python3 ] + ++ optional enableManpages python3.pkgs.sphinx; buildInputs = [ libxml2 libffi ]; @@ -120,7 +120,7 @@ stdenv.mkDerivation ({ ''; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib ''; postInstall = '' diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index 5ac9a7a2672ad..cc5dcfc160bc7 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3 , fixDarwinDylibNames , enableManpages ? false , enablePolly ? false # TODO: get this info from llvm (passthru?) @@ -19,8 +19,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - nativeBuildInputs = [ cmake python ] - ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + nativeBuildInputs = [ cmake python3 ] + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; buildInputs = [ libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index a7d4bcb869624..ae98940adeab8 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -1,10 +1,10 @@ -{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }: +{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5"; - nativeBuildInputs = [ cmake python llvm ]; + nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 621a246225d72..f5dbea58a7db9 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook -, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith +, 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 }: @@ -16,7 +16,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "0lb4kdh7j2fhfz8kd6iv5df7m3pikiryk1vvwsf87spc90n09q0w"; tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -42,12 +42,12 @@ let llvm-manpages = lowPrio (tools.llvm.override { enableManpages = true; - python = pkgs.python; # don't use python-boot + python3 = pkgs.python3; # don't use python-boot }); clang-manpages = lowPrio (tools.clang-unwrapped.override { enableManpages = true; - python = pkgs.python; # don't use python-boot + python3 = pkgs.python3; # don't use python-boot }); libclang = tools.clang-unwrapped.lib; @@ -126,7 +126,7 @@ let }); libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { compiler-rt = callPackage ./compiler-rt.nix { diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index f6f9970d7a6ec..f2cdd2f6f5fa5 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version , enableShared ? ! stdenv.hostPlatform.isMusl }: stdenv.mkDerivation { @@ -24,7 +24,7 @@ stdenv.mkDerivation { '' + lib.optionalString stdenv.hostPlatform.isMusl '' patchShebangs utils/cat_files.py ''; - nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python; + nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl python3; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix index 44687ead4d1c3..ace6ae812fded 100644 --- a/pkgs/development/compilers/llvm/7/lldb.nix +++ b/pkgs/development/compilers/llvm/7/lldb.nix @@ -10,7 +10,7 @@ , llvm , clang-unwrapped , perl -, python +, python3 , version , darwin }: @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v"; - nativeBuildInputs = [ cmake perl python which swig ]; + nativeBuildInputs = [ cmake perl python3 which swig ]; buildInputs = [ ncurses zlib libedit libxml2 llvm ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index c56bbfd0eab90..d7fb1fe4b93f3 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -2,7 +2,7 @@ , fetch , fetchpatch , cmake -, python +, python3 , libffi , libbfd , libpfm @@ -48,8 +48,8 @@ in stdenv.mkDerivation ({ outputs = [ "out" "python" ] ++ optional enableSharedLibraries "lib"; - nativeBuildInputs = [ cmake python ] - ++ optional enableManpages python.pkgs.sphinx; + nativeBuildInputs = [ cmake python3 ] + ++ optional enableManpages python3.pkgs.sphinx; buildInputs = [ libxml2 libffi ] ++ optional enablePFM libpfm; # exegesis @@ -141,7 +141,7 @@ in stdenv.mkDerivation ({ ''; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib ''; postInstall = '' diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 8c540e45b2860..8601f6d068099 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3 , fixDarwinDylibNames , enableManpages ? false , enablePolly ? false # TODO: get this info from llvm (passthru?) @@ -19,8 +19,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - nativeBuildInputs = [ cmake python ] - ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + nativeBuildInputs = [ cmake python3 ] + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; buildInputs = [ libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 344ff7256755a..9c0829146f723 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -1,10 +1,10 @@ -{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }: +{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: stdenv.mkDerivation { pname = "compiler-rt"; inherit version; src = fetch "compiler-rt" "0dqqf8f930l8gag4d9qjgn1n0pj0nbv2anviqqhdi1rkhas8z0hi"; - nativeBuildInputs = [ cmake python llvm ]; + nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index 36d7a14142b46..8b916e1cda7da 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook -, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith +, 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 }: @@ -16,7 +16,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "1qf3097bc5ia8p6cpmbx985rjr3yaah5s8fc0nv7pw742yv7jw8q"; tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -42,12 +42,12 @@ let llvm-manpages = lowPrio (tools.llvm.override { enableManpages = true; - python = pkgs.python; # don't use python-boot + python3 = pkgs.python3; # don't use python-boot }); clang-manpages = lowPrio (tools.clang-unwrapped.override { enableManpages = true; - python = pkgs.python; # don't use python-boot + python3 = pkgs.python3; # don't use python-boot }); libclang = tools.clang-unwrapped.lib; @@ -162,7 +162,7 @@ let }); libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { compiler-rt = callPackage ./compiler-rt.nix ({} // diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index 8ec1c419748d8..883d9c8776f33 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version , enableShared ? true }: stdenv.mkDerivation { @@ -25,7 +25,7 @@ stdenv.mkDerivation { patchShebangs utils/cat_files.py ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python; + ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix index 254933c82a098..75be5b993df3b 100644 --- a/pkgs/development/compilers/llvm/8/lldb.nix +++ b/pkgs/development/compilers/llvm/8/lldb.nix @@ -9,7 +9,7 @@ , libxml2 , llvm , clang-unwrapped -, python +, python3 , version , darwin }: @@ -30,7 +30,7 @@ stdenv.mkDerivation { cmake/modules/LLDBStandalone.cmake ''; - nativeBuildInputs = [ cmake python which swig ]; + nativeBuildInputs = [ cmake python3 which swig ]; buildInputs = [ ncurses zlib libedit libxml2 llvm ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc darwin.apple_sdk.frameworks.Foundation darwin.bootstrap_cmds darwin.apple_sdk.frameworks.Carbon darwin.apple_sdk.frameworks.Cocoa ]; diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index df3d6e796aa07..a9c4a6b0ba25e 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -1,7 +1,7 @@ { stdenv , fetch , cmake -, python +, python3 , libffi , libbfd , libpfm @@ -46,8 +46,8 @@ in stdenv.mkDerivation ({ outputs = [ "out" "python" ] ++ optional enableSharedLibraries "lib"; - nativeBuildInputs = [ cmake python ] - ++ optionals enableManpages [ python.pkgs.sphinx python.pkgs.recommonmark ]; + nativeBuildInputs = [ cmake python3 ] + ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; buildInputs = [ libxml2 libffi ] ++ optional enablePFM libpfm; # exegesis @@ -117,7 +117,7 @@ in stdenv.mkDerivation ({ ''; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib ''; postInstall = '' diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index 1b779b118a7f8..5f89c3dc3b712 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3 , fixDarwinDylibNames , enableManpages ? false , enablePolly ? false # TODO: get this info from llvm (passthru?) @@ -19,8 +19,8 @@ let mv clang-tools-extra-* $sourceRoot/tools/extra ''; - nativeBuildInputs = [ cmake python ] - ++ stdenv.lib.optional enableManpages python.pkgs.sphinx; + nativeBuildInputs = [ cmake python3 ] + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; buildInputs = [ libxml2 llvm ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix index 75d0614b51429..037953bb23d8c 100644 --- a/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -1,10 +1,10 @@ -{ stdenv, version, fetch, cmake, python, llvm, libcxxabi }: +{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; src = fetch pname "0xwh79g3zggdabxgnd0bphry75asm1qz7mv3hcqihqwqr6aspgy2"; - nativeBuildInputs = [ cmake python llvm ]; + nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; NIX_CFLAGS_COMPILE = [ diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index c9e8ce91f0ce6..38ab7794018f5 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -1,5 +1,5 @@ { lowPrio, newScope, pkgs, stdenv, cmake, libstdcxxHook -, libxml2, python, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith +, 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 }: @@ -16,7 +16,7 @@ let clang-tools-extra_src = fetch "clang-tools-extra" "01vgzd4k1q93nfs8gyl83mjlc4x0qsgfqw32lacbjzdxg0mdfvxj"; tools = stdenv.lib.makeExtensible (tools: let - callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); mkExtraBuildCommands = cc: '' rsrc="$out/resource-root" mkdir "$rsrc" @@ -42,12 +42,12 @@ let llvm-manpages = lowPrio (tools.llvm.override { enableManpages = true; - python = pkgs.python; # don't use python-boot + python3 = pkgs.python3; # don't use python-boot }); clang-manpages = lowPrio (tools.clang-unwrapped.override { enableManpages = true; - python = pkgs.python; # don't use python-boot + python3 = pkgs.python3; # don't use python-boot }); libclang = tools.clang-unwrapped.lib; @@ -162,7 +162,7 @@ let }); libraries = stdenv.lib.makeExtensible (libraries: let - callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python isl release_version version fetch; }); + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); in { compiler-rt = callPackage ./compiler-rt.nix ({} // diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix index 1166c7bd76c91..9e3525574d5c6 100644 --- a/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetch, cmake, python, libcxxabi, fixDarwinDylibNames, version +{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version , enableShared ? true }: stdenv.mkDerivation { @@ -21,7 +21,7 @@ stdenv.mkDerivation { patchShebangs utils/cat_files.py ''; nativeBuildInputs = [ cmake ] - ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python; + ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3; buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/pkgs/development/compilers/llvm/9/lldb.nix index 64f111502cc5c..506fc1c3e5058 100644 --- a/pkgs/development/compilers/llvm/9/lldb.nix +++ b/pkgs/development/compilers/llvm/9/lldb.nix @@ -9,7 +9,7 @@ , libxml2 , llvm , clang-unwrapped -, python +, python3 , version , darwin , lit @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./lldb-procfs.patch ]; - nativeBuildInputs = [ cmake python which swig lit ]; + nativeBuildInputs = [ cmake python3 which swig lit ]; buildInputs = [ ncurses zlib diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix index acd3ec92897f6..2cdc5a5fd0669 100644 --- a/pkgs/development/compilers/llvm/9/llvm.nix +++ b/pkgs/development/compilers/llvm/9/llvm.nix @@ -1,7 +1,7 @@ { stdenv , fetch , cmake -, python +, python3 , libffi , libbfd , libpfm @@ -46,8 +46,8 @@ in stdenv.mkDerivation (rec { outputs = [ "out" "python" ] ++ optional enableSharedLibraries "lib"; - nativeBuildInputs = [ cmake python ] - ++ optionals enableManpages [ python.pkgs.sphinx python.pkgs.recommonmark ]; + nativeBuildInputs = [ cmake python3 ] + ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; buildInputs = [ libxml2 libffi ] ++ optional enablePFM libpfm; # exegesis @@ -134,7 +134,7 @@ in stdenv.mkDerivation (rec { ''; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib ''; postInstall = '' diff --git a/pkgs/development/compilers/mlton/20130715.nix b/pkgs/development/compilers/mlton/20130715.nix index 207ed8f29bc75..52bb0a0775cf1 100644 --- a/pkgs/development/compilers/mlton/20130715.nix +++ b/pkgs/development/compilers/mlton/20130715.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { chmod u+x $(pwd)/../${usr_prefix}/bin/mlton # So the builder runs the binary compiler with gmp. - export LD_LIBRARY_PATH=${gmp.out}/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=${gmp.out}/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH '' + stdenv.lib.optionalString stdenv.isLinux '' # Patch ELF interpreter. diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index bdb16c9220719..316ddbfcb6079 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "nim"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { url = "https://nim-lang.org/download/${pname}-${version}.tar.xz"; - sha256 = "1q5fx9g40bk4ajghi856w5l34fmrl7avq5j6p0dr2xa4l52ib149"; + sha256 = "1cv6bxc7w21455c0pv0r2h64ljyzw266jsk1fsgiiyk2rx8mfkhk"; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix index b520a5e703c89..87af63c671a56 100644 --- a/pkgs/development/compilers/picat/default.nix +++ b/pkgs/development/compilers/picat/default.nix @@ -1,13 +1,16 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, zlib }: stdenv.mkDerivation { - name = "picat-1.9-4"; + pname = "picat"; + version = "2.8-2"; src = fetchurl { - url = http://picat-lang.org/download/picat19_src.tar.gz; - sha256 = "0wvl95gf4pjs93632g4wi0mw1glzzhjp9g4xg93ll2zxggbxibli"; + url = http://picat-lang.org/download/picat28_src.tar.gz; + sha256 = "10hf2fxxbpq28gi39icr8c9wafdiy9ddfkk6l4rx7kkqyrdi7n85"; }; + buildInputs = [ zlib ]; + ARCH = if stdenv.hostPlatform.system == "i686-linux" then "linux32" else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64" else throw "Unsupported system"; @@ -16,12 +19,12 @@ stdenv.mkDerivation { buildPhase = '' cd emu - make -f Makefile.picat.$ARCH + make -f Makefile.$ARCH ''; installPhase = '' mkdir -p $out/bin - cp picat_$ARCH $out/bin/picat + cp picat $out/bin/picat ''; meta = { diff --git a/pkgs/development/compilers/rust/1_38_0.nix b/pkgs/development/compilers/rust/1_38_0.nix index be43e074228d4..13d2139bffdcd 100644 --- a/pkgs/development/compilers/rust/1_38_0.nix +++ b/pkgs/development/compilers/rust/1_38_0.nix @@ -1,6 +1,7 @@ import ./default.nix { rustcVersion = "1.38.0"; rustcSha256 = "101dlpsfkq67p0hbwx4acqq6n90dj4bbprndizpgh1kigk566hk4"; + enableRustcDev = false; # Note: the version MUST be one version prior to the version we're # building diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 60e31c6def474..da3421a987dab 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -1,5 +1,6 @@ { rustcVersion , rustcSha256 +, enableRustcDev ? true , bootstrapVersion , bootstrapHashes , selectRustPackage @@ -70,6 +71,7 @@ rustc = self.callPackage ./rustc.nix ({ version = rustcVersion; sha256 = rustcSha256; + inherit enableRustcDev; # Use boot package set to break cycle rustPlatform = bootRustPlatform; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index e5c8a709a900f..b0c26f3dffdfb 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -4,6 +4,7 @@ , pkgconfig, openssl , which, libffi , withBundledLLVM ? false +, enableRustcDev ? true , version , sha256 }: @@ -132,9 +133,15 @@ in stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; setOutputFlags = false; - # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so - # and thus a transitive dependency on ncurses - postInstall = '' + postInstall = stdenv.lib.optionalString enableRustcDev '' + # install rustc-dev components. Necessary to build rls, clippy... + python x.py dist rustc-dev + tar xf build/dist/rustc-dev*tar.gz + cp -r rustc-dev*/rustc-dev*/lib/* $out/lib/ + + '' + '' + # remove references to llvm-config in lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so + # and thus a transitive dependency on ncurses find $out/lib -name "*.so" -type f -exec remove-references-to -t ${llvmShared} '{}' '+' ''; diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index e3d9ee98635b8..79173871095cd 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "sbcl"; - version = "1.5.6"; + version = "2.0.1"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${pname}-${version}-source.tar.bz2"; - sha256 = "10z43dc29p7s8dl3jixklhmzqfp7gcm3fccjdfd36qqhyfxqxx3a"; + sha256 = "1s2nrq26czl7f8jpa9qjpmdqbzvldvf4c7c1z1c438v4f85xcl44"; }; buildInputs = [texinfo]; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 23e6c64f3ffcb..0f71ed79e7ee3 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { checkPhase = '' while IFS= read -r -d ''' dir do - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/$dir + LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/$dir export LD_LIBRARY_PATH done < <(find . -type d -print0) diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index cea464ad5d279..97f501f41db75 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { preCheck = '' # Make `libgcc_s.so' visible for `pthread_cancel'. export LD_LIBRARY_PATH=\ - "$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH" + "$(dirname $(echo ${stdenv.cc.cc.lib}/lib*/libgcc_s.so))''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/interpreters/elixir/1.10.nix b/pkgs/development/interpreters/elixir/1.10.nix new file mode 100644 index 0000000000000..f9e1451354d63 --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.10.nix @@ -0,0 +1,9 @@ +{ mkDerivation }: + +# How to obtain `sha256`: +# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz +mkDerivation { + version = "1.10.0"; + sha256 = "1fz22c2jqqm2jvzxar11bh1djg3kqdn5rbxdddlz0cv6mfz7hvgv"; + minimumOTPVersion = "21"; +} diff --git a/pkgs/development/interpreters/elixir/1.5.nix b/pkgs/development/interpreters/elixir/1.5.nix deleted file mode 100644 index 229c42d9f7b24..0000000000000 --- a/pkgs/development/interpreters/elixir/1.5.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ mkDerivation }: - -mkDerivation { - version = "1.5.3"; - sha256 = "00kgqcn9g6vflc551wniz9pwv7pszyf8v6smpkqs50j3kbliihy5"; - minimumOTPVersion = "18"; -} diff --git a/pkgs/development/interpreters/pure/default.nix b/pkgs/development/interpreters/pure/default.nix index 9c35fc3549765..764ee241aff3a 100644 --- a/pkgs/development/interpreters/pure/default.nix +++ b/pkgs/development/interpreters/pure/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-release" ]; doCheck = true; checkPhase = '' - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${llvm}/lib make check + LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${llvm}/lib make check ''; postInstall = '' wrapProgram $out/bin/pure --prefix LD_LIBRARY_PATH : ${llvm}/lib diff --git a/pkgs/development/interpreters/python/cpython/2.7/boot.nix b/pkgs/development/interpreters/python/cpython/2.7/boot.nix deleted file mode 100644 index 0b9ddc0bb3457..0000000000000 --- a/pkgs/development/interpreters/python/cpython/2.7/boot.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ stdenv, fetchurl, configd, CF, coreutils }: - -with stdenv.lib; - -let - - mkPaths = paths: { - C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; - LIBRARY_PATH = makeLibraryPath paths; - }; - -in - -stdenv.mkDerivation rec { - pname = "python-boot"; - version = "2.7.12"; - libPrefix = "python2.7"; - - src = fetchurl { - url = "https://www.python.org/ftp/python/2.7.12/Python-${version}.tar.xz"; - sha256 = "0y7rl603vmwlxm6ilkhc51rx2mfj14ckcz40xxgs0ljnvlhp30yp"; - }; - - inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; - - LDFLAGS = optionalString (!stdenv.isDarwin) "-lgcc_s"; - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; - - buildInputs = optionals stdenv.isDarwin [ CF configd ]; - - patches = - [ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff. - ./search-path.patch - - # Python recompiles a Python if the mtime stored *in* the - # pyc/pyo file differs from the mtime of the source file. This - # doesn't work in Nix because Nix changes the mtime of files in - # the Nix store to 1. So treat that as a special case. - ./nix-store-mtime.patch - - # patch python to put zero timestamp into pyc - # if DETERMINISTIC_BUILD env var is set - ./deterministic-build.patch - ]; - - # Hack hack hack to stop shit from failing from a missing _scproxy on Darwin. Since - # we only use this python for bootstrappy things, it doesn't really matter if it - # doesn't have perfect proxy support in urllib :) this just makes it fall back on env - # vars instead of attempting to read the proxy configuration automatically, so not a - # huge loss even if for whatever reason we did want proxy support. - postPatch = '' - substituteInPlace Lib/urllib.py --replace "if sys.platform == 'darwin'" "if False" - ''; - - DETERMINISTIC_BUILD = 1; - - preConfigure = '' - # Purity. - for i in /usr /sw /opt /pkg; do - substituteInPlace ./setup.py --replace $i /no-such-path - done - '' + optionalString (stdenv ? cc && stdenv.cc.libc != null) '' - for i in Lib/plat-*/regen; do - substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/ - done - '' + optionalString stdenv.isDarwin '' - substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' - substituteInPlace Lib/multiprocessing/__init__.py \ - --replace 'os.popen(comm)' 'os.popen("${coreutils}/bin/nproc")' - ''; - - configureFlags = [ "--enable-shared" "--with-threads" "--enable-unicode=ucs4" ] - ++ optionals stdenv.isCygwin [ "ac_cv_func_bind_textdomain_codeset=yes" ] - ++ optionals stdenv.isDarwin [ "--disable-toolbox-glue" ]; - - postInstall = - '' - ln -s $out/share/man/man1/{python2.7.1.gz,python.1.gz} - - rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev - ''; - - enableParallelBuilding = true; - - passthru.pkgs = builtins.throw "python-boot does not support packages, this package is only intended for bootstrapping." {}; - - meta = { - homepage = http://python.org; - description = "A high-level dynamically-typed programming language"; - longDescription = '' - Python is a remarkably powerful dynamic programming language that - is used in a wide variety of application domains. Some of its key - distinguishing features include: clear, readable syntax; strong - introspection capabilities; intuitive object orientation; natural - expression of procedural code; full modularity, supporting - hierarchical packages; exception-based error handling; and very - high level dynamic data types. - ''; - license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ lnl7 domenkozar ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index e6b3dff433b3a..77b37c5f5c396 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -11,7 +11,7 @@ , tcl ? null, tk ? null, tix ? null, xlibsWrapper ? null, libX11 ? null, x11Support ? false , zlib , self -, CF, configd, coreutils +, configd, coreutils , python-setup-hook # Some proprietary libs assume UCS2 unicode, especially on darwin :( , ucsEncoding ? 4 @@ -180,7 +180,7 @@ let ++ optional stdenv.hostPlatform.isCygwin expat ++ [ db gdbm ncurses sqlite readline ] ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] - ++ optionals stdenv.isDarwin ([ CF ] ++ optional (configd != null) configd); + ++ optional (stdenv.isDarwin && configd != null) configd; nativeBuildInputs = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc buildPackages.python ]; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index e75bd0a09875e..70eff43daf5cf 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -11,7 +11,7 @@ , tcl ? null, tk ? null, tix ? null, libX11 ? null, xorgproto ? null, x11Support ? false , zlib , self -, CF, configd +, configd , python-setup-hook , nukeReferences # For the Python package set @@ -57,10 +57,10 @@ let pythonForBuild ]; - buildInputs = filter (p: p != null) [ + buildInputs = filter (p: p != null) ([ zlib bzip2 expat lzma libffi gdbm sqlite readline ncurses openssl ] ++ optionals x11Support [ tcl tk libX11 xorgproto ] - ++ optionals stdenv.isDarwin [ CF configd ]; + ++ optionals stdenv.isDarwin [ configd ]); hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false); diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 4811c8ec48e8b..b4326235c4e7b 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -57,7 +57,7 @@ in { suffix = ""; }; sha256 = "0hds28cg226m8j8sr394nm9yc4gxhvlv109w0avsf2mxrlrz0hsd"; - inherit (darwin) CF configd; + inherit (darwin) configd; inherit passthruFun; }; @@ -70,7 +70,7 @@ in { suffix = ""; }; sha256 = "0jdh9pvx6m6lfz2liwvvhn7vks7qrysqgwn517fkpxb77b33fjn2"; - inherit (darwin) CF configd; + inherit (darwin) configd; inherit passthruFun; }; @@ -83,7 +83,7 @@ in { suffix = ""; }; sha256 = "1pj0mz1xl27khi250p29c0y99vxg662js8zp71aprkf8i8wkr0qa"; - inherit (darwin) CF configd; + inherit (darwin) configd; inherit passthruFun; }; @@ -96,7 +96,7 @@ in { suffix = ""; }; sha256 = "0gskry19ylw91p38pdq36qcgk6h3x5i4ia0ik977kw2943kwr8jm"; - inherit (darwin) CF configd; + inherit (darwin) configd; inherit passthruFun; }; @@ -109,7 +109,7 @@ in { suffix = ""; }; sha256 = "1s4lwn5vzsajlc88m6hkghsvnjw4d00l2dsgng0m2w6vyqbl32bm"; - inherit (darwin) CF configd; + inherit (darwin) configd; inherit passthruFun; }; @@ -122,7 +122,7 @@ in { suffix = "a2"; }; sha256 = "02a301bdcldin05ksdg8xw8xr6gdkpf73p0cabvn9rdl6yhkr3q8"; - inherit (darwin) CF configd; + inherit (darwin) configd; inherit passthruFun; }; @@ -136,6 +136,7 @@ in { ncurses = null; gdbm = null; sqlite = null; + configd = null; stripConfig = true; stripIdlelib = true; stripTests = true; diff --git a/pkgs/development/libraries/boxfort/default.nix b/pkgs/development/libraries/boxfort/default.nix index 95c1afd090f4a..fb6e735c46e74 100644 --- a/pkgs/development/libraries/boxfort/default.nix +++ b/pkgs/development/libraries/boxfort/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = '' - export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; outputs = [ "dev" "out" ]; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index ecf991cb59ce6..e32ec16957924 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$PWD/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/criterion/default.nix b/pkgs/development/libraries/criterion/default.nix index c2721d3839a11..3dc4b4624048f 100644 --- a/pkgs/development/libraries/criterion/default.nix +++ b/pkgs/development/libraries/criterion/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCTESTS=ON" ]; doCheck = true; preCheck = '' - export LD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; checkTarget = "criterion_tests test"; diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 6cd464e55390b..2cf611eed2752 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; preBuild = '' - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pwd`/Cutelyst:`pwd`/EventLoopEPoll" + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/Cutelyst:`pwd`/EventLoopEPoll" ''; postBuild = '' diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 21f63e07335df..425346df816ea 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ''} ${stdenv.lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}`pwd`/lib # Removing tests depending on charset conversion substituteInPlace ../test/Makefile --replace "conversions.sh" "" rm -f ../tests/bugfixes/redmine/test_issue_460.py diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 9c2da3c5b6952..0ecbb35c16705 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, nixosTests, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl , docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3 -, gobject-introspection, doCheck ? false, makeWrapper }: +, gobject-introspection, doCheck ? false, makeWrapper +, fetchpatch +}: let pname = "gdk-pixbuf"; @@ -16,6 +18,12 @@ in stdenv.mkDerivation rec { patches = [ # Move installed tests to a separate output ./installed-tests-path.patch + # Temporary until the fix is released. + (fetchpatch { + name = "tests-circular-table.patch"; + url = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/merge_requests/59.diff"; + sha256 = "0kaflac3mrh6031hwxk7j9fhli775hc503818h8zfl6b28zyn93f"; + }) ]; outputs = [ "out" "dev" "man" "devdoc" "installedTests" ]; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 63a773522a0de..86f73e23d50c8 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.62.2"; + version = "2.62.3"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0i2mw75297ql72h47vyvff3hqa0kcmqybblj52fqrarb0kfbhi06"; + sha256 = "1xvzixzwwh8wk8f79qbm2gl7hp3hj1a7skv281v5qsx74dpzi8cc"; }; patches = [ diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 4a7d6cce90b07..1875621323001 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { checkInputs = [ tzdata libxml2 desktop-file-utils shared-mime-info ]; preCheck = optionalString doCheck '' - export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${pname}-${version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" export XDG_CACHE_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP" diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 32be2205bcc12..458745694bcc0 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -97,6 +97,15 @@ stdenv.mkDerivation ({ ./CVE-2018-11236.patch # https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f51c8367685dc888a02f7304c729ed5277904aff ./CVE-2018-11237.patch + + # Remove after upgrading to glibc 2.28+ + # Change backported from upstream + # https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=9c79cec8cd2a6996a73aa83d79b360ffd4bebde6 + ./fix-out-of-bounds-access-in-findidxwc.patch + + # Remove after upgrading to glibc 2.28+ + # https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=21526a507df8f1b2e37492193a754534d8938c0b + ./fix-out-of-bounds-access-in-ibm-1390-converter.patch ] ++ lib.optionals stdenv.isx86_64 [ ./fix-x64-abi.patch diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 1a17595a1a32f..150681ebda184 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -49,20 +49,18 @@ callPackage ./common.nix { inherit stdenv; } { ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "pie"; NIX_CFLAGS_COMPILE = stdenv.lib.concatStringsSep " " - (if !stdenv.hostPlatform.isMusl - # TODO: This (returning a string or `null`, instead of a list) is to - # not trigger a mass rebuild due to the introduction of the - # musl-specific flags below. - # At next change to non-musl glibc builds, remove this `then` - # and the above condition, instead keeping only the `else` below. - then (stdenv.lib.optionals withGd gdCflags) - else - (builtins.concatLists [ - (stdenv.lib.optionals withGd gdCflags) - # Fix -Werror build failure when building glibc with musl with GCC >= 8, see: - # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798 - (stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias") - ])); + (builtins.concatLists [ + (stdenv.lib.optionals withGd gdCflags) + # Fix -Werror build failure when building glibc with musl with GCC >= 8, see: + # https://github.com/NixOS/nixpkgs/pull/68244#issuecomment-544307798 + (stdenv.lib.optional stdenv.hostPlatform.isMusl "-Wno-error=attribute-alias") + (stdenv.lib.optionals ((stdenv.hostPlatform != stdenv.buildPlatform) || stdenv.hostPlatform.isMusl) [ + # Ignore "error: '__EI___errno_location' specifies less restrictive attributes than its target '__errno_location'" + # New warning as of GCC 9 + # Same for musl: https://github.com/NixOS/nixpkgs/issues/78805 + "-Wno-error=missing-attributes" + ]) + ]); # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for # any program we run, because the gcc will have been placed at a new diff --git a/pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-findidxwc.patch b/pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-findidxwc.patch new file mode 100644 index 0000000000000..2d1ac0bc3afb6 --- /dev/null +++ b/pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-findidxwc.patch @@ -0,0 +1,26 @@ +diff -ur glibc-2.27/locale/weightwc.h glibc-2.27-patched/locale/weightwc.h +--- glibc-2.27/locale/weightwc.h 2018-02-02 01:17:18.000000000 +0900 ++++ glibc-2.27-patched/locale/weightwc.h 2020-01-12 04:54:16.044440602 +0900 +@@ -94,19 +94,19 @@ + if (cp[cnt] != usrc[cnt]) + break; + +- if (cnt < nhere - 1) ++ if (cnt < nhere - 1 || cnt == len) + { + cp += 2 * nhere; + continue; + } + +- if (cp[nhere - 1] > usrc[nhere -1]) ++ if (cp[nhere - 1] > usrc[nhere - 1]) + { + cp += 2 * nhere; + continue; + } + +- if (cp[2 * nhere - 1] < usrc[nhere -1]) ++ if (cp[2 * nhere - 1] < usrc[nhere - 1]) + { + cp += 2 * nhere; + continue; diff --git a/pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-ibm-1390-converter.patch b/pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-ibm-1390-converter.patch new file mode 100644 index 0000000000000..8b560566a4918 --- /dev/null +++ b/pkgs/development/libraries/glibc/fix-out-of-bounds-access-in-ibm-1390-converter.patch @@ -0,0 +1,35 @@ +From 21526a507df8f1b2e37492193a754534d8938c0b Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@suse.de> +Date: Tue, 24 Jul 2018 14:08:34 +0200 +Subject: [PATCH] Fix out-of-bounds access in IBM-1390 converter (bug 23448) + +The IBM-1390 converter can consume/produce two UCS4 characters in each +loop. +--- + ChangeLog | 6 ++++++ + iconvdata/ibm1364.c | 2 ++ + 2 files changed, 8 insertions(+) + +diff --git a/iconvdata/ibm1364.c b/iconvdata/ibm1364.c +index b833273..517fe60 100644 +--- a/iconvdata/ibm1364.c ++++ b/iconvdata/ibm1364.c +@@ -150,6 +150,7 @@ enum + #define MIN_NEEDED_INPUT MIN_NEEDED_FROM + #define MAX_NEEDED_INPUT MAX_NEEDED_FROM + #define MIN_NEEDED_OUTPUT MIN_NEEDED_TO ++#define MAX_NEEDED_OUTPUT MAX_NEEDED_TO + #define LOOPFCT FROM_LOOP + #define BODY \ + { \ +@@ -296,6 +297,7 @@ enum + + /* Next, define the other direction. */ + #define MIN_NEEDED_INPUT MIN_NEEDED_TO ++#define MAX_NEEDED_INPUT MAX_NEEDED_TO + #define MIN_NEEDED_OUTPUT MIN_NEEDED_FROM + #define MAX_NEEDED_OUTPUT MAX_NEEDED_FROM + #define LOOPFCT TO_LOOP +-- +2.9.3 + diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index abcd3abaf3097..dfec171f1dbcb 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; preBuild = '' - export LD_LIBRARY_PATH=$(pwd):$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=unknown-warning-option"; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 8adb6264e3757..71a427eb2a667 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -2,7 +2,7 @@ let pname = "gspell"; - version = "1.8.2"; + version = "1.8.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1miybm1z5cl91i25l7mfqlxhv7j8yy8rcgi0s1bgbb2vm71rb4dv"; + sha256 = "1s1dns070pz8dg04ppshdbx1r86n9406vkxcfs8hdghn0bfi9ras"; }; propagatedBuildInputs = [ enchant2 ]; # required for pkgconfig diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index c70e898a47d8c..e69e584b23dca 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, stdenv, autoreconfHook -, perl, bison2, flex, pkgconfig, glib, libxml2, libintl, libunwind +, perl, bison, flex, pkgconfig, glib, libxml2, libintl, libunwind }: stdenv.mkDerivation rec { @@ -15,12 +15,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook flex perl pkgconfig libintl bison2 glib ]; + nativeBuildInputs = [ autoreconfHook flex perl pkgconfig libintl bison glib ]; buildInputs = stdenv.lib.optional stdenv.isDarwin libunwind; propagatedBuildInputs = [ glib libxml2 ]; patches = [ (fetchpatch { + url = "https://github.com/flathub/com.xnview.XnRetro/raw/fec03bbe240f45aa10d7d4eea9d6f066d9b6ac9c/gstreamer-0.10.36-bison3.patch"; + sha256 = "05aarg3yzl5jx3z5838ixv392g0r3kbsi2vfqniaxmidhnfzij2y"; + }) + (fetchpatch { url = "https://github.com/GStreamer/common/commit/03a0e5736761a72d4ed880e8c485bbf9e4a8ea47.patch"; sha256 = "0rin3x01yy78ky3smmhbwlph18hhym18q4x9w6ddiqajg5lk4xhm"; extraPrefix = "common/"; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 60432614433bf..f0d5d9d9bf2e2 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.12"; + version = "3.24.13"; 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 = "10xyyhlfb0yk4hglngxh2zsv9xrxkqv343df8h01dvagc6jyp10k"; + sha256 = "1a9hi7k59q0kqx0n3xhsk1ly23w9g9ncllnay1756g0yrww5qxsc"; }; patches = [ @@ -77,6 +77,9 @@ stdenv.mkDerivation rec { # 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 ./patches/3.0-darwin-x11.patch + # 3.24.13 failed to ship a header file + # https://gitlab.gnome.org/GNOME/gtk/issues/2279 + ./patches/missing-header.patch ]; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/development/libraries/gtk/patches/missing-header.patch b/pkgs/development/libraries/gtk/patches/missing-header.patch new file mode 100644 index 0000000000000..49eb51dae9af7 --- /dev/null +++ b/pkgs/development/libraries/gtk/patches/missing-header.patch @@ -0,0 +1,56 @@ +diff --git a/gdk/quartz/gdkquartz-gtk-only.h b/gdk/quartz/gdkquartz-gtk-only.h +new file mode 100644 +index 0000000000000000000000000000000000000000..193686c041971e4d8b3a1bc6bb2a79d8ba6e9a70 +--- /dev/null ++++ b/gdk/quartz/gdkquartz-gtk-only.h +@@ -0,0 +1,50 @@ ++/* gdkquartz-gtk-only.h ++ * ++ * Copyright (C) 2005-2007 Imendio AB ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++#ifndef __GDK_QUARTZ_GTK_ONLY_H__ ++#define __GDK_QUARTZ_GTK_ONLY_H__ ++ ++#if !(defined (GTK_COMPILATION) || defined (GDK_COMPILATION)) ++#error "This API is for use only in Gtk internal code." ++#endif ++ ++#include <Appkit/Appkit.h> ++#include <gdk/gdk.h> ++#include <gdk/quartz/gdkquartz.h> ++ ++/* Drag and Drop/Clipboard */ ++GDK_AVAILABLE_IN_ALL ++GdkAtom gdk_quartz_pasteboard_type_to_atom_libgtk_only (NSString *type); ++GDK_AVAILABLE_IN_ALL ++NSString *gdk_quartz_target_to_pasteboard_type_libgtk_only (const gchar *target); ++GDK_AVAILABLE_IN_ALL ++NSString *gdk_quartz_atom_to_pasteboard_type_libgtk_only (GdkAtom atom); ++ ++/* Utilities */ ++GDK_AVAILABLE_IN_ALL ++NSImage *gdk_quartz_pixbuf_to_ns_image_libgtk_only (GdkPixbuf *pixbuf); ++GDK_AVAILABLE_IN_ALL ++NSEvent *gdk_quartz_event_get_nsevent (GdkEvent *event); ++ ++/* Window */ ++GDK_AVAILABLE_IN_ALL ++NSWindow *gdk_quartz_window_get_nswindow (GdkWindow *window); ++GDK_AVAILABLE_IN_ALL ++NSView *gdk_quartz_window_get_nsview (GdkWindow *window); ++ ++#endif diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 72158e186ac2a..7b06cc8ad4e64 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { # Hack to be able to run the test, broken because we use # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install preBuild = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="`pwd`/src/lib_json:$DYLD_LIBRARY_PATH" + export DYLD_LIBRARY_PATH="`pwd`/src/lib_json''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" '' else '' - export LD_LIBRARY_PATH="`pwd`/src/lib_json:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="`pwd`/src/lib_json''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; nativeBuildInputs = [ cmake python ]; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index e3927f34fab93..04b4e409b9bd4 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -10,13 +10,13 @@ assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { pname = "libarchive"; - version = "3.4.0"; + version = "3.4.1"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${version}"; - sha256 = "063f5bw9qmksj3iy6094qxwawx174cx00q1fg6l698wqw7xn8ihq"; + sha256 = "0g0kzfl01zy1aabr5jcrh8480mb16vh3pacdhg6mm2bdv2f5w8z1"; }; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index 97532d616189d..b83984e23c8e4 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libedit"; - version = "20191025-3.1"; + version = "20191231-3.1"; src = fetchurl { url = "https://thrysoee.dk/editline/${pname}-${version}.tar.gz"; - sha256 = "0fdznw6fklis39xqk30ihw8dl8kdw9fzq1z42jmbyy6lc1k07zvd"; + sha256 = "0wch48nml28jj6ild889745dsg2agm7mpvrmbl1gi98nw6vjrf6v"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libtins/default.nix b/pkgs/development/libraries/libtins/default.nix index c90cff31677b1..60bb092c6fa4b 100644 --- a/pkgs/development/libraries/libtins/default.nix +++ b/pkgs/development/libraries/libtins/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD${placeholder "out"}/lib - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$PWD${placeholder "out"}/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD${placeholder "out"}/lib + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD${placeholder "out"}/lib ''; checkTarget = "tests test"; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 57a7294c887d1..42515b7373c18 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ] ++ lib.optional pythonSupport "py" ++ lib.optional (enableStatic && enableShared) "static"; - propagatedBuildOutputs = [ "out" "bin" ] ++ lib.optional pythonSupport "py"; buildInputs = lib.optional pythonSupport python ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 761d6594bd01e..c041507b2ec59 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let - version = "19.3.1"; + version = "19.3.2"; branch = versions.major version; in @@ -42,7 +42,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "0ndfpqry08s74yw4x3ydyhim6v4ywg0b4yhaazq7zaankjv1v5fd"; + sha256 = "1hg1gvcwvayksrdh9z8rfz66h3z1ffspmm2qgyy2nd8n8qrfwfjf"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix index f3e8742bb2077..52dbdc1057500 100644 --- a/pkgs/development/libraries/odpic/default.nix +++ b/pkgs/development/libraries/odpic/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: let - version = "3.2.1"; + version = "3.3.0"; libPath = stdenv.lib.makeLibraryPath [ oracle-instantclient.lib ]; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "oracle"; repo = "odpi"; rev = "v${version}"; - sha256 = "1f9gznc7h73cgx32p55rkhzla6l7l9dg53ilwh6zdgdqlp7n018i"; + sha256 = "0qyfpincifz2vgicjd4q3rk563sg7927xja53rz3l7zv54wp9k62"; }; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ]; diff --git a/pkgs/development/libraries/orcania/default.nix b/pkgs/development/libraries/orcania/default.nix index bc27011c58875..2f8765f9a7259 100644 --- a/pkgs/development/libraries/orcania/default.nix +++ b/pkgs/development/libraries/orcania/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = '' - export LD_LIBRARY_PATH="$(pwd):$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" ''; 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 25953949eb76a..379f5b3d80e0b 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="`pwd`/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" configureFlags+=" -docdir $out/share/doc/${name} -plugindir $out/lib/qt4/plugins diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index bc23d0f9cafe1..930c59d347b14 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -164,7 +164,7 @@ stdenv.mkDerivation { setOutputFlags = false; preConfigure = '' - export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ${lib.optionalString (compareVersion "5.9.0" < 0) '' # We need to set LD to CXX or otherwise we get nasty compile errors export LD=$CXX diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 542afdd55da02..1133623483aff 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -2,7 +2,7 @@ , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel , fontconfig, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake -, bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby +, bison, flex, gdb, gperf, perl, pkgconfig, python2, ruby , darwin , flashplayerFix ? false }: @@ -31,7 +31,7 @@ qtModule { ++ optionals (stdenv.isDarwin) (with darwin; with apple_sdk.frameworks; [ ICU OpenGL ]) ++ optional usingAnnulenWebkitFork hyphen; nativeBuildInputs = [ - bison2 flex gdb gperf perl pkgconfig python2 ruby + bison flex gdb gperf perl pkgconfig python2 ruby ] ++ optional usingAnnulenWebkitFork cmake; cmakeFlags = optionals usingAnnulenWebkitFork ([ "-DPORT=Qt" ] diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index 529d361f206f0..7e006236080aa 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "quickder"; - version = "1.2-6"; + version = "1.3.0"; src = fetchFromGitHub { - sha256 = "00wifjydgmqw2i5vmr049visc3shjqccgzqynkmmhkjhs86ghzr6"; + sha256 = "15lxv8vcjnsjxg7ywcac5p6mj5vf5pxq1219yap653ci4f1liqfr"; rev = "version-${version}"; owner = "vanrein"; repo = "quick-der"; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 36576de056317..89f3aa94247b9 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -30,9 +30,9 @@ stdenv.mkDerivation { ]; preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/lib + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}`pwd`/lib '' else '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/lib '' + '' # Prevent tests from using all cores export OMP_NUM_THREADS=2 diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index bff0d9a85fa2c..fda902f320c9b 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # Run single threaded export OMP_NUM_THREADS=1 - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix index c6bb2afc2705b..9825c0c403551 100644 --- a/pkgs/development/libraries/seasocks/default.nix +++ b/pkgs/development/libraries/seasocks/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seasocks"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "mattgodbolt"; repo = pname; rev = "v${version}"; - sha256 = "1vzdhp61bq2bddz7kkpygdq5adxdspjw1q6a03j6qyyimapblrg8"; + sha256 = "1c2gc0k9wgbgn7y7wmq2ylp0gvdbmagc1x8c4jwbsncl1gy6x4g2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix index 51583fdbbcd65..b19272774559a 100644 --- a/pkgs/development/libraries/spdk/default.nix +++ b/pkgs/development/libraries/spdk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spdk"; - version = "19.10"; + version = "19.10.1"; src = fetchFromGitHub { owner = "spdk"; repo = "spdk"; rev = "v${version}"; - sha256 = "16v2vswn3rnnj7ak5w5rsak6r8f9b85gyhyll4ac1k4xpyj488hj"; + sha256 = "1fajcc4c09p6wcfw08k0x4x7v8yh0ghq94zhs5d4g9563p2va6ab"; }; patches = [ ./spdk-dpdk-meson.patch ]; diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index 129d57904d1ee..a906939f529b0 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libsrtp"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "cisco"; repo = "libsrtp"; rev = "v${version}"; - sha256 = "1ac7xs1djb03j131f1gmqyfmrplblid9qqyxahs0shdy707r5ll6"; + sha256 = "1f7i3jdh1wzdv7zjlz7gs3xw5jqig9zw8z9awsqqcp54f94xdpvd"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix deleted file mode 100644 index febadc2d6ac88..0000000000000 --- a/pkgs/development/libraries/v8/3.14.nix +++ /dev/null @@ -1,86 +0,0 @@ -# This old version of V8 is still needed for the R V8 module -{ stdenv, fetchFromGitHub, gyp, readline, python, which, icu, ... }: - -assert readline != null; - -with stdenv.lib; -let - version = "3.14.5.10"; - sha256 = "08vhl84166x13b3cbx8y0g99yqx772zd33gawsa1nxqkyrykql6k"; - - arch = if stdenv.is64bit then "x64" else "ia32"; - -in -stdenv.mkDerivation { - pname = "v8"; - inherit version; - - src = fetchFromGitHub { - owner = "v8"; - repo = "v8"; - rev = version; - inherit sha256; - }; - patchPhase = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 - sed -i 's,#!/usr/bin/python,#!${python}/bin/python,' build/gyp_v8 - ''; - - configurePhase = '' - PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ - PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ - build/gyp_v8 \ - -f make \ - --generator-output="out" \ - -Dflock_index=0 \ - -Dv8_enable_i18n_support=1 \ - -Duse_system_icu=1 \ - -Dconsole=readline \ - -Dcomponent=shared_library \ - -Dv8_target_arch=${arch} - ''; - - nativeBuildInputs = [ which ]; - buildInputs = [ readline python icu ]; - - # http://code.google.com/p/v8/issues/detail?id=2149 - NIX_CFLAGS_COMPILE = concatStringsSep " " [ - "-Wno-error=strict-overflow" - "-Wno-unused-local-typedefs" - "-Wno-aggressive-loop-optimizations" - ]; - - buildFlags = [ - "LINK=g++" - "-C out" - "builddir=$(CURDIR)/Release" - "BUILDTYPE=Release" - ]; - - postPatch = stdenv.lib.optionalString (!stdenv.cc.isClang) '' - sed -i build/standalone.gyp -e 's,-Wno-format-pedantic,,g' - ''; - - enableParallelBuilding = true; - - installPhase = '' - install -vD out/Release/d8 "$out/bin/d8" - ${if stdenv.hostPlatform.system == "x86_64-darwin" then '' - install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" - '' else '' - install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" - ''} - cp -vr include "$out/" - ''; - - postFixup = if stdenv.isDarwin then '' - install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 - install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib - '' else null; - - meta = with stdenv.lib; { - description = "Google's open source JavaScript engine"; - platforms = [ "x86_64-linux" "i686-linux" ]; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 9998add0d9307..2757ca7704c43 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, nasm }: +{ stdenv, lib, fetchurl, nasm }: stdenv.mkDerivation rec { pname = "x264"; @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1xv41z04km3rf374xk3ny7v8ibr211ph0j5am0909ln63mphc48f"; }; + # Upstream ./configure greps for (-mcpu|-march|-mfpu) in CFLAGS, which in nix + # is put in the cc wrapper anyway. + patches = [ ./disable-arm-neon-default.patch ]; + postPatch = '' patchShebangs . ''; @@ -17,15 +21,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" ]; - preConfigure = '' + preConfigure = lib.optionalString (stdenv.buildPlatform.isx86_64 || stdenv.hostPlatform.isi686) '' # `AS' is set to the binutils assembler, but we need nasm unset AS ''; configureFlags = [ "--enable-shared" ] - ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"; + ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic" + ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--cross-prefix=${stdenv.cc.targetPrefix}"; - nativeBuildInputs = [ nasm ]; + nativeBuildInputs = lib.optional (stdenv.hostPlatform.isx86_64 || stdenv.hostPlatform.isi686) nasm; meta = with stdenv.lib; { description = "Library for encoding H264/AVC video streams"; diff --git a/pkgs/development/libraries/x264/disable-arm-neon-default.patch b/pkgs/development/libraries/x264/disable-arm-neon-default.patch new file mode 100644 index 0000000000000..6971944abb4f3 --- /dev/null +++ b/pkgs/development/libraries/x264/disable-arm-neon-default.patch @@ -0,0 +1,13 @@ +diff -Naur x264-snapshot-20190517-2245-stable-orig/configure x264-snapshot-20190517-2245-stable/configure +--- x264-snapshot-20190517-2245-stable-orig/configure 2020-01-03 19:51:03.041037657 -0500 ++++ x264-snapshot-20190517-2245-stable/configure 2020-01-03 19:52:15.075034609 -0500 +@@ -930,9 +930,6 @@ + fi + + if [ $asm = auto -a $ARCH = ARM ] ; then +- # set flags so neon is built by default +- [ $compiler == CL ] || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon" +- + cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM + if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then + define HAVE_ARMV6 diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix index 10d055eb4d762..924a06e9551d8 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = '' - export LD_LIBRARY_PATH="$(pwd):$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" ''; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix new file mode 100644 index 0000000000000..5247b1697892f --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-extras.nix @@ -0,0 +1,39 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fare-quasiquote-extras''; + version = ''fare-quasiquote-20190521-git''; + + description = ''fare-quasiquote plus extras''; + + deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."named-readtables" args."optima" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz''; + sha256 = ''1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj''; + }; + + packageName = "fare-quasiquote-extras"; + + asdFilesToKeep = ["fare-quasiquote-extras.asd"]; + overrides = x: x; +} +/* (SYSTEM fare-quasiquote-extras DESCRIPTION fare-quasiquote plus extras + SHA256 1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj URL + http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz + MD5 e08c24d35a485a74642bd0c7c06662d6 NAME fare-quasiquote-extras FILENAME + fare-quasiquote-extras DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) + (NAME fare-quasiquote FILENAME fare-quasiquote) + (NAME fare-quasiquote-optima FILENAME fare-quasiquote-optima) + (NAME fare-quasiquote-readtable FILENAME fare-quasiquote-readtable) + (NAME fare-utils FILENAME fare-utils) + (NAME named-readtables FILENAME named-readtables) + (NAME optima FILENAME optima)) + DEPENDENCIES + (alexandria closer-mop fare-quasiquote fare-quasiquote-optima + fare-quasiquote-readtable fare-utils named-readtables optima) + VERSION fare-quasiquote-20190521-git SIBLINGS + (fare-quasiquote-optima fare-quasiquote-readtable fare-quasiquote-test + fare-quasiquote) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix new file mode 100644 index 0000000000000..da6c1947902f8 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-optima.nix @@ -0,0 +1,34 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fare-quasiquote-optima''; + version = ''fare-quasiquote-20190521-git''; + + description = ''fare-quasiquote extension for optima''; + + deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-utils" args."optima" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz''; + sha256 = ''1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj''; + }; + + packageName = "fare-quasiquote-optima"; + + asdFilesToKeep = ["fare-quasiquote-optima.asd"]; + overrides = x: x; +} +/* (SYSTEM fare-quasiquote-optima DESCRIPTION + fare-quasiquote extension for optima SHA256 + 1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj URL + http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz + MD5 e08c24d35a485a74642bd0c7c06662d6 NAME fare-quasiquote-optima FILENAME + fare-quasiquote-optima DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) + (NAME fare-quasiquote FILENAME fare-quasiquote) + (NAME fare-utils FILENAME fare-utils) (NAME optima FILENAME optima)) + DEPENDENCIES (alexandria closer-mop fare-quasiquote fare-utils optima) + VERSION fare-quasiquote-20190521-git SIBLINGS + (fare-quasiquote-extras fare-quasiquote-readtable fare-quasiquote-test + fare-quasiquote) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix new file mode 100644 index 0000000000000..4af3c19fa6792 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote-readtable.nix @@ -0,0 +1,33 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fare-quasiquote-readtable''; + version = ''fare-quasiquote-20190521-git''; + + description = ''Using fare-quasiquote with named-readtable''; + + deps = [ args."fare-quasiquote" args."fare-utils" args."named-readtables" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz''; + sha256 = ''1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj''; + }; + + packageName = "fare-quasiquote-readtable"; + + asdFilesToKeep = ["fare-quasiquote-readtable.asd"]; + overrides = x: x; +} +/* (SYSTEM fare-quasiquote-readtable DESCRIPTION + Using fare-quasiquote with named-readtable SHA256 + 1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj URL + http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz + MD5 e08c24d35a485a74642bd0c7c06662d6 NAME fare-quasiquote-readtable + FILENAME fare-quasiquote-readtable DEPS + ((NAME fare-quasiquote FILENAME fare-quasiquote) + (NAME fare-utils FILENAME fare-utils) + (NAME named-readtables FILENAME named-readtables)) + DEPENDENCIES (fare-quasiquote fare-utils named-readtables) VERSION + fare-quasiquote-20190521-git SIBLINGS + (fare-quasiquote-extras fare-quasiquote-optima fare-quasiquote-test + fare-quasiquote) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix new file mode 100644 index 0000000000000..fe31fcd5d3254 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-quasiquote.nix @@ -0,0 +1,29 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fare-quasiquote''; + version = ''20190521-git''; + + description = ''Portable, matchable implementation of quasiquote''; + + deps = [ args."fare-utils" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz''; + sha256 = ''1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj''; + }; + + packageName = "fare-quasiquote"; + + asdFilesToKeep = ["fare-quasiquote.asd"]; + overrides = x: x; +} +/* (SYSTEM fare-quasiquote DESCRIPTION + Portable, matchable implementation of quasiquote SHA256 + 1skrj68dnmihckip1vyc31xysbdsw9ihb7imks73cickkvv6yjfj URL + http://beta.quicklisp.org/archive/fare-quasiquote/2019-05-21/fare-quasiquote-20190521-git.tgz + MD5 e08c24d35a485a74642bd0c7c06662d6 NAME fare-quasiquote FILENAME + fare-quasiquote DEPS ((NAME fare-utils FILENAME fare-utils)) DEPENDENCIES + (fare-utils) VERSION 20190521-git SIBLINGS + (fare-quasiquote-extras fare-quasiquote-optima fare-quasiquote-readtable + fare-quasiquote-test) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix new file mode 100644 index 0000000000000..d7af897eafb8d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fare-utils.nix @@ -0,0 +1,26 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''fare-utils''; + version = ''20170124-git''; + + description = ''Basic functions and macros, interfaces, pure and stateful datastructures''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz''; + sha256 = ''0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq''; + }; + + packageName = "fare-utils"; + + asdFilesToKeep = ["fare-utils.asd"]; + overrides = x: x; +} +/* (SYSTEM fare-utils DESCRIPTION + Basic functions and macros, interfaces, pure and stateful datastructures + SHA256 0jhb018ccn3spkgjywgd0524m5qacn8x15fdiban4zz3amj9dapq URL + http://beta.quicklisp.org/archive/fare-utils/2017-01-24/fare-utils-20170124-git.tgz + MD5 6752362d0c7c03df6576ab2dbe807ee2 NAME fare-utils FILENAME fare-utils + DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS (fare-utils-test) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix new file mode 100644 index 0000000000000..42cdca06d9057 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/global-vars.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''global-vars''; + version = ''20141106-git''; + + description = ''Define efficient global variables.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz''; + sha256 = ''0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j''; + }; + + packageName = "global-vars"; + + asdFilesToKeep = ["global-vars.asd"]; + overrides = x: x; +} +/* (SYSTEM global-vars DESCRIPTION Define efficient global variables. SHA256 + 0bjgmsifs9vrq409rfrsgrhlxwklvls1dpvh2d706i0incxq957j URL + http://beta.quicklisp.org/archive/global-vars/2014-11-06/global-vars-20141106-git.tgz + MD5 dd3153ee75c972a80450aa00644b2200 NAME global-vars FILENAME global-vars + DEPS NIL DEPENDENCIES NIL VERSION 20141106-git SIBLINGS (global-vars-test) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix new file mode 100644 index 0000000000000..ea153987c0bb9 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-declarations-1_dot_0.nix @@ -0,0 +1,26 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''parse-declarations-1_dot_0''; + version = ''parse-declarations-20101006-darcs''; + + description = ''Library to parse and rebuild declarations.''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz''; + sha256 = ''0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd''; + }; + + packageName = "parse-declarations-1.0"; + + asdFilesToKeep = ["parse-declarations-1.0.asd"]; + overrides = x: x; +} +/* (SYSTEM parse-declarations-1.0 DESCRIPTION + Library to parse and rebuild declarations. SHA256 + 0r85b0jfacd28kr65kw9c13dx4i6id1dpmby68zjy63mqbnyawrd URL + http://beta.quicklisp.org/archive/parse-declarations/2010-10-06/parse-declarations-20101006-darcs.tgz + MD5 e49222003e5b59c5c2a0cf58b86cfdcd NAME parse-declarations-1.0 FILENAME + parse-declarations-1_dot_0 DEPS NIL DEPENDENCIES NIL VERSION + parse-declarations-20101006-darcs SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix new file mode 100644 index 0000000000000..24ac9348005c5 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/serapeum.nix @@ -0,0 +1,61 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''serapeum''; + version = ''20190710-git''; + + description = ''Utilities beyond Alexandria.''; + + deps = [ args."alexandria" args."bordeaux-threads" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-extras" args."fare-quasiquote-optima" args."fare-quasiquote-readtable" args."fare-utils" args."global-vars" args."introspect-environment" args."iterate" args."lisp-namespace" args."named-readtables" args."optima" args."parse-declarations-1_dot_0" args."parse-number" args."split-sequence" args."string-case" args."trivia" args."trivia_dot_balland2006" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_quasiquote" args."trivia_dot_trivial" args."trivial-cltl2" args."trivial-file-size" args."trivial-garbage" args."trivial-macroexpand-all" args."type-i" args."uiop" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/serapeum/2019-07-10/serapeum-20190710-git.tgz''; + sha256 = ''1yvpv8808q24r4fbi2apks12b94az41if2ny1i1ddv9h00vzvpy5''; + }; + + packageName = "serapeum"; + + asdFilesToKeep = ["serapeum.asd"]; + overrides = x: x; +} +/* (SYSTEM serapeum DESCRIPTION Utilities beyond Alexandria. SHA256 + 1yvpv8808q24r4fbi2apks12b94az41if2ny1i1ddv9h00vzvpy5 URL + http://beta.quicklisp.org/archive/serapeum/2019-07-10/serapeum-20190710-git.tgz + MD5 60e2073fccc750d5b56a7e0814756e1c NAME serapeum FILENAME serapeum DEPS + ((NAME alexandria FILENAME alexandria) + (NAME bordeaux-threads FILENAME bordeaux-threads) + (NAME closer-mop FILENAME closer-mop) + (NAME fare-quasiquote FILENAME fare-quasiquote) + (NAME fare-quasiquote-extras FILENAME fare-quasiquote-extras) + (NAME fare-quasiquote-optima FILENAME fare-quasiquote-optima) + (NAME fare-quasiquote-readtable FILENAME fare-quasiquote-readtable) + (NAME fare-utils FILENAME fare-utils) + (NAME global-vars FILENAME global-vars) + (NAME introspect-environment FILENAME introspect-environment) + (NAME iterate FILENAME iterate) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME named-readtables FILENAME named-readtables) + (NAME optima FILENAME optima) + (NAME parse-declarations-1.0 FILENAME parse-declarations-1_dot_0) + (NAME parse-number FILENAME parse-number) + (NAME split-sequence FILENAME split-sequence) + (NAME string-case FILENAME string-case) (NAME trivia FILENAME trivia) + (NAME trivia.balland2006 FILENAME trivia_dot_balland2006) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivia.quasiquote FILENAME trivia_dot_quasiquote) + (NAME trivia.trivial FILENAME trivia_dot_trivial) + (NAME trivial-cltl2 FILENAME trivial-cltl2) + (NAME trivial-file-size FILENAME trivial-file-size) + (NAME trivial-garbage FILENAME trivial-garbage) + (NAME trivial-macroexpand-all FILENAME trivial-macroexpand-all) + (NAME type-i FILENAME type-i) (NAME uiop FILENAME uiop)) + DEPENDENCIES + (alexandria bordeaux-threads closer-mop fare-quasiquote + fare-quasiquote-extras fare-quasiquote-optima fare-quasiquote-readtable + fare-utils global-vars introspect-environment iterate lisp-namespace + named-readtables optima parse-declarations-1.0 parse-number split-sequence + string-case trivia trivia.balland2006 trivia.level0 trivia.level1 + trivia.level2 trivia.quasiquote trivia.trivial trivial-cltl2 + trivial-file-size trivial-garbage trivial-macroexpand-all type-i uiop) + VERSION 20190710-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix new file mode 100644 index 0000000000000..4b81f2fa7fa02 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivia_dot_quasiquote.nix @@ -0,0 +1,44 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivia_dot_quasiquote''; + version = ''trivia-20190710-git''; + + description = ''fare-quasiquote extension for trivia''; + + deps = [ args."alexandria" args."closer-mop" args."fare-quasiquote" args."fare-quasiquote-readtable" args."fare-utils" args."lisp-namespace" args."named-readtables" args."trivia_dot_level0" args."trivia_dot_level1" args."trivia_dot_level2" args."trivia_dot_trivial" args."trivial-cltl2" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz''; + sha256 = ''0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic''; + }; + + packageName = "trivia.quasiquote"; + + asdFilesToKeep = ["trivia.quasiquote.asd"]; + overrides = x: x; +} +/* (SYSTEM trivia.quasiquote DESCRIPTION fare-quasiquote extension for trivia + SHA256 0601gms5n60c6cgkh78a50a3m1n3mb1a39p5k4hb69yx1vnmz6ic URL + http://beta.quicklisp.org/archive/trivia/2019-07-10/trivia-20190710-git.tgz + MD5 f17ca476901eaff8d3e5d32de23b7447 NAME trivia.quasiquote FILENAME + trivia_dot_quasiquote DEPS + ((NAME alexandria FILENAME alexandria) + (NAME closer-mop FILENAME closer-mop) + (NAME fare-quasiquote FILENAME fare-quasiquote) + (NAME fare-quasiquote-readtable FILENAME fare-quasiquote-readtable) + (NAME fare-utils FILENAME fare-utils) + (NAME lisp-namespace FILENAME lisp-namespace) + (NAME named-readtables FILENAME named-readtables) + (NAME trivia.level0 FILENAME trivia_dot_level0) + (NAME trivia.level1 FILENAME trivia_dot_level1) + (NAME trivia.level2 FILENAME trivia_dot_level2) + (NAME trivia.trivial FILENAME trivia_dot_trivial) + (NAME trivial-cltl2 FILENAME trivial-cltl2)) + DEPENDENCIES + (alexandria closer-mop fare-quasiquote fare-quasiquote-readtable fare-utils + lisp-namespace named-readtables trivia.level0 trivia.level1 trivia.level2 + trivia.trivial trivial-cltl2) + VERSION trivia-20190710-git SIBLINGS + (trivia trivia.balland2006 trivia.benchmark trivia.cffi trivia.level0 + trivia.level1 trivia.level2 trivia.ppcre trivia.test trivia.trivial) + PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix new file mode 100644 index 0000000000000..5b92cf9ec5987 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-file-size.nix @@ -0,0 +1,29 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-file-size''; + version = ''20180131-git''; + + parasites = [ "trivial-file-size/tests" ]; + + description = ''Stat a file's size.''; + + deps = [ args."fiveam" args."uiop" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-file-size/2018-01-31/trivial-file-size-20180131-git.tgz''; + sha256 = ''1dhbj764rxw8ndr2l06g5lszzvxis8fjbp71i3l2y9zmdm0k5zrd''; + }; + + packageName = "trivial-file-size"; + + asdFilesToKeep = ["trivial-file-size.asd"]; + overrides = x: x; +} +/* (SYSTEM trivial-file-size DESCRIPTION Stat a file's size. SHA256 + 1dhbj764rxw8ndr2l06g5lszzvxis8fjbp71i3l2y9zmdm0k5zrd URL + http://beta.quicklisp.org/archive/trivial-file-size/2018-01-31/trivial-file-size-20180131-git.tgz + MD5 ac921679334dd8bd12f927f0bd806f4b NAME trivial-file-size FILENAME + trivial-file-size DEPS + ((NAME fiveam FILENAME fiveam) (NAME uiop FILENAME uiop)) DEPENDENCIES + (fiveam uiop) VERSION 20180131-git SIBLINGS NIL PARASITES + (trivial-file-size/tests)) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix new file mode 100644 index 0000000000000..473a41063e700 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-macroexpand-all.nix @@ -0,0 +1,26 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''trivial-macroexpand-all''; + version = ''20171023-git''; + + description = ''Call each implementation's macroexpand-all equivalent''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz''; + sha256 = ''0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm''; + }; + + packageName = "trivial-macroexpand-all"; + + asdFilesToKeep = ["trivial-macroexpand-all.asd"]; + overrides = x: x; +} +/* (SYSTEM trivial-macroexpand-all DESCRIPTION + Call each implementation's macroexpand-all equivalent SHA256 + 0h5h9zn32pn26x7ll9h08g0csr2f5hvk1wgbr7kdhx5zbrszd7zm URL + http://beta.quicklisp.org/archive/trivial-macroexpand-all/2017-10-23/trivial-macroexpand-all-20171023-git.tgz + MD5 9cec494869344eb64ebce802c01928c5 NAME trivial-macroexpand-all FILENAME + trivial-macroexpand-all DEPS NIL DEPENDENCIES NIL VERSION 20171023-git + SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix index 5cdeef36840c3..375c1b6ea1be9 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix @@ -105,6 +105,18 @@ $out/lib/common-lisp/query-fs" ''; }; }; + serapeum = x: { + overrides = y: (x.overrides y) //{ + # Override src until quicklisp catches up to 65837f8 (see serapeum + # issue #42) + src = pkgs.fetchFromGitHub { + owner = "ruricolist"; + repo = "serapeum"; + rev = "65837f8a0d65b36369ec8d000fff5c29a395b5fe"; + sha256 = "0clwf81r2lvk1rbfvk91s9zmbkas9imf57ilqclw12mxaxlfsnbw"; + }; + }; + }; sqlite = x: { propagatedBuildInputs = [pkgs.sqlite]; overrides = y: (x.overrides y) // { diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index ce73d3baec465..4df1884efd10b 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -120,6 +120,7 @@ prove-asdf query-fs quri salza2 +serapeum simple-date smart-buffer split-sequence diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index db725d415c518..972cb78a88572 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -34,6 +34,24 @@ let quicklisp-to-nix-packages = rec { })); + "trivial-macroexpand-all" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-macroexpand-all" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-macroexpand-all.nix { + inherit fetchurl; + })); + + + "trivial-file-size" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivial-file-size" or (x: {})) + (import ./quicklisp-to-nix-output/trivial-file-size.nix { + inherit fetchurl; + "fiveam" = quicklisp-to-nix-packages."fiveam"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + "trivial-cltl2" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivial-cltl2" or (x: {})) @@ -57,6 +75,26 @@ let quicklisp-to-nix-packages = rec { })); + "trivia_dot_quasiquote" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."trivia_dot_quasiquote" or (x: {})) + (import ./quicklisp-to-nix-output/trivia_dot_quasiquote.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + })); + + "trivia_dot_level2" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."trivia_dot_level2" or (x: {})) @@ -109,6 +147,14 @@ let quicklisp-to-nix-packages = rec { })); + "parse-declarations-1_dot_0" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."parse-declarations-1_dot_0" or (x: {})) + (import ./quicklisp-to-nix-output/parse-declarations-1_dot_0.nix { + inherit fetchurl; + })); + + "introspect-environment" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."introspect-environment" or (x: {})) @@ -117,6 +163,71 @@ let quicklisp-to-nix-packages = rec { })); + "global-vars" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."global-vars" or (x: {})) + (import ./quicklisp-to-nix-output/global-vars.nix { + inherit fetchurl; + })); + + + "fare-utils" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-utils" or (x: {})) + (import ./quicklisp-to-nix-output/fare-utils.nix { + inherit fetchurl; + })); + + + "fare-quasiquote-readtable" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-quasiquote-readtable" or (x: {})) + (import ./quicklisp-to-nix-output/fare-quasiquote-readtable.nix { + inherit fetchurl; + "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + })); + + + "fare-quasiquote-optima" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-quasiquote-optima" or (x: {})) + (import ./quicklisp-to-nix-output/fare-quasiquote-optima.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "optima" = quicklisp-to-nix-packages."optima"; + })); + + + "fare-quasiquote-extras" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-quasiquote-extras" or (x: {})) + (import ./quicklisp-to-nix-output/fare-quasiquote-extras.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-quasiquote-optima" = quicklisp-to-nix-packages."fare-quasiquote-optima"; + "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "optima" = quicklisp-to-nix-packages."optima"; + })); + + + "fare-quasiquote" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."fare-quasiquote" or (x: {})) + (import ./quicklisp-to-nix-output/fare-quasiquote.nix { + inherit fetchurl; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + })); + + "stefil" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."stefil" or (x: {})) @@ -1267,6 +1378,45 @@ let quicklisp-to-nix-packages = rec { })); + "serapeum" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."serapeum" or (x: {})) + (import ./quicklisp-to-nix-output/serapeum.nix { + inherit fetchurl; + "alexandria" = quicklisp-to-nix-packages."alexandria"; + "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads"; + "closer-mop" = quicklisp-to-nix-packages."closer-mop"; + "fare-quasiquote" = quicklisp-to-nix-packages."fare-quasiquote"; + "fare-quasiquote-extras" = quicklisp-to-nix-packages."fare-quasiquote-extras"; + "fare-quasiquote-optima" = quicklisp-to-nix-packages."fare-quasiquote-optima"; + "fare-quasiquote-readtable" = quicklisp-to-nix-packages."fare-quasiquote-readtable"; + "fare-utils" = quicklisp-to-nix-packages."fare-utils"; + "global-vars" = quicklisp-to-nix-packages."global-vars"; + "introspect-environment" = quicklisp-to-nix-packages."introspect-environment"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "lisp-namespace" = quicklisp-to-nix-packages."lisp-namespace"; + "named-readtables" = quicklisp-to-nix-packages."named-readtables"; + "optima" = quicklisp-to-nix-packages."optima"; + "parse-declarations-1_dot_0" = quicklisp-to-nix-packages."parse-declarations-1_dot_0"; + "parse-number" = quicklisp-to-nix-packages."parse-number"; + "split-sequence" = quicklisp-to-nix-packages."split-sequence"; + "string-case" = quicklisp-to-nix-packages."string-case"; + "trivia" = quicklisp-to-nix-packages."trivia"; + "trivia_dot_balland2006" = quicklisp-to-nix-packages."trivia_dot_balland2006"; + "trivia_dot_level0" = quicklisp-to-nix-packages."trivia_dot_level0"; + "trivia_dot_level1" = quicklisp-to-nix-packages."trivia_dot_level1"; + "trivia_dot_level2" = quicklisp-to-nix-packages."trivia_dot_level2"; + "trivia_dot_quasiquote" = quicklisp-to-nix-packages."trivia_dot_quasiquote"; + "trivia_dot_trivial" = quicklisp-to-nix-packages."trivia_dot_trivial"; + "trivial-cltl2" = quicklisp-to-nix-packages."trivial-cltl2"; + "trivial-file-size" = quicklisp-to-nix-packages."trivial-file-size"; + "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage"; + "trivial-macroexpand-all" = quicklisp-to-nix-packages."trivial-macroexpand-all"; + "type-i" = quicklisp-to-nix-packages."type-i"; + "uiop" = quicklisp-to-nix-packages."uiop"; + })); + + "salza2" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."salza2" or (x: {})) diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 5fc747cbc8c29..38516cc191452 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { cat > "$out/bin/${cmd}" <<EOF #!${runtimeShell} set -f - LD_LIBRARY_PATH="\$LD_LIBRARY_PATH:$libs" exec $out/pharo "\$@" + LD_LIBRARY_PATH="\$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$libs" exec $out/pharo "\$@" EOF chmod +x "$out/bin/${cmd}" ln -s ${libgit2}/lib/libgit2.so* "$out/" diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index 4daf76219adfa..310e84a918d4d 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 = "5.9"; + version = "6.0"; src = fetchPypi { inherit pname version; - sha256 = "0lggiqws4dzq6k6c20l515pmjajl19gymsxfggkv771dv5kr1gbs"; + sha256 = "02wgrdrg0s0cr9yjsb4945244m8x8rr8jzxr8h8c6k2na4d17xf4"; }; propagatedBuildInputs = [ capstone ]; diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix new file mode 100755 index 0000000000000..3de3277a72d53 --- /dev/null +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, certifi +, chardet +, idna +, oauthlib +, requests +, requests_oauthlib +, six +, urllib3 +, pytestrunner +, pytest +}: + +buildPythonPackage rec { + pname = "atlassian-python-api"; + version = "1.14.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "28ff793cb43152384a810efc6ee572473daf3dc44bf7c1c295efb270a6d29251"; + }; + + checkInputs = [ pytestrunner pytest ]; + + propagatedBuildInputs = [ oauthlib requests requests_oauthlib six ]; + + meta = with lib; { + description = "Python Atlassian REST API Wrapper"; + homepage = "https://github.com/atlassian-api/atlassian-python-api"; + license = licenses.asl20; + maintainers = [ maintainers.arnoldfarkas ]; + }; +} + diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 9bf93fe8c3806..4b96e86193d81 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -34,7 +34,6 @@ in buildPythonPackage rec { six ]; - # Tests are in nixos/tests/blivet.nix. doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index 82a3aac6e1d38..e2532f23709c8 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 = "0.15.2"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "558738aff623d6667aa5b85df6093ad3828867de8a82b66a6d458fb42567beb3"; + sha256 = "0cvinm7bb03qfjpq2zhfacm0qs4ip4378nvya8x41p4wpi2q4dxz"; }; # no tests in tarball diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 201c8ccda705c..a842baca22891 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "cvxopt"; - version = "1.2.3"; + version = "1.2.4"; disabled = isPyPy; # hangs at [translation:info] src = fetchPypi { inherit pname version; - sha256 = "ea62a2a1b8e2db3a6ae44ac394f58e4620149af226c250c6f2b18739b48cfc21"; + sha256 = "1h9g79gxpgpy6xciqyypihw5q4ngp322lpkka1nkwk0ysybfsp7s"; }; # similar to Gsl, glpk, fftw there is also a dsdp interface diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix new file mode 100644 index 0000000000000..626d704f1d8a4 --- /dev/null +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, django, djangorestframework, pyjwt }: + +buildPythonPackage rec { + pname = "djangorestframework_simplejwt"; + version = "4.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "c315be70aa12a5f5790c0ab9acd426c3a58eebea65a77d0893248c5144a5080c"; + }; + + propagatedBuildInputs = [ django djangorestframework pyjwt ]; + + # Test raises django.core.exceptions.ImproperlyConfigured + doCheck = false; + + meta = with lib; { + description = "A minimal JSON Web Token authentication plugin for Django REST Framework"; + homepage = "https://github.com/davesque/django-rest-framework-simplejwt"; + license = licenses.mit; + maintainers = [ maintainers.arnoldfarkas ]; + }; +} diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index 38e51ac0ac68f..1ba7df00ea3a1 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.7.8"; + version = "0.8.1"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "0gd5c3scpyir3h8clhwb5jsf8dkmh1vh7rx8135lkx9fxx01q0az"; + sha256 = "1mjicdvrzh9r9q3xrjrzaiaxk04r60a3l6l0vnp1hq3xfc9ccqc8"; }; # tests of Nearley support require js2py diff --git a/pkgs/development/python-modules/mailmanclient/default.nix b/pkgs/development/python-modules/mailmanclient/default.nix index e6233de93d12c..247a7ed1b004a 100644 --- a/pkgs/development/python-modules/mailmanclient/default.nix +++ b/pkgs/development/python-modules/mailmanclient/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "mailmanclient" ]; meta = with stdenv.lib; { - homepage = "http://www.gnu.org/software/mailman/"; + homepage = "https://www.gnu.org/software/mailman/"; description = "REST client for driving Mailman 3"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix index 3901f7c310d06..106a94b50e283 100644 --- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix +++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "moznetwork"; - version = "0.27"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "09ypx5wif0mly6fk3491nlzg8whg6qw24x7h9w70hykdqindbh2s"; + sha256 = "0ws20l4ggb6mj7ycwrk5h7hj1jmj3mj0ca48k5jzsa4n042ahwrd"; }; propagatedBuildInputs = [ mozlog mozinfo ]; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 61567d851e9b3..a27867467edfb 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "minio"; - version = "5.0.5"; + version = "5.0.6"; src = fetchPypi { inherit pname version; - sha256 = "a5886b3ccb9b46cb4a322a486e06674d1f287b773f20b24cdc3de8450ff935a7"; + sha256 = "1p6gnbapwzpg7h0wv52fn4dd3dlhxl5qziadkiqjl8xaz8yp3vys"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/musicbrainzngs/default.nix b/pkgs/development/python-modules/musicbrainzngs/default.nix index 71bdcc8b547cf..7ae3445377e6a 100644 --- a/pkgs/development/python-modules/musicbrainzngs/default.nix +++ b/pkgs/development/python-modules/musicbrainzngs/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "musicbrainzngs"; - version = "0.6"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1dddarpjawryll2wss65xq3v9q8ln8dan7984l5dxzqx88d2dvr8"; + sha256 = "09z6k07pxncfgfc8clfmmxl2xqbd7h8x8bjzwr95hc0bzl00275b"; }; buildInputs = [ pkgs.glibcLocales ]; diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index 0016da922ff31..334edd0cf1ebe 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib , buildPythonPackage , fetchPypi , pythonAtLeast @@ -19,10 +19,10 @@ buildPythonPackage rec { doCheck = false; pythonImportsCheck = [ "nest_asyncio" ]; - meta = with stdenv.lib; { - homepage = https://github.com/erdewit/nest_asyncio; + meta = with lib; { description = "Patch asyncio to allow nested event loops"; + homepage = "https://github.com/erdewit/nest_asyncio"; license = licenses.bsdOriginal; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index b66d323114612..26c9a8af5e6ff 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "plyvel"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1icsycqqjj8048a0drj3j75a71yiv2cmijh4w3jf9zxahh3k2c9p"; + sha256 = "1xkgj58i66w4h6gwp6fn6xj5nkrad6kxz3byhy9q1j94jml1ns1x"; }; buildInputs = [ pkgs.leveldb ] ++ stdenv.lib.optional isPy3k pytest; diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index 286f42e2f30b7..acaf78cc4d296 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ buildPythonPackage +, fetchPypi +, lib +}: buildPythonPackage rec { pname = "pycodestyle"; @@ -6,13 +9,23 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c"; + sha256 = "0v4prb05n21bm8650v0a01k1nyqjdmkrsm3zycfxh2j5k9n962p4"; }; + # https://github.com/PyCQA/pycodestyle/blob/2.5.0/tox.ini#L14 + checkPhase = '' + python pycodestyle.py --max-doc-length=72 --testsuite testsuite + python pycodestyle.py --statistics pycodestyle.py + python pycodestyle.py --max-doc-length=72 --doctest + python setup.py test + ''; + meta = with lib; { description = "Python style guide checker (formerly called pep8)"; homepage = https://pycodestyle.readthedocs.io; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ + kamadorueda + ]; }; } diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index cd645a8d89b7d..f144cf5555250 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi -, pkgs +, enchant2 }: buildPythonPackage rec { @@ -13,15 +13,21 @@ buildPythonPackage rec { sha256 = "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0"; }; - propagatedBuildInputs = [ pkgs.enchant1 ]; + propagatedBuildInputs = [ enchant2 ]; - patchPhase = let - path_hack_script = "s|LoadLibrary(e_path)|LoadLibrary('${pkgs.enchant1}/lib/' + e_path)|"; + postPatch = let + libext = stdenv.hostPlatform.extensions.sharedLibrary; in '' - sed -i "${path_hack_script}" enchant/_enchant.py - - # They hardcode a bad path for Darwin in their library search code - substituteInPlace enchant/_enchant.py --replace '/opt/local/lib/' "" + # Use the $PYENCHANT_LIBRARY_PATH envvar lookup line to hard-code the + # location of the nix enchant-2 library into _enchant.py. + # + # Also, they hardcode a bad path for Darwin in their library search code; + # This code should never be hit, but in case it does, we don't want to have + # it "accidentally" work by pulling something from /opt. + substituteInPlace enchant/_enchant.py \ + --replace 'os.environ.get("PYENCHANT_LIBRARY_PATH")' \ + "'${enchant2}/lib/libenchant-2${libext}'" \ + --replace '/opt/local/lib/' "" ''; # dictionaries needed for tests @@ -31,7 +37,6 @@ buildPythonPackage rec { description = "pyenchant: Python bindings for the Enchant spellchecker"; homepage = https://github.com/pyenchant/pyenchant; license = licenses.lgpl21; - badPlatforms = [ "x86_64-darwin" ]; }; } diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index eb0b573c4387b..7188ac8ce4af8 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.5.7"; + version = "0.5.8"; src = fetchPypi { inherit pname version; - sha256 = "512c409b36eadfe39c40e46112d8f96b29fdc1032dc424da2bdc783d476f5b0a"; + sha256 = "038xi3a6zvrxbyyfpp64ka8pcjgsdq4fgw9cl5lpxbvmm1bzzw2q"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix index fc19ab26573ab..c294b02c31d9f 100644 --- a/pkgs/development/python-modules/pygdbmi/default.nix +++ b/pkgs/development/python-modules/pygdbmi/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "pygdbmi"; - version = "0.9.0.0"; + version = "0.9.0.2"; src = fetchFromGitHub { #inherit pname version; @@ -14,7 +14,7 @@ buildPythonPackage rec { owner = "cs01"; repo = "pygdbmi"; rev = version; - sha256 = "12xq9iajgqz23dska5x63hrx75icr5bwwswnmba0y69y39s0jpsj"; + sha256 = "01isx7912dbalmc3xsafk1a1n6bzzfrjn2363djcq0v57rqii53d"; }; checkInputs = [ gdb ]; diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 1467783d76a29..a8fff00ae1510 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pykeepass"; - version = "3.1.2"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "280b0884243d059df888a61fd3fc77b2ea76dce4fdb1c1f60f3ab9139ca1259c"; + sha256 = "1ysjn92bixq8wkwhlbhrjj9z0h80qnlnj7ks5478ndkzdw5gxvm1"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index a4765434f74e6..93cba65ae5e72 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "pynvim"; - version = "0.4.0"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1mp9ajsgrb9k2f3s8g7vdflj5mg02ii0d0wk4n6dmvjx52rqpzbi"; + sha256 = "0n2cx22lrmbq7xk7356lyn6k77ryqvkxplw9k0fglk35ckb1isam"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyspotify/default.nix b/pkgs/development/python-modules/pyspotify/default.nix index c30b8ee891a61..e329d4f7b6e01 100644 --- a/pkgs/development/python-modules/pyspotify/default.nix +++ b/pkgs/development/python-modules/pyspotify/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyspotify"; - version = "2.1.2"; + version = "2.1.3"; src = fetchurl { url = "https://github.com/mopidy/pyspotify/archive/v${version}.tar.gz"; - sha256 = "0g3dvwpaz7pqrdx53kyzkh31arlmdzz1hb7jp8m488lbsf47w6nd"; + sha256 = "1y1zqkqi9jz5m9bb2z7wmax7g40c1snm3c6di6b63726qrf26rb7"; }; propagatedBuildInputs = [ cffi ]; diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index 514ff6eb8fe11..f383854d5b44e 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pysrt"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "byroot"; repo = "pysrt"; rev = "v${version}"; - sha256 = "0rwjaf26885vxhxnas5d8zwasvj7x88y4y2pdivjd4vdcpqrqdjn"; + sha256 = "1f5hxyzlh5mdvvi52qapys9qcinffr6ghgivb6k4jxa92cbs3mfg"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index 57f6fd7bf676a..9cfc68dee4659 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -1,15 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, runtimeShell, +{ lib, buildPythonPackage, fetchFromGitHub, runtimeShell, nose, dbus, dbus-python, pygobject3, which, pyflakes, pycodestyle, bluez, networkmanager }: buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.18.3"; + version = "0.19"; - src = fetchPypi { - inherit pname version; - sha256 = "994a178268b6d74aeb158c0f155cd141e9a0cfae14226a764cd022c4949fe242"; + src = fetchFromGitHub { + owner = "martinpitt"; + repo = pname; + rev = version; + sha256 = "09j338lmrjabbd3fpajr4piz4r20sl33030szfsqfzlwrrmvkyi0"; }; prePatch = '' diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index 4d10c985092b8..1c6cdcc28a1f4 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-periphery"; - version = "2.0.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "1arsibmc19iyzr70lqfrkq0fk6gd6imm3zxa7zxv93b6lwl5bw1d"; + sha256 = "1v0qpv0i2kqhjvl6wvvvy29hazjdcym7nn14qzv4r5zq1zsdb92x"; }; # Some tests require physical probing and additional physical setup diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index d55be70ae490b..0556ff93c13c9 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -105,7 +105,7 @@ let path = "${cudatoolkit}/lib/stubs/libcuda.so"; }]; cudaStubEnv = lib.optionalString cudaSupport - "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} "; + "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { version = "1.2.0"; diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index 141353ee1d467..9baf3e40227a0 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.6.2"; + version = "0.6.3"; pname = "robotframework-requests"; src = fetchPypi { inherit pname version; - sha256 = "30669de238f7efd171ccab1c19c7f30ed6b77f43db534c173c1fa1568194d4cb"; + sha256 = "f29844eee373775fd590b80f80a7d5a4325094a4f0a3c48e972d24712dbd2ce4"; }; buildInputs = [ unittest2 ]; diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index e45ccdd49c67a..61d354c8d5f50 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.10.2"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "9cd2194c6642a8754e85f9a6e6912cdf996bebf6ff715d3cc67f65dadfd37cc9"; + sha256 = "0wcc7xbwlf8r2diw9fnzf4bg9h5cg406w7phd3dz37hx17yfi3ha"; }; checkInputs = with self; [ nose ]; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index 2128be1a3c0e7..3a03fae154d77 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.5"; # Upgrades may break sage. Please test or ping @timokau. + version = "1.5.1"; # Upgrades may break sage. Please test or ping @timokau. src = fetchPypi { inherit pname version; - sha256 = "1s4w7q8gndim2ky825a84jmwcf7ryfn10wm8yxz9dw5z2307smii"; + sha256 = "d77901d748287d15281f5ffe5b0fef62dd38f357c2b827c44ff07f35695f4e7e"; }; checkInputs = [ glibcLocales ]; @@ -21,15 +21,16 @@ buildPythonPackage rec { # tests take ~1h doCheck = false; + pythonImportsCheck = [ "sympy" ]; preCheck = '' export LANG="en_US.UTF-8" ''; - meta = { + meta = with lib; { description = "A Python library for symbolic mathematics"; - homepage = https://www.sympy.org/; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ lovek323 timokau ]; + homepage = "https://www.sympy.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ lovek323 timokau ]; }; } diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 6dbb19fcb6942..8c50affaeffd6 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-22"; }; +let derive2 = derive { snapshot = "2020-01-27"; }; 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]; }; @@ -230,10 +230,11 @@ in with self; { 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]; }; 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="1.6.0"; sha256="056ygqpbqznysjzg4z96wrgfa4bwp1lf5qrv9bp6692r3ldq0485"; depends=[hypervolume nls2 raster spatstat vegan]; }; + BAT = derive2 { name="BAT"; version="2.0.0"; sha256="0fwyarkgxxgckaky2wjf311ymlh78942j51a2dvjkwlbshcdqbij"; 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]; }; @@ -386,7 +387,7 @@ in with self; { 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 QRM R2jags]; }; + BayesMed = derive2 { name="BayesMed"; version="1.0.1"; sha256="1ysc7sh0drqxbisi2dz6gj4jlw6qsd879bbhr5pra7nxgmk4h650"; depends=[MCMCpack polspline R2jags]; }; 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]; }; @@ -461,6 +462,7 @@ in with self; { BioMedR = derive2 { name="BioMedR"; version="1.2.1"; sha256="0l3nmnqv0gzkbby4fhajbba910zpnbyckvxwds353pn54g9pcry7"; depends=[Biostrings ChemmineR fmcsR GOSemSim MASS org_Hs_eg_db pls randomForest rcdk RCurl rjson]; }; BioPET = derive2 { name="BioPET"; version="0.2.2"; sha256="0zgq7i37d0rnjhlkcrl44x62vhz0njsv2fldm64j9r4wc02z1q9n"; depends=[ggplot2 gridExtra pROC VGAM]; }; BioPETsurv = derive2 { name="BioPETsurv"; version="0.1.0"; sha256="0svwf8pzvlmlp8aacf70hzlg2h81m6lyhh4p73ixqw5v9bnyq6m0"; depends=[ggplot2 gridExtra survival]; }; + BioProbability = derive2 { name="BioProbability"; version="1.0"; sha256="051m761zf079s0p4q0ambwqc22qjz2yajxrsmnjnxvqiaadaj1q7"; depends=[]; }; BioStatR = derive2 { name="BioStatR"; version="3.0.0"; sha256="1fv37xckhpn0b744r71q7h57pr5j2y0v8hcc97cgzdsqd8p4axmk"; depends=[ggplot2]; }; BiocManager = derive2 { name="BiocManager"; version="1.30.10"; sha256="03n9s2vf7vgpgb5alpxwamf9xfkn32cbzngwyn6spq1bnh9a9dzk"; depends=[]; }; 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]; }; @@ -508,6 +510,7 @@ in with self; { 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]; }; 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=[]; }; @@ -521,6 +524,7 @@ in with self; { 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]; }; + 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]; }; @@ -570,7 +574,7 @@ in with self; { CENFA = derive2 { name="CENFA"; version="1.0.0"; sha256="0ah8rh0gbwwhdfxzj9sj4i8iqbybkga09vinlh0r514ayv2qq2x8"; 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.5"; sha256="1y5i55knkkkmx9wvwgawjyplr1ylkwpinks88g714a0b4ix077a1"; depends=[]; }; + 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=[]; }; CGP = derive2 { name="CGP"; version="2.1-1"; sha256="05a6gydlb99yk2jpy2hyg4c30hqyp8dg2i9dmbjc1n5cmgpg3im9"; depends=[]; }; @@ -707,9 +711,9 @@ in with self; { 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.1.48"; sha256="0jadmz03y6zybmhm2zg8qbhrhgawxbf4c3fs021qyhvlcrs162q7"; depends=[ChemoSpecUtils plyr]; }; + 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.3.60"; sha256="07isl2zdimyzsr1z319s6yblvqa2hjids150agh3h7jkw32m0azq"; depends=[plyr]; }; + ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.4.38"; sha256="1b7czs41jsniw1hnrm1c5z6pc5yiybbdnp2bqr810farmv61slzz"; 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]; }; @@ -879,8 +883,8 @@ in with self; { 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]; }; DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; }; - DAMOCLES = derive2 { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[ape caper deSolve expm geiger 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 QRM rstan VGAM xtable]; }; + 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]; }; 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]; }; @@ -1249,7 +1253,6 @@ in with self; { EloRating = derive2 { name="EloRating"; version="0.46.10"; sha256="03cnbmm18cfh0awg221j478sb5r4r1v4hcilj5chr8qr4i1xmjvz"; 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=[]; }; - Emcdf = derive2 { name="Emcdf"; version="0.1.2"; sha256="0jb59jp1drcwipmk6yzg0cl366i8nhffa13c3x3fmhaj7ifv77vv"; depends=[lattice Rcpp]; }; 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]; }; @@ -1295,7 +1298,7 @@ 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]; }; - EventDetectR = derive2 { name="EventDetectR"; version="0.3.3"; sha256="01yaf44bhkd8zwwky5m2a0bm3mmpkcyqhvjb4yqx0gszlfm1nb60"; depends=[forecast ggplot2 gridExtra imputeTS]; }; + 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]; }; @@ -1371,7 +1374,6 @@ 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"; sha256="0cmq3qzpqx39q01qx7hwbgld9g6pvisr332fj0iy32zqw0bmmaq3"; 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]; }; @@ -1386,7 +1388,7 @@ in with self; { FSMUMI = derive2 { name="FSMUMI"; version="1.0"; sha256="06ri1zi86cm4arjdlp2pha2bvcc8vz6irvd9n3ja074hv62wxcw4"; depends=[FuzzyR lsa]; }; 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.1"; sha256="0b5raplyw0qmlddcmxndwkkk0krdn6h0mdvfga8d4gvy3i8an0dh"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; }; + 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]; }; FTICRMS = derive2 { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[lattice Matrix]; }; FUNTA = derive2 { name="FUNTA"; version="0.1.0"; sha256="02yxz95s2hs26mfmgwhv5d54yyjz0aczjpnay8b4gpzbpd6aci61"; depends=[]; }; @@ -1420,7 +1422,7 @@ in with self; { FeaLect = derive2 { name="FeaLect"; version="1.14"; sha256="1h6jc8n57mvyz3gi2jdx5xacwv5iim5sx86qzrg3v1higfr54b1l"; 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.4"; sha256="1mcsr48hvrpfnk2f0z1bc8556jf848bpd8prm3y46gqdj452wpmm"; depends=[geoR mapdata maps proj4 sp]; }; + FeedbackTS = derive2 { name="FeedbackTS"; version="1.5"; sha256="120labhmisw1x1bq8c4bl6l14vayvb9xcm6jsj1awacypgrr2ar2"; depends=[automap gstat mapdata maps proj4 sp]; }; Fgmutils = derive2 { name="Fgmutils"; version="0.9.5"; sha256="05n8lvx3cs1ckliaj7ni2rbfcrdl7d0pzf9bkwlyd1779h684cxz"; depends=[data_table devEMF ggplot2 gridExtra plyr png sqldf stringr]; }; FiRE = derive2 { name="FiRE"; version="1.0"; sha256="0biy53i10yj261p3y55q7mdkd8g20smszd2dx36z1jkkfr61hy84"; depends=[BH Rcpp]; }; FiSh = derive2 { name="FiSh"; version="1.0"; sha256="07x9z2hn5dsjmg7p6y2flanp7hnzpp2r8d994mwhc2jw5i5xqx2d"; depends=[fda_usc KernSmooth]; }; @@ -1461,7 +1463,7 @@ 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.6"; sha256="00gjg1v21by2w7gmgf169vs8scyj0c9l2pf980fm4win4rwndla5"; depends=[ars]; }; + ForestFit = derive2 { name="ForestFit"; version="0.4.7"; sha256="0p6nygykx4ad8vznpjdx2ipnxpbhmp9sz3pg50hgkhmhzdlpwk1h"; 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=[]; }; @@ -1502,6 +1504,7 @@ in with self; { GACFF = derive2 { name="GACFF"; version="1.0"; sha256="0lhjzb6cj8838dh4423929z7bwpa6cv3dn84rccwi3382vsq9g2c"; depends=[]; }; 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]; }; GAIPE = derive2 { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; }; GAMBoost = derive2 { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; }; @@ -1564,7 +1567,7 @@ in with self; { 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]; }; - GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.6-5"; sha256="1n2xs4apf477bkyzw3p5zfmm3dzs4ja0m03b1vg8iic44d0nnxzv"; depends=[MASS matrixStats nlme]; }; + GLMMadaptive = derive2 { name="GLMMadaptive"; version="0.6-8"; sha256="07pfvbzj4brfj5a66vqnj41zd335vy74hdv0kj7ziad18nh7xqla"; depends=[MASS matrixStats nlme]; }; GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; }; GLMpack = derive2 { name="GLMpack"; version="0.1.0"; sha256="15bpw42y999ljdw8ka2ysrrm0y73xz37wwi3j67i01wafipq82xy"; depends=[AER censReg effects foreign lme4 lmtest MASS Matrix nnet pBrackets plm pscl sandwich]; }; GLMsData = derive2 { name="GLMsData"; version="1.0.0"; sha256="12q41zxniblzys20vjrf5skj8cbzlwb92mwk6jvnyd86lc70bsh1"; depends=[]; }; @@ -1600,8 +1603,6 @@ in with self; { 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]; }; - GRANBase = derive2 { name="GRANBase"; version="2.5.0"; sha256="1sc7f47dnrwww89v4n8y41zvc9z8i8lv7qgya6nwf98vh9b6ifmi"; depends=[covr dplyr GRANCore htmlTable jsonlite markdown RCurl sendmailR stringi switchr]; }; - GRANCore = derive2 { name="GRANCore"; version="0.2.3"; sha256="1f3f34pk0y12yv9cl84ggg40p0bam0x48avrk5f56jskfr475kqk"; 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]; }; @@ -1617,7 +1618,7 @@ in with self; { GSIF = derive2 { name="GSIF"; version="0.5-5"; sha256="104v01yifpagj7kyjfy80c4dgn9wv76py0av90vmgc55qynmvv19"; 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.0"; sha256="1z8j6filfbqc83z495lw3qwwvd3xm35p7r00n74h9qabgvpydycd"; depends=[countrycode curl data_table future_apply httr R_utils]; }; + GSODR = derive2 { name="GSODR"; version="2.0.1"; sha256="0wy2qim636g5rfy046r3qab3r58j3w7ngx57k5gdarbwcjzxw07y"; 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]; }; @@ -1800,7 +1801,6 @@ 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"; sha256="1pcr0dlmhcblsgdyb79n377523x347d4gbzia247cpv52y4kbk0q"; 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=[]; }; @@ -1844,7 +1844,7 @@ in with self; { 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]; }; - HydroCode = derive2 { name="HydroCode"; version="1.0.0"; sha256="060g2kspa7970m6hlv9lnvrkik8v8xgsg35hvj2radnrawrv5a30"; depends=[]; }; + HydroCode = derive2 { name="HydroCode"; version="1.0.1"; sha256="0093a19d52pvy5f0c8l8vxix0kni2c6ablqsfxflwwg9wbms81pa"; depends=[sp]; }; HydroMe = derive2 { name="HydroMe"; version="2.0"; sha256="1a1d3lay94mzwk8n22l650h3p133npdf4aj63zgrdw4760p54rqf"; depends=[minpack_lm nlme]; }; HyperbolicDist = derive2 { name="HyperbolicDist"; version="0.6-2"; sha256="1wgqbx9ascyk6gw1dmvfz6hljvbh49gb9shr9qgf22qbq83waiva"; depends=[]; }; HypergeoMat = derive2 { name="HypergeoMat"; version="3.0.0"; sha256="03xnvb7d80nak7wawfi2sniq9syjbjx5gk71xsgchgwqsdnixp8y"; depends=[gsl Rcpp RcppArmadillo]; }; @@ -1921,7 +1921,7 @@ in with self; { 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.1"; sha256="0y9ph0d00dy4y2alnwyli4i0nm9rqasxy5n3d3m0a5j2vvwjjfzq"; depends=[dplyr eeptools GlobalOptions lubridate testthat]; }; + IPDFileCheck = derive2 { name="IPDFileCheck"; version="0.6.2"; sha256="16fapss0y31y9ynizhv9z8zqywf0aam2v7g53dcwylvdjc6qpzi2"; depends=[dplyr eeptools GlobalOptions lubridate testthat]; }; 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]; }; @@ -2008,14 +2008,14 @@ in with self; { Inventorymodel = derive2 { name="Inventorymodel"; version="1.1.0"; sha256="1l87xghdksgmb2k3a8j382p7ffi2pma38a6pn31sfjsa6bgmrdnk"; depends=[e1071 GameTheoryAllocation]; }; Irescale = derive2 { name="Irescale"; version="2.3.0"; sha256="037bzli0zwlfbf5xmllqg2pi0shs33ggrnw69kzyw2sf780y3hs2"; depends=[e1071 fBasics ggplot2 imager Rdpack reshape2 sp]; }; IrishDirectorates = derive2 { name="IrishDirectorates"; version="1.4"; sha256="1mwjrmqga7f0p5w2m4f0i6mb68jimx6791pz03r8iqj3yx0vzkh0"; depends=[Rcpp RcppArmadillo]; }; - IrregLong = derive2 { name="IrregLong"; version="0.1.0"; sha256="0m0lzvdp3f57faylk5vihymyhya7b6kri01zql971lqmfazybjy8"; depends=[frailtypack geepack survival]; }; + IrregLong = derive2 { name="IrregLong"; version="0.2.0"; sha256="17s3gl550qzp81dl901iijfad3qg2mclsc00hsqyg0adh63jlj91"; depends=[data_table frailtypack geepack survival]; }; IsingFit = derive2 { name="IsingFit"; version="0.3.1"; sha256="1prdzzp15klkdy72379bjksdgxr15nk16pqm35w95341cddxchc7"; depends=[glmnet Matrix qgraph]; }; - IsingSampler = derive2 { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[magrittr nnet plyr Rcpp]; }; + 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]; }; 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.1"; sha256="0xh45p2ky3hh5p01yw27y6y7iikr6fbwalmw3qbw1y6c5jc3978v"; depends=[MASS]; }; + IsoplotR = derive2 { name="IsoplotR"; version="3.2"; sha256="00v2b7r537awxmns8m22gk3q225kkh68wwwzip5x6qrvykmnxdk6"; 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]; }; @@ -2036,7 +2036,7 @@ in with self; { 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]; }; - JWileymisc = derive2 { name="JWileymisc"; version="1.0.1"; sha256="1rd1k46h0gvkhhhcrr2d95k62msl5zxxyk03vj6asdd5r6h8hdqa"; depends=[cowplot data_table emmeans extraoperators ggplot2 ggthemes lavaan lme4 MASS mgcv mice multcompView psych quantreg rms robustbase VGAM]; }; + 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]; }; JavaGD = derive2 { name="JavaGD"; version="0.6-1.1"; sha256="11knns2b1b8kd4nf8zwfzdhj4xqwkx3f1ba672vqi7jfr47938hh"; depends=[]; }; @@ -2150,12 +2150,12 @@ in with self; { LPCM = derive2 { name="LPCM"; version="0.46-3"; sha256="1bm5y95lzwcv8arlh55sy17m6hz1x48bcjkrwf3x34ax90qimf66"; depends=[]; }; LPGraph = derive2 { name="LPGraph"; version="2.0"; sha256="1d3czxihaz3f09bfb34knqb6prhcx50kh8y4qrhhakic999z6ifw"; depends=[car PMA SDMTools]; }; LPKsample = derive2 { name="LPKsample"; version="2.0"; sha256="1jg99025vk42rnjdymh3nj71npn4pmdsmk6rvnx3lykpi72f85dz"; depends=[apcluster igraph mclust]; }; - LPM = derive2 { name="LPM"; version="2.7"; sha256="1anjgflj1272xrghn3s9a21f2dfggppnzjqh3p8zaid91bzg0g34"; depends=[fracdiff MASS QRM]; }; + 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]; }; 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="0.99.5"; sha256="13iv2v8lkyz9rpjzz2pr6b5g6nh79j8vd5hpx03vjyx08ii0dnq6"; depends=[]; }; + 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]; }; @@ -2482,7 +2482,7 @@ in with self; { ManifoldOptim = derive2 { name="ManifoldOptim"; version="0.1.4"; sha256="0c5hw01nlnxrys8d9qhwvnls834i0081pf9iic9kx5k6ckc7iwha"; 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.3"; sha256="04fhnghakygpwrmhrwqr6g0r62zsxl0czy5bn3xl5iqzaswcd4i1"; depends=[rentrez]; }; + Map2NCBI = derive2 { name="Map2NCBI"; version="1.4"; sha256="1ssqnm9g5p0nnhdyp9dqbbsz3hw8jzdwy0rv3csp8fxm0f1bi1kb"; depends=[rentrez]; }; MapGAM = derive2 { name="MapGAM"; version="1.2-5"; sha256="0ardqsa7smx0syh1l591bm6a1rb7kvcyw3rlb3hkfk8rk4k60qmr"; depends=[colorspace gam maptools sp survival]; }; Mapinguari = derive2 { name="Mapinguari"; version="1.0.0"; sha256="1jfqinfr6wkpmkp4jm9ixgawcywm3n1ni03h6zngvx74saz7kd3g"; depends=[dplyr magrittr raster rgdal rlang stringr testthat]; }; MareyMap = derive2 { name="MareyMap"; version="1.3.4"; sha256="1wap0syzgd0w3xla2x4bcasn8zzlj63r5yyf9r479nvifjxdqxzz"; depends=[tkrplot]; }; @@ -2573,7 +2573,7 @@ in with self; { 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.2"; sha256="1p4b1lq4iqvg335wp7mhvr0m23k69vnhw99kyn3ys0brf7889dgc"; depends=[]; }; + Minirand = derive2 { name="Minirand"; version="0.1.3"; sha256="19lib0qh3xfzvpgsskl3yypmjygss0w7pimz0136av0px5b4jran"; depends=[]; }; MissMech = derive2 { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l4wxlahk2gmawzv9rhyibwzf0yp60cb1sv9"; depends=[]; }; MissingDataGUI = derive2 { name="MissingDataGUI"; version="0.2-5"; sha256="0drbm87ka17avg6fmswjilgnz9c3azwd0236s8yfms24k9k77vnd"; depends=[cairoDevice GGally ggplot2 gWidgetsRGtk2 reshape]; }; MitISEM = derive2 { name="MitISEM"; version="1.2"; sha256="0dn398vrxh16gmy7ghh5000dgk7cbhb3gi3myrxp5dfri3ysjxcj"; depends=[mvtnorm]; }; @@ -2603,7 +2603,7 @@ in with self; { ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2.1"; sha256="17yw46yr0n9hddvlhh73jdpmpdlpa581n5xjpwkr6cpr2f7xxpqc"; 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.63"; sha256="0kyz4cplkd7yhls78x08fla7yciv5103xr7j8b5gnpv0ncbhhzd4"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt tmvtnorm]; }; + 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]; }; 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]; }; @@ -2698,6 +2698,7 @@ in with self; { NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; }; NISTunits = derive2 { name="NISTunits"; version="1.0.1"; sha256="0km9l3k9p35sb1qrhrz4ijjsdihvsp6j7cz5kh46lgf7nn6xdk7a"; depends=[]; }; NITPicker = derive2 { name="NITPicker"; version="1.0.1"; sha256="00jmin7y1bp7a4a1qcvv3rkgiy9qij7gbkxcdgpiyzcs6aaif59z"; depends=[fda fda_usc fdasrvf]; }; + NLMR = derive2 { name="NLMR"; version="1.0"; sha256="0i5whvr42mizkv37fa4am81sfq58fsz9rnrhjlig4id9nddm6m9x"; depends=[checkmate dplyr fasterize RandomFields raster Rcpp sf spatstat tibble]; }; NLP = derive2 { name="NLP"; version="0.2-0"; sha256="0xbhkrnxcbf322jfw31xcn4y2gnk5y7ccq1bz4h3prf44h0whr7w"; depends=[]; }; 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]; }; @@ -2993,7 +2994,7 @@ in with self; { 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.1"; sha256="0rxhy2spvnzkggcawbrf8i2940vqy3rgpif6hnp9l3y17qnx07hq"; depends=[Matrix Rcpp RcppEigen]; }; + 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]; }; @@ -3041,7 +3042,7 @@ in with self; { PakPMICS2014HH = derive2 { name="PakPMICS2014HH"; version="0.1.0"; sha256="1n6cyanqafscizgi1xqmc19w59yigxk5mvqinbivpdr7rydhrac6"; depends=[data_table]; }; PakPMICS2014HL = derive2 { name="PakPMICS2014HL"; version="0.1.0"; sha256="18i5p54zmqxph0lkbgz4ahrbmi2jwhjwdca7aqvx9az18ki5c9sx"; depends=[data_table]; }; PakPMICS2014Wm = derive2 { name="PakPMICS2014Wm"; version="0.1.0"; sha256="1sczczk07n91c21iqkxz1j1hixrk6p0c30ggahxbmk1cawqfn4cb"; depends=[data_table]; }; - PakPMICS2018 = derive2 { name="PakPMICS2018"; version="0.1.0"; sha256="0xrv0srm87fdsr1sicgw5s5pj0n03v9zxlwwx2wf1zp7mgafd4sk"; depends=[tibble]; }; + PakPMICS2018 = derive2 { name="PakPMICS2018"; version="1.0.0"; sha256="0jjch9nhwif01j6avbyr4ajpfnxb51idq6pnywfjhn46wn0by756"; depends=[tibble]; }; PakPMICS2018bh = derive2 { name="PakPMICS2018bh"; version="0.1.0"; sha256="0c1fy4mp45nay15plpfzv4xjx1dw17zrrild70sfbrmdfdwnjgcl"; depends=[tibble]; }; PakPMICS2018fs = derive2 { name="PakPMICS2018fs"; version="0.1.0"; sha256="009hx1r9a0q0xxrk5zsy39sj1ynj5qjvci37i82yihjvjxb3rj0g"; depends=[tibble]; }; PakPMICS2018hh = derive2 { name="PakPMICS2018hh"; version="0.1.0"; sha256="0wkjxy8qkndhnyf1w03cr3g7s03cm60yn0lxn5j6hvh019b28nmz"; depends=[tibble]; }; @@ -3063,7 +3064,7 @@ in with self; { 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="1.7.1"; sha256="11r4p4s2pm0c4fmnpijzz5srhpai444mbx5nszhkssfsp9rh7cm9"; depends=[SDMTools]; }; + PatternClass = derive2 { name="PatternClass"; version="2.0.0"; sha256="0z2qbg8diskk33ffiqkhkkp5va1p56cij2a6yqfhybrrcxizliw1"; 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=[]; }; @@ -3127,6 +3128,7 @@ in with self; { 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]; }; 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]; }; @@ -3221,7 +3223,6 @@ in with self; { 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-13"; sha256="0zxhm1bdbs4jizd909vw9yjdn484vmcrwcmpk3a7gr4142q9kdjh"; 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=[]; }; @@ -3294,7 +3295,7 @@ in with self; { 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]; }; - RATest = derive2 { name="RATest"; version="0.1.6"; sha256="1xbsdl302ybgcx58rvsz0c1055j7jr01a6zyaq34sq2rdy18vwrs"; depends=[ggplot2 gridExtra quantreg]; }; + 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=[]; }; @@ -3340,7 +3341,7 @@ in with self; { RDocumentation = derive2 { name="RDocumentation"; version="0.8.2"; sha256="0qdn3c5xbjyrhk56wfch50xpyyfd4f79hs0v00cqk9iwsnjlwmb5"; depends=[httr proto rjson]; }; RDota2 = derive2 { name="RDota2"; version="0.1.6"; sha256="0fjsgg4dmzw2xwrf8jxq0f2d7f78bf67bl3ms5qcjk9kskfnymag"; depends=[httr jsonlite]; }; REAT = derive2 { name="REAT"; version="3.0.2"; sha256="0x5cal502n8abynx1jk2ccmmggvd41rvd2gc6rxkbyvcp4794l82"; depends=[]; }; - REBayes = derive2 { name="REBayes"; version="1.8"; sha256="1mvi163djhnq3c711mx4a6mh1vmlcj80562czx12z2gmx13810nh"; depends=[Matrix reliaR]; }; + 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]; }; @@ -3537,7 +3538,7 @@ in with self; { 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.1"; sha256="1znzw0f85jqarg7m303v50kdc6zzx4byrp7nh3nfkhzyxplmc1aa"; depends=[]; }; + RRPP = derive2 { name="RRPP"; version="0.5.2"; sha256="0j31drphisckab9v93z6spdj9jgd0wx9dkbd2b22ff5la6bvil7k"; depends=[]; }; 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]; }; @@ -3613,7 +3614,7 @@ in with self; { 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]; }; RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; }; - RXshrink = derive2 { name="RXshrink"; version="1.3"; sha256="0vripaygn9l71iirvnf84df6dwij2pcfnygw0g5f2ggfiq8snamg"; depends=[lars]; }; + RXshrink = derive2 { name="RXshrink"; version="1.3.1"; sha256="1kj661g4dkdnnkrc7vh7qpvfrgj77db6lwvvlpbynn8n3l3qbg94"; 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]; }; @@ -3666,7 +3667,7 @@ in with self; { 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]; }; - Rcmdr = derive2 { name="Rcmdr"; version="2.6-1"; sha256="1slwflnz64lbps16jzp2s0cjcns0cpxbh9mb4925l4xg08mc1a27"; depends=[abind car effects lme4 RcmdrMisc relimp tcltk2]; }; + 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]; }; @@ -3713,9 +3714,9 @@ in with self; { Rcpp = derive2 { name="Rcpp"; version="1.0.3"; sha256="03h3zyjq948y0hrrs95lfk4zgx6wfrg64hjlrfrzf5na7bfh0d9b"; 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.4"; sha256="1rmadfvavjn17xs0fs93h2dahil5nqg0w59f4zdsnn193cwcfi7p"; depends=[gmp Rcpp RcppThread]; }; + 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.3.0"; sha256="0kpcspg3mafi5kncjfhnbcwimvlf19jvrxilvhbpd20sap473mh3"; depends=[Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.800.4.0"; sha256="1csh54v4d0ccwmk4bqj4rca1d5rqpafvb4459x3q6k9sys0charx"; 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]; }; RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.10"; sha256="175bn75akwgz3vcp0n59kiqqz7q9cwkvih241nj8v810cp4gpmkp"; depends=[Rcpp]; }; @@ -3770,6 +3771,7 @@ in with self; { Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; }; Rdsdp = derive2 { name="Rdsdp"; version="1.0.4-2"; sha256="05bk6yqvhzvyfzga1dz34w68nlwl2dc8bvhh3ghd07a61fsnkg4x"; 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=[]; }; @@ -3779,7 +3781,6 @@ in with self; { 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]; }; - RecordTest = derive2 { name="RecordTest"; version="0.1.0"; sha256="1x6w6f2zlp6xb561n5khbf53955kv2ydmy646v7w85ygx9p8hyni"; depends=[car ggplot2 Smisc]; }; 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=[]; }; @@ -3820,7 +3821,7 @@ in with self; { 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.1"; sha256="1lrbl0nax7rzk460mh6rq9hydahdi3ckxk4kxx3xij29jl3lmijh"; depends=[png]; }; + RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.5.2"; sha256="1y2dinxmzx6mg6ynpk2q7f4k4rxjm66my185gafdcvpc4rl7svs7"; depends=[png]; }; 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]; }; @@ -3858,7 +3859,7 @@ in with self; { Rmixmod = derive2 { name="Rmixmod"; version="2.1.2.2"; sha256="1kfhaj47igcjs3h22slk8jywq85kbm5rnj4c1jhrp03hyzy2vg0v"; depends=[Rcpp RcppEigen]; }; RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; }; Rmosek = derive2 { name="Rmosek"; version="1.3.5"; sha256="18q39n2p3gms9zqrl8g15rjjk4v64365v0rm8r7zvvivh1hy5xa0"; depends=[]; }; - Rmpfr = derive2 { name="Rmpfr"; version="0.7-2"; sha256="1zq3as34r27v2yc729731997wdhxb6cs5ilmak4nmsljabnac7gc"; depends=[gmp]; }; + Rmpfr = derive2 { name="Rmpfr"; version="0.8-1"; sha256="09kw7hyca8xc09r2d88qj81cclar8acaq5q9q5rw9f49iffda0rr"; depends=[gmp]; }; 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=[]; }; @@ -4075,6 +4076,7 @@ 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]; }; 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]; }; @@ -4139,7 +4141,7 @@ in with self; { STGS = derive2 { name="STGS"; version="0.1.0"; sha256="0xfwd0jsg3glbr3c5l5yyri4is5kg77ivgr6qlzaxp6p8q7yfzqf"; depends=[brnn glmnet kernlab randomForest rrBLUP]; }; STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; }; STMedianPolish = derive2 { name="STMedianPolish"; version="0.2"; sha256="0jzgcfhm09cccg2nwbvrmnkah1psbnmg26rc2n7lz26n4b20p3l2"; depends=[gstat maptools nabor reshape2 sp spacetime zoo]; }; - STMotif = derive2 { name="STMotif"; version="1.0.4"; sha256="0667jqpn40y1pw69am59jhkyds9433fm1v67y3vgqi1z1zzpan19"; depends=[ggplot2 RColorBrewer reshape2 scales shiny]; }; + STMotif = derive2 { name="STMotif"; version="2.0.0"; sha256="190qwbh9lhq75mz20cyfsh77y5m91rbg5gharffknbq618gwlcmf"; depends=[ggplot2 RColorBrewer reshape2 scales shiny]; }; STOPES = derive2 { name="STOPES"; version="0.1"; sha256="0gv58nf0m67bfqc15c7n4gksqk7h661c9b55qapk210j259b7xbv"; depends=[changepoint glmnet MASS]; }; STPGA = derive2 { name="STPGA"; version="5.2.1"; sha256="0mwjv9r7x925ljmbwk2fl0xvf2n2hnf5n5z5p5rxr57ywvirqw1b"; depends=[AlgDesign emoa scales scatterplot3d]; }; STRAH = derive2 { name="STRAH"; version="1.0"; sha256="0a2av8by99sq7l28c7cjwm6nqhp1i4pd5qxcsarvwd8f9fckvr5z"; depends=[BiocManager Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19]; }; @@ -4164,7 +4166,7 @@ in with self; { 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.4-1"; sha256="0sv24565w80xvllky3r88h6zc48c68mj9sp6ixp2n01f41x3lz25"; depends=[doParallel formattable memoise pbapply]; }; + SamplingStrata = derive2 { name="SamplingStrata"; version="1.5"; sha256="1rh26jcb2ksjfabpqprc0glw4b6ig8hagqjhxrm6pgji9para31x"; 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]; }; @@ -4283,7 +4285,6 @@ in with self; { 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]; }; - Smisc = derive2 { name="Smisc"; version="0.3.9.1"; sha256="1dsgn37w690xh2r4mk3nwsbnaxjnw1a5qywihridvybf58nqgs06"; depends=[doParallel plyr]; }; SmithWilsonYieldCurve = derive2 { name="SmithWilsonYieldCurve"; version="1.0.1"; sha256="0qvhd1dn2wm9gzyp6k7iq057xqpkngkb4cfmvmjqmf0vhysp371w"; depends=[]; }; 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]; }; @@ -4522,7 +4523,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-7"; sha256="0rxxhvqi55869dg2p82hzg5kvgcqf9h60cjcg00k3pv9aw4x07kb"; depends=[foreach]; }; + TSP = derive2 { name="TSP"; version="1.1-8"; sha256="0g44f2a4m7rfx6y51cdbr6vcmmpbwgyzpvfjksq3lb7gcpbr7xrx"; 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]; }; @@ -4570,7 +4571,7 @@ in with self; { TauStar = derive2 { name="TauStar"; version="1.1.4"; sha256="06bb6570mqzfbjw2qp4bjl4a1bdpwsvcr0vw2y4l1x444m670ds1"; depends=[Rcpp RcppArmadillo]; }; TaxicabCA = derive2 { name="TaxicabCA"; version="0.1.1"; sha256="0izjf6vrdjvs9axvafr2mamr157i8w6d7m5sfjch1p5c174cpr9c"; depends=[]; }; Taxonstand = derive2 { name="Taxonstand"; version="2.2"; sha256="1cpx5mp17l9gjvb60f0ypm8r8b69ff520p67jac8y6rvw8aqhc6j"; depends=[pbapply]; }; - TcGSA = derive2 { name="TcGSA"; version="0.12.4"; sha256="1kqgmmrkwy5idr77r3grq76km6bvi2003a148kjmdmi688jjkc2g"; depends=[cluster cowplot ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; }; + 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]; }; @@ -4584,7 +4585,7 @@ in with self; { Ternary = derive2 { name="Ternary"; version="1.1.3"; sha256="1hpm6ybksyizzkpig88jczj58kzgc82dmm22wy61hqhlbs4pmj1z"; 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.0"; sha256="0jl65fv5iafpnm3xbi1wf676qdyk329cqm6c9zw9gzzbwc7f2pb7"; depends=[crayon foreach logitnorm lpSolve Matrix Rcpp Rdpack]; }; + 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]; }; TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; }; TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; }; @@ -4680,6 +4681,7 @@ in with self; { UScensus2000cdp = derive2 { name="UScensus2000cdp"; version="0.03"; sha256="143hqnzdla3p31n422ddzaaa34wc6xnnhil4y53m4qydyg407700"; depends=[foreign maptools sp]; }; UScensus2000tract = derive2 { name="UScensus2000tract"; version="0.03"; sha256="11ppw75k8zghj7xphx5xyl3azsdsyd142avp0la2g941w6f8l2n1"; depends=[foreign maptools sp]; }; UScensus2010 = derive2 { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4ijvfg557rl3176ki4i8a1y39cyqm3v7mnzwckyj3l"; depends=[foreign maptools sp]; }; + USgrid = derive2 { name="USgrid"; version="0.1.0"; sha256="0kdbq1vbqcm0avzy2y8g8xk56bp8qnqpc1zfqspkwl6a0gzzfjxz"; depends=[tsibble]; }; UStatBookABSC = derive2 { name="UStatBookABSC"; version="1.0.0"; sha256="16r6clhfaalfsg5hmvzm8a128zygxax5hyc0vr1q9bsw9hj7cs0c"; depends=[]; }; UWHAM = derive2 { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; }; UdderQuarterInfectionData = derive2 { name="UdderQuarterInfectionData"; version="1.0.0"; sha256="084bq5ai1ccp4www64z0ipic74zkd8j1ygv0py900164a25wdr9b"; depends=[]; }; @@ -4699,7 +4701,7 @@ in with self; { 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"; sha256="07xmhmqbw0pvsc3vwpdkkx0j7f3nbgwlg7fii93gfrixxn8sjs1r"; depends=[curl jsonlite Rcpp]; }; + V8 = derive2 { name="V8"; version="3.0.1"; sha256="0xkyja3722qbs2ndyw3171yfsakijnydm2bfqv76cf0gbzxdab5b"; depends=[curl jsonlite Rcpp]; }; 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]; }; @@ -4999,7 +5001,7 @@ in with self; { airportr = derive2 { name="airportr"; version="0.1.3"; sha256="1h8h0cdfqgxv8cf9hp82sx5n4a1z88qyyxicj7d2kmmybqqz2r5n"; depends=[dplyr]; }; 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.1"; sha256="034hm328fflpr9ppgr87sbwxj9hrmynq86c9nawwjlkv4daw9j7i"; depends=[data_table dplyr ggforce ggplot2 ggraph igraph magrittr rlang stringr textstem tibble tidygraph tidytext widyr]; }; + 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]; }; 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]; }; @@ -5030,9 +5032,9 @@ in with self; { 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="3.1.1"; sha256="0qy23lzz2lfsrhl9yn195r5gdkspgi99zlp13l1fpcw0d02diw1z"; depends=[assertthat htmlwidgets jsonlite magrittr repr reticulate rlang vegawidget]; }; + 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.2"; sha256="1k3p06v8ccj0dbjfpl4nw6579bwcy4j925rk15v55khqmrlx780l"; depends=[]; }; + altmeta = derive2 { name="altmeta"; version="2.3"; sha256="0fcd2pzp62871b37fcwz1zcidch5akj6a5npcvwzg4zwp8i9rmyl"; depends=[coda 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]; }; @@ -5117,7 +5119,7 @@ in with self; { 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]; }; - aqp = derive2 { name="aqp"; version="1.18.1"; sha256="08mvh65b4i2dcrx4a4is4qpbmxdnzy2212b72l3xq6yppdzl2fhl"; depends=[cluster digest lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; }; + 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=[]; }; @@ -5229,7 +5231,6 @@ in with self; { attachment = derive2 { name="attachment"; version="0.0.9"; sha256="0z47v5nqvw0grgll2bl66zy82igg1ncy78jm9dwv45yd4dl2xi10"; depends=[desc devtools glue knitr magrittr rmarkdown stringr]; }; attempt = derive2 { name="attempt"; version="0.3.0"; sha256="1q0r4r0hirw2kxsvcq5rqkmbxzi7fa6fxaqi6rmzwiz25025iv71"; depends=[rlang]; }; attenuation = derive2 { name="attenuation"; version="1.0.0"; sha256="0ys4psvkvimmym4qj9cmhq8y7x10kv0x6bsvpjkrsc3l8p2g3474"; depends=[]; }; - attrCUSUM = derive2 { name="attrCUSUM"; version="0.1.0"; sha256="113y40v9hyvnvvzvyqg81n0n1h84pj4zph5q8p0vc0384hw00544"; depends=[Rcpp RcppArmadillo]; }; 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]; }; aucm = derive2 { name="aucm"; version="2019.12-1"; sha256="1vjb5jiq2iz6c8nhfcbqg21nms7nf485xlrgd7mdkbzvqxxl43h6"; depends=[kyotil]; }; @@ -5288,7 +5289,7 @@ in with self; { backpipe = derive2 { name="backpipe"; version="0.2.3"; sha256="12k2cv9x8h0b002m9c8g4vj5a7chp4b8jqz377ia0diqw89dydpm"; depends=[]; }; backports = derive2 { name="backports"; version="1.1.5"; sha256="0k19w68b2aihyj5mflw3732gkkzs78sssqdns960pdw3yfnkiv33"; depends=[]; }; backtest = derive2 { name="backtest"; version="0.3-4"; sha256="1s0mf247dz2vvyf4m3sp9xiqhv7xcs4rphyg9gdcy73060sah2ad"; depends=[lattice]; }; - bacondecomp = derive2 { name="bacondecomp"; version="0.1.0"; sha256="120whsc3sjwq4y30kk81k2lkcqwpvzcd3z44xkl8nlfzd2gn20w3"; depends=[]; }; + 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]; }; @@ -5304,6 +5305,7 @@ in with self; { bamboo = derive2 { name="bamboo"; version="0.9.24"; sha256="1fw1wniba0kxb44d2w9r9nh5sy1jhrk48bn0zblz2y6gvwn8m2vn"; 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]; }; + 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]; }; @@ -5343,8 +5345,6 @@ in with self; { 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]; }; 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=[]; }; - bayesCT = derive2 { name="bayesCT"; version="0.99.1"; sha256="1ylv7l4rs4sb7lld6m2w02xg9g26fm8z9jdrszbjc18z1f4bm78j"; depends=[bayesDP dplyr magrittr purrr]; }; - bayesDP = derive2 { name="bayesDP"; version="1.3.2"; sha256="1xv133v01mbfsy0w5acc9819m92dcxfdjg4a8p7kdfkycz4ilwnl"; depends=[ggplot2 Rcpp RcppArmadillo survival]; }; bayesDccGarch = derive2 { name="bayesDccGarch"; version="2.0"; sha256="1s2b8f43wi9ja966n2p2r4l4s79vk6xb8mqaxsagnw90g969p681"; depends=[coda numDeriv]; }; 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]; }; @@ -5418,7 +5418,7 @@ in with self; { 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="1.0.2"; sha256="1gxgw4gcrlbxmlv5scddr6qh4df9xaj6zbs48k660qqn02gjxy9b"; depends=[fdrtool igraph knitr Matrix]; }; + beam = derive2 { name="beam"; version="2.0.0"; sha256="1b61cabaw3pixzmzsrxh4mnbdrnxfd7ffyibn3kgk1dr0sc9d1da"; 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]; }; @@ -5569,6 +5569,7 @@ in with self; { bipartite = derive2 { name="bipartite"; version="2.14"; sha256="0wy7ciw59b7z2gzp5qiphss9p208qf6dyprl59nksb462fg4rxyq"; 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]; }; 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=[]; }; @@ -5648,7 +5649,6 @@ in with self; { 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]; }; - bookdownplus = derive2 { name="bookdownplus"; version="1.5.7"; sha256="1y3iiw3grs6h3ppar1yjmha0nbp19naiirj0hvzgi4yhnibf7nid"; 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=[]; }; @@ -5659,7 +5659,7 @@ in with self; { bootSVD = derive2 { name="bootSVD"; version="0.5"; sha256="14xwbrpqj3j1xpsppgjxpn9ggsns2n1kmni9vn30vgy68zwvs2wy"; depends=[ff]; }; bootStepAIC = derive2 { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; }; bootcluster = derive2 { name="bootcluster"; version="0.1.0"; sha256="1mx08p0csz06mq55bdg4vgnqa9khdgqrz4jnm48c24pg8rpaj98b"; depends=[cluster flexclust fpc mclust plyr sets]; }; - bootnet = derive2 { name="bootnet"; version="1.2.4"; sha256="152zgkk7lw0cjvsrnqbb2j4hlvfdy7n6j63xjpn5sjxyal69inp2"; depends=[abind BDgraph corpcor dplyr ggplot2 glasso graphicalVAR gtools huge igraph IsingFit IsingSampler lavaan Matrix mgm mvtnorm NetworkToolbox networktools parcor pbapply psychTools qgraph relaimpo tidyr]; }; + bootnet = derive2 { name="bootnet"; version="1.3"; sha256="0173xv22p25gm9hnwhh9wkq7ygxz5lkpsakhbv63v36qrlyfw9al"; depends=[abind BDgraph corpcor dplyr ggplot2 glasso graphicalVAR gtools huge igraph IsingFit IsingSampler lavaan Matrix mgm mvtnorm NetworkToolbox networktools parcor pbapply psychTools qgraph relaimpo tidyr]; }; bootruin = derive2 { name="bootruin"; version="1.2-4"; sha256="1gbvh99snchipf13kjhymcx60s2kni23y7lv8lhzd3d402grp68h"; depends=[]; }; bootsPLS = derive2 { name="bootsPLS"; version="1.1.2"; sha256="19ikz3l0qds25hgcxvhsvqy6jyshcdvnxw6774ifl9ylngxvlfh0"; depends=[mixOmics]; }; bootspecdens = derive2 { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; }; @@ -5749,11 +5749,11 @@ in with self; { bunchr = derive2 { name="bunchr"; version="1.2.0"; sha256="1b8hdg2x26k0ahx4gxdpzr36hy056939r4496q3vbgyd4bbk2fbd"; depends=[shiny]; }; bundesbank = derive2 { name="bundesbank"; version="0.1-9"; sha256="05sc6m2v8bfgdka7v28rxhq5a8c88gsxkv0zjk08rpw8k8zql0dk"; depends=[]; }; bundesligR = derive2 { name="bundesligR"; version="0.1.0"; sha256="0dnhbh9jh7dfbk7mfh8msq4ys5kakalr0kwkycycrb2q8rd049vp"; depends=[]; }; - bupaR = derive2 { name="bupaR"; version="0.4.2"; sha256="0fg16lw3liwmp1y92ky32wq18lfzn8psn2sqfja0322q6b34fgjk"; depends=[data_table dplyr eventdataR forcats glue magrittr miniUI purrr rlang shiny tidyr]; }; + bupaR = derive2 { name="bupaR"; version="0.4.3"; sha256="1041agc2bxwdxham850ac9lirrirba057ghi2h33mcmba8k5a1i2"; depends=[data_table dplyr eventdataR forcats glue lubridate magrittr miniUI purrr rlang shiny stringr tidyr]; }; burnr = derive2 { name="burnr"; version="0.5.0"; sha256="19kkk4cyd7h3idn8di77426lcmq2jkxaksbpvg87hpkn72vcr8y5"; depends=[ggplot2 MASS plyr reshape2]; }; bursts = derive2 { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; }; busdater = derive2 { name="busdater"; version="0.2.0"; sha256="0hib73zay9r7rv49zv1lx0l15jzjyli9f1vrk414l8apggvx4c6s"; depends=[lubridate]; }; - butcher = derive2 { name="butcher"; version="0.1.1"; sha256="0ds4k5yj4i2dj3zd35xgsz9h3scsrirndggz7arjwgfax9cnwidh"; depends=[fs lobstr modeldata purrr rlang tibble usethis]; }; + butcher = derive2 { name="butcher"; version="0.1.2"; sha256="0z3rpjvrr42j1qqzmadigcq2ivqd40dhz7yymjmbap9nbz26rb3l"; depends=[fs lobstr modeldata purrr rlang tibble usethis]; }; bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; }; bvartools = derive2 { name="bvartools"; version="0.0.2"; sha256="16wa2bnm91764xspgvswvl3ylv0s3x5f734scw9x0zjy9q72b05h"; depends=[coda Rcpp RcppArmadillo]; }; bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; }; @@ -5777,7 +5777,7 @@ in with self; { 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]; }; - ca = derive2 { name="ca"; version="0.71"; sha256="1ywqvj0rc9ss7yim4x09yf6l80xz4y6ggl56m0c1hc9x6wxna7h2"; depends=[]; }; + 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]; }; @@ -5796,7 +5796,7 @@ in with self; { 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.0"; sha256="1hvxw2glizq8g0qnxakcxh8jc5scn0hp1x8i70fdpqwwbgx49slr"; depends=[processx R6]; }; + callr = derive2 { name="callr"; version="3.4.1"; sha256="0nyba0knzd44zz2xmr7zd9qh3rny0q8msysxf49843d9rlyv6y70"; 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]; }; @@ -5820,6 +5820,7 @@ in with self; { car = derive2 { name="car"; version="3.0-6"; sha256="0yv5mwaa0ymrbis9590mx0zcj3w6j4drhs6ab13zhx4zc3x1b7b6"; 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]; }; carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; }; @@ -5900,7 +5901,7 @@ in with self; { cdcfluview = derive2 { name="cdcfluview"; version="0.9.0"; sha256="0i6jipzpfcqs48w0cwjyynf3lpdppa7xh27q1rwv3jsqd246880v"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf 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-1"; sha256="15gm2869dgnvwmdl6zbqb3aa2ngmnqmkjz6hapff1s09y3vwhq52"; depends=[curl dplyr glue lubridate readr rlang stringr tibble]; }; + 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]; }; cdom = derive2 { name="cdom"; version="0.1.0"; sha256="00xqqqhskjlkz8ii7kqyabxk8995w7g9jiz1isyqjpwg8nsa3x28"; depends=[broom ggplot2 minpack_lm tidyr]; }; @@ -5958,7 +5959,7 @@ in with self; { changepointsHD = derive2 { name="changepointsHD"; version="0.3.3"; sha256="1wdhmkg21kb5jd95a0aqqp2qgdkndc69rbdxjf792gq8f1rigarh"; depends=[Rcpp RcppArmadillo]; }; changepointsVar = derive2 { name="changepointsVar"; version="0.1.0"; sha256="0kj9m9jik1dm5fx4c4hb559f5irpl1mvxk4wwajd5577a2fdqxb5"; depends=[lars MASS]; }; changer = derive2 { name="changer"; version="0.0.3"; sha256="1pmnspadkshz7z9f275vks1xjh6a9k37h7j51dqdjrqilzq7y6sf"; depends=[available devtools git2r]; }; - charlatan = derive2 { name="charlatan"; version="0.3.0"; sha256="1i8n6kmdv8f2mnd626qja979qx35fdl1a8r9akgqznh5bhjqiq42"; depends=[R6 tibble whisker]; }; + charlatan = derive2 { name="charlatan"; version="0.4.0"; sha256="0hrc4kdympi05j6gx0x6vy4jb1mvxxi7pcrnpzcp8vxvd6r3wjmq"; depends=[R6 tibble whisker]; }; chartql = derive2 { name="chartql"; version="0.1.0"; sha256="108csn7q8qrjhiss54f5bliv3av7psq7kfryspajbdb6wm9ciz3p"; depends=[ggplot2 stringr]; }; cheb = derive2 { name="cheb"; version="0.3"; sha256="0vqkdx7i40w493vr7xywjypr398rjzdk5g410m1yi95cy1nk4mc7"; depends=[]; }; chebpol = derive2 { name="chebpol"; version="2.1-2"; sha256="126cgqnl9jy332q0ywg9dr11d4q1aichwwakb1xcrxrqw2j26zzi"; depends=[geometry]; }; @@ -5967,7 +5968,7 @@ in with self; { checkmate = derive2 { name="checkmate"; version="1.9.4"; sha256="08ddpgs4mv5d5y4j054pm8drmxkn7yvhfpbghwxlizjpnxa5g8ps"; depends=[backports]; }; checkpoint = derive2 { name="checkpoint"; version="0.4.8"; sha256="0j5z6kmpfns8i28bkdbmwcmbv8cxmfws9d57kv3g1g3km2fmiwcl"; depends=[]; }; checkr = derive2 { name="checkr"; version="0.5.0"; sha256="14hkpfbw5ibdwz2jygir2f2bb2qgrj62gn3449n4dif31nswaj2f"; depends=[err]; }; - cheese = derive2 { name="cheese"; version="0.0.1"; sha256="0yjb68qlz62vmvjf6c8qfblihkkigfbhxpw42mm6qdy4f483mpr2"; depends=[dplyr forcats kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + cheese = derive2 { name="cheese"; version="0.0.2"; sha256="08947y0zh3kp4ggvbrv7rl5rgj3yhmdwpbbkg8vd0hmbyz8vycc0"; 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]; }; @@ -5979,6 +5980,7 @@ in with self; { 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]; }; 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]; }; @@ -6005,7 +6007,7 @@ in with self; { chunked = derive2 { name="chunked"; version="0.4"; sha256="0pqk6nnxxnlsw9zal62ajjalrlmvkdrzyz2l8r10jd7s61vhra40"; depends=[DBI dplyr LaF lazyeval]; }; ciTools = derive2 { name="ciTools"; version="0.5.1"; sha256="02jgi09vkzsan47mvg65ciqc1q4vmrl14v2i5bsaqxbvxwd65lww"; depends=[arm boot dplyr lme4 magrittr MASS survival tibble]; }; cifti = derive2 { name="cifti"; version="0.4.5"; sha256="092334lcpkzv52bg53hzx64dnrwq67f3p9fzwchmafx1l46xrqx9"; depends=[gifti oro_nifti R_utils xml2]; }; - cimir = derive2 { name="cimir"; version="0.3-0"; sha256="1xin8alkv5nzmiz41r3d96aihj2234087b6mr4i896p5agm26fva"; depends=[curl dplyr glue jsonlite purrr rlang stringr tidyr]; }; + 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=[]; }; @@ -6041,7 +6043,7 @@ in with self; { cleanNLP = derive2 { name="cleanNLP"; version="3.0.0"; sha256="15prwj32rq28dqqpfagaq4vfbimjws7ldrjm7waf4w6rcavz7r93"; 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.2.0"; sha256="0n8qxvy8xixdgibh17fsl5vf1nvfj0l0804crdjq3lhr5s3b794f"; depends=[crayon knitr pillar rlang]; }; + cleaner = derive2 { name="cleaner"; version="1.3.0"; sha256="0k0nhq6ap3gwdx6vdq226d7x1sp7inrm4cgxlibvaycrg8zbcjxb"; depends=[crayon knitr pillar rlang]; }; 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]; }; @@ -6058,6 +6060,7 @@ in with self; { 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]; }; + 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]; }; @@ -6140,11 +6143,10 @@ in with self; { coRanking = derive2 { name="coRanking"; version="0.1.4"; sha256="03wvy19jrb3q31yfpmakji25zwc6zx26irj4rwkad81iwdqihq3s"; 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.10"; sha256="1yfibzkg4psmghfwpv5rivaxzizilbd8frgpd0z05hx519lmx9h7"; depends=[checkmate dplyr forcats ggplot2 gtools jsonlite lubridate magrittr purrr RCurl reshape2 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]; }; cobiclust = derive2 { name="cobiclust"; version="0.1.0"; sha256="068cqrhx7lxsvcjb62rgrca7y20cybz4445bl1qc6k16ca4bh0m9"; depends=[cluster]; }; - cobs = derive2 { name="cobs"; version="1.3-3"; sha256="1pqvz7czcchri4x79g78hbwyagb3bqzdqb047zkbdinyz067c7kb"; depends=[quantreg SparseM]; }; + cobs = derive2 { name="cobs"; version="1.3-4"; sha256="0hiw5smk6kgk0gb9840kcqkhkybl7n30s77xhjc395x09izbgix1"; depends=[quantreg SparseM]; }; 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]; }; @@ -6205,7 +6207,7 @@ 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.1"; sha256="0bwahphbvmk0jq4iafvny1nwsvcksm5avly8d30w7b6kkirym7jk"; depends=[BH Rcpp]; }; + colourvalues = derive2 { name="colourvalues"; version="0.3.2"; sha256="1ap2k9b4f0x8di0vk4756x05im64ypxhcz6s584w6j7hx4jfl3wr"; 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]; }; @@ -6305,7 +6307,7 @@ in with self; { convevol = derive2 { name="convevol"; version="1.3"; sha256="1b0lygbrdm6rqascck5iwjnm248lklc4cxr71qlgand5jsblpcnn"; depends=[ape cluster geiger MASS phytools]; }; convexjlr = derive2 { name="convexjlr"; version="0.8.1"; sha256="1x2ra1xcyd7bvc7wq49wpihh0g9ygh1bq5214vvrhfrjfjifvlaw"; depends=[JuliaCall magrittr]; }; convey = derive2 { name="convey"; version="0.2.1"; sha256="1fcfzcpiy35xr2i81q002h07zf8gvbv1m5is7j475bi13666ynzh"; depends=[survey]; }; - convoSPAT = derive2 { name="convoSPAT"; version="1.2.4"; sha256="0by1z2z7gzycwrll1agkqnpn5h5cjr6b62gpwy11wl4lh48p4213"; depends=[ellipse fields geoR MASS plotrix StatMatch]; }; + convoSPAT = derive2 { name="convoSPAT"; version="1.2.6"; sha256="17zgrwmlpzir5z8a1blf8r2sblfzbrmbdgy1b73p7l0aayhqmywp"; depends=[ellipse fields MASS plotrix StatMatch]; }; cooccur = derive2 { name="cooccur"; version="1.3"; sha256="1wlaghhi4f3v8kzwhcgq3c6as7v3zlpkzhb232qz1amr7f0058kv"; depends=[ggplot2 gmp reshape2]; }; cooccurNet = derive2 { name="cooccurNet"; version="0.1.6"; sha256="1vqfmvjrxxn977jrry47wn4lag4yi4bkyxwlis3n1ly39kkmyh2j"; depends=[bigmemory doParallel foreach igraph knitr Matrix pryr seqinr]; }; coop = derive2 { name="coop"; version="0.6-2"; sha256="052n2h7yhjj88x87sd3ci9ahhhn5r5rvsm79kh3r2zqbxsr8zzrh"; depends=[]; }; @@ -6339,7 +6341,7 @@ in with self; { 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]; }; - corpustools = derive2 { name="corpustools"; version="0.4.1"; sha256="1zg7vx9j678zj4hmmi03pyf91y7dxx5297ks6gk00b3521z7hybh"; depends=[data_table digest Matrix R6 Rcpp RNewsflow SnowballC stringi tokenbrowser udpipe wordcloud]; }; + 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]; }; @@ -6437,6 +6439,7 @@ in with self; { 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]; }; crimCV = derive2 { name="crimCV"; version="0.9.6"; sha256="14ckk88i7jk8a7kl51d7qfdis44jng6zz9zd72cdp80a57dvrvzq"; depends=[]; }; @@ -6615,6 +6618,7 @@ in with self; { 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]; }; 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]; }; @@ -6656,6 +6660,7 @@ in with self; { 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]; }; 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]; }; @@ -6666,6 +6671,7 @@ in with self; { dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; }; ddalpha = derive2 { name="ddalpha"; version="1.3.11"; sha256="1sdnb47r534nh138zk3a6b2mgi74nvshc7p5m304vjs9jlx4l2y3"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; }; dde = derive2 { name="dde"; version="1.0.1"; sha256="0qgnxb27a2wnrbfk5v22i985mqhjp4hp05vl1ccsapbxkpf0gqcv"; depends=[ring]; }; + 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]; }; @@ -6732,6 +6738,7 @@ in with self; { densratio = derive2 { name="densratio"; version="0.2.1"; sha256="0x333kfx5mdzzjsqy37j4bmv9iddlgp3wi4774lx8d159lbr6irp"; depends=[]; }; denstrip = derive2 { name="denstrip"; version="1.5.4"; sha256="0hzxphj740q6pfa1q42knr7n12bmnawg7b2fs74msxn83dka5cmq"; depends=[lattice]; }; denvax = derive2 { name="denvax"; version="0.1.2"; sha256="0a8x7z7jagshc5h6xy24xrvqv0gm08f78ik6y8ki4i0mhl8c5fyx"; depends=[]; }; + depcoeff = derive2 { name="depcoeff"; version="0.0.1"; sha256="08vs0yzfvd4ahcs5rz4i4spp8l6fg45bm0m22gn5rzxc4759mzac"; depends=[copula Rcpp]; }; depend_truncation = derive2 { name="depend.truncation"; version="3.0"; sha256="1jym52qxx8v4kbq2578d03q2593q96jccr85if47djikw0aaxmcr"; depends=[mvtnorm]; }; depmix = derive2 { name="depmix"; version="0.9.16"; sha256="1vi9fi131ni34z9p3x6pdp6y9v0y0nx71zg1q8898frhqwbwhd9c"; depends=[MASS]; }; depmixS4 = derive2 { name="depmixS4"; version="1.4-2"; sha256="07d4fxwnbl3jqczrylbvdch9q87az37jrjsmvilhl9h98z31wzaq"; depends=[MASS nlme nnet Rsolnp]; }; @@ -6919,7 +6926,7 @@ in with self; { 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]; }; - dixonTest = derive2 { name="dixonTest"; version="1.0.1"; sha256="080s5vkxn5lif9xk4q47ivq76dqda1k0srd7iaa0i48yny5f7mk2"; depends=[]; }; + dixonTest = derive2 { name="dixonTest"; version="1.0.2"; sha256="04d66nf47mllk5madqn6k36vc1gq2syp7kbif8cnf6imxr98xx50"; depends=[]; }; diyar = derive2 { name="diyar"; version="0.0.3"; sha256="1m4rs6q3gwpl9v62cmam3z207wsy2z2xr2dhxdqzggq8yk6qc83q"; depends=[dplyr lubridate rlang tidyr]; }; dkDNA = derive2 { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; }; dkanr = derive2 { name="dkanr"; version="0.1.3"; sha256="1zic7qhwq3s9w70zi1f6qyf7pzm69k5a1p5fd4n3z4nbga54njxd"; depends=[assertthat dplyr httr jsonlite purrr stringr tibble]; }; @@ -6939,7 +6946,7 @@ in with self; { 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.5"; sha256="0gw3r4sg0893gjkh54k1gyy3x5wqnv5lxhj8ds1p98c9v7j94z78"; depends=[graph igraph Matrix Rgraphviz supraHex]; }; + dnet = derive2 { name="dnet"; version="1.1.6"; sha256="11zvqrlwhil19fpss14fd8iq1mbz0xn0r2cibyd40hdhaixz7nkl"; 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]; }; @@ -7037,7 +7044,7 @@ in with self; { dtangle = derive2 { name="dtangle"; version="2.0.9"; sha256="0yg1fbrqixqp93vdw3grvz1la5l2kidgs730qp6yihkp3260cxf3"; depends=[DEoptimR]; }; 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.0"; sha256="115b08fc3rpj101i0j5gx2z3w80ylgampzvb674jhx2jxf4kl9c7"; depends=[crayon data_table dplyr rlang tibble tidyselect]; }; + 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]; }; @@ -7285,7 +7292,7 @@ in with self; { energy = derive2 { name="energy"; version="1.7-7"; sha256="13wnx5nwk7nsv7vf5sxhz4y0rxrnzm76ldgywk1bxrz67srqzf37"; depends=[boot Rcpp]; }; energyr = derive2 { name="energyr"; version="0.1.2"; sha256="0gjw2cvpvhyywxlx3vfkhlh7zjwig46z1zwdc01zxwflvdx3z40n"; depends=[RgoogleMaps]; }; enetLTS = derive2 { name="enetLTS"; version="0.1.0"; sha256="0lqnhrsg9fnkn8z5crdrajpgavk1knr9z4sbdffpa6q9n8s5pmhr"; depends=[cvTools ggplot2 glmnet reshape robustHD]; }; - english = derive2 { name="english"; version="1.2-4"; sha256="0qxrkcj65v000qi63awiak8qyqghf06b1g0f2b6gjl9ilsdkgcb6"; depends=[]; }; + english = derive2 { name="english"; version="1.2-5"; sha256="0d6rin40wy2y6k75x8d5qvf03rfy139f309wrl8xwbdb1h8fjkd1"; depends=[]; }; 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]; }; @@ -7297,7 +7304,7 @@ 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=[]; }; - entropart = derive2 { name="entropart"; version="1.6-3"; sha256="06g2fig1adyxaqz2w32343qlj95xgxx63giyggbri60sjf9fck65"; depends=[ade4 ape EntropyEstimation geiger ggplot2 ggpubr reshape2 SPECIES vegan]; }; + 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]; }; envDocument = derive2 { name="envDocument"; version="2.4.1"; sha256="074m7adnasvys28kjdgj9071fi90vsl4yv5zvpxik4crlx098dlw"; depends=[]; }; @@ -7318,12 +7325,12 @@ in with self; { 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]; }; 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-10"; sha256="1y1ki5dynzs58m1wgzsydbhpi8lmfbb9h4sma064mwyw6mih0q7g"; depends=[BiasedUrn survival]; }; + epiR = derive2 { name="epiR"; version="1.0-11"; sha256="1f9v22g7pfsywq44pck436x0dxp6nxicl3jv0d5bbppzjyf1ghp7"; 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]; }; - epimdr = derive2 { name="epimdr"; version="0.6-4"; sha256="15j0gz8pqvmjb8q7bp1bnpv8mz63cq0j5kikp3h1146nzcnlxmaw"; depends=[deSolve polspline shiny]; }; + 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=[]; }; @@ -7398,7 +7405,7 @@ in with self; { esvis = derive2 { name="esvis"; version="0.2.0"; sha256="0l4c87l9n94q14hwky7d7i4h9c5zh8r04zlcz9w4mx7ixfd34zir"; depends=[sfsmisc]; }; 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.5"; sha256="03skydbw4ch0lhhlm57qgg4q0vyd4rwzsq3v2w40jrczpxpdsn9q"; depends=[dplyr httr jsonlite Rmpfr]; }; + 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]; }; 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]; }; @@ -7409,7 +7416,7 @@ in with self; { eulerr = derive2 { name="eulerr"; version="6.0.0"; sha256="0pvyg91xamhmz4k1b18g96imkddk64d6dadg74v1mnbzjiq742wh"; 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.4.20002"; sha256="04pzn47hnjglm30f06d9iv4agapgmxr761fvbzspj6siw5yzp77g"; depends=[broom classInt countrycode curl dplyr httr jsonlite RColorBrewer readr RefManageR sf sp stringi stringr tibble tidyr]; }; + 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]; }; evaluate = derive2 { name="evaluate"; version="0.14"; sha256="0a2y7j534gbgixkwj9r1z76l2vssw4g1hznzbpclc076wkdqpj58"; depends=[]; }; @@ -7554,6 +7561,7 @@ in with self; { factory = derive2 { name="factory"; version="0.1.0"; sha256="1715bx2rn8kk5qd196jnrv5f95l54n4y0aqqdzfkgrmqihcy8ahx"; depends=[purrr 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]; }; fail = derive2 { name="fail"; version="1.3"; sha256="0vfm6kmpmgsamda5p0sl771kbnsscan31l2chzssyw93kwmams7d"; depends=[BBmisc checkmate]; }; fairadapt = derive2 { name="fairadapt"; version="0.1.0"; sha256="01ing7mm1asfgh4w8cc7f7fpv13lja97vv5skk5bri00zycwcqfd"; depends=[ranger]; }; fairness = derive2 { name="fairness"; version="1.0.1"; sha256="1n17vrp0a3zii3444a2a7k33ffmyxmm15c8m7ln2fypya1z2pc5l"; depends=[caret devtools e1071 ggplot2 pROC]; }; @@ -7614,7 +7622,7 @@ in with self; { 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.3"; sha256="0xjwdwi6r8mpjzzf72bf13waf3pbjlrmbn4v8z8b6j35bdx76ij8"; depends=[ggplot2 gridExtra plyr Rcpp RcppArmadillo tibble]; }; + fastshap = derive2 { name="fastshap"; version="0.0.4"; sha256="0ll1ak1ps24q2m8h71swszcm3p8qzj29gaaznihws3mvppkygc57"; 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]; }; @@ -7635,6 +7643,7 @@ in with self; { 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]; }; + 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]; }; @@ -7658,7 +7667,7 @@ in with self; { 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.2"; sha256="0hsfmp6ay2c64wpwhaibxbbjc6s958nkrch64r6z3rbjina5avam"; depends=[dplyr glue googlesheets pedometrics readr sp stringr xlsx]; }; + febr = derive2 { name="febr"; version="1.0.3"; sha256="0rpk9k33ykcb8m475p420hpc1rj64i29dq8h0r9d49yl90ixhrn6"; depends=[dplyr glue googlesheets pedometrics readr sp stringr xlsx]; }; 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]; }; @@ -7785,6 +7794,7 @@ in with self; { 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]; }; 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]; }; @@ -7858,7 +7868,7 @@ in with self; { 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=[]; }; - fracdiff = derive2 { name="fracdiff"; version="1.5-0"; sha256="0f735pb94xxmnqypfd5zi3qmlqg7m10z20g2cbqq71aa0y22cbvr"; 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]; }; @@ -7984,7 +7994,7 @@ in with self; { 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-2"; sha256="0b69gv4g5cx2p9jciy3dbixc7cc5ybyz79w21bxzpjxkcqawcp8q"; depends=[functional graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; + gRain = derive2 { name="gRain"; version="1.3-3"; sha256="1vbsvnipy014lda8djxz5a81c0c967hci31jlmkkg5523p8l2g6r"; 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]; }; gRc = derive2 { name="gRc"; version="0.4-3.2"; sha256="0f8m83wqhmsn6p0v0msdzyy9vl900nc9ddr8y78181jxcd9mqd0d"; depends=[gRbase MASS]; }; @@ -7994,7 +8004,7 @@ in with self; { 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.0.0"; sha256="09avy1xclzy5rb1wg8b7wmh4rcdi70b1xhbm9y93k0242p0yfb0r"; depends=[broom dplyr future future_apply ggplot2 ggrepel gWQS 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]; }; 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]; }; @@ -8097,7 +8107,7 @@ in with self; { 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]; }; geigen = derive2 { name="geigen"; version="2.3"; sha256="0blg4w9wjprbax8z6md3285v12ajcjmcrpca52l3kd5qmxlvizy7"; depends=[]; }; - geiger = derive2 { name="geiger"; version="2.0.6.2"; sha256="0780mrs5accmlscg8ya3i341gxdk1d2x21hj4lhjhrcdc1xh8lwi"; depends=[ape coda colorspace deSolve digest MASS mvtnorm ncbit Rcpp subplex]; }; + 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]; }; @@ -8262,7 +8272,7 @@ in with self; { ggetho = derive2 { name="ggetho"; version="0.3.4"; sha256="05wh0qk5cbcvcfgj5wf12qqbjgl1bbwcxywc16qdby7r4h5wy0gn"; 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="0.9"; sha256="03adq3pdhlgckqc20aw6r70kdcrw0v4rmm848ivv6wkck4qyla3m"; depends=[dplyr ggplot2 magrittr RColorBrewer rlang]; }; + 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]; }; @@ -8272,7 +8282,7 @@ in with self; { 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.1.0"; sha256="1mfjvfm5xbih7k7qz6x8akbqgh0b18dz9pybfgh7rbq2ppwnhpy9"; depends=[dplyr ggplot2 ggrepel magrittr purrr rlang tibble]; }; + 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]; }; gginnards = derive2 { name="gginnards"; version="0.0.3"; sha256="15ly88wjsd2fqvp483376rm2fczcbmj1s1vagb70z9z7968407xy"; depends=[ggplot2 magrittr rlang stringr tibble]; }; @@ -8339,9 +8349,9 @@ in with self; { 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.0.1"; sha256="1llinfajb0g7006jd2w1hpskxpmkjhnqarcjb71r1qvsccb2ph7k"; depends=[httr ini jsonlite]; }; + 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.7"; sha256="195hsskh2ykafqr93f675xqsmhbrki3abi61hk78bzy09n1d4jfk"; depends=[gplots numDeriv]; }; + 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]; }; gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; gifski = derive2 { name="gifski"; version="0.8.6"; sha256="00w4bzp0rrp4isy1rnxs6g1q07r3wndadk3mqdrxk2wxi7jmghna"; depends=[]; }; @@ -8376,7 +8386,7 @@ in with self; { gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; }; glinternet = derive2 { name="glinternet"; version="1.0.10"; sha256="15dikazmhs7md7j8p45f67h3947br18hsrjl74cjk10vazd0ihng"; depends=[]; }; gllm = derive2 { name="gllm"; version="0.37"; sha256="169y3yz947d8qdphqv2a6yrdash6v2h9jfvj2fk7rcpmz0r45kl6"; depends=[]; }; - gllvm = derive2 { name="gllvm"; version="1.2.0"; sha256="1ks2kz3c7gfcnxc0c8s0d88ygnzkczczv4z8why8qqp7s5bivk10"; depends=[fishMod MASS Matrix mgcv mvabund mvtnorm RcppEigen statmod TMB]; }; + gllvm = derive2 { name="gllvm"; version="1.2.1"; sha256="1zz1q8qxgpb9kxcdrylpgl36x3lq7gg12r0gjmhrry584y1adp59"; depends=[fishMod MASS Matrix mgcv mvabund mvtnorm RcppEigen statmod TMB]; }; glm_deploy = derive2 { name="glm.deploy"; version="1.0.4"; sha256="1akklvbhz2pp0sv1hax1jq0s9ajbfv1597z643gh5l9hwizj2h9m"; depends=[Rcpp]; }; glm_predict = derive2 { name="glm.predict"; version="3.1-0"; sha256="16ahl6jvydmx48hzixv8whsr55w527k0a1xbic20crinblx0ncb4"; depends=[MASS nnet]; }; glm2 = derive2 { name="glm2"; version="1.2.1"; sha256="1byqlvpls23gzy7xlbs1kgfr4bsrmsrpc8rzzacf9czap1nlw39y"; depends=[]; }; @@ -8430,7 +8440,7 @@ in with self; { 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.5"; sha256="042mzsl6z6s61fy5m21yf9q83l08vnyqljn4iax7kqyiycpsp0gn"; depends=[]; }; + 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]; }; gnFit = derive2 { name="gnFit"; version="0.2.0"; sha256="0cji4zjslh18dfj0l827r6br4hx2f0akiaxrg7fhhyyyhgdcjnsm"; depends=[ismev rmutil]; }; @@ -8441,6 +8451,7 @@ in with self; { 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]; }; 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]; }; @@ -8536,6 +8547,7 @@ in with self; { 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]; }; 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]; }; @@ -8615,7 +8627,7 @@ in with self; { gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; 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.26.0.2"; sha256="1ldjk1gm6jb5zvk2rmlfah4zm827dpmj4c5q83ysd4arwqqz5gna"; depends=[jsonlite RCurl]; }; + h2o = derive2 { name="h2o"; version="3.28.0.2"; sha256="1975898p9bh61qa01aqzdkxjcnblgbkn0ld7das9ibav4w5jjva5"; 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]; }; @@ -8692,6 +8704,7 @@ in with self; { 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]; }; 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]; }; 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]; }; heims = derive2 { name="heims"; version="0.4.0"; sha256="0vnq31jwn09grni4gdhf1hzd87b62as4f65b2qw7ky6mi38ahr5d"; depends=[bit64 data_table fastmatch hutils lubridate magrittr]; }; @@ -8705,7 +8718,7 @@ in with self; { hereR = derive2 { name="hereR"; version="0.3.0"; sha256="119py0lpbnc03v2md3wg5pbq7kz40rw82jhmc529i6hkz4qf65js"; 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.0.3"; sha256="166jqxlp2x459ixm83kw55ssd86041qiwfymsk035r5aaf7nvjq1"; depends=[]; }; + 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]; }; 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]; }; @@ -8884,7 +8897,7 @@ in with self; { 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.2.9"; sha256="1bspcndcq6a2y3pnsfijp11pczxikbxy3m9jjznwfiisl8xcvqav"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra Hmisc htmlwidgets knitr Matrix NbClust pheatmap plotly plyr RColorBrewer reshape Rtsne scatterplot3d shiny uwot]; }; + 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]; }; 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]; }; @@ -8947,6 +8960,7 @@ in with self; { icosa = derive2 { name="icosa"; version="0.9.81"; sha256="05gpiksncdi536f4py7szfi6myny1gqj8i0hsgpma7cfcm3npn0l"; depends=[igraph raster Rcpp rgdal rgl 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]; }; + 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=[]; }; @@ -9170,7 +9184,7 @@ 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.3.0"; sha256="1lix9j9xnid0npxmjyjk79an2jfcjf0k109d05cv5hv02813kj23"; depends=[dplyr ggplot2 gridExtra pbapply purrr reshape2 rlang statmod tidyr]; }; + irtplay = derive2 { name="irtplay"; version="1.4.0"; sha256="0v2zwb9jqfbbmfs8zshzvmmhz7g98pm3k9q83yb38q2zakvg1jip"; depends=[dplyr ggplot2 gridExtra 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]; }; @@ -9235,7 +9249,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.0"; sha256="131bld44bkjahpby0aqscl9sh1abc31dx2822vbdvib55hls45ay"; depends=[dplyr magrittr purrr rlang snakecase tidyr]; }; + janitor = derive2 { name="janitor"; version="1.2.1"; sha256="1sgak2zdwy9kwz24q88dpjjvnc8pmw9iansy5ci2hphh3wiykali"; depends=[dplyr magrittr purrr rlang snakecase tidyr]; }; 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]; }; @@ -9263,7 +9277,7 @@ in with self; { 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]; }; - joineRmeta = derive2 { name="joineRmeta"; version="0.1.1"; sha256="0d9wwb3v43v30xjy67j366mhwixzz79bm67j01fqmcdsnmn3qpjn"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm nlme statmod survival]; }; + 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]; }; jointDiag = derive2 { name="jointDiag"; version="0.3"; sha256="0pra70jcnkqkzrxz5vc6lzi637rp5w8n9wbv9ix718vnd0j3fm3n"; depends=[]; }; @@ -9296,9 +9310,9 @@ in with self; { 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]; }; jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; }; - jtools = derive2 { name="jtools"; version="2.0.1"; sha256="03c3nii7il8wjdpv99xqlbpf12hjpw7ni4vdqxmkffybra6c97nx"; depends=[crayon ggplot2 magrittr pander pkgconfig rlang tibble]; }; + jtools = derive2 { name="jtools"; version="2.0.2"; sha256="1vm2jd70w4a9qfnq2wjixnvpv9yilal6xpfjajgqx289c19csvq9"; 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.1"; sha256="1wdm5k9hy3v3kahjyhifqqivqn13c8h3bcxg2z2qam7hcafvdc1l"; depends=[data_table readxl xts yaml zoo]; }; + 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]; }; @@ -9423,6 +9437,7 @@ in with self; { ks = derive2 { name="ks"; version="1.11.6"; sha256="0hcccjfqnzdxkmnfzq8c5a7yhc138azwyl7rp29d1vl1jawwrwfq"; 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=[]; }; ksrlive = derive2 { name="ksrlive"; version="1.0"; sha256="1zd3ggzgjks0jay69s5m7ihbd7v7zha6ssj2m9ahnyp00ghpk83j"; depends=[tightClust]; }; kst = derive2 { name="kst"; version="0.5-2"; sha256="0xkmwr4222h4r5dzmfgr0zk8gx7bplm865p5snw2q6h46rbfsasv"; depends=[proxy relations sets]; }; kstIO = derive2 { name="kstIO"; version="0.3-0"; sha256="0pmgb7n4gvslzc6qhqga39593k45vimj1y774bfsxhsacsb1ad9l"; depends=[kstMatrix MASS pks relations sets stringr]; }; @@ -9556,7 +9571,7 @@ in with self; { leafpm = derive2 { name="leafpm"; version="0.1.0"; sha256="06d2k5x6bnv7bf4aw2bayi8sh5bw8z6akwnp7da5s7454hyqn0vv"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet sf]; }; leafpop = derive2 { name="leafpop"; version="0.0.5"; sha256="0mv04inb7glv69baq6xwdm2rnk9mihjz0rgd4zw6qyxnf03lhh06"; depends=[base64enc brew htmltools htmlwidgets sf svglite uuid]; }; leafsync = derive2 { name="leafsync"; version="0.1.0"; sha256="0p6pb7w5yz2wj33kdh7ixii9f6b8zv018psp6b7ifr7npgdxi3vx"; depends=[htmltools htmlwidgets leaflet]; }; - leaftime = derive2 { name="leaftime"; version="0.1.2"; sha256="0a653h0lhdw10j9yv0jsvaivj09fz1cjg3z9g3caja6c83w5c65q"; depends=[geojsonio htmltools htmlwidgets leaflet]; }; + leaftime = derive2 { name="leaftime"; version="0.2.0"; sha256="10ij06rq7kmfnzfa629l2kskwj96lh87m00wi9b1aq15b5h7bxls"; depends=[htmltools htmlwidgets leaflet]; }; leanpubr = derive2 { name="leanpubr"; version="0.3.1"; sha256="0c8pmzn25cwv0wccf30zrrqrs5amlk8iqyyva9vp9976wzwgbxrx"; depends=[httr jsonlite xml2]; }; leapp = derive2 { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[corpcor MASS sva]; }; leaps = derive2 { name="leaps"; version="3.1"; sha256="1dn3yl1p03n0iynd1vsdkrr0fhmvgrmfkv37y7n371765h83lz1x"; depends=[]; }; @@ -9774,7 +9789,7 @@ in with self; { 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]; }; lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; }; - lpSolve = derive2 { name="lpSolve"; version="5.6.13.3"; sha256="1xazby8amb47vw5n12k13awv7x3bjci3q8vdd3vk1ms0ii16ahg6"; depends=[]; }; + 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=[]; }; lpbrim = derive2 { name="lpbrim"; version="1.0.0"; sha256="1cbkzl23vgs9hf83ggkcnkmxvvj8867k5b9vhfdrznpqyqv1f2gp"; depends=[Matrix plyr RColorBrewer]; }; lpc = derive2 { name="lpc"; version="1.0.2.1"; sha256="1g1dzm7pcrbrdk1dmhbdhj58j69dzar41al3i8q4gysf3adqzsvv"; depends=[]; }; @@ -9851,7 +9866,7 @@ in with self; { 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"; sha256="1z5ffm85x74hn6z4gz51mcg119122f5al4rg0dnc3w2xx03xpg3j"; depends=[aftgee icenReg survival]; }; + mable = derive2 { name="mable"; version="2.0.1"; sha256="1jz0nnjx0sidxgvqfsmps3h4g4f73fpks37r6v11da0dmkcb1biz"; 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]; }; @@ -9871,7 +9886,7 @@ in with self; { 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]; }; magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; }; - magick = derive2 { name="magick"; version="2.2"; sha256="1xh5mhaks3wk1iwqs9d3lnbfv121lc1yz5fqdzk5il9ppr831l85"; depends=[curl magrittr Rcpp]; }; + magick = derive2 { name="magick"; version="2.3"; sha256="182b4wahkq9q0scn99mql4vm9fp92nja0r5yizc4x9rjl492ahd8"; depends=[curl magrittr Rcpp]; }; magickGUI = derive2 { name="magickGUI"; version="1.1.1"; sha256="0p2266vpy6snvn0a4winwv3qygz1gkhh3kxa8qmf7qdx34xv4qwd"; depends=[magick]; }; magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; }; magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; }; @@ -10122,7 +10137,7 @@ in with self; { 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=[]; }; - metap = derive2 { name="metap"; version="1.2"; sha256="0pfbcixjrzx81l9wqhlp55khg9k63zf8pvg2n39c19akr4ppzhvf"; depends=[lattice mutoss Rdpack TFisher]; }; + 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]; }; @@ -10143,6 +10158,7 @@ in with self; { 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]; }; 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]; }; @@ -10189,8 +10205,6 @@ in with self; { 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=[]; }; - microclass = derive2 { name="microclass"; version="1.1"; sha256="0hl2s4135k187f0vqmj9snvmnwa5k9fg8ahivfs7ciknrcxfv3nk"; depends=[microcontax microseq Rcpp RcppEigen RcppParallel]; }; - microcontax = derive2 { name="microcontax"; version="1.0"; sha256="0l5mfgda5xagjbh9bwv328k3m7kgggdm90rc8fr1ic59hvg56f3g"; depends=[microseq]; }; microdemic = derive2 { name="microdemic"; version="0.4.0"; sha256="0i4pkrw02ad8ssvryndf7pxgk5wcyn4126yvl28fxk38249kvc9v"; depends=[crul data_table 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]; }; @@ -10371,7 +10385,7 @@ in with self; { mnlogit = derive2 { name="mnlogit"; version="1.2.6"; sha256="0dfwpkl8g7ap5xr48smiv8vdbamd2r1liy9nwpsn0kcsr9cj65n9"; depends=[Formula lmtest mlogit]; }; mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; }; mnormt = derive2 { name="mnormt"; version="1.5-5"; sha256="1b34xxrnf35khsx82mhvmk96sgfr2flyasaah7qkb2976pwxay7z"; depends=[]; }; - mnreadR = derive2 { name="mnreadR"; version="2.1.3"; sha256="1vyri8kd5afr1hdy7lxh0bsb6zxkz4hcb0q6a8m4mmrizqav6v1q"; depends=[dplyr ggplot2 nlme tibble tidyr]; }; + mnreadR = derive2 { name="mnreadR"; version="2.1.4"; sha256="11mfpf12pjpgvcih6q8l9fwspj2gy78fcirimzv7gn061nr4v7sg"; depends=[dplyr ggplot2 nlme tibble tidyr]; }; 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=[]; }; @@ -10392,7 +10406,7 @@ in with self; { modelDown = derive2 { name="modelDown"; version="1.0.1"; sha256="0rdpma8g461a17n6qsdvjb9s5nnhap1n05mavjy8cpj7d8j7ikkv"; 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.0"; sha256="0jr29m536pn2v3h7vl898szl4cin8wll3mhl0gmx01a0naz9vsbx"; depends=[bayestestR effectsize emmeans insight parameters]; }; + modelbased = derive2 { name="modelbased"; version="0.1.1"; sha256="08ck275nfvskrnvlixclyz994bagwlc1gcca0qnh3x9mq9xcspiy"; 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]; }; modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; }; @@ -10447,6 +10461,7 @@ in with self; { 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]; }; 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]; }; @@ -10485,7 +10500,7 @@ in with self; { 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]; }; - mrds = derive2 { name="mrds"; version="2.2.0"; sha256="08m5a61rpbw5pv0v0yspihkzihcxazsh6w5kmfvg68s4akjwcnqi"; depends=[mgcv numDeriv optimx Rsolnp]; }; + 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]; }; @@ -10690,6 +10705,7 @@ in with self; { 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_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]; }; @@ -10748,6 +10764,7 @@ in with self; { 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]; }; networkD3 = derive2 { name="networkD3"; version="0.4"; sha256="02wxki67drppgfka1is1ykg1f2rxf0x0657c0crj7ipfy62jbf1k"; depends=[htmlwidgets igraph magrittr]; }; @@ -10790,7 +10807,7 @@ in with self; { nima = derive2 { name="nima"; version="0.6.1"; sha256="0rfb624pap2ga19vll6hbvjh2jr8dh3i1bj1h8qpqpb5nk6lkf4x"; 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]; }; - nipals = derive2 { name="nipals"; version="0.5"; sha256="1zrn1ykl9scd988wj3mm0j6g5q6lq04iwn2ibgap1lrsd0rw1zbf"; depends=[]; }; + 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]; }; nlMS = derive2 { name="nlMS"; version="1.1"; sha256="01ijg1bp3r0dg8ph7qpsx3hqzrrvfhbykml20hqchxk7c5n2w9wz"; depends=[nlme]; }; @@ -10800,6 +10817,7 @@ in with self; { nleqslv = derive2 { name="nleqslv"; version="3.3.2"; sha256="1v9znvncyigw9r25wx2ma0b7ib179b488dl0qsrhp5zrcz7mcjgm"; depends=[]; }; 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]; }; 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]; }; @@ -11243,7 +11261,7 @@ in with self; { palr = derive2 { name="palr"; version="0.1.0"; sha256="1v0bajsnzqamx9y275qhvzp56vzzs3hyp4mr5ijqynqj4376fqys"; 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="0.9"; sha256="01dv70ca3zif2b2fkx4xjl24x9p9kc63wf0dj5agdjp5qgbkp1p5"; depends=[gmodels lattice lme4 lmerTest mvtnorm]; }; + 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]; }; 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]; }; @@ -11257,7 +11275,7 @@ in with self; { 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]; }; panelvar = derive2 { name="panelvar"; version="0.5.2"; sha256="1rr7d0cyz6afxhwqslvcnbfb03cizpfldzwsfnkzxqmxpqasbw80"; depends=[ggplot2 knitr MASS Matrix matrixcalc progress reshape2 texreg]; }; - pangaear = derive2 { name="pangaear"; version="0.8.2"; sha256="1dy8fgfsm6n88mchc8c6z918iih0myg04xh8hjhnss1idhy5206f"; depends=[crul hoardr jsonlite oai png tibble xml2]; }; + 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]; }; papeR = derive2 { name="papeR"; version="1.0-4"; sha256="1sc336haqsx6825g7m0z3a4pjklrmnzkq4995dpqwhvdvcikk9jd"; depends=[car gmodels xtable]; }; paperplanes = derive2 { name="paperplanes"; version="0.0.1.9"; sha256="1d9grc95xqxn91lvk8v7w3z90bhl8savkhihwshyjp8ij2xpzfkl"; depends=[]; }; @@ -11377,7 +11395,7 @@ in with self; { 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]; }; - pcmabc = derive2 { name="pcmabc"; version="1.0.4"; sha256="1s6j9353azn0561is4dlisi6lnam9ng2rlwdnrj7hpbhr3hskpxl"; depends=[ape distory geiger mvSLOUCH phangorn TreeSim yuima]; }; + 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]; }; @@ -11438,7 +11456,7 @@ 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.2"; sha256="1pcjmqqm178dvdcpzkv5p4sj7glsppcny7znljb2nqkxh539a59p"; depends=[bayestestR insight]; }; + performance = derive2 { name="performance"; version="0.4.3"; sha256="1164585ywbnrcy7an57kifh2gdb6g08z9pxw75ywqdcfyd51i3dz"; 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]; }; @@ -11524,7 +11542,7 @@ in with self; { 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.0"; sha256="0zbkh7j3i87c77k9z959gq676qn3aqnsx8lvm7jg99yl9p7i5znm"; depends=[git2r httr jsonlite RCurl rlist SASxport shiny stringr yaml]; }; + 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]; }; phyclust = derive2 { name="phyclust"; version="0.1-28"; sha256="0y6f4d4mnpgk841knbhaf73khbakjphim9x4sqrczgsrsjas596f"; depends=[ape]; }; phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; }; @@ -11594,7 +11612,7 @@ in with self; { 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.27"; sha256="0spcamjncj78kzjps2rw4v1a4494yazv6xvhn0vmdflnypc8k8hp"; depends=[bibtex codetools digest magrittr registry stringi stringr withr xtable]; }; + 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]; }; 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]; }; @@ -11845,7 +11863,7 @@ in with self; { prettycode = derive2 { name="prettycode"; version="1.1.0"; sha256="1ifh9h73szc23p1ii77z0r68n1gghndqqdm07wd7gxsg5pppp1sg"; depends=[crayon]; }; prettydoc = derive2 { name="prettydoc"; version="0.3.1"; sha256="02x4vf7rr4gazz6mmygynqnjs016jhjb2gg109sqrs0nwk1blcm9"; depends=[rmarkdown]; }; prettymapr = derive2 { name="prettymapr"; version="0.2.2"; sha256="151jp0l728krmxcyzwjh01mvd1zhqijq0nsgjaqsh0q8n3jmndi0"; depends=[digest httr plyr rjson]; }; - prettyunits = derive2 { name="prettyunits"; version="1.1.0"; sha256="0453vvslpkj1ysyv0cy9hw98q5wlnj7bvvz7vzl5ld8ij82lwy5c"; depends=[]; }; + prettyunits = derive2 { name="prettyunits"; version="1.1.1"; sha256="1ibmzgknw5896q2i6r59jz2izblxwgb29ivvjzx50pkd1jl9l6cs"; depends=[]; }; prevR = derive2 { name="prevR"; version="3.4.0"; sha256="1y61ggqjf3b2a5f9zprbp9ylfkcfk0jiqfymkyqci9figsnahdy1"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; }; 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]; }; @@ -11856,7 +11874,7 @@ in with self; { 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]; }; - primerTree = derive2 { name="primerTree"; version="1.0.4"; sha256="15am88swc9h8igjnjqr4jg105i91lsl28nncqly03cgy4vm814kk"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr reshape2 scales stringr XML]; }; + primerTree = derive2 { name="primerTree"; version="1.0.5"; sha256="1ymj4y0a8pd0r15bsqilm03b2n0a633ibzzp2h0qkv880xqbikz4"; depends=[ape directlabels foreach ggplot2 gridExtra httr lubridate plyr RCurl reshape2 scales stringr XML]; }; primes = derive2 { name="primes"; version="0.1.0"; sha256="0hhkgpkadvai9xcivfalsvr5w0irsxygyz3p2zngwl3g5rvvh5g9"; depends=[Rcpp]; }; princurve = derive2 { name="princurve"; version="2.1.4"; sha256="1b3grra328wkfsmqkkwp3lwdzhbdiwyq380qi5pl9r2jc6arnppj"; depends=[Rcpp]; }; prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; @@ -11906,6 +11924,7 @@ 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=[]; }; 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]; }; @@ -11972,10 +11991,10 @@ in with self; { 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]; }; - psycho = derive2 { name="psycho"; version="0.4.91"; sha256="0yfjgsxkbp878phjvxyb2caiy5nkknkv66294arqvmadh4an7ip3"; depends=[BayesFactor blavaan broom DescTools dplyr emmeans ggcorrplot ggplot2 lavaan lme4 lmerTest loo MASS MuMIn nFactors ppcor psych purrr qgraph rstanarm rstantools scales stringr tibble tidyr]; }; + 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.4.1"; sha256="1i79hs2433qlg4qj62dwxbaz9p07byr9fy46dkqaibs5shkf03xh"; depends=[abind corpcor crayon dplyr glasso lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply pbv qgraph Rcpp RcppArmadillo ucminf VCA]; }; + 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]; }; psymonitor = derive2 { name="psymonitor"; version="0.0.2"; sha256="09288w2bk5jhnbyj516jqn5qb33yqqg5kqbg6ylqk7anlq2yg2sl"; depends=[doParallel foreach magrittr]; }; @@ -12324,6 +12343,7 @@ in with self; { 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]; }; 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]; }; @@ -12349,7 +12369,7 @@ in with self; { 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.2"; sha256="1s2n862s7wwgqwy28j02g68k5xdxzx115qvv205shwgrpy5aszz8"; depends=[doParallel foreach ggplot2 imager magrittr png progress raster rayrender Rcpp RcppArmadillo rgl scales]; }; + 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]; }; 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]; }; @@ -12438,7 +12458,7 @@ in with self; { 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.1"; sha256="0fzx0qy9s366gd81xiz36k3v4d9sdsrrf3m5azlghvbvq5h42wxv"; depends=[htmltools]; }; + 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]; }; 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]; }; @@ -12599,7 +12619,7 @@ in with self; { 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]; }; reshapeGUI = derive2 { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; }; - respirometry = derive2 { name="respirometry"; version="1.0.1"; sha256="1syc2gf3jri90pi0qmrhwg472rn6dx8abpr9yb8jb5q1f1qs07p0"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; }; + 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]; }; 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]; }; @@ -12677,7 +12697,7 @@ in with self; { 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.5"; sha256="10r869fxry4056izaar1yjyl8ad2wyy6fvbrzwbxd76fifq49l7j"; depends=[dplyr]; }; + riceidconverter = derive2 { name="riceidconverter"; version="1.0.6"; sha256="1p3dzlvsbf51igmq3m3m9vy023l9ybi81zdqbcqmbpa581zlg52x"; 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=[]; }; @@ -12724,7 +12744,7 @@ in with self; { 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.2"; sha256="0fczcp17kaz3s4p0nd4126bppwl20vpxfybhsndpcky9h75wklgv"; depends=[]; }; + 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]; }; 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]; }; @@ -12784,7 +12804,7 @@ in with self; { 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.4"; sha256="1kivj594bn774lbn29ws2rmzy2km99sza0j3jqvhal6hwmk27a9s"; depends=[digest pkgmaker stringr]; }; + 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]; }; @@ -12797,7 +12817,7 @@ in with self; { 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.4"; sha256="1pvd8dw0kgwxrwnafaraya1qm3cwnp2c3ma569i7nwm2xsys76xj"; depends=[]; }; + robcp = derive2 { name="robcp"; version="0.2.5"; sha256="023g9w26bxia873qblscdcf50r7qv5hknwdx45dqbr3r778ls8bn"; depends=[]; }; robeth = derive2 { name="robeth"; version="2.7-5"; sha256="0jz3ivck9ma8x03sz41zkln3qh70ckfm5c2l57nlxi0ci5h0dfh2"; 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]; }; @@ -12824,7 +12844,7 @@ in with self; { robustlmm = derive2 { name="robustlmm"; version="2.3"; sha256="1rfiz29wy20srwd24ja42fh51ng9vyqrkjbb2dzvsqf663hsf1q0"; depends=[cubature fastGHQuad ggplot2 lattice lme4 Matrix nlme Rcpp RcppEigen robustbase xtable]; }; robustloggamma = derive2 { name="robustloggamma"; version="1.0-2.1"; sha256="1lj0479jgpfdn0886ap9j0vcajr1h30g30yy8vn844z9sbq45d47"; depends=[numDeriv RobustAFT robustbase survival]; }; robustrank = derive2 { name="robustrank"; version="2019.3-7"; sha256="1wqfr6l7vzx8yjvj8f03djdr5srdql0gl041mgnbrc3r4n7ajg7x"; depends=[kyotil]; }; - robustrao = derive2 { name="robustrao"; version="1.0-3"; sha256="0gcxxizsg380blrv55vl9f3az8gnr274c6idi0pimhh5c26h7ma6"; depends=[doParallel foreach gmp igraph iterpc quadprog]; }; + robustrao = derive2 { name="robustrao"; version="1.0-5"; sha256="1r8v9qjx70s8swh09imq9kzdxg0qhnmk00zrg939mig9b12mw1p6"; depends=[doParallel foreach gmp igraph iterpc quadprog]; }; robustreg = derive2 { name="robustreg"; version="0.1-11"; sha256="08c6dyzki68hzl006s12bkjiirlw2n2isirjh8b79sd6zjrjlh72"; depends=[Matrix Rcpp RcppArmadillo]; }; robustsae = derive2 { name="robustsae"; version="0.1.0"; sha256="0fi1fpqnfj6vkmidlr90kqbn1bxxxqb5qpqqrz9rrimlsvrc4ddl"; depends=[coda lattice MCMCpack mvtnorm pscl]; }; robvis = derive2 { name="robvis"; version="0.3.0"; sha256="0xzvx3230ydd082jmdlm70vyhjizknngfzhvcbqpdcm403klni5h"; depends=[ggplot2 scales tidyr]; }; @@ -12872,6 +12892,7 @@ in with self; { 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=[]; }; @@ -12957,7 +12978,6 @@ in with self; { rscorecard = derive2 { name="rscorecard"; version="0.14.0"; sha256="0r951j0n841ihlig2aw76vxdd31zbx98k4sz92nmi8zb69669d5w"; 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]; }; - rsed = derive2 { name="rsed"; version="0.1.2"; sha256="1rk7wkidvdn1d39a11cbgglz2dg74bbv3v1ijjdx903kgwg3nnrc"; depends=[Smisc]; }; 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]; }; @@ -13018,9 +13038,9 @@ in with self; { 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=[]; }; rts = derive2 { name="rts"; version="1.0-49"; sha256="086zlmcjsv7a38k1jfzq2vhlmx7nivhffcz83i57hl6wbkjl7gv2"; depends=[raster RCurl sp xts zoo]; }; - rtsdata = derive2 { name="rtsdata"; version="0.1.1"; sha256="1xh5wsc330x49zcid8hpv9jarbp64dgq10k6lbjjsx1n7dg9qm3z"; depends=[alfred anytime curl data_table mongolite Quandl quantmod 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.1"; sha256="0dkv8pl2937zfpcwyy9ms1ak29nv9mxyb8w6bh2ns8figjp11zmp"; depends=[quantmod RColorBrewer xts zoo]; }; + rtsplot = derive2 { name="rtsplot"; version="0.1.2"; sha256="1y2is2n2r0xz71ajvxqc22qg8dzidrzq475a7nc7xjgfriayx535"; 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]; }; @@ -13048,7 +13068,7 @@ in with self; { 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]; }; rvest = derive2 { name="rvest"; version="0.3.5"; sha256="0r0a5jic09xw5pk0x42pr99r3zab5m9s4x85ymx1sl769jz42zqf"; depends=[httr magrittr selectr xml2]; }; - rvg = derive2 { name="rvg"; version="0.2.2"; sha256="0f74ja8frkfgb5hhsdydirn7v6hhylmq5wbay9p0z2ac16xrslrd"; depends=[gdtools officer Rcpp rlang xml2]; }; + rvg = derive2 { name="rvg"; version="0.2.3"; sha256="1psqjwn80vqfvfl9hyx0rabqrrlqp34hrwrbg8ghsd65f0f1ncgm"; 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]; }; @@ -13132,6 +13152,7 @@ in with self; { 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]; }; + santoku = derive2 { name="santoku"; version="0.3.0"; sha256="019wdskp1i9y7z858mwhx5k2r3zk3wq52g9fwmf66dydlf6l1yky"; depends=[assertthat Rcpp]; }; sanzo = derive2 { name="sanzo"; version="0.1.0"; sha256="1fqsx2mgjsy6vjvsp2avi2i5cw7cjs2p53l1z6hb3bzid3067s87"; depends=[]; }; saotd = derive2 { name="saotd"; version="0.2.0"; sha256="1rhkhsnmh3nf7y0x5sl3mmr5mismz8m92gj0v12niysalcywiarh"; depends=[dplyr ggplot2 ggraph igraph ldatuning lubridate magrittr maps plyr purrr reshape2 scales stringr tidyr tidytext topicmodels twitteR widyr]; }; sapa = derive2 { name="sapa"; version="2.0-2"; sha256="056xlh14dnzq4x7sbp7ff2k61jxy7110a742b502vz549qfrr5ds"; depends=[ifultools splus2R]; }; @@ -13450,6 +13471,7 @@ in with self; { 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]; }; + shinypanels = derive2 { name="shinypanels"; version="0.5.0"; sha256="1rslz9wl3gx11dm6il77j4k5swxvcfy5mf0zffbs4zk8xjgpzzj6"; depends=[glue htmltools shiny shinyjs]; }; 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]; }; @@ -13488,6 +13510,7 @@ in with self; { 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]; }; 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]; }; @@ -13565,7 +13588,7 @@ in with self; { 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.1"; sha256="0rmfc2pq80w0kxh6icljhqm31q580s0czvllsfxk6crmpyfgxkp7"; depends=[bayestestR dplyr effectsize forcats ggeffects ggplot2 ggrepel glmmTMB insight knitr lme4 magrittr MASS modelr parameters performance psych purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; + 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]; }; 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]; }; @@ -13637,7 +13660,7 @@ in with self; { 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]; }; - smoothr = derive2 { name="smoothr"; version="0.1.1"; sha256="03pqvblrw0qj55gncn6a3hb0y0y64k8v1a2a8g64p53jjmlrw9nv"; depends=[sf units]; }; + smoothr = derive2 { name="smoothr"; version="0.1.2"; sha256="0226l760rwvxkabz2r0zzpsbh1kbd65jx5xr1plqyq3gvqh1176q"; depends=[raster sf units]; }; smoothtail = derive2 { name="smoothtail"; version="2.0.5"; sha256="1sqkwniz9m03k23nba9ndmdm0g03mdshzm8risr6wz98jcqjilrk"; depends=[logcondens]; }; smoots = derive2 { name="smoots"; version="1.0.1"; sha256="1kk1hvfqxslg76gy8gzaidv3d55pflyvbv3ski6rkk0l9lwbb2q1"; depends=[]; }; smotefamily = derive2 { name="smotefamily"; version="1.3.1"; sha256="062yps71bqnyff1hzqb7yvigvqg2lnc24r9gfp8m3zhvmyprk3cp"; depends=[dbscan FNN igraph]; }; @@ -13719,8 +13742,9 @@ in with self; { 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=[]; }; soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; }; - soundgen = derive2 { name="soundgen"; version="1.6.0"; sha256="0kdlv0kxhr5r1cdls1g7pf2lyphwmvhv049s8aa31i2dlrm21j1y"; depends=[dtw mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs tuneR zoo]; }; + soundgen = derive2 { name="soundgen"; version="1.6.1"; sha256="1mbxgl7mf4gyr13xf8i5hachlmv1l3khyjwzawb3rm5wl5k7pr81"; 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=[]; }; @@ -13813,9 +13837,9 @@ in with self; { 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.62-2"; sha256="0frmm14rlhfmhby5zxjg6ngck66v85j0x8yz7r7gnx1x3g2ivk2p"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; }; + spatstat = derive2 { name="spatstat"; version="1.63-0"; sha256="0sda6gj4w06fcsamvxwvvwnxhj90ridj16v7mp8diiv463v8rca3"; 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-0"; sha256="137cf9x6qcp7lw3rpjqizsy73z99yihff8gr434wlz7b5fwmn7hj"; depends=[spatstat_utils]; }; + spatstat_data = derive2 { name="spatstat.data"; version="1.4-3"; sha256="18lfj5vkwxgf5w9qz0g5al3zy8y2yi3bnd13w24hszfc82nbcmc9"; depends=[Matrix 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]; }; @@ -13863,6 +13887,7 @@ in with self; { 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=[]; }; + spiR = derive2 { name="spiR"; version="0.1.1"; sha256="10l93f1sw4i2fd67jni32758kmnamxqxsf671k57pbf4jyczwfyy"; depends=[dplyr gsheet reshape2]; }; 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]; }; @@ -13880,6 +13905,7 @@ 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=[]; }; 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]; }; splithalfr = derive2 { name="splithalfr"; version="1.0.10"; sha256="08gl60dbjb4nq6ab0w7yj7ac0gnj0zxbvzlg3rkqczvx4r3gwkip"; depends=[dplyr rlang]; }; @@ -13939,7 +13965,7 @@ in with self; { 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.0"; sha256="1bnr9yk7c9a318pisnq7bnwb4k1ipnyksa08yaqpz8zqc88nbg4p"; depends=[abind actuar chk fitdistrplus ggplot2 lifecycle scales VGAM]; }; + 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]; }; 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]; }; @@ -14012,7 +14038,7 @@ in with self; { 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.0"; sha256="1m6swfxkifbifrh90dkjr948znfz787bmrsn4s9c0kfnxnkl3fli"; depends=[BayesFactor boot broomExtra crayon dplyr ez groupedstats psych purrr rcompanion rlang tibble tidyr WRS2]; }; + 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]; }; 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]; }; @@ -14056,7 +14082,7 @@ in with self; { stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.2"; sha256="08f16a68kmw0r1acs82sha83m04d81b7zdpxjw5g424zbvagwdj4"; 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.4.1"; sha256="0kgs3ccyhm2hi8aia7misxwj45c5fy686sqliz7vdk8jayzdsqv1"; depends=[curl dplyr geosphere httr igraph jsonlite lubridate lwgeom magrittr maptools nabor openxlsx raster Rcpp RcppArmadillo readr rgeos rlang sf sp stringr]; }; + 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]; }; 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]; }; @@ -14243,8 +14269,7 @@ in with self; { 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]; }; switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; }; - switchr = derive2 { name="switchr"; version="0.13.5"; sha256="11y9f8h5qkaykkdk5ya1z8dyw98z5svny56hx0q2b1z2f0iszwc3"; depends=[RCurl RJSONIO]; }; - switchrGist = derive2 { name="switchrGist"; version="0.2.4"; sha256="137kz944qqqrislbm6anknw6n303j441mfhfcrzh33xcb19z320v"; depends=[gistr httpuv RJSONIO switchr]; }; + 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]; }; 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]; }; @@ -14269,7 +14294,7 @@ in with self; { 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]; }; syntaxr = derive2 { name="syntaxr"; version="0.8.0"; sha256="1iik9b3x9jx7w31j7hyi3sixg30l5a6w40svhqj1xlchsk60yykn"; depends=[magrittr]; }; - synthACS = derive2 { name="synthACS"; version="1.5.2"; sha256="1y9kvp4fq1602c9876jc8102iidxzqkqsh89ix3m5qf63ldx071f"; depends=[acs data_table Rcpp]; }; + synthACS = derive2 { name="synthACS"; version="1.5.3"; sha256="1fpaqjxyrgmzsxpd2wqpabpzj6fsp88wac0kaf21nc9k5b8lf0gk"; 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=[]; }; @@ -14350,7 +14375,7 @@ in with self; { tea = derive2 { name="tea"; version="1.0"; sha256="03wxhbgx17hl9bbzbfjmfa30q4fqszhs5y9imbp768fmzwbppn24"; depends=[eva]; }; 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.3"; sha256="1p2fx30j4wplicd30b8677jdmg78fpp6cbd3nqmx8xbs01gwix9w"; depends=[dplyr ggplot2]; }; + 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=[]; }; @@ -14461,11 +14486,11 @@ in with self; { 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.5"; sha256="035x8aw96as2848j2if9v0d36zpjvybqkbb1wb04hpi92a6bm8fx"; depends=[crayon curl dplyr fuzzyjoin ggplot2 jsonlite keyring magrittr nlme rgdal sf stringi tigris usethis]; }; + 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]; }; 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.5"; sha256="0scp32d50chjvc68qp77psx7jzjdv3v4sq33lli89f2hq200ql4f"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; }; + tidycensus = derive2 { name="tidycensus"; version="0.9.6"; sha256="16lcldbs1h8y1ajsj7lv04h0gq93hfcd0mbws2wb5pgx0jr187yk"; 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]; }; @@ -14487,7 +14512,7 @@ in with self; { 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]; }; 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.0"; sha256="1403j0xd93l0r7qj738ryd5zc79hbcghrzybib3c3hrnaq5s78cj"; depends=[dplyr ellipsis glue lifecycle magrittr purrr Rcpp rlang stringi tibble tidyselect vctrs]; }; + 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]; }; tidystats = derive2 { name="tidystats"; version="0.4"; sha256="1jxn8la5s3mdh9kbkbvlc5icwa7ymingaxrl0q49ykifrsnbpd4a"; depends=[dplyr jsonlite purrr readr stringr tibble tidyr]; }; @@ -14516,7 +14541,7 @@ in with self; { timeR = derive2 { name="timeR"; version="1.1.0"; sha256="0ksdfk0hchphhixllix4wnm1ig46215093i2jvqlcrkqnx5v2zbz"; depends=[lubridate R6]; }; timeROC = derive2 { name="timeROC"; version="0.4"; sha256="1qxijg7hazc8bifwj2254ig2p3cbrp9p0bsyhhh3aikf1rg113v1"; depends=[mvtnorm pec]; }; timeSeq = derive2 { name="timeSeq"; version="1.0.4"; sha256="0m59g12dmnwpmwjmyb9x6z53x3gjmxcaxqva2dlbazsqkbzgaayp"; depends=[gss lattice mgcv pheatmap reshape]; }; - timeSeries = derive2 { name="timeSeries"; version="3042.102"; sha256="185hmd70hida6i12mxbrccapkpwb6jhf6cmcfbz8bc3sv9h3q5gs"; depends=[timeDate]; }; + timeSeries = derive2 { name="timeSeries"; version="3062.100"; sha256="1ybm4jss8y3px172kfx3mhi68k32dmyb1f21kvgcz7992jpx590l"; depends=[timeDate]; }; timechange = derive2 { name="timechange"; version="0.0.1"; sha256="054zh151am6asadj39nz3l4s37kip0bcjwg8mw59s78s5gyjbwds"; depends=[Rcpp]; }; timedelay = derive2 { name="timedelay"; version="1.0.8"; sha256="18f8x3lxhh954vn75gjg27iwyi81x7ajh1xh0bxafs7qivnimxvm"; depends=[MASS]; }; timeline = derive2 { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; }; @@ -14579,7 +14604,7 @@ in with self; { 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"; sha256="05cc6jrkjbwxzmgzq30h63xzhlgq8f0l3wx2q54vrv0wpvlvfphn"; depends=[igraph survival]; }; + tnet = derive2 { name="tnet"; version="3.0.14.1"; sha256="1fvczx1lc8a7w4mbg1yzsiayfg5qwyjvg02s4r631vcml6vkznsf"; 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]; }; togglr = derive2 { name="togglr"; version="0.1.33"; sha256="105c9vxa67bqccj31ksk5myfd0v7v0wbz6qqjhxqndlg7v6ggfzc"; depends=[assertthat dplyr getPass glue httr jsonlite keyring lubridate magrittr parsedate prettyunits purrr rstudioapi]; }; @@ -14649,7 +14674,7 @@ in with self; { treebase = derive2 { name="treebase"; version="0.1.4"; sha256="1bx31jahb0wy2g8wl1z71vy659lfi8fq1sbbaxvyixzcwymix1wq"; depends=[ape httr RCurl XML]; }; 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.3.0"; sha256="0aiqznj8mmxmwmw15m9n1c6wbjawlixwqh8ch735jjbhq737d1s4"; depends=[ape limSolve]; }; + treedater = derive2 { name="treedater"; version="0.5.0"; sha256="007rdrbv3v1z3qbyasla22rck105sqlqh93yfmxklihdydl7smfd"; depends=[ape limSolve]; }; 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]; }; @@ -14899,7 +14924,7 @@ in with self; { 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.0"; sha256="0835p71lipihxks8mzb4wisrjlnlqb794khzw0bh6f6j5s3kaspb"; depends=[rstudioapi testthat]; }; + 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]; }; @@ -14936,7 +14961,7 @@ in with self; { 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.1"; sha256="0rlwjfvvhv3s5mj4lqhwlqwddpizyp46i1qbcvw0mzb5q8b0nkz0"; depends=[backports digest ellipsis glue rlang zeallot]; }; + vctrs = derive2 { name="vctrs"; version="0.2.2"; sha256="008xjmlj5a5vm303wxac7bliamqwaj7mcj0jv6n9ibc8p8h93aqd"; depends=[digest ellipsis glue rlang]; }; vcvComp = derive2 { name="vcvComp"; version="1.0.1"; sha256="1103hjzd29f8gpsfbagdryq52m6fkhhh9dbqhbmhixxlimc7sd03"; depends=[]; }; 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]; }; @@ -14947,7 +14972,7 @@ in with self; { vegalite = derive2 { name="vegalite"; version="0.6.1"; sha256="0dlzhvrg3nj6knyycdgg3d1vzq3dn9vxb34fjin9hzilszqmarbk"; depends=[base64 clipr digest htmltools htmlwidgets jsonlite magrittr webshot]; }; vegan = derive2 { name="vegan"; version="2.5-6"; sha256="0g60rgn1i7wqf9pf5m1yki1m45gcp7i5hmjic0ci0f6vng70mh5k"; depends=[cluster lattice MASS mgcv permute]; }; vegan3d = derive2 { name="vegan3d"; version="1.1-2"; sha256="01yyhrapdvs6rr5hw1ij4jnpz7mq005s35pn96snpy8ngn6ir386"; depends=[cluster rgl scatterplot3d vegan]; }; - vegawidget = derive2 { name="vegawidget"; version="0.2.1"; sha256="1afmz3bpd863hghvfbv3yicy9hf29fr9ga741yxbkx5jd8grxzzs"; depends=[assertthat glue htmltools htmlwidgets jsonlite magrittr rlang]; }; + vegawidget = derive2 { name="vegawidget"; version="0.3.1"; sha256="154k5n3vg1fdjx6mbrlxvi9h17h651aqwr12wiknwmw0ikhcrnh0"; depends=[assertthat glue htmltools htmlwidgets jsonlite magrittr rlang]; }; vegclust = derive2 { name="vegclust"; version="1.7.7"; sha256="0f81jw429ib601lvbzi4q23kb5n6lvavlgw56wfqdmvvkl68vwlc"; depends=[circular Kendall MASS Rcpp sp vegan]; }; vegdata = derive2 { name="vegdata"; version="0.9.7"; sha256="1cfb993p8sgm08g5859v4q9mil3a64yzhx3hzddvp536pq7jsc86"; depends=[foreign plyr xml2]; }; vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; }; @@ -14987,7 +15012,6 @@ in with self; { 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]; }; 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]; }; - virtuoso = derive2 { name="virtuoso"; version="0.1.4"; sha256="1z222xl6h57fgnyk0n3d50j7y6hl9c4lb5g8n94f9krlgnbxi77q"; depends=[curl DBI digest fs ini odbc processx ps rappdirs]; }; virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; }; visNetwork = derive2 { name="visNetwork"; version="2.0.9"; sha256="0854r9znpjd9iy6j5bgrn20vj13dhp606gs3b6iy0rhym71ks2sy"; depends=[htmltools htmlwidgets jsonlite magrittr]; }; visTree = derive2 { name="visTree"; version="0.8.1"; sha256="1l07zfr2hagjpdxfw5290wa3ki4bl7iqxrrhda0d1bp3wmwfz0ai"; depends=[colorspace partykit rpart]; }; @@ -15052,7 +15076,7 @@ in with self; { 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]; }; - walker = derive2 { name="walker"; version="0.3.0"; sha256="0p45mq6xfpzr82y8pbfv04r85prvygm6z01xda4paicmimynd2r4"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; }; + 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]; }; wally = derive2 { name="wally"; version="1.0.10"; sha256="1d03vxn6q7v0nsrkd7dxkkv3siysgicv6c13fkvwmypln9vsl6sl"; depends=[data_table prodlim riskRegression]; }; @@ -15097,7 +15121,7 @@ in with self; { 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]; }; webp = derive2 { name="webp"; version="1.0"; sha256="1h17g2zaq6ipsb1w6ix9m68ddmp7dspmaqflqkskylh2n8jhk8cd"; depends=[]; }; - webr = derive2 { name="webr"; version="0.1.0"; sha256="0fjbk933034cgmqd41cw7q5xcvrwgylcic6lxav9jv3b2sspzw06"; depends=[ggplot2 moonBook stringr]; }; + 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]; }; websearchr = derive2 { name="websearchr"; version="0.0.3"; sha256="1c6dwm5g5rjq0b12zrwwi5k9760jb0ph83v4j2gm8zm0x9dhiqm9"; depends=[]; }; webshot = derive2 { name="webshot"; version="0.5.2"; sha256="0gq4h8cw51z95yvsnf38kj5l58wgljkm0dalmi8mn1sp06bxr0zi"; depends=[callr jsonlite magrittr]; }; @@ -15136,7 +15160,7 @@ in with self; { 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.0"; sha256="09nf25s134livlcgfl0aq5njg50kcw82nmiin6jqzwpjkd35x6vp"; depends=[httr jsonlite keyring readr stringi stringr xml2]; }; + wiesbaden = derive2 { name="wiesbaden"; version="1.2.1"; sha256="0ilqqv4xp4ngjq3snhzwdc8qzp3zr31kq2r4lqiv2arj5ggb1350"; 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]; }; @@ -15194,7 +15218,7 @@ in with self; { wrMisc = derive2 { name="wrMisc"; version="1.1.0"; sha256="10cg4l963aabynic25m6k3sp69d6amhkpqv5x5m38nidy4855jzb"; 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.5"; sha256="0sjahmmvcxrpn2ajffzxb4q05ibzjwpiqsrijs8wvanb55zlpf4r"; depends=[]; }; + wrapr = derive2 { name="wrapr"; version="1.9.6"; sha256="0kpwjasnsskk6l2najydcxqwa0ms2mf7v0y286hv8gipqfq48z03"; depends=[]; }; wrassp = derive2 { name="wrassp"; version="0.1.8"; sha256="052x0lxpchr6f97yfj3vmhh8gc8qg5pp1m91h5akrav4yfawbs7k"; depends=[]; }; write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; writexl = derive2 { name="writexl"; version="1.2"; sha256="09fhdip6igcg97fjx4c7727cx2lb49l4d74l4i8rg2bag2s5lrj3"; depends=[]; }; @@ -15277,9 +15301,9 @@ in with self; { 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.1"; sha256="0mrdvvbjpi65jdpzfm37h6v55dqsvmk7l5zxvkwazlcjp2w8wyg0"; depends=[csv encode ggplot2 knitr yaml]; }; + yamlet = derive2 { name="yamlet"; version="0.3.3"; sha256="181kz8xnkgm7k9ff6iw7jydfl69717b19bwwwxpyy8p9pxzmr94q"; depends=[csv dplyr encode ggplot2 knitr rlang yaml]; }; yap = derive2 { name="yap"; version="0.1.0"; sha256="12cagxisky7aq04ab9ycd4mp7xfs7z0v3rc2sczcngn2pc8pdjm7"; depends=[lhs randtoolbox]; }; - yardstick = derive2 { name="yardstick"; version="0.0.4"; sha256="03pq8wmb6467mkp7ax1gpydg5c6q82r1byhdzjl92g7986p7h3mv"; depends=[dplyr generics pROC Rcpp rlang tidyselect]; }; + yardstick = derive2 { name="yardstick"; version="0.0.5"; sha256="0gmfq1jx8lp6b24clxyj5r1976q3znlchbqa6jk87lyd5fn43f7b"; 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=[]; }; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index df44139024a54..2c927c7408c1a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -363,7 +363,7 @@ let topicmodels = [ pkgs.gsl_1 ]; udunits2 = [ pkgs.udunits pkgs.expat ]; units = [ pkgs.udunits ]; - V8 = [ pkgs.v8_3_14 ]; + V8 = [ pkgs.v8 ]; WhopGenome = [ pkgs.zlib.dev ]; XBRL = [ pkgs.zlib pkgs.libxml2.dev ]; xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; @@ -849,11 +849,16 @@ let }); V8 = old.V8.overrideDerivation (attrs: { + postPatch = '' + substituteInPlace configure \ + --replace " -lv8_libplatform" "" + ''; + preConfigure = '' - export INCLUDE_DIR=${pkgs.v8_3_14}/include - export LIB_DIR=${pkgs.v8_3_14}/lib + export INCLUDE_DIR=${pkgs.v8}/include + export LIB_DIR=${pkgs.v8}/lib patchShebangs configure - ''; + ''; }); acs = old.acs.overrideDerivation (attrs: { diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index 1c90bcc3a9f8e..7001510d52d62 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, python, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }: +{ stdenv, fetchFromGitHub, fetchpatch, python3, buildDocs ? true, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, re2c }: with stdenv.lib; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "0zsg46jflsh644jccrcgyfalr7fkzrv041kyi8644nyk923gcrl9"; }) # https://github.com/ninja-build/ninja/issues/1510 - fix w/musl, possibly BSDs? - # + # (fetchpatch { name = "fix-issue-1510.patch"; url = https://github.com/makepost/ninja/commit/567815df38a2ff54ad7478a90bd75c91e434236a.patch; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ python re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; + nativeBuildInputs = [ python3 re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; buildPhase = '' python configure.py --bootstrap diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 4ebeb7f052844..792daba791bb2 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -78,6 +78,8 @@ stdenv.mkDerivation rec { sha256 = "0936ix7lfwsamssap58b265zid7x2m97azrr2qpjcln3xysd16lg"; }; + bootstrapper = ./rebar3-nix-bootstrap; + buildInputs = [ erlang tree ]; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 2e69c7df2a3c6..9708674c6d670 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.204.1"; + version = "2.204.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "112jimw5sf6n9nszmpsllz9sb06d3d8i45fin3m1vkdikszypf8j"; + sha256 = "1iviffgz32i6rhmk6hgas4l8wpwr0h5lw5s1f5zjk3aw0r6cb42a"; }; buildCommand = '' diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 2c86cffeaab5e..67d408505db8b 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.1.2"; + version = "6.1.3"; 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 = "sha256:1rh1p50mwwlmwwdlcx7pzlsrg1dcl7gdsjbi7kyz0m71fbnn0bnv"; + sha256 = "0hd5gkfjhxb1ny8y0pqn7vs34bqk4w5k7vcygd6iz1d57q0giwp6"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/misc/argbash/default.nix b/pkgs/development/tools/misc/argbash/default.nix index b8e3ff4a9dfe9..0cc25ddf20b6b 100644 --- a/pkgs/development/tools/misc/argbash/default.nix +++ b/pkgs/development/tools/misc/argbash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf }: +{ stdenv, fetchFromGitHub, autoconf, runtimeShell, python3Packages, makeWrapper }: stdenv.mkDerivation rec { pname = "argbash"; @@ -12,12 +12,24 @@ stdenv.mkDerivation rec { sha256 = "0zara7v3pnwiwkpb0x0g37pxhmim4425q4gba712f6djj115r1mr"; }; - sourceRoot = "${src}/resources"; + sourceRoot = "source/resources"; - nativeBuildInputs = [ autoconf ]; + postPatch = '' + chmod -R +w .. + patchShebangs .. + substituteInPlace Makefile \ + --replace '/bin/bash' "${runtimeShell}" + ''; + + nativeBuildInputs = [ autoconf python3Packages.docutils makeWrapper ]; makeFlags = [ "PREFIX=$(out)" ]; + postInstall = '' + wrapProgram $out/bin/argbash \ + --prefix PATH : '${autoconf}/bin' + ''; + meta = with stdenv.lib; { description = "Bash argument parsing code generator"; homepage = "https://argbash.io/"; diff --git a/pkgs/development/tools/misc/avarice/default.nix b/pkgs/development/tools/misc/avarice/default.nix deleted file mode 100644 index a8f6426a3b7b2..0000000000000 --- a/pkgs/development/tools/misc/avarice/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gcc, perl, libusb }: - -stdenv.mkDerivation rec { - - name="avarice-2.13"; - - src = fetchurl { - url = "mirror://sourceforge/avarice/${name}.tar.bz2"; - sha256 = "0jhh1h1k5b41v2ycq8kn43nkrkh0b9l7xjmw38rak871g3z3hix1"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gcc perl libusb ]; - - meta = { - license = stdenv.lib.licenses.gpl2; - description = "Translator between GDB's remote debug protocol and the AVR JTAG ICE protocol"; - homepage = https://sourceforge.net/projects/avarice/files/avarice/; - maintainers = [ stdenv.lib.maintainers.smironov ]; - platforms = stdenv.lib.platforms.linux; - broken = true; # 2018-04-10 - }; -} - diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index c0aa1d16374e3..f3092a696b168 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -8,11 +8,11 @@ else buildDunePackage rec { pname = "utop"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; - sha256 = "0y2v8rkfz19nlz8gh0lkh5wx5hyvw5gl4nw1kg8j2pw9jnilq5nb"; + sha256 = "107al0l3x4a5kkjka7glmhsqlm7pwzzc6shspiv5gsjb49pblc2f"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix deleted file mode 100644 index e9aa33d2f60b1..0000000000000 --- a/pkgs/development/tools/parsing/bison/2.x.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, lib, fetchurl, m4, perl }: - -stdenv.mkDerivation rec { - name = "bison-2.7.1"; - - src = fetchurl { - url = "mirror://gnu/bison/${name}.tar.gz"; - sha256 = "0c9li3iaslzzr3zig6m3zlmb4r8i0wfvkcrvdyiqxasb09mjkqh8"; - }; - - nativeBuildInputs = [ m4 ]; - propagatedBuildInputs = [ m4 ]; - checkInputs = [ perl ]; - - patches = lib.optional stdenv.isDarwin ./darwin-vasnprintf.patch; - - doCheck = true; - # M4 = "${m4}/bin/m4"; - - meta = { - homepage = https://www.gnu.org/software/bison/; - description = "Yacc-compatible parser generator"; - license = stdenv.lib.licenses.gpl3Plus; - - longDescription = '' - Bison is a general-purpose parser generator that converts an - annotated context-free grammar into an LALR(1) or GLR parser for - that grammar. Once you are proficient with Bison, you can use - it to develop a wide range of language parsers, from those used - in simple desk calculators to complex programming languages. - - Bison is upward compatible with Yacc: all properly-written Yacc - grammars ought to work with Bison with no change. Anyone - familiar with Yacc should be able to use Bison with little - trouble. You need to be fluent in C or C++ programming in order - to use Bison. - ''; - - platforms = stdenv.lib.platforms.unix; - }; - - passthru = { glrSupport = true; }; -} diff --git a/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch b/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch deleted file mode 100644 index 84b0e6d39d876..0000000000000 --- a/pkgs/development/tools/parsing/bison/darwin-vasnprintf.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur bison-2.7-pristine/lib/vasnprintf.c bison-2.7/lib/vasnprintf.c ---- bison-2.7-pristine/lib/vasnprintf.c 2012-11-30 20:48:23.000000000 +0900 -+++ bison-2.7/lib/vasnprintf.c 2018-06-28 16:55:31.000000000 +0900 -@@ -4870,7 +4870,7 @@ - #endif - *fbp = dp->conversion; - #if USE_SNPRINTF --# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__)) -+# if !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) || (defined __APPLE__ && defined __MACH__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0'; diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/default.nix index 0253fa27dc0df..0253fa27dc0df 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/default.nix diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index f50e7670b4634..b18bd0104ce6c 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch -, bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg +, bison, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg , libpng, perl, python, ruby, sqlite, qtwebkit, qmake, qtbase , darwin, writeScriptBin, cups, makeWrapper }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ qmake ]; buildInputs = [ - bison2 flex fontconfig freetype gperf icu openssl + bison flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite qtwebkit qtbase makeWrapper ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/pkgs/development/tools/pretty-simple/default.nix b/pkgs/development/tools/pretty-simple/default.nix new file mode 100644 index 0000000000000..c55e176176d95 --- /dev/null +++ b/pkgs/development/tools/pretty-simple/default.nix @@ -0,0 +1,12 @@ +{ haskell, haskellPackages, lib }: + +haskell.lib.justStaticExecutables (haskell.lib.overrideCabal haskellPackages.pretty-simple (oldAttrs: { + maintainers = (oldAttrs.maintainers or []) ++ [ + lib.maintainers.cdepillabout + ]; + + configureFlags = (oldAttrs.configureFlags or []) ++ ["-fbuildexe"]; + + buildDepends = (oldAttrs.buildDepends or []) ++ [haskellPackages.optparse-applicative]; +})) + diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 544fa26b21ccc..5706337dffd71 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -109,7 +109,7 @@ let ''; preBuild = '' - export LD_LIBRARY_PATH="$PWD/depends/protobuf:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$PWD/depends/protobuf''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ] diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/pkgs/games/dwarf-fortress/wrapper/dfhack.in index 4cf884ebed2cd..026b33ab87bf7 100644 --- a/pkgs/games/dwarf-fortress/wrapper/dfhack.in +++ b/pkgs/games/dwarf-fortress/wrapper/dfhack.in @@ -7,5 +7,5 @@ for i in dfhack.init-example dfhack-config/default hack/* stonesense/*; do done cd "$DF_DIR" -LD_LIBRARY_PATH="$env_dir/hack/libs:$env_dir/hack:$LD_LIBRARY_PATH" \ +LD_LIBRARY_PATH="$env_dir/hack/libs:$env_dir/hack${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ LD_PRELOAD="$env_dir/hack/libdfhack.so:$LD_PRELOAD" exec $env_dir/libs/Dwarf_Fortress "$@" diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 6e6d6b56014f9..3d4f52f2c7047 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -12,6 +12,8 @@ # any build is allowed, so this parameter acts as a simple whitelist. # Takes the package version and returns the build version. , makeBuildVersion ? (v: v) +, enableClient ? true +, enableServer ? true }: let @@ -52,6 +54,9 @@ let pname = "${pname}-deps"; inherit version src postPatch; nativeBuildInputs = [ gradle_5 perl ]; + # Here we build both the server and the client so we only have to specify + # one hash for 'deps'. Deps can be garbage collected after the build, + # so this is not really an issue. buildPhase = '' export GRADLE_USER_HOME=$(mktemp -d) gradle --no-daemon desktop:dist -Pbuildversion=${buildVersion} @@ -68,31 +73,49 @@ let outputHash = "16k058fw9yk89adx8j1708ynfri5yizmmvh49prls9slw4hipffb"; }; -in stdenv.mkDerivation rec { - inherit pname version src postPatch; - - nativeBuildInputs = [ gradle_5 makeWrapper ]; - - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - # point to offline repo - sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" build.gradle + # Separate commands for building and installing the server and the client + buildClient = '' gradle --offline --no-daemon desktop:dist -Pbuildversion=${buildVersion} + ''; + buildServer = '' gradle --offline --no-daemon server:dist -Pbuildversion=${buildVersion} ''; - - installPhase = '' + installClient = '' install -Dm644 desktop/build/libs/Mindustry.jar $out/share/mindustry.jar - install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar - mkdir $out/bin + mkdir -p $out/bin makeWrapper ${jre}/bin/java $out/bin/mindustry \ --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib \ --add-flags "-jar $out/share/mindustry.jar" - makeWrapper ${jre}/bin/java $out/bin/mindustry-server \ - --add-flags "-jar $out/share/mindustry-server.jar" install -Dm644 core/assets/icons/icon_64.png $out/share/icons/hicolor/64x64/apps/mindustry.png install -Dm644 ${desktopItem}/share/applications/Mindustry.desktop $out/share/applications/Mindustry.desktop ''; + installServer = '' + install -Dm644 server/build/libs/server-release.jar $out/share/mindustry-server.jar + mkdir -p $out/bin + makeWrapper ${jre}/bin/java $out/bin/mindustry-server \ + --add-flags "-jar $out/share/mindustry-server.jar" + ''; + +in +assert stdenv.lib.assertMsg (enableClient || enableServer) + "mindustry: at least one of 'enableClient' and 'enableServer' must be true"; +stdenv.mkDerivation rec { + inherit pname version src postPatch; + + nativeBuildInputs = [ gradle_5 makeWrapper ]; + + buildPhase = with stdenv.lib; '' + export GRADLE_USER_HOME=$(mktemp -d) + # point to offline repo + sed -ie "s#mavenLocal()#mavenLocal(); maven { url '${deps}' }#g" build.gradle + ${optionalString enableClient buildClient} + ${optionalString enableServer buildServer} + ''; + + installPhase = with stdenv.lib; '' + ${optionalString enableClient installClient} + ${optionalString enableServer installServer} + ''; meta = with stdenv.lib; { homepage = "https://mindustrygame.github.io/"; diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 2fde729e935e1..4751660af3add 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.14.4"; + version = "1.15.2"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/3dc3d84a581f14691199cf6831b71ed1296a9fdf/server.jar"; - sha256 = "0aapiwgx9bmnwgmrra9459qfl9bw8q50sja4lhhr64kf7amyvkay"; + url = "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar"; + sha256 = "12kynrpxgcdg8x12wcvwkxka0fxgm5siqg8qq0nnmv0443f8dkw0"; }; preferLocalBuild = true; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index f286c359e6fc4..02a53d0650674 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp , libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, sqlite, luajit -, freetype, gettext, doxygen, ncurses, graphviz, xorg +, freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex , leveldb, postgresql, hiredis }: @@ -46,6 +46,7 @@ let buildInputs = [ irrlicht luajit jsoncpp gettext freetype sqlite curl bzip2 ncurses + gmp libspatialindex ] ++ optionals buildClient [ libpng libjpeg libGLU libGL openal libogg libvorbis xorg.libX11 libXxf86vm ] ++ optionals buildServer [ @@ -73,8 +74,8 @@ let }; v5 = { - version = "5.1.0"; - sha256 = "184n9gxfa7yr0j85z2x736maaymsnppd5jzm326wlqri3c0qqy3z"; + version = "5.1.1"; + sha256 = "0cjj63333b7j4ydfq0h9yc6d2jvmyjd7n7zbd08yrf0rcibrj2k0"; dataSha256 = "1r9fxz2j24q74a9injvbxbf2xk67fzabv616i676zw2cvgv9hn39"; }; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 8ef6e0c8be575..80fa840cc69b5 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "scummvm"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz"; - sha256 = "6b50c6596a1536b52865f556dc05ded20f86b6ffabe4bccbd746b5587b15f727"; + sha256 = "1a6waf1ybp91nwva8g650cljlfb1di4l0jv13vg6yfgkas9pclsp"; }; nativeBuildInputs = [ nasm ]; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index fd3219d479c8a..1a930b287af16 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -53,7 +53,7 @@ let echo "$runtime_paths" exit 0 fi - export LD_LIBRARY_PATH="$runtime_paths:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$runtime_paths''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" exec "$@" ''; @@ -260,7 +260,7 @@ in buildFHSUserEnv rec { exit 1 fi shift - ${lib.optionalString (!nativeOnly) "export LD_LIBRARY_PATH=/lib32:/lib64:${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH"} + ${lib.optionalString (!nativeOnly) "export LD_LIBRARY_PATH=/lib32:/lib64:${lib.concatStringsSep ":" ldPath}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"} exec -- "$run" "$@" ''; }; diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index 7e6694b28d97a..6c47109fb65c8 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "attract-mode"; - version = "2.2.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "mickelson"; repo = "attract"; rev = "v${version}"; - sha256 = "1arkfj0q3n1qbq5jwmal0kixxph8lnmv3g9bli36inab4r8zzmp8"; + sha256 = "16p369j0hanm0l2fiy6h9d9pn0f3qblcy9l39all6h7rfxnhp9ii"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 0b6eab70263f8..025158b071733 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -68,6 +68,11 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ]) ++ [ pkgs.xorg.libX11 pkgs.perl ])); + patches = [ + # Also look for root certificates at $NIX_SSL_CERT_FILE + ./cert-path.patch + ]; + # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. diff --git a/pkgs/misc/emulators/wine/cert-path.patch b/pkgs/misc/emulators/wine/cert-path.patch new file mode 100644 index 0000000000000..da01a4778102b --- /dev/null +++ b/pkgs/misc/emulators/wine/cert-path.patch @@ -0,0 +1,24 @@ +diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c +index f795181..fb4926a 100644 +--- a/dlls/crypt32/rootstore.c ++++ b/dlls/crypt32/rootstore.c +@@ -18,6 +18,7 @@ + #include "config.h" + #include <stdarg.h> + #include <stdio.h> ++#include <stdlib.h> /* getenv */ + #include <sys/types.h> + #ifdef HAVE_SYS_STAT_H + #include <sys/stat.h> +@@ -916,6 +917,11 @@ static void read_trusted_roots_from_known_locations(HCERTSTORE store) + + for (i = 0; !ret && i < ARRAY_SIZE(CRYPT_knownLocations); i++) + ret = import_certs_from_path(CRYPT_knownLocations[i], from, TRUE); ++ ++ char *nix_cert_file = getenv("NIX_SSL_CERT_FILE"); ++ if (nix_cert_file != NULL) ++ ret = import_certs_from_path(nix_cert_file, from, TRUE); ++ + check_and_store_certs(from, store); + } + CertCloseStore(from, 0); diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 21d00b30dcba9..06b3a950ba099 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "4.0.3"; - url = "https://dl.winehq.org/wine/source/4.0/wine-${version}.tar.xz"; - sha256 = "1nhgw1wm613ln9dhjm0d03zs5adcmnqr2b50p21jbmm5k2gns0i5"; + version = "5.0"; + url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz"; + sha256 = "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.0-rc6"; + version = "5.0"; url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz"; - sha256 = "1d1kv7ppqq5irx3wv2lw810ylg8wk1nddc1kwb936v5qrkkgifwc"; + sha256 = "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "193z92gpw7f421a4sa46qmp90pnbgglrlgyzfs5zpap32zmwhrqz"; + sha256 = "054m2glvav29qnlgr3p36kahyv3kbxzba82djzqpc7cmsrin0d3f"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index eb5cf21e79d57..d4823066d8dc0 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -4887,6 +4887,17 @@ let }; }; + vim-prosession = buildVimPluginFrom2Nix { + pname = "vim-prosession"; + version = "2019-11-01"; + src = fetchFromGitHub { + owner = "dhruvasagar"; + repo = "vim-prosession"; + rev = "84df77d6470491a67f926b9a6a6a8cc675c161ac"; + sha256 = "03p5ncdah3mxd2dxrqprd14gzyy2qlvf9y5hcsdcakf2hhsrxvlg"; + }; + }; + vim-protobuf = buildVimPluginFrom2Nix { pname = "vim-protobuf"; version = "2017-12-26"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a069638cadf91..9ce6f478672b8 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -68,6 +68,7 @@ deoplete-plugins/deoplete-jedi deoplete-plugins/deoplete-zsh derekelkins/agda-vim derekwyatt/vim-scala +dhruvasagar/vim-prosession dhruvasagar/vim-table-mode digitaltoad/vim-jade direnv/direnv.vim diff --git a/pkgs/os-specific/darwin/apple-sdk/default.nix b/pkgs/os-specific/darwin/apple-sdk/default.nix index c3914777c6dc0..aef7341e5e9f8 100644 --- a/pkgs/os-specific/darwin/apple-sdk/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xar, cpio, pkgs, python, pbzx, lib }: +{ stdenv, fetchurl, xar, cpio, pkgs, python3, pbzx, lib }: let # sadly needs to be exported because security_tool needs it @@ -16,7 +16,7 @@ let sha256 = "13xq34sb7383b37hwy076gnhf96prpk1b4087p87xnwswxbrisih"; }; - buildInputs = [ xar cpio python pbzx ]; + nativeBuildInputs = [ xar cpio python3 pbzx ]; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index afa5dc1c08cb4..da2d0c5dc7bf0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -1,9 +1,11 @@ { appleDerivation, lib, bootstrap_cmds, bison, flex -, gnum4, unifdef, perl, python +, gnum4, unifdef, perl, python3 , headersOnly ? true }: appleDerivation ({ - nativeBuildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl python ]; + nativeBuildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl python3 ]; + + patches = [ ./python3.patch ]; postPatch = '' substituteInPlace Makefile \ diff --git a/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch b/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch new file mode 100644 index 0000000000000..10778406c8e0e --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/xnu/python3.patch @@ -0,0 +1,41 @@ +diff --git a/bsd/kern/makekdebugevents.py b/bsd/kern/makekdebugevents.py +index 73b2db4..d354ba0 100755 +--- a/bsd/kern/makekdebugevents.py ++++ b/bsd/kern/makekdebugevents.py +@@ -5,7 +5,7 @@ + # named kd_events[] or these mappings. + # Required to generate a header file used by DEVELOPMENT and DEBUG kernels. + # +- ++ + import sys + import re + +@@ -21,18 +21,18 @@ code_table = [] + # scan file to generate internal table + with open(trace_code_file, 'rt') as codes: + for line in codes: +- m = id_name_pattern.match(line) +- if m: ++ m = id_name_pattern.match(line) ++ if m: + code_table += [(int(m.group(1),base=16), m.group(2))] + + # emit typedef: +-print "typedef struct {" +-print " uint32_t id;" +-print " const char *name;" +-print "} kd_event_t;" ++print("typedef struct {") ++print(" uint32_t id;") ++print(" const char *name;") ++print("} kd_event_t;") + # emit structure declaration and sorted initialization: +-print "kd_event_t kd_events[] = {" ++print("kd_event_t kd_events[] = {") + for mapping in sorted(code_table, key=lambda x: x[0]): +- print " {0x%x, \"%s\"}," % mapping +-print "};" ++ print(" {0x%x, \"%s\"}," % mapping) ++print("};") + diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix index be8554983074c..e82636fce1f2a 100644 --- a/pkgs/os-specific/darwin/iproute2mac/default.nix +++ b/pkgs/os-specific/darwin/iproute2mac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, darwin, python }: +{ stdenv, fetchFromGitHub, darwin, python2 }: stdenv.mkDerivation rec { version = "1.2.1"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { sha256 = "1n6la7blbxza2m79cpnywsavhzsdv4gzdxrkly4dppyidjg6jy1h"; }; - buildInputs = [ python ]; + buildInputs = [ python2 ]; postPatch = '' substituteInPlace src/ip.py \ - --replace /usr/bin/python ${python}/bin/python \ + --replace /usr/bin/python ${python2}/bin/python \ --replace /sbin/ifconfig ${darwin.network_cmds}/bin/ifconfig \ --replace /sbin/route ${darwin.network_cmds}/bin/route \ --replace /usr/sbin/netstat ${darwin.network_cmds}/bin/netstat \ diff --git a/pkgs/os-specific/darwin/libtapi/default.nix b/pkgs/os-specific/darwin/libtapi/default.nix index 2af1c5db2e323..182d1db3bfd51 100644 --- a/pkgs/os-specific/darwin/libtapi/default.nix +++ b/pkgs/os-specific/darwin/libtapi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python, clang_6 }: +{ lib, stdenv, fetchFromGitHub, cmake, python3, clang_6 }: stdenv.mkDerivation { name = "libtapi-1000.10.8"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1a19h39a48agvnmal99n9j1fjadiqwib7hfzmn342wmgh9z3vk0g"; }; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ clang_6.cc ]; preConfigure = '' diff --git a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix index 4f2f84b3c0a5d..059cb70bfbd5f 100644 --- a/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix +++ b/pkgs/os-specific/darwin/swift-corelibs/corefoundation.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, python, ninja, libxml2, objc4, ICU, curl }: +{ stdenv, fetchFromGitHub, fetchurl, ninja, python3, curl, libxml2, objc4, ICU }: let # 10.12 adds a new sysdir.h that our version of CF in the main derivation depends on, but @@ -20,8 +20,8 @@ stdenv.mkDerivation { sha256 = "17kpql0f27xxz4jjw84vpas5f5sn4vdqwv10g151rc3rswbwln1z"; }; - nativeBuildInputs = [ ninja python ]; - buildInputs = [ libxml2 objc4 ICU curl ]; + nativeBuildInputs = [ ninja python3 ]; + buildInputs = [ curl libxml2 objc4 ICU ]; sourceRoot = "source/CoreFoundation"; diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index 09d218e87458b..a9e5aaef39767 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -285,7 +285,7 @@ if test -z "$libsOnly"; then for prog in $BIN/*; do cp -f $prog $out/bin && patchelf --set-interpreter $(echo $glibcDir/lib/ld-linux*.so.2) $out/bin/$(basename $prog) && - wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib/:$gcc/lib/:$out/share/ati/:$libXinerama/lib/:$libXrandr/lib/:$libfontconfig/lib/:$libfreetype/lib/:$LD_LIBRARY_PATH + wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib/:$gcc/lib/:$out/share/ati/:$libXinerama/lib/:$libXrandr/lib/:$libfontconfig/lib/:$libfreetype/lib/${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH done } diff --git a/pkgs/os-specific/linux/bpftool/default.nix b/pkgs/os-specific/linux/bpftool/default.nix index 8b288fc046a69..34ddcc3a213f8 100644 --- a/pkgs/os-specific/linux/bpftool/default.nix +++ b/pkgs/os-specific/linux/bpftool/default.nix @@ -1,15 +1,19 @@ { stdenv , libopcodes, libbfd, libelf , linuxPackages_latest, zlib +, python3 }: stdenv.mkDerivation { pname = "bpftool"; inherit (linuxPackages_latest.kernel) version src; + nativeBuildInputs = [ python3 ]; buildInputs = [ libopcodes libbfd libelf zlib ]; preConfigure = '' + patchShebangs scripts/bpf_helpers_doc.py + cd tools/bpf/bpftool substituteInPlace ./Makefile \ --replace '/usr/local' "$out" \ diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix index 42f959a61579c..6dbf6ace693c7 100644 --- a/pkgs/os-specific/linux/evdi/default.nix +++ b/pkgs/os-specific/linux/evdi/default.nix @@ -1,37 +1,44 @@ -{ stdenv, fetchFromGitHub, kernel, libdrm }: +{ stdenv, fetchFromGitHub, fetchpatch, kernel, libdrm }: stdenv.mkDerivation rec { pname = "evdi"; - version = "1.6.4"; + version = "-unstable-20190116"; src = fetchFromGitHub { owner = "DisplayLink"; repo = pname; - rev = "v${version}"; - sha256 = "1yrjm8lvvz3v4h5af6m9qzq6z4lbgd7qbvq5rz7sjhdsh7g6qibd"; + rev = "391f1f71e4c86fc18de27947c78e02b5e3e9f128"; + sha256 = "147cwmk57ldchvzr06lila6av7jvcdggs9jgifqscklp9x6dc4ny"; }; nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ kernel libdrm ]; + patches = [ + (fetchpatch { + url = "https://crazy.dev.frugalware.org/evdi-all-in-one-fixes.patch"; + sha256 = "03hs68v8c2akf8a4rc02m15fzyp14ay70rcx8kwg2y98qkqh7w30"; + }) + ]; + makeFlags = [ - "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "KVER=${kernel.modDirVersion}" + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; hardeningDisable = [ "format" "pic" "fortify" ]; installPhase = '' install -Dm755 module/evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko - install -Dm755 library/libevdi.so $out/lib/libevdi.so + install -Dm755 library/libevdi.so.1.6.4 $out/lib/libevdi.so ''; meta = with stdenv.lib; { description = "Extensible Virtual Display Interface"; - homepage = "https://www.displaylink.com/"; - license = with licenses; [ lgpl21 gpl2 ]; platforms = platforms.linux; + license = with licenses; [ lgpl21 gpl2 ]; + homepage = "https://www.displaylink.com/"; broken = versionOlder kernel.version "4.9" || stdenv.isAarch64; }; } 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 6e535cce8985a..1a454cb8957ea 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2019-12-15"; + version = "2020-01-22"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = lib.replaceStrings ["-"] [""] version; - sha256 = "01zwmgva2263ksssqhhi46jh5kzb6z1a4xs8agsb2mbwifxf84cl"; + sha256 = "0256p99bqwf1d1s6gqnzpjcdmg6skcp1jzz64sd1p29xxrf0pzfa"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1jp2bb87jbcml1q3r4yilf9l3pirr19zb70l6mlxlmbqml50zwzd"; + outputHash = "1d2jvy395jpfq0gli7q5p571lcb9p5y0y8qr8p8rlcmczh4gry64"; meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4bd86a702672a..4ce6a37e689cc 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -24,6 +24,13 @@ let # configuration items have to be part of a subattrs flattenKConf = nested: mapAttrs (_: head) (zipAttrs (attrValues nested)); + whenPlatformHasEBPFJit = + mkIf (stdenv.hostPlatform.isAarch32 || + stdenv.hostPlatform.isAarch64 || + stdenv.hostPlatform.isx86_64 || + (stdenv.hostPlatform.isPowerPC && stdenv.hostPlatform.is64bit) || + (stdenv.hostPlatform.isMips && stdenv.hostPlatform.is64bit)); + options = { debug = { @@ -106,7 +113,12 @@ let IP_DCCP_CCID3 = no; # experimental CLS_U32_PERF = yes; CLS_U32_MARK = yes; - BPF_JIT = mkIf (stdenv.hostPlatform.system == "x86_64-linux") yes; + BPF_JIT = whenPlatformHasEBPFJit yes; + BPF_JIT_ALWAYS_ON = whenPlatformHasEBPFJit yes; + HAVE_EBPF_JIT = whenPlatformHasEBPFJit yes; + BPF_STREAM_PARSER = whenAtLeast "4.19" yes; + XDP_SOCKETS = whenAtLeast "4.19" yes; + XDP_SOCKETS_DIAG = whenAtLeast "4.19" yes; WAN = yes; # Required by systemd per-cgroup firewalling CGROUP_BPF = option yes; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index ba2b1ddb61b36..d7c6c6b5e6063 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.167"; + version = "4.14.169"; # 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 = "0hzyb5k6adhg4vkhix21kg7z6gdzyk1dnzylvbsz9yh2m73qzdrb"; + sha256 = "0jc24zvqz3vsv65xxcivzkj6nv27vsy62l50n2h1ysy5jdwsk3nq"; }; } // (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 9512729bc34df..00f5fb9db9409 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.98"; + version = "4.19.100"; # 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 = "0dr9vnaaycq77r49mj001zvkxhdyxkgh27dbjsaxcq1dq8xv3zli"; + sha256 = "04z7c36k78k5hhwhli0kalmvpkiwqli09gj5dmns82wklsv8n4sq"; }; } // (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 0e3d0db2b950f..5409947c0a170 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.211"; + version = "4.4.212"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1f6qz4bvjn18cfcg3wwfsl75aw2kxwn28r228kdic9aibhy6rpvp"; + sha256 = "0mx3qyj6w6h7gw7drsfsgl4iyz1695sjnf9hqh4kczci48kw5rj7"; }; } // (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 6efc22e0d34a8..ff202b3fe9b00 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.211"; + version = "4.9.212"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1gmi27ih5ys1wxbrnc4a5dr9vw9ngccs9xpa2p0gsk4pbn6n15r5"; + sha256 = "0c5yjilaq86j6i2hzlxbp2ia7jhnf7kv952ffv7jxdf90sk3irxd"; }; } // (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 77b28e5f34da0..60be497894507 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.15"; + version = "5.4.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ccldlwj89qd22cl06706w7xzm8n69m6kg8ic0s5ns0ghlpj41v4"; + sha256 = "0ynspac26hn7pj8fahacvdlyq8kqin0hmfjiymi20y3l57gl25ci"; }; } // (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 new file mode 100644 index 0000000000000..7347cf1fa6680 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "5.5"; + + # 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 = "0c131fi6s7vgvka1c0597vnvcmwn1pp968rci5kq64iwj3pd9yx6"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 9f32e3e37ddbd..07dd8c78f4263 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { # perf refers both to newt and slang nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty audit makeWrapper pkgconfig + flex bison libiberty audit makeWrapper pkgconfig python3 ]; buildInputs = [ elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl @@ -54,6 +54,10 @@ stdenv.mkDerivation { "-Wno-error=stringop-truncation" ]; + postPatch = '' + patchShebangs scripts/bpf_helpers_doc.py + ''; + doCheck = false; # requires "sparse" doInstallCheck = false; # same diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 39e97f8473c8c..741c51e2233b8 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "MAN3DIR=$(man)/share/man/man3" "MAN5DIR=$(man)/share/man/man5" "MAN8DIR=$(man)/share/man/man8" - "PYTHON=python" + "PYTHON=${python.pythonForBuild}/bin/python" "PYTHONLIBDIR=$(py)/${python.sitePackages}" "SBINDIR=$(bin)/sbin" "SHLIBDIR=$(out)/lib" diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index d1a035d744807..e4429cc3bd7c3 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -44,9 +44,7 @@ stdenv.mkDerivation rec { # which is done by dlopening $out/lib/security/pam_foo.so # $out/etc was also missed: pam_env(login:session): Unable to open config file - preConfigure = '' - configureFlags="$configureFlags --includedir=$out/include/security" - '' + stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' + preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform.libc == "musl") '' # export ac_cv_search_crypt=no # (taken from Alpine linux, apparently insecure but also doesn't build O:)) # disable insecure modules @@ -54,6 +52,15 @@ stdenv.mkDerivation rec { sed -e 's/pam_rhosts//g' -i modules/Makefile.in ''; + configureFlags = [ + "--includedir=${placeholder "out"}/include/security" + "--enable-sconfigdir=/etc/security" + ]; + + installFlags = [ + "SCONFIGDIR=${placeholder "out"}/etc/security" + ]; + doCheck = false; # fails meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 214c9b75cea11..2f8f898ceafea 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -30,7 +30,7 @@ let gnupg-minimal = gnupg.override { bzip2 = null; }; in stdenv.mkDerivation { - version = "243.3"; + version = "243.4"; pname = "systemd"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix index dfcf4c9937b1f..387a3bcf2c6fe 100644 --- a/pkgs/os-specific/linux/tiscamera/default.nix +++ b/pkgs/os-specific/linux/tiscamera/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { # dependency on `libtcam` (which itself is built as part of this build). In order to allow # that, we set the dynamic linker's path to point on the build time location of the library. preBuild = '' - export LD_LIBRARY_PATH=$PWD/src:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=$PWD/src''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index e1de74a185556..247fd8ed2507f 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "0.0.20200121"; + version = "0.0.20200128"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "0h8jq8ki998jw4fynb7if4hcgnl0w6lbd5zwiy0xljj3mfqxdxvv"; + sha256 = "05iz0pl0znx5yham8qzpym2ggc9babh36xaa504k99qqvddg8b11"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/zenmonitor/default.nix b/pkgs/os-specific/linux/zenmonitor/default.nix new file mode 100644 index 0000000000000..c333b94f40e21 --- /dev/null +++ b/pkgs/os-specific/linux/zenmonitor/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, pkgconfig, gtk3, wrapGAppsHook }: + +stdenv.mkDerivation rec { + pname = "zenmonitor"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "ocerman"; + repo = "zenmonitor"; + rev = "v${version}"; + sha256 = "16p2njrgik8zfkidm64v4qy53qlsqqxxgr9m3n84pr9l3pk25dwk"; + }; + + buildInputs = [ gtk3 ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + description = "Monitoring software for AMD Zen-based CPUs"; + homepage = https://github.com/ocerman/zenmonitor; + license = licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ alexbakker ]; + }; +} diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 40780c9a97b20..d80508bfe44cd 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -85,6 +85,7 @@ stdenv.mkDerivation rec { license = ["IDPL" "Interbase-1.0"]; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index ea762ed656d60..98247e35e19c0 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, stdenv49, gccStdenv, llvmPackages +{ gcc6Stdenv, stdenv, gccStdenv, llvmPackages , lib, fetchurl, fetchpatch, fetchFromGitHub , cmake, ninja, which, findutils, m4, gawk @@ -37,6 +37,7 @@ in with builtins; { patches = [ ./patches/ldflags-5.1.patch ./patches/fix-scm-version.patch + ./patches/gcc-fixes.patch python3-six-patch python3-print-patch ]; @@ -50,6 +51,7 @@ in with builtins; { patches = [ ./patches/ldflags-5.2.patch ./patches/fix-scm-version.patch + ./patches/gcc-fixes.patch python3-six-patch python3-print-patch ]; diff --git a/pkgs/servers/foundationdb/patches/gcc-fixes.patch b/pkgs/servers/foundationdb/patches/gcc-fixes.patch new file mode 100644 index 0000000000000..295e405b9fc5a --- /dev/null +++ b/pkgs/servers/foundationdb/patches/gcc-fixes.patch @@ -0,0 +1,117 @@ +diff --git a/fdbrpc/ContinuousSample.h b/fdbrpc/ContinuousSample.h +index 54ff1b1..577c228 100644 +--- a/fdbrpc/ContinuousSample.h ++++ b/fdbrpc/ContinuousSample.h +@@ -26,6 +26,7 @@ + #include "flow/IRandom.h" + #include <vector> + #include <algorithm> ++#include <cmath> + + template <class T> + class ContinuousSample { +diff --git a/fdbrpc/Smoother.h b/fdbrpc/Smoother.h +index 3ed8e6e..fb46947 100644 +--- a/fdbrpc/Smoother.h ++++ b/fdbrpc/Smoother.h +@@ -23,6 +23,7 @@ + #pragma once + + #include "flow/flow.h" ++#include <cmath> + + struct Smoother { + // Times (t) are expected to be nondecreasing +@@ -90,4 +91,4 @@ struct TimerSmoother { + double time, total, estimate; + }; + +-#endif +\ No newline at end of file ++#endif +diff --git a/fdbrpc/libcoroutine/Coro.c b/fdbrpc/libcoroutine/Coro.c +index cbfdc8f..9993cee 100644 +--- a/fdbrpc/libcoroutine/Coro.c ++++ b/fdbrpc/libcoroutine/Coro.c +@@ -66,6 +66,8 @@ VALGRIND_STACK_DEREGISTER((coro)->valgrindStackId) + #define STACK_DEREGISTER(coro) + #endif + ++#pragma GCC diagnostic ignored "-Wreturn-local-addr" ++ + // Define outside + extern intptr_t g_stackYieldLimit; + +diff --git a/fdbserver/Knobs.cpp b/fdbserver/Knobs.cpp +index 819c513..acfbfe7 100644 +--- a/fdbserver/Knobs.cpp ++++ b/fdbserver/Knobs.cpp +@@ -20,6 +20,7 @@ + + #include "Knobs.h" + #include "fdbrpc/Locality.h" ++#include <cmath> + + ServerKnobs const* SERVER_KNOBS = new ServerKnobs(); + +diff --git a/flow/Knobs.cpp b/flow/Knobs.cpp +index b485a84..82541d4 100644 +--- a/flow/Knobs.cpp ++++ b/flow/Knobs.cpp +@@ -20,6 +20,7 @@ + + #include "Knobs.h" + #include "flow/flow.h" ++#include <cmath> + + FlowKnobs const* FLOW_KNOBS = new FlowKnobs(); + +diff --git a/flow/Platform.cpp b/flow/Platform.cpp +index 69dac88..69b86d4 100644 +--- a/flow/Platform.cpp ++++ b/flow/Platform.cpp +@@ -623,7 +623,7 @@ void getDiskStatistics(std::string const& directory, uint64_t& currentIOs, uint6 + unsigned int minorId; + disk_stream >> majorId; + disk_stream >> minorId; +- if(majorId == (unsigned int) major(buf.st_dev) && minorId == (unsigned int) minor(buf.st_dev)) { ++ if(majorId == (unsigned int) gnu_dev_major(buf.st_dev) && minorId == (unsigned int) gnu_dev_minor(buf.st_dev)) { + std::string ignore; + uint64_t rd_ios; /* # of reads completed */ + // This is the total number of reads completed successfully. +diff --git a/flow/TDMetric.actor.h b/flow/TDMetric.actor.h +index 5421b83..711a960 100755 +--- a/flow/TDMetric.actor.h ++++ b/flow/TDMetric.actor.h +@@ -36,6 +36,7 @@ + #include "CompressedInt.h" + #include <algorithm> + #include <functional> ++#include <cmath> + + struct MetricNameRef { + MetricNameRef() {} +diff --git a/flow/flow.h b/flow/flow.h +index 0c220af..f685fbc 100644 +--- a/flow/flow.h ++++ b/flow/flow.h +@@ -248,19 +248,6 @@ public: + } + } + +- bool operator == (ErrorOr const& o) const { +- return error == o.error && (!present() || get() == o.get()); +- } +- bool operator != (ErrorOr const& o) const { +- return !(*this == o); +- } +- +- bool operator < (ErrorOr const& o) const { +- if (error != o.error) return error < o.error; +- if (!present()) return false; +- return get() < o.get(); +- } +- + bool isError() const { return error.code() != invalid_error_code; } + bool isError(int code) const { return error.code() == code; } + Error getError() const { ASSERT(isError()); return error; } diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index 0265e18861e07..a7eedb8408b49 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -1,7 +1,7 @@ # This builder is for FoundationDB's original, somewhat strange visual studio + # make build system. In FoundationDB 6.1 and later, there's a new CMake system # (which will eventually become the default version.) -{ stdenv49, lib, fetchurl, fetchFromGitHub +{ gcc6Stdenv, lib, fetchurl, fetchFromGitHub , which, findutils, m4, gawk , python, openjdk, mono, libressl @@ -12,7 +12,7 @@ let # hysterical raisins dictate a version of boost this old. however, # we luckily do not need to build anything, we just need the header # files. - boost152 = stdenv49.mkDerivation { + boost152 = gcc6Stdenv.mkDerivation { name = "boost-headers-1.52.0"; src = fetchurl { @@ -33,10 +33,6 @@ let # the revision can be inferred from the fdb tagging policy , rev ? "refs/tags/${version}" - # in theory newer versions of fdb support newer compilers, but they - # don't :( maybe one day - , stdenv ? stdenv49 - # in theory newer versions of fdb support newer boost versions, but they # don't :( maybe one day , boost ? boost152 @@ -45,7 +41,7 @@ let , officialRelease ? true , patches ? [] - }: stdenv.mkDerivation { + }: gcc6Stdenv.mkDerivation { pname = "foundationdb"; inherit version; @@ -143,7 +139,7 @@ let outputs = [ "out" "lib" "dev" "pythonsrc" ]; - meta = with stdenv.lib; { + meta = with gcc6Stdenv.lib; { description = "Open source, distributed, transactional key-value store"; homepage = https://www.foundationdb.org; license = licenses.asl20; diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix new file mode 100644 index 0000000000000..ff59ad53ed1ce --- /dev/null +++ b/pkgs/servers/gobetween/default.nix @@ -0,0 +1,34 @@ +{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }: + +buildGoModule rec { + pname = "gobetween"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "yyyar"; + repo = "gobetween"; + rev = version; + sha256 = "f01593509ccece063acd47002c4fc52261fbbbcdbf14b088d813b7d8e38fcca8"; + }; + + modSha256 = + "dd91838d20c99c73447590e43edd13c87755276f17ef3e53f24c5df3d0908f78"; + + buildPhase = '' + make build${lib.optionalString enableStatic "-static"} + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/gobetween $out/bin + cp -r share $out/share + cp -r config $out/share + ''; + + meta = with lib; { + description = "Modern & minimalistic load balancer for the Сloud era"; + homepage = "http://gobetween.io"; + license = licenses.mit; + maintainers = with maintainers; [ tomberek ]; + }; +} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 275241fcd176a..0dfb69b953840 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.103.6"; + version = "0.104.3"; components = { "abode" = ps: with ps; [ ]; "acer_projector" = ps: with ps; [ pyserial ]; @@ -22,7 +22,7 @@ "almond" = ps: with ps; [ aiohttp-cors ]; "alpha_vantage" = ps: with ps; [ ]; "amazon_polly" = ps: with ps; [ boto3 ]; - "ambiclimate" = ps: with ps; [ ]; + "ambiclimate" = ps: with ps; [ aiohttp-cors ]; "ambient_station" = ps: with ps; [ ]; "amcrest" = ps: with ps; [ ha-ffmpeg ]; "ampio" = ps: with ps; [ ]; @@ -87,6 +87,7 @@ "bom" = ps: with ps; [ ]; "braviatv" = ps: with ps; [ ]; "broadlink" = ps: with ps; [ broadlink ]; + "brother" = ps: with ps; [ ]; "brottsplatskartan" = ps: with ps; [ ]; "browser" = ps: with ps; [ ]; "brunt" = ps: with ps; [ ]; @@ -164,7 +165,7 @@ "dnsip" = ps: with ps; [ aiodns ]; "dominos" = ps: with ps; [ aiohttp-cors ]; "doods" = ps: with ps; [ pillow ]; - "doorbird" = ps: with ps; [ ]; + "doorbird" = ps: with ps; [ aiohttp-cors ]; "dovado" = ps: with ps; [ ]; "downloader" = ps: with ps; [ ]; "dsmr" = ps: with ps; [ ]; @@ -189,6 +190,7 @@ "efergy" = ps: with ps; [ ]; "egardia" = ps: with ps; [ ]; "eight_sleep" = ps: with ps; [ ]; + "elgato" = ps: with ps; [ ]; "eliqonline" = ps: with ps; [ ]; "elkm1" = ps: with ps; [ ]; "elv" = ps: with ps; [ ]; @@ -228,7 +230,7 @@ "fido" = ps: with ps; [ ]; "file" = ps: with ps; [ ]; "filesize" = ps: with ps; [ ]; - "filter" = ps: with ps; [ ]; + "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "fints" = ps: with ps; [ fints ]; "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ ]; @@ -272,6 +274,7 @@ "geofency" = ps: with ps; [ aiohttp-cors ]; "geonetnz_quakes" = ps: with ps; [ ]; "geonetnz_volcano" = ps: with ps; [ ]; + "gios" = ps: with ps; [ ]; "github" = ps: with ps; [ PyGithub ]; "gitlab_ci" = ps: with ps; [ python-gitlab ]; "gitter" = ps: with ps; [ ]; @@ -359,6 +362,7 @@ "integration" = ps: with ps; [ ]; "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; + "intesishome" = ps: with ps; [ ]; "ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "iota" = ps: with ps; [ ]; "iperf3" = ps: with ps; [ ]; @@ -378,6 +382,7 @@ "kankun" = ps: with ps; [ ]; "keba" = ps: with ps; [ ]; "keenetic_ndms2" = ps: with ps; [ ]; + "kef" = ps: with ps; [ ]; "keyboard" = ps: with ps; [ ]; "keyboard_remote" = ps: with ps; [ evdev ]; "kira" = ps: with ps; [ ]; @@ -410,13 +415,14 @@ "liveboxplaytv" = ps: with ps; [ ]; "llamalab_automate" = ps: with ps; [ ]; "local_file" = ps: with ps; [ ]; + "local_ip" = ps: with ps; [ ]; "locative" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; "lockitron" = ps: with ps; [ ]; "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; - "logi_circle" = ps: with ps; [ ha-ffmpeg ]; + "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; "london_air" = ps: with ps; [ ]; "london_underground" = ps: with ps; [ ]; "loopenergy" = ps: with ps; [ ]; @@ -601,7 +607,7 @@ "qrcode" = ps: with ps; [ pillow ]; "quantum_gateway" = ps: with ps; [ ]; "qwikswitch" = ps: with ps; [ ]; - "rachio" = ps: with ps; [ ]; + "rachio" = ps: with ps; [ aiohttp-cors ]; "radarr" = ps: with ps; [ ]; "radiotherm" = ps: with ps; [ ]; "rainbird" = ps: with ps; [ ]; @@ -655,6 +661,7 @@ "sensehat" = ps: with ps; [ ]; "sensibo" = ps: with ps; [ ]; "sensor" = ps: with ps; [ ]; + "sentry" = ps: with ps; [ sentry-sdk ]; "serial" = ps: with ps; [ pyserial-asyncio ]; "serial_pm" = ps: with ps; [ ]; "sesame" = ps: with ps; [ ]; @@ -666,6 +673,7 @@ "shopping_list" = ps: with ps; [ aiohttp-cors ]; "sht31" = ps: with ps; [ ]; "sigfox" = ps: with ps; [ ]; + "signal_messenger" = ps: with ps; [ ]; "simplepush" = ps: with ps; [ ]; "simplisafe" = ps: with ps; [ ]; "simulated" = ps: with ps; [ ]; @@ -718,6 +726,7 @@ "statsd" = ps: with ps; [ statsd ]; "steam_online" = ps: with ps; [ ]; "stiebel_eltron" = ps: with ps; [ ]; + "stookalert" = ps: with ps; [ ]; "stream" = ps: with ps; [ aiohttp-cors av ]; "streamlabswater" = ps: with ps; [ ]; "stt" = ps: with ps; [ aiohttp-cors ]; @@ -725,6 +734,7 @@ "sun" = ps: with ps; [ ]; "supervisord" = ps: with ps; [ ]; "supla" = ps: with ps; [ ]; + "surepetcare" = ps: with ps; [ ]; "swiss_hydrological_data" = ps: with ps; [ ]; "swiss_public_transport" = ps: with ps; [ ]; "swisscom" = ps: with ps; [ ]; @@ -770,6 +780,7 @@ "tile" = ps: with ps; [ ]; "time_date" = ps: with ps; [ ]; "timer" = ps: with ps; [ ]; + "tmb" = ps: with ps; [ ]; "tod" = ps: with ps; [ ]; "todoist" = ps: with ps; [ todoist ]; "tof" = ps: with ps; [ ]; @@ -848,11 +859,11 @@ "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; "weblink" = ps: with ps; [ ]; - "webostv" = ps: with ps; [ websockets ]; + "webostv" = ps: with ps; [ ]; "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ ]; "whois" = ps: with ps; [ ]; - "wink" = ps: with ps; [ ]; + "wink" = ps: with ps; [ aiohttp-cors ]; "wirelesstag" = ps: with ps; [ ]; "withings" = ps: with ps; [ aiohttp-cors ]; "wled" = ps: with ps; [ ]; @@ -870,12 +881,12 @@ "xfinity" = ps: with ps; [ ]; "xiaomi" = ps: with ps; [ ha-ffmpeg ]; "xiaomi_aqara" = ps: with ps; [ ]; - "xiaomi_miio" = ps: with ps; [ construct ]; + "xiaomi_miio" = ps: with ps; [ construct python-miio ]; "xiaomi_tv" = ps: with ps; [ ]; "xmpp" = ps: with ps; [ slixmpp ]; "xs1" = ps: with ps; [ ]; "yale_smart_alarm" = ps: with ps; [ ]; - "yamaha" = ps: with ps; [ ]; + "yamaha" = ps: with ps; [ rxv ]; "yamaha_musiccast" = ps: with ps; [ ]; "yandex_transport" = ps: with ps; [ ]; "yandextts" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 8e83d7f15da4c..7d32bf9a05840 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -27,9 +27,6 @@ let (mkOverride "colorlog" "4.0.2" "3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42") - (mkOverride "pyyaml" "5.1.2" - "1r5faspz73477hlbjgilw05xsms0glmsa371yqdd26znqsvg1b81") - # required by aioesphomeapi (self: super: { protobuf = super.protobuf.override { @@ -70,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.103.6"; + hassVersion = "0.104.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -85,7 +82,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "1492q4icyhvz30fw5ysrwlnsls4iy5pv62ay3vq1ygcfnlapkqhl"; + sha256 = "06bh9qrpa1d370pvw6in0isg3yw4p7gh9rpy4hm96p0mf53vxfdp"; }; propagatedBuildInputs = [ @@ -101,14 +98,6 @@ in with py.pkgs; buildPythonApplication rec { asynctest pytest pytest-aiohttp requests-mock pydispatcher aiohue netdisco hass-nabucasa ]; - patches = [ - # newer importlib-metadata version - (fetchpatch { - url = "https://github.com/home-assistant/home-assistant/commit/63c6b803dc2d835d57b97ed833ee5cd8318bf7ae.patch"; - sha256 = "16q3qdnmgsw5415f70zvsv1z63dljp3c9glv06cyj4s6qsl13xdc"; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace "aiohttp==3.6.1" "aiohttp" \ diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 8e763800f6507..d6b73aea3da55 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -28,15 +28,12 @@ buildPythonPackage rec { ''; # Mailman assumes that those scripts in $out/bin are Python scripts. Wrapping - # them in shell code breaks this assumption. The proper way to use mailman is - # to create a specialized python interpreter: - # - # python37.withPackages (ps: [ps.mailman]) + # them in shell code breaks this assumption. Use the wrapped version (see + # wrapped.nix) if you need the CLI (rather than the Python library). # # This gives a properly wrapped 'mailman' command plus an interpreter that # has all the necessary search paths to execute unwrapped 'master' and - # 'runner' scripts. The setup is a little tricky, but fortunately NixOS is - # about to get a OS module that takes care of those details. + # 'runner' scripts. dontWrapPythonPrograms = true; meta = { diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index fedd6c9f75935..57c1b355bf26b 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ''; meta = { - homepage = "http://www.gnu.org/software/mailman/"; + homepage = "https://www.gnu.org/software/mailman/"; description = "Archiver for GNU Mailman v3"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/mail/mailman/settings.py b/pkgs/servers/mail/mailman/settings.py deleted file mode 100644 index 5f246db41ad10..0000000000000 --- a/pkgs/servers/mail/mailman/settings.py +++ /dev/null @@ -1,512 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 1998-2019 by the Free Software Foundation, Inc. -# -# This file is part of Postorius. -# -# Postorius 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. -# -# Postorius 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 -# Postorius. If not, see <http://www.gnu.org/licenses/>. - -""" -Django settings for postorius project. - -For more information on this file, see -https://docs.djangoproject.com/en/1.9/topics/settings/ - -For the full list of settings and their values, see -https://docs.djangoproject.com/en/1.9/ref/settings/ -""" - -# Build paths inside the project like this: os.path.join(BASE_DIR, ...) -import os - -# Compatibility with Bootstrap 3 -from django.contrib.messages import constants as messages - - -BASE_DIR = os.path.dirname(os.path.abspath(__file__)) - - -# Quick-start development settings - unsuitable for production -# See https://docs.djangoproject.com/en/1.9/howto/deployment/checklist/ - -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '$!-7^wl#wiifjbh)5@f7ji%x!vp7s1vzbvwt26hxv$idixq0u0' - -# SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False - -ADMINS = ( - #('Admin', 'webmaster@example.com'), -) - -SITE_ID = 1 - -# Hosts/domain names that are valid for this site; required if DEBUG is False -# See https://docs.djangoproject.com/en/1.8/ref/settings/#allowed-hosts -ALLOWED_HOSTS = [ - "localhost", # Archiving API from Mailman, keep it. - "127.0.0.1", - # Add here all production URLs you may have. - @ALLOWED_HOSTS@ -] - -# Mailman API credentials -MAILMAN_REST_API_URL = 'http://localhost:8001' -MAILMAN_REST_API_USER = 'restadmin' -MAILMAN_REST_API_PASS = 'restpass' -MAILMAN_ARCHIVER_KEY = "@ARCHIVER_KEY@" -MAILMAN_ARCHIVER_FROM = ('127.0.0.1', '::1') - -# Application definition - -INSTALLED_APPS = ( - 'hyperkitty', - 'postorius', - 'django_mailman3', - # Uncomment the next line to enable the admin: - 'django.contrib.admin', - # Uncomment the next line to enable admin documentation: - # 'django.contrib.admindocs', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'rest_framework', - 'django_gravatar', - 'compressor', - 'haystack', - 'django_extensions', - 'django_q', - 'allauth', - 'allauth.account', - 'allauth.socialaccount', - 'django_mailman3.lib.auth.fedora', - 'allauth.socialaccount.providers.openid', - 'allauth.socialaccount.providers.github', - 'allauth.socialaccount.providers.gitlab', - 'allauth.socialaccount.providers.google', - #'allauth.socialaccount.providers.facebook', - #'allauth.socialaccount.providers.twitter', - 'allauth.socialaccount.providers.stackexchange', -) - - -MIDDLEWARE = ( - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'django_mailman3.middleware.TimezoneMiddleware', -) - -ROOT_URLCONF = 'urls' - - -TEMPLATES = [ - { - 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], - 'APP_DIRS': True, - 'OPTIONS': { - 'context_processors': [ - 'django.template.context_processors.debug', - 'django.template.context_processors.i18n', - 'django.template.context_processors.media', - 'django.template.context_processors.static', - 'django.template.context_processors.tz', - 'django.template.context_processors.csrf', - 'django.template.context_processors.request', - 'django.contrib.auth.context_processors.auth', - 'django.contrib.messages.context_processors.messages', - 'django_mailman3.context_processors.common', - 'hyperkitty.context_processors.common', - ], - }, - }, -] - -WSGI_APPLICATION = 'wsgi.application' - - -# Database -# https://docs.djangoproject.com/en/1.9/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': '/var/lib/mailman-web/mailman-web.db' - } -} - -# Password validation -# https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators - -AUTH_PASSWORD_VALIDATORS = [ - { - 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', - }, - { - 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', - }, -] - - -# If you're behind a proxy, use the X-Forwarded-Host header -# See https://docs.djangoproject.com/en/1.8/ref/settings/#use-x-forwarded-host -# USE_X_FORWARDED_HOST = True - -# And if your proxy does your SSL encoding for you, set SECURE_PROXY_SSL_HEADER -# https://docs.djangoproject.com/en/1.8/ref/settings/#secure-proxy-ssl-header -# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') -# SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_SCHEME', 'https') - -# Other security settings -# SECURE_SSL_REDIRECT = True -# If you set SECURE_SSL_REDIRECT to True, make sure the SECURE_REDIRECT_EXEMPT -# contains at least this line: -# SECURE_REDIRECT_EXEMPT = [ -# "archives/api/mailman/.*", # Request from Mailman. -# ] -# SESSION_COOKIE_SECURE = True -# SECURE_CONTENT_TYPE_NOSNIFF = True -# SECURE_BROWSER_XSS_FILTER = True -# CSRF_COOKIE_SECURE = True -# CSRF_COOKIE_HTTPONLY = True -# X_FRAME_OPTIONS = 'DENY' - - -# Internationalization -# https://docs.djangoproject.com/en/1.9/topics/i18n/ - -LANGUAGE_CODE = 'en-us' - -TIME_ZONE = 'UTC' - -USE_I18N = True - -USE_L10N = True - -USE_TZ = True - - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/1.9/howto/static-files/ - - -# Absolute path to the directory static files should be collected to. -# Don't put anything in this directory yourself; store your static files -# in apps' "static/" subdirectories and in STATICFILES_DIRS. -# Example: "/var/www/example.com/static/" -STATIC_ROOT = 'static' - -# URL prefix for static files. -# Example: "http://example.com/static/", "http://static.example.com/" -STATIC_URL = '/static/' - -# Additional locations of static files -STATICFILES_DIRS = ( - # Put strings here, like "/home/html/static" or "C:/www/django/static". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. - # BASE_DIR + '/static/', -) - -# List of finder classes that know how to find static files in -# various locations. -STATICFILES_FINDERS = ( - 'django.contrib.staticfiles.finders.FileSystemFinder', - 'django.contrib.staticfiles.finders.AppDirectoriesFinder', - # 'django.contrib.staticfiles.finders.DefaultStorageFinder', - 'compressor.finders.CompressorFinder', -) - -# Django 1.6+ defaults to a JSON serializer, but it won't work with -# django-openid, see -# https://bugs.launchpad.net/django-openid-auth/+bug/1252826 -SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer' - - -LOGIN_URL = 'account_login' -LOGIN_REDIRECT_URL = 'hk_root' -LOGOUT_URL = 'account_logout' - - -# If you enable internal authentication, this is the address that the emails -# will appear to be coming from. Make sure you set a valid domain name, -# otherwise the emails may get rejected. -# https://docs.djangoproject.com/en/1.8/ref/settings/#default-from-email -DEFAULT_FROM_EMAIL = "@SERVER_EMAIL@" - -# If you enable email reporting for error messages, this is where those emails -# will appear to be coming from. Make sure you set a valid domain name, -# otherwise the emails may get rejected. -# https://docs.djangoproject.com/en/1.8/ref/settings/#std:setting-SERVER_EMAIL -SERVER_EMAIL = "@SERVER_EMAIL@" - - -MESSAGE_TAGS = { - messages.ERROR: 'danger' -} - - -# -# Social auth -# -AUTHENTICATION_BACKENDS = ( - 'django.contrib.auth.backends.ModelBackend', - 'allauth.account.auth_backends.AuthenticationBackend', -) - -# Django Allauth -ACCOUNT_AUTHENTICATION_METHOD = "username_email" -ACCOUNT_EMAIL_REQUIRED = True -ACCOUNT_EMAIL_VERIFICATION = "mandatory" -ACCOUNT_DEFAULT_HTTP_PROTOCOL = "https" -ACCOUNT_UNIQUE_EMAIL = True - -SOCIALACCOUNT_PROVIDERS = { - 'openid': { - 'SERVERS': [ - dict(id='yahoo', - name='Yahoo', - openid_url='http://me.yahoo.com'), - ], - }, - 'google': { - 'SCOPE': ['profile', 'email'], - 'AUTH_PARAMS': {'access_type': 'online'}, - }, - 'facebook': { - 'METHOD': 'oauth2', - 'SCOPE': ['email'], - 'FIELDS': [ - 'email', - 'name', - 'first_name', - 'last_name', - 'locale', - 'timezone', - ], - 'VERSION': 'v2.4', - }, - 'gitlab': { - 'GITLAB_URL': 'https://gitlab.com', - 'SCOPE': ['read_user'], - }, -} - - -# -# Gravatar -# https://github.com/twaddington/django-gravatar -# -# Gravatar base url. -# GRAVATAR_URL = 'http://cdn.libravatar.org/' -# Gravatar base secure https url. -# GRAVATAR_SECURE_URL = 'https://seccdn.libravatar.org/' -# Gravatar size in pixels. -# GRAVATAR_DEFAULT_SIZE = '80' -# An image url or one of the following: 'mm', 'identicon', 'monsterid', -# 'wavatar', 'retro'. -# GRAVATAR_DEFAULT_IMAGE = 'mm' -# One of the following: 'g', 'pg', 'r', 'x'. -# GRAVATAR_DEFAULT_RATING = 'g' -# True to use https by default, False for plain http. -# GRAVATAR_DEFAULT_SECURE = True - -# These can be set to override the defaults but are not mandatory: -# EMAIL_CONFIRMATION_TEMPLATE = 'postorius/address_confirmation_message.txt' -# EMAIL_CONFIRMATION_SUBJECT = 'Confirmation needed' - -# -# django-compressor -# https://pypi.python.org/pypi/django_compressor -# -COMPRESS_PRECOMPILERS = ( - ('text/x-scss', '/run/current-system/sw/bin/sassc -t compressed {infile} {outfile}'), - ('text/x-sass', '/run/current-system/sw/bin/sassc -t compressed {infile} {outfile}'), -) -# On a production setup, setting COMPRESS_OFFLINE to True will bring a -# significant performance improvement, as CSS files will not need to be -# recompiled on each requests. It means running an additional "compress" -# management command after each code upgrade. -# http://django-compressor.readthedocs.io/en/latest/usage/#offline-compression -COMPRESS_ENABLED = True -COMPRESS_OFFLINE = True - -# Needed for debug mode -# INTERNAL_IPS = ('127.0.0.1',) - - -# -# Full-text search engine -# -HAYSTACK_CONNECTIONS = { - 'default': { - 'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine', - 'PATH': "/var/lib/mailman-web/fulltext_index", - # You can also use the Xapian engine, it's faster and more accurate, - # but requires another library. - # http://django-haystack.readthedocs.io/en/v2.4.1/installing_search_engines.html#xapian - # Example configuration for Xapian: - #'ENGINE': 'xapian_backend.XapianEngine' - }, -} - - -# -# REST framework -# -REST_FRAMEWORK = { - 'PAGE_SIZE': 10, - 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination', - 'DEFAULT_FILTER_BACKENDS': ( - 'rest_framework.filters.OrderingFilter', - ), -} - - -# -# Asynchronous tasks -# -Q_CLUSTER = { - 'timeout': 300, - 'save_limit': 100, - 'orm': 'default', -} - - -# A sample logging configuration. The only tangible logging -# performed by this configuration is to send an email to -# the site admins on every HTTP 500 error when DEBUG=False. -# See http://docs.djangoproject.com/en/dev/topics/logging for -# more details on how to customize your logging configuration. -LOGGING = { - 'version': 1, - 'disable_existing_loggers': False, - 'filters': { - 'require_debug_false': { - '()': 'django.utils.log.RequireDebugFalse' - } - }, - 'handlers': { - 'console': { - 'class': 'logging.StreamHandler', - 'formatter': 'simple', - }, - 'mail_admins': { - 'level': 'ERROR', - 'filters': ['require_debug_false'], - 'class': 'django.utils.log.AdminEmailHandler' - }, - 'file':{ - 'level': 'INFO', - #'class': 'logging.handlers.RotatingFileHandler', - 'class': 'logging.handlers.WatchedFileHandler', - 'filename': 'mailman-web.log', - 'formatter': 'verbose', - }, - }, - 'loggers': { - 'django': { - 'handlers': ['console', 'file'], - 'level': 'INFO', - }, - 'django.request': { - 'handlers': ['console', 'mail_admins', 'file'], - 'level': 'ERROR', - 'propagate': True, - }, - 'postorius': { - 'handlers': ['console', 'file'], - 'level': 'INFO', - }, - 'django': { - 'handlers': ['file'], - 'level': 'ERROR', - 'propagate': True, - }, - 'hyperkitty': { - 'handlers': ['file'], - 'level': 'DEBUG', - 'propagate': True, - }, - }, - 'formatters': { - 'simple': { - 'format': '%(levelname)s: %(message)s' - }, - 'verbose': { - 'format': '%(levelname)s %(asctime)s %(process)d %(name)s %(message)s' - }, - 'simple': { - 'format': '%(levelname)s %(message)s' - }, - }, - #'root': { - # 'handlers': ['file'], - # 'level': 'INFO', - #}, -} - - -POSTORIUS_TEMPLATE_BASE_URL = "http://localhost:8000" - - -# Using the cache infrastructure can significantly improve performance on a -# production setup. This is an example with a local Memcached server. -#CACHES = { -# 'default': { -# 'BACKEND': 'django.core.cache.backends.memcached.PyLibMCCache', -# 'LOCATION': '127.0.0.1:11211', -# } -#} - - -# When DEBUG is True, don't actually send emails to the SMTP server, just store -# them in a directory. This way you won't accidentally spam your mailing-lists -# while you're fiddling with the code. -if DEBUG == True: - EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend' - EMAIL_FILE_PATH = '/tmp/hyperkitty-emails' - - -# -# HyperKitty-specific -# -# Only display mailing-lists from the same virtual host as the webserver -FILTER_VHOST = False -# Disable singleton locking for Django-Q tasks. -HYPERKITTY_DISABLE_SINGLETON_TASKS = False -# Maximum time between two task runs with same function and arguments. -# This setting is mostly meant for Mailman Developers and should be used -# with caution. -# Default set to 10mins. -HYPERKITTY_TASK_LOCK_TIMEOUT = 10 * 60 - - -try: - from settings_local import * -except ImportError: - pass diff --git a/pkgs/servers/mail/mailman/urls.py b/pkgs/servers/mail/mailman/urls.py deleted file mode 100644 index 9e18da2a218a9..0000000000000 --- a/pkgs/servers/mail/mailman/urls.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 1998-2019 by the Free Software Foundation, Inc. -# -# This file is part of Postorius. -# -# Postorius 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. -# -# Postorius 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 -# Postorius. If not, see <http://www.gnu.org/licenses/>. - - -from django.conf.urls import include, url -from django.contrib import admin -from django.urls import reverse_lazy -from django.views.generic import RedirectView - - -urlpatterns = [ - url(r'^$', RedirectView.as_view(url=reverse_lazy('hk_root'))), - url(r'^hyperkitty/', include('hyperkitty.urls')), - url(r'^postorius/', include('postorius.urls')), - url(r'', include('django_mailman3.urls')), - url(r'^accounts/', include('allauth.urls')), - # Django admin - url(r'^admin/', admin.site.urls), -] diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index ec16775b1d451..408840c3f9344 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -1,38 +1,39 @@ -{ stdenv, python, hyperkitty, postorius, buildPythonPackage, isPy3k -, serverEMail ? "postmaster@example.org" -, archiverKey ? "SecretArchiverAPIKey" -, allowedHosts ? [] +{ buildPythonPackage, lib, fetchgit, isPy3k +, git, makeWrapper, sassc, hyperkitty, postorius, whoosh }: -let - - allowedHostsString = stdenv.lib.concatMapStringsSep ", " (x: "\""+x+"\"") allowedHosts; - -in - -# We turn those Djando configuration files into a make-shift Python library so -# that Nix users can use this package as a part of their buildInputs to import -# the code. Also, this package implicitly provides an environment in which the -# Django app can be run. - -buildPythonPackage { - name = "mailman-web-0"; +buildPythonPackage rec { + pname = "mailman-web-unstable"; + version = "2019-09-29"; disabled = !isPy3k; - propagatedBuildInputs = [ hyperkitty postorius ]; + src = fetchgit { + url = "https://gitlab.com/mailman/mailman-web"; + rev = "d17203b4d6bdc71c2b40891757f57a32f3de53d5"; + sha256 = "124cxr4vfi1ibgxygk4l74q4fysx0a6pga1kk9p5wq2yvzwg9z3n"; + leaveDotGit = true; + }; + + # This is just so people installing from pip also get uwsgi + # installed, AFAICT. + postPatch = '' + sed -i '/^ uwsgi$/d' setup.cfg + ''; + + nativeBuildInputs = [ git makeWrapper ]; + propagatedBuildInputs = [ hyperkitty postorius whoosh ]; - unpackPhase = ":"; - buildPhase = ":"; - setuptoolsCheckPhase = ":"; + # Tries to check runtime configuration. + doCheck = false; - installPhase = '' - d=$out/${python.sitePackages} - install -D -m 444 ${./urls.py} $d/urls.py - install -D -m 444 ${./wsgi.py} $d/wsgi.py - substitute ${./settings.py} $d/settings.py \ - --subst-var-by SERVER_EMAIL '${serverEMail}' \ - --subst-var-by ARCHIVER_KEY '${archiverKey}' \ - --subst-var-by ALLOWED_HOSTS '${allowedHostsString}' - chmod 444 $d/settings.py + postInstall = '' + wrapProgram $out/bin/mailman-web \ + --suffix PATH : ${lib.makeBinPath [ sassc ]} ''; + + meta = with lib; { + description = "Django project for Mailman 3 web interface"; + license = licenses.gpl3; + maintainers = with maintainers; [ qyliss ]; + }; } diff --git a/pkgs/servers/mail/mailman/wrapped.nix b/pkgs/servers/mail/mailman/wrapped.nix new file mode 100644 index 0000000000000..2a620763d876b --- /dev/null +++ b/pkgs/servers/mail/mailman/wrapped.nix @@ -0,0 +1,20 @@ +{ runCommand, lib, makeWrapper, python3 +, archivers ? [ python3.pkgs.mailman-hyperkitty ] +}: + +let + inherit (python3.pkgs) makePythonPath mailman; +in + +runCommand "${mailman.name}-wrapped" { + inherit (mailman) meta; + buildInputs = [ makeWrapper ]; + passthru = mailman.passthru // { unwrapped = mailman; }; +} '' + mkdir -p "$out/bin" + cd "${mailman}/bin" + for exe in *; do + makeWrapper "${mailman}/bin/$exe" "$out/bin/$exe" \ + --set PYTHONPATH ${makePythonPath ([ mailman ] ++ archivers)} + done +'' diff --git a/pkgs/servers/mail/mailman/wsgi.py b/pkgs/servers/mail/mailman/wsgi.py deleted file mode 100644 index 5bdbc51147391..0000000000000 --- a/pkgs/servers/mail/mailman/wsgi.py +++ /dev/null @@ -1,17 +0,0 @@ -""" -WSGI config for meh project. - -It exposes the WSGI callable as a module-level variable named ``application``. - -For more information on this file, see -https://docs.djangoproject.com/en/1.9/howto/deployment/wsgi/ -""" - -import os - -from django.core.wsgi import get_wsgi_application - - -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") - -application = get_wsgi_application() diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 5a768178ee78b..48e2666c580a5 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.1p1"; + version = "6.6.2p1"; 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 = "1ngil8j13m2rq07g94j4yjr6zmaimzy8wbfr17shi7rxnazys6zb"; + sha256 = "16nz2n4s3djlasd6m6dqfwggf6igyfxzq5igny5i0qb8lnn13f33"; }; patches = [ diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 274f45d5b2d11..6980dca940356 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -9,9 +9,6 @@ perlPackages.buildPerlPackage rec { sha256 = "1380cmrgjsyidnznr844c5yr9snz36dw7xchdfryi2s61vjzvf55"; }; - # https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7434 - patches = [ ./sa-update_add--siteconfigpath.patch ]; - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ HTMLParser NetCIDRLite NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP IOSocketSSL DBI EncodeDetect IPCountry NetIdent Razor2ClientAgent MailSPF @@ -22,7 +19,7 @@ perlPackages.buildPerlPackage rec { # for the PERL5LIB environment variable. Needs further investigation. makeFlags = [ "PERL_BIN=${perlPackages.perl}/bin/perl" "PERL_TAINT=no" ]; - makeMakerFlags = [ "CONFDIR=/homeless/shelter" "LOCALSTATEDIR=/var/lib/spamassassin" ]; + makeMakerFlags = [ "SYSCONFDIR=/etc LOCALSTATEDIR=/var/lib/spamassassin" ]; doCheck = false; diff --git a/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch b/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch index 3264aefc0722b..bac048892fe83 100644 --- a/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch +++ b/pkgs/servers/mail/spamassassin/sa-update_add--siteconfigpath.patch @@ -30,7 +30,7 @@ index bb7396d..39f681f 100755 # check only disabled gpg # https://issues.apache.org/SpamAssassin/show_bug.cgi?id=5854 -@@ -1808,6 +1812,7 @@ Options: +@@ -1808,7 +1812,7 @@ Options: --updatedir path Directory to place updates, defaults to the SpamAssassin site rules directory (default: @@LOCAL_STATE_DIR@@/@@VERSION@@) @@ -39,21 +39,6 @@ index bb7396d..39f681f 100755 -D, --debug [area=n,...] Print debugging messages -v, --verbose Be verbose, like print updated channel names; -- -diff --git a/lib/Mail/SpamAssassin/PerMsgStatus.pm b/lib/Mail/SpamAssassin/PerMsgStatus.pm -index 6d8beaa..6ad87dc 100644 ---- a/lib/Mail/SpamAssassin/PerMsgStatus.pm -+++ b/lib/Mail/SpamAssassin/PerMsgStatus.pm -@@ -389,7 +389,8 @@ sub check_timed { - if (!$self->{main}->have_plugin("check_main")) { - die "check: no loaded plugin implements 'check_main': cannot scan!\n". - "Check that the necessary '.pre' files are in the config directory.\n". -- "At a minimum, v320.pre loads the Check plugin which is required.\n"; -+ "At a minimum, v320.pre loads the Check plugin which is required.\n". -+ "NixOS: Since there is no '/etc/spamassassin' simply restart 'spamd.service' which on its behalf will run 'sa-learn --siteconfigpath=/nix/store/l4hr4yxk8mb4wbkha6vm6rh92pj19rj6-spamd-env ...' to update the /var/lib/spamassassin configs.\n"; - } - } - --- 2.12.2 diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 608ac6028f411..295881b03a335 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.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "0ghmxzk2njid7d7ccggda8a9zx4dg1r59n5ymp8f2n9kxz7z2rj2"; + sha256 = "13csf18dchm75vw251a7h57diag94vw6rhg8kkkbpi35cibn0cz2"; }; patches = [ diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index dfb3ac2cfa202..004822b906ca7 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent}: stdenv.mkDerivation rec { - version = "1.5.20"; + version = "1.5.21"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "1r511qr95q0ywdaql3pdjiwzkfqxhhfzb13ilvl7mznfm4iv1myg"; + sha256 = "1x4jzrz09aq4nllkarn7d5x77gsys5l3nvfj8c7j4nvmvc30rlg3"; }; configureFlags = [ diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 183bbc73f5db9..1148f6ca25e12 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.5.3"; + version = "6.6.0"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1ks951b3ar1wdpbxn8ak74m8zh02d3lbmk6mphwni68c019ymahi"; + sha256 = "0pdhi3lrcfyr60cs93dqskkwlbn7ic4jngaksa3y6kicy6z1nmgz"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1gjj0h7kz4lan00ka5kg901l3nyzswnjfr0slqy08bl4svqpizh2"; + sha256 = "1xp92kbvgyb3pl0sslwdn6bai41ym0yr26wp8qj39rvqamsh86g2"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index eb98e45c36c3e..5312ecb069245 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "seyren"; - version = "1.1.0"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/scobal/seyren/releases/download/${version}/seyren-${version}.jar"; - sha256 = "10m64zdci4swlvivii1jnmrwfi461af3xvn0xvwvy7i8kyb56vrr"; + sha256 = "1fixij04n8hgmaj8kw8i6vclwyd6n94x0n6ify73ynm6dfv8g37x"; }; phases = ["installPhase"]; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index eb95077dc24d7..35bf759af8e58 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "telegraf"; - version = "1.12.1"; + version = "1.13.2"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,19 +14,21 @@ buildGoPackage rec { owner = "influxdata"; repo = "telegraf"; rev = version; - sha256 = "00cd4kskdswcinv5bhwimggi0vbznq3sb2dllkhidx0bird3wdiw"; + sha256 = "1vcnac1gj7ri1hdlkz5i6zpxiwljpfn1iag1zb3fymlw6c91b11p"; }; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} '' ]; + passthru.tests = { inherit (nixosTests) telegraf; }; + goDeps = ./deps.nix; meta = with lib; { description = "The plugin-driven server agent for collecting & reporting metrics."; license = licenses.mit; homepage = https://www.influxdata.com/time-series-platform/telegraf/; - maintainers = with maintainers; [ mic92 roblabla ]; + maintainers = with maintainers; [ mic92 roblabla foxit64 ]; }; } diff --git a/pkgs/servers/monitoring/telegraf/deps.nix b/pkgs/servers/monitoring/telegraf/deps.nix index 952d78980b0c6..091984f5bdf11 100644 --- a/pkgs/servers/monitoring/telegraf/deps.nix +++ b/pkgs/servers/monitoring/telegraf/deps.nix @@ -37,12 +37,30 @@ }; } { + goPackagePath = "github.com/Azure/azure-pipeline-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-pipeline-go"; + rev = "b8e3409182fd52e74f7d7bdfbff5833591b3b655"; + sha256 = "0p2m31l893377na7dmsjfpjd5swqnb7p0vhsng3vyn237i8f1336"; + }; + } + { + goPackagePath = "github.com/Azure/azure-storage-queue-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-storage-queue-go"; + rev = "6ed74e755687d1a74f08d9aab5a9e3f2fbe7d162"; + sha256 = "0zw9hcbgsbzy2k3ipbnv95kfp7f24qbr3hgw89pnsf29hld27hba"; + }; + } + { goPackagePath = "github.com/Azure/go-autorest"; fetch = { type = "git"; url = "https://github.com/Azure/go-autorest"; - rev = "1f7cd6cfe0adea687ad44a512dfe76140f804318"; - sha256 = "0sh7c8lgjjwpaw6rka0j5wlg9dsz0swz4h7lc2xnzfv2wvgzliv8"; + rev = "3492b2aff5036c67228ab3c7dba3577c871db200"; + sha256 = "0ih4vjcfsgd575971cdkmpbpk0s1j562ryl5qrh9f4ddn2l85x74"; }; } { @@ -67,9 +85,9 @@ goPackagePath = "github.com/Shopify/sarama"; fetch = { type = "git"; - url = "https://github.com/influxdata/sarama.git"; - rev = "b12709e6ca29240128c89fe0b30b6a76be42b457"; - sha256 = "0hp8g1qwcir2356y48a1qsbhc8qvb44lswhlrc5vgnzscq54zj35"; + url = "https://github.com/Shopify/sarama"; + rev = "675b0b1ff204c259877004140a540d6adf38db17"; + sha256 = "0h63maidp2yzjvrk4pd9b51frdw8yym91k6s1vcqzmcx4956gq72"; }; } { @@ -221,8 +239,8 @@ fetch = { type = "git"; url = "https://github.com/dimchansky/utfbom"; - rev = "6c6132ff69f0f6c088739067407b5d32c52e1d0f"; - sha256 = "01qbwnglc019303qbr9x85d36svd0hrwd1qrld77fgw45ml6b2ib"; + rev = "d2133a1ce379ef6fa992b0514a77146c60db9d1c"; + sha256 = "06s61wwd32fad1p8qn5blqjd5791avzb13fnqflkkg993adw49ww"; }; } { @@ -329,8 +347,8 @@ fetch = { type = "git"; url = "https://github.com/glinton/ping"; - rev = "1983bc2fd5de3ea00aa5457bbc8774300e889db9"; - sha256 = "0ixxdwknb2pr1gsp9ay41pl6lhbzz487h43hnynix3gxl38lg6rc"; + rev = "d3c0ecf4df108179eccdff2176f4ff569c3aab37"; + sha256 = "172h22kv78ickxdhvl0lhaffylhg11ab4wb4nn15vcc164d6lwil"; }; } { @@ -379,6 +397,15 @@ }; } { + goPackagePath = "github.com/gofrs/uuid"; + fetch = { + type = "git"; + url = "https://github.com/gofrs/uuid"; + rev = "3a54a6416087bae7aa0ac32dd79fe1bf87bc99e4"; + sha256 = "0b0hnr7d8zxwk0djifffp8y8x71vv1i03r8y1wpzp79v54jz28m3"; + }; + } + { goPackagePath = "github.com/gogo/protobuf"; fetch = { type = "git"; @@ -388,6 +415,15 @@ }; } { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "9fa652df1129bef0e734c9cf9bf6dbae9ef3b9fa"; + sha256 = "0wxsjz98v2df4cy1p297cyphdaja0bgg4d2w4kbhsaky022vn7g2"; + }; + } + { goPackagePath = "github.com/golang/protobuf"; fetch = { type = "git"; @@ -572,8 +608,8 @@ fetch = { type = "git"; url = "https://github.com/jackc/pgx"; - rev = "8faa4453fc7051d1076053f8854077753ab912f2"; - sha256 = "0zx52pidklrmxkxja0i38zn4yq6z909jvyb30xr48qlsbjn5y6zx"; + rev = "c73e7d75061bb42b0282945710f344cfe1113d10"; + sha256 = "1am1iggch89mn4a99bxnawjhc5yrgd8fjlmzq0b9l9qy5w1gzr1f"; }; } { @@ -595,21 +631,12 @@ }; } { - goPackagePath = "github.com/kardianos/osext"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/osext"; - rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; - sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; - }; - } - { goPackagePath = "github.com/kardianos/service"; fetch = { type = "git"; url = "https://github.com/kardianos/service"; - rev = "615a14ed75099c9eaac6949e22ac2341bf9d3197"; - sha256 = "149hwk6nils3vff38znc89vzdnhppp227i7ds14hy1nighjwr77c"; + rev = "56787a3ea05e9b262708192e7ce3b500aba73561"; + sha256 = "0srikxxl78grkn85w1chxpxi0bc9zhsfl4794k1qsgykgipkz078"; }; } { @@ -617,8 +644,8 @@ fetch = { type = "git"; url = "https://github.com/karrick/godirwalk"; - rev = "2de2192f9e35ce981c152a873ed943b93b79ced4"; - sha256 = "014n3pq9b4m2gx7h3ncf5xk7kw8g89yhbvnfc6dqg006r9q26w4w"; + rev = "532e518bccc921708e14b29e16503b1bf5c898cc"; + sha256 = "0d1w72w99aqxzlf4w0s9s0ji4w01xfry207q1pm4wlllk7m2mh1c"; }; } { @@ -631,6 +658,15 @@ }; } { + goPackagePath = "github.com/klauspost/compress"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/compress"; + rev = "4e96aec082898e4dad17d8aca1a7e2d01362ff6c"; + sha256 = "12bxybwcgkfi1a32d60y0v1s7s58q1xgavrf428lnzljsm1cak2n"; + }; + } + { goPackagePath = "github.com/kr/logfmt"; fetch = { type = "git"; @@ -680,8 +716,8 @@ fetch = { type = "git"; url = "https://github.com/mdlayher/apcupsd"; - rev = "2fe55d9e1d0704d3c6f03f69a1fd9ebe2aef9df1"; - sha256 = "1y8wabqln92h2g71aglgf0cp66b7zj8zb2wb03jhpfm75ssv1yyb"; + rev = "eb3dd99a75fe58389e357b732691320dcf706b5f"; + sha256 = "0s1m6l4pnazqiymb8y89ajbxfl2cn0ahvhws10nvxvc4jjivlbbq"; }; } { @@ -689,8 +725,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "5a2b9fab83ff0f8bfc99684bd5f43a37abe560f1"; - sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx"; + rev = "f4db2ca6edc3af0ee51bf332099cc480bcf3ef9d"; + sha256 = "1mr9ia1r2ai9gwrljycj6i64r1i612nxp0n8fk1ajkkf7dwnjk33"; }; } { @@ -698,8 +734,8 @@ fetch = { type = "git"; url = "https://github.com/mitchellh/go-homedir"; - rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66"; - sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; + rev = "af06845cf3004701891bf4fdb884bfe4920b3727"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; }; } { @@ -892,6 +928,15 @@ }; } { + goPackagePath = "github.com/safchain/ethtool"; + fetch = { + type = "git"; + url = "https://github.com/safchain/ethtool"; + rev = "42ed695e3de80b9d695f280295fd7994639f209d"; + sha256 = "0n5hkrzc1bh46nidcssx4539kvcmgj501v3kzh2pljpg27509daj"; + }; + } + { goPackagePath = "github.com/samuel/go-zookeeper"; fetch = { type = "git"; @@ -905,8 +950,8 @@ fetch = { type = "git"; url = "https://github.com/satori/go.uuid"; - rev = "f58768cc1a7a7e77a3bd49e98cdd21419399b6a3"; - sha256 = "1j4s5pfg2ldm35y8ls8jah4dya2grfnx2drb4jcbjsyrp4cm5yfb"; + rev = "b2ce2384e17bbe0c6d34077efa39dbab3e09123b"; + sha256 = "1yz4cx02377ijlf8mnn84j1dcmlwh8ncx7y3kw1zg2qw0z4x119c"; }; } { @@ -914,8 +959,8 @@ fetch = { type = "git"; url = "https://github.com/shirou/gopsutil"; - rev = "d80c43f9c984a48783daf22f4bd9278006ae483a"; - sha256 = "0zqcdvf0ym6nylz9ac1z38d3src8yws34n7gkvhpn52ikp801asn"; + rev = "fc7e5e7af6052e36e83e5539148015ed2c09d8f9"; + sha256 = "1p51r5qwbv7dkk3k3ndhz77hi08b76zpz9ik8qakgg5l6p5h8n7l"; }; } { @@ -941,8 +986,8 @@ fetch = { type = "git"; url = "https://github.com/soniah/gosnmp"; - rev = "96b86229e9b3ffb4b954144cdc7f98fe3ee1003f"; - sha256 = "06al7bwl4hy8mc9l6q366sbpibad4n93xhdmifz133h6q9608djf"; + rev = "40eae407a1f8cbbe3f3f14c57bde0b16db1cfe85"; + sha256 = "1da492l2d9rc9nfc482fmyx8z9a3gmwca87kbizpwibkix9b7b02"; }; } { @@ -1085,8 +1130,8 @@ fetch = { type = "git"; url = "https://github.com/golang/crypto.git"; - rev = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9"; - sha256 = "0hjjk6k9dq7zllwsw9icdfbli12ii379q2lajd6l7lyw72wy28by"; + rev = "87dc89f01550277dc22b74ffcf4cd89fa2f40f4c"; + sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; }; } { @@ -1252,12 +1297,12 @@ }; } { - goPackagePath = "gopkg.in/ldap.v2"; + goPackagePath = "gopkg.in/ldap.v3"; fetch = { type = "git"; url = "https://github.com/go-ldap/ldap"; - rev = "bb7a9ca6e4fbc2129e3db588a34bc970ffe811a9"; - sha256 = "1wf81wy04nhkqs0dg5zkivr4sh37r83bxrfwjz9vr4jq6vmljr3h"; + rev = "caa044a2bfa324b735baee1722e8e2e372f76864"; + sha256 = "000jfdx38k10irfy9952jjzqn04ji3lnlfpvabvq9l78zs96n91p"; }; } { diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix index 550ee4c160f32..4838fed47fb03 100644 --- a/pkgs/servers/mtprotoproxy/default.nix +++ b/pkgs/servers/mtprotoproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mtprotoproxy"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "alexbers"; repo = "mtprotoproxy"; rev = "v${version}"; - sha256 = "1bpgbqbgy7c637bzm6g5msm2i10dfl4qb7psy3k3cbaysw696kjc"; + sha256 = "16f9hzh4h41qb5962lxx04653ncar83znh872g2qh564b6f922z2"; }; nativeBuildInputs = [ wrapPython ]; diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix new file mode 100644 index 0000000000000..45d3d3cc55950 --- /dev/null +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -0,0 +1,21 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "VictoriaMetrics"; + version = "1.32.5"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1i3l8bkii3x8wnq9a8yn48cchni5h0gy3rrpvg0jgm4kmm5dlq4y"; + }; + + modSha256 = "0696p1hv5z3dvawizvw0yi4xzl41bsmszkdqayzb37nm5cfk8riq"; + meta = with lib; { + homepage = "https://victoriametrics.com/"; + description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; + license = licenses.asl20; + maintainers = [ maintainers.yorickvp ]; + }; +} diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 267bd4c2600fb..3d69d2197803d 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -97,6 +97,6 @@ buildFHSUserEnv { # Actually run Plex, prepending LD_LIBRARY_PATH with the libraries from # the Plex package. - LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$root exec "$root/Plex Media Server" + LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$root exec "$root/Plex Media Server" ''; } diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index aeedf8b30aee4..f6791d0108831 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -111,6 +111,8 @@ stdenv.mkDerivation rec { ++ lib.unique (lib.concatMap (mod: mod.inputs) enabledModules) ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = "-Wno-error"; hardeningDisable = [ "format" ]; @@ -123,6 +125,8 @@ stdenv.mkDerivation rec { postInstall = '' # helper for compiling modules... not generally useful; also pulls in perl dependency rm "$out"/bin/fsxs + # include configuration templates + cp -r conf $out/share/freeswitch/ ''; meta = { diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 5a6cbd7e2d6f5..8452adcf22215 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "squid-4.9"; + name = "squid-4.10"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz"; - sha256 = "188znkbpr315yxbpvpvbpb5sbsn15zmg8l207a55dc43cs687c8w"; + sha256 = "07sz0adv8nkhy797675bpra7lvdkwjq9isw1ddgylhlazl511w4q"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 0dfec772a1884..13e7fb7b93b69 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"; + version = "4.10.1"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "14pjhc8a8fgm5cyy93r693nrjinaps6642v00jpwrjf7h2p8mfli"; + sha256 = "1xi2cvn1lxk1h1kilmjiq8ybxln3rrh6m5cd340zg20vpzz56cwh"; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 42ad65f704ac1..97506ce74472b 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -950,11 +950,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXpm = callPackage ({ stdenv, pkgconfig, fetchurl, libX11, libXext, xorgproto, libXt, gettext }: stdenv.mkDerivation { - name = "libXpm-3.5.12"; + name = "libXpm-3.5.13"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2; - sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; + url = mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2; + sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig gettext ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 84bf23a0fded0..7a9ffcfc6469c 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -261,11 +261,6 @@ self: super: }); libXpm = super.libXpm.overrideAttrs (attrs: { - name = "libXpm-3.5.12"; - src = fetchurl { - url = mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2; - sha256 = "1v5xaiw4zlhxspvx76y3hq4wpxv7mpj6parqnwdqvpj8vbinsspx"; - }; outputs = [ "bin" "dev" "out" ]; # tiny man in $bin patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; }); diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list index 0f5377cb84a97..8db2034f1bccb 100644 --- a/pkgs/servers/x11/xorg/tarballs.list +++ b/pkgs/servers/x11/xorg/tarballs.list @@ -195,7 +195,7 @@ mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2 mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2 -mirror://xorg/individual/lib/libXpm-3.5.12.tar.bz2 +mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2 mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2 mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index 121368abf4c70..7ca57ac015649 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -41,9 +41,10 @@ stdenv.mkDerivation rec { -DSSH_SOURCE_BASHRC ''; - patchFlags = [ "-p0" ]; + patchFlags = [ "-p0" "-T" ]; patches = upstreamPatches + ++ [ ./pgrp-pipe-4.4.patch ] ++ optional stdenv.hostPlatform.isCygwin ./cygwin-bash-4.4.11-2.src.patch # https://lists.gnu.org/archive/html/bug-bash/2016-10/msg00006.html ++ optional stdenv.hostPlatform.isMusl (fetchurl { diff --git a/pkgs/shells/bash/5.0.nix b/pkgs/shells/bash/5.0.nix index a06b08a5599cc..05aaf39b34049 100644 --- a/pkgs/shells/bash/5.0.nix +++ b/pkgs/shells/bash/5.0.nix @@ -41,9 +41,10 @@ stdenv.mkDerivation rec { -DSSH_SOURCE_BASHRC ''; - patchFlags = [ "-p0" ]; + patchFlags = [ "-p0" "-T" ]; - patches = upstreamPatches; + patches = upstreamPatches + ++ [ ./pgrp-pipe-5.0.patch ]; configureFlags = [ (if interactive then "--with-installed-readline" else "--disable-readline") diff --git a/pkgs/shells/bash/pgrp-pipe-4.4.patch b/pkgs/shells/bash/pgrp-pipe-4.4.patch new file mode 100644 index 0000000000000..ea3d7bdf92b43 --- /dev/null +++ b/pkgs/shells/bash/pgrp-pipe-4.4.patch @@ -0,0 +1,29 @@ +diff -u ./configure ../bash-4.4-fixed/configure +--- ./configure 2016-09-07 22:57:01.000000000 +0200 ++++ ../bash-4.4-fixed/configure 2020-01-08 14:10:26.316858174 +0100 +@@ -16064,10 +16064,7 @@ + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 2.[456789]*|[34]*) $as_echo "#define PGRP_PIPE 1" >>confdefs.h +- ;; +- esac ;; ++ $as_echo "#define PGRP_PIPE 1" >>confdefs.h ;; + *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; + powerux*) LOCAL_LIBS="-lgen" ;; +diff -u ./configure.ac ../bash-4.4-fixed/configure.ac +--- ./configure.ac 2016-09-07 22:56:28.000000000 +0200 ++++ ../bash-4.4-fixed/configure.ac 2016-09-07 22:56:28.000000000 +0200 +@@ -1092,9 +1092,7 @@ + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 2.[[456789]]*|[[34]]*) AC_DEFINE(PGRP_PIPE) ;; +- esac ;; ++ AC_DEFINE(PGRP_PIPE) ;; + *qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; + powerux*) LOCAL_LIBS="-lgen" ;; diff --git a/pkgs/shells/bash/pgrp-pipe-5.0.patch b/pkgs/shells/bash/pgrp-pipe-5.0.patch new file mode 100644 index 0000000000000..2a9fa6f33c3bb --- /dev/null +++ b/pkgs/shells/bash/pgrp-pipe-5.0.patch @@ -0,0 +1,31 @@ +diff -u ./configure ../bash-5.0-fixed/configure +--- ./configure 2019-01-02 15:43:31.000000000 +0100 ++++ ../bash-5.0-fixed/configure 2020-01-08 14:18:21.017296179 +0100 +@@ -16312,11 +16312,7 @@ + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 1.*|2.[0123]*) : ;; +- *) $as_echo "#define PGRP_PIPE 1" >>confdefs.h +- ;; +- esac ;; ++ $as_echo "#define PGRP_PIPE 1" >>confdefs.h ;; + netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; + *qnx[67]*) LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; +diff -u ./configure.ac ../bash-5.0-fixed/configure.ac +--- ./configure.ac 2019-01-02 15:39:11.000000000 +0100 ++++ ../bash-5.0-fixed/configure.ac 2019-01-02 15:39:11.000000000 +0100 +@@ -1108,10 +1108,7 @@ + solaris2*) LOCAL_CFLAGS=-DSOLARIS ;; + lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; + linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading +- case "`uname -r`" in +- 1.*|2.[[0123]]*) : ;; +- *) AC_DEFINE(PGRP_PIPE) ;; +- esac ;; ++ AC_DEFINE(PGRP_PIPE) ;; + netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;; + *qnx[[67]]*) LOCAL_LIBS="-lncurses" ;; + *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index e53ee1394edfb..86e786668e1b3 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-01-04"; + version = "2020-01-30"; pname = "oh-my-zsh"; - rev = "78b07e92fd4a3a5e1f92ee4e3d680c39b72c2245"; + rev = "dcffc895806f5c2aaade3fce09772e1c9f52504e"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1s5vr89dxgm1g3jcqybx4an80x0gmda4lh8y36r2dafxwmb09qmk"; + sha256 = "08qaxwfvm66iyidxrf6z7m7yahx3ksrnw4v0ld2sf5nxracmmlmh"; }; pathsToLink = [ "/share/oh-my-zsh" ]; diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 86a6e33c94248..f73fca48b7a7c 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -190,13 +190,10 @@ in rec { useSharedLibraries = false; }; - python = super.callPackage ../../development/interpreters/python/cpython/2.7/boot.nix { - CF = null; # use CoreFoundation from bootstrap-tools - configd = null; - }; - python2 = self.python; + python3 = super.python3Minimal; ninja = super.ninja.override { buildDocs = false; }; + darwin = super.darwin // { cctools = super.darwin.cctools.override { enableTapiSupport = false; @@ -218,11 +215,11 @@ in rec { stage2 = prevStage: let persistent = self: super: with prevStage; { inherit - zlib patchutils m4 scons flex perl bison unifdef unzip openssl python + zlib patchutils m4 scons flex perl bison unifdef unzip openssl python3 libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils - libssh2 nghttp2 libkrb5 python2 ninja; + libssh2 nghttp2 libkrb5 ninja; darwin = super.darwin // { inherit (darwin) @@ -252,11 +249,11 @@ in rec { stage3 = prevStage: let persistent = self: super: with prevStage; { inherit - patchutils m4 scons flex perl bison unifdef unzip openssl python + patchutils m4 scons flex perl bison unifdef unzip openssl python3 gettext sharutils libarchive pkg-config groff bash subversion openssh sqlite sed serf openldap db cyrus-sasl expat apr-util findfreetype libssh curl cmake autoconf automake libtool cpio - libssh2 nghttp2 libkrb5 python2 ninja; + libssh2 nghttp2 libkrb5 ninja; # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds. libxml2 = super.libxml2.override { pythonSupport = false; }; @@ -302,7 +299,7 @@ in rec { stage4 = prevStage: let persistent = self: super: with prevStage; { inherit - gnumake gzip gnused bzip2 gawk ed xz patch bash + gnumake gzip gnused bzip2 gawk ed xz patch bash python3 ncurses libffi zlib gmp pcre gnugrep coreutils findutils diffutils patchutils ninja; @@ -332,7 +329,7 @@ in rec { libxml2-nopython = super.libxml2.override { pythonSupport = false; }; CF = super.darwin.CF.override { libxml2 = libxml2-nopython; - python = prevStage.python; + python3 = prevStage.python3; }; }; }; @@ -365,17 +362,6 @@ in rec { }); in { inherit tools libraries; } // tools // libraries); - # N.B: the important thing here is to ensure that python == python2 - # == python27 or you get weird issues with inconsistent package sets. - # In a particularly subtle bug, I overrode python2 instead of python27 - # here, and it caused gnome-doc-utils to complain about: - # "PyThreadState_Get: no current thread". This is because Python gets - # really unhappy if you have Python A which loads a native python lib - # which was linked against Python B, which in our case was happening - # because we didn't override python "deeply enough". Anyway, this works - # and I'm just leaving this blurb here so people realize why it matters - python27 = super.python27.override { CF = prevStage.darwin.CF; }; - darwin = super.darwin // { inherit (darwin) dyld ICU Libsystem libiconv; } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) { @@ -438,7 +424,8 @@ in rec { inherit cc; darwin = super.darwin // { - xnu = super.darwin.xnu.override { python = super.python.override { configd = null; }; }; + inherit (prevStage.darwin) CF; + xnu = super.darwin.xnu.override { inherit (prevStage) python3; }; }; }); }; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index befeb45099732..df2d35d541b84 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -53,6 +53,7 @@ let lib = import ../../../lib; in lib.makeOverridable ( let defaultNativeBuildInputs = extraNativeBuildInputs ++ [ ../../build-support/setup-hooks/move-docs.sh + ../../build-support/setup-hooks/make-symlinks-relative.sh ../../build-support/setup-hooks/compress-man-pages.sh ../../build-support/setup-hooks/strip.sh ../../build-support/setup-hooks/patch-shebangs.sh diff --git a/pkgs/tools/X11/libstrangle/nixos.patch b/pkgs/tools/X11/libstrangle/nixos.patch index 912bdded6daf8..03c8c19b54cfb 100644 --- a/pkgs/tools/X11/libstrangle/nixos.patch +++ b/pkgs/tools/X11/libstrangle/nixos.patch @@ -26,4 +26,4 @@ index e280e86..b2dd42b 100755 -# Execute the strangled program under a clean environment # pass through the FPS and overriden LD_PRELOAD environment variables -exec env FPS="${FPS}" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" "$@" -+FPS="${FPS}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" exec "$@" ++FPS="${FPS}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@out@/lib/libstrangle/lib64:@out@/lib/libstrangle/lib32" LD_PRELOAD="${LD_PRELOAD}:libstrangle.so" exec "$@" diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index a70b619a6b46e..eb8aa042e7b02 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -27,7 +27,7 @@ let in writeScriptBin "primusrun" '' #!${runtimeShell} - export LD_LIBRARY_PATH=${ldPath}:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=${ldPath}''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH # https://bugs.launchpad.net/ubuntu/+source/bumblebee/+bug/1758243 export __GLVND_DISALLOW_PATCHING=1 exec "$@" diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 3cadafc633ee2..89c8e2866e492 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1m4hcj2bi9v3ngjj2x1fifcnb450jrij06vbi3j28slsdwn1bcc8"; + sha256 = "13kxilsy0fdzg1phzcsxfg53flzx3xk6c5jyygggajp45aysbyra"; }; - modSha256 = "1c8qyxzfazgw77rlv3yw2x39ymaq66jjd51im0jl4131a6hzj6fd"; + modSha256 = "0g5alqhwna9sd6dp50waqa87af2z3n5pj5mwnb9i2y65g2kclaha"; subPackages = [ "cmd/eksctl" ]; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index fa7c3876a2834..48daaa418bb46 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,18 +2,22 @@ buildGoModule rec { pname = "lego"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "1djvwyjg30f9bj61pf3y2k2w055pj39v0sif4rjqg8cz0j382a2z"; + sha256 = "135zz5gp5vqqwmz3701n5xfvz9yxzm4m53q3dbj9vfc8xkcxn44n"; }; - modSha256 = "0k3p11cji3p4nzr8aia8hp01wyx1qfx84259dwbfwg1b32ln8rkc"; + modSha256 = "0jirpfd427317px0fd630bmi3li6zc5vihydwmwbj0qsfvhn4qm4"; subPackages = [ "cmd/lego" ]; + buildFlagsArray = [ + "-ldflags=-X main.version=${version}" + ]; + meta = with lib; { description = "Let's Encrypt client and ACME library written in Go"; license = licenses.mit; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index 7f9c7cb777365..f602a52d85abb 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "upx"; - version = "3.95"; + version = "3.96"; src = fetchurl { url = "https://github.com/upx/upx/releases/download/v${version}/${pname}-${version}-src.tar.xz"; - sha256 = "14jmgy7hvx4zqra20w8260wrcxmjf2h6ba2yrw7pcp18im35a3rv"; + sha256 = "051pk5jk8fcfg5mpgzj43z5p4cn7jy5jbyshyn78dwjqr7slsxs7"; }; CXXFLAGS = "-Wno-unused-command-line-argument"; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 1da8470280b83..e3545315d6f77 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"; + version = "5.4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1ykhasv0jc3qi3xrm5841mzkmlbkjw6rm70gl4aww90jj6ak55qg"; + sha256 = "0scxg9p6z0wss92gmv5a8yxdmr8x449kb5v3bfnvs26n92r7zq7k"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index aa3622ed057ad..e3b1d7c661c73 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -135,10 +135,10 @@ in rec { substituteInPlace src/common/module.c --replace "/sbin/modprobe" "modprobe" # for pybind/rgw to find internal dep - export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$PWD/build/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + # install target needs to be in PYTHONPATH for "*.pth support" check to succeed # set PYTHONPATH, so the build system doesn't silently skip installing ceph-volume and others export PYTHONPATH=${ceph-python-env}/${sitePackages}:$lib/${sitePackages}:$out/${sitePackages} - patchShebangs src/script src/spdk src/test src/tools ''; diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/0001-Fix-build-on-BSD-systems.patch b/pkgs/tools/filesystems/squashfs-tools-ng/0001-Fix-build-on-BSD-systems.patch deleted file mode 100644 index 2834b046cef2b..0000000000000 --- a/pkgs/tools/filesystems/squashfs-tools-ng/0001-Fix-build-on-BSD-systems.patch +++ /dev/null @@ -1,103 +0,0 @@ -From ea1bc0fcfd33191002c5d1f7072c1c02bb7ec4af Mon Sep 17 00:00:00 2001 -From: Alyssa Ross <hi@alyssa.is> -Date: Thu, 14 Nov 2019 15:45:46 +0000 -Subject: [PATCH] Fix build on BSD systems - -I tested FreeBSD, DragonflyBSD, NetBSD and OpenBSD and the endian -macros weren't necessary (and in fact caused errors) on all of them. - -Because OpenBSD ships with an ancient GCC that doesn't support the -checked addition/multiplication builtins, the build there would fail -unless built with CC=cc or CC=clang. I changed configure.ac to prefer -cc over gcc, so that the distribution's compiler preference is -respected. (The default is [gcc cc]). I had to move AC_PROG_CC above -LT_INIT because otherwise LT_INIT would run AC_PROG_CC first, and we -wouldn't have a chance to use non-default parameters. ---- - configure.ac | 2 +- - include/util/compat.h | 13 +++++-------- - lib/common/dirstack.c | 1 + - lib/common/mkdir_p.c | 2 +- - 4 files changed, 8 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 018b3f6..19ea0ed 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3,8 +3,8 @@ AC_INIT([squashfs-tools-ng], [0.7], [goliath@infraroot.at], squashfs-tools-ng) - AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects]) - AM_SILENT_RULES([yes]) -+AC_PROG_CC([cc gcc clang]) - LT_INIT --AC_PROG_CC - AC_PROG_CC_C99 - AC_PROG_INSTALL - AC_SYS_LARGEFILE -diff --git a/include/util/compat.h b/include/util/compat.h -index 74d0b6f..f53fd0e 100644 ---- a/include/util/compat.h -+++ b/include/util/compat.h -@@ -7,6 +7,10 @@ - #ifndef COMPAT_H - #define COMPAT_H - -+#ifndef __linux__ -+#define O_PATH 0 -+#endif -+ - #if defined(__APPLE__) - #include <libkern/OSByteOrder.h> - -@@ -17,14 +21,8 @@ - #define le32toh(x) OSSwapLittleToHostInt32(x) - #define le16toh(x) OSSwapLittleToHostInt16(x) - #define le64toh(x) OSSwapLittleToHostInt64(x) --#elif defined(__OpenBSD__) -+#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) - #include <sys/endian.h> --#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) --#include <sys/endian.h> -- --#define le16toh(x) letoh16(x) --#define le32toh(x) letoh32(x) --#define le64toh(x) letoh64(x) - #elif defined(_WIN32) || defined(__WINDOWS__) - #define htole16(x) (x) - #define htole32(x) (x) -@@ -89,7 +87,6 @@ - #else - #include <sys/types.h> - #include <sys/stat.h> --#include <sys/sysmacros.h> - #endif - - #endif /* COMPAT_H */ -diff --git a/lib/common/dirstack.c b/lib/common/dirstack.c -index 8f73898..f8d1278 100644 ---- a/lib/common/dirstack.c -+++ b/lib/common/dirstack.c -@@ -5,6 +5,7 @@ - * Copyright (C) 2019 David Oberhollenzer <goliath@infraroot.at> - */ - #include "common.h" -+#include "util/compat.h" - - #include <string.h> - #include <stdlib.h> -diff --git a/lib/common/mkdir_p.c b/lib/common/mkdir_p.c -index cb433b3..95187ba 100644 ---- a/lib/common/mkdir_p.c -+++ b/lib/common/mkdir_p.c -@@ -7,7 +7,7 @@ - #include "common.h" - - #include <string.h> --#include <alloca.h> -+#include <stdlib.h> - #include <stdio.h> - #include <errno.h> - --- -2.23.0 - diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index 727e257a4861e..bc8ce7b19c531 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -1,20 +1,17 @@ -{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, doxygen, graphviz, perl -, pkgconfig, lz4, xz, zlib, zstd +{ stdenv, lib, fetchurl, doxygen, graphviz, perl, pkgconfig +, lz4, xz, zlib, zstd }: stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "0.7"; + version = "0.8"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "01yn621dnsfhrah3qj1xh6ynag7r3nvihc510sa5frapkyg9nw8n"; + sha256 = "1km18qm9kgmm39aj9yq2aaq99708nmj9cpa9lqf5bp1y617bhh7y"; }; - patches = lib.optional (!stdenv.isLinux) ./0001-Fix-build-on-BSD-systems.patch; - - nativeBuildInputs = [ doxygen graphviz pkgconfig perl ] - ++ lib.optional (!stdenv.isLinux) autoreconfHook; + nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]; buildInputs = [ zlib xz lz4 zstd ]; meta = with lib; { @@ -22,5 +19,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ qyliss ]; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch b/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch new file mode 100644 index 0000000000000..97d95d1c5b195 --- /dev/null +++ b/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch @@ -0,0 +1,51 @@ +From 3bd82a82cf4ba693d2c31c7b95aaec4e56dc92a4 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Mon, 11 Mar 2019 16:40:29 -0700 +Subject: [PATCH 1/1] strtod: fix clash with strtold + +Problem reported for RHEL 5 by Jesse Caldwell (Bug#34817). +* lib/strtod.c (compute_minus_zero, minus_zero): +Simplify by remving the macro / external variable, +and having just a function. User changed. This avoids +the need for an external variable that might clash. +--- + ChangeLog | 9 +++++++++ + lib/strtod.c | 11 +++++------ + 2 files changed, 14 insertions(+), 6 deletions(-) + +diff --git a/lib/strtod.c b/lib/strtod.c +index b9eaa51..69b1564 100644 +--- a/lib/strtod.c ++++ b/lib/strtod.c +@@ -294,16 +294,15 @@ parse_number (const char *nptr, + ICC 10.0 has a bug when optimizing the expression -zero. + The expression -MIN * MIN does not work when cross-compiling + to PowerPC on Mac OS X 10.5. */ +-#if defined __hpux || defined __sgi || defined __ICC + static DOUBLE +-compute_minus_zero (void) ++minus_zero (void) + { ++#if defined __hpux || defined __sgi || defined __ICC + return -MIN * MIN; +-} +-# define minus_zero compute_minus_zero () + #else +-DOUBLE minus_zero = -0.0; ++ return -0.0; + #endif ++} + + /* Convert NPTR to a DOUBLE. If ENDPTR is not NULL, a pointer to the + character after the last one used in the number is put in *ENDPTR. */ +@@ -479,6 +478,6 @@ STRTOD (const char *nptr, char **endptr) + /* Special case -0.0, since at least ICC miscompiles negation. We + can't use copysign(), as that drags in -lm on some platforms. */ + if (!num && negative) +- return minus_zero; ++ return minus_zero (); + return negative ? -num : num; + } +-- +1.9.1 + diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index cbe97dda9e5ab..519a33c60d693 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -15,7 +15,7 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { pname = "coreutils"; version = "8.31"; @@ -29,7 +29,9 @@ stdenv.mkDerivation rec { # To be removed in coreutils-8.32. ++ optional stdenv.hostPlatform.isMusl ./avoid-false-positive-in-date-debug-test.patch # Fix compilation in musl-cross environments. To be removed in coreutils-8.32. - ++ optional stdenv.hostPlatform.isMusl ./coreutils-8.31-musl-cross.patch; + ++ optional stdenv.hostPlatform.isMusl ./coreutils-8.31-musl-cross.patch + # Fix compilation in android-cross environments. To be removed in coreutils-8.32. + ++ [ ./coreutils-8.31-android-cross.patch ]; postPatch = '' # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems. @@ -143,8 +145,9 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.eelco ]; }; - } // optionalAttrs stdenv.hostPlatform.isMusl { # Work around a bogus warning in conjunction with musl. NIX_CFLAGS_COMPILE = "-Wno-error"; -} +} // stdenv.lib.optionalAttrs stdenv.hostPlatform.isAndroid { + NIX_CFLAGS_COMPILE = "-D__USE_FORTIFY_LEVEL=0"; +}) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index e05d11c9c7271..c358e24095a5e 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "direnv"; - version = "2.21.1"; + version = "2.21.2"; goPackagePath = "github.com/direnv/direnv"; src = fetchFromGitHub { owner = "direnv"; repo = "direnv"; rev = "v${version}"; - sha256 = "05yhhd6f55ps96faw9gz4ap8qmv41cfrsz8l0qbvir0jn2hjhmqw"; + sha256 = "0afpxx8pwa1zb66l79af57drzjaazn2rp6306w4pxvqfh0zi2bri"; }; postConfigure = '' diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index bffc8a01f9206..ec1e2c48e640c 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ethtool"; - version = "5.3"; + version = "5.4"; src = fetchurl { - url = "mirror://kernel/software/network/ethtool/${pname}-${version}.tar.xz"; - sha256 = "1i14zrg4a84zjpwvqi8an0zx0hm06g614a79zc2syrkhrvdw1npk"; + url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0srbqp4a3x9ryrbm5q854375y04ni8j0bmsrl89nmsyn4x4ixy12"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 3329386019019..59055e4114a77 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -16,11 +16,11 @@ assert !cpp || mpi == null; let inherit (stdenv.lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.10.5"; + version = "1.10.6"; pname = "hdf5"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/${pname}-${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "0i3g6v521vigzbx8wpd32ibsiiw92r65ca3qdbn0d8fj8f4fmmk8"; + sha256 = "1gf38x51128hn00744358w27xgzjk0ff4wra4yxh2lk804ck1mh9"; }; passthru = { diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index 482a949482ff1..1b3b22b2adfe9 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "brook"; - version = "20190601"; + version = "20200102"; goPackagePath = "github.com/txthinking/brook"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "04gx1p447wabw3d18s9sm8ynlvj2bp8ac9dsgs08kd1dyrsjlljk"; + sha256 = "17h74p4apghljiyqjxgk6c4hqnyqs4lsn15gbysx26r4cvzglpx6"; }; goDeps = ./deps.nix; diff --git a/pkgs/tools/networking/brook/deps.nix b/pkgs/tools/networking/brook/deps.nix index a9a8d5e43e3b1..9ccb446b5e52c 100644 --- a/pkgs/tools/networking/brook/deps.nix +++ b/pkgs/tools/networking/brook/deps.nix @@ -1,11 +1,39 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "github.com/urfave/cli"; fetch = { type = "git"; url = "https://github.com/urfave/cli"; - rev = "a1c7408de3f632d86eee604a3bb755f1ffb68226"; - sha256 = "1fq0amfgpccf35nll7xw0k6smwrb7h0wy62n70kfd9kvh64n8hbn"; + rev = "3f8c3bca5729c9b679beffd0d88a67d468f832fd"; + sha256 = "07m5dfp5190wczdw2vqzz4srcpjz5lci1z12rzww9pg9pdjs63gy"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "217d7bd9dd5494abdf2877afbeb24ba0e11b43d6"; + sha256 = "0vsmdrh5c5ngrnq91yg40l8388vh7l1p4wlv4lh7p977dp75ivg6"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "75dcda0896e109a2a22c9315bca3bb21b87b2ba5"; + sha256 = "1d0sy1paa055ic84sp3766s9pa24q008hf77dc842vrgvn8p3wmh"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "c3e18be99d19e6b3e8f1559eea2c161a665c4b6b"; + sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv"; }; } { @@ -13,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/mdp/qrterminal"; - rev = "ee9ef6b3f704870848e4022c4bc8c4d8c192516c"; - sha256 = "19dwrmkd1hqjngpmz05y9d0gxzxmdx1plya91ja08s1c1nqc264f"; + rev = "b74f0e01e9f532111951caf89df78e5619193db5"; + sha256 = "1xz5f3dfkdwd6svnbh98rlr5pfr4s4hrqs4vffn9wy5vb336pp8p"; }; } { @@ -22,8 +50,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "d16ecb693e3f8d524769fefce2192a4c92207ff9"; - sha256 = "0x0danna6nzkbiprwjpj0bix2m25lsbvna1bncdm233l3prh8sb1"; + rev = "6c0c4e6581f8e173cc562c8b3363ab984e4ae071"; + sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1"; }; } { @@ -31,8 +59,8 @@ fetch = { type = "git"; url = "https://github.com/patrickmn/go-cache"; - rev = "5633e0862627c011927fa39556acae8b1f1df58a"; - sha256 = "1zjk6yvig68zcbipa85dxz9xa82fk4zp4q33hwzxdv6h68wga5bs"; + rev = "46f407853014144407b6c2ec7ccc76bf67958d93"; + sha256 = "08155wdk2883qw37p7wgrpv8wb9lbx4cpfgrraivdavs3qbjlq5j"; }; } { @@ -67,8 +95,17 @@ fetch = { type = "git"; url = "https://github.com/txthinking/x"; - rev = "8956479d309307bcd91c2ec89370118aef61abf7"; - sha256 = "0vfsbm5025cpmqpc506vz1vqlzmcw5sc1zrjgx8z22kp1q1slylv"; + rev = "99b19c1440b66f803ee98b30b6829651cc3f90cc"; + sha256 = "0vzw9wxlgj21y35qv580806vy6k6w1z5yqd5n6ccnq8cd3lvmx70"; + }; + } + { + goPackagePath = "github.com/urfave/negroni"; + fetch = { + type = "git"; + url = "https://github.com/urfave/negroni"; + rev = "f4316798d5d3acd39eb6784301b19f27f471415f"; + sha256 = "0w4iva6s8v8sk95l8mb1a67v0bn4h7njyylv9dnwma0d3l7k24y3"; }; } { @@ -76,8 +113,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "20be4c3c3ed52bfccdb2d59a412ee1a936d175a7"; - sha256 = "1ph7y8v30hc95h1dwr7vrhg1nzs47a261qin6zg8mhf12g5k2lxb"; + rev = "69ecbb4d6d5dab05e49161c6e77ea40a030884e1"; + sha256 = "1ylm1lp1miihaq93p8rh2yh823qljqkyqwk3gjzk2bdvzz427pr5"; }; } { @@ -85,8 +122,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f3200d17e092c607f615320ecaad13d87ad9a2b3"; - sha256 = "1mskh7p80dd8j1ffy16917d3cyy7lfh1gb56n4rq9g1bwckz4lwy"; + rev = "6afb5195e5aab057fda82e27171243402346b0ad"; + sha256 = "1aiz41q2yxgg3dxfkn33ff54vhaxbiwcps9j3ia1xx4cqxim38zw"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "9fbb57f87de9ccfe3a99d4e3270ce8a926ebba4f"; + sha256 = "0qaz2jjkrxzgkapmjqingdwamrgq2aiblxvzzgrcsv2qhkj0wdps"; }; } { @@ -94,8 +140,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + rev = "929e72ca90deac4784bbe451caf10faa5b256ebe"; + sha256 = "0kwyw87bx0rsc5bbqrrg36yv2b7rs4ijs4p4444s8zwzq6sw24y8"; }; } { diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 051271e978845..a732ddcb89ea6 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.67.0"; + name = "curl-7.68.0"; 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 = "0v2qb1c82m3qzkiyglsg1745qi791i9pl1jgnks8nm0sh9b6jpyx"; + sha256 = "1fgf4f33wj25jk6lkpxmrvmfnnxvc66z3k3561rxr8nngn8m8zr0"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 87748211425f4..68d253ef0b8fe 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "keepalived"; - version = "2.0.19"; + version = "2.0.20"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "05jgr0f04z69x3zf3b9z04wczl15fnh69bs6j0yw55fij1k9nj4d"; + sha256 = "0ijzw56hbac24dhrgjd0hjgf45072imyzq3mcgsirdl3xqjc6x12"; }; buildInputs = [ diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix index d047646fa7195..4288395cdac59 100644 --- a/pkgs/tools/networking/maxscale/default.nix +++ b/pkgs/tools/networking/maxscale/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, glibc -, bison2, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient +, bison, curl, flex, gperftools, jansson, jemalloc, kerberos, lua, libmysqlclient , ncurses, openssl, pcre, pcre2, perl, rabbitmq-c, sqlite, tcl , libaio, libedit, libtool, libui, libuuid, zlib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - bison2 curl flex gperftools jansson jemalloc kerberos lua libmysqlclient + bison curl flex gperftools jansson jemalloc kerberos lua libmysqlclient ncurses openssl pcre pcre2 perl rabbitmq-c sqlite tcl libaio libedit libtool libui libuuid zlib ]; diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index 221e873387f11..8d173997d7125 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.10.6"; + version = "1.12.2"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "15n9sd6ymxvw7hidc9pw81j89acwi5cjfhj220a68mi1h8vsfb1w"; + sha256 = "1si5bnm0d3b5ccpgj7xakl7pgy9mypm8ds6xgj1q0rzds2yx4xjg"; }; nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index e762ac73844cb..1a33a735cfe48 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -4,17 +4,17 @@ , gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup , ethtool, gnused, iputils, kmod, jansson, gtk-doc, libxslt , docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43 -, openconnect, curl, meson, ninja, libpsl }: +, openconnect, curl, meson, ninja, libpsl, mobile-broadband-provider-info, runtimeShell }: let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { pname = "network-manager"; - version = "1.20.8"; + version = "1.22.4"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "1ijpnx25wy5bcvp4mc49va942q56d0pncpj4jpknpdzwilmf455d"; + sha256 = "0682hm5l3ix8cq35yl5pxidri4kxbdnvj9llf8vg9mcg5abdaslv"; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -54,8 +54,8 @@ in stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - inherit iputils kmod openconnect ethtool gnused dbus; - inherit (stdenv) shell; + inherit iputils kmod openconnect ethtool gnused systemd; + inherit runtimeShell; }) # Meson does not support using different directories during build and @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - systemd libselinux audit libpsl libuuid polkit ppp libndp curl + systemd libselinux audit libpsl libuuid polkit ppp libndp curl mobile-broadband-provider-info bluez5 dnsmasq gobject-introspection modemmanager readline newt libsoup jansson ]; diff --git a/pkgs/tools/networking/network-manager/fix-install-paths.patch b/pkgs/tools/networking/network-manager/fix-install-paths.patch index 5798c1edfb6ee..02a006c1c3dbe 100644 --- a/pkgs/tools/networking/network-manager/fix-install-paths.patch +++ b/pkgs/tools/networking/network-manager/fix-install-paths.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index 4105a9c80..3d912557f 100644 +index 0af69f35d..9ab239c8a 100644 --- a/meson.build +++ b/meson.build -@@ -884,9 +884,9 @@ meson.add_install_script( +@@ -912,9 +912,9 @@ meson.add_install_script( join_paths('tools', 'meson-post-install.sh'), nm_datadir, nm_bindir, @@ -11,19 +11,6 @@ index 4105a9c80..3d912557f 100644 nm_pkglibdir, - nm_pkgstatedir, + nm_prefix + nm_pkgstatedir, - enable_docs ? 'install_docs' : '', nm_mandir, - ) -diff --git a/src/settings/plugins/ifcfg-rh/meson.build b/src/settings/plugins/ifcfg-rh/meson.build -index 58acdcfcb..e3a16d597 100644 ---- a/src/settings/plugins/ifcfg-rh/meson.build -+++ b/src/settings/plugins/ifcfg-rh/meson.build -@@ -69,7 +69,7 @@ install_data( - ) - - meson.add_install_script('sh', '-c', -- 'mkdir -p $DESTDIR/@0@/sysconfig/network-scripts'.format(nm_sysconfdir)) -+ 'mkdir -p $DESTDIR/@0@/sysconfig/network-scripts'.format(nm_prefix + nm_sysconfdir)) - - if enable_tests - subdir('tests') + nm_sysconfdir, + enable_docs ? '1' : '0', diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/network-manager/fix-paths.patch index c45dc174a0dff..af35fc0a36bfa 100644 --- a/pkgs/tools/networking/network-manager/fix-paths.patch +++ b/pkgs/tools/networking/network-manager/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c -index 204b7c286..8bdb734c2 100644 +index ffae5f553..ba1093e4d 100644 --- a/clients/common/nm-vpn-helpers.c +++ b/clients/common/nm-vpn-helpers.c -@@ -215,10 +215,7 @@ nm_vpn_openconnect_authenticate_helper (const char *host, +@@ -203,10 +203,7 @@ nm_vpn_openconnect_authenticate_helper (const char *host, NULL, }; @@ -15,7 +15,7 @@ index 204b7c286..8bdb734c2 100644 if (!g_spawn_sync (NULL, (char **) NM_MAKE_STRV (path, "--authenticate", host), diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules -index e398cb9f2..31c56596a 100644 +index e398cb9f2..a43d61864 100644 --- a/data/84-nm-drivers.rules +++ b/data/84-nm-drivers.rules @@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end" @@ -23,27 +23,27 @@ index e398cb9f2..31c56596a 100644 ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end" DRIVERS=="?*", GOTO="nm_drivers_end" -PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" -+PROGRAM="@shell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" ++PROGRAM="@runtimeShell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c" LABEL="nm_drivers_end" diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in -index 2f442bf23..c3e797bf4 100644 +index 91ebd9a36..5201a56c3 100644 --- a/data/NetworkManager.service.in +++ b/data/NetworkManager.service.in @@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@ [Service] Type=dbus BusName=org.freedesktop.NetworkManager --ExecReload=/usr/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.Reload uint32:0 -+ExecReload=@dbus@/bin/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.Reload uint32:0 +-ExecReload=/usr/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0 ++ExecReload=@systemd@/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0 #ExecReload=/bin/kill -HUP $MAINPID ExecStart=@sbindir@/NetworkManager --no-daemon Restart=on-failure diff --git a/libnm/meson.build b/libnm/meson.build -index 710ef181d..3aa182dd4 100644 +index 51ca46d2b..0c04cc216 100644 --- a/libnm/meson.build +++ b/libnm/meson.build -@@ -280,7 +280,7 @@ if enable_introspection +@@ -261,7 +261,7 @@ if enable_introspection name, input: libnm_gir[0], output: name, @@ -52,20 +52,20 @@ index 710ef181d..3aa182dd4 100644 depends: libnm_gir, ) -@@ -289,7 +289,7 @@ if enable_introspection +@@ -270,7 +270,7 @@ if enable_introspection name, - input: libnm_gir[0], + input: [libnm_gir[0], nm_settings_docs_overrides], output: name, -- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'], -+ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT@', '--overrides', nm_settings_docs_overrides, '--output', '@OUTPUT@'], +- command: [generate_setting_docs_env, python.path(), generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'], ++ command: [generate_setting_docs_env, generate_setting_docs, '--lib-path', meson.current_build_dir(), '--gir', '@INPUT0@', '--overrides', '@INPUT1@', '--output', '@OUTPUT@'], depends: libnm_gir, ) endif diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c -index 67e23b8f9..b0ce52711 100644 +index e7a4a059a..0a8f8b7c6 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c -@@ -12840,14 +12840,14 @@ nm_device_start_ip_check (NMDevice *self) +@@ -13179,14 +13179,14 @@ nm_device_start_ip_check (NMDevice *self) gw = nm_ip4_config_best_default_route_get (priv->ip_config_4); if (gw) { nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf); @@ -83,10 +83,10 @@ index 67e23b8f9..b0ce52711 100644 } } diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c -index d896d4d33..4cacb5cb6 100644 +index fb92289f0..c91b27b09 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c -@@ -446,7 +446,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char * +@@ -336,7 +336,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char * /* construct the argument list */ argv = g_ptr_array_sized_new (4); diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index e079f9a881edd..2306359addf8e 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.3"; + version = "5.5.5"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "099yvqng085f69k815961jnwk50nzmiknvhl1wwmji2hl36r160g"; + sha256 = "01gni315lnkyrwd173fqw0c12qrisfb38wy066s2j85nq64a3nqv"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index 2e1384693ec29..5d741e25fb9d0 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.1.1"; + version = "0.2.0"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = "${version}"; - sha256 = "1n9274np1ibz1s35q1qqajnwj7w4l695js9xdbga5wim18ly622m"; + sha256 = "0bsay1vqi5b3z7qjwbkwx3ikmpjzc0kswbajm50xmcwlg8jrn420"; }; - cargoSha256 = "0zjvvqw68y6zmjzmd22hh246422x2kxljj73vxywkl18crkakd7k"; + cargoSha256 = "1mqicibpa9sxac8v2kk8vfvxcis2wkdkklia2pbspc0pz3h0c8if"; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; diff --git a/pkgs/tools/security/bitwarden_rs/cargo-lock-lettre.patch b/pkgs/tools/security/bitwarden_rs/cargo-lock-lettre.patch deleted file mode 100644 index d9f491ca290a5..0000000000000 --- a/pkgs/tools/security/bitwarden_rs/cargo-lock-lettre.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 2e0b695..6d23410 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -114,8 +114,8 @@ dependencies = [ - "handlebars 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "jsonwebtoken 6.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "lettre 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -- "lettre_email 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lettre_email 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "multipart 0.16.1 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -1007,13 +1007,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "lettre" --version = "0.9.1" -+version = "0.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "fast_chemail 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)", - "hostname 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -1026,14 +1024,12 @@ dependencies = [ - - [[package]] - name = "lettre_email" --version = "0.9.1" -+version = "0.9.2" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "email 0.0.20 (registry+https://github.com/rust-lang/crates.io-index)", -- "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "lettre 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -2858,8 +2854,8 @@ dependencies = [ - "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" - "checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" - "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" --"checksum lettre 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "646aee0a55545eaffdf0df1ac19b500b51adb3095ec4dfdc704134e56ea23531" --"checksum lettre_email 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae1b3d43e4bb7beb9974a359cbb3ea4f93dfba6c1c0c6e9c9f82e538e0f9ab9f" -+"checksum lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c66afaa5dfadbb81d4e00fd1d1ab057c7cd4c799c5a44e0009386d553587e728" -+"checksum lettre_email 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bbb68ca999042d965476e47bbdbacd52db0927348b6f8062c44dd04a3b1fd43b" - "checksum libc 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)" = "42914d39aad277d9e176efbdad68acb1d5443ab65afe0e0e4f0d49352a950880" - "checksum libsqlite3-sys 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd6457c70bbff456d9fe49deaba35ec47c3e598bf8d7950ff0575ceb7a8a6ad1" - "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index f04996f1b431e..1b262581eb235 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -1,31 +1,43 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, Security, CoreServices }: +{ stdenv, rustPlatform, fetchFromGitHub +, pkgconfig, openssl +, Security, CoreServices +, dbBackend ? "sqlite", libmysqlclient, postgresql }: -rustPlatform.buildRustPackage rec { +let + featuresFlag = "--features ${dbBackend}"; + +in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.9.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "0jfb4b2lp2v01aw615lx0qj1qh73hyrbjn9kva7zqp74wcfw12gp"; + sha256 = "0af8cnpx86a096m59wmszcfyrfgf7adlqr39phbg647mgjfzwcrk"; }; - cargoPatches = [ - # type annotations required: cannot resolve `std::string::String: std::convert::AsRef<_>` - ./cargo-lock-lettre.patch - ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security CoreServices ]; + buildInputs = with stdenv.lib; [ openssl ] + ++ optionals stdenv.isDarwin [ Security CoreServices ] + ++ optional (dbBackend == "mysql") libmysqlclient + ++ optional (dbBackend == "postgresql") postgresql; RUSTC_BOOTSTRAP = 1; - cargoSha256 = "0p39gqrqdmgqhngp1qyh6jl0sp0ifj5n3bxfqafjbspb4zph3ls4"; + cargoSha256 = "1v6n4aqhd5pyvvhlzhpmq7ykclfxw82wn2bg7n49b53d9p72jwq6"; + cargoBuildFlags = [ featuresFlag ]; + + checkPhase = '' + runHook preCheck + echo "Running cargo cargo test ${featuresFlag} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" + cargo test ${featuresFlag} -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} + runHook postCheck + ''; meta = with stdenv.lib; { - description = "An unofficial lightweight implementation of the Bitwarden server API using Rust and SQLite"; - homepage = https://github.com/dani-garcia/bitwarden_rs; + description = "Unofficial Bitwarden compatible server written in Rust"; + homepage = "https://github.com/dani-garcia/bitwarden_rs"; license = licenses.gpl3; maintainers = with maintainers; [ msteen ]; platforms = platforms.all; diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 51dde99bcf197..9cbf067d40b44 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.12.0"; + version = "2.12.0b"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "064dxfplqn67grpx03ryzshwmr7s00w4mll0hk0anddviwvd8r1n"; + sha256 = "01jwyhcam9kh8lpxfgzzw7r3nn9sn6jbgmd78a7h8r50z5hy04g5"; }; buildCommand = '' diff --git a/pkgs/tools/security/default.nix b/pkgs/tools/security/ecdsatool/default.nix index 0e57a5bab884c..0e57a5bab884c 100644 --- a/pkgs/tools/security/default.nix +++ b/pkgs/tools/security/ecdsatool/default.nix diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix index 9448182a65a71..20fadee6a40e5 100644 --- a/pkgs/tools/security/keybase/kbfs.nix +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -6,7 +6,7 @@ buildGoPackage { inherit (keybase) src version; goPackagePath = "github.com/keybase/client"; - subPackages = [ "go/kbfs/kbfsfuse" "go/kbfs/kbfsgit/git-remote-keybase" ]; + subPackages = [ "go/kbfs/kbfsfuse" "go/kbfs/redirector" "go/kbfs/kbfsgit/git-remote-keybase" ]; dontRenameImports = true; diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index 5e26bcf6759d3..c58772346eea8 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir = true; preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/3rdparty/googletest/googletest:$(pwd)/neopg + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/3rdparty/googletest/googletest:$(pwd)/neopg ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 263c308fc3d6c..2141f12151fa2 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "pcsclite"; - version = "1.8.25"; + version = "1.8.26"; outputs = [ "bin" "out" "dev" "doc" "man" ]; src = fetchurl { url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2"; - sha256 = "14l7irs1nsh8b036ag4cfy8wryyysch78scz5dw6xxqwqgnpjvfp"; + sha256 = "1ndvvz0fgqwz70pijymsxmx25mzryb0zav1i8jjc067ndryvxdry"; }; patches = [ ./no-dropdir-literals.patch ]; diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 7fc6ed209663c..fcbc166689e3a 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkgconfig +{ stdenv, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkgconfig , libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qdigidoc"; - version = "4.1.0"; + version = "4.2.3"; src = fetchgit { url = "https://github.com/open-eid/DigiDoc4-Client"; rev = "v${version}"; - sha256 = "1iry36h3pfnw2gqjnfhv53i2svybxj8jf18qh486djyai84hjr4d"; + sha256 = "1hj49vvg8vrayr9kpz73fafa7k298hmiamkyd8c3ipy6s51xh6q4"; fetchSubmodules = true; }; @@ -42,9 +42,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt-based UI for signing and verifying DigiDoc documents"; - homepage = https://www.id.ee/; + homepage = "https://www.id.ee/"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ yegortimoshenko ]; + maintainers = with maintainers; [ yegortimoshenko mmahut ]; }; } diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index b273b882daf08..da850c6d9daa6 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -2,17 +2,17 @@ with rustPlatform; buildRustPackage rec { - version = "0.3.0"; + version = "0.4.0"; pname = "ripasso-cursive"; src = fetchFromGitHub { owner = "cortex"; repo = "ripasso"; rev = "release-${version}"; - sha256 = "1rkb23i9gcfmifcl31s8w86k7aza6nxrh3w33fvhv1ins1gxxk7w"; + sha256 = "164da20j727p8l7hh37j2r8pai9sj402nhswvg0nrlgj53nr6083"; }; - cargoSha256 = "1p0bsl4h2w257vfjbpqiga693gaslfq34g30dghpqb5n4kl416zp"; + cargoSha256 = "1vyhdbia7khh0ixim00knai5d270jl5a5crqik1qaz7bkwc02bsp"; cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 888d3bb4018ab..7d0878841611b 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -1,27 +1,27 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - name = "saml2aws-${version}"; +buildGoModule rec { pname = "saml2aws"; - version = "2.15.0"; - - goPackagePath = "github.com/versent/saml2aws"; - goDeps = ./deps.nix; - - buildFlagsArray = '' - -ldflags=-X main.Version=${version} - ''; + version = "2.19.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "Versent"; repo = "saml2aws"; - sha256 = "0pn4zdzisgan7vvgi7hp8716wsb2x33gq55c7fw1aa2qwy0bq3gp"; + rev = "v${version}"; + sha256 = "1b34v52nvn5mgkxj90lmw0hhpqb35gi3dn47x3v7255890wkzryz"; }; + modSha256 = "1ndr8npjjaxg97azshpca7mclxhbqm49wzswmv571y5x519bb7q8"; + + subPackages = [ "." "cmd/saml2aws" ]; + + buildFlagsArray = '' + -ldflags=-X main.Version=${version} + ''; + meta = with stdenv.lib; { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; - homepage = https://github.com/Versent/saml2aws; + homepage = "https://github.com/Versent/saml2aws"; license = licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pmyjavec ]; diff --git a/pkgs/tools/security/saml2aws/deps.nix b/pkgs/tools/security/saml2aws/deps.nix deleted file mode 100644 index 08a26db91b10c..0000000000000 --- a/pkgs/tools/security/saml2aws/deps.nix +++ /dev/null @@ -1,372 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/99designs/keyring"; - fetch = { - type = "git"; - url = "https://github.com/99designs/keyring"; - rev = "82da6802f65f1ac7963cfc3b7c62ae12dab8ee5d"; - sha256 = "105ddy9vkjr6cmcm85qnxxlnsmkx2svm6bd80rzr9n6zyc5hhk7b"; - }; - } - { - goPackagePath = "github.com/AlecAivazis/survey"; - fetch = { - type = "git"; - url = "https://github.com/AlecAivazis/survey"; - rev = "e752db451e07e09c7d7dc8cada807a44bdb0fd47"; - sha256 = "00fhmsaymrf86pg246cqxvfrivgfkyg3i0aixsp3sn15hg3i0vlq"; - }; - } - { - goPackagePath = "github.com/Azure/go-ntlmssp"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-ntlmssp"; - rev = "4b934ac9dad38d389d34f0b98d98b2467c422012"; - sha256 = "0pwrax8mih2jgsdifag0346vh0vivgyz45jc4kjy6dhp3qhsy34z"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/goquery"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/goquery"; - rev = "dc2ec5c7ca4d9aae063b79b9f581dd3ea6afd2b2"; - sha256 = "11010z9ask21r0dskvm2pbh3z8951bnpcqg8aqa213if4h34gaa2"; - }; - } - { - 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/andybalholm/cascadia"; - fetch = { - type = "git"; - url = "https://github.com/andybalholm/cascadia"; - rev = "901648c87902174f774fac311d7f176f8647bdaa"; - sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; - }; - } - { - goPackagePath = "github.com/aulanov/go.dbus"; - fetch = { - type = "git"; - url = "https://github.com/aulanov/go.dbus"; - rev = "25c3068a42a0b50b877953fb249dbcffc6bd1bca"; - sha256 = "0jh4jyxqhsl1rkzabhln7chw1jkzhqw2nn0mw79cmn8fyafi0rgn"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "bfc1a07cf158c30c41a3eefba8aae043d0bb5bff"; - sha256 = "0vfpygjhdikmsqn9dgmp965ji5q790gcz9mg49mcpipc9n2lzx0d"; - }; - } - { - goPackagePath = "github.com/beevik/etree"; - fetch = { - type = "git"; - url = "https://github.com/beevik/etree"; - rev = "9d7e8feddccb4ed1b8afb54e368bd323d2ff652c"; - sha256 = "0f3lj7azxd5qq29hqd32211ds7n56i3rgmfll6c1f4css1f3srxg"; - }; - } - { - goPackagePath = "github.com/briandowns/spinner"; - fetch = { - type = "git"; - url = "https://github.com/briandowns/spinner"; - rev = "48dbb65d7bd5c74ab50d53d04c949f20e3d14944"; - sha256 = "1178kn72agihs13ffgm2sz5ad61pqwdmkrh8rhggzbaagch9mc75"; - }; - } - { - goPackagePath = "github.com/danieljoos/wincred"; - fetch = { - type = "git"; - url = "https://github.com/danieljoos/wincred"; - rev = "412b574fb496839b312a75fba146bd32a89001cf"; - sha256 = "1bb1928nnikx5036aw4152p55g8xgwx42rv0n2i5zydh1031f50m"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/dvsekhvalnov/jose2go"; - fetch = { - type = "git"; - url = "https://github.com/dvsekhvalnov/jose2go"; - rev = "f21a8cedbbae609f623613ec8f81125c243212e6"; - sha256 = "1nzwvk6nqi7nm2wq4mr2q6k5p0qzsl0kmwx7kgkqsg1zh53250ld"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"; - sha256 = "0fx123601aiqqn0yr9vj6qp1bh8gp240w4qdm76irs73q8dxlk7a"; - }; - } - { - goPackagePath = "github.com/godbus/dbus"; - fetch = { - type = "git"; - url = "https://github.com/godbus/dbus"; - rev = "2ff6f7ffd60f0f2410b3105864bdd12c7894f844"; - sha256 = "1c107893nbdfc297i9y0smljmqs167mw26i24509qd09dmvr998y"; - }; - } - { - goPackagePath = "github.com/gsterjov/go-libsecret"; - fetch = { - type = "git"; - url = "https://github.com/gsterjov/go-libsecret"; - rev = "a6f4afe4910cad8688db3e0e9b9ac92ad22d54e1"; - sha256 = "09zaiadnll83vs22ib89agg7anj0blw5fywvmckxllsgif6ak6v7"; - }; - } - { - goPackagePath = "github.com/headzoo/surf"; - fetch = { - type = "git"; - url = "https://github.com/headzoo/surf"; - rev = "a4a8c16c01dc47ef3a25326d21745806f3e6797a"; - sha256 = "1dzcp0wdh3qmm5s5hixk9vj2s2kcvkpbhjdwz7kh2crvnavdgwh6"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; - }; - } - { - goPackagePath = "github.com/keybase/go-keychain"; - fetch = { - type = "git"; - url = "https://github.com/keybase/go-keychain"; - rev = "f1daa725cce4049b1715f1e97d6a51880e401e70"; - sha256 = "0wk2zc5f5i5mhdkbyzd60wzc64vybds6kxlmwc41k8mx6d1hxdm6"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/mgutz/ansi"; - fetch = { - type = "git"; - url = "https://github.com/mgutz/ansi"; - rev = "9520e82c474b0a04dd04f8a40959027271bab992"; - sha256 = "00bz22314j26736w1f0q4jy9d9dfaml17vn890n5zqy3cmvmww1j"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "3864e76763d94a6df2f9960b16a20a33da9f9a66"; - sha256 = "1n8vya16l60i5jms43yb8fzdgwvqa2q926p5wkg3lbrk8pxy1nv0"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/robertkrimen/otto"; - fetch = { - type = "git"; - url = "https://github.com/robertkrimen/otto"; - rev = "15f95af6e78dcd2030d8195a138bd88d4f403546"; - sha256 = "07j7l340lmqwpfscwyb8llk3k37flvs20a4a8vzc85f16xyd9npf"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"; - sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "f35b8ab0b5a2cef36673838d662e249dd9c94686"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/tidwall/gjson"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/gjson"; - rev = "afaeb9562041a8018c74e006551143666aed08bf"; - sha256 = "1hysk947mrlpaqjq7mab0nnm190fwvfdifaa2cq3sbwfrzx6h1c8"; - }; - } - { - goPackagePath = "github.com/tidwall/match"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/match"; - rev = "1731857f09b1f38450e2c12409748407822dc6be"; - sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "a8fb68e7206f8c78be19b432c58eb52a6aa34462"; - sha256 = "1svphap40hy5srcqnb0l207r6wfm9hf0f3fcaq124qp4m91s6vlf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196"; - sha256 = "1f6q8kbijnrfy6wjqxrzgjf38ippckc5w34lhqsjs7kq045aar9a"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "8014b7b116a67fea23fbb82cd834c9ad656ea44b"; - sha256 = "1ld5nr0zqjgkny7d5biix9hbnxnlzxxa5nspnal2q2c7wnai8apa"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "gopkg.in/AlecAivazis/survey.v1"; - fetch = { - type = "git"; - url = "https://github.com/AlecAivazis/survey"; - rev = "e752db451e07e09c7d7dc8cada807a44bdb0fd47"; - sha256 = "00fhmsaymrf86pg246cqxvfrivgfkyg3i0aixsp3sn15hg3i0vlq"; - }; - } - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "06f5f3d67269ccec1fe5fe4134ba6e982984f7f5"; - sha256 = "0fx123601aiqqn0yr9vj6qp1bh8gp240w4qdm76irs73q8dxlk7a"; - }; - } - { - goPackagePath = "gopkg.in/sourcemap.v1"; - fetch = { - type = "git"; - url = "https://github.com/go-sourcemap/sourcemap"; - rev = "6e83acea0053641eff084973fee085f0c193c61a"; - sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; - }; - } -] \ No newline at end of file diff --git a/pkgs/tools/text/kramdown-rfc2629/Gemfile b/pkgs/tools/text/kramdown-rfc2629/Gemfile new file mode 100644 index 0000000000000..9b3347860b653 --- /dev/null +++ b/pkgs/tools/text/kramdown-rfc2629/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'kramdown-rfc2629' diff --git a/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock b/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock new file mode 100644 index 0000000000000..f4f16580c0cc1 --- /dev/null +++ b/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock @@ -0,0 +1,17 @@ +GEM + remote: https://rubygems.org/ + specs: + certified (1.0.0) + kramdown (1.17.0) + kramdown-rfc2629 (1.2.13) + certified (~> 1.0) + kramdown (~> 1.17.0) + +PLATFORMS + ruby + +DEPENDENCIES + kramdown-rfc2629 + +BUNDLED WITH + 1.17.3 diff --git a/pkgs/tools/text/kramdown-rfc2629/default.nix b/pkgs/tools/text/kramdown-rfc2629/default.nix new file mode 100644 index 0000000000000..945c676ca18d2 --- /dev/null +++ b/pkgs/tools/text/kramdown-rfc2629/default.nix @@ -0,0 +1,18 @@ +{ lib, bundlerApp }: + +# Not in the default ../../../development/ruby-modules/with-packages/Gemfile +# because of version clash on the "kramdown" dependency. +bundlerApp rec { + pname = "kramdown-rfc2629"; + gemdir = ./.; + exes = [ "kramdown-rfc2629" ]; + + meta = with lib; { + description = "A markdown parser with multiple backends"; + homepage = "https://github.com/cabo/kramdown-rfc2629"; + license = with licenses; mit; + maintainers = with maintainers; [ + vcunat # not really, but I expect to use it occasionally around IETF + ]; + }; +} diff --git a/pkgs/tools/text/kramdown-rfc2629/gemset.nix b/pkgs/tools/text/kramdown-rfc2629/gemset.nix new file mode 100644 index 0000000000000..65d1c234de254 --- /dev/null +++ b/pkgs/tools/text/kramdown-rfc2629/gemset.nix @@ -0,0 +1,33 @@ +{ + certified = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1706p6p0a8adyvd943af2a3093xakvislgffw3v9dvp7j07dyk5a"; + type = "gem"; + }; + version = "1.0.0"; + }; + kramdown = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq"; + type = "gem"; + }; + version = "1.17.0"; + }; + kramdown-rfc2629 = { + dependencies = ["certified" "kramdown"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s53m46qlcdakik0czvx0p41mk46l9l36331cps8gpf364wf3l9d"; + type = "gem"; + }; + version = "1.2.13"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index a2a02049d267d..01b16908fb7cd 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { makeFlags = [ # let intermediate tools find intermediate library - "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(CURDIR)/src" + "LD_LIBRARY_PATH=$LD_LIBRARY_PATH\${LD_LIBRARY_PATH:+:}$(CURDIR)/src" ]; # Parallel building occasionaly fails with: Error copying file "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/libopencc.so.1.0.0" to "/tmp/nix-build-opencc-1.0.5.drv-0/OpenCC-ver.1.0.5/build/src/tools". diff --git a/pkgs/tools/typesetting/tex/nix/run-latex.sh b/pkgs/tools/typesetting/tex/nix/run-latex.sh index 3941fdcac4a48..7a5767f9c0633 100644 --- a/pkgs/tools/typesetting/tex/nix/run-latex.sh +++ b/pkgs/tools/typesetting/tex/nix/run-latex.sh @@ -47,6 +47,7 @@ runLaTeX() { if fgrep -q \ -e "LaTeX Warning: Label(s) may have changed." \ -e "Rerun to get citations correct." \ + -e "Please rerun LaTeX." \ "$tmpFile"; then runNeeded=1 fi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aedba5c21b7b2..6abbca2153db3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -791,6 +791,9 @@ in bitwarden_rs = callPackage ../tools/security/bitwarden_rs { inherit (darwin.apple_sdk.frameworks) Security CoreServices; }; + bitwarden_rs-sqlite = bitwarden_rs; + bitwarden_rs-mysql = bitwarden_rs.override { dbBackend = "mysql"; }; + bitwarden_rs-postgresql = bitwarden_rs.override { dbBackend = "postgresql"; }; bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { }; @@ -1726,9 +1729,7 @@ in fdroidserver = python3Packages.callPackage ../development/tools/fdroidserver { }; - filebench = callPackage ../tools/misc/filebench { - bison = bison2; - }; + filebench = callPackage ../tools/misc/filebench { }; fileshare = callPackage ../servers/fileshare {}; @@ -1890,6 +1891,8 @@ in klaus = with python3Packages; toPythonApplication klaus; + kramdown-rfc2629 = callPackage ../tools/text/kramdown-rfc2629 { }; + lcdproc = callPackage ../servers/monitoring/lcdproc { }; languagetool = callPackage ../tools/text/languagetool { }; @@ -2387,13 +2390,6 @@ in circus = callPackage ../tools/networking/circus { }; - # Cleanup before 20.03: - citrix_receiver = throw "citrix_receiver has been discontinued by Citrix (https://docs.citrix.com/en-us/citrix-workspace-app.html). Please use citrix_workspace."; - citrix_receiver_13_10_0 = citrix_receiver; - citrix_receiver_13_9_1 = citrix_receiver; - citrix_receiver_13_9_0 = citrix_receiver; - citrix_receiver_13_8_0 = citrix_receiver; - citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; 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"; }; @@ -3439,9 +3435,7 @@ in fusuma = callPackage ../tools/inputmethods/fusuma {}; - fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { - stdenv49 = gcc49Stdenv; - }); + fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { }); inherit (fdbPackages) foundationdb51 @@ -3627,10 +3621,6 @@ in gnash = callPackage ../misc/gnash { }; - gnaural = callPackage ../applications/audio/gnaural { - stdenv = gcc49Stdenv; - }; - gnirehtet = callPackage ../tools/networking/gnirehtet { }; gnome-builder = callPackage ../applications/editors/gnome-builder { }; @@ -5875,6 +5865,8 @@ in pre-commit = gitAndTools.pre-commit; + pretty-simple = callPackage ../development/tools/pretty-simple { }; + prettyping = callPackage ../tools/networking/prettyping { }; prey-bash-client = callPackage ../tools/security/prey { }; @@ -7776,7 +7768,6 @@ in avian = callPackage ../development/compilers/avian { inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; - stdenv = if stdenv.cc.isGNU then gcc49Stdenv else stdenv; }; bigloo = callPackage ../development/compilers/bigloo { }; @@ -7899,6 +7890,7 @@ in crystal_0_29 crystal_0_30 crystal_0_31 + crystal_0_32 crystal crystal2nix; @@ -7956,7 +7948,6 @@ in }; gcc49Stdenv = overrideCC gccStdenv buildPackages.gcc49; - gcc5Stdenv = overrideCC gccStdenv buildPackages.gcc5; gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6; gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7; gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8; @@ -8074,18 +8065,6 @@ in cloog = if !stdenv.isDarwin then cloog_0_18_0 else null; })); - gcc5 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5 { - inherit noSysDirs; - - # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion - profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); - - 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_14 else null; - })); - gcc6 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/6 { inherit noSysDirs; @@ -8164,14 +8143,6 @@ in profiledCompiler = false; }); - gfortran5 = wrapCC (gcc5.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - }); - gfortran6 = wrapCC (gcc6.cc.override { name = "gfortran"; langFortran = true; @@ -8759,9 +8730,7 @@ in pforth = callPackage ../development/compilers/pforth {}; - picat = callPackage ../development/compilers/picat { - stdenv = gcc49Stdenv; - }; + picat = callPackage ../development/compilers/picat { }; ponyc = callPackage ../development/compilers/ponyc { llvm = llvm_7; @@ -9100,7 +9069,7 @@ in inherit (beam.interpreters) erlang erlangR18 erlangR19 erlangR20 erlangR21 erlangR22 erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02 - elixir elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 + elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6 lfe lfe_1_2; inherit (beam.packages.erlang) @@ -9757,10 +9726,6 @@ in avrdude = callPackage ../development/tools/misc/avrdude { }; - avarice = callPackage ../development/tools/misc/avarice { - gcc = gcc49; - }; - babeltrace = callPackage ../development/tools/misc/babeltrace { }; bam = callPackage ../development/tools/build-managers/bam {}; @@ -9810,9 +9775,7 @@ in }; }); - bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; - bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; - bison = bison3; + bison = callPackage ../development/tools/parsing/bison { }; yacc = bison; # TODO: move to aliases.nix blackmagic = callPackage ../development/tools/misc/blackmagic { }; @@ -10244,6 +10207,8 @@ in guile = guile_2_0; }; + hadolint = haskell.lib.justStaticExecutables haskellPackages.hadolint; + hcloud = callPackage ../development/tools/hcloud { }; help2man = callPackage ../development/tools/misc/help2man { }; @@ -10912,7 +10877,6 @@ in arrayfire = callPackage ../development/libraries/arrayfire {}; arrow-cpp = callPackage ../development/libraries/arrow-cpp ({ - inherit (pkgsStatic) gtest; } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = overrideCC stdenv buildPackages.gcc6; # hidden symbol `__divmoddi4' }); @@ -13216,7 +13180,7 @@ in libxmi = callPackage ../development/libraries/libxmi { }; libxml2 = callPackage ../development/libraries/libxml2 { - python = if stdenv.isDarwin then python2 else python3; + python = python3; }; libxml2Python = let @@ -13844,7 +13808,7 @@ in (import ../development/libraries/qt-5/5.12) { inherit newScope; inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; - bison = bison2; # error: too few arguments to function 'int yylex(... + inherit bison; inherit cups; inherit dconf; inherit harfbuzz; @@ -14571,13 +14535,6 @@ in gnutls = gnutls; }); - # 3.14 is needed for R V8 module in ../development/r-modules/default.nix - v8_3_14 = callPackage ../development/libraries/v8/3.14.nix { - inherit (python2Packages) python gyp; - cctools = darwin.cctools; - stdenv = gcc5Stdenv; - }; - v8_5_x = callPackage ../development/libraries/v8/5_x.nix ({ inherit (python2Packages) python gyp; icu = icu58; # v8-5.4.232 fails against icu4c-59.1 @@ -15279,8 +15236,8 @@ in fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { }; - firebird = callPackage ../servers/firebird { icu = null; stdenv = gcc5Stdenv; }; - firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = gcc5Stdenv; }; + firebird = callPackage ../servers/firebird { icu = null; /*stdenv = gcc5Stdenv;*/ }; + firebirdSuper = firebird.override { icu = icu58; superServer = true; /*stdenv = gcc5Stdenv;*/ }; frab = callPackage ../servers/web-apps/frab { }; @@ -15310,6 +15267,10 @@ in grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; + gobetween = callPackage ../servers/gobetween { + buildGoModule = buildGo112Module; + }; + h2o = callPackage ../servers/http/h2o { }; haka = callPackage ../tools/security/haka { }; @@ -15360,8 +15321,12 @@ in labelImg = callPackage ../applications/science/machine-learning/labelimg { }; + mailman = callPackage ../servers/mail/mailman/wrapped.nix { }; + mailman-rss = callPackage ../development/python-modules/mailman-rss { }; + mailman-web = with python3.pkgs; toPythonApplication mailman-web; + mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; matterbridge = callPackage ../servers/matterbridge { }; @@ -15926,6 +15891,8 @@ in unifiStable; unifi = unifiStable; + victoriametrics = callPackage ../servers/nosql/victoriametrics { }; + virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { @@ -16467,6 +16434,14 @@ 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_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -16672,7 +16647,7 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_5_4; + linuxPackages_latest = linuxPackages_5_5; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -16686,6 +16661,7 @@ 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); # When adding to this list: # - Update linuxPackages_latest to the latest version @@ -16791,7 +16767,7 @@ in keyutils = callPackage ../os-specific/linux/keyutils { }; libselinux = callPackage ../os-specific/linux/libselinux { - python = python3; + python = python37; }; libsemanage = callPackage ../os-specific/linux/libsemanage { @@ -17289,6 +17265,8 @@ in zd1211fw = callPackage ../os-specific/linux/firmware/zd1211 { }; + zenmonitor = callPackage ../os-specific/linux/zenmonitor { }; + inherit (callPackage ../os-specific/linux/zfs { configFile = "user"; }) zfsStable zfsUnstable; @@ -17856,6 +17834,8 @@ in soundfont-fluid = callPackage ../data/soundfonts/fluid { }; + spdx-license-list-data = callPackage ../data/misc/spdx-license-list-data { }; + stdmanpages = callPackage ../data/documentation/std-man-pages { }; starship = callPackage ../tools/misc/starship { @@ -18095,7 +18075,6 @@ in afterstep = callPackage ../applications/window-managers/afterstep { fltk = fltk13; gtk = gtk2; - stdenv = gcc49Stdenv; }; agedu = callPackage ../tools/misc/agedu { }; @@ -18380,7 +18359,6 @@ in calf = callPackage ../applications/audio/calf { inherit (gnome2) libglade; - stdenv = gcc5Stdenv; }; calcurse = callPackage ../applications/misc/calcurse { }; @@ -19680,7 +19658,7 @@ in stdenv = gccStdenv; }; - ike = callPackage ../applications/networking/ike { bison = bison2; }; + ike = callPackage ../applications/networking/ike { }; ikiwiki = callPackage ../applications/misc/ikiwiki { inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; @@ -20850,7 +20828,7 @@ in pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pdfpc = callPackage ../applications/misc/pdfpc { - inherit (gst_all_1) gstreamer gst-plugins-base; + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-libav; }; peek = callPackage ../applications/video/peek { }; @@ -21556,9 +21534,7 @@ in inherit (ocamlPackages) stog; - stp = callPackage ../applications/science/logic/stp { - bison = bison2; - }; + stp = callPackage ../applications/science/logic/stp { }; stretchly = callPackage ../applications/misc/stretchly { inherit (gnome2) GConf; @@ -22686,6 +22662,9 @@ in bitcoin-classic = libsForQt5.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = false; }; + bitcoin-gold = libsForQt5.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; + bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; }; + btc1 = callPackage ../applications/blockchains/btc1.nix { inherit (darwin.apple_sdk.frameworks) AppKit; boost = boost165; @@ -22719,7 +22698,7 @@ in ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; - litecoin = callPackage ../applications/blockchains/litecoin.nix { + litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin.nix { inherit (darwin.apple_sdk.frameworks) AppKit; }; litecoind = litecoin.override { withGui = false; }; @@ -23159,6 +23138,11 @@ in mindustry = callPackage ../games/mindustry { }; + mindustry-server = callPackage ../games/mindustry { + enableClient = false; + enableServer = true; + }; + minecraft = callPackage ../games/minecraft { }; minecraft-server = callPackage ../games/minecraft-server { }; @@ -23835,7 +23819,7 @@ in aragorn = callPackage ../applications/science/biology/aragorn { }; archimedes = callPackage ../applications/science/electronics/archimedes { - stdenv = gcc49Stdenv; + stdenv = gcc6Stdenv; }; bayescan = callPackage ../applications/science/biology/bayescan { }; @@ -24773,6 +24757,8 @@ in dumb = callPackage ../misc/dumb { }; + ecdsatool = callPackage ../tools/security/ecdsatool { }; + emulationstation = callPackage ../misc/emulators/emulationstation { }; electricsheep = callPackage ../misc/screensavers/electricsheep { }; @@ -24959,7 +24945,7 @@ in mupen64plus = callPackage ../misc/emulators/mupen64plus { }; - muse = callPackage ../applications/audio/muse { }; + muse = libsForQt5.callPackage ../applications/audio/muse { }; musly = callPackage ../applications/audio/musly { }; diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 7496449c044c1..a240510756366 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -71,8 +71,8 @@ rec { # Other Beam languages. These are built with `beam.interpreters.erlang`. To # access for example elixir built with different version of Erlang, use - # `beam.packages.erlangR19.elixir`. - inherit (packages.erlang) elixir elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5; + # `beam.packages.erlangR22.elixir`. + inherit (packages.erlang) elixir elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7 elixir_1_6; inherit (packages.erlang) lfe lfe_1_2; }; @@ -83,7 +83,6 @@ rec { # Each field in this tuple represents all Beam packages in nixpkgs built with # appropriate Erlang/OTP version. packages = { - # Packages built with default Erlang version. erlang = packagesWith interpreters.erlang; erlangR18 = packagesWith interpreters.erlangR18; @@ -91,6 +90,5 @@ rec { erlangR20 = packagesWith interpreters.erlangR20; erlangR21 = packagesWith interpreters.erlangR21; erlangR22 = packagesWith interpreters.erlangR22; - }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df480391e13df..596c397505f16 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1662,6 +1662,8 @@ in { asn1ate = callPackage ../development/python-modules/asn1ate { }; + atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; + atomiclong = callPackage ../development/python-modules/atomiclong { }; atomicwrites = callPackage ../development/python-modules/atomicwrites { }; @@ -2823,6 +2825,7 @@ in { (p: p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; + broken = (super.meta.broken or false) || pythonAtLeast "3.8"; }; })) @@ -3324,6 +3327,8 @@ in { djangorestframework-jwt = callPackage ../development/python-modules/djangorestframework-jwt { }; + djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; + django-raster = callPackage ../development/python-modules/django-raster { }; django_redis = callPackage ../development/python-modules/django_redis { }; @@ -4840,7 +4845,7 @@ in { pyelftools = callPackage ../development/python-modules/pyelftools { }; - pyenchant = callPackage ../development/python-modules/pyenchant { }; + pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; }; pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 3dd539e03a723..0de1db7d99b3f 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -88,7 +88,6 @@ self: super: let in { stdenv = foldl (flip id) super.stdenv staticAdapters; gcc49Stdenv = foldl (flip id) super.gcc49Stdenv staticAdapters; - gcc5Stdenv = foldl (flip id) super.gcc5Stdenv staticAdapters; gcc6Stdenv = foldl (flip id) super.gcc6Stdenv staticAdapters; gcc7Stdenv = foldl (flip id) super.gcc7Stdenv staticAdapters; gcc8Stdenv = foldl (flip id) super.gcc8Stdenv staticAdapters; |