diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix index 8f94a2b4940..21632919699 100644 --- a/nixos/modules/services/audio/slimserver.nix +++ b/nixos/modules/services/audio/slimserver.nix @@ -63,6 +63,7 @@ in { description = "Slimserver daemon user"; home = cfg.dataDir; group = "slimserver"; + isSystemUser = true; }; groups.slimserver = {}; }; diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix index c0ff28039b1..ae1dab5b8d8 100644 --- a/nixos/modules/tasks/filesystems/btrfs.nix +++ b/nixos/modules/tasks/filesystems/btrfs.nix @@ -55,7 +55,16 @@ in (mkIf enableBtrfs { system.fsPackages = [ pkgs.btrfs-progs ]; - boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ]; + boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" ]; + boot.initrd.availableKernelModules = mkIf inInitrd ( + [ "crc32c" ] + ++ optionals (config.boot.kernelPackages.kernel.kernelAtLeast "5.5") [ + # Needed for mounting filesystems with new checksums + "xxhash_generic" + "blake2b_generic" + "sha256_generic" # Should be baked into our kernel, just to be sure + ] + ); boot.initrd.extraUtilsCommands = mkIf inInitrd '' diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index 4bcda6c4d32..6378a97f31d 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "3.4"; + version = "3.6"; src = fetchFromGitHub { owner = "helio-fm"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-zXsDu/xi7OV6VtnZK9ZJ8uwPeA5uTgNpAQsqe90iwG4="; + sha256 = "sha256-qW39g6rQ5VPQ3Hx9NmwLbpZiITnzFZDZlcLkE+pJKPc="; }; buildInputs = [ diff --git a/pkgs/applications/audio/soundtracker/default.nix b/pkgs/applications/audio/soundtracker/default.nix index 71fc763a5c5..607e71e48f2 100644 --- a/pkgs/applications/audio/soundtracker/default.nix +++ b/pkgs/applications/audio/soundtracker/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , pkg-config -, autoconf +, autoreconfHook , gtk2 , alsaLib , SDL @@ -12,21 +12,43 @@ stdenv.mkDerivation rec { pname = "soundtracker"; - version = "1.0.1"; + version = "1.0.2.1"; src = fetchurl { # Past releases get moved to the "old releases" directory. # Only the latest release is at the top level. # Nonetheless, only the name of the file seems to affect which file is # downloaded, so this path should be fine both for old and current releases. - url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.bz2"; - sha256 = "0m5iiqccch6w53khpvdldz59zymw13vmwqc5ggx3sn41riwbd6ks"; + url = "mirror://sourceforge/soundtracker/soundtracker-${version}.tar.xz"; + sha256 = "0nh0dwz8nldc040q6n06vlazhss8ms42r2dffhjcrqj3hbrvfx82"; }; + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # Darwin binutils don't support D option for ar + # ALSA macros are missing on Darwin, causing error + substituteInPlace configure.ac \ + --replace ARFLAGS=crD ARFLAGS=cru \ + --replace AM_PATH_ALSA '#AM_PATH_ALSA' + # Avoid X11-specific workaround code on more than just Windows + substituteInPlace app/keys.c \ + --replace '!defined(_WIN32)' '!defined(_WIN32) && !defined(__APPLE__)' + # "The application with bundle ID (null) is running setugid(), which is not allowed." + sed -i -e '/seteuid/d' -e '/setegid/d' app/main.c + ''; + + configureFlags = [ + "--with-graphics-backend=gdk" + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "--disable-alsa" + ]; + + enableParallelBuilding = true; + nativeBuildInputs = [ pkg-config - autoconf + autoreconfHook ]; + buildInputs = [ gtk2 SDL @@ -35,8 +57,6 @@ stdenv.mkDerivation rec { goocanvas ] ++ lib.optional stdenv.isLinux alsaLib; - hardeningDisable = [ "format" ]; - meta = with lib; { description = "A music tracking tool similar in design to the DOS program FastTracker and the Amiga legend ProTracker"; longDescription = '' @@ -51,7 +71,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; - # gdk/gdkx.h not found - broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix index 5247207d149..08a1b5a71af 100644 --- a/pkgs/applications/misc/kjv/default.nix +++ b/pkgs/applications/misc/kjv/default.nix @@ -1,43 +1,41 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, readline }: let + patchPrefix = "https://github.com/samuelgrf/kjv/commit/"; -patch-base = "https://github.com/LukeSmithxyz/kjv/commit/"; - -add-apocrypha = fetchpatch { - url = patch-base + "b92b7622285d10464f9274f11e740bef90705bbc.patch"; - sha256 = "0n4sj8p9m10fcair4msc129jxkkx5whqzhjbr5k4lfgp6nb1zk8k"; -}; - -add-install-target = fetchpatch { - url = patch-base + "f4ad73539eb73f1890f4b791d8d38dd95900a4a4.patch"; - sha256 = "1yzj72i5fkzn2i4wl09q6jx7nwn2h4jwm49fc23nxfwchzar9m1q"; -}; + add-apocrypha = fetchpatch { + url = patchPrefix + "0856fa0d37b45de0d6b47d163b5ea9a0b7f2c061.patch"; + sha256 = "1jkajdg4wvpbbwc5mn37i4c8nfis4z0pv5rl7gqs0laj0gpj7jn8"; + }; + add-install-target = fetchpatch { + url = patchPrefix + "50a83256ee45430fb06b7aea1945dd91c6813bc3.patch"; + sha256 = "0bv9yma67jdj496a6vn6y007c9gwjpg3rzld1i9m9y9xmlzq4yzv"; + }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "kjv"; - version = "unstable-2018-12-25"; + version = "unstable-2021-03-11"; src = fetchFromGitHub { owner = "bontibon"; - repo = pname; - rev = "fda81a610e4be0e7c5cf242de655868762dda1d4"; - sha256 = "1favfcjvd3pzz1ywwv3pbbxdg7v37s8vplgsz8ag016xqf5ykqqf"; + repo = "kjv"; + rev = "108595dcbb9bb12d40e0309f029b6fb3ccd81309"; + hash = "sha256-Z6myd9Xn23pYizG+IZVDrP988pYU06QIcpqXtWTcPiw="; }; patches = [ add-apocrypha add-install-target ]; - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; + buildInputs = [ readline ]; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with lib; { description = "The Bible, King James Version"; homepage = "https://github.com/bontibon/kjv"; - license = licenses.publicDomain; - maintainers = [ maintainers.jtobin ]; + license = licenses.unlicense; + maintainers = with maintainers; [ jtobin samuelgrf ]; + mainProgram = "kjv"; }; } - diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index 52c5f542b27..9c0cc7d08e7 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "stretchly"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "https://github.com/hovancik/stretchly/releases/download/v${version}/stretchly-${version}.tar.xz"; - sha256 = "1q0ihp6cd65lnscbr7xj3yyb06qds77r4s6m1xbk5l9vs2rw923d"; + sha256 = "sha256-F6p+g0yuDMpNq+cVgA3ZhUwCIiIU1QfYM90lmaNnRWw="; }; icon = fetchurl { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 4bb2cfd1291..47518bc3886 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "92.0.4515.107", - "sha256": "04khamgxwzgbm2rn7is53j5g55vm5qfyz7zwxqc51sd429jsqlbf", - "sha256bin64": "0vfg8wjf9i1yz8nlxsij8fmqq7qr4nsccaihppqm3axpk91mmdsj", + "version": "92.0.4515.131", + "sha256": "0fnfyh61w6dmavvfbf2x1zzrby0xpx4jd4ifjsgyc39rsl789b5n", + "sha256bin64": "04ykc7vgq47m595j0g0gl28n5rkki6aic7ck8xr08r5cia46gk3g", "deps": { "gn": { "version": "2021-05-07", @@ -12,9 +12,9 @@ } }, "chromedriver": { - "version": "92.0.4515.43", - "sha256_linux": "1s22y892py99kzcb2j3gafmbz9jrr2lfhhh8hp3ggn2i37yxs8bw", - "sha256_darwin": "1cjg4r4z5m74c2si4m25rj3z44n0iimhqzb1l3l3y0a3q024bi8f" + "version": "92.0.4515.107", + "sha256_linux": "12yckzjhlhxp14j7aphnvlw4xv713vllj44h5pba181ivxavmky3", + "sha256_darwin": "0gm0zazwy053rip9h0ma2s53rc65b8pzy57x48ch0fpq7rrsbycp" } }, "beta": { diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix deleted file mode 100644 index 7356768f397..00000000000 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/extensions.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ stdenv -, fetchgit -, fetchurl - -# common -, zip - -# HTTPS Everywhere -, git -, libxml2 # xmllint -, python27 -, python27Packages -, rsync -}: - -{ - https-everywhere = stdenv.mkDerivation rec { - pname = "https-everywhere"; - version = "2017.10.4"; - - extid = "https-everywhere-eff@eff.org"; - - src = fetchgit { - url = "https://git.torproject.org/https-everywhere.git"; - rev = "refs/tags/${version}"; - sha256 = "1g7971xygnhagnb25xjdf6mli6091ai9igx42d0ww88g8i0cqfzj"; - fetchSubmodules = true; # for translations, TODO: remove - }; - - nativeBuildInputs = [ - git - libxml2 # xmllint - python27 - python27Packages.lxml - rsync - zip - ]; - - buildPhase = '' - $shell ./makexpi.sh ${version} --no-recurse - ''; - - installPhase = '' - install -m 444 -D pkg/https-everywhere-$version-eff.xpi "$out/$extid.xpi" - ''; - }; - - noscript = stdenv.mkDerivation rec { - pname = "noscript"; - version = "5.1.2"; - - extid = "{73a6fe31-595d-460b-a920-fcc0f8843232}"; - - src = fetchurl { - url = "https://secure.informaction.com/download/releases/noscript-${version}.xpi"; - sha256 = "1fzspdiwhjabwz1yxb3gzj7giz9jbc1xxm65i93rvhzcp537cs42"; - }; - - dontUnpack = true; - - installPhase = '' - install -m 444 -D $src "$out/$extid.xpi" - ''; - }; - - torbutton = stdenv.mkDerivation rec { - pname = "torbutton"; - version = "1.9.8.1"; - - extid = "torbutton@torproject.org"; - - src = fetchgit { - url = "https://git.torproject.org/torbutton.git"; - rev = "refs/tags/${version}"; - sha256 = "1amp0c9ky0a7fsa0bcbi6n6ginw7s2g3an4rj7kvc1lxmrcsm65l"; - }; - - nativeBuildInputs = [ zip ]; - - buildPhase = '' - $shell ./makexpi.sh - ''; - - installPhase = '' - install -m 444 -D pkg/torbutton-$version.xpi "$out/$extid.xpi" - ''; - }; - - tor-launcher = stdenv.mkDerivation rec { - pname = "tor-launcher"; - version = "0.2.13"; - - extid = "tor-launcher@torproject.org"; - - src = fetchgit { - url = "https://git.torproject.org/tor-launcher.git"; - rev = "refs/tags/${version}"; - sha256 = "1f98v88y2clwvjiw77kxqc9cacp5h0489a540nc2wmsx7vnskrq0"; - }; - - nativeBuildInputs = [ zip ]; - - buildPhase = '' - make package - ''; - - installPhase = '' - install -m 444 -D pkg/tor-launcher-$version.xpi "$out/$extid.xpi" - ''; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 5d3b251089c..1b6bcd6758f 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -17,10 +17,10 @@ in mkFranzDerivation' rec { pname = "ferdi"; name = "Ferdi"; - version = "5.6.0-beta.6"; + version = "5.6.0"; src = fetchurl { url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb"; - sha256 = "sha256-Q1HSAEVcaxFyOq7oWqa6AJJpsBKRxbsKb9ydyK/gH/A="; + sha256 = "sha256-yaAYNQAvbtArw9qAtbTDD11a9nH2OQEPE8QLg1E79Yc="; }; extraBuildInputs = [ xorg.libxshmfence ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index dd46b64e4f6..21467534993 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, - setuptools, fetchpatch, + setuptools, fetchpatch, installShellFiles, pytest, faker, pytest-aiohttp, aioresponses, @@ -56,6 +56,10 @@ buildPythonApplication rec { aioresponses ]; + nativeBuildInputs = [ + installShellFiles + ]; + # darwin has difficulty communicating with server, fails some integration tests doCheck = !stdenv.isDarwin; @@ -63,6 +67,10 @@ buildPythonApplication rec { pytest ''; + postInstall = '' + installManPage docs/man/*.[1-9] + ''; + meta = with lib; { description = "An end-to-end encryption aware Matrix reverse proxy daemon"; homepage = "https://github.com/matrix-org/pantalaimon"; diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 90bbd31a888..b6afe0aa44e 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,24 +1,40 @@ { spellChecking ? true -, lib, stdenv, fetchurl, pkg-config, gtk3, gtkspell3 ? null -, gmime2, gettext, intltool, itstool, libxml2, libnotify, gnutls -, makeWrapper, gnupg -, gnomeSupport ? true, libsecret, gcr +, lib +, stdenv +, fetchurl +, pkg-config +, gtk3 +, gtkspell3 +, gmime2 +, gettext +, intltool +, itstool +, libxml2 +, libnotify +, gnutls +, makeWrapper +, gnupg +, gnomeSupport ? true +, libsecret +, gcr }: -assert spellChecking -> gtkspell3 != null; - -let version = "0.146"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pan"; - inherit version; + version = "0.146"; src = fetchurl { - url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; + url = "https://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; sha256 = "17agd27sn4a7nahvkpg0w39kv74njgdrrygs74bbvpaj8rk2hb55"; }; + patches = [ + # Take , , "gtk-compat.h" out of extern "C" + ./move-out-of-extern-c.diff + ]; + nativeBuildInputs = [ pkg-config gettext intltool itstool libxml2 makeWrapper ]; + buildInputs = [ gtk3 gmime2 libnotify gnutls ] ++ lib.optional spellChecking gtkspell3 ++ lib.optionals gnomeSupport [ libsecret gcr ]; @@ -29,7 +45,7 @@ stdenv.mkDerivation { "--with-gnutls" "--enable-libnotify" ] ++ lib.optional spellChecking "--with-gtkspell" - ++ lib.optional gnomeSupport "--enable-gkr"; + ++ lib.optional gnomeSupport "--enable-gkr"; postInstall = '' wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin @@ -42,6 +58,6 @@ stdenv.mkDerivation { homepage = "http://pan.rebelbase.com/"; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; - license = with licenses; [ gpl2 fdl11 ]; + license = with licenses; [ gpl2Only fdl11 ]; }; } diff --git a/pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff b/pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff new file mode 100644 index 00000000000..02b19b58ee5 --- /dev/null +++ b/pkgs/applications/networking/newsreaders/pan/move-out-of-extern-c.diff @@ -0,0 +1,1113 @@ +diff --git a/pan/data-impl/article-filter.cc b/pan/data-impl/article-filter.cc +index b06d0c2..f424738 100644 +--- a/pan/data-impl/article-filter.cc ++++ b/pan/data-impl/article-filter.cc +@@ -25,10 +25,7 @@ + #include + + //#include +-extern "C" +-{ +- #include +-} ++#include + + #include "article-filter.h" + +diff --git a/pan/data-impl/data-impl.cc b/pan/data-impl/data-impl.cc +index 88012cc..4465966 100644 +--- a/pan/data-impl/data-impl.cc ++++ b/pan/data-impl/data-impl.cc +@@ -22,10 +22,8 @@ + **************/ + + #include +-extern "C" { +- #include +- #include // for g_build_filename +-} ++#include ++#include // for g_build_filename + #include + #include + #include +diff --git a/pan/data-impl/data-io.cc b/pan/data-impl/data-io.cc +index bea1a90..d938634 100644 +--- a/pan/data-impl/data-io.cc ++++ b/pan/data-impl/data-io.cc +@@ -27,9 +27,9 @@ extern "C" { + #include // for chmod + #include // for chmod + #include +- #include +- #include + } ++#include ++#include + #include + #include + #include +diff --git a/pan/data-impl/groups.cc b/pan/data-impl/groups.cc +index 244feb9..da0183a 100644 +--- a/pan/data-impl/groups.cc ++++ b/pan/data-impl/groups.cc +@@ -29,9 +29,9 @@ + #include + + #include ++#include + extern "C" { + #include +- #include + } + + #include +diff --git a/pan/data-impl/headers.cc b/pan/data-impl/headers.cc +index f8c4466..16d5672 100644 +--- a/pan/data-impl/headers.cc ++++ b/pan/data-impl/headers.cc +@@ -25,10 +25,10 @@ + #include + #include + #include ++#include + extern "C" { + #include // for chmod + #include // for chmod +- #include + } + #include + #include +diff --git a/pan/data-impl/profiles.cc b/pan/data-impl/profiles.cc +index e999fda..a6e6bb5 100644 +--- a/pan/data-impl/profiles.cc ++++ b/pan/data-impl/profiles.cc +@@ -26,9 +26,9 @@ + extern "C" { + #include // for chmod + #include // for chmod +- #include +- #include + } ++#include ++#include + #include + #include + #include +diff --git a/pan/data-impl/server.cc b/pan/data-impl/server.cc +index 9ea55d4..b23782f 100644 +--- a/pan/data-impl/server.cc ++++ b/pan/data-impl/server.cc +@@ -25,10 +25,8 @@ + #include + #include + #include +-extern "C" { +- #include // for GMarkup +- #include +-} ++#include // for GMarkup ++#include + #include + #include + #include +diff --git a/pan/data-impl/xover.cc b/pan/data-impl/xover.cc +index ff8644f..a199556 100644 +--- a/pan/data-impl/xover.cc ++++ b/pan/data-impl/xover.cc +@@ -20,10 +20,8 @@ + #include + #include + #include +-extern "C" { +- #include +- #include +-} ++#include ++#include + #include + #include + #include +diff --git a/pan/data/article-cache.cc b/pan/data/article-cache.cc +index 1855153..30fa0f9 100644 +--- a/pan/data/article-cache.cc ++++ b/pan/data/article-cache.cc +@@ -26,11 +26,10 @@ extern "C" + #include + #include + #include +- +- #include +- #include +- #include + } ++#include ++#include ++#include + + #include + #include +diff --git a/pan/data/article-cache.h b/pan/data/article-cache.h +index 2ac722b..1304bfe 100644 +--- a/pan/data/article-cache.h ++++ b/pan/data/article-cache.h +@@ -22,9 +22,7 @@ + + #include + #include +-extern "C" { +- #include // for guint64 +-} ++#include // for guint64 + #include + #include + +diff --git a/pan/data/cert-store.cc b/pan/data/cert-store.cc +index 340fc8b..f6cd46e 100644 +--- a/pan/data/cert-store.cc ++++ b/pan/data/cert-store.cc +@@ -34,10 +34,8 @@ + #include + #include + +-extern "C" { + #include + #include +-} + + #include + #include +diff --git a/pan/data/encode-cache.cc b/pan/data/encode-cache.cc +index 3a82ea9..61c67a2 100644 +--- a/pan/data/encode-cache.cc ++++ b/pan/data/encode-cache.cc +@@ -28,11 +28,10 @@ extern "C" + #include + #include + #include +- +- #include +- #include +- #include + } ++#include ++#include ++#include + + #include + #include +diff --git a/pan/data/encode-cache.h b/pan/data/encode-cache.h +index 8bbd530..1affc0c 100644 +--- a/pan/data/encode-cache.h ++++ b/pan/data/encode-cache.h +@@ -22,9 +22,7 @@ + + #include + #include +-extern "C" { +- #include // for guint64 +-} ++#include // for guint64 + #include + #include + +diff --git a/pan/general/e-util.cc b/pan/general/e-util.cc +index af5ccd0..62879ee 100644 +--- a/pan/general/e-util.cc ++++ b/pan/general/e-util.cc +@@ -26,9 +26,9 @@ + #include + extern "C" { + #include +- #include +- #include + } ++#include ++#include + #include "debug.h" + #include "e-util.h" + +diff --git a/pan/general/file-util.cc b/pan/general/file-util.cc +index 02e9ed1..9efa269 100644 +--- a/pan/general/file-util.cc ++++ b/pan/general/file-util.cc +@@ -27,12 +27,12 @@ extern "C" + #include + #include + #include +- #include +- #include + #ifndef G_OS_WIN32 + #include + #endif + } ++#include ++#include + + #include "debug.h" + #include "log.h" +diff --git a/pan/general/file-util.h b/pan/general/file-util.h +index c125c8d..8c67639 100644 +--- a/pan/general/file-util.h ++++ b/pan/general/file-util.h +@@ -25,9 +25,9 @@ + extern "C" { + #include + #include +- #include +- #include + } ++#include ++#include + #include + + #define g_freopen freopen +diff --git a/pan/general/line-reader.cc b/pan/general/line-reader.cc +index afb9be8..6b80fc4 100644 +--- a/pan/general/line-reader.cc ++++ b/pan/general/line-reader.cc +@@ -1,9 +1,7 @@ + #include + #include + #include +-extern "C"{ +- #include +-} ++#include + #include + #include "file-util.h" + #include "line-reader.h" +diff --git a/pan/general/macros.h b/pan/general/macros.h +index 6dcf908..b16230f 100644 +--- a/pan/general/macros.h ++++ b/pan/general/macros.h +@@ -63,9 +63,6 @@ + *** g_assert + **/ + +-extern "C" +-{ +- #include +-} ++#include + + #endif +diff --git a/pan/general/text-match.cc b/pan/general/text-match.cc +index fcacbe2..d390de0 100644 +--- a/pan/general/text-match.cc ++++ b/pan/general/text-match.cc +@@ -20,9 +20,9 @@ + #include + extern "C" { + #include +- #include +- #include + } ++#include ++#include + #include "debug.h" + #include "log.h" + #include "text-match.h" +diff --git a/pan/general/utf8-utils.cc b/pan/general/utf8-utils.cc +index be79a13..fea6100 100644 +--- a/pan/general/utf8-utils.cc ++++ b/pan/general/utf8-utils.cc +@@ -21,9 +21,7 @@ + #include + #include + #include +-extern "C" { + #include +-} + #include + #include + #include +diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc +index 520c08b..5ec397c 100644 +--- a/pan/gui/actions.cc ++++ b/pan/gui/actions.cc +@@ -18,11 +18,9 @@ + */ + + #include +-extern "C" { +- #include +- #include "gtk-compat.h" +-} ++#include "gtk-compat.h" + ++#include + #include + #include + #include +diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc +index 53e9124..e9841e2 100644 +--- a/pan/gui/body-pane.cc ++++ b/pan/gui/body-pane.cc +@@ -22,11 +22,9 @@ + #include + #include + #include +-extern "C" { +- #include +- #include "gtk-compat.h" +- #include +-} ++#include "gtk-compat.h" ++#include ++#include + #include + #include + #include +diff --git a/pan/gui/dl-headers-ui.cc b/pan/gui/dl-headers-ui.cc +index 5841651..e9f4b2d 100644 +--- a/pan/gui/dl-headers-ui.cc ++++ b/pan/gui/dl-headers-ui.cc +@@ -18,11 +18,9 @@ + */ + + #include +-extern "C" { +- #include +- #include +- #include "gtk-compat.h" +-} ++#include ++#include ++#include "gtk-compat.h" + #include + #include + #include +diff --git a/pan/gui/group-pane.cc b/pan/gui/group-pane.cc +index 28ad581..3ff103e 100644 +--- a/pan/gui/group-pane.cc ++++ b/pan/gui/group-pane.cc +@@ -20,10 +20,8 @@ + #include + #include + #include +-extern "C" { +- #include +- #include "gtk-compat.h" +-} ++#include "gtk-compat.h" ++#include + #include + //#include + #include +diff --git a/pan/gui/group-prefs-dialog.cc b/pan/gui/group-prefs-dialog.cc +index 677b07a..0d7df8b 100644 +--- a/pan/gui/group-prefs-dialog.cc ++++ b/pan/gui/group-prefs-dialog.cc +@@ -18,14 +18,14 @@ + */ + + #include +-extern "C" { +- #include +- #include +- #include "gtk-compat.h" ++#include ++#include + #ifdef HAVE_GTKSPELL ++extern "C" { + #include +-#endif + } ++#endif ++#include "gtk-compat.h" + #include + #include + #include +diff --git a/pan/gui/group-prefs.cc b/pan/gui/group-prefs.cc +index 3e9851b..b06a949 100644 +--- a/pan/gui/group-prefs.cc ++++ b/pan/gui/group-prefs.cc +@@ -21,8 +21,8 @@ extern "C" { + #include + #include // chmod + #include // chmod +- #include + } ++#include + #include + #include + #include +diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc +index f79aa1e..9f8787e 100644 +--- a/pan/gui/gui.cc ++++ b/pan/gui/gui.cc +@@ -25,9 +25,9 @@ + extern "C" { + #include // for chmod + #include // for chmod +- #include + #include + } ++#include + #include + #include + #include +diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc +index dc65a77..a4a9952 100644 +--- a/pan/gui/header-pane.cc ++++ b/pan/gui/header-pane.cc +@@ -19,10 +19,9 @@ + + extern "C" { + #include +- #include +- #include "gtk-compat.h" +- #include "gtk-compat.h" + } ++#include "gtk-compat.h" ++#include + #include + #include + #include +diff --git a/pan/gui/log-ui.cc b/pan/gui/log-ui.cc +index 7b11493..b204298 100644 +--- a/pan/gui/log-ui.cc ++++ b/pan/gui/log-ui.cc +@@ -21,10 +21,8 @@ + #include + #include + #include +-extern "C" { +- #include +- #include "gtk-compat.h" +-} ++#include "gtk-compat.h" ++#include + #include + #include + #include +diff --git a/pan/gui/pan-file-entry.cc b/pan/gui/pan-file-entry.cc +index 705fc91..c67acf8 100644 +--- a/pan/gui/pan-file-entry.cc ++++ b/pan/gui/pan-file-entry.cc +@@ -19,10 +19,8 @@ + + #include + #include +-extern "C" { +- #include +- #include "gtk-compat.h" +-} ++#include "gtk-compat.h" ++#include + #include + #include "pad.h" + #include "pan-file-entry.h" +diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc +index fb3a696..46c1a5d 100644 +--- a/pan/gui/pan.cc ++++ b/pan/gui/pan.cc +@@ -24,9 +24,6 @@ + #include + + extern "C" { +- #include +- #include "gtk-compat.h" +- #include + #include + #include + #include +@@ -34,6 +31,9 @@ extern "C" { + #include + } + ++#include "gtk-compat.h" ++#include ++#include + #ifdef G_OS_WIN32 + #undef _WIN32_WINNT + #define _WIN32_WINNT 0x0501 +diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc +index 8769ec5..92c757d 100644 +--- a/pan/gui/post-ui.cc ++++ b/pan/gui/post-ui.cc +@@ -23,14 +23,14 @@ + #include + #include + extern "C" { +- #include +- #include +- #include "gtk-compat.h" + #include + #ifdef HAVE_GTKSPELL + #include + #endif + } ++#include "gtk-compat.h" ++#include ++#include + #include + #include + #include +diff --git a/pan/gui/prefs-file.cc b/pan/gui/prefs-file.cc +index bde7ef3..64c540f 100644 +--- a/pan/gui/prefs-file.cc ++++ b/pan/gui/prefs-file.cc +@@ -24,8 +24,8 @@ + extern "C" { + #include // for chmod + #include // for chmod +- #include + } ++#include + #include + #include "prefs-file.h" + +diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc +index f7dc0f0..aac9ec1 100644 +--- a/pan/gui/prefs-ui.cc ++++ b/pan/gui/prefs-ui.cc +@@ -18,10 +18,8 @@ + */ + + #include +-extern "C" { +- #include +- #include "gtk-compat.h" +-} ++#include "gtk-compat.h" ++#include + #include + #include + #include +diff --git a/pan/gui/prefs.cc b/pan/gui/prefs.cc +index fdbd908..64dd8da 100644 +--- a/pan/gui/prefs.cc ++++ b/pan/gui/prefs.cc +@@ -23,10 +23,8 @@ + #include + #include + #include +-extern "C" { +- #include +- #include +-} ++#include ++#include + #include + #include + #include +diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc +index 26ff029..cf8bd44 100644 +--- a/pan/gui/profiles-dialog.cc ++++ b/pan/gui/profiles-dialog.cc +@@ -23,10 +23,8 @@ + + #include + #include +-extern "C" { +- #include +- #include "gtk-compat.h" +-} ++#include "gtk-compat.h" ++#include + #include + #include + #include +diff --git a/pan/gui/progress-view.cc b/pan/gui/progress-view.cc +index 241ad1c..43ef4f2 100644 +--- a/pan/gui/progress-view.cc ++++ b/pan/gui/progress-view.cc +@@ -18,9 +18,7 @@ + */ + + #include +-extern "C" { +- #include "gtk-compat.h" +-} ++#include "gtk-compat.h" + #include + #include + #include "progress-view.h" +diff --git a/pan/gui/save-attach-ui.cc b/pan/gui/save-attach-ui.cc +index 0b08b6f..0e86a1b 100644 +--- a/pan/gui/save-attach-ui.cc ++++ b/pan/gui/save-attach-ui.cc +@@ -18,10 +18,8 @@ + */ + + #include +-extern "C" { +- #include +- #include "gtk-compat.h" +-} ++#include "gtk-compat.h" ++#include + #include + #include + #include +diff --git a/pan/gui/save-ui.cc b/pan/gui/save-ui.cc +index 0f034e5..1df0cfb 100644 +--- a/pan/gui/save-ui.cc ++++ b/pan/gui/save-ui.cc +@@ -18,10 +18,8 @@ + */ + + #include +-extern "C" { +- #include +- #include "gtk-compat.h" +-} ++#include "gtk-compat.h" ++#include + #include + #include + #include +diff --git a/pan/gui/score-add-ui.cc b/pan/gui/score-add-ui.cc +index e72bdb5..3b81167 100644 +--- a/pan/gui/score-add-ui.cc ++++ b/pan/gui/score-add-ui.cc +@@ -20,9 +20,7 @@ + #include + #include + #include +-extern "C" { +- #include +-} ++#include + #include + #include + #include "hig.h" +diff --git a/pan/gui/score-view-ui.cc b/pan/gui/score-view-ui.cc +index d6c81c1..1327426 100644 +--- a/pan/gui/score-view-ui.cc ++++ b/pan/gui/score-view-ui.cc +@@ -18,10 +18,8 @@ + */ + + #include +-extern "C" { +- #include +- #include "gtk-compat.h" +-} ++#include "gtk-compat.h" ++#include + #include + #include "pad.h" + #include "score-add-ui.h" +diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc +index b42bc18..268114b 100644 +--- a/pan/gui/server-ui.cc ++++ b/pan/gui/server-ui.cc +@@ -21,11 +21,9 @@ + #include + #include + #include +-extern "C" { +- #include +- #include +- #include "gtk-compat.h" +-} ++#include ++#include ++#include "gtk-compat.h" + + #include + #include +diff --git a/pan/gui/task-pane.cc b/pan/gui/task-pane.cc +index 4f77922..18a8f74 100644 +--- a/pan/gui/task-pane.cc ++++ b/pan/gui/task-pane.cc +@@ -18,11 +18,9 @@ + */ + + #include +-extern "C" { +- #include +- #include +- #include "gtk-compat.h" +-} ++#include ++#include ++#include "gtk-compat.h" + #include + #include + #include +diff --git a/pan/gui/url.cc b/pan/gui/url.cc +index e1173ae..94ffb52 100644 +--- a/pan/gui/url.cc ++++ b/pan/gui/url.cc +@@ -20,10 +20,8 @@ + #include + #include + #include +-extern "C" { +- #include +- #include +-}; ++#include ++#include + #include + #include "url.h" + +diff --git a/pan/tasks/decoder.cc b/pan/tasks/decoder.cc +index b4c21ae..f8cb6db 100644 +--- a/pan/tasks/decoder.cc ++++ b/pan/tasks/decoder.cc +@@ -28,8 +28,8 @@ + extern "C" { + # define PROTOTYPES + # include +-# include + }; ++#include + #include + #include + #include +diff --git a/pan/tasks/encoder.cc b/pan/tasks/encoder.cc +index 7960b84..5989059 100644 +--- a/pan/tasks/encoder.cc ++++ b/pan/tasks/encoder.cc +@@ -31,10 +31,10 @@ + extern "C" { + #define PROTOTYPES + #include +-#include + #include + }; + ++#include + #include + #include + #include +diff --git a/pan/tasks/nntp.cc b/pan/tasks/nntp.cc +index ceb1574..71c5cf1 100644 +--- a/pan/tasks/nntp.cc ++++ b/pan/tasks/nntp.cc +@@ -22,10 +22,8 @@ + #include + #include // abort, atoi, strtoul + #include // snprintf +-extern "C" { +- #include +- #include +-} ++#include ++#include + #include + #include + #include +diff --git a/pan/tasks/nzb.cc b/pan/tasks/nzb.cc +index af890e5..14df6f6 100644 +--- a/pan/tasks/nzb.cc ++++ b/pan/tasks/nzb.cc +@@ -24,9 +24,7 @@ + #include + #include + #include +-extern "C" { +- #include +-} ++#include + #include + #include + #include +diff --git a/pan/tasks/socket-impl-gio.cc b/pan/tasks/socket-impl-gio.cc +index d3339dd..7dc2ec1 100644 +--- a/pan/tasks/socket-impl-gio.cc ++++ b/pan/tasks/socket-impl-gio.cc +@@ -31,9 +31,9 @@ + + extern "C" { + #include +- #include + } + ++#include + #include + #include + #include +diff --git a/pan/tasks/socket-impl-main.cc b/pan/tasks/socket-impl-main.cc +index c33edfd..688183c 100644 +--- a/pan/tasks/socket-impl-main.cc ++++ b/pan/tasks/socket-impl-main.cc +@@ -30,10 +30,7 @@ + //#include + //#include + +-extern "C" +-{ +- #include +-} ++#include + + #include + +diff --git a/pan/tasks/socket-impl-openssl.cc b/pan/tasks/socket-impl-openssl.cc +index b58e074..5b1b0b0 100644 +--- a/pan/tasks/socket-impl-openssl.cc ++++ b/pan/tasks/socket-impl-openssl.cc +@@ -34,13 +34,14 @@ + + extern "C" { + #include +- #include + #include + #include + #include + #include + } + ++#include ++ + #include + #include + #include +diff --git a/pan/tasks/socket-impl-openssl.h b/pan/tasks/socket-impl-openssl.h +index e48cbae..eea41d4 100644 +--- a/pan/tasks/socket-impl-openssl.h ++++ b/pan/tasks/socket-impl-openssl.h +@@ -27,10 +27,7 @@ + #include + //#include + //#include +-extern "C" +-{ +- #include +-} ++#include + + #include + #include +diff --git a/pan/tasks/socket.cc b/pan/tasks/socket.cc +index 78d53fb..2c7a28d 100644 +--- a/pan/tasks/socket.cc ++++ b/pan/tasks/socket.cc +@@ -21,9 +21,7 @@ + #include + #include + #include +-extern "C" { +- #include +-} ++#include + #include + #include + #include "socket.h" +diff --git a/pan/tasks/task-article.cc b/pan/tasks/task-article.cc +index 9c96b7d..1dc17ba 100644 +--- a/pan/tasks/task-article.cc ++++ b/pan/tasks/task-article.cc +@@ -24,10 +24,7 @@ + #include + #include + #include +-extern "C" +-{ +- #include +-} ++#include + #include + #include + #include +diff --git a/pan/tasks/task-groups.cc b/pan/tasks/task-groups.cc +index b8618d6..9b72369 100644 +--- a/pan/tasks/task-groups.cc ++++ b/pan/tasks/task-groups.cc +@@ -20,9 +20,9 @@ + #include + #include + extern "C" { +- #include + #include + } ++#include + #include + #include + #include +diff --git a/pan/tasks/task-post.cc b/pan/tasks/task-post.cc +index bb80fb9..4ab9c2f 100644 +--- a/pan/tasks/task-post.cc ++++ b/pan/tasks/task-post.cc +@@ -18,9 +18,7 @@ + */ + + #include +-extern "C" { +- #include +-} ++#include + #include "task-post.h" + #include + #include +diff --git a/pan/tasks/task-upload.h b/pan/tasks/task-upload.h +index 7bd4fe0..e5377c6 100644 +--- a/pan/tasks/task-upload.h ++++ b/pan/tasks/task-upload.h +@@ -37,10 +37,10 @@ + extern "C" { + #define PROTOTYPES + #include +- #include +- #include + }; + ++#include ++#include + #include + + namespace pan +diff --git a/pan/tasks/task-xover.cc b/pan/tasks/task-xover.cc +index c3c8260..64b41a4 100644 +--- a/pan/tasks/task-xover.cc ++++ b/pan/tasks/task-xover.cc +@@ -26,10 +26,10 @@ extern "C" + #define PROTOTYPES + #include + #include +-#include +-#include + } + ++#include ++#include + #include + #include + #include +diff --git a/pan/tasks/task-xoverinfo.cc b/pan/tasks/task-xoverinfo.cc +index c598bf8..9a9e488 100644 +--- a/pan/tasks/task-xoverinfo.cc ++++ b/pan/tasks/task-xoverinfo.cc +@@ -24,10 +24,10 @@ extern "C" { + #define PROTOTYPES + #include + #include +- #include +- #include + #include + } ++#include ++#include + #include + #include + #include +diff --git a/pan/usenet-utils/filter-info.cc b/pan/usenet-utils/filter-info.cc +index f464428..6b1a5c9 100644 +--- a/pan/usenet-utils/filter-info.cc ++++ b/pan/usenet-utils/filter-info.cc +@@ -18,10 +18,8 @@ + */ + + #include +-extern "C" { +- #include +- #include +-} ++#include ++#include + #include + #include "filter-info.h" + +diff --git a/pan/usenet-utils/gnksa.cc b/pan/usenet-utils/gnksa.cc +index db1f2c4..fb888d5 100644 +--- a/pan/usenet-utils/gnksa.cc ++++ b/pan/usenet-utils/gnksa.cc +@@ -37,10 +37,10 @@ extern "C" + { + #include + #include +- #include + #include + } + ++#include + #include + #include + #include +diff --git a/pan/usenet-utils/gpg.cc b/pan/usenet-utils/gpg.cc +index 4df4525..8755777 100644 +--- a/pan/usenet-utils/gpg.cc ++++ b/pan/usenet-utils/gpg.cc +@@ -28,9 +28,9 @@ extern "C" { + #include + #include + #include +- #include +- #include + } ++#include ++#include + + #ifdef HAVE_GMIME_CRYPTO + +diff --git a/pan/usenet-utils/message-check.cc b/pan/usenet-utils/message-check.cc +index a511556..461ce86 100644 +--- a/pan/usenet-utils/message-check.cc ++++ b/pan/usenet-utils/message-check.cc +@@ -21,9 +21,7 @@ + #include + #include + #include +-extern "C" { + #include +-} + #include + #include + #include +diff --git a/pan/usenet-utils/rules-info.cc b/pan/usenet-utils/rules-info.cc +index 1c03adc..91e78be 100644 +--- a/pan/usenet-utils/rules-info.cc ++++ b/pan/usenet-utils/rules-info.cc +@@ -22,10 +22,8 @@ + + + #include +-extern "C" { +- #include +- #include +-} ++#include ++#include + #include + #include "rules-info.h" + +diff --git a/pan/usenet-utils/scorefile.cc b/pan/usenet-utils/scorefile.cc +index 8b56a2a..4b151f0 100644 +--- a/pan/usenet-utils/scorefile.cc ++++ b/pan/usenet-utils/scorefile.cc +@@ -23,9 +23,7 @@ + #include + #include + #include +-extern "C" { +- #include +-} ++#include + #include + #include + #include +diff --git a/pan/usenet-utils/ssl-utils.h b/pan/usenet-utils/ssl-utils.h +index 2286250..0beb32f 100644 +--- a/pan/usenet-utils/ssl-utils.h ++++ b/pan/usenet-utils/ssl-utils.h +@@ -43,9 +43,7 @@ + #include + #include + #include +-extern "C" { +- #include +-} ++#include + + namespace pan + { +diff --git a/pan/usenet-utils/text-massager.cc b/pan/usenet-utils/text-massager.cc +index 4fcd8d5..15a818b 100644 +--- a/pan/usenet-utils/text-massager.cc ++++ b/pan/usenet-utils/text-massager.cc +@@ -22,9 +22,7 @@ + #include + #include + #include +-extern "C" { + #include +-} + #include "text-massager.h" + #include + #include diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index f6243476f1b..98070994fa3 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -476,11 +476,11 @@ md5name = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523-libjpeg-turbo-1.5.3.tar.gz"; } { - name = "language-subtag-registry-2020-12-18.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2020-12-18.tar.bz2"; - sha256 = "62ce680d5db0f28001b64bd57db47f388c13629cdefc9af8e8af0fbe93689ba1"; + name = "language-subtag-registry-2021-03-05.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2021-03-05.tar.bz2"; + sha256 = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a"; md5 = ""; - md5name = "62ce680d5db0f28001b64bd57db47f388c13629cdefc9af8e8af0fbe93689ba1-language-subtag-registry-2020-12-18.tar.bz2"; + md5name = "ce80e8face06bf2ada363e0c159e3f990c4116fdae9232ca43e6369aa82bf16a-language-subtag-registry-2021-03-05.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index 3870c478c80..2e1a4b1d78d 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,7 +8,7 @@ rec { major = "7"; minor = "1"; - patch = "3"; + patch = "4"; tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1gr9c8kv7nc9kaag1sw9r36843pfba1my80afx7p0lxj0k8pzbrm"; + sha256 = "1jsskhnlyra7q6d12kkc8dxq5fgrnd8grl32bdck7j9hkwv6d13m"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "09xkr6jmnwq55savw9xjsy8l8zcyflnsg4nfwhknvm3ls8sqj4w6"; + sha256 = "0cslzhp5ic1w7hnl6wbyxrxhczdmap1g1hh1nj9sgpw9iqdryqj7"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "0dc981vmxfdwlyfgq84axkr99d8chm1ypknj39v0cmaqn56lpwg0"; + sha256 = "091yhm1qkxgvv130a1yzmmikchvxvp8109mcdrlpybp4gc276l8q"; }; } diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index d622fef424d..32305f5b4cd 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -22,6 +22,7 @@ , uhd , SDL , gsl +, soapysdr , libsodium , libsndfile , libunwind @@ -44,14 +45,14 @@ , pname ? "gnuradio" , versionAttr ? { major = "3.9"; - minor = "1"; + minor = "2"; patch = "0"; } , fetchSubmodules ? false }: let - sourceSha256 = "0zydmrr3gkaqiv4jv8f42awrfzs177bqb349q34rnr6j3d32z2vp"; + sourceSha256 = "01wyqazrpphmb0fl69j93k0w4vm4d1l4177m1fyg7qx8hzia0aaq"; featuresInfo = { # Needed always basic = { @@ -205,6 +206,12 @@ let gr-network = { cmakeEnableFlag = "GR_NETWORK"; }; + gr-soapy = { + cmakeEnableFlag = "GR_SOAPY"; + runtime = [ + soapysdr + ]; + }; }; shared = (import ./shared.nix { inherit @@ -233,6 +240,7 @@ stdenv.mkDerivation rec { src nativeBuildInputs buildInputs + cmakeFlags disallowedReferences stripDebugList doCheck @@ -248,25 +256,9 @@ stdenv.mkDerivation rec { } // lib.optionalAttrs (hasFeature "gr-qtgui" features) { inherit (libsForQt5) qwt; }; - cmakeFlags = shared.cmakeFlags - # From some reason, if these are not set, libcodec2 and gsm are not - # detected properly. - ++ lib.optionals (hasFeature "gr-vocoder" features) [ - "-DLIBCODEC2_FOUND=TRUE" - "-DLIBCODEC2_LIBRARIES=${codec2}/lib/libcodec2.so" - "-DLIBCODEC2_INCLUDE_DIRS=${codec2}/include" - "-DLIBCODEC2_HAS_FREEDV_API=ON" - "-DLIBGSM_FOUND=TRUE" - "-DLIBGSM_LIBRARIES=${gsm}/lib/libgsm.so" - "-DLIBGSM_INCLUDE_DIRS=${gsm}/include/gsm" - ] - ; postInstall = shared.postInstall # This is the only python reference worth removing, if needed. - # Even if python support is enabled, and we don't care about this - # reference, pybind's path is not properly set. See: - # https://github.com/gnuradio/gnuradio/issues/4380 + lib.optionalString (!hasFeature "python-support" features) '' ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake ${removeReferencesTo}/bin/remove-references-to -t ${python} $(readlink -f $out/lib/libgnuradio-runtime.so) diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 8dd2766ff0e..e9712a859d7 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl }: +{ stdenv, fetchFromGitHub, git, lib, makeWrapper, nettools, perl, perlPackages }: stdenv.mkDerivation rec { pname = "gitolite"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/gitolite-shell \ - --prefix PATH : ${lib.makeBinPath [ git perl ]} + --prefix PATH : ${lib.makeBinPath [ git (perl.withPackages (p: [ p.JSON ])) ]} ''; installPhase = '' diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index ca9ae20f346..0c44805bedd 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { pname = "containerd"; - version = "1.5.2"; + version = "1.5.4"; outputs = [ "out" "man" ]; @@ -18,7 +18,7 @@ buildGoModule rec { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-RDLAmPBjDHCx9al+gstUTrvKc/L0vAm8IEd/mvX5Als="; + sha256 = "sha256-VV1cxA8tDRiPDxKV8OGu3T7sgutmyL+VPNqTeFcVjJA="; }; vendorSha256 = null; diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c index a438b80e182..27e70e3fe5c 100644 --- a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c +++ b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c @@ -43,7 +43,6 @@ const gchar *create_tmpdir() { void pivot_host(const gchar *guest) { g_autofree gchar *point = g_build_filename(guest, "host", NULL); fail_if(g_mkdir(point, 0755)); - fail_if(mount(0, "/", 0, MS_PRIVATE | MS_REC, 0)); fail_if(pivot_root(guest, point)); } @@ -122,6 +121,9 @@ int main(gint argc, gchar **argv) { fail("unshare", unshare_errno); } + // hide all mounts we do from the parent + fail_if(mount(0, "/", 0, MS_PRIVATE | MS_REC, 0)); + if (uid != 0) { spit("/proc/self/setgroups", "deny"); spit("/proc/self/uid_map", "%d %d 1", uid, uid); diff --git a/pkgs/desktops/gnome/extensions/default.nix b/pkgs/desktops/gnome/extensions/default.nix index 1ca9a57eb99..0e1167561eb 100644 --- a/pkgs/desktops/gnome/extensions/default.nix +++ b/pkgs/desktops/gnome/extensions/default.nix @@ -62,7 +62,7 @@ in rec { gnomeExtensions = lib.recurseIntoAttrs ( (mapReadableNames (produceExtensionsList "40")) // (callPackage ./manuallyPackaged.nix {}) - // lib.optionalAttrs (config.allowAliases or false) { + // lib.optionalAttrs (config.allowAliases or true) { unite-shell = gnomeExtensions.unite; # added 2021-01-19 arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 2cb8a459e64..ca8f4106f3d 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -18,7 +18,7 @@ , config , glib , libxml2 -, ffmpeg_3 +, ffmpeg , libxslt , libGL , freetype @@ -168,7 +168,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 ffmpeg_3 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++ lib.optionals swingSupport [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc]; rpath = lib.strings.makeLibraryPath libraries; diff --git a/pkgs/development/gnuradio-modules/ais/default.nix b/pkgs/development/gnuradio-modules/ais/default.nix index 5ff4ffd7565..638210f8412 100644 --- a/pkgs/development/gnuradio-modules/ais/default.nix +++ b/pkgs/development/gnuradio-modules/ais/default.nix @@ -8,18 +8,22 @@ , cppunit , log4cpp , osmosdr +, gmp +, mpir +, fftwFloat +, icu }: mkDerivation rec { pname = "gr-ais"; - version = "2015-12-20"; + version = "2020-08-13"; src = fetchFromGitHub { owner = "bistromath"; repo = "gr-ais"; - rev = "cdc1f52745853f9c739c718251830eb69704b26e"; - sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; + rev = "2162103226f3dae43c8c2ab23b79483b84346665"; + sha256 = "1vackka34722d8pcspfwj0j6gc9ic7dqq64sgkrpjm94sh3bmb0b"; }; - disabledForGRafter = "3.8"; + disabledForGRafter = "3.9"; nativeBuildInputs = [ cmake @@ -32,6 +36,10 @@ mkDerivation rec { osmosdr boost log4cpp + gmp + mpir + fftwFloat + icu ]; meta = with lib; { diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 82f65082b94..2b2ffbea31e 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -1,20 +1,20 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, nix-update-script, fetchpatch }: stdenv.mkDerivation rec { pname = "editline"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "troglobit"; repo = "editline"; rev = version; - sha256 = "0vjm42y6zjmi6hdcng0l7wkksw7s50agbmk5dxsc3292q8mvq8v6"; + sha256 = "sha256-0FeDUVCUahbweH24nfaZwa7j7lSfZh1TnQK7KYqO+3g="; }; patches = [ (fetchpatch { - name = "fix-for-multiline-as-one-line.patch"; - url = "https://github.com/troglobit/editline/commit/ceee039cfc819c8e09eebbfca192091b0cf8df75.patch"; - sha256 = "149fmfva05ghzwkd0bq1sahdbkys3qyyky28ssqb5jq7q9hw3ddm"; + name = "fix-for-home-end-in-tmux.patch"; + url = "https://github.com/troglobit/editline/commit/265c1fb6a0b99bedb157dc7c320f2c9629136518.patch"; + sha256 = "sha256-9fhQH0hT8BcykGzOUoT18HBtWjjoXnePSGDJQp8GH30="; }) ]; @@ -22,11 +22,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + meta = with lib; { - homepage = "https://troglobit.com/editline.html"; + homepage = "https://troglobit.com/projects/editline/"; description = "A readline() replacement for UNIX without termcap (ncurses)"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill oxalica ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 049688cf74d..ca82f7dc709 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -226,6 +226,28 @@ stdenv.mkDerivation ({ libc_cv_c_cleanup=yes libc_cv_gnu89_inline=yes EOF + + # ./configure has logic like + # + # AR=`$CC -print-prog-name=ar` + # + # This searches various directories in the gcc and its wrapper. In nixpkgs, + # this returns the bare string "ar", which is build ar. This can result as + # a build failure with the following message: + # + # libc_pic.a: error adding symbols: archive has no index; run ranlib to add one + # + # (Observed cross compiling from aarch64-linux -> armv7l-linux). + # + # Nixpkgs passes a correct value for AR and friends, so to use the correct + # set of tools, we only need to delete this special handling. + sed -i \ + -e '/^AR=/d' \ + -e '/^AS=/d' \ + -e '/^LD=/d' \ + -e '/^OBJCOPY=/d' \ + -e '/^OBJDUMP=/d' \ + $configureScript ''; preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH"; diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index f9fcdedf180..4f0caa7cc33 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -18,21 +18,21 @@ let url = "https://download.fcitx-im.org/data/lm_sc.3gm.arpa-${arpaVer}.tar.bz2"; sha256 = "0bqy3l7mif0yygjrcm65qallszgn17mvgyxhvz7a54zaamyan6vm"; }; - dictVer = "20200715"; + dictVer = "20210402"; dict = fetchurl { url = "https://download.fcitx-im.org/data/dict.utf8-${dictVer}.tar.xz"; - sha256 = "1ln7r64j8mc7wz4j0q4v8wd68wy7qqz4bz1dpxk7zqbdvza6rhr3"; + sha256 = "sha256-gYz7tama5bQMJwe2FYc09KEBlkRIU0AMvWsUUFWS2A0="; }; in stdenv.mkDerivation rec { pname = "libime"; - version = "1.0.3"; + version = "1.0.7"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; rev = version; - sha256 = "sha256-Ykj4/3yKUqK0BRqW1E2zFYNgeUOXQ1DsotmKU6c8vEg="; + sha256 = "sha256-q/SXS6pT4vBkCkCTarPVHrZPXijYnc2t51YGRvzQ0FY="; fetchSubmodules = true; }; diff --git a/pkgs/development/libraries/xcb-imdkit/default.nix b/pkgs/development/libraries/xcb-imdkit/default.nix index a3bcc822b36..b2e56c8193b 100644 --- a/pkgs/development/libraries/xcb-imdkit/default.nix +++ b/pkgs/development/libraries/xcb-imdkit/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "xcb-imdkit"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "fcitx"; repo = "xcb-imdkit"; rev = version; - sha256 = "sha256-ISaVsMtDsyfhbhsAwDSWkQ7ZcpNtvC7M9NFQsWA5ju8="; + sha256 = "sha256-IPuTRSgmrnCJRgGWcE4JRaxd0sGCcHrKRnn2B1OdDMU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index b03dcc89d44..e2d40630905 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -20,7 +20,7 @@ }: let pname = "github-actions-runner"; - version = "2.278.0"; + version = "2.279.0"; deps = (import ./deps.nix { inherit fetchurl; }); nugetPackages = map @@ -41,6 +41,10 @@ let # Online tests (x: "FullyQualifiedName!=GitHub.Runner.Common.Tests.Worker.ActionManagerL0.PrepareActions_${x}") [ + "CompositeActionWithActionfile_CompositeContainerNested" + "CompositeActionWithActionfile_CompositePrestepNested" + "CompositeActionWithActionfile_MaxLimit" + "CompositeActionWithActionfile_Node" "DownloadActionFromGraph" "DownloadActionFromGraph_Legacy" "NotPullOrBuildImagesMultipleTimes" @@ -80,8 +84,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "actions"; repo = "runner"; - rev = "62d926efce35d3ea16d7624a25aaa5b300737def"; # v${version} - sha256 = "sha256-KAb14739DYnuNIf7ZNZk5CShye6XFGn8aLu8BAcuT/c="; + rev = "6b75179ec79e2041b3b5b4e9206b73db2d206aac"; # v${version} + sha256 = "sha256-d7LAHL8Ff7R++d1HuLxWjtiBZRogySe7xHY/xJAcFms="; }; nativeBuildInputs = [ @@ -123,6 +127,11 @@ stdenv.mkDerivation rec { --replace 'dotnet test Test/Test.csproj' \ "dotnet test Test/Test.csproj --filter '${testFilterXml}'" + # We don't use a Git checkout + substituteInPlace src/dir.proj \ + --replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \ + 'echo Patched out.' + # Fix FHS path substituteInPlace src/Test/L0/Util/IOUtilL0.cs \ --replace '/bin/ln' '${coreutils}/bin/ln' diff --git a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix index b857b910f0a..3ebbc9b0339 100644 --- a/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix +++ b/pkgs/development/tools/haskell/dconf2nix/dconf2nix.nix @@ -1,13 +1,13 @@ -{ mkDerivation, base, containers, fetchgit, hedgehog -, optparse-applicative, parsec, lib, template-haskell, text +{ mkDerivation, base, containers, fetchgit, hedgehog, lib +, optparse-applicative, parsec, template-haskell, text }: mkDerivation { pname = "dconf2nix"; - version = "0.0.7"; + version = "0.0.8"; src = fetchgit { url = "https://github.com/gvolpe/dconf2nix.git"; - sha256 = "04p8di1ckv5fkfa61pjg5xp8vcw091lz1kw39lh4w8ks2zjwaha1"; - rev = "34c523e920b79208c3b4c0ad371900b0948799f7"; + sha256 = "19jk3p0ys3lbqk21lm37a7alkg2vhnmkvcffjqfxrw8p4737hxid"; + rev = "6bf3d7d4ca9f553a9e1ba4a70a65640114d230b2"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 88bbfda5c73..b85ca99a9e6 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.10.3"; + version = "0.10.4"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1psmsiwd3xlbrvkdvr2zgs2b66kw8w2jvvqa399g7jhixh2fpbx4"; + outputHash = "0pjgnm5argmc92872vblsz0pw2wniggvkw4w2346ps09ybdv9r3q"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index 7b06e720caa..6ba4eecac48 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -120,7 +120,7 @@ in stdenv.mkDerivation rec { # Sourcetrail attempts to copy clang headers from the LLVM store path substituteInPlace CMakeLists.txt \ - --replace "\''${LLVM_BINARY_DIR}" '${llvmPackages.clang-unwrapped}' + --replace "\''${LLVM_BINARY_DIR}" '${lib.getLib llvmPackages.clang-unwrapped}' patchShebangs script ln -sf ${installJavaIndexer} script/update_java_indexer.sh diff --git a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock index 165aa6ac856..094c703b65f 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock +++ b/pkgs/development/tools/wasm-bindgen-cli/Cargo.lock @@ -15,9 +15,9 @@ checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" [[package]] name = "aho-corasick" -version = "0.7.13" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -33,9 +33,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.32" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b" +checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" [[package]] name = "arrayref" @@ -45,21 +45,21 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "ascii" -version = "0.8.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97be891acc47ca214468e09425d02cef3af2c94d0d82081cd02061f996802f14" +checksum = "bbf56136a5198c7b01a49e3afcbef6cf84597273d298f54432926024107b0109" [[package]] name = "askama" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70a6e7ebd44d0047fd48206c83c5cd3214acc7b9d87f001da170145c47ef7d12" +checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" dependencies = [ "askama_derive", "askama_escape", @@ -68,13 +68,12 @@ dependencies = [ [[package]] name = "askama_derive" -version = "0.10.3" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d7169690c4f56343dcd821ab834972a22570a2662a19a84fd7775d5e1c3881" +checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" dependencies = [ "askama_shared", "proc-macro2", - "quote", "syn", ] @@ -86,15 +85,15 @@ checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb" [[package]] name = "askama_shared" -version = "0.10.4" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62fc272363345c8cdc030e4c259d9d028237f8b057dc9bb327772a257bde6bb5" +checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" dependencies = [ "askama_escape", "humansize", - "nom", - "num-traits 0.2.12", - "percent-encoding 2.1.0", + "nom 6.1.2", + "num-traits 0.2.14", + "percent-encoding", "proc-macro2", "quote", "serde", @@ -104,10 +103,11 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "1.0.1" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c88b9ca26f9c16ec830350d309397e74ee9abdfd8eb1f71cb6ecc71a3fc818da" +checksum = "a88b6bd5df287567ffdf4ddf4d33060048e1068308e5f62d81c6f9824a045a48" dependencies = [ + "bstr", "doc-comment", "predicates", "predicates-core", @@ -134,9 +134,9 @@ checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" [[package]] name = "autocfg" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" +checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "base64" @@ -150,9 +150,18 @@ dependencies = [ [[package]] name = "base64" -version = "0.11.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" +checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +dependencies = [ + "byteorder", +] + +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bitflags" @@ -167,16 +176,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] -name = "blake2b_simd" -version = "0.5.10" +name = "bitvec" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "blake2b_simd" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" dependencies = [ "arrayref", "arrayvec", "constant_time_eq", ] +[[package]] +name = "bstr" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" +dependencies = [ + "lazy_static", + "memchr", + "regex-automata", +] + [[package]] name = "buf_redux" version = "0.8.4" @@ -189,15 +221,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" [[package]] name = "byteorder" -version = "1.3.4" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "canvas" @@ -210,9 +242,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.58" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" +checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" [[package]] name = "cfg-if" @@ -235,26 +267,28 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.13" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" dependencies = [ + "libc", "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", "time", + "winapi", ] [[package]] name = "chunked_transfer" -version = "0.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498d20a7aaf62625b9bf26e637cf7736417cde1d0c99f1d04d1170229a85cf87" +checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" [[package]] name = "clap" -version = "2.33.1" +version = "2.33.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" +checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" dependencies = [ "ansi_term", "atty", @@ -285,9 +319,9 @@ dependencies = [ [[package]] name = "color_quant" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dbbb57365263e881e805dc77d94697c9118fd94d8da011240555aa7b23445bd" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "console_error_panic_hook" @@ -314,58 +348,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] -name = "crossbeam-deque" -version = "0.7.3" +name = "crossbeam-channel" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" +dependencies = [ + "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", - "maybe-uninit", ] [[package]] name = "crossbeam-epoch" -version = "0.8.2" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" +checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" dependencies = [ - "autocfg 1.0.0", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "crossbeam-utils", "lazy_static", - "maybe-uninit", "memoffset", "scopeguard", ] -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if 0.1.10", - "crossbeam-utils", - "maybe-uninit", -] - [[package]] name = "crossbeam-utils" -version = "0.7.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" dependencies = [ - "autocfg 1.0.0", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "lazy_static", ] [[package]] name = "curl" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9447ad28eee2a5cfb031c329d46bef77487244fff6a724b378885b8691a35f78" +checksum = "003cb79c1c6d1c93344c7e1201bb51c2148f24ec2bd9c253709d6b2efb796515" dependencies = [ "curl-sys", "libc", @@ -378,9 +408,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.33+curl-7.71.1" +version = "0.4.44+curl-7.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9818ea018327f79c811612f29b9834d2abddbe7db81460a2d5c7e12946b337" +checksum = "4b6d85e9322b193f117c966e79c2d6929ec08c02f339f950044aba12e20bbaf1" dependencies = [ "cc", "libc", @@ -439,14 +469,14 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "docopt" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f525a586d310c87df72ebcd98009e57f1cc030c8c268305287a476beb653969" +checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", "serde", - "strsim 0.9.3", + "strsim 0.10.0", ] [[package]] @@ -459,9 +489,9 @@ dependencies = [ [[package]] name = "either" -version = "1.5.3" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" +checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "enum_primitive" @@ -480,7 +510,7 @@ checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" dependencies = [ "atty", "humantime", - "log 0.4.11", + "log 0.4.14", "regex", "termcolor", ] @@ -499,13 +529,13 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e500da2fab70bdc43f8f0e0b350a227f31c72311c56aba48f01d5cd62bb0345b" +checksum = "1d34cfa13a63ae058bfa601fe9e313bbdb3746427c1459185464ce0fcf62e1e8" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.2.8", "winapi", ] @@ -515,7 +545,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -533,6 +563,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding", +] + [[package]] name = "fuchsia-cprng" version = "0.1.1" @@ -540,10 +580,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] -name = "futures" -version = "0.3.5" +name = "funty" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" +checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" + +[[package]] +name = "futures" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" dependencies = [ "futures-channel", "futures-core", @@ -556,9 +602,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" +checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" dependencies = [ "futures-core", "futures-sink", @@ -575,9 +621,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" +checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" [[package]] name = "futures-core-preview" @@ -587,9 +633,9 @@ checksum = "b35b6263fb1ef523c3056565fa67b1d16f0a8604ff12b11b08c25f28a734c60a" [[package]] name = "futures-executor" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" +checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" dependencies = [ "futures-core", "futures-task", @@ -598,27 +644,27 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" +checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" [[package]] name = "futures-lite" -version = "1.11.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb" +checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" dependencies = [ "futures-core", - "memchr", "pin-project-lite", ] [[package]] name = "futures-macro" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" +checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" dependencies = [ + "autocfg 1.0.1", "proc-macro-hack", "proc-macro2", "quote", @@ -627,25 +673,23 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" +checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" [[package]] name = "futures-task" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" -dependencies = [ - "once_cell", -] +checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" [[package]] name = "futures-util" -version = "0.3.5" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" dependencies = [ + "autocfg 1.0.1", "futures-channel", "futures-core", "futures-io", @@ -653,7 +697,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project", + "pin-project-lite", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -662,13 +706,24 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "wasi", + "wasi 0.9.0+wasi-snapshot-preview1", +] + +[[package]] +name = "getrandom" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi 0.10.2+wasi-snapshot-preview1", ] [[package]] @@ -696,9 +751,9 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] @@ -712,30 +767,30 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.15" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" dependencies = [ "libc", ] [[package]] name = "httparse" -version = "1.3.4" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" [[package]] name = "humansize" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6cab2627acfc432780848602f3f558f7e9dd427352224b0d9324025796d2a5e" +checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" [[package]] name = "humantime" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "id-arena" @@ -748,9 +803,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.1.5" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" dependencies = [ "matches", "unicode-bidi", @@ -789,23 +844,22 @@ checksum = "e7e0062d2dc2f17d2f13750d95316ae8a2ff909af0fda957084f5defd87c43bb" [[package]] name = "itoa" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "jpeg-decoder" -version = "0.1.20" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc797adac5f083b8ff0ca6f6294a999393d76e197c36488e2ef732c4715f6fa3" +checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" dependencies = [ - "byteorder", "rayon", ] [[package]] name = "js-sys" -version = "0.3.50" +version = "0.3.51" dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", @@ -833,16 +887,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3576a87f2ba00f6f106fdfcd16db1d698d648a26ad8e0573cad8537c3c362d2a" [[package]] -name = "libc" -version = "0.2.74" +name = "lexical-core" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10" +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +dependencies = [ + "arrayvec", + "bitflags 1.2.1", + "cfg-if 1.0.0", + "ryu", + "static_assertions", +] + +[[package]] +name = "libc" +version = "0.2.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36" [[package]] name = "libz-sys" -version = "1.0.25" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe" +checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" dependencies = [ "cc", "libc", @@ -856,16 +923,16 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" dependencies = [ - "log 0.4.11", + "log 0.4.14", ] [[package]] name = "log" -version = "0.4.11" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -880,25 +947,19 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" [[package]] name = "memoffset" -version = "0.5.5" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" +checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", ] [[package]] @@ -924,19 +985,19 @@ dependencies = [ [[package]] name = "multipart" -version = "0.15.4" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adba94490a79baf2d6a23eac897157047008272fa3eecb3373ae6377b91eca28" +checksum = "136eed74cadb9edd2651ffba732b19a450316b680e4f48d6c79e905799e19d01" dependencies = [ "buf_redux", "httparse", - "log 0.4.11", + "log 0.4.14", "mime", "mime_guess", "quick-error", - "rand 0.4.6", + "rand 0.6.5", "safemem", - "tempdir", + "tempfile", "twoway", ] @@ -954,7 +1015,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" dependencies = [ "memchr", - "version_check 0.9.2", + "version_check 0.9.3", +] + +[[package]] +name = "nom" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" +dependencies = [ + "bitvec", + "funty", + "lexical-core", + "memchr", + "version_check 0.9.3", ] [[package]] @@ -965,23 +1039,23 @@ checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] name = "num-integer" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" dependencies = [ - "autocfg 1.0.0", - "num-traits 0.2.12", + "autocfg 1.0.1", + "num-traits 0.2.14", ] [[package]] name = "num-iter" -version = "0.1.41" +version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" +checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -991,7 +1065,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e" dependencies = [ "num-integer", - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] @@ -1000,16 +1074,16 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", ] [[package]] @@ -1024,46 +1098,46 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.4.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b631f7e854af39a1739f401cf34a8a013dfe09eac4fa4dba91e9768bd28168d" +checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] name = "openssl" -version = "0.10.30" +version = "0.10.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" +checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8" dependencies = [ "bitflags 1.2.1", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "foreign-types", - "lazy_static", "libc", + "once_cell", "openssl-sys", ] [[package]] name = "openssl-probe" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-src" -version = "111.10.2+1.1.1g" +version = "111.15.0+1.1.1k" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a287fdb22e32b5b60624d4a5a7a02dbe82777f730ec0dbc42a0554326fef5a70" +checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.58" +version = "0.9.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", "cc", "libc", "openssl-src", @@ -1071,12 +1145,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "percent-encoding" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" - [[package]] name = "percent-encoding" version = "2.1.0" @@ -1131,26 +1199,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "pin-project" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "pin-project-lite" version = "0.2.6" @@ -1165,9 +1213,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "png" @@ -1183,15 +1231,15 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "predicates" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96bfead12e90dccead362d62bb2c90a5f6fc4584963645bc7f71a735e0b0735a" +checksum = "f49cfaf7fdaa3bfacc6fa3e7054e65148878354a5cfddcf661df4c851f8021df" dependencies = [ "difference", "float-cmp", @@ -1202,15 +1250,15 @@ dependencies = [ [[package]] name = "predicates-core" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06075c3a3e92559ff8929e7a280684489ea27fe44805174c3ebd9328dcb37178" +checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" [[package]] name = "predicates-tree" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e63c4859013b38a76eca2414c64911fba30def9e3202ac461a2d22831220124" +checksum = "15f553275e5721409451eb85e15fd9a860a6e5ab4496eb215987502b5f5391f2" dependencies = [ "predicates-core", "treeline", @@ -1218,47 +1266,45 @@ dependencies = [ [[package]] name = "proc-macro-error" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc175e9777c3116627248584e8f8b3e2987405cabe1c0adf7d1dd28f09dc7880" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", "syn", - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] name = "proc-macro-error-attr" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc9795ca17eb581285ec44936da7fc2335a3f34f2ddd13118b6f4d515435c50" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", "quote", - "syn", - "syn-mid", - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] name = "proc-macro-hack" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" +checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" dependencies = [ "unicode-xid", ] @@ -1271,38 +1317,18 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ "proc-macro2", ] [[package]] -name = "rand" -version = "0.4.6" +name = "radium" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - -[[package]] -name = "rand" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -dependencies = [ - "cloudabi", - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "winapi", -] +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] name = "rand" @@ -1329,13 +1355,25 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom", + "getrandom 0.1.16", "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc 0.2.0", ] +[[package]] +name = "rand" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +dependencies = [ + "libc", + "rand_chacha 0.3.0", + "rand_core 0.6.2", + "rand_hc 0.3.0", +] + [[package]] name = "rand_chacha" version = "0.1.1" @@ -1356,6 +1394,16 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.2", +] + [[package]] name = "rand_core" version = "0.3.1" @@ -1377,7 +1425,16 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom", + "getrandom 0.1.16", +] + +[[package]] +name = "rand_core" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +dependencies = [ + "getrandom 0.2.3", ] [[package]] @@ -1398,6 +1455,15 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_hc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +dependencies = [ + "rand_core 0.6.2", +] + [[package]] name = "rand_isaac" version = "0.1.1" @@ -1453,11 +1519,11 @@ dependencies = [ [[package]] name = "rayon" -version = "1.3.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080" +checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ - "autocfg 1.0.0", + "autocfg 1.0.1", "crossbeam-deque", "either", "rayon-core", @@ -1465,12 +1531,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.7.1" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280" +checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ + "crossbeam-channel", "crossbeam-deque", - "crossbeam-queue", "crossbeam-utils", "lazy_static", "num_cpus", @@ -1517,33 +1583,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] -name = "redox_users" -version = "0.3.4" +name = "redox_syscall" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" +checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" dependencies = [ - "getrandom", - "redox_syscall", + "bitflags 1.2.1", +] + +[[package]] +name = "redox_users" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +dependencies = [ + "getrandom 0.1.16", + "redox_syscall 0.1.57", "rust-argon2", ] [[package]] name = "regex" -version = "1.3.9" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] -name = "regex-syntax" -version = "0.6.18" +name = "regex-automata" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "remove_dir_all" @@ -1564,16 +1644,17 @@ dependencies = [ [[package]] name = "rouille" -version = "3.0.0" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112568052ec17fa26c6c11c40acbb30d3ad244bf3d6da0be181f5e7e42e5004f" +checksum = "0cfaebc11a52b7415f07e69f18f8240a0ea5eedf0dcb888c5fb7b432e7b4729b" dependencies = [ - "base64 0.9.3", + "base64 0.10.1", "chrono", "filetime", "multipart", "num_cpus", - "rand 0.5.6", + "percent-encoding", + "rand 0.7.3", "serde", "serde_derive", "serde_json", @@ -1587,11 +1668,11 @@ dependencies = [ [[package]] name = "rust-argon2" -version = "0.7.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" +checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" dependencies = [ - "base64 0.11.0", + "base64 0.13.0", "blake2b_simd", "constant_time_eq", "crossbeam-utils", @@ -1606,9 +1687,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.16" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" +checksum = "410f7acf3cb3a44527c5d9546bad4bf4e6c460915d5f9f2fc524498bfe8f70ce" [[package]] name = "ryu" @@ -1662,18 +1743,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.114" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.114" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" +checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ "proc-macro2", "quote", @@ -1682,9 +1763,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.57" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "itoa", "ryu", @@ -1705,19 +1786,17 @@ checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" [[package]] name = "slab" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" [[package]] name = "socket2" -version = "0.3.12" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" +checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" dependencies = [ - "cfg-if 0.1.10", "libc", - "redox_syscall", "winapi", ] @@ -1727,6 +1806,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3" +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "strsim" version = "0.8.0" @@ -1735,15 +1820,15 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "strsim" -version = "0.9.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structopt" -version = "0.3.15" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de2f5e239ee807089b62adce73e48c625e0ed80df02c7ab3f068f5db5281065c" +checksum = "5277acd7ee46e63e5168a80734c9f6ee81b1367a7d8772a2d765df2a3705d28c" dependencies = [ "clap", "lazy_static", @@ -1752,9 +1837,9 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.8" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510413f9de616762a4fbeab62509bf15c729603b72d7cd71280fbca431b1c118" +checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" dependencies = [ "heck", "proc-macro-error", @@ -1765,9 +1850,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.67" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702" +checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" dependencies = [ "proc-macro2", "quote", @@ -1775,36 +1860,21 @@ dependencies = [ ] [[package]] -name = "syn-mid" -version = "0.5.0" +name = "tap" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "rand 0.7.3", - "redox_syscall", + "rand 0.8.3", + "redox_syscall 0.2.8", "remove_dir_all", "winapi", ] @@ -1822,9 +1892,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" dependencies = [ "winapi-util", ] @@ -1838,15 +1908,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static", -] - [[package]] name = "threadpool" version = "1.8.1" @@ -1868,22 +1929,31 @@ dependencies = [ [[package]] name = "tiny_http" -version = "0.6.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1661fa0a44c95d01604bd05c66732a446c657efb62b5164a7a083a3b552b4951" +checksum = "9ce51b50006056f590c9b7c3808c3bd70f0d1101666629713866c227d6e58d39" dependencies = [ "ascii", "chrono", "chunked_transfer", - "log 0.4.11", + "log 0.4.14", "url", ] [[package]] name = "tinyvec" -version = "0.3.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" +checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "todomvc" @@ -1898,9 +1968,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.6" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ "serde", ] @@ -1913,9 +1983,9 @@ checksum = "a7f741b240f1a48843f9b8e0444fb55fb2a4ff67293b50a9179dfd5ea67f8d41" [[package]] name = "trybuild" -version = "1.0.31" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a4d94e6adf00b96b1ab94fcfcd8c3cf916733b39adf90c8f72693629887b9b8" +checksum = "1768998d9a3b179411618e377dbb134c58a88cda284b0aa71c42c40660127d46" dependencies = [ "glob", "lazy_static", @@ -1954,27 +2024,27 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" dependencies = [ "matches", ] [[package]] name = "unicode-normalization" -version = "0.1.13" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" [[package]] name = "unicode-width" @@ -1984,26 +2054,27 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "url" -version = "1.7.2" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ + "form_urlencoded", "idna", "matches", - "percent-encoding 1.0.1", + "percent-encoding", ] [[package]] name = "vcpkg" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" +checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa" [[package]] name = "vec_map" @@ -2019,9 +2090,9 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "wait-timeout" @@ -2034,24 +2105,24 @@ dependencies = [ [[package]] name = "walrus" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d470d0583e65f4cab21a1ff3c1ba3dd23ae49e68f516f0afceaeb001b32af39" +checksum = "4eb08e48cde54c05f363d984bb54ce374f49e242def9468d2e1b6c2372d291f8" dependencies = [ "anyhow", "id-arena", "leb128", - "log 0.4.11", + "log 0.4.14", "rayon", "walrus-macro", - "wasmparser 0.59.0", + "wasmparser 0.77.0", ] [[package]] name = "walrus-macro" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c2bb690b44cb1b0fdcc54d4998d21f8bdaf706b93775425e440b174f39ad16" +checksum = "0a6e5bd22c71e77d60140b0bd5be56155a37e5bd14e24f5f87298040d0cc40d7" dependencies = [ "heck", "proc-macro2", @@ -2065,9 +2136,15 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +[[package]] +name = "wasi" +version = "0.10.2+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" + [[package]] name = "wasm-bindgen" -version = "0.2.73" +version = "0.2.74" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2083,11 +2160,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.73" +version = "0.2.74" dependencies = [ "bumpalo", "lazy_static", - "log 0.4.11", + "log 0.4.14", "proc-macro2", "quote", "syn", @@ -2104,7 +2181,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "assert_cmd", @@ -2112,7 +2189,7 @@ dependencies = [ "diff", "docopt", "env_logger", - "log 0.4.11", + "log 0.4.14", "openssl", "predicates", "rayon", @@ -2132,11 +2209,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "base64 0.9.3", - "log 0.4.11", + "log 0.4.14", "rustc-demangle", "serde_json", "tempfile", @@ -2154,19 +2231,19 @@ dependencies = [ [[package]] name = "wasm-bindgen-externref-xform" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "rayon", "walrus", "wasmprinter", - "wast", + "wast 21.0.0", "wat", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.23" +version = "0.4.24" dependencies = [ "cfg-if 1.0.0", "futures-channel-preview", @@ -2180,7 +2257,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.73" +version = "0.2.74" dependencies = [ "quote", "trybuild", @@ -2191,7 +2268,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.73" +version = "0.2.74" dependencies = [ "proc-macro2", "quote", @@ -2202,13 +2279,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-multi-value-xform" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "rayon", "walrus", "wasmprinter", - "wast", + "wast 21.0.0", "wat", ] @@ -2223,11 +2300,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.73" +version = "0.2.74" [[package]] name = "wasm-bindgen-test" -version = "0.3.23" +version = "0.3.24" dependencies = [ "console_error_panic_hook", "js-sys", @@ -2253,7 +2330,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.23" +version = "0.3.24" dependencies = [ "proc-macro2", "quote", @@ -2261,7 +2338,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-threads-xform" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "walrus", @@ -2270,7 +2347,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-conventions" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "walrus", @@ -2278,10 +2355,10 @@ dependencies = [ [[package]] name = "wasm-bindgen-wasm-interpreter" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", - "log 0.4.11", + "log 0.4.14", "tempfile", "walrus", "wasm-bindgen-wasm-conventions", @@ -2290,13 +2367,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-webidl" -version = "0.2.73" +version = "0.2.74" dependencies = [ "anyhow", "env_logger", "heck", "lazy_static", - "log 0.4.11", + "log 0.4.14", "proc-macro2", "quote", "sourcefile", @@ -2324,6 +2401,15 @@ dependencies = [ "wasm-bindgen-futures", ] +[[package]] +name = "wasm-in-web-worker" +version = "0.1.0" +dependencies = [ + "console_error_panic_hook", + "wasm-bindgen", + "web-sys", +] + [[package]] name = "wasm2js" version = "0.1.0" @@ -2339,18 +2425,24 @@ checksum = "a950e6a618f62147fd514ff445b2a0b53120d382751960797f85f058c7eda9b9" [[package]] name = "wasmparser" -version = "0.60.2" +version = "0.77.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d5790a08f11f3d6b5767f6c49152df74b215e3dc5a38147713c4f6a05aac7f" +checksum = "b35c86d22e720a07d954ebbed772d01180501afe7d03d464f413bb5f8914a8d6" + +[[package]] +name = "wasmparser" +version = "0.78.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52144d4c78e5cf8b055ceab8e5fa22814ce4315d6002ad32cfd914f37c12fd65" [[package]] name = "wasmprinter" -version = "0.2.7" +version = "0.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc836dba85dd00df43d71b22063bcb367d324aa1be0d046077cc7fca4c43876" +checksum = "2ccec894c70710c2e4669320a532cb2b9cfb97adb0429745642f8ce76916ed85" dependencies = [ "anyhow", - "wasmparser 0.60.2", + "wasmparser 0.78.2", ] [[package]] @@ -2363,17 +2455,26 @@ dependencies = [ ] [[package]] -name = "wat" -version = "1.0.22" +name = "wast" +version = "35.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce85d72b74242c340e9e3492cfb602652d7bb324c3172dd441b5577e39a2e18c" +checksum = "2ef140f1b49946586078353a453a1d28ba90adfc54dde75710bc1931de204d68" dependencies = [ - "wast", + "leb128", +] + +[[package]] +name = "wat" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ec280a739b69173e0ffd12c1658507996836ba4e992ed9bc1e5385a0bd72a02" +dependencies = [ + "wast 35.0.2", ] [[package]] name = "web-sys" -version = "0.3.50" +version = "0.3.51" dependencies = [ "js-sys", "wasm-bindgen", @@ -2447,7 +2548,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "610950904727748ca09682e857f0d6d6437f0ca862f32f9229edba8cec8b2635" dependencies = [ - "nom", + "nom 5.1.2", ] [[package]] @@ -2517,7 +2618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33358e95c77d660f1c7c07f4a93c2bd89768965e844e3c50730bb4b42658df5f" dependencies = [ "anyhow", - "wast", + "wast 21.0.0", "wit-writer", ] @@ -2535,9 +2636,9 @@ dependencies = [ [[package]] name = "wit-walrus" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b532d7bc47d02a08463adc934301efbf67e7b1e1284f8a68edc85d1ca84fa125" +checksum = "ad559e3e4c6404b2a6a675d44129d62a3836e3b951b90112fa1c5feb852757cd" dependencies = [ "anyhow", "id-arena", @@ -2572,3 +2673,9 @@ dependencies = [ "wasm-bindgen", "web-sys", ] + +[[package]] +name = "wyz" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index a52f7b6550c..ef8affdf244 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -1,10 +1,17 @@ -{ rustPlatform, fetchFromGitHub, lib, openssl, pkg-config, stdenv, curl, Security +{ rustPlatform +, fetchFromGitHub +, lib +, openssl +, pkg-config +, stdenv +, curl +, Security , runCommand }: rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.73"; + version = "0.2.74"; src = let @@ -12,9 +19,10 @@ rustPlatform.buildRustPackage rec { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "sha256-JrfS9Z/ZqhoZXJxrxMSLpl2NiktTUkjW6q3xN9AU2zw="; + hash = "sha256-GsraYfWzUZjFpPpufTyXF0i2llBzjh04iTKio6m4NRA="; }; - in runCommand "source" { } '' + in + runCommand "source" { } '' cp -R ${tarball} $out chmod -R +w $out cp ${./Cargo.lock} $out/Cargo.lock @@ -23,7 +31,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-GUdoOms4FrNmPkELFX1PXcU/ww7CSN8JGHoCvnm73PQ="; + cargoHash = "sha256-djeI7kSGRHMpXnsbVlM2CDek02u5tFAsyAdHwbKC0y8="; cargoBuildFlags = [ "-p" pname ]; meta = with lib; { diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 7d70ee9e6d3..ee47a0ecdc2 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, nixosTests, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.16.5"; + version = "1.17"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/1b557e7b033b583cd9f66746b7a9ab1ec1673ced/server.jar"; + url = "https://launcher.mojang.com/v1/objects/0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e/server.jar"; # sha1 because that comes from mojang via api - sha1 = "1b557e7b033b583cd9f66746b7a9ab1ec1673ced"; + sha1 = "0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e"; }; preferLocalBuild = true; diff --git a/pkgs/games/powermanga/default.nix b/pkgs/games/powermanga/default.nix new file mode 100644 index 00000000000..ce3f5b9bf55 --- /dev/null +++ b/pkgs/games/powermanga/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, SDL +, SDL_mixer +, libpng +}: + +stdenv.mkDerivation rec { + pname = "powermanga"; + version = "0.93.1"; + + src = fetchurl { + url = "https://linux.tlk.fr/games/Powermanga/download/powermanga-${version}.tgz"; + sha256 = "sha256-2nU/zoOQWm2z/Y6mXHDFfWYjYshsQp1saVRBcUT5Q+g="; + }; + + nativeBuildInputs = [ + autoconf + automake + ]; + + buildInputs = [ + SDL + SDL_mixer + libpng + ]; + + preConfigure = '' + ./bootstrap + ''; + + installFlags = [ + # Default is $(out)/games + "gamesdir=$(out)/bin" + # We set the scoredir to $TMPDIR. + # Otherwise it will try to write in /var/games at install time + "scoredir=$(TMPDIR)" + ]; + + meta = with lib; { + homepage = "https://linux.tlk.fr/games/Powermanga/"; + downloadPage = "https://linux.tlk.fr/games/Powermanga/download/"; + description = "An arcade 2D shoot-em-up game"; + longDescription = '' + Powermanga is an arcade 2D shoot-em-up game with 41 levels and more than + 200 sprites. It runs in 320x200 or 640x400 pixels, with Window mode or + full screen and support for 8, 15, 16, 24, and 32 bpp. As you go through + the levels, you will destroy enemy spaceships and bosses, collect gems to + power up your ship and get special powers, helpers and weapons. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/games/tecnoballz/default.nix b/pkgs/games/tecnoballz/default.nix new file mode 100644 index 00000000000..d13468b78e0 --- /dev/null +++ b/pkgs/games/tecnoballz/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, SDL +, SDL_mixer +, SDL_image +, libmikmod +, tinyxml +}: + +stdenv.mkDerivation rec { + pname = "tecnoballz"; + version = "0.93.1"; + + src = fetchurl { + url = "https://linux.tlk.fr/games/TecnoballZ/download/tecnoballz-${version}.tgz"; + sha256 = "sha256-WRW76e+/eXE/KwuyOjzTPFQnKwNznbIrUrz14fnvgug="; + }; + + nativeBuildInputs = [ + autoconf + automake + ]; + + buildInputs = [ + SDL + SDL_mixer + SDL_image + libmikmod + tinyxml + ]; + + # Newer compilers introduced warnings + postPatch = '' + substituteInPlace configure.ac \ + --replace "-Werror" "" + ''; + + preConfigure = '' + ./bootstrap + ''; + + installFlags = [ + # Default is $(out)/games + "gamesdir=$(out)/bin" + # We set the scoredir to $TMPDIR at install time. + # Otherwise it will try to write in /var/games at install time + "scoredir=$(TMPDIR)" + ]; + + meta = with lib; { + homepage = "https://linux.tlk.fr/games/TecnoballZ/"; + downloadPage = "https://linux.tlk.fr/games/TecnoballZ/download/"; + description = "A brick breaker game with a sophisticated system of weapons and bonuses"; + longDescription = '' + A exciting Brick Breaker with 50 levels of game and 11 special levels, + distributed on the 2 modes of game to give the player a sophisticated + system of attack weapons with an enormous power of fire that can be build + by gaining bonuses. Numerous decors, musics and sounds complete this great + game. This game was ported from the Commodore Amiga. + ''; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} 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 a5445488534..4293f53e47d 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 @@ stdenvNoCC.mkDerivation rec { pname = "firmware-linux-nonfree"; - version = "2021-05-11"; + version = "2021-07-16"; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; rev = "refs/tags/" + lib.replaceStrings ["-"] [""] version; - sha256 = "015hajf3mq8dv2hw5wsyvi34zdqiwxp9p5dwdp8nrk4r9z5ysqxw"; + sha256 = "185pnaqf2qmhbcdvvldmbar09zgaxhh3h8x9bxn6079bcdpaskn6"; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "034bwbl616vzl7lhcbvyz9dzmpzwi12vca3r5mszdxqh3z3s1g6a"; + outputHash = "0g470hj2ylpviijfpjqzsndn2k8kkscj27wqwk51xlk8cr3mrahb"; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 92f6bd90625..8fc439aeb3c 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -27,10 +27,10 @@ rec { else legacy_390; beta = generic { - version = "465.27"; - sha256_64bit = "fmn/qFve5qqqa26n4dsoOwGZ+ash5Bon3JBI8kncMXE="; - settingsSha256 = "3BFLCx0dcrQY4Mv1joMsiVPwTPyufgsNT5pFgp1Mk/A="; - persistencedSha256 = "HtoFGTiBnAeQyRTOMlve5poaQh63LHRD+DHJxZO+c90="; + version = "465.31"; + sha256_64bit = "YAjQAckzWGMEnDOOe6arlkBvT3rzFCeqjBjG0ncnLNo="; + settingsSha256 = "33zHXxfG/t6REbHqhYjzBhtuus7jP34r2wK90sBT9vE="; + persistencedSha256 = "1r/QqjOxg6836mQ46hNsPscKliNAtpN9xW6M++02woY="; }; # Vulkan developer beta driver diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 9e298697d4b..fba025b29d9 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, substituteAll, autoreconfHook, pkg-config, libusb1, hwdata , python3 }: stdenv.mkDerivation rec { - name = "usbutils-012"; + name = "usbutils-013"; src = fetchurl { url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz"; - sha256 = "0iiy0q7fzikavmdsjsb0sl9kp3gfh701qwyjjccvqh0qz4jlcqw8"; + sha256 = "0f0klk6d3hmbpf6p4dcwa1qjzblmkhbxs1wsw87aidvqri7lj8wy"; }; patches = [ diff --git a/pkgs/os-specific/linux/usbutils/fix-paths.patch b/pkgs/os-specific/linux/usbutils/fix-paths.patch index d75c68505ef..ef63a41e726 100644 --- a/pkgs/os-specific/linux/usbutils/fix-paths.patch +++ b/pkgs/os-specific/linux/usbutils/fix-paths.patch @@ -1,7 +1,7 @@ --- a/Makefile.am +++ b/Makefile.am -@@ -51,11 +51,11 @@ - usbreset.c +@@ -61,7 +61,7 @@ EXTRA_DIST = \ + LICENSES/GPL-3.0-only.txt lsusb.py: $(srcdir)/lsusb.py.in - sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ @@ -9,8 +9,3 @@ chmod 755 $@ lsusb.8: $(srcdir)/lsusb.8.in -- sed 's|VERSION|$(VERSION)|g;s|@usbids@|$(datadir)/usb.ids|g' $< >$@ -+ sed 's|VERSION|$(VERSION)|g;s|@usbids@|@hwdata@/share/hwdata/usb.ids|g' $< >$@ - - usb-devices.1: $(srcdir)/usb-devices.1.in - sed 's|VERSION|$(VERSION)|g' $< >$@ diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index d5fb9e7ed6e..093685a8d7b 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "dovecot"; - version = "2.3.15"; + version = "2.3.16"; nativeBuildInputs = [ perl pkg-config ]; buildInputs = @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "141manrh54cy8xizr7f8fsa3vdzc2ccfgdz87l9rjylm8mfxvfr1"; + sha256 = "04ngqv5mml5z0i4p7fkchp4xw2awy7x7mq2mim9frnav0m9iv9q3"; }; enableParallelBuilding = true; diff --git a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 33c66a46bb7..a13a7c10419 100644 --- a/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -3,11 +3,11 @@ let dovecotMajorMinor = lib.versions.majorMinor dovecot.version; in stdenv.mkDerivation rec { pname = "dovecot-pigeonhole"; - version = "0.5.15"; + version = "0.5.16"; src = fetchurl { url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz"; - sha256 = "1l2h0p8ddsl3ja2lnwk0mfqplqh8n0iw8k27awd3ak7prr88yjg1"; + sha256 = "0f79qsiqnhaxn7mrrfcrnsjyv6357kzb7wa0chhfd69vwa06g8sw"; }; buildInputs = [ dovecot openssl ]; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 6f29d336da1..32612d2e452 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.23.0.4482-62106842a"; + version = "1.23.1.4602-280ab6053"; pname = "plexmediaserver"; # Fetch the source src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb"; - sha256 = "0i4cfnzlzxh3vwd8kivy0dy6wg102j96v7p3mpivkwj15kjrl01v"; + sha256 = "0q0drm9x7c1c14ja21pzy4cl03am37gp78s6djbpk4sgxwvvyhic"; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "0yh30712m23hmpqc4b83pbmadgslq72z8lc4prx2kp01n3p5hfkq"; + sha256 = "0hz6572yj9wfq4sri76cjyzz4xmfvf8jlzvxqhsk4r05d8kbxrli"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index b50f3f33a31..332904ae9c7 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -1,10 +1,7 @@ -#! /usr/bin/env perl - -# Usage: -# -# manually update tarballs.list -# then run: cat tarballs.list | perl ./generate-expr-from-tarballs.pl +#!/usr/bin/env nix-shell +#!nix-shell --pure --keep NIX_PATH -i perl -p cacert nix perl +# Usage: manually update tarballs.list then run: ./generate-expr-from-tarballs.pl tarballs.list use strict; use warnings; diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 190f396009a..43e77d918e1 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -15,7 +15,7 @@ with lib; stdenv.mkDerivation rec { - version = "0.11.9"; # also update communityModules + version = "0.11.10"; # also update communityModules pname = "prosody"; # The following community modules are necessary for the nixos module # prosody module to comply with XEP-0423 and provide a working @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; - sha256 = "02gzvsaq0l5lx608sfh7hfz14s6yfsr4sr4kzcsqd1cxljp35h6c"; + sha256 = "1q84s9cq7cgzd295qxa2iy0r3vd3v3chbck62bdx3pd6skk19my6"; }; # A note to all those merging automated updates: Please also update this @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "c149edb37349"; - sha256 = "1njw17k0nhf15hc20l28v0xzcc7jha85lqy3j97nspv9zdxmshk1"; + rev = "64fafbeba14d"; + sha256 = "02gj1b8sdmdvymsdmjpq47zrl7sg578jcdxbbq18s44f3njmc9q1"; }; buildInputs = [ diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index d2779e2b4c5..e837350abd6 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -4,18 +4,18 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; - sha256 = "14bpc5ddhxvgfxkxhj5q9z443s7z4nn1zf4k1hxj7rbf13rcpg00"; + sha256 = "e4f579963199f05476657f0066beaa32d1261aef2203382f3919e1ed4bc4594e"; } else { arch = "i386"; gcclib = "${stdenv.cc.cc.lib}/lib"; - sha256 = "1s829q8gy9xgz0jm7w70aljqs2h49x402blqfr9zvn806aprmrm5"; + sha256 = "69113bf33ba0c57a363305b76361f2866c3b8394b173eed0f49db1f50bfe0373"; }; in stdenv.mkDerivation rec { pname = "yandex-disk"; - version = "0.1.5.1039"; + version = "0.1.6.1074"; src = fetchurl { url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${pname}-${version}-1.fedora.${p.arch}.rpm"; diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index e578fbf1443..ee801fdb24a 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.0.4"; + version = "5.0.8"; src = fetchFromGitHub { owner = "fcitx"; - repo = "fcitx5"; + repo = pname; rev = version; - sha256 = "sha256-2KGdR1m70Qatidzf/DZuFK3lc1t8z7sxjyhaxuc0Tqg="; + sha256 = "0czj2awvgk9apdh9rj3vcb04g8x2wp1d4sshvch31nwpqs10hssr"; }; prePatch = '' diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 6d3952c9c22..3a4a38c6b70 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.0.3"; + version = "5.0.6"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-chinese-addons"; rev = version; - sha256 = "sha256-kCihpRUtUXrqqf7FPQp8ZRexiygOuDVOdQwVx7tSn+c="; + sha256 = "sha256-+DhXFqUxECGZYHAmEw5cZJQnRHHgvT0nVVqY9DXgWBU="; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index cd7679dbbf1..584a1b932f4 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.0.4"; + version = "5.0.5"; src = fetchFromGitHub { owner = "fcitx"; - repo = "fcitx5-configtool"; + repo = pname; rev = version; - sha256 = "sha256-UO3Ob+bFQ/2Vqb8YpD9tfmfZt5YLUyoqcbtsHLaVOzE="; + sha256 = "0w6cgg57ldk02j3fs7mm8pn5inblcjyr20d3xl5qbyawwccjsn2m"; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index 1b76cec554d..7b27184cde3 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -4,9 +4,11 @@ , extra-cmake-modules , fcitx5 , gobject-introspection +, glib , gtk2 , gtk3 , gtk4 +, fmt , pcre , libuuid , libselinux @@ -24,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.3"; + version = "5.0.7"; src = fetchFromGitHub { owner = "fcitx"; - repo = "fcitx5-gtk"; + repo = pname; rev = version; - sha256 = "sha256-+BzXbZyzC3fvLqysufblk0zK9fAg5jslVdm/v3jz4B4="; + sha256 = "0vcikqrxv1xxcdaiz3axgm7rpab4w8aciw838sbpa9l20dp8cnyq"; }; cmakeFlags = [ @@ -39,8 +41,10 @@ stdenv.mkDerivation rec { ] ++ lib.optional (! withGTK2) "-DENABLE_GTK2_IM_MODULE=off"; buildInputs = [ + glib gtk3 gtk4 + fmt gobject-introspection fcitx5 pcre @@ -57,6 +61,11 @@ stdenv.mkDerivation rec { libXtst ] ++ lib.optional withGTK2 gtk2; + NIX_CFLAGS_COMPILE = lib.concatMapStringsSep " " (s: "-isystem ${s}") [ + "${glib.dev}/include/gio-unix-2.0" + "${glib.dev}/include/glib-2.0" + ]; + nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index f4df324fa05..879e6ffa78f 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.4"; + version = "5.0.5"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-lua"; rev = version; - sha256 = "sha256-1gKfFq+x/tCOYqESO49Qddp5z6zXO7ULjTJgDEl8BqI="; + sha256 = "0x7b78rz9mdyhm3y8yi7kihah7fgqzjyfgqwjyfx3i90wxflnmmc"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix index f8601a64e2a..cd362e94ef5 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix @@ -1,5 +1,4 @@ { lib, stdenv -, fetchurl , fetchFromGitHub , pkg-config , cmake @@ -12,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.0.4"; + version = "5.0.6"; src = fetchFromGitHub { owner = "fcitx"; - repo = "fcitx5-rime"; + repo = pname; rev = version; - sha256 = "sha256-WB+bWvJxL2yywictNN8Zy0OYxiCRErQGL2dGH4zQPp8="; + sha256 = "1r36c1pl63vka9mxa8f5x0kijapjgxzz5b4db8h87ri9kcxk7i2g"; }; cmakeFlags = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix index 355ac97d8a1..570893c2ade 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.0.2"; + version = "5.0.4"; src = fetchFromGitHub { owner = "fcitx"; - repo = "fcitx5-table-extra"; + repo = pname; rev = version; - sha256 = "sha256-Bqxdi/rjiTKqHLvVFVcQMjz/I0xxTiBgUIRkZjLuK+M="; + sha256 = "1rhm9jyqxlsgjsn3f5n9jwm5qjcgg87widp0bv1xa9cc23mydrqv"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix index 5e42016ec7c..00e13bc756f 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-other.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.0.3"; + version = "5.0.5"; src = fetchFromGitHub { owner = "fcitx"; - repo = "fcitx5-table-other"; + repo = pname; rev = version; - sha256 = "sha256-jJTFAOrBeRBoUn0mqqkX0z1zQnDOh7otMHDPmjuZbWw="; + sha256 = "0z34y05sbb2qavpa6banv7xvlsmpymmm828265r8bf7r995wx8lz"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/update.py b/pkgs/tools/inputmethods/fcitx5/update.py index e3513c747fc..9f54e313fd3 100755 --- a/pkgs/tools/inputmethods/fcitx5/update.py +++ b/pkgs/tools/inputmethods/fcitx5/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i python3 -p nix-prefetch-github python3Packages.requests +#!nix-shell -i python3 -p nix-update nix-prefetch-github python3Packages.requests from nix_prefetch_github import * import json @@ -12,8 +12,7 @@ REPOS = [ "libime", "xcb-imdkit", "fcitx5", "fcitx5-gtk", "fcitx5-qt", "fcitx5-c OWNER = "fcitx" def get_latest_tag(repo, owner=OWNER): - r = requests.get( 'https://api.github.com/repos/{}/{}/tags'.format(owner,repo) - , auth=('poscat', 'db5e6fd16d0eb8c36385d3d944e058a1178b4265')) + r = requests.get('https://api.github.com/repos/{}/{}/tags'.format(owner,repo)) return r.json()[0].get("name") def main(): diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index ae580545114..40586f6be65 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "silicon"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "sha256-ci0gq4rOQHBmFPvhXZseIlwnqAWd06/qg/i/luhV79s="; + sha256 = "sha256-k+p8AEEL1BBJTmPc58QoIk7EOzu8QKdG00RQ58EN3bg="; }; - cargoSha256 = "sha256-sUPOf9er+BOMqDJ8C6+Xjjqj6NQUV2JTzGA4yUWtDWM="; + cargoSha256 = "sha256-vpegobS7lpRkt/oZePW9WggYeg0JXDte8fQP/bf7oAI="; buildInputs = [ llvmPackages.libclang expat freetype fira-code ] ++ lib.optionals stdenv.isLinux [ libxcb ] diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix index c6792ecfd3b..3ec9bce0b4c 100644 --- a/pkgs/tools/networking/connman/connman.nix +++ b/pkgs/tools/networking/connman/connman.nix @@ -55,10 +55,10 @@ let inherit (lib) optionals; in stdenv.mkDerivation rec { pname = "connman"; - version = "1.39"; + version = "1.40"; src = fetchurl { url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; - sha256 = "sha256-n2KnFpt0kcZwof8uM1sNlmMI+y9i4oXHgRBeuQ8YGvM="; + sha256 = "sha256-GleufOI0qjoXRKrDvlwhIdmNzpmUQO+KucxO39XtyxI="; }; buildInputs = [ @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { libmnl gnutls readline - ]; + ] ++ optionals (enableOpenconnect) [ openconnect ]; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index bbad0ab1f2f..2019f8ac99d 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "0.103.2"; + version = "0.103.3"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - sha256 = "sha256-1LXQrGZiYuQjoyb7VHeMqnxpYk1sP5VCiV/rhHgnG9I="; + sha256 = "sha256-n249GESfPRo5kncdaWaFJJ36EnNv4rKSmFjyx9gnauk="; }; # don't install sample config files into the absolute sysconfdir folder diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20727323881..8c62b879a31 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13566,7 +13566,9 @@ in nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; - nexus = callPackage ../development/tools/repository-managers/nexus { }; + nexus = callPackage ../development/tools/repository-managers/nexus { + jre_headless = jre8_headless; + }; nwjs = callPackage ../development/tools/nwjs { gconf = pkgs.gnome2.GConf; @@ -28569,6 +28571,8 @@ in pokerth-server = libsForQt5.callPackage ../games/pokerth { target = "server"; }; + powermanga = callPackage ../games/powermanga { }; + prboom = callPackage ../games/prboom { }; pysolfc = python3Packages.callPackage ../games/pysolfc { }; @@ -28789,6 +28793,8 @@ in tbe = libsForQt5.callPackage ../games/the-butterfly-effect { }; + tecnoballz = callPackage ../games/tecnoballz { }; + teetertorture = callPackage ../games/teetertorture { }; teeworlds = callPackage ../games/teeworlds { };