diff options
Diffstat (limited to 'pkgs')
487 files changed, 8694 insertions, 5754 deletions
diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix new file mode 100644 index 00000000000..842c43fc55b --- /dev/null +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -0,0 +1,200 @@ +{ lib, stdenv, curl, gnugrep, jq, xorg, alsa-lib, freetype, p7zip, autoPatchelfHook, writeShellScript, zlib, libjack2, makeWrapper }: +let + versionForFile = v: builtins.replaceStrings ["."] [""] v; + + mkPianoteq = { name, src, version, archdir, ... }: + stdenv.mkDerivation rec { + inherit src version; + + pname = "pianoteq-${name}"; + + unpackPhase = '' + ${p7zip}/bin/7z x $src + ''; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ + stdenv.cc.cc.lib + xorg.libX11 # libX11.so.6 + xorg.libXext # libXext.so.6 + alsa-lib # libasound.so.2 + freetype # libfreetype.so.6 + ]; + + installPhase = '' + mkdir -p $out/bin + mv -t $out/bin Pianoteq*/${archdir}/* + for f in $out/bin/Pianoteq*; do + if [ -x "$f" ] && [ -f "$f" ]; then + wrapProgram "$f" --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath (buildInputs ++ [ + xorg.libXcursor + xorg.libXinerama + xorg.libXrandr + libjack2 + zlib + ]) + } + fi + done + ''; + + meta = with lib; { + homepage = "https://www.modartt.com/pianoteq"; + description = "Software synthesizer that features real-time MIDI-control of digital physically modeled pianos and related instruments"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; # TODO extract binary according to each platform? + maintainers = [ maintainers.mausch ]; + }; + }; + + fetchWithCurlScript = { name, sha256, script, impureEnvVars ? [] }: + stdenv.mkDerivation { + inherit name; + builder = writeShellScript "builder.sh" '' + source $stdenv/setup + + curlVersion=$(${curl}/bin/curl -V | head -1 | cut -d' ' -f2) + + # Curl flags to handle redirects, not use EPSV, handle cookies for + # servers to need them during redirects, and work on SSL without a + # certificate (this isn't a security problem because we check the + # cryptographic hash of the output anyway). + curl=( + ${curl}/bin/curl + --location + --max-redirs 20 + --retry 3 + --disable-epsv + --cookie-jar cookies + --insecure + --user-agent "curl/$curlVersion Nixpkgs/${lib.trivial.release}" + $NIX_CURL_FLAGS + ) + + ${script} + + ''; + nativeBuildInputs = [ curl ]; + outputHashAlgo = "sha256"; + outputHash = sha256; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ impureEnvVars ++ [ + # This variable allows the user to pass additional options to curl + "NIX_CURL_FLAGS" + ]; + }; + + fetchPianoteqTrial = { name, sha256 }: + fetchWithCurlScript { + inherit name sha256; + script = '' + "''${curl[@]}" --silent --request POST \ + --cookie cookies \ + --header "modartt-json: request" \ + --header "origin: https://www.modartt.com" \ + --header "content-type: application/json; charset=UTF-8" \ + --header "accept: application/json, text/javascript, */*" \ + --data-raw '{"file": "${name}", "get": "url"}' \ + https://www.modartt.com/json/download -o /dev/null + json=$( + "''${curl[@]}" --silent --request POST \ + --cookie cookies \ + --header "modartt-json: request" \ + --header "origin: https://www.modartt.com" \ + --header "content-type: application/json; charset=UTF-8" \ + --header "accept: application/json, text/javascript, */*" \ + --data-raw '{"file": "${name}", "get": "url"}' \ + https://www.modartt.com/json/download + ) + url=$(echo $json | ${jq}/bin/jq -r .url) + "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" + ''; + }; + + fetchPianoteqWithLogin = { name, sha256 }: + fetchWithCurlScript { + inherit name sha256; + + impureEnvVars = [ "NIX_MODARTT_USERNAME" "NIX_MODARTT_PASSWORD" ]; + + script = '' + if [ -z "''${NIX_MODARTT_USERNAME}" -o -z "''${NIX_MODARTT_PASSWORD}" ]; then + echo "Error: Downloading a personal Pianoteq instance requires the nix building process (nix-daemon in multi user mode) to have the NIX_MODARTT_USERNAME and NIX_MODARTT_PASSWORD env vars set." >&2 + exit 1 + fi + + "''${curl[@]}" -s -o /dev/null "https://www.modartt.com/user_area" + + ${jq}/bin/jq -n "{connect: 1, login: \"''${NIX_MODARTT_USERNAME}\", password: \"''${NIX_MODARTT_PASSWORD}\"}" > login.json + + "''${curl[@]}" --silent --request POST \ + --cookie cookies \ + --referer "https://www.modartt.com/user_area" \ + --header "modartt-json: request" \ + --header "origin: https://www.modartt.com" \ + --header "content-type: application/json; charset=UTF-8" \ + --header "accept: application/json, text/javascript, */*" \ + --data @login.json \ + https://www.modartt.com/json/session + + json=$( + "''${curl[@]}" --silent --request POST \ + --cookie cookies \ + --header "modartt-json: request" \ + --header "origin: https://www.modartt.com" \ + --header "content-type: application/json; charset=UTF-8" \ + --header "accept: application/json, text/javascript, */*" \ + --data-raw '{"file": "${name}", "get": "url"}' \ + https://www.modartt.com/json/download + ) + url=$(echo $json | ${jq}/bin/jq -r .url) + + "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" + ''; + }; + +in { + # TODO currently can't install more than one because `lame` clashes + stage-trial = mkPianoteq rec { + name = "stage-trial"; + version = "7.3.0"; + archdir = "x86-64bit"; + src = fetchPianoteqTrial { + name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z"; + sha256 = "12zbr54ng7cb4ngl1qrf5h0gs8c42d6d3j08492xr14m9x9y132k"; + }; + }; + standard-trial = mkPianoteq rec { + name = "standard-trial"; + version = "7.3.0"; + archdir = "x86-64bit"; + src = fetchPianoteqTrial { + name = "pianoteq_linux_trial_v${versionForFile version}.7z"; + sha256 = "04sh45hm3y3y6kfj3p32fi6p95r9fc6xf4r5i74laylms4f6gr6d"; + }; + }; + stage-6 = mkPianoteq rec { + name = "stage-6"; + version = "6.7.3"; + archdir = "amd64"; + src = fetchPianoteqWithLogin { + name = "pianoteq_stage_linux_v${versionForFile version}.7z"; + sha256 = "0jy0hkdynhwv0zhrqkby0hdphgmcc09wxmy74rhg9afm1pzl91jy"; + }; + }; + stage-7 = mkPianoteq rec { + name = "stage-7"; + version = "7.3.0"; + archdir = "x86-64bit"; + src = fetchPianoteqWithLogin { + name = "pianoteq_stage_linux_v${versionForFile version}.7z"; + sha256 = "05w7sv9v38r6ljz9xai816w5z2qqwx88hcfjm241fvgbs54125hx"; + }; + }; + # TODO other paid binaries, I don't own that so I don't know their hash. +} diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 49aa0ba4714..dc030cc708b 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -40,7 +40,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ chromaprint - dateutil + python-dateutil discid fasteners mutagen diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 239b62a4026..66a14fa05b2 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,30 +1,34 @@ -{ lib, stdenv, fetchurl, alsa-lib, gtk2, pkg-config }: +{ lib, stdenv, fetchFromGitHub, pkg-config, wrapGAppsHook, alsa-lib, gtk3, libpulseaudio }: stdenv.mkDerivation rec { pname = "praat"; - version = "6.0.43"; + version = "6.1.50"; - src = fetchurl { - url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "1l13bvnl7sv8v6s5z63201bhzavnj6bnqcj446akippsam13z4sf"; + src = fetchFromGitHub { + owner = "praat"; + repo = "praat"; + rev = "v${version}"; + sha256 = "11cw4292pml71hdnfy8y91blwyh45dyam1ywr09355zk44c5njpq"; }; configurePhase = '' - cp makefiles/makefile.defs.linux.alsa makefile.defs + cp makefiles/makefile.defs.linux.pulse makefile.defs ''; installPhase = '' - mkdir -p $out/bin - cp praat $out/bin + install -Dt $out/bin praat ''; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ alsa-lib gtk2 ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + buildInputs = [ alsa-lib gtk3 libpulseaudio ]; - meta = { + enableParallelBuilding = true; + + meta = with lib; { description = "Doing phonetics by computer"; homepage = "https://www.fon.hum.uva.nl/praat/"; - license = lib.licenses.gpl2Plus; # Has some 3rd-party code in it though - platforms = lib.platforms.linux; + license = licenses.gpl2Plus; # Has some 3rd-party code in it though + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 7b85a242eff..9bcc2ee3b46 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -16,8 +16,6 @@ python3Packages.buildPythonApplication rec { }; patches = [ - # tweak version requirements to what's available in Nixpkgs - ./dependencies.patch # Allow later websockets release, https://github.com/Chia-Network/chia-blockchain/pull/6304 (fetchpatch { name = "later-websockets.patch"; @@ -66,6 +64,16 @@ python3Packages.buildPythonApplication rec { "test_spend_zero_coin" ]; + postPatch = '' + # tweak version requirements to what's available in Nixpkgs + substituteInPlace setup.py \ + --replace "aiohttp==3.7.4" "aiohttp>=3.7.4" \ + --replace "sortedcontainers==2.3.0" "sortedcontainers>=2.3.0" \ + --replace "click==7.1.2" "click>=7.1.2" \ + --replace "clvm_rs==0.1.7" "clvm_rs>=0.1.7" \ + --replace "clvm==0.9.6" "clvm>=0.9.6" \ + ''; + preCheck = '' export HOME=`mktemp -d` ''; diff --git a/pkgs/applications/blockchains/chia/dependencies.patch b/pkgs/applications/blockchains/chia/dependencies.patch deleted file mode 100644 index d9575d1d392..00000000000 --- a/pkgs/applications/blockchains/chia/dependencies.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/setup.py b/setup.py -index c5cf95db..b783a9e6 100644 ---- a/setup.py -+++ b/setup.py -@@ -8,7 +8,7 @@ dependencies = [ - "clvm==0.9.6", - "clvm_rs==0.1.7", - "clvm_tools==0.4.3", -- "aiohttp==3.7.4", # HTTP server for full node rpc -+ "aiohttp==3.7.4.post0", # HTTP server for full node rpc - "aiosqlite==0.17.0", # asyncio wrapper for sqlite, to store blocks - "bitstring==3.1.7", # Binary data management library - "colorlog==5.0.1", # Adds color to logs diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 946cef998c1..8a87889e702 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -640,10 +640,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.8.tar"; - sha256 = "0vkq8dsj6k3gsdhiyg6ccv49fqgjw6f0db4wjsvm5zbkadjvlm86"; + url = "https://elpa.gnu.org/packages/consult-0.9.tar"; + sha256 = "1n3bnvgj92fjd9dai9f95wvyfb20yhaw7b722lkqjg42i10jqzfn"; }; packageRequires = [ emacs ]; meta = { @@ -670,10 +670,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.8.tar"; - sha256 = "1qrrky1g4k5vw56435dgkwnmnri7i51gkydd76as3l0ixm4pnp05"; + url = "https://elpa.gnu.org/packages/corfu-0.9.tar"; + sha256 = "0710bq07j6w6zm49ci1bbx580frdbc62b3hbxwzkwm5204nf78bf"; }; packageRequires = [ emacs ]; meta = { @@ -835,10 +835,10 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/devdocs-0.1.tar"; - sha256 = "1ps2jpp1ckq9839l63p6npqrf85b8zb5akwvjvv7fkm8nvspdkil"; + url = "https://elpa.gnu.org/packages/devdocs-0.2.tar"; + sha256 = "1npc7yra7pvf86ahmz1h7hnjxrz15ar1vjcalg4ilizypycpgrwj"; }; packageRequires = [ emacs ]; meta = { @@ -1015,10 +1015,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.23"; + version = "0.6.24"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.23.tar"; - sha256 = "0j3jvy9s606qjqcmcjzgck3dp8bhpgly2g00wnswzcgk4makdzld"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.24.tar"; + sha256 = "0156rh6fkv2yp509h6i8qzh4gsda2mcmfrxl4r6ywn1z5ahijc3r"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -1075,10 +1075,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20210607"; + version = "20210618"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20210607.tar"; - sha256 = "0avd58m8630s4d3ys9g84csscdmf2y1swwwkgzjkrrq8q0j5yd3l"; + url = "https://elpa.gnu.org/packages/eev-20210618.tar"; + sha256 = "13sb9shpj9fhns8sl3dxdgnn8z4wf14mgi4s87k5x4nrr012sscf"; }; packageRequires = [ emacs ]; meta = { @@ -1198,10 +1198,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "7.2"; + version = "7.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-7.2.tar"; - sha256 = "11vqqh9rnzibsfw7wx62rgzl8i8ldpf0hv1sj43nhl5c6dlc8d5z"; + url = "https://elpa.gnu.org/packages/emms-7.5.tar"; + sha256 = "0d7nsx2idzbp6d5im5rrsnwppbr2cimvxgx31bhwsm2aq3ya5v2j"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -1867,10 +1867,10 @@ elpaBuild { pname = "ivy-posframe"; ename = "ivy-posframe"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.0.tar"; - sha256 = "07dzglrcdl54lkznyphw97xwd9bcwzdcgzkav0vqfk7f5cwh1wkf"; + url = "https://elpa.gnu.org/packages/ivy-posframe-0.6.1.tar"; + sha256 = "1nay2sfbwm2fkp3f1y89innd9h6j3q70q9y4yddrwa69cxlj9m23"; }; packageRequires = [ emacs ivy posframe ]; meta = { @@ -2017,10 +2017,10 @@ elpaBuild { pname = "leaf"; ename = "leaf"; - version = "4.4.8"; + version = "4.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/leaf-4.4.8.tar"; - sha256 = "0h0ksmgrhn29ci6z8y54dbbzcqlvfs1ra0kmf226gz0dqzk45vb3"; + url = "https://elpa.gnu.org/packages/leaf-4.5.2.tar"; + sha256 = "0i90shhhkpdcwmfi8zv0008qgmg4g3cqd2yvpycfv9n2axvhag54"; }; packageRequires = [ emacs ]; meta = { @@ -2152,10 +2152,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.6.tar"; - sha256 = "05pwaz9643shxnv63l6r9m2c0qf1nc1hy6jiqw01bkvvgg8g4jag"; + url = "https://elpa.gnu.org/packages/marginalia-0.7.tar"; + sha256 = "1nz55nx6xp72nahs4g6asl5y5yrlnlnza58bjrlwwzmwsf7daz18"; }; packageRequires = [ emacs ]; meta = { @@ -2829,10 +2829,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.0.3.tar"; - sha256 = "0c3lnrydsysv8j25brgc0cckf1hz54yhkginncmw81y1ia43rqmx"; + url = "https://elpa.gnu.org/packages/posframe-1.0.4.tar"; + sha256 = "0i2pw90gw9zb22gj8yyvcp3b2k1bxxhbjj0idvr5iz1vd9023bc6"; }; packageRequires = [ emacs ]; meta = { @@ -2889,10 +2889,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "3.7.9"; + version = "3.8.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-3.7.9.tar"; - sha256 = "00ff1izdwcy53dcwpdn18wwndnw2jsw4bhg8gkqaa60xm468xzkl"; + url = "https://elpa.gnu.org/packages/pyim-3.8.2.tar"; + sha256 = "05sgciqb0hzy07j8pvbg7h2vpa9z5z60m6pknxd3b1kpi45vaihw"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3355,10 +3355,10 @@ elpaBuild { pname = "setup"; ename = "setup"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/setup-0.2.0.tar"; - sha256 = "1xhjkyksilw1vbx12a4yz4bpj0dhl3m02yi8d9nyd19z098cfa9y"; + url = "https://elpa.gnu.org/packages/setup-0.2.1.tar"; + sha256 = "15paand086g33w2vb6jkyxd3i2pmpp84f31y3j5v8w9ia68pjzms"; }; packageRequires = [ emacs ]; meta = { @@ -3595,10 +3595,10 @@ elpaBuild { pname = "sql-indent"; ename = "sql-indent"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sql-indent-1.5.tar"; - sha256 = "07k5rn9hbxppnka7nq0a3a6zyqqa1hp8j6qrb344js6zyak0cb63"; + url = "https://elpa.gnu.org/packages/sql-indent-1.6.tar"; + sha256 = "000pimlg0k4mrv2wpqq8w8l51wpr1lzlaq6ai8iaximm2a92ap5b"; }; packageRequires = [ cl-lib ]; meta = { @@ -3610,10 +3610,10 @@ elpaBuild { pname = "ssh-deploy"; ename = "ssh-deploy"; - version = "3.1.12"; + version = "3.1.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.12.tar"; - sha256 = "0fz49l63jfw9zy459f07bq2irdb8ispnx8m2c3wxwiim9yw5xnjg"; + url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.13.tar"; + sha256 = "006jr8yc5qvxdfk0pn40604a2b7a1ah6l6hi6rhxm3p5b08d9i5w"; }; packageRequires = [ emacs ]; meta = { @@ -3779,10 +3779,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.0.5"; + version = "2.5.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.0.5.tar"; - sha256 = "1dclxffynfacvwi2scpda35sxjb42603yyf2p0477qa9b0i4xha0"; + url = "https://elpa.gnu.org/packages/tramp-2.5.1.tar"; + sha256 = "1r7wifhzy2ipdlc4fqnx6549fnx45ggz57wh0cp7s6y25761si7q"; }; packageRequires = [ emacs ]; meta = { @@ -3824,10 +3824,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.3.4"; + version = "0.3.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.3.4.tar"; - sha256 = "1m71w52cr8f9wm6lybfa003w408lkrl6q9whs53hpp3pl5phhfvb"; + url = "https://elpa.gnu.org/packages/transient-0.3.5.tar"; + sha256 = "15dlj21gn0zxywic9wdcp5zc8skm1s170bq7smgkpd3p3lxslf68"; }; packageRequires = [ emacs ]; meta = { @@ -3949,6 +3949,21 @@ license = lib.licenses.free; }; }) {}; + vc-hgcmd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "vc-hgcmd"; + ename = "vc-hgcmd"; + version = "1.14"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/vc-hgcmd-1.14.tar"; + sha256 = "0pg6fg0znsmky3iwdpxn2sx5bbn72kw83s077000ilawi6zqwc2d"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/vc-hgcmd.html"; + license = lib.licenses.free; + }; + }) {}; vcard = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "vcard"; @@ -4015,10 +4030,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.11.tar"; - sha256 = "0hzwddkac85i449173az8crlksj9ivrqf969r81kbr45ksgr1ij6"; + url = "https://elpa.gnu.org/packages/vertico-0.12.tar"; + sha256 = "14qlc438bysg23wfj04zpvpraqzzi4jlz3r11vc56vd0k2hfmvmn"; }; packageRequires = [ emacs ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix index b70032982c0..e5f6f1aa7c9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210607"; + version = "20210628"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210607.tar"; - sha256 = "178z9bnzcdaymnwxf0kkw1yzlzkj5dmdjjwdklc9qb9iv6rckfji"; + url = "https://orgmode.org/elpa/org-20210628.tar"; + sha256 = "1sn2yyynndk8qf43ss8bayll33r4ina8xfx4ywzcs3m1lm6xy1zl"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210607"; + version = "20210628"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210607.tar"; - sha256 = "03liivgfcmp0lh6p57bh2gyn85n3sc4p91y374kq8kzc7fzrgzyr"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210628.tar"; + sha256 = "0r4kxp1hbhkwvi7939fglng8db4h4n7vigy8pd2gia3a02xcw8l5"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 1429040e415..86d117b8956 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -25,26 +25,26 @@ }, { "ename": "0x0", - "commit": "a48b10b770038efc606fbbbedf79178d3b05186c", - "sha256": "1nkc5hfz77s37a1rp8m69f7zbk05jc1y1fcj0b46h9khyz6zbm01", + "commit": "982788433004ba644a372c50130613e3c56bba10", + "sha256": "0447s6jq57g0p5myb295930wyqk7q5qj00r8qi3l39670xsgbqdl", "fetcher": "git", - "url": "https://git.sr.ht/~zge/nullpointer-emacs", + "url": "https://git.sr.ht/~pkal/nullpointer-emacs", "unstable": { "version": [ - 20210512, - 1001 + 20210628, + 1207 ], - "commit": "655846fd3ce772950d30167b4b9be6ce64502ae7", - "sha256": "0y4v72pmjjly2kxrrwks2z35qbc76109pnqpj637fpjr190c468l" + "commit": "a613afa08271a75551a4d2165b4ab872b131edc0", + "sha256": "1ngaq8ldyv9h0g5c83y4g5z1a19z4k90dha5y4g7v3lpzmqx4jgn" }, "stable": { "version": [ 0, 4, - 2 + 3 ], - "commit": "655846fd3ce772950d30167b4b9be6ce64502ae7", - "sha256": "0y4v72pmjjly2kxrrwks2z35qbc76109pnqpj637fpjr190c468l" + "commit": "ab3e213607e6349aecc0063332972ac40506edd9", + "sha256": "1aywyarjl8fghy5py05rd64sidhkla0xzks1596p1gwpk5pm7n0n" } }, { @@ -741,10 +741,10 @@ }, { "ename": "ac-html", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "1vidmvylwwvraf8k63dvxv47ism49n6pp0f38l5rl4iaznhkdr84", + "commit": "28430d3db6e21cec8b138ef09320aeed711e58f9", + "sha256": "1fhrvww7sds90b4ka16sp79pjbjwrrl6ycp65pfc4b2cg1bq1w7m", "fetcher": "github", - "repo": "zhangkaiyulw/ac-html", + "repo": "victorteokw/ac-html", "unstable": { "version": [ 20151005, @@ -1029,8 +1029,8 @@ "auto-complete", "yasnippet" ], - "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", - "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" + "commit": "8a0dc9888de87ea3aace06628bff52ed32f3ca2b", + "sha256": "1xcsm72by6jiqr9y9fyk70nshsj5dj494faz9734m67fmxq45pfj" }, "stable": { "version": [ @@ -1055,8 +1055,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20210218, - 559 + 20210617, + 949 ], "deps": [ "dash", @@ -1066,8 +1066,8 @@ "s", "xcscope" ], - "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", - "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" + "commit": "8a0dc9888de87ea3aace06628bff52ed32f3ca2b", + "sha256": "1xcsm72by6jiqr9y9fyk70nshsj5dj494faz9734m67fmxq45pfj" }, "stable": { "version": [ @@ -1133,8 +1133,8 @@ "auto-complete", "rtags" ], - "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", - "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" + "commit": "65113e2a137baa9f85dc2157b893291470788dc4", + "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" }, "stable": { "version": [ @@ -1507,14 +1507,14 @@ "repo": "mrkkrp/ace-popup-menu", "unstable": { "version": [ - 20210318, - 1748 + 20210608, + 839 ], "deps": [ "avy-menu" ], - "commit": "9a2056c53faba0bd7b7f44fb3faabf4d34b8497f", - "sha256": "0i7a708y9x4xdny3ccqwngn4la5vg0539c7qk87d163gl61mbk7k" + "commit": "594a305704be8ca0ef79a12b787bdb59bc6077c0", + "sha256": "1ykpb4l29iw5bxmip9cn6irgiak2hwb79kg1k5m32wc9p6b4kbjf" }, "stable": { "version": [ @@ -1929,30 +1929,28 @@ "repo": "agda/agda", "unstable": { "version": [ - 20210505, - 1142 + 20210619, + 545 ], "deps": [ "annotation", "eri" ], - "commit": "044843c5281a7bdb9479317793a75c8c0fcfadd9", - "sha256": "04lirb2p1h46c1l84ysdnr2jxvzsdw1zv6jhm7h8ybgzmaa65b6m" + "commit": "007a26fb5f7d9eb54db16484fb116d6e47c8cc5e", + "sha256": "1w9pra3qqmidsf5mvp0lmk9liw1ryaf8kjiawfgyyc6mzgw6nrvz" }, "stable": { "version": [ 2, 6, - 1, - 3, - 20210605 + 2 ], "deps": [ "annotation", "eri" ], - "commit": "ab805592a0ae7066fbd5fa5f47e933194fce878f", - "sha256": "19ld12x4is0nx52i05zv20js0zysx3bljbdn2nr65vy11dq2cyyp" + "commit": "246a229faea2ef2fa53caf491ff8a2d72dd7510c", + "sha256": "1ccmryw6vs8d87d5zmjl0kr2kvyd1zxl73344fa7yzqgg2kw1da6" } }, { @@ -2323,8 +2321,8 @@ "deps": [ "flycheck" ], - "commit": "df5664e71c1026af4aaf69e6b227d427a728e7c6", - "sha256": "1czy3sbwm6lfrgdbj0y12q4n70w6zg8g3y27iz1zr4y20hhcp2zk" + "commit": "bf859fdb80a46c6d0d9fd8f8540a8ae96d5c1016", + "sha256": "1bp3q84alqwkglifhwc5kcrb2dc22kjd3l0h9r0bh1klz70sjss4" }, "stable": { "version": [ @@ -2451,14 +2449,25 @@ "repo": "wyuenho/all-the-icons-dired", "unstable": { "version": [ - 20210422, - 921 + 20210614, + 1350 ], "deps": [ "all-the-icons" ], - "commit": "a294f45ec2c338e1255ae2dd98b19f3f143204e6", - "sha256": "1m3gqsgybx57qhdlswbn92cnsz9w10sqfzs2lnja63hzwzwxjg92" + "commit": "a758766878b6e8b9eaaf41d68599a2df99e37f48", + "sha256": "1shla7nyhml9m3g81p6yy8k4pdq289gb42900xzfp7zl4qvnm2vy" + }, + "stable": { + "version": [ + 2, + 0 + ], + "deps": [ + "all-the-icons" + ], + "commit": "a758766878b6e8b9eaaf41d68599a2df99e37f48", + "sha256": "1shla7nyhml9m3g81p6yy8k4pdq289gb42900xzfp7zl4qvnm2vy" } }, { @@ -2550,28 +2559,28 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20210605, - 1700 + 20210626, + 1956 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "e0eba9cb8f8c85c0b63434f6117f9fa232d8a890", - "sha256": "05a53s7v1vy688gwnn01p3flqlhznp2m0k1mg8ax4hjygyc05l8q" + "commit": "07b8c5271719afa6a4c598c2a19f4a096ca6efe8", + "sha256": "1blr46w08s9f3wrcarqds09is9akdsq8faghshby5fnk9s5srkq3" }, "stable": { "version": [ 1, - 5, - 1 + 6, + 2 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "0138c7e7f3b7a6c09665e45a6dd2168359efd47c", - "sha256": "0nbbkasbklxf62rx9mc5w37r014vdbbg3vm5dy03hxzvq3y1yrpn" + "commit": "07b8c5271719afa6a4c598c2a19f4a096ca6efe8", + "sha256": "1blr46w08s9f3wrcarqds09is9akdsq8faghshby5fnk9s5srkq3" } }, { @@ -3150,11 +3159,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20210519, - 1401 + 20210620, + 751 ], - "commit": "b22f594f3b813b12e442860344d2feb39d944b53", - "sha256": "1911j82vw8pp58byc41v2fhbjvr3l9rdjqa46gs757xssh0g8jal" + "commit": "9aba6305fef54f32b085a56ce2b843b3d8194ac2", + "sha256": "1n2pgvc4fw8r22ck2r3jmkrrh1vlwv1r35ljy5g3b95zjh11w7g4" }, "stable": { "version": [ @@ -3192,19 +3201,17 @@ 20200914, 644 ], - "commit": "044843c5281a7bdb9479317793a75c8c0fcfadd9", - "sha256": "04lirb2p1h46c1l84ysdnr2jxvzsdw1zv6jhm7h8ybgzmaa65b6m" + "commit": "007a26fb5f7d9eb54db16484fb116d6e47c8cc5e", + "sha256": "1w9pra3qqmidsf5mvp0lmk9liw1ryaf8kjiawfgyyc6mzgw6nrvz" }, "stable": { "version": [ 2, 6, - 1, - 3, - 20210605 + 2 ], - "commit": "ab805592a0ae7066fbd5fa5f47e933194fce878f", - "sha256": "19ld12x4is0nx52i05zv20js0zysx3bljbdn2nr65vy11dq2cyyp" + "commit": "246a229faea2ef2fa53caf491ff8a2d72dd7510c", + "sha256": "1ccmryw6vs8d87d5zmjl0kr2kvyd1zxl73344fa7yzqgg2kw1da6" } }, { @@ -4517,30 +4524,6 @@ } }, { - "ename": "auth-source-pass", - "commit": "6e63342b442794ead4d8bed803b0924d9cd26dc4", - "sha256": "10l3kbffy08fh0krwvh4gn75k37criv2ma5hgkadvq1s2p5ps8r6", - "fetcher": "github", - "repo": "DamienCassou/auth-source-pass", - "unstable": { - "version": [ - 20210210, - 1908 - ], - "commit": "fa8b964494c1ef42035fad340ff5f29fcdbed21c", - "sha256": "0fn30iy1jy0kh09652a0fn7zg93cf3xvs2bz28lml7knj2hbqi2r" - }, - "stable": { - "version": [ - 5, - 0, - 0 - ], - "commit": "df074612114c3cc2fa1c3023f26ff182f9b1190a", - "sha256": "0qnqqdpbfr06nqw4hq7c1s7yh7zyrv4gqjj06v70cavjml7pagp6" - } - }, - { "ename": "auth-source-xoauth2", "commit": "8ba0273c8aa2a50b9dc9b8312b860d94dfd808d5", "sha256": "0g06240ix4gzw3fb74jcadiq7nissi20i1vsbzhkx35j10mv7wn3", @@ -4605,14 +4588,14 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20210518, - 1020 + 20210615, + 1457 ], "deps": [ "packed" ], - "commit": "3af0b02393ca4f207f1e454161f7bd8a747f3051", - "sha256": "1h2iv14ppj5pqbnb7z7xvw1jm3cmis10jpqnd6miax1s6jlm8z0r" + "commit": "0f3afc6b057f9c9a3b60966f36e34cb46008cf61", + "sha256": "0grb9y7v7ibbcjv1yhssnavz43cij16ys5c68my8mv12wg5ld86z" }, "stable": { "version": [ @@ -4964,19 +4947,22 @@ "repo": "jcs-elpa/auto-highlight-symbol", "unstable": { "version": [ - 20210108, - 1841 + 20210629, + 1535 ], - "commit": "5ad84d0a12b175360b18504cd04e6bf7ab1cf5c8", - "sha256": "0dpsqzl6nn08kg9d42a6zpk7jq6621c0hzf28c1ary4vzcwm4j9v" + "deps": [ + "ht" + ], + "commit": "45c472cf72df1d477550dcc07e556047b2fc5852", + "sha256": "1xbkcpidmzlbv3qs8r9i880pbkf7w78xagh85nvcrv965ra66k6c" }, "stable": { "version": [ 1, - 59 + 60 ], - "commit": "0982390f19fee3c05856b9e4e40056dce4c4020d", - "sha256": "1vvk0vp61y63rjhfxk5ajs0m4p36pvbwb97sw66zdlrq5h33lmv9" + "commit": "d5125800b038d1275aabd14008ede75a3a858587", + "sha256": "1mi4mayfavkfm9fkg1j1wcv6kvb2cfgf5nr5kk15jhy7x1ajwphp" } }, { @@ -5111,11 +5097,11 @@ "repo": "jcs-elpa/auto-rename-tag", "unstable": { "version": [ - 20210418, - 1758 + 20210629, + 1537 ], - "commit": "8dbf13b344f6d5eba5c4876b18905d30b3118bb9", - "sha256": "1nlwg78d60w6xjpqhrc49nxxvjaxj07wb036rb5jsng9yb6r94m9" + "commit": "ac7b7183c5e84da110e2f4850c5d8bc5325d058a", + "sha256": "1hzh6ajccmkc2p5kcbl7vjh16rdh4nw3kmncw8ca32ij3l01rmb1" }, "stable": { "version": [ @@ -5313,10 +5299,10 @@ }, { "ename": "autocrypt", - "commit": "c5aac210984709f020f96f3ca166185900accddf", - "sha256": "1y5p5n2p2qk638i1as3wbfz82r08jv4q91470xz9r1gkdnn1xyx8", + "commit": "982788433004ba644a372c50130613e3c56bba10", + "sha256": "0ngdxqski3q4mqsrw8h07mkm58kwrvpxvclgyhq2jypvcvlb7abg", "fetcher": "git", - "url": "https://git.sr.ht/~zge/autocrypt", + "url": "https://git.sr.ht/~pkal/autocrypt", "unstable": { "version": [ 20210412, @@ -5325,8 +5311,8 @@ "deps": [ "cl-generic" ], - "commit": "5b55f8d37545e9c441788627c17e350d7edf4055", - "sha256": "0b06xnjkgwjpxl96mdi674pmvdaiwncifi1a30wxhl1dwr7kr084" + "commit": "1dc4e5983382093fc74c81d84a45cd2b53adfd90", + "sha256": "0r99h100v43i7wr2c1jqgyzixlc1y973swwfa9cfmnaxck3ibk93" } }, { @@ -5530,8 +5516,8 @@ "avy", "embark" ], - "commit": "ef609bf15368a68c4eb3c46fd8cc1bb623b6b83e", - "sha256": "0ddh7zqgaq07534l6m3wjvbcj23a01h3x7scd4pl5rj6wyxqwv76" + "commit": "acbe1cba548832d295449da348719f69b9685c6f", + "sha256": "0c1zqfrn2va2m9z6rw3i2h6dwm2vc0asbha4d9r0gss4b7519pf2" }, "stable": { "version": [ @@ -5771,19 +5757,19 @@ "repo": "juergenhoetzel/babel", "unstable": { "version": [ - 20210520, - 501 + 20210612, + 640 ], - "commit": "1f68c175e8a3223f37858167239051e9ab9e540c", - "sha256": "1b13pfxabfcl8p3j6bw6c5m2njzignab4p6fzxfmfpsvrq5yjzfz" + "commit": "946e69c61188bc41793402ac48466d8967ddb43d", + "sha256": "0drqcvkak677r2bc8jr0bp0qv3x2iw5cvlma6ir2blgm1d3q2bg3" }, "stable": { "version": [ 1, - 4 + 7 ], - "commit": "65b55ad89017c9b3a1c8c241ac4b4541eabdaf5f", - "sha256": "0px1xggk6qyrwkma1p3d7b4z2id2gbrsxkliw3nwc1q4zndg1zr7" + "commit": "a6028ec6780f22b5b15c4458d968f7b49be3974b", + "sha256": "1vbhmrgcbrqj079g40w43xya4yc38ddhfn6wrd75s77qzmhrczll" } }, { @@ -6115,11 +6101,11 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20201011, - 916 + 20210615, + 1601 ], - "commit": "65e54c6f9c0ffebf94f7c505694bd249b9b53d32", - "sha256": "0aj110pmx6f11flmyk8ryj4mghjay2wbix945wisrlydlnl9jmmc" + "commit": "d9c97b741db389ceb127b0f0180b2087cb24d0ef", + "sha256": "15m7gbwq1lmca2rlfb2ik86ibmvjnj58yajbp5d23xn03qqd6x6c" }, "stable": { "version": [ @@ -6987,8 +6973,8 @@ "a", "pdf-tools" ], - "commit": "246120647e28a27506ca0894ba98e371086881fd", - "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" + "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", + "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" } }, { @@ -7036,14 +7022,14 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20210607, - 1230 + 20210625, + 1718 ], "deps": [ "bibtex-completion" ], - "commit": "07a3c64b12673b722a21c932eb85c595dea0c863", - "sha256": "0afnb0aa3msnvg2p4pjdcliccsfhaa7pp7bx76h3sfvv4648kki5" + "commit": "ee09acded11c160001e60c47de700e5fee6e9426", + "sha256": "0i4476gydsyandyb3r53hk8izx9jpmg03ny8f4glxcvlsm1ysvzf" }, "stable": { "version": [ @@ -7119,11 +7105,11 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20201028, - 1854 + 20210615, + 1459 ], - "commit": "e3fbc0737bb5f891e4d57d048bbc1fe17401f17f", - "sha256": "1jgrnd3yxaqgd3rxls41xxzfaq9hkmjk9wbdg06ak9h5xw4fi17j" + "commit": "2f0d6fbe0e363a0ed1f878316d1c0d7c1d6e1082", + "sha256": "1zlbz5kkqz4r3a2d5y563s1isbs1328kjjrfmn69gwd6w2zi5pii" }, "stable": { "version": [ @@ -7490,8 +7476,8 @@ 20200404, 1550 ], - "commit": "d99ab1aad84e4bd2bd4a499877764c213cce50ff", - "sha256": "0ay49ars61vr43n4bd3k4n1w89ilmw7d8s53ifixgw0vvjkz74z1" + "commit": "8f7cd388abccdf25baeca99c07ef2dfe264e8f2f", + "sha256": "16c4scmc7csb34c237m04fc2w252lvqiwjcz65bjmf077g1ipd7q" }, "stable": { "version": [ @@ -7963,15 +7949,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20210530, - 1158 + 20210618, + 2112 ], "deps": [ "epkg", "magit" ], - "commit": "e2263534e16ed8bbc935ee466f6ad2acbe9c603e", - "sha256": "169sdgi476hnxxv0s9qfi8cply9q7gb8i1hli4i74ynlrhc9wfq7" + "commit": "6ea061f30065493e206132ff3f7a2d8febb859d0", + "sha256": "0m7c512r789pbx2qgzx1zgbr2w4y6ma8l7zhvslji57hzhcvj10y" }, "stable": { "version": [ @@ -8570,16 +8556,16 @@ "repo": "countvajhula/buffer-ring", "unstable": { "version": [ - 20210529, - 2059 + 20210624, + 1642 ], "deps": [ "dynaring", "ht", "s" ], - "commit": "30572b4d8fff519c4996078a5ad743583fb22b0e", - "sha256": "1xg6kbjj4fccsr5awnh3ba9x33qznnala3kmnfwpmj94rd72whiy" + "commit": "4a226bc410ec7b5b0323879b03aad73be1b69728", + "sha256": "02l4wh4qykbk58cda8l3cyg4lpf5zjr0ss4927ac48nlxnawcrsa" }, "stable": { "version": [ @@ -8925,14 +8911,14 @@ "repo": "alphapapa/burly.el", "unstable": { "version": [ - 20201211, - 58 + 20210621, + 845 ], "deps": [ "map" ], - "commit": "291c2b34eee255f64c0fd889b67dc11a3b69ef12", - "sha256": "0a9k47xn9fhhw6rl73gri2ykzag5c68drfc7c4r0f1nqp61smkkv" + "commit": "c6d6aaeded0ef892af307652503de21db2a2a5b3", + "sha256": "1ic6qgmcj4l7a4775wwz45qwadj4ha4z3v2qlr4s54hzzldwc9w7" }, "stable": { "version": [ @@ -9202,11 +9188,11 @@ "repo": "lassik/emacs-c-eval", "unstable": { "version": [ - 20210603, - 1716 + 20210611, + 705 ], - "commit": "f79be8354a3c01fddbf38b731aa8934421cef22f", - "sha256": "1qpi5j2h9q4khp3kbk4ybsg4mp2cp5kws5fz7bjpxz4iz0s8mbx7" + "commit": "fd129bfcb75475ac6820cc33862bd8efb8097fae", + "sha256": "1xfgjc0j8ck03278n014mvf768m68knyawrc3lmybr2gj04b4cz9" } }, { @@ -9426,20 +9412,20 @@ "repo": "unhammer/calendar-norway.el", "unstable": { "version": [ - 20180906, - 1502 + 20210608, + 1136 ], - "commit": "8d1fda8268caa74ba5e712c7675ed3c34e46e2d4", - "sha256": "011c8pz1g805a7c3djai39yasd2idfp4c2dcrvf7kbls27ayrl6d" + "commit": "4dd8c38ef30ad45931c8ae7bcdfd720c3fcffffc", + "sha256": "02xf57dincpn7km1f3c9dnq2qv6lk07m9z5hilm3nnns0wwzqdyw" }, "stable": { "version": [ 0, 9, - 4 + 5 ], - "commit": "8d1fda8268caa74ba5e712c7675ed3c34e46e2d4", - "sha256": "011c8pz1g805a7c3djai39yasd2idfp4c2dcrvf7kbls27ayrl6d" + "commit": "4dd8c38ef30ad45931c8ae7bcdfd720c3fcffffc", + "sha256": "02xf57dincpn7km1f3c9dnq2qv6lk07m9z5hilm3nnns0wwzqdyw" } }, { @@ -9785,14 +9771,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20210422, - 657 + 20210615, + 1543 ], "deps": [ "markdown-mode" ], - "commit": "0174599fd1c1b429042c7ca67c3d45f07441a43d", - "sha256": "0qm6cgzsr86s1rcvqpv8x5b3r1v7nq7z8il8ci4vlw9hk0wg65a2" + "commit": "1dd9771853b4327ed161232b65520c13ffe3c0c6", + "sha256": "12pwlww471s6n4vy367m3z8gscxpapi7q6sz5siyis9vjwz3ql2y" }, "stable": { "version": [ @@ -9894,8 +9880,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210528, - 1605 + 20210621, + 1830 ], "deps": [ "ansi", @@ -9906,8 +9892,8 @@ "s", "shut-up" ], - "commit": "daee4bec9c7d96a165366f7edeaa4616837bf432", - "sha256": "062hsgb4315wvydygvygjywi4wp8xri3h0gj4n5dmy884578hhjl" + "commit": "9fbc15dfe8b0739082e7bbff65f226dfe74ac9dd", + "sha256": "16pc37b6qaaar8gb4b6rzx7bwdj1lamg34a0nlqw6bkp0wzv1d4v" }, "stable": { "version": [ @@ -10165,11 +10151,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20201016, - 1659 + 20210621, + 654 ], - "commit": "adf96bab0bbf28f65c882c0874f1c14fdb216bd8", - "sha256": "010sljis51q31l2irhmr4k3i80f6vnzxf8k09p6k7b91jcby3nf5" + "commit": "720f9145d88b3e54b5388742c8a1a2b963d74581", + "sha256": "1mgjw93b5mag1ivvxsm416nkvappi4rkddpjlpjcvqw7lwzgps3d" }, "stable": { "version": [ @@ -10423,17 +10409,17 @@ 20171115, 2108 ], - "commit": "35b67c8380bb284c9c59914d967ee157a62311b8", - "sha256": "1579n0m13l7ghw5g4b0iffrcvgsh5pk3abk29rrskq736i0h007s" + "commit": "3a5929f70b2b258e4786f86383edee6db76bd5a7", + "sha256": "05a004z6lxafi9x16br3hhflv7dr1ndlgqrfsb88rjm17w6afpc3" }, "stable": { "version": [ 3, - 17, + 18, 0 ], - "commit": "68302fb6a977b11238c91ad9a2b5cb52e6294561", - "sha256": "0y8knkrxhj8w2pvz3wjf36q4lpcbv89h2ha8ha1248mfgqmh3wjr" + "commit": "b2e902351f51f30b46836494ae9cc1b38b3c6cf5", + "sha256": "1lm791bv829p4yjy95lw673g1l9cihg0akan6qxyjg7x219l7dgy" } }, { @@ -10542,16 +10528,16 @@ "repo": "Alexander-Miller/cfrs", "unstable": { "version": [ - 20210529, - 1123 + 20210609, + 1805 ], "deps": [ "dash", "posframe", "s" ], - "commit": "e16a01012545d378150432fa10684a2a7d1cc2d1", - "sha256": "1pj0l0jqgx3bixklllppgm6pwyfd0dc1ik5cs9x1azb1qdgf8kjs" + "commit": "2cb7f1cbf9292b0efe167ef372cfb5a7600564eb", + "sha256": "1y75mijqchkzhq185961clyl2idj22kz0a1gp69y29qhhfvs43yk" }, "stable": { "version": [ @@ -11055,16 +11041,16 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210603, - 1656 + 20210622, + 44 ], "deps": [ "dash", "seq", "ts" ], - "commit": "5c5b7fc5e72e2322af2cac14745c7adaab1d56cf", - "sha256": "104n79hj8649h90g8kh3i4rfyk1alq0skpjv8jjpbz0cybhp7n53" + "commit": "e7561cf0bb6cbe129edec7f3e15265c985e6e117", + "sha256": "1x8jb65pmzw3218skqmgn95bvl5wx02yghp5wmn1gd4xdhran2qc" }, "stable": { "version": [ @@ -11121,14 +11107,14 @@ "url": "https://tildegit.org/contrapunctus/chronometrist.git", "unstable": { "version": [ - 20210603, - 1656 + 20210617, + 1707 ], "deps": [ "chronometrist" ], - "commit": "5c5b7fc5e72e2322af2cac14745c7adaab1d56cf", - "sha256": "104n79hj8649h90g8kh3i4rfyk1alq0skpjv8jjpbz0cybhp7n53" + "commit": "e7561cf0bb6cbe129edec7f3e15265c985e6e117", + "sha256": "1x8jb65pmzw3218skqmgn95bvl5wx02yghp5wmn1gd4xdhran2qc" }, "stable": { "version": [ @@ -11199,8 +11185,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210524, - 832 + 20210625, + 1100 ], "deps": [ "clojure-mode", @@ -11211,8 +11197,8 @@ "sesman", "spinner" ], - "commit": "8f51546c0efb36226c4bae7d65465b0e0aa8c06f", - "sha256": "0bn1k34a0dr85c0jj3cb3w8afbhb5iy7whdddkfpa5fkrhc77acf" + "commit": "af140ced2286ff646471b067b94c2b18d42616df", + "sha256": "0nwh1pi31jrhxjxy7q92hpis5lf1k6f6l6k5vdb0y2lfsd7acqii" }, "stable": { "version": [ @@ -11403,14 +11389,14 @@ "repo": "jorgenschaefer/circe", "unstable": { "version": [ - 20210601, - 801 + 20210614, + 912 ], "deps": [ "cl-lib" ], - "commit": "c0b2f997b3b73640d635ee84627bb8cf36c9adfe", - "sha256": "1kjfch0fhq67iivad56s071c8qlsssdsdg83h5v9iz2x4jipm0wa" + "commit": "d6f1fa18646f6ed2a1c0f06a4888130bd694ff19", + "sha256": "1l6v02aa072jvhq4b9dpkprqs14py0d4jm3xvihm05lvrbf9v6c6" }, "stable": { "version": [ @@ -11552,6 +11538,21 @@ } }, { + "ename": "citre", + "commit": "a11fd12ba99427246c17c178ef9277fc2d2e2eed", + "sha256": "0nbyb0n0f1f11lnyv9wxy2d1vmz5vg5w18dln2vlwcjh2a6n3jz9", + "fetcher": "github", + "repo": "universal-ctags/citre", + "unstable": { + "version": [ + 20210701, + 1448 + ], + "commit": "01ed8539e8068f1e1ff658ab4b1931d9b7907809", + "sha256": "1ihxy871wqdpy3ri77kl1wwd21bnl484x343z9xvggl9z6dz8pw4" + } + }, + { "ename": "cl-format", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "09jwy0fgaz2f04dvcdns6w859s6izvrkp8ib4lws3x8kx8z918fy", @@ -11629,26 +11630,26 @@ }, { "ename": "clang-capf", - "commit": "c47e1fd9d5a4b85f08676742a9b36b74a2ac8fb6", - "sha256": "11qfh8c2kjcy715yyp0sywla74z92qn5j1z9wp4fv5p45w6b6112", + "commit": "982788433004ba644a372c50130613e3c56bba10", + "sha256": "0xng53wrvmmcl3pq1ap9ddnqrfwmhqwcwli7xnf7a5dqlx6dxj7h", "fetcher": "git", - "url": "https://git.sr.ht/~zge/clang-capf", + "url": "https://git.sr.ht/~pkal/clang-capf", "unstable": { "version": [ - 20201205, - 1229 + 20210625, + 1107 ], - "commit": "6d0fcae75044d930e989903673b6ab22d0401418", - "sha256": "12kcb26vk0x20nkwsqw7fk2mlzd64dbh02wz7bpdr3r74iygsapf" + "commit": "e422f339395aac6d023954880d19bc76a0d1072d", + "sha256": "1gdd674m1vbl8acwsgx6qfmx1gr7h8a6yadzp1jjaandpmc9jlrf" }, "stable": { "version": [ 1, 2, - 0 + 1 ], - "commit": "630ab057ed614d142ac08bb3a44a869a81cb591a", - "sha256": "0xrxk4b903ayymrngf2swk8d7ic8np1dy8zp9hg3wjlibsmagak0" + "commit": "e422f339395aac6d023954880d19bc76a0d1072d", + "sha256": "1gdd674m1vbl8acwsgx6qfmx1gr7h8a6yadzp1jjaandpmc9jlrf" } }, { @@ -11925,8 +11926,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20210518, - 1305 + 20210628, + 1154 ], "deps": [ "cider", @@ -11939,8 +11940,8 @@ "seq", "yasnippet" ], - "commit": "ae2f6344eaf66c872ebc4a87a389f34434ad7a3d", - "sha256": "064pnj9wyhfx02cczmp9ah00ng5v9ps7mhn6mbs6vldv9cfrsvr7" + "commit": "466822ff6f9da584f7cf72c868017b8840574dbd", + "sha256": "1jvmqb4sj3www6fq8srq13yjixp4ixx5i6b0xhiv2bi6r41m3ina" }, "stable": { "version": [ @@ -12337,26 +12338,26 @@ "repo": "emacscollective/closql", "unstable": { "version": [ - 20210530, - 1136 + 20210616, + 1951 ], "deps": [ "emacsql-sqlite" ], - "commit": "1b0e5bfef95de49bf669c54a15571386f10f4705", - "sha256": "01l4w3wc7rm7mca8pbkyz0yrks4z8i00ppy5c4bmrnn6akf7h9ih" + "commit": "e2687e7ff958a19e6e5d6552c4e0b7b33c424bab", + "sha256": "1ghqxnn39i032ibm5sbnv67r2dd2hgfnfpqbmb8wzg9wc6smnacq" }, "stable": { "version": [ 1, 0, - 5 + 6 ], "deps": [ "emacsql-sqlite" ], - "commit": "1b0e5bfef95de49bf669c54a15571386f10f4705", - "sha256": "01l4w3wc7rm7mca8pbkyz0yrks4z8i00ppy5c4bmrnn6akf7h9ih" + "commit": "e2687e7ff958a19e6e5d6552c4e0b7b33c424bab", + "sha256": "1ghqxnn39i032ibm5sbnv67r2dd2hgfnfpqbmb8wzg9wc6smnacq" } }, { @@ -12483,8 +12484,8 @@ "repo": "atilaneves/cmake-ide", "unstable": { "version": [ - 20210603, - 1522 + 20210610, + 1525 ], "deps": [ "cl-lib", @@ -12492,8 +12493,8 @@ "s", "seq" ], - "commit": "9b1100bd8d65b961b7478f9c011f0f6eb8cfcdd9", - "sha256": "1lr9cz856hqb3qz5fq6qqc2a55mfgdrh451np5m2bf2ljw0d67nh" + "commit": "28dc4ab5bd01d99553901b4efeb7234280928b18", + "sha256": "01xpknvj5mm2d3z6xzaw6cyb26hrzhvs44763ajvgw9l43mviwy3" }, "stable": { "version": [ @@ -12520,17 +12521,19 @@ 20210104, 1831 ], - "commit": "05d8a586fa4eb6256b8b80a0f7f084e8c5d3c8e6", - "sha256": "11vxpkf8y9n0kxyfgkbyrq76b0g4xjl2rriyj2d59s3xlx27gqjp" + "commit": "bf6c9567920965f7b3aba37079cc1b51f31d969d", + "sha256": "1hk1qmvw9hmq8xarcnc3pspgsa2fkr8cra8g43i12b8011dz6hpb" }, "stable": { "version": [ 3, - 20, - 3 + 21, + 0, + -1, + 2 ], - "commit": "13d112ea03f2b068da1f7ac3239a42a6cff94eda", - "sha256": "1rn9gzjcg1km9pbyipkfgzq8jvsmwwa2zkmra5yksfwq2094apnh" + "commit": "e610e99ad34a545ac67f1977e78ea59a52fdcf79", + "sha256": "1jss6aavq89kmhdbjml6qamv9jm92xf74g1wz4dsr36wh0mypgfk" } }, { @@ -12682,11 +12685,11 @@ "repo": "astoff/code-cells.el", "unstable": { "version": [ - 20210529, - 1452 + 20210612, + 755 ], - "commit": "2e40770d7963dcbb52ac45dcd83c0537fda5e188", - "sha256": "1m6csmg7y99ihw6nhknnr6wqamf5y5j931gfbsrhbar2hh8wjx5m" + "commit": "1bd650391a6fe84eb267f2534a0750ea1b5549f4", + "sha256": "0r0gp0i0mkfw035qrhpbjw3vdlyiffc5b9zmsmq93wcqvn459154" } }, { @@ -13489,11 +13492,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210606, - 135 + 20210618, + 2105 ], - "commit": "e0f8c9ad754bdc2c02318f4baf433886c7aa83e3", - "sha256": "1wqwcggjzmqihdgs3bm23fbv2cxpbh9cjvnzgdj01vbgh4ccqkfh" + "commit": "1fd1b363eee68e4cdcf0e610005c0bdbf9940604", + "sha256": "00502ffyfx9zc6bs2pzn3zj3rj2zz8sdm1g046ijkgbya8wszkcm" }, "stable": { "version": [ @@ -13772,26 +13775,26 @@ "repo": "redguardtoo/company-ctags", "unstable": { "version": [ - 20210528, - 1311 + 20210629, + 1038 ], "deps": [ "company" ], - "commit": "26f0a906a646b4885984e068a2046c3a1d0578eb", - "sha256": "0ix5zjwfjj4cbx61qy9d0rfbsmk5kgvm9r2v2r76qa39wx3dys82" + "commit": "cf7bfdbfedc8ca4ee134c8d66e70eb6035185174", + "sha256": "0ysf3gd3fk74j203y2zg3rq41jx42wgk1y1fn2g5giawazi7ym2x" }, "stable": { "version": [ 0, 0, - 5 + 6 ], "deps": [ "company" ], - "commit": "26f0a906a646b4885984e068a2046c3a1d0578eb", - "sha256": "0ix5zjwfjj4cbx61qy9d0rfbsmk5kgvm9r2v2r76qa39wx3dys82" + "commit": "cf7bfdbfedc8ca4ee134c8d66e70eb6035185174", + "sha256": "0ysf3gd3fk74j203y2zg3rq41jx42wgk1y1fn2g5giawazi7ym2x" } }, { @@ -14010,16 +14013,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20210329, - 1543 + 20210608, + 1454 ], "deps": [ "company", "ht", "s" ], - "commit": "a90e45ee69bac18205418aea68d981c12835eb81", - "sha256": "0rm2nw5h74qhc5sqrwgw7l94x32kp35fw3xdpfpglr6bmqyqjbmz" + "commit": "b35c6fd89ad111c662916751cf8b3facc8acb1c0", + "sha256": "0h9ly6jpbkbcraxs8l0245vqld61jap1vw3cfrbp885jyyzpfb0v" }, "stable": { "version": [ @@ -14531,15 +14534,15 @@ "repo": "xenodium/company-org-block", "unstable": { "version": [ - 20210607, - 1202 + 20210623, + 731 ], "deps": [ "company", "org" ], - "commit": "e2742dea77b356ee11a1200263d48eed79f5fe43", - "sha256": "194kjkpaca7k60hxs96mah416fdn5mfbsa4wgrpc3cprlrbyp8jr" + "commit": "4fd9a9c673225196e211bb3ced411d0ef9ff2f88", + "sha256": "1nsgkamrq54vm88imdyhl4326fxl9hvkfp0prckgjcg2r37pkxar" } }, { @@ -14558,8 +14561,8 @@ "cl-lib", "company" ], - "commit": "9770c95bf2df93d9cb0f200723b03b3d9a480640", - "sha256": "188z1i209z61nwfcgffgp90rdcsnl75izxpqv4x1vbaay5fvg33f" + "commit": "8a0dc9888de87ea3aace06628bff52ed32f3ca2b", + "sha256": "1xcsm72by6jiqr9y9fyk70nshsj5dj494faz9734m67fmxq45pfj" }, "stable": { "version": [ @@ -14591,8 +14594,8 @@ "company", "phpactor" ], - "commit": "debf66848c6099415c731b179dcd47e96db3b50b", - "sha256": "0i5g4gh5i5y8wsrqw89lwi2s2sn67pvvj2y6p7lnyv0i201v5bs8" + "commit": "272217fbb6b7e7f70615fc518d77c6d75f33a44f", + "sha256": "0hm96i9vdbkcq6mypjpl94dn3gzyk23iql5zzy2d221vmjhqvn7d" }, "stable": { "version": [ @@ -14920,8 +14923,8 @@ "company", "rtags" ], - "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", - "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" + "commit": "65113e2a137baa9f85dc2157b893291470788dc4", + "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" }, "stable": { "version": [ @@ -14986,8 +14989,8 @@ "company", "solidity-mode" ], - "commit": "383ac144727c716c65989c079ae76127e25144c3", - "sha256": "1q4b8623mygzp3qwy5bmb3hipzjfri9007x0ilq3i7k5bs34jz9r" + "commit": "5f6ef3156fadae5af6f381d674d20535529a20e4", + "sha256": "02rmc7naspjfl757k7zdfg9xd6nvfpsiqfcxkj6ywc7mnndpq2c0" }, "stable": { "version": [ @@ -15703,19 +15706,19 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210606, - 1237 + 20210629, + 1951 ], - "commit": "ae905501bcdb8fdda0d10a0846d575fd2a38e6d7", - "sha256": "1jz4j27irxknfbcxsn8phhhaiwyc2z9gnyrj03ah1v57i0i9g79c" + "commit": "6ce9aa58e74da92e391cfe938bc3da4f47ab591e", + "sha256": "1ji5ilakwahipp23avzjpi5vfp5f17pm6m1prygk065zqdianrv9" }, "stable": { "version": [ 0, - 8 + 9 ], - "commit": "e538f168d9d16c926d92c19d6131298962b778a9", - "sha256": "1460818fb6y086vgn1mzmrwhpa5jswlwi4v71zr86cg6y7yg4248" + "commit": "ee58941308d83a717728f056ea753e80f68cfbc0", + "sha256": "0iy6lrqbpi4lv7141rdawpn278rxinfxspwb81n04azyxrk28vlw" } }, { @@ -15789,29 +15792,29 @@ "repo": "gagbo/consult-lsp", "unstable": { "version": [ - 20210428, - 1515 + 20210630, + 1151 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "12989949cc21a1173206f688d56a1e798073a4c3", - "sha256": "0g3bpi53x6gr9631kzidbv4596bvdbxlr8y84ln40iwx5j8w6s7p" + "commit": "e8a50f2c94f40c86934ca2eaff007f9c00586272", + "sha256": "1xkkybfdzr1xqhvc2bamp253icm75dz7bkdz6bv8xj8688p8vrm9" }, "stable": { "version": [ 0, - 2 + 4 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "c4c0426b58946578ac1806a60258d2b275d5b524", - "sha256": "11lrnv5ssiwwdvdib05nz070yc3w9lfcqikgnl3bq8gbcrm9zjf4" + "commit": "e4a0b9403477fe90741ac84d0d2ac3729122b363", + "sha256": "00rrc17axn7pmvzy1q95nf0w036cx7fhxwhimamh9cmijkdsf5w5" } }, { @@ -15822,15 +15825,15 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20210519, - 57 + 20210701, + 422 ], "deps": [ "consult", "notmuch" ], - "commit": "71aa3b8ee6cd3cd07313b74353ac29fdfde0e7b0", - "sha256": "1wfghhyv89fcnjznvjwriwdpksr3yijr5lg0xihc7vssz05c7qpr" + "commit": "9e65c421cf54ca12234acad727818fa0fe60fa3e", + "sha256": "19flyh3v1xm2zswzjkvjbijvpbq5r8isafza4fd0yicvqbjyklhx" }, "stable": { "version": [ @@ -15853,14 +15856,14 @@ "url": "https://codeberg.org/jao/consult-recoll.git", "unstable": { "version": [ - 20210411, - 1300 + 20210620, + 1955 ], "deps": [ "consult" ], - "commit": "9038cfa4222f428e28bdafa0aeb57362104a873d", - "sha256": "0sqwczfvplmlwkjmpd3l8i6gjsfw180kafyvkzdkdig4cwa39yks" + "commit": "7b54edb8ac011015ccb43c9d6193e455b4405425", + "sha256": "1qz0r36nv5d52g9i4g9lcrp9gh1kf16q8lgjwgxxqi0qrq2h99z0" } }, { @@ -15871,15 +15874,15 @@ "url": "https://codeberg.org/jao/espotify", "unstable": { "version": [ - 20210605, - 1502 + 20210620, + 1953 ], "deps": [ "consult", "espotify" ], - "commit": "3d62a3319ab03a810030058d3fb368b28dfd82d5", - "sha256": "0hj3nczmqmgiwsvh664rs34j63wl325x6nar21p1a84h5ximpkxq" + "commit": "5bf63dacc5df8a74860e80dabd16afce68a24a36", + "sha256": "1vxg86wv6f96bva0d1xxhisk525chwhdl4nq77xhriflq65mcmi3" } }, { @@ -16397,14 +16400,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20210410, - 1256 + 20210608, + 206 ], "deps": [ "counsel" ], - "commit": "5d7ee6776ed5c314472e2af2797ebfdc725e6a70", - "sha256": "116yylad46sjfvadpl3lj3sb17ariswyp6k1ihh8ba5jn9f9hl5h" + "commit": "2c1f2161d36f70e0034e29abecfcb8878b30b6ac", + "sha256": "1hcsz773i67i82crzczm4csjkl9qj430m73lpvqkh7if543bs030" }, "stable": { "version": [ @@ -16735,15 +16738,15 @@ "repo": "mnewt/counsel-web", "unstable": { "version": [ - 20200313, - 5 + 20210609, + 2156 ], "deps": [ "counsel", "request" ], - "commit": "35c648b4cdd9f266ab54512a0fec2a3ca55d5bc6", - "sha256": "128vl9a5w8v2xzfi5xn9cqshxmcfq2pcmnkkqcxfmi401m2lm0bx" + "commit": "1359b3b204fcdac7a3d6664c7d540a88b5acecfd", + "sha256": "1y5dnhsx5q8jvrr5hjr8cp53nvdq25c9q9im61ym75nccl9lwp4v" } }, { @@ -17067,8 +17070,8 @@ 20210601, 1327 ], - "commit": "771a405e262c98b802e2c5302306aed802d8233e", - "sha256": "0kcv3jjygjvz75irjdddgakw8b0ckm5gqasrb2341zgqms7l9rfr" + "commit": "b2c24f42f2fae63433787150f77b397d69ce0e5b", + "sha256": "1c0smqhc87fzg7db20k92k938p8dkqiig59krwylkqgagsi7hbg4" }, "stable": { "version": [ @@ -17238,11 +17241,11 @@ "repo": "Boruch-Baum/emacs-crossword", "unstable": { "version": [ - 20210216, - 1703 + 20210614, + 633 ], - "commit": "cb2e2a435ea9f4fa8c7517b4909af8b62bca8a3e", - "sha256": "18dk9623ff2kxfhbdnh4l68n5dfxqgrm6ilmv85dfj685kahd0d3" + "commit": "a8594b6e13f5e276aa9bc810ac74a8032bb1f678", + "sha256": "1in8y4fg79v0lx5k0bfhazppkhmb8x9xb0wrjpv3p877vy3687i9" }, "stable": { "version": [ @@ -17372,16 +17375,16 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210328, - 2004 + 20210624, + 1320 ], "deps": [ "tree-sitter", "tree-sitter-indent", "tree-sitter-langs" ], - "commit": "33e3042535e70a284389f8da1c495958fed8a826", - "sha256": "009qizx0cc97if0bdxrmw3l1slddwwhb21fq6npchg7dwswpnai4" + "commit": "093f0f21a9d04d79a380de145cbc42693ef8c76f", + "sha256": "1150s8zz9z6pmr9m8jny7g8qrhxdnpbk4nzrlyddhaf9hkw9nfi9" }, "stable": { "version": [ @@ -18050,8 +18053,8 @@ 20190111, 2150 ], - "commit": "7b018126aefb100a4f00aeba121688e8a168ee22", - "sha256": "0wxjnxic06kkdjlsd0r0afpms26rhdyskv2f4nj7gabiz1m341gm" + "commit": "e7e5d1dc652755bd0ac0a45e4f970b1a2b137308", + "sha256": "0900w9ddx0i942spji7jg6ssv9d898isggzy9yjhirwn8fs0a2jb" }, "stable": { "version": [ @@ -18525,11 +18528,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20210602, - 1928 + 20210609, + 1330 ], - "commit": "aab346ed9d8f0f7ea033029c9688810353052e7e", - "sha256": "0vq8sgbil17llimaar4j5ar07g17q8ir3a7hfpmv9572ah1zqpw9" + "commit": "88d799595e8f1b4154637ce8a3f81b97b0520c1a", + "sha256": "0b68kivrvwwp51q7cizgdd5i69n7p322gzd305zb377aksl98rbj" }, "stable": { "version": [ @@ -18604,8 +18607,8 @@ "deps": [ "dash" ], - "commit": "aab346ed9d8f0f7ea033029c9688810353052e7e", - "sha256": "0vq8sgbil17llimaar4j5ar07g17q8ir3a7hfpmv9572ah1zqpw9" + "commit": "88d799595e8f1b4154637ce8a3f81b97b0520c1a", + "sha256": "0b68kivrvwwp51q7cizgdd5i69n7p322gzd305zb377aksl98rbj" }, "stable": { "version": [ @@ -19635,11 +19638,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20210606, - 933 + 20210625, + 1617 ], - "commit": "07fc164a680d02de2a7af983adb5e726cbfd7fc0", - "sha256": "1ldd4h9r7wiqgynxwlqf6hg5m2whzaczlhxmbch7i60rd72wwvrj" + "commit": "f7c57d1878d78f076e2a2ef1c97129dc8aa4da15", + "sha256": "0fgyv5g23by8gddaai6q7dwv0f87fam91avpd0fx8klckyz3i5ww" } }, { @@ -19650,11 +19653,11 @@ "repo": "blahgeek/emacs-devdocs-browser", "unstable": { "version": [ - 20210601, - 1447 + 20210629, + 1601 ], - "commit": "d3702670eb361715e41440eb699523b3f4c60bee", - "sha256": "1mv0d67y6m1wi779lc0mnpylqiw3cnaj0rkj199fxh91nkc6vk27" + "commit": "23e62096b98b9b509efc453d7fee0810acea4bf8", + "sha256": "0f6ld4m1x419677snbpd3qyx782zpj61rahphgc5nfj6aanvll0w" } }, { @@ -19759,10 +19762,10 @@ }, { "ename": "dictcc", - "commit": "5e867df96915a0c4f22fdccd4e2096878895bda6", - "sha256": "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm", + "commit": "cdc15fbd060183e2b06f0c776075beddf7433f39", + "sha256": "023r50vwc3bbbyfmn05lyfpq78cmjr076i2rjd064izbrybififp", "fetcher": "github", - "repo": "cqql/dictcc.el", + "repo": "martenlienen/dictcc.el", "unstable": { "version": [ 20200421, @@ -19867,14 +19870,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210523, - 11 + 20210615, + 1539 ], "deps": [ "cl-lib" ], - "commit": "d4340608c2d6d8b81aad8e690d0265799aba16f3", - "sha256": "1haqmaaj6ajqqfdni6gn3nmqaif8jqrpdnr84m3zjddsdw5zlcsk" + "commit": "1077c734b3b6de02c80456035a4939b028cb4179", + "sha256": "18vk7rhysavm8j02kd4lw6j6zr2l13gyvrjxq7psy1flhvmkxknc" }, "stable": { "version": [ @@ -19931,14 +19934,14 @@ "repo": "ShuguangSun/diffpdf.el", "unstable": { "version": [ - 20210307, - 932 + 20210626, + 1447 ], "deps": [ "transient" ], - "commit": "96861493f95fe88118942bbe64954142250d6c24", - "sha256": "13dda1883pkji4nf44mx9xiys6rgirw12si9fnazsviiqycjaf1b" + "commit": "a5b203b549e373cb9b0ef3f00c0010bd34dd644a", + "sha256": "0bd09ljvlzffb02fgcvjjvysrj762a1wfvad0ywph4722dvnjfn0" }, "stable": { "version": [ @@ -19963,8 +19966,8 @@ 20141014, 2357 ], - "commit": "e0aacd8b3d9f886f27222c1397f0655e849e0af7", - "sha256": "14ccak3cmv36pd085188lypal9gd3flyikcrxn0wi6hn60w2dgvr" + "commit": "53f2d001bd3a5cb80c6ada16b4e570afd1989a09", + "sha256": "0ivy5ydww69gnxws6y37hgvyyvs9gssvdljzs1h13pcycm05hdxb" } }, { @@ -20100,11 +20103,11 @@ "repo": "tarsius/dim-autoload", "unstable": { "version": [ - 20200103, - 1239 + 20210615, + 1502 ], - "commit": "c8dc02259d6c1aa25fb58742ae8b181f83b39a13", - "sha256": "0k9m57zrdpabb6b34j9xy3cmcpzni89wq71pzzwgdi47p1n4r4vd" + "commit": "77b6a5814ffb49e33679fd67b53b9f05042b6ebc", + "sha256": "1a1xhmsm1c4k3mkbbhzd7fmb8q60fhs0lrf39m261180kz0wnhrq" }, "stable": { "version": [ @@ -20130,8 +20133,8 @@ "deps": [ "dylan" ], - "commit": "040c8ebc884305fd4ff980d21c68946fa74b095a", - "sha256": "1f99wn0lgknvnplp7nk2lylf17yak2hw53n9a0vkxng01xhf50d2" + "commit": "d85409dc3cba57a390ca85da95822f8078ecbfa2", + "sha256": "1cm4l2ycaw47mfgc6ms021zxkas1jajgwpnykqlkcwcbakbczxjl" } }, { @@ -20866,14 +20869,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20210411, - 2315 + 20210608, + 2340 ], "deps": [ "dired-subtree" ], - "commit": "79d8187da373b573a2d5385ca868553bb73e0005", - "sha256": "0b1f6ddhn8z4q790d370zhyqrn4mlqk7i6901sld52m14zigd72j" + "commit": "6be2dad2782e28dae2f50c0cbfd82042b2b6ba8d", + "sha256": "1lqnd64ga7g8dzzgfn2bw00y65hlvlgxnj3bk7j6qr5wzkz6qp52" }, "stable": { "version": [ @@ -21017,14 +21020,14 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20210603, - 2349 + 20210613, + 1423 ], "deps": [ "key-assist" ], - "commit": "43159042ca788be74c387cc59ba3fffc57079993", - "sha256": "01r6sk2zlj3mf39vczaybhpzzmv379vvi85mc4gygif24m102sg3" + "commit": "5e13b7c088e2554b2aa406581520d53902c74016", + "sha256": "06vy5wgrv0sjdnsx31jg1c12wwzxpkgb2xz1djzi5pbhakidspv3" }, "stable": { "version": [ @@ -21069,8 +21072,8 @@ 20160529, 2017 ], - "commit": "c08e163d9d6c62f7b07e94d54c96c2e364e67e0e", - "sha256": "1h2hnm8r3anfbk5x7d2dnv38bdllsbwaam6ivpbgzn12r23wrsr2" + "commit": "ad328a15c5deffc1021af9b3f19a745dcd8f4415", + "sha256": "1s6gwn3ksvk2wyslv7kwn0da3xgw1ayx6yaddhbxz0kg6ps2ran2" }, "stable": { "version": [ @@ -21864,8 +21867,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20210516, - 1958 + 20210624, + 1359 ], "deps": [ "dash", @@ -21875,8 +21878,8 @@ "tablist", "transient" ], - "commit": "bc2dc09edea167d4fdf022aa263bad71932bb0c4", - "sha256": "009qxd0q77pzq2xvm060zswy0amga9cdcc1h3zf2mhn2cw64ydic" + "commit": "9bcefbe54dbed4d364286fe65a87872e763ff7dc", + "sha256": "184dsvaa60b4j6w8s6146x81l5d2a6hkxjqp69gwiixpyjyvcj6n" }, "stable": { "version": [ @@ -22076,8 +22079,8 @@ "deps": [ "s" ], - "commit": "f6dcb378bb69c23d58978d5bc1e37c4ae160d278", - "sha256": "055b24cskxp0wy74synnnsmfnzbavmazyackq0qfnfbkqryrzfml" + "commit": "32196031f60627e88a67b676d643ab51c251711f", + "sha256": "19bm4fr38hkh6mrbf0vgafwq2hfldkcn2b5flllvizq2qh86hq81" }, "stable": { "version": [ @@ -22219,30 +22222,30 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210606, - 1532 + 20210627, + 1731 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "1660910b758251608c17e1a0e27ff862e345daab", - "sha256": "1apbh9kp1qk3klx65imbhmxxnf8ax0hzzcdwj4n6qpm7s6bk1gc3" + "commit": "07d03c4626eaaf2cc9c346308add3700ad4a3a06", + "sha256": "0c9g5i9cyqcc934rz778zia24bls99i9hfl0s61354ncgw4qndfy" }, "stable": { "version": [ 3, - 1, - 1 + 2, + 0 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "5cb0ff7a3878b218486fe7ef9b3c83cb226dd03e", - "sha256": "1dkgh87sv25mdlzdfihp6gp0asvwplx9yrn7nfsqzsfc3kpajkck" + "commit": "d514f43679513819b37333a64a44523f239150b6", + "sha256": "1gfkaxga919a1a19dhpbby95l8dixb1278g5d7iadjf2i3j0p3l0" } }, { @@ -22272,14 +22275,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210604, - 1922 + 20210701, + 707 ], "deps": [ "cl-lib" ], - "commit": "b2c0ea0f0778a6ea85b87e1b87916572e98e1fe7", - "sha256": "1rjhmjsszms4rlqq368f717ds4kmdjblkgd2ww830d7sy5h5rb6n" + "commit": "bd5b9065dea54472519da67ccfcc3185bf5e35c3", + "sha256": "0g12rlkfg9ijgd2csrcmcqf6yrs33x9gfkw3g7azp74pvx3cvcmi" }, "stable": { "version": [ @@ -22523,11 +22526,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20210518, - 657 + 20210627, + 1011 ], - "commit": "aa72f3d5c4d49cc0fb581d2f4eac528cf0278a11", - "sha256": "1ay4i606rjcr55ky54sxyvh6ac4s4ilr1i3pykvavdgmrzy3ij89" + "commit": "99ef8ef438e8e11a4486a20c353508b5e20d010e", + "sha256": "0hrqbggmfizl7wcwjcnpgs7ykns6iqwai51mqv61k7m2m37slf6k" }, "stable": { "version": [ @@ -22883,16 +22886,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20210303, - 1714 + 20210622, + 1720 ], "deps": [ "dash", "popup", "s" ], - "commit": "8f70acbe164553b225476fed55019ecddcf0bbd6", - "sha256": "08g417yf4byhhldvcbkmhrlm7iaylkv0cbcg1c701dyfngxn01y2" + "commit": "542e72d3feba986a12119f6def515ef1347cb4ca", + "sha256": "1x0g1n9x7qsiwqq8432li6yiww2kvdbk2wkqs3glw97grzrz89gc" }, "stable": { "version": [ @@ -22936,17 +22939,17 @@ 20210213, 757 ], - "commit": "ac3a66e0f7d3577b27cc5d5f2399163bfbe11828", - "sha256": "1grll7h2hv906bik224qn9fldmq4lhnlfcif1lg4grr3f4nhl1wc" + "commit": "846b38c1efab4757240d131d2c45102930fc305c", + "sha256": "1vw500g9jfa4za1f0r90bzzb6ra9jyn52z1g4nwvqcnha1sixj7m" }, "stable": { "version": [ 2, - 8, - 5 + 9, + 0 ], - "commit": "e84ba5230f6afacb12f022937138a752f1c301b6", - "sha256": "0a1jj6njzsfjgklsirs6a79079wg4jhy6n888vg3dgp44awwq5jn" + "commit": "641a95d2254ca7c51c97f07f2eed85b7a95db954", + "sha256": "01np4jy0f3czkpzkl38k9b4lsh41qk52ldaqxl98mgigyzhx4w0b" } }, { @@ -23058,11 +23061,11 @@ "repo": "dylan-lang/dylan-emacs-support", "unstable": { "version": [ - 20210329, - 604 + 20210613, + 1431 ], - "commit": "040c8ebc884305fd4ff980d21c68946fa74b095a", - "sha256": "1f99wn0lgknvnplp7nk2lylf17yak2hw53n9a0vkxng01xhf50d2" + "commit": "d85409dc3cba57a390ca85da95822f8078ecbfa2", + "sha256": "1cm4l2ycaw47mfgc6ms021zxkas1jajgwpnykqlkcwcbakbczxjl" } }, { @@ -23185,14 +23188,14 @@ "repo": "ahyatt/emacs-dyncloze", "unstable": { "version": [ - 20210405, - 212 + 20210613, + 1956 ], "deps": [ "dash" ], - "commit": "38aac1a38017a707b4c539a7932cc8f6cd8f1a77", - "sha256": "05i0a1680a79xvawa93iip10ln6bkrnvzqh3a2lica4hfx0hsi0x" + "commit": "fe5baf6d324800779f80f5c6298a56e2dcb87598", + "sha256": "0c7bh3swwmfc1z834f79jakg1n6li5prd33r5k92id8kl18hb8fj" } }, { @@ -23449,8 +23452,8 @@ 20201112, 820 ], - "commit": "5f3cfac22a7e2508be47079860ab573f397c3cfa", - "sha256": "1p7x7wvzc1sragxpb7b6qnb9fv193mm3ydwf1kwi6rgnz29zql58" + "commit": "527df13dcfb11f7a059ca9e8e4d31ab79423d896", + "sha256": "0ylmd42z0lczliafwhw0ga80y7j1njdypzmfkmnblhlxyiwjxwxk" }, "stable": { "version": [ @@ -24329,8 +24332,8 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20201110, - 1827 + 20210630, + 1626 ], "deps": [ "auto-complete", @@ -24341,8 +24344,8 @@ "popup", "s" ], - "commit": "648e8ac632bee8eaa92fc4e09a674ae453bae0a9", - "sha256": "1z7abw4s3k8ynx9i25blp0i51is0wdpsipx79l4wkpazhpsx8gb6" + "commit": "5564f5292eba339afa7760af9467c896ccd708da", + "sha256": "0dkpijsfprlckaggnzmarrbny2qn02927s0fh94dql2gqkvfxhd0" }, "stable": { "version": [ @@ -24505,8 +24508,8 @@ 20200107, 2333 ], - "commit": "df4e47f7c8adfe90d9bf408459772a6cb4e71b70", - "sha256": "1n0dcrhwpl24whxzwhxf7qjlqlllzl5aahdq8h2zdgb6xz912k64" + "commit": "54fc2af0efdbb9e000667749bcfc9fda659304cf", + "sha256": "032iacivlg86fi3kwgsh0dsggx7kp8l9yvngb4ih7ilfd33mzrza" }, "stable": { "version": [ @@ -24526,8 +24529,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210526, - 1751 + 20210611, + 2249 ], "deps": [ "eldoc", @@ -24536,8 +24539,8 @@ "project", "xref" ], - "commit": "e498cb171bb07ec36880a2494aafc8acb1cc34ca", - "sha256": "1q2rg6kk16h0wv70p2x1rg5cjmn0w0gc3phriwdd7iwn842dsrb7" + "commit": "5cc8df63d86a6c43134dd6e4e3ae26cfae14e66a", + "sha256": "0whplm1858d3mv4af6qk0jr5dk9ym1yzp4zsslrrfpyi54vy96yx" }, "stable": { "version": [ @@ -24863,11 +24866,11 @@ "repo": "dimitri/el-get", "unstable": { "version": [ - 20210606, - 911 + 20210613, + 1418 ], - "commit": "52df810e538243d07f2a317ad36e351b440a75e0", - "sha256": "0s9107bss982v4njwkfyi4gismg402xcrqkq9c2hrwhyr6pny4w0" + "commit": "ec135b5353867ce3564a675e99024944b834395d", + "sha256": "1mpc4gnrpvqvhfvjvp4hqb4x6nzn1kfzgsqi4sdjgbfjqll2jzv0" }, "stable": { "version": [ @@ -25170,8 +25173,8 @@ 20210524, 1611 ], - "commit": "afe8f31e2b9f78d13b22a695b7cf9c373656b85e", - "sha256": "09yk4xvsdd5mvrzx4kdfyi2bkbdykjg80hcxvjamh967s6vinzjb" + "commit": "64545671174f9ae307c0bd0aa9f1304d04236421", + "sha256": "10hjqva6xpilnsfsi8z7w3mjmii4hzf53cmccv1w3076ccvcpq62" } }, { @@ -25219,8 +25222,8 @@ 20210530, 1641 ], - "commit": "e9af76aa8fd9ce5b7010b7322a73341828cfe690", - "sha256": "1wryp568bl5p0s78va2pgh9aiskhphmva20zmk1jg0qjxim58grv" + "commit": "d51ce6152519b5cf32d0dcc40cad6787eb605997", + "sha256": "1nkc9fwg7fn8gvj4zg515320p7m2h3b1nyd6zzbp2v60qj7277jq" }, "stable": { "version": [ @@ -25240,11 +25243,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20210402, - 2039 + 20210608, + 2202 ], - "commit": "f66f8d0641a0025d65da1ec21141ea594d6883da", - "sha256": "1y9ns6kmhgzi176z251cymplqc9bdk0axhhcvh4mn21vi5igz4pz" + "commit": "13d207d40863a041b84c34f075668c7931db5a78", + "sha256": "1cvwp01w0adgxwlsispmir4wgs73cl62n5rh7ri6rw6g4fribq1m" }, "stable": { "version": [ @@ -25302,15 +25305,15 @@ "repo": "stardiviner/eldoc-overlay", "unstable": { "version": [ - 20200715, - 1214 + 20210630, + 1345 ], "deps": [ "inline-docs", "quick-peek" ], - "commit": "563ca285a510d1cbd5129cc3a8f8a3cdded065de", - "sha256": "1llh93rlvzsl9m2f7gprb5rbbf2ghysyn1balb8clb64hq98gjyb" + "commit": "3edbfb23836bdef253f4a5fd125952e55877d2b2", + "sha256": "1r2fjdra4bav16c108jzzjd2qhng7493i7l7znbasialf40j3cbs" } }, { @@ -25412,11 +25415,11 @@ "repo": "xwl/electric-spacing", "unstable": { "version": [ - 20210430, - 1714 + 20210625, + 1722 ], - "commit": "800e09af7b0cd5d78d22f857dbce10fb080637df", - "sha256": "0ykndvbbx8rvaxppmkngyrzp1x6fghj9xv55i847kpzx1c6gs4fc" + "commit": "1be87078a689d967cb2d6654659fb49427926d62", + "sha256": "06iws70cc58xs79wlv9wgqk6vk9grvv1jhcngjjwg0pdn080rksz" } }, { @@ -25531,6 +25534,44 @@ } }, { + "ename": "elfeed-autotag", + "commit": "11425f3533d452f1f7f412b1dbe617be9dcbf225", + "sha256": "0p6avgi7pclcf1ml0k3lzwd92plgz28d8q82675gyjs8gfwkn5m7", + "fetcher": "github", + "repo": "paulelms/elfeed-autotag", + "unstable": { + "version": [ + 20210607, + 637 + ], + "deps": [ + "dash", + "elfeed", + "elfeed-protocol", + "org", + "s" + ], + "commit": "bc62c37fb79b720ff8b6d67f04f2268841306dcd", + "sha256": "0vmvl3c465i2gkm9079hj7l3qxna37q3rrs498r8dby11c0dgcax" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "deps": [ + "dash", + "elfeed", + "elfeed-protocol", + "org", + "s" + ], + "commit": "bc62c37fb79b720ff8b6d67f04f2268841306dcd", + "sha256": "0vmvl3c465i2gkm9079hj7l3qxna37q3rrs498r8dby11c0dgcax" + } + }, + { "ename": "elfeed-dashboard", "commit": "339127464845e86419c6a88004fc16b60d675f57", "sha256": "1ykg8gcsl7gf1w2xvd1wm088fw1l1mbsamx7drrvkdnpwxx6xiga", @@ -25907,15 +25948,15 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20200815, - 2357 + 20210615, + 1624 ], "deps": [ "dash", "s" ], - "commit": "b3634a4567c655a1cda51b217629849cba0ac6a7", - "sha256": "1zy629gavyrwx5gmpz7l1a86hbrxjrfqik398v3ja8vg8bj9d6nq" + "commit": "fdde21e34b1272783d566d8230b5ed2dc4749048", + "sha256": "15g3xp3w8lrshjf812c8v50y396zx7107fcyc59kljhsc257j62y" }, "stable": { "version": [ @@ -26361,11 +26402,11 @@ "repo": "redguardtoo/elpa-mirror", "unstable": { "version": [ - 20210509, - 439 + 20210614, + 302 ], - "commit": "193dd942cd74f71d94067f48249427676ba7dec8", - "sha256": "0hwsy780x1kw1c9k1xrbrbip6l62fa41czal0nnqr9li0brig7d7" + "commit": "18209f7f4602e48204992e38c5d265eb1a68320a", + "sha256": "0507bydbplh515jm1y8w9fpv3mljxkj797ssackadx484n3v0yvv" }, "stable": { "version": [ @@ -26424,8 +26465,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20210328, - 1852 + 20210630, + 2317 ], "deps": [ "company", @@ -26434,8 +26475,8 @@ "s", "yasnippet" ], - "commit": "2203597e1254eba345d6873daa40c7b9d144931c", - "sha256": "0rzqmcbrq7xdk748cwy5ikzbg7f13g57jf7rhxyfy6j5pwn8q7k7" + "commit": "4248dccef31e260813d93cafd083bfcd71efc92a", + "sha256": "16pkbg1fwsn0haz2x0ky9pmpgxj9syszsm5g58jra5r0dhyv99vz" }, "stable": { "version": [ @@ -26737,11 +26778,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20210504, - 1306 + 20210615, + 1503 ], - "commit": "53d257db92fb72ade8ea1b91dc6839c21563119e", - "sha256": "1qccz8z0410xhygrfy62h1j3553avdcb7m61ps6b6y74nz615l1r" + "commit": "ef6dfa8e598b2761d0a481526e98e254123a20f6", + "sha256": "0p7c2mnwz85klliy1af96knkdja6q9k9j11r0hfka7g4fak0qi6d" }, "stable": { "version": [ @@ -26818,11 +26859,11 @@ "repo": "skeeto/emacsql", "unstable": { "version": [ - 20200714, - 28 + 20210615, + 1539 ], - "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", - "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" + "commit": "9dca5996168c4963eb67e61c7f17fdcb8228e314", + "sha256": "1gjwll970avjv0ah4m8w56ybi4l4bc4n8p29wq77za56m0g6jzrg" }, "stable": { "version": [ @@ -26848,8 +26889,8 @@ "deps": [ "emacsql" ], - "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", - "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" + "commit": "9dca5996168c4963eb67e61c7f17fdcb8228e314", + "sha256": "1gjwll970avjv0ah4m8w56ybi4l4bc4n8p29wq77za56m0g6jzrg" }, "stable": { "version": [ @@ -26878,8 +26919,8 @@ "deps": [ "emacsql" ], - "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", - "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" + "commit": "9dca5996168c4963eb67e61c7f17fdcb8228e314", + "sha256": "1gjwll970avjv0ah4m8w56ybi4l4bc4n8p29wq77za56m0g6jzrg" }, "stable": { "version": [ @@ -26908,8 +26949,8 @@ "deps": [ "emacsql" ], - "commit": "6d8cd9366284b5a27268ff4b783e2c34573d5b60", - "sha256": "04l1rzsmy9131h42y1v6vsfbby7v1gldwd5g600mqfjbbwcnbgsk" + "commit": "9dca5996168c4963eb67e61c7f17fdcb8228e314", + "sha256": "1gjwll970avjv0ah4m8w56ybi4l4bc4n8p29wq77za56m0g6jzrg" }, "stable": { "version": [ @@ -27058,11 +27099,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210607, - 1506 + 20210615, + 1833 ], - "commit": "ef609bf15368a68c4eb3c46fd8cc1bb623b6b83e", - "sha256": "0ddh7zqgaq07534l6m3wjvbcj23a01h3x7scd4pl5rj6wyxqwv76" + "commit": "acbe1cba548832d295449da348719f69b9685c6f", + "sha256": "0c1zqfrn2va2m9z6rw3i2h6dwm2vc0asbha4d9r0gss4b7519pf2" }, "stable": { "version": [ @@ -27088,8 +27129,8 @@ "consult", "embark" ], - "commit": "ef609bf15368a68c4eb3c46fd8cc1bb623b6b83e", - "sha256": "0ddh7zqgaq07534l6m3wjvbcj23a01h3x7scd4pl5rj6wyxqwv76" + "commit": "acbe1cba548832d295449da348719f69b9685c6f", + "sha256": "0c1zqfrn2va2m9z6rw3i2h6dwm2vc0asbha4d9r0gss4b7519pf2" }, "stable": { "version": [ @@ -27256,29 +27297,29 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210607, - 1450 + 20210619, + 1246 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "c360a8934c1e07ddab4e12d28800d362d254ccbd", - "sha256": "02aikwki7932dldhnsq8ndca59spbc4g2kjfal3sw16lklfw0sfa" + "commit": "6e0aaaf4c5598826b24c3079b80bf8af000a77c6", + "sha256": "016y0w1gy8z1gdri54njas20l3kw99jg5bjyrmcbmgzjmb1jq0y8" }, "stable": { "version": [ 7, - 2 + 5 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "b0173b6b4c5b66a4706cb82c9b50a179bf159a0f", - "sha256": "1scppj8wkiml4dgsg4540hdd8mv9ghcp2r17b647az0ccxwp73qm" + "commit": "144c49ac2931b6e57e265cc6139b7c9718f1297e", + "sha256": "0j9qh781zr348qx49zvr59rdpmh4204fqx9sm3mfh3kg6kbc7v8x" } }, { @@ -28006,26 +28047,26 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20210530, - 1147 + 20210616, + 2229 ], "deps": [ "closql" ], - "commit": "8ee60b65bff02ef606d489b83e2def9922e9623d", - "sha256": "03zsysj78w43q902wi9dhck64q9va247avr6fhdw8ynf2lvb78d3" + "commit": "44b7b2519f84056ee94a6c4ce21fce146532174c", + "sha256": "0z9sz9ydfjzhawh4qip41h3vid1lslaf0h14hkjz9kx8fkrzib8a" }, "stable": { "version": [ 3, 3, - 0 + 1 ], "deps": [ "closql" ], - "commit": "8ee60b65bff02ef606d489b83e2def9922e9623d", - "sha256": "03zsysj78w43q902wi9dhck64q9va247avr6fhdw8ynf2lvb78d3" + "commit": "44b7b2519f84056ee94a6c4ce21fce146532174c", + "sha256": "0z9sz9ydfjzhawh4qip41h3vid1lslaf0h14hkjz9kx8fkrzib8a" } }, { @@ -28158,10 +28199,10 @@ }, { "ename": "eradio", - "commit": "533c3f130d94335bf18907fefe2b5f1e047cdfbe", - "sha256": "0dxlsikgz1fbsypxxzczp6m4bbqh4kqv0f7w058z2sgzplybq3m4", + "commit": "99f67df1d87ecd1bb54b85fa1711dfba90dd00dc", + "sha256": "1w6igfsb8l4i2nq1h528wys61gwh784xzm99bw25rrjj17jdyxsn", "fetcher": "github", - "repo": "fossegrim/eradio", + "repo": "olavfosse/eradio", "unstable": { "version": [ 20210327, @@ -28277,11 +28318,11 @@ "repo": "alexmurray/erc-matterircd", "unstable": { "version": [ - 20201029, - 2321 + 20210701, + 32 ], - "commit": "d46f55909f1c229fd84f409ef992a7a463719893", - "sha256": "19vwpl40nw3jgfmiwl1y4yna0ygjyzlqf5gs85g63f61d89gjlrs" + "commit": "6e9698310f5df5193bccb334839bca29e4bbfe30", + "sha256": "0cwq1ljgb0ga1b8f8gks9c4y8rqjfawpr4l0fi0p3y674a76z33f" } }, { @@ -28643,19 +28684,17 @@ 20200914, 644 ], - "commit": "044843c5281a7bdb9479317793a75c8c0fcfadd9", - "sha256": "04lirb2p1h46c1l84ysdnr2jxvzsdw1zv6jhm7h8ybgzmaa65b6m" + "commit": "007a26fb5f7d9eb54db16484fb116d6e47c8cc5e", + "sha256": "1w9pra3qqmidsf5mvp0lmk9liw1ryaf8kjiawfgyyc6mzgw6nrvz" }, "stable": { "version": [ 2, 6, - 1, - 3, - 20210605 + 2 ], - "commit": "ab805592a0ae7066fbd5fa5f47e933194fce878f", - "sha256": "19ld12x4is0nx52i05zv20js0zysx3bljbdn2nr65vy11dq2cyyp" + "commit": "246a229faea2ef2fa53caf491ff8a2d72dd7510c", + "sha256": "1ccmryw6vs8d87d5zmjl0kr2kvyd1zxl73344fa7yzqgg2kw1da6" } }, { @@ -28669,17 +28708,17 @@ 20210315, 1640 ], - "commit": "a8969ec16a91c0e1ac56a438d81069d288662518", - "sha256": "0wp6sf8rw73waws47av68d4sdd28qix74n53c4fpdc4c2xq3j3h6" + "commit": "3517ac9f6b48641b949e19971a1a2d022b7494a0", + "sha256": "1r9adb0x370c3cj93lgaag2ifkgi954gh5hnshkr3wz8bpqirvk1" }, "stable": { "version": [ 24, 0, - 2 + 3 ], - "commit": "82f97b9d3d639ed87175aeed75747eb6594170ab", - "sha256": "065kc9p30jam23grpm7dwxjf76n6g1hzdrq9q1irr3qmw1rr0240" + "commit": "0a887ba078f6faadea128b51a98e928dcb0e79a4", + "sha256": "0hirfg5y53gj5smf2rqxiadj02ad761hgq3yqcz4j1ldnm50hlr9" } }, { @@ -29418,8 +29457,8 @@ 20210405, 1808 ], - "commit": "3d62a3319ab03a810030058d3fb368b28dfd82d5", - "sha256": "0hj3nczmqmgiwsvh664rs34j63wl325x6nar21p1a84h5ximpkxq" + "commit": "5bf63dacc5df8a74860e80dabd16afce68a24a36", + "sha256": "1vxg86wv6f96bva0d1xxhisk525chwhdl4nq77xhriflq65mcmi3" } }, { @@ -29531,11 +29570,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210520, - 2146 + 20210616, + 1806 ], - "commit": "f62f460e3c55e5e7ad5941225e7884b0e1656131", - "sha256": "0i5i59pbga10s4yml5vi4fbbxmaqgf8fx4caj3mfgd8dkrkxblgp" + "commit": "a5df6aa81351385e9813b722afcacdba1648226d", + "sha256": "0di7s1k9lizvbr4n59qhn6ipc67klcyimlkdqw4if7nkfjif5bsn" }, "stable": { "version": [ @@ -30126,15 +30165,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210527, - 2107 + 20210628, + 1913 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "ad47644eea5e351269f5bead18e713768d96f207", - "sha256": "1bcdrvrrjq9r75cfrxziq84slrjm8gbbhbm72hqjfzka6zcnr39g" + "commit": "f20d442ff006aa5a6dc48ac654906b48b95107fd", + "sha256": "0bl854036zpjg5p5asamvlnl9lf46rgcpa645yhrvxqmwznm6din" }, "stable": { "version": [ @@ -30328,15 +30367,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210607, - 1954 + 20210701, + 1024 ], "deps": [ "annalist", "evil" ], - "commit": "86b02f84a8df0ddd6216cb85d49bedd6ee2ab747", - "sha256": "0vh0wdzz9idfinbfd3mynlp88lgq5j9wk8c3pc5a1is6g3jpj938" + "commit": "a24168ffe3711890b5dcd41041a51146bbd67497", + "sha256": "1pz046fw06lgc7gjrfr0a895j867mm96k8h5dw3k0p64rh1xh1sa" }, "stable": { "version": [ @@ -30894,26 +30933,26 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20210325, - 123 + 20210609, + 1311 ], "deps": [ "evil" ], - "commit": "8c8c94bea899718f393ad041202a355e6f24ea19", - "sha256": "0vygxkvri6363wi3byjd2r23bjyvjkfy58n2kshslaq18z5vylzl" + "commit": "d7ad7f712b98aa64b7cc4fb16354b32666739c77", + "sha256": "1x7wpq0lgkp016yik6sc7b2abhixgcwk0mxx29dyycsjjkdlhp3a" }, "stable": { "version": [ 2, 3, - 11 + 12 ], "deps": [ "evil" ], - "commit": "a0c5bd1fe89119b94ffb0a266d2969434e7ec4c1", - "sha256": "1990g1b6v0i7jaiv35bdssdn601rjifzg4fy9s3sxk0drqm1xiss" + "commit": "9cd0ddaacb3476221d37344715c759ed3cb538d7", + "sha256": "0l4ash907d91vccqdxjz1v5spd8f4va0vrdri6h9y1qc67mjlsph" } }, { @@ -31029,11 +31068,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20210528, - 1009 + 20210624, + 1122 ], - "commit": "c0f49e4e87300720b8e8a8296d92b8386956c7a2", - "sha256": "0ci3hjzgwayz9nvmwg5vbmvn80cz0lsppghi511cbr3cdf8xkkv4" + "commit": "118bebd02a489ddf5eee3ab6fb55b3ef37ebe6d4", + "sha256": "15phgj1x2k7i6wnhq3lbrjldrc7xr18z4sgsmklwwgr4blx9ql1s" }, "stable": { "version": [ @@ -31463,15 +31502,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20210607, - 420 + 20210609, + 509 ], "deps": [ "cl-lib", "evil" ], - "commit": "9bd7345476174dfc6eeaa700a505e45b155ddb83", - "sha256": "1p7v9pnbyc4mhpkvmyl9vr825grqnfyl0h203sbnb1vnw15bbnbp" + "commit": "a9b9b39a7915e66b7d5da9cecfaf002c72d08196", + "sha256": "01ikzxvm878k0xwj10h3ww02459g3jiz4fjsm481jw1jjvnxg5b2" }, "stable": { "version": [ @@ -31557,14 +31596,14 @@ "repo": "emacs-evil/evil-surround", "unstable": { "version": [ - 20200603, - 2216 + 20210615, + 2119 ], "deps": [ "evil" ], - "commit": "4706987bc01a552343848da49b4951bd54374643", - "sha256": "0v2v58pchr5icdpvg4k6vblxhgjk09wi7f54hs1dj0f6rgvpxmx5" + "commit": "3bd73794ee5a760118042584ef74e2b6fb2a1e06", + "sha256": "125yxpd2cmhwvcb0p9z5dc6ydk4w2a9vblkn9hayh6myj9jwjy9f" }, "stable": { "version": [ @@ -31654,8 +31693,8 @@ "deps": [ "evil" ], - "commit": "ad47644eea5e351269f5bead18e713768d96f207", - "sha256": "1bcdrvrrjq9r75cfrxziq84slrjm8gbbhbm72hqjfzka6zcnr39g" + "commit": "f20d442ff006aa5a6dc48ac654906b48b95107fd", + "sha256": "0bl854036zpjg5p5asamvlnl9lf46rgcpa645yhrvxqmwznm6din" }, "stable": { "version": [ @@ -32308,8 +32347,8 @@ 20190520, 1106 ], - "commit": "e043df1bcef40cd5934a74c210e1e35d5eb0e5a6", - "sha256": "0am4g25mlmm1iqcm2kxzskrzhrm1f09cdwcqmvk4lidid5xcb6xc" + "commit": "fc6713e753380f3034d8df55b7af3a737ea52ab4", + "sha256": "17p8gcbm81qq1rgn3xdblmvyx3qn4sjpylna7pfpq32nkxjaajvc" }, "stable": { "version": [ @@ -32338,10 +32377,10 @@ }, { "ename": "expand-line", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "0bzz7zrpfdxhjxs7nzlmzjb9jfajhxkivzr5sm87mg3zx8b6gjyi", + "commit": "06f13c6ff35e0e710407b2138fcefaebf01b007a", + "sha256": "19vk9kp1pp5m9l6qwgnxalamqlcds66f3vc0psyymna1g7pinr1w", "fetcher": "github", - "repo": "zhangkaiyulw/expand-line", + "repo": "victorteokw/expand-line", "unstable": { "version": [ 20151006, @@ -32359,11 +32398,11 @@ "repo": "magnars/expand-region.el", "unstable": { "version": [ - 20200304, - 1839 + 20210624, + 1015 ], - "commit": "4b8322774d9c1d8b64a0049d1dbbc1e7ce80c1a0", - "sha256": "1x6sbychbz91q7mnfn882ir9blfw98mjcrzby38z1xlx3c9phwyi" + "commit": "519e92eabc470fe1792d8d4a37c98e76cf195840", + "sha256": "0rh5li9i6nz81mbji87dnv5ly58rl5lphlvjx4m0hb7dlqpw0db2" }, "stable": { "version": [ @@ -32775,15 +32814,15 @@ "repo": "rejeep/f.el", "unstable": { "version": [ - 20191110, - 1357 + 20210624, + 1103 ], "deps": [ "dash", "s" ], - "commit": "c4dbf8c8e83df834f5d6f72cd5649b9d8a8812ec", - "sha256": "132zj5yvx4llzsh6rs0jwj0b5cfl140v0m6rk0kckw3vfgfh0cln" + "commit": "50af874cd19042f17c8686813d52569b1025c76a", + "sha256": "0k6qp5vqyiql9f6i6z95iskjpv9wn6sd66wnf2x0jxbws4r2bjxy" }, "stable": { "version": [ @@ -32871,10 +32910,10 @@ }, { "ename": "face-shift", - "commit": "e55d2d30525602726c3c63025f5fce671efac416", - "sha256": "1y0m6yv64q76x6i2r5npn97c2axsy2k7b3m58zxh8p7c5lpwjdpa", + "commit": "982788433004ba644a372c50130613e3c56bba10", + "sha256": "06962zrxnm7q9w8ddm6xwa2q1vbb8wi1z8sqmw0yksz6wra49d5w", "fetcher": "git", - "url": "https://git.sr.ht/~zge/face-shift", + "url": "https://git.sr.ht/~pkal/face-shift", "unstable": { "version": [ 20190818, @@ -32883,8 +32922,8 @@ "deps": [ "cl-lib" ], - "commit": "8dd6fb5f6277d3a594654aeb3e6a7b7b5581656a", - "sha256": "003k8i18s782zf1g0c9wi8p9lyk0viz76dah8hd3y622hmx8sdlb" + "commit": "8c62d7a27a0e3092942742362ed73e17e254e904", + "sha256": "028b3j7rp4z78285r8w4db8dx9j6zlqp8aw4y0pvd4ifqbs5wh05" }, "stable": { "version": [ @@ -32952,8 +32991,8 @@ 20210602, 1952 ], - "commit": "45f2faef92ee23738b86f4f8d0a433ad729a5ca8", - "sha256": "0slvrgw508388il24wlx9g0bf32anpk6rbhmb2r99anq2vhn4b4g" + "commit": "cb8803355e20812d84195b1b7c9b0578c3262e68", + "sha256": "0wx2k9262p712aasn3ha8si250yzhcqz513apna8lp5gri2rxsg8" }, "stable": { "version": [ @@ -33424,20 +33463,20 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20210410, - 1942 + 20210624, + 1431 ], - "commit": "59ab02344f569069b9899a3a5ffdca4a30093df4", - "sha256": "1vh6n2sg89g43sidymk22wjzjh71wgbajshhh7y3f6zf8xs94mmz" + "commit": "f37a3de72c6cbf37f82d4b2f37d9009af5058099", + "sha256": "1qnmcysrl2zxiid4v1h1hq1nax3a7sxs2dmag54sfifm149lf7f3" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "ae4634bef12f66a1d4721ab74c5bf8dd29d710d2", - "sha256": "15b5zb66dzszpdiqkwgxqv434kqgpk1l065ic4lbj3y3krm2snbg" + "commit": "ea8564a2cc4f7e10b3fc13faf26a4f098b159f00", + "sha256": "1qnmcysrl2zxiid4v1h1hq1nax3a7sxs2dmag54sfifm149lf7f3" } }, { @@ -33574,15 +33613,15 @@ "repo": "knpatel401/filetree", "unstable": { "version": [ - 20210514, - 1614 + 20210629, + 356 ], "deps": [ "dash", "helm" ], - "commit": "08c0ea22f304f9777cd96e9b86f7c6e5331e82d8", - "sha256": "1phqiisabqsfkmslajl012lc0bf5y0vkgrcjavbwzf52hj7kn982" + "commit": "f7dd8a310f5364f1e1549082ef231c3c27285e89", + "sha256": "1w1f924as6l0s9dkpjjk6bnkp29x52mf5pzzqxqsigp2r1z6k2lk" } }, { @@ -33768,8 +33807,8 @@ 20210427, 1205 ], - "commit": "3bf010d2be073d499de5ffdaa98f48bf8a3dd21e", - "sha256": "0zpckqcx4fbjni1f0c6wzi1356ab06j33himfgkhvyl1bn4w5jna" + "commit": "680ec93808176442a2c78b91b18bb4256d81d340", + "sha256": "1af30i3nsms1s2gwq3wx0xbmjxd95hipai63icw3jpwc3pmw3g2n" }, "stable": { "version": [ @@ -33918,11 +33957,11 @@ "repo": "jming422/fira-code-mode", "unstable": { "version": [ - 20201005, - 1607 + 20210621, + 1933 ], - "commit": "a3a7a75d2b8b15404c37de186162a5f89ba447bf", - "sha256": "0az773s1g8c1sahyrci4zclzhyznr3kizmvxs65rpn0pcmcfq1m8" + "commit": "85e0eba018bca70040faea19996b43ce8e543cad", + "sha256": "1mv0gphbp976ncfif2jbfrmkayh0lp5cjqmiimhw1inw7ps18k5r" } }, { @@ -34855,14 +34894,14 @@ "repo": "leotaku/flycheck-aspell", "unstable": { "version": [ - 20210605, - 1713 + 20210618, + 920 ], "deps": [ "flycheck" ], - "commit": "8c45988a12e7c149b17d7edb84e6dfc33bb7b288", - "sha256": "1lsfz3yi3i1mqmq6p9x6fx26wrlqihsaz3yk5g50yv6jqvfr1g79" + "commit": "3abe1a6184fefea3e427141131fba40afae3d356", + "sha256": "1g600caz7v7qm6fj67x0s064f4n5fr57bnd0m3sc43gn24rpjjdv" } }, { @@ -35723,31 +35762,31 @@ }, { "ename": "flycheck-grammalecte", - "commit": "2e7aee5074faedef4f2b989ffe05995b2f73bfbb", - "sha256": "031x2yh3wdklsm169h34sg0bzpl36nfms129zj4j0z99gw1kda3z", + "commit": "5f03c71c5482b4f3f6424e71dc19e7daec400db6", + "sha256": "0w55xmxxa28k776fl0kc08frsk1msq0ia40afa4gj8g6mi254qm3", "fetcher": "git", "url": "https://git.umaneti.net/flycheck-grammalecte/", "unstable": { "version": [ - 20210504, - 1852 + 20210627, + 1018 ], "deps": [ "flycheck" ], - "commit": "f488739aea2ef5c8d39bd28083dd72fdfee46e02", - "sha256": "18yiv09hzbclf9rjp61lxlia2m1qbvmwkiqxxs9jjpac28x7ypjf" + "commit": "8f13de89134e9708b2a24a040a0335a7302632f9", + "sha256": "1acwvndq604gl5n3985mj5v70vcl3d12vh6bzs5nz5xyr8c848z7" }, "stable": { "version": [ - 1, - 4 + 2, + 0 ], "deps": [ "flycheck" ], - "commit": "f488739aea2ef5c8d39bd28083dd72fdfee46e02", - "sha256": "18yiv09hzbclf9rjp61lxlia2m1qbvmwkiqxxs9jjpac28x7ypjf" + "commit": "fab1b5071b7fe7a34869ffb8672abad38948c047", + "sha256": "040mb9djj4cxpjsjch9i30pi36a2z7grkhnsnfdi5qyh341p4pq0" } }, { @@ -36178,6 +36217,37 @@ } }, { + "ename": "flycheck-languagetool", + "commit": "06859c648c33d422a798ef98a564cb79783a9a3d", + "sha256": "0qnvvl9bfx7i0agfm3v7qrcjm86vfshpx97aa0ms8byw77hii5i7", + "fetcher": "github", + "repo": "emacs-languagetool/flycheck-languagetool", + "unstable": { + "version": [ + 20210629, + 536 + ], + "deps": [ + "flycheck" + ], + "commit": "6ade9d7f294cee7e41d0bce9dddb139c49985501", + "sha256": "1yq2n7bknw7by1cn53xn7kz8a3qj1w7szsjysaj93mhxb154g9qz" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "flycheck", + "s" + ], + "commit": "5608a330e09222d05bf0354f1847f537168e22dd", + "sha256": "0v6gqhgwn2x6qd34380y5n1ql08anv02bs6qk7glq6a0ha8xkzfa" + } + }, + { "ename": "flycheck-ledger", "commit": "dc715e6849aa5d6017e2478514c4a0d84c7ddbe5", "sha256": "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl", @@ -36513,15 +36583,15 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20201126, - 603 + 20210617, + 2237 ], "deps": [ "flycheck", "phpstan" ], - "commit": "6863a5278fc656cddb604b0c6e165f05d0171d0a", - "sha256": "05q1y6xshh5csr672jwplp2xmp87gvj9rc65ybpa687dkdmq8cdh" + "commit": "56617fa87c9bec037d4e4a0a143b7d70a989c082", + "sha256": "02k4pmmxq3h8mi0dsjh0s0002gjkpg6g9pxsnxgalwb6rakfirbh" }, "stable": { "version": [ @@ -36900,8 +36970,8 @@ "flycheck", "rtags" ], - "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", - "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" + "commit": "65113e2a137baa9f85dc2157b893291470788dc4", + "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" }, "stable": { "version": [ @@ -37355,8 +37425,8 @@ 20210411, 2342 ], - "commit": "8c45988a12e7c149b17d7edb84e6dfc33bb7b288", - "sha256": "1lsfz3yi3i1mqmq6p9x6fx26wrlqihsaz3yk5g50yv6jqvfr1g79" + "commit": "3abe1a6184fefea3e427141131fba40afae3d356", + "sha256": "1g600caz7v7qm6fj67x0s064f4n5fr57bnd0m3sc43gn24rpjjdv" } }, { @@ -37898,6 +37968,36 @@ } }, { + "ename": "flymake-languagetool", + "commit": "3ead983cef03a4a25f78bac45d4a7cca5058880a", + "sha256": "07m3mps9vs2zk63ssgcwwmdbfln7qzqhnny4i90x6kd2g10vkmvc", + "fetcher": "github", + "repo": "emacs-languagetool/flymake-languagetool", + "unstable": { + "version": [ + 20210627, + 434 + ], + "deps": [ + "s" + ], + "commit": "5e44d7ba7153d20a01428bff98c1949a7a0eb753", + "sha256": "19149wr4plng3n1bpfd49ja1phd3sbyrxa6vk47qh8xc7x1ra309" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "s" + ], + "commit": "f0f105ab11fd1de1379baef91fcd46e6c2464dca", + "sha256": "1sylnd4hybxnygcgxqw8p7mlp0r000n6f44y5fq3sv9518l5mflz" + } + }, + { "ename": "flymake-less", "commit": "6d4eae8b7b7d81ebf4d85f38fc3a17b4bc918318", "sha256": "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0", @@ -38086,14 +38186,14 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20201122, - 950 + 20210617, + 2223 ], "deps": [ "phpstan" ], - "commit": "6863a5278fc656cddb604b0c6e165f05d0171d0a", - "sha256": "05q1y6xshh5csr672jwplp2xmp87gvj9rc65ybpa687dkdmq8cdh" + "commit": "56617fa87c9bec037d4e4a0a143b7d70a989c082", + "sha256": "02k4pmmxq3h8mi0dsjh0s0002gjkpg6g9pxsnxgalwb6rakfirbh" }, "stable": { "version": [ @@ -38116,14 +38216,11 @@ "repo": "manuel-uberti/flymake-proselint", "unstable": { "version": [ - 20200927, - 640 - ], - "deps": [ - "flymake-quickdef" + 20210621, + 929 ], - "commit": "b94950301139846002d2020bc630440ff834bf24", - "sha256": "1zlbw4mj0l9p72gw03jrqmaakh7550ha02r3rmxrlqs6gjzqsd1f" + "commit": "adf1ce7daf1380cb50f365a36548165fe4a32423", + "sha256": "1mmwq4b4idhbsygwjmn3fj67idixx4gaap9zfa0v4didahjsjsjh" } }, { @@ -38242,24 +38339,6 @@ } }, { - "ename": "flymake-rust", - "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", - "sha256": "0fgpkz1d4y2ywizwwrhqdqncdmhdnbgf3mcv3hjpa82x44yb7j32", - "fetcher": "github", - "repo": "jxs/flymake-rust", - "unstable": { - "version": [ - 20170729, - 2139 - ], - "deps": [ - "flymake-easy" - ], - "commit": "2f42d1f2dad73ec9de460eda6176e3ab25c446f0", - "sha256": "02fgkv9hxwrv8n5h6izb5jyjcpazlf86pjjj4zkv1ycpa6gyzzwn" - } - }, - { "ename": "flymake-sass", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d", @@ -38964,8 +39043,8 @@ 20191004, 1850 ], - "commit": "246120647e28a27506ca0894ba98e371086881fd", - "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" + "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", + "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" } }, { @@ -39042,8 +39121,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210525, - 1345 + 20210628, + 736 ], "deps": [ "closql", @@ -39053,16 +39132,17 @@ "let-alist", "magit", "markdown-mode", - "transient" + "transient", + "yaml" ], - "commit": "551e51511e25505d14e05699a1707fd57e394a9a", - "sha256": "139pndj9l9aifnvv2ak5zwf5gzwhp3m6dfpw1avf4vkh1zywzwa0" + "commit": "84ef3a7bad5879a2dd179a94655ac0da28be3898", + "sha256": "0mp1jwc0ms6d15l3vw0zg35l68q58bk5bj8w5znjvwjh3akybfpm" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "closql", @@ -39074,8 +39154,8 @@ "markdown-mode", "transient" ], - "commit": "551e51511e25505d14e05699a1707fd57e394a9a", - "sha256": "139pndj9l9aifnvv2ak5zwf5gzwhp3m6dfpw1avf4vkh1zywzwa0" + "commit": "e7d0d759440492549db331f3c39c3cc62880118f", + "sha256": "0j28vc0q1h36pk0y2nidnlsc2y7n0vpfrd8civiv1zp8z0jwfyc9" } }, { @@ -39110,15 +39190,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210604, - 1107 + 20210619, + 533 ], "deps": [ "inheritenv", "language-id" ], - "commit": "82f68e5d1f0641d7a050db02ab2c0a7d3888f358", - "sha256": "0761qmkza4sbl1k0vj4q18zm9p148h7131dq46wwajyxbmrxlxja" + "commit": "6a3463a723e08a37bae85a7585700ab314ae86ea", + "sha256": "10aa5jh4ba4bhghwb8mi6my1dazbvxlylk3gcxji47qj0z78fajh" }, "stable": { "version": [ @@ -39255,26 +39335,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20210523, - 1327 + 20210611, + 1228 ], "deps": [ "seq" ], - "commit": "77f3ce6b646868210f91b6a80fcaaa77297ed341", - "sha256": "1f0mzrn237kv2p5bz58km4b7a46shzm1v7n4a6ksyfd3n7cqas85" + "commit": "91f4ad083fa620e6e6202460decc3280bd8e4e71", + "sha256": "0xlg5b0sa4qbv68sza23fr5khv36860jbhzfbcqcw1d420xllryx" }, "stable": { "version": [ 3, - 4, - 1 + 5, + 0 ], "deps": [ "seq" ], - "commit": "707b8fdc9a0e1de1a911ca312c23c0c1672f3ec3", - "sha256": "14zhbcfqyp093kd1bxl7f2hf5l5995qmgpmnxfgw9qcc781crj73" + "commit": "91f4ad083fa620e6e6202460decc3280bd8e4e71", + "sha256": "0xlg5b0sa4qbv68sza23fr5khv36860jbhzfbcqcw1d420xllryx" } }, { @@ -40214,11 +40294,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20210508, - 1516 + 20210619, + 1421 ], - "commit": "23c09c9c0417c7de67a8965d9b506d0cc7aea7a2", - "sha256": "0c4cz1kyanqswz5ww8aql96hqxg8p8lwwwygw061rq2ycmkl54nk" + "commit": "c975001725e4b7f58dd9379a64c170f07734af59", + "sha256": "01d303vbn7vvhl1g1wpmpy90h5vaj3yimzgmhnmswc2qc2s3cnhq" }, "stable": { "version": [ @@ -40271,11 +40351,11 @@ "repo": "ShiroTakeda/gams-mode", "unstable": { "version": [ - 20210227, - 251 + 20210701, + 36 ], - "commit": "52e984d64c48f518222e0f6bd326236f78d7bf7a", - "sha256": "0fjdm2mlwibi6cz0r7cm4ylxzg7i8fljkwfhflb84xqcaknwr2sk" + "commit": "64e3544726b77f10becb58a51d61993fbba433af", + "sha256": "1sn893lnqfr13p1m2g36i6f0ikpibhp7q7ak5271fhpzjzh0fi1r" }, "stable": { "version": [ @@ -40760,14 +40840,14 @@ "repo": "emacs-geiser/stklos", "unstable": { "version": [ - 20210503, - 944 + 20210626, + 1440 ], "deps": [ "geiser" ], - "commit": "0e3a0570354c03c0cfa25da82fb34ad2e81c1981", - "sha256": "1g31cibl88g1vjfvw4z80ywxpnxy5lijhs754qdcnx36maragh07" + "commit": "be482a03225720d7adb003c28e4515f6252e7ce2", + "sha256": "1dyzpr9i5pxi2p2hg3ndryh7x4y0r9bra88pd1l904vdfsxdxv5z" }, "stable": { "version": [ @@ -40789,11 +40869,11 @@ "url": "https://git.carcosa.net/jmcbray/gemini.el.git", "unstable": { "version": [ - 20210226, - 1419 + 20210611, + 1833 ], - "commit": "0a227125a4112266c06ed7247de039090314b525", - "sha256": "0fiix0ssaannim5kxpckhd5z6fssij3igv1dg9y7143dzxf274zz" + "commit": "97e096ab2400bbe3c0f6d19fb49bd952f2f14e03", + "sha256": "1l092mhpv8dg00ln4yv040kmha7556klm5bqfdvc9ysjnfiwprkd" }, "stable": { "version": [ @@ -40938,8 +41018,8 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20210530, - 402 + 20210620, + 334 ], "deps": [ "dash", @@ -40947,8 +41027,8 @@ "magit", "s" ], - "commit": "f1bdc47ab2bb29c2a0a385aaa9a5f0f6d543ffb5", - "sha256": "1qcw5kzcw9g41hqg0gnq3k6i4ygfgrlghadmfzdnf7dbk93ngl4g" + "commit": "ac555ccec74c48297bac0944a207e5b8aceac49e", + "sha256": "053gn6ja80810y4a2dayz3xy1bmzb7w06lvf87difa0nhm3mr54g" } }, { @@ -41206,15 +41286,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20210531, - 2006 + 20210619, + 1405 ], "deps": [ "let-alist", "treepy" ], - "commit": "e9a819c9c997b8e752eeb4a3fcd1a7b55ab8da47", - "sha256": "1c92q4hrax9gfrw35qi3slr7man006v5vqzp6hi2an5haw2cz4x2" + "commit": "865424d4faf66048bfb3752856ac0cf68e1c6efe", + "sha256": "0kqjxwkm3n6r9zg6pi015g9ix4pyz7b2rngcmmrindcjb5h292a4" }, "stable": { "version": [ @@ -41272,8 +41352,8 @@ 20210401, 656 ], - "commit": "fa81e915c256271fa10b807a2935d5eaa4700dff", - "sha256": "1yf6yipvhhna29mzaan5vb3d5qvbrkp2awr5diyf381mvxgk8akh" + "commit": "8ab9c88a2b8cccd3c092e155f84b1b19930d0719", + "sha256": "1jiglrlhrph57p5kkm1qlqihwl6z7h9qh16qmmd5783ynksnbxp3" }, "stable": { "version": [ @@ -41572,16 +41652,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210525, - 844 + 20210701, + 1554 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", - "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" + "commit": "2ae376e4923e02355828350b81cdc1b0f8fa72ff", + "sha256": "1h07rg0fvr7av69bcks1n63digafq145mlsaddyv6xixxqjp0vbg" }, "stable": { "version": [ @@ -43004,11 +43084,11 @@ "repo": "emacsorphanage/gnuplot", "unstable": { "version": [ - 20210526, - 1848 + 20210609, + 834 ], - "commit": "07a80272b86c081b40602ec0b080571f3269749d", - "sha256": "1d50b5vwnzca16g7hs2i0357lx9x5rvivdb5hdi0ngf6sb8d1afk" + "commit": "7138b139d2dca9683f1a81325c643b2744aa1ea3", + "sha256": "1v30avyx5klccpxqi85l5467dbc2v7s1jk5xv7rzvhg27azr4jm2" }, "stable": { "version": [ @@ -43574,14 +43654,14 @@ "repo": "emacsorphanage/go-impl", "unstable": { "version": [ - 20170125, - 1552 + 20210621, + 743 ], "deps": [ "go-mode" ], - "commit": "69f0d0ef05771487e15abec500cd06befd171abf", - "sha256": "1rmik6g3l9q1bqavmqx1fhcadz4pwswgfnkbaxl6c5b6g2sl26iq" + "commit": "1eebba6ccd02d11a5a82ad4540a8d562797bc3b3", + "sha256": "1i48vawn2a76bdbvv02mw7c5ny7g8dxk6b6xw2y9z0iijmbr0dzl" }, "stable": { "version": [ @@ -44081,20 +44161,20 @@ "repo": "io12/good-scroll.el", "unstable": { "version": [ - 20210607, - 339 + 20210613, + 206 ], - "commit": "b4233500bbbdb64758283ba8a4b7cef5a85181a2", - "sha256": "05k03bycwpgs9wf9rh4rxfp38lhzr46c8zpvkd5qr6zwb1nnvr00" + "commit": "26a1b958bbf2c45d86f033e58b74edd196302f23", + "sha256": "0g4fzji614aqy3kw9iivlmw5v8igql0lkrzvgffrd01jn57dzlwp" }, "stable": { "version": [ 1, 1, - 1 + 4 ], - "commit": "61aa3b57d572e6a46a1415b66dbc4b80c33bfb73", - "sha256": "0zprygv94rp1hdq7qxcmp3ns04j6l28y9w5hp087mhfbr1v5y54m" + "commit": "4ca86e18c8f64fd7a2d088a591ac11773d6b06a7", + "sha256": "0bq229nnwp8cy33gizp75wi3x11wn46p73v1581srm2f1zmkapsj" } }, { @@ -44483,8 +44563,8 @@ "magit-popup", "s" ], - "commit": "da0ae769e70e1af16865c3fadb25e9132d089dc6", - "sha256": "09kdlz6h31yasi1rv7759m40zb12vj6llv70pqh9swrpii2nmdzp" + "commit": "93851bd6e14df055d86661de494119e6bacb2192", + "sha256": "0bb5zbyr0xsf4p3440n5x2f3h10ya76vwr3jq10j0ff0x4fxs6iy" }, "stable": { "version": [ @@ -45098,11 +45178,11 @@ "repo": "ZungBang/emacs-grep-a-lot", "unstable": { "version": [ - 20131006, - 1347 + 20210618, + 1420 ], - "commit": "9f9f645b9e308a0d887b66864ff97d0fca1ba4ad", - "sha256": "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw" + "commit": "223819dbea049bdeb5f97f9849fce139a5f16a75", + "sha256": "06rrbwb5ms2m3mhsg1l4hqnn7x379019kkdfm8gys5kxv4mfp22l" } }, { @@ -45128,20 +45208,20 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20210515, - 1548 + 20210609, + 1305 ], - "commit": "02b7a8109fa1ae248e61c91da3bd8676f8d2e175", - "sha256": "0rd8nasnlc01wb4lkzpk3xrwj9lx2n4gsq7h4nc0irnbfy8phy1s" + "commit": "0ef2a3566f76e1c03ec64ac64cbb916530e40e32", + "sha256": "1p15b41bdzg8819hnq6js62486mwdqcwxns5mnqb21bn6m7pizpm" }, "stable": { "version": [ 2, - 2, - 1 + 3, + 0 ], - "commit": "9615c4774727a719d38313a679d70f2a2c6aca68", - "sha256": "01imyi1l33ng78m6c5g4pma5gy4j7jy7dwmqwsqgwbws08qdbwgr" + "commit": "0ef2a3566f76e1c03ec64ac64cbb916530e40e32", + "sha256": "1p15b41bdzg8819hnq6js62486mwdqcwxns5mnqb21bn6m7pizpm" } }, { @@ -45264,11 +45344,11 @@ "repo": "ROCKTAKEY/grugru", "unstable": { "version": [ - 20210127, - 432 + 20210617, + 1028 ], - "commit": "4ac2bf3877e3af7d23ace3165b9c8ed536ff4832", - "sha256": "05nw45hgbygfvbymghsp425474d4nrgl8pjii8jwd1ym155bf13k" + "commit": "b1d873cb6186e08c6f7ec782df989b01e955fb4d", + "sha256": "1rsixglxvc5a25v1pbyz23bngql84nvjn8673lmkhdcqcvd3s1hg" }, "stable": { "version": [ @@ -45494,14 +45574,14 @@ "repo": "tmalsburg/guess-language.el", "unstable": { "version": [ - 20210308, - 1514 + 20210623, + 1505 ], "deps": [ "cl-lib" ], - "commit": "7e511d23ee4315a79081c53596398c471572fb0f", - "sha256": "03bm6j8d1v5z1gz1chlpp7s3jzi0lnq6nqdw8r7z1ik5si59dvj5" + "commit": "e6b78ed2a36bf5debd3d07ffd99a5a8ca60609d6", + "sha256": "0g0vdz42s6hns249lfxcha7l7ihqpyay3n5iijziwrbrrhqi6rx6" } }, { @@ -45576,8 +45656,8 @@ "repo": "alezost/guix.el", "unstable": { "version": [ - 20210224, - 1601 + 20210608, + 1653 ], "deps": [ "bui", @@ -45586,8 +45666,8 @@ "geiser", "magit-popup" ], - "commit": "8ce6d219e87c5097abff9ce6f1f5a4293cdfcb31", - "sha256": "0awbd8x154c4dk4av7inpgd63n07xzng84vvc8qckmgljknc0j7k" + "commit": "c9aef52121b458297e70bb50f49f7276b4a8d759", + "sha256": "00xdxadbi9fxpfp60zah9190rcz3w08vl1blbhmaiy7c1hd2gi39" }, "stable": { "version": [ @@ -46201,11 +46281,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20210507, - 2243 + 20210622, + 2049 ], - "commit": "b35e8547b67f3d2c4d38ec7e7e516e3c0925352f", - "sha256": "1z6x28gv47vdi2a06p1w390a40ll1b1g2dhxhzpn998r6b1d8zxm" + "commit": "98ba3922360199d5260d47f417f096730ad057c5", + "sha256": "1k7zs7vlbpyhizv4ff1mhagz1mvazmm4bvq215z9f871hhf6l7ff" }, "stable": { "version": [ @@ -46535,30 +46615,30 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210607, - 1026 + 20210701, + 637 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "a92156303021e0ec91a904e16a994d8e1ccd78f7", - "sha256": "1lxmp0a7wk7wqb6qcy1zn9sr47vakgxzn0j8yyvdv1vps4hz9wk0" + "commit": "e74f450eaa4f197f1fa63a819193bc1c65984042", + "sha256": "1xl9wn520gnpyyryf7iij8y1x5ak61zcira6g480sqvv2ympmhkd" }, "stable": { "version": [ 3, - 7, - 1 + 8, + 0 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "8b0b9953a71ba07c24fdfc4d26fab21fb66e4d1f", - "sha256": "0b8sfpvy02ijk9xi9b44762b718jqfq063wcg75dk3q452d27s1h" + "commit": "0714e27fe703a42fa52caf6daa0921d544a55402", + "sha256": "1xrpv0sqmlwn94bc31k2iav284i1hl95937541ihlkhqg6v2vwrv" } }, { @@ -47443,26 +47523,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210606, - 1857 + 20210701, + 608 ], "deps": [ "async" ], - "commit": "a92156303021e0ec91a904e16a994d8e1ccd78f7", - "sha256": "1lxmp0a7wk7wqb6qcy1zn9sr47vakgxzn0j8yyvdv1vps4hz9wk0" + "commit": "e74f450eaa4f197f1fa63a819193bc1c65984042", + "sha256": "1xl9wn520gnpyyryf7iij8y1x5ak61zcira6g480sqvv2ympmhkd" }, "stable": { "version": [ 3, - 7, - 1 + 8, + 0 ], "deps": [ "async" ], - "commit": "8b0b9953a71ba07c24fdfc4d26fab21fb66e4d1f", - "sha256": "0b8sfpvy02ijk9xi9b44762b718jqfq063wcg75dk3q452d27s1h" + "commit": "0714e27fe703a42fa52caf6daa0921d544a55402", + "sha256": "1xrpv0sqmlwn94bc31k2iav284i1hl95937541ihlkhqg6v2vwrv" } }, { @@ -49523,8 +49603,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20201123, - 1102 + 20210608, + 1556 ], "deps": [ "dash", @@ -49532,16 +49612,17 @@ "org-ql", "s" ], - "commit": "208e103ecc146db71d878df3bd09c6eb60c2797d", - "sha256": "09vdndp3935iy4flynbjpkvfax7vs1ppswl19wx4nn2rp7hdz8kp" + "commit": "8342656b2d9af4bb6af9daa0a8b037d3693bd940", + "sha256": "0alrs2dsd5k4xjrs2zs7hcr5fbfrr3rdq705s04943ic4kzvhrc9" }, "stable": { "version": [ 0, - 5 + 5, + 2 ], - "commit": "3924b023e0f1e8fa93cfa79bdd71f9f0c0fb4679", - "sha256": "14nsy2dbln3m5bpqzyfqycn18sb3qh407hjbkk1l0x2nqs3lrkqn" + "commit": "d3b0ef2f5194452d88bf23ec31ebfef822c47c24", + "sha256": "0b3xxnbhnrz0263fnrrdbs3gif4pjkfws4mxkfqqpg0fc8azp2rx" } }, { @@ -50284,8 +50365,8 @@ "helm", "rtags" ], - "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", - "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" + "commit": "65113e2a137baa9f85dc2157b893291470788dc4", + "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" }, "stable": { "version": [ @@ -50795,15 +50876,15 @@ "repo": "emacs-helm/helm-system-packages", "unstable": { "version": [ - 20201114, - 1019 + 20210628, + 1727 ], "deps": [ "helm", "seq" ], - "commit": "c331c69de0a37d2bc4d6f882cc021a905e7e56f9", - "sha256": "13a8jpj4wwm0yjv8hnsizgjf8wi3r2ap87lyvw7g4c7snp2dydwa" + "commit": "a16bb1c3708416984106a98353700d456414b6a1", + "sha256": "09acgs1mjkqmm7n88x4hck2bp3jv5fifdkd406r8fh874vyfib38" }, "stable": { "version": [ @@ -51560,11 +51641,11 @@ "repo": "emacsmirror/highlight", "unstable": { "version": [ - 20190710, - 1527 + 20210318, + 2248 ], - "commit": "9258a2b8362d737115cbd87618f947eadb140411", - "sha256": "0pbqzgbfkm8smi23j94hirxh2r1yc0ipyjbbv1y906br6bx5c1a8" + "commit": "28557cb8d99b96eb509aaec1334c7cdda162517f", + "sha256": "1klrc2w0wg9ajm973b7blkjcwscqni6nxaqkcmimava398lxss2l" } }, { @@ -51800,10 +51881,10 @@ "version": [ 2, 0, - 2 + 3 ], - "commit": "fdabfda5f6300f8dd4d2a62c49359605798cc001", - "sha256": "0x833ahd5m4rlqrgr7n5xj477vbs7mmp267in22hw0cxi9aan08q" + "commit": "891538de31524956136e1419e1206af0c8befe02", + "sha256": "08l5gb73ibs1mmfifnks5gxrcg8x8azw9g10jj2f8vn8viwwa7m0" } }, { @@ -52153,11 +52234,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20210320, - 1051 + 20210617, + 1324 ], - "commit": "717b4f743c633362a8b28c883c454c5ef3711722", - "sha256": "16b1hnxzfygn3pgck5d8m612iwn42bxsx0zhdqrzmjl9sjvvps4h" + "commit": "0ea43d320219ba4e6b7b1be36a5c1533ac3edb42", + "sha256": "1hg18rm7lqs45gvv1rb5d3vqh6g9nmyf2wd2sichl06a2cn48n16" } }, { @@ -52204,11 +52285,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20210422, - 56 + 20210629, + 602 ], - "commit": "42dee82058e49a7eae5490af2b6b4147600e87ed", - "sha256": "1csvhvjzhq1w9384i9n78qv8x0c2y8mdqig6fa2k5qi84cgsh8zp" + "commit": "c251d0cd354565b859ddf7c61bdae32649c6a0f4", + "sha256": "0a8dkay7d31h2k4vsapwigf62wl77yk4r0wa86ly4p6vghbczj3w" } }, { @@ -52241,11 +52322,11 @@ "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20210504, - 1406 + 20210615, + 1505 ], - "commit": "57378bd4511887a815725a7850e1ff2c6e9fda16", - "sha256": "0bdwdp8d0g7n0kv6l4h7alya3z6fsfi618dzw5x8f2az3r87yg8y" + "commit": "5ac0076cfeaea57f7c7a59d9d41a34c1bdc4b22e", + "sha256": "1h3h62rglgwir3jfy6wq9hkwlx6z28cs9dz8jv8xgpk1jsj89whw" }, "stable": { "version": [ @@ -53137,11 +53218,11 @@ "repo": "Riyyi/emacs-hybrid-reverse", "unstable": { "version": [ - 20210527, - 2324 + 20210630, + 1155 ], - "commit": "4cad8a17f6c9d98a628d78fe358d589b03172b57", - "sha256": "0xwl0fycygzwsrv4vrph6q6hy0550j3z1ir9ahfc7fjl091k192x" + "commit": "e59c8392938235ca8d95306aa1c3f1591a43fb45", + "sha256": "0vrdd4w9v07g6092sva8br0n3dlf1n9gj8y56k13a1wn9hwi2wp3" } }, { @@ -53614,27 +53695,27 @@ "repo": "plandes/icsql", "unstable": { "version": [ - 20210605, - 1658 + 20210612, + 1340 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "bc7c5f27f9d804613759a1d1357166f9ccecbe0e", - "sha256": "1g3wy9jjlag4ma610kdqnb0f2sy1032m5q419ankh5fv0gfxlwbl" + "commit": "4521e9d2debef7687bfd26a664479f0c46688a36", + "sha256": "0s65kilx1jrjhm80sc4fj3x0mr3x4m3vjllm6qxj8ml8sh3pkai3" }, "stable": { "version": [ 0, - 7 + 8 ], "deps": [ "buffer-manage", "choice-program" ], - "commit": "bc7c5f27f9d804613759a1d1357166f9ccecbe0e", - "sha256": "1g3wy9jjlag4ma610kdqnb0f2sy1032m5q419ankh5fv0gfxlwbl" + "commit": "4521e9d2debef7687bfd26a664479f0c46688a36", + "sha256": "0s65kilx1jrjhm80sc4fj3x0mr3x4m3vjllm6qxj8ml8sh3pkai3" } }, { @@ -54150,15 +54231,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20210223, - 850 + 20210614, + 1212 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "80aabd2566082aa67d17eccdd80e9f1fb10c9ec8", - "sha256": "1cmmasfmgnzhixhczigz1c2jzhr9yj4v6mwvgxs99vbg2k3p9rcq" + "commit": "f52ad0b4770403561b40f1d0499ecaca70da886c", + "sha256": "1ai5ha67650ryj7mdxx6b86hlm2v13h7kipisgvxj5dss3j9j7lv" }, "stable": { "version": [ @@ -54196,11 +54277,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20210606, - 1026 + 20210612, + 546 ], - "commit": "94650d77719a554cdcebfc6e26a731de87e14483", - "sha256": "029z9j3anb948mbmh6ai8asxgfim8193ymm41c7crqzga9p4ivc7" + "commit": "3247f3029a4e309c71a5b066fa4299d4cbb79fbc", + "sha256": "1w6apgfs4zgcqpcn3qgf0ncx46m6sz7vr4ln00s626ll0c4lhnys" }, "stable": { "version": [ @@ -54403,11 +54484,11 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20200103, - 1238 + 20210615, + 1506 ], - "commit": "100d62c7095743fadddfad5b9e0740ee386ba4cf", - "sha256": "0wpfl74v7xnvsk3ribxkfyy4p5p9j2wskrcf0naavqpgm6fc6jvr" + "commit": "b61b1582abe8f7a389883f48b7e5243abb010a69", + "sha256": "19nbas7kpbxksd0vqbvf8awzpnrmy97yxd616kcxcp86qk34mlwr" }, "stable": { "version": [ @@ -54910,16 +54991,16 @@ "repo": "emacs-stuff/indent-tools", "unstable": { "version": [ - 20190606, - 1642 + 20210622, + 1207 ], "deps": [ "hydra", "s", "yafolding" ], - "commit": "c419874e6fb296ecdba94b2f4b73c9eecdd5329d", - "sha256": "1dwhn9ssirr7i08rfd97mih629cxc9jwnvncb74dxdbgn1bi2b9k" + "commit": "c731f05fa3950e2e8580ec61b88abbc705639830", + "sha256": "0jri2vxd5a4sx93xq6kjcc5zx9yrhv789x3lyq6r2p2422diw2jr" } }, { @@ -55077,11 +55158,11 @@ "repo": "J3RN/inf-elixir", "unstable": { "version": [ - 20210315, - 1723 + 20210629, + 40 ], - "commit": "b526ce852886d1863163e054fcbbcbb83c55b32a", - "sha256": "1kmv2j1g299wb8dqq43zk61jigkfl9rnqxbfnclzsqfdlnhvw6ii" + "commit": "ec87ecaab5a10e79034f77d553e7fefbf60b9f97", + "sha256": "1p6r0iwqcaf9bp123ccwafmzlf8hgwvap0cqwgy33cks6bhcbzb9" }, "stable": { "version": [ @@ -55578,17 +55659,17 @@ }, { "ename": "insert-kaomoji", - "commit": "216fcef758036cf466fa5b52599394709eed48b3", - "sha256": "1ip61cigz6b6hsj8ahgb6fxf7yab24r0rjjl11i10ykq7sb49k00", + "commit": "982788433004ba644a372c50130613e3c56bba10", + "sha256": "0yaz5fsnxdrnv16sns8hgvf07fmfz8p8969619ywv844kv3p16q7", "fetcher": "git", - "url": "https://git.sr.ht/~zge/kaomoji", + "url": "https://git.sr.ht/~pkal/insert-kaomoji", "unstable": { "version": [ - 20200325, - 2248 + 20210618, + 2249 ], - "commit": "d18423f78cc02ba866b1a1dfb0617476cd941c54", - "sha256": "0n6fjndwcp2qg8164420dlc3xsdzm6m0zwbvvwn5w03khbk788hr" + "commit": "25b74d527cef00f6a49985161a8caaf62faa887c", + "sha256": "1qqxw67fbpix290jjrfai6z33fsyzb3zy1nwzk6mjss151586f5n" }, "stable": { "version": [ @@ -56862,15 +56943,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20210426, - 2144 + 20210609, + 1053 ], "deps": [ "ivy", "posframe" ], - "commit": "084cc59ea2cd62afaa51445ada3d00404749a541", - "sha256": "170z5akdwxzrn0b4cbk6v8a3dqz229b7pj9n0534y1a7ydvcyv9h" + "commit": "9c8382823392d5e64fb4879055e43ab4a029e62a", + "sha256": "1dqbgi12rd79jkrbyd59lrx9b5wi5a0k2xmf927c4mcqjfbvih2w" }, "stable": { "version": [ @@ -56993,8 +57074,8 @@ "ivy", "rtags" ], - "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", - "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" + "commit": "65113e2a137baa9f85dc2157b893291470788dc4", + "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" }, "stable": { "version": [ @@ -57060,8 +57141,8 @@ "espotify", "ivy" ], - "commit": "3d62a3319ab03a810030058d3fb368b28dfd82d5", - "sha256": "0hj3nczmqmgiwsvh664rs34j63wl325x6nar21p1a84h5ximpkxq" + "commit": "5bf63dacc5df8a74860e80dabd16afce68a24a36", + "sha256": "1vxg86wv6f96bva0d1xxhisk525chwhdl4nq77xhriflq65mcmi3" } }, { @@ -57858,11 +57939,11 @@ "repo": "rymndhng/jest-test-mode", "unstable": { "version": [ - 20210228, - 132 + 20210615, + 41 ], - "commit": "fb2bacab9475410c79e6e4ca344f093f7698466d", - "sha256": "0m3p75659krzcyc54ri0x8bwr1zxhkrfmyz8z7z5mjpydb8qb1v8" + "commit": "d7660096e7d49f9b2ebc8924c0f5b39c5ffa8c86", + "sha256": "1sw1cgykq9i6wdjjlqlw6jrdxnic615k96lbqyir84fizn55qcja" } }, { @@ -58412,14 +58493,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20210414, - 2241 + 20210622, + 102 ], "deps": [ "cl-lib" ], - "commit": "b891edecedf30be6321e2f109fdfeb25b0edad27", - "sha256": "179vkwr57nibc148b961g1aim052v65qsva44imxibkm9h0n32w9" + "commit": "4eaf98e3cc3789381a37a05cd70a248db9ac8c1b", + "sha256": "0mlp1pbph3790lvg5j6cdaffhb9ly8jdl00lmffs14840b8prkf3" }, "stable": { "version": [ @@ -58484,8 +58565,8 @@ "deps": [ "js2-mode" ], - "commit": "d970dd53dec76f9f72ade5b1f8717dea3d45bb3c", - "sha256": "0i46frhgmkw6qga1mki9bsrm6zncyca9fr81n1sadmgwfl1rxl28" + "commit": "ab01c290860ab0d8f43afcf1f7466fdced24e123", + "sha256": "12g1yah3k0k0p6nlrq8j9iq5l59zalknix60s1zj24bssac5y0zj" }, "stable": { "version": [ @@ -58777,14 +58858,14 @@ "repo": "tminor/jsonnet-mode", "unstable": { "version": [ - 20210527, - 1557 + 20210627, + 1451 ], "deps": [ "dash" ], - "commit": "54a89b0aaba7a68782008c5e1ab00d5ec757316a", - "sha256": "14nxfa91yg2243v4d5kvynp2645x3811ispmhmpgil3x9qbl9jg9" + "commit": "404ebe3ca964fde99b7a6d89d2840ce53376d80a", + "sha256": "1ddkljjmvbm35gdw6wnys2na19826wxxgydlikn52nvchvr5z5z9" }, "stable": { "version": [ @@ -58820,10 +58901,10 @@ }, { "ename": "jst", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "1kxf8ckhsh0sgc4xqkkyh7ghk17farqqz35ibvmyrkl9s19ydj1q", + "commit": "93d46615545045ea2a9456b8a28016ec933e43d4", + "sha256": "0zl20xy33cz1k0lcm2ymk0bi0w7ayndq0xqrw42fvd7gm1plbsd4", "fetcher": "github", - "repo": "zhangkaiyulw/jst-mode", + "repo": "victorteokw/jst-mode", "unstable": { "version": [ 20150604, @@ -58933,8 +59014,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20210330, - 1901 + 20210624, + 547 ], "deps": [ "dash", @@ -58943,8 +59024,8 @@ "spinner", "vterm" ], - "commit": "03b4296ba7151963eb3c850f3314b02644101f51", - "sha256": "1jgs0pz8bzqg8116kyw3z7jwbf6karrl89ks028q091ylc00nm8b" + "commit": "47f1b125f8364a0aa8c072fdc7b4007aad5c0724", + "sha256": "12lqc5yysjzf0vypjcs2mnsv6frhwyfm950rcsbwkwz3lvfnrajn" }, "stable": { "version": [ @@ -59216,26 +59297,26 @@ "repo": "TxGVNN/emacs-k8s-mode", "unstable": { "version": [ - 20210414, - 1543 + 20210618, + 1540 ], "deps": [ "yaml-mode" ], - "commit": "14f08627d5bc320fee5bd9926e9aabe6956f514e", - "sha256": "1rfglmslhv3i71fgsqs8gjcnkff06lnp0b9s182rsnfz29dnzd1a" + "commit": "430e9d698f1411efe3f8f2bb4c8f8857e0321a8d", + "sha256": "0rpgsfxvbic7ni82cpqi7wya73ajbd2jfbjskklzlmhwn1j26a9v" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "yaml-mode" ], - "commit": "9364cdbbae00055c4efa1eeb80503e0b0a215743", - "sha256": "1ap8nwlv9ha5a03gc10sva12sc6qzq1vig8hibg1igbsc1qmfkad" + "commit": "430e9d698f1411efe3f8f2bb4c8f8857e0321a8d", + "sha256": "0rpgsfxvbic7ni82cpqi7wya73ajbd2jfbjskklzlmhwn1j26a9v" } }, { @@ -59849,11 +59930,11 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20210521, - 828 + 20210616, + 826 ], - "commit": "a12ef1fb480b56c34c92f48fc7f7aa8a1d7c4c4b", - "sha256": "0093v1c5nl2bh1lvccqq6fzpgjald3yypp87dsim982aywl2vlv1" + "commit": "04ba7519f34421c235bac458f0192c130f732f12", + "sha256": "09xr0h2ag3pzlz455gv5h915vn1dz56gqx61jx3n7fc4a794pqxw" }, "stable": { "version": [ @@ -59920,14 +60001,14 @@ "repo": "dacap/keyfreq", "unstable": { "version": [ - 20160516, - 1416 + 20210630, + 1318 ], "deps": [ "cl-lib" ], - "commit": "e5fe9d585ce882f1ba9afa5d894eaa82c79be4f4", - "sha256": "12m1jy8m8i39b809qbxx9g3r066jxhqwfyf5mqbd1lzlaw63b1i7" + "commit": "7bb36e910ae04ff1dce387e3ce73b669d299680b", + "sha256": "188055yg9fqw92p1wip7mx7nz5gz5jbwb6lgcjncxzs4i9v7w8kr" }, "stable": { "version": [ @@ -60316,8 +60397,8 @@ 20210318, 2106 ], - "commit": "3894a454ee03ede25e920759e6ac2df040ff3431", - "sha256": "1crqrmzxhm21psv5mkbzn3h2syrgszx50i4kd4n92f56dq7s8i4b" + "commit": "143ba31a0a5c23d8c1a8d6fb1972d94cc1d7f31c", + "sha256": "1daisqp687p0bpjk8mj7c3sxq9clwi25byzbk7yx8l15rcr1bhr5" }, "stable": { "version": [ @@ -60527,10 +60608,10 @@ }, { "ename": "kroman", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "0rcy3343pmlqzqzhmz2c3r0b44pn8fsyp39mvn9nmdnaxsn6q3k8", + "commit": "ff990cb7ff2c10c3d6c97b820c9eaad7c4e86b11", + "sha256": "0vg7wrm7h36gnhhyjpk6k2sq5x1rilzaqhjrhyk508f5jfzylzqz", "fetcher": "github", - "repo": "zhangkaiyulw/kroman-el", + "repo": "victorteokw/kroman-el", "unstable": { "version": [ 20150827, @@ -60601,8 +60682,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20210326, - 2053 + 20210623, + 1316 ], "deps": [ "dash", @@ -60610,8 +60691,8 @@ "transient", "yaml-mode" ], - "commit": "91d1c8e97e4168fc49548c3449b4a60568c96790", - "sha256": "16s6iy3igb40r29x4bpb2x9763pf1fg5cygfdgabjq8xq36slmg8" + "commit": "801d4cc78cb59b3c39e9ea53d7f16ec3c9a6bb6b", + "sha256": "120pyq6njxvhjwjrsbrclxj9g4qsi9awm9pmvvy74z3qzxjkj7bl" }, "stable": { "version": [ @@ -60643,8 +60724,8 @@ "evil", "kubel" ], - "commit": "91d1c8e97e4168fc49548c3449b4a60568c96790", - "sha256": "16s6iy3igb40r29x4bpb2x9763pf1fg5cygfdgabjq8xq36slmg8" + "commit": "801d4cc78cb59b3c39e9ea53d7f16ec3c9a6bb6b", + "sha256": "120pyq6njxvhjwjrsbrclxj9g4qsi9awm9pmvvy74z3qzxjkj7bl" }, "stable": { "version": [ @@ -60661,27 +60742,27 @@ }, { "ename": "kubernetes", - "commit": "16850227ea48f6f38102b9cdf80e0758766a24d2", - "sha256": "06357a8y3rpvid03r9vhmjgq97hmiah5g8gff32dij9424vidil9", + "commit": "870901c45fb35384953568a972aa36ad445e1ad9", + "sha256": "07x770fcnjg0545bml3jqmd9d9l1bw8i8i4imznqhwx3acm8grzy", "fetcher": "github", - "repo": "chrisbarrett/kubernetes-el", + "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20210604, - 909 + 20210630, + 612 ], "deps": [ "dash", "magit", "magit-popup" ], - "commit": "93d7b4d1b079b3cf1fbe3949154b6a1bc06904ef", - "sha256": "0xz35j38ph1l870zrdd0r2xycxq65pbq1a1hi270q4mikpai85gb" + "commit": "d8034e6ddd668d2f7d34b6aa7bd19e2a575b609f", + "sha256": "1hp760wqwzflpnqrha1qnrbilr3qynd1dma00jyrhq76hdb83xwv" }, "stable": { "version": [ 0, - 13, + 15, 0 ], "deps": [ @@ -60689,40 +60770,40 @@ "magit", "magit-popup" ], - "commit": "8ae9dc2340620c7d8efb2347723b25bde5a6fba0", - "sha256": "0di3vcq8c8j8avjlic7bhvbq4p27cvzyklm26wiq4rga88vjhyb0" + "commit": "ea81874f0490cea310b09c57718aa0e5c83d578b", + "sha256": "13kra8y8laqk949phxwlw5q0lmv4yc9knql12srdys1hyvhczwx3" } }, { "ename": "kubernetes-evil", - "commit": "16850227ea48f6f38102b9cdf80e0758766a24d2", - "sha256": "12ygfs6g9aivf2ws3lxwjm5xnd2kidhli889icpygd5v7gnk9pg8", + "commit": "870901c45fb35384953568a972aa36ad445e1ad9", + "sha256": "163idbancjbm8jj8bprhrg7lqypz3g3qkfz7mas0b40iw6ip220h", "fetcher": "github", - "repo": "chrisbarrett/kubernetes-el", + "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20191108, - 615 + 20210628, + 2003 ], "deps": [ "evil", "kubernetes" ], - "commit": "93d7b4d1b079b3cf1fbe3949154b6a1bc06904ef", - "sha256": "0xz35j38ph1l870zrdd0r2xycxq65pbq1a1hi270q4mikpai85gb" + "commit": "d8034e6ddd668d2f7d34b6aa7bd19e2a575b609f", + "sha256": "1hp760wqwzflpnqrha1qnrbilr3qynd1dma00jyrhq76hdb83xwv" }, "stable": { "version": [ 0, - 13, + 15, 0 ], "deps": [ "evil", "kubernetes" ], - "commit": "8ae9dc2340620c7d8efb2347723b25bde5a6fba0", - "sha256": "0di3vcq8c8j8avjlic7bhvbq4p27cvzyklm26wiq4rga88vjhyb0" + "commit": "ea81874f0490cea310b09c57718aa0e5c83d578b", + "sha256": "13kra8y8laqk949phxwlw5q0lmv4yc9knql12srdys1hyvhczwx3" } }, { @@ -60969,8 +61050,8 @@ "highlight", "math-symbol-lists" ], - "commit": "63796ccadcc9147c5badd9a87f626611f63e3c4c", - "sha256": "1iwgi7jm20qwxlfa7klkz5zmdfxa14psly6xsl29i37j9p6146sb" + "commit": "56f808edfd0983c0df2ed1c957c50c02af5faad3", + "sha256": "05fyx88wmyc4c6lcy5qphg6zhbfmlnpy7y23l00qfi5k9hmv99hm" } }, { @@ -61095,25 +61176,25 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20210411, - 1332 + 20210618, + 1532 ], "deps": [ "cl-lib" ], - "commit": "30a5bc267af7de167d0a835ead828016e6e7e14c", - "sha256": "1wkppwh72zs8b4jqdxqpf3gikh11la03nkj8nna9bg7k8n0a4vaq" + "commit": "7db7ba27d2abf8891d40dc952c22d3a3654d9bbc", + "sha256": "11wzyv6jdprppjqygszl30hkxydjlhk7fdvda6h37k6dlk1fh1wp" }, "stable": { "version": [ 0, - 12 + 13 ], "deps": [ "cl-lib" ], - "commit": "2c99ce29b86fc635649f4e89723912dc1cc4f36c", - "sha256": "12fzzdc4jns440gb71iydsicni646gciaxv50p0wrfk9mbppidck" + "commit": "7db7ba27d2abf8891d40dc952c22d3a3654d9bbc", + "sha256": "11wzyv6jdprppjqygszl30hkxydjlhk7fdvda6h37k6dlk1fh1wp" } }, { @@ -61124,26 +61205,26 @@ "repo": "PillFall/Emacs-LanguageTool.el", "unstable": { "version": [ - 20201111, - 515 + 20210621, + 453 ], "deps": [ "request" ], - "commit": "531ab81bf66c778616a326b93d4eedd509dd795e", - "sha256": "03mrlwic3ws54573abc8wpq4apffnmq4ncqlwsvs4nhg14yl2s59" + "commit": "feea3f9271ce920490a0d9dcd11e669e3eaad1d0", + "sha256": "0vxq945x1yn86kpw7qbb686vb3pzyk7wma8g0dbval2m4hsbrn26" }, "stable": { "version": [ 0, - 3, - 0 + 4, + 2 ], "deps": [ "request" ], - "commit": "531ab81bf66c778616a326b93d4eedd509dd795e", - "sha256": "03mrlwic3ws54573abc8wpq4apffnmq4ncqlwsvs4nhg14yl2s59" + "commit": "feea3f9271ce920490a0d9dcd11e669e3eaad1d0", + "sha256": "0vxq945x1yn86kpw7qbb686vb3pzyk7wma8g0dbval2m4hsbrn26" } }, { @@ -61364,11 +61445,11 @@ "repo": "pekingduck/launchctl-el", "unstable": { "version": [ - 20210309, - 1113 + 20210611, + 2243 ], - "commit": "86cbb8980de4641b552a792389cc2cb9b2718ee4", - "sha256": "08prmsx6ski5j1pnzr7v3hxvbdrb5by8x2dihwhz0wjgfsqj13mr" + "commit": "c9b7e93f5ec6fa504dfb03d60571cf3e5dc38e12", + "sha256": "0hbhbyl4qbc9b7hmkjpwclyfh4xnl5j51j18793wrh28xqpbkf0s" } }, { @@ -61476,11 +61557,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20210603, - 1518 + 20210611, + 1550 ], - "commit": "af0d4d8daaa323c34502d3cbea85ec8f70b06c00", - "sha256": "0p4smpfld1ky07cy5qn8kqpbqw5ymrn8valkpx4c519lj6pb9rn6" + "commit": "a4fd520f5c31f54e0797155866e0b35df277664e", + "sha256": "0xy1zjr32xpj4kkl3rxshcz5x2qvkn1ciq4v61p6a7vfr3qmkiz2" }, "stable": { "version": [ @@ -61775,8 +61856,8 @@ "repo": "kaiwk/leetcode.el", "unstable": { "version": [ - 20210121, - 1600 + 20210620, + 706 ], "deps": [ "aio", @@ -61785,14 +61866,14 @@ "log4e", "spinner" ], - "commit": "9c44791407c3f4f76d903ee43367547803ae9c32", - "sha256": "14nlmgbkb8vyb0r25sdg03lg2h38gj83vspp9v9vsqyiiirhnvnh" + "commit": "aeba19919e6d8f1c0529330572240143a2af38e0", + "sha256": "0yfghps19832w4sdjaglnbb9xn40fc5a6072lxbsw8gan9c2bjh7" }, "stable": { "version": [ 0, 1, - 18 + 22 ], "deps": [ "aio", @@ -61801,8 +61882,8 @@ "log4e", "spinner" ], - "commit": "ef59344158ae4b7842ca2531ec77c439ed6e6997", - "sha256": "0sxrzr34x43dcxw9l3ib982rz4327fpwnjmj3hi17bc5gk6zzfq2" + "commit": "aeba19919e6d8f1c0529330572240143a2af38e0", + "sha256": "0yfghps19832w4sdjaglnbb9xn40fc5a6072lxbsw8gan9c2bjh7" } }, { @@ -62049,16 +62130,17 @@ 20210603, 1241 ], - "commit": "1feb8af64c977946b6184b7d63b436c49dbeb52d", - "sha256": "0vxpkvp8fsi52zb2sqqd9xfdndyxb59hqg8qkpdfsdwszxngfij5" + "commit": "8b73426766029eb541b69f49cc49b9dfa1c616be", + "sha256": "101mpzj38w6cng09aq5rq4ly4a0p9zgr8jmbvlkf12i8k03lsfsv" }, "stable": { "version": [ 2, - 0 + 0, + 1 ], - "commit": "76eaf432f768b45393e404c1bd1861a08c19de3b", - "sha256": "0vxpkvp8fsi52zb2sqqd9xfdndyxb59hqg8qkpdfsdwszxngfij5" + "commit": "c09b9aebaa659f5c2d0c152d8401fd6924144ce9", + "sha256": "0a5cfnk3021idvv4bv2lvnksjy9d0yyd13bnj793ks86j5f3hdv5" } }, { @@ -62153,11 +62235,11 @@ "repo": "magit/libegit2", "unstable": { "version": [ - 20200515, - 1759 + 20210620, + 2017 ], - "commit": "0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a", - "sha256": "0pnjr3bg6y6354dfjjxfj0g51swzgl1fncpprah75x4k94rd369f" + "commit": "77bd28aeaa2a49962e8f714741f5a69b656a2183", + "sha256": "19sxrikxl0kbfnbl2rdjvj96l9abmqhi68jj5hglgpa8qp3flc24" } }, { @@ -62183,20 +62265,20 @@ "repo": "mpdel/libmpdel", "unstable": { "version": [ - 20210107, - 950 + 20210627, + 755 ], - "commit": "9162a4b350c978f94dde6f75d60bc6a17e1dc18e", - "sha256": "0w45g4pkjsggv5yqw0zsnwqvzljapfvhxzf0vhnrqc446ys9jzp3" + "commit": "e4ae63dd002fe07835c3c8a35b20b6e8347f8e84", + "sha256": "0pryjihv1766x86lqy2anpxwr159dndlzmqxxiiwhhz4skp5498w" }, "stable": { "version": [ 1, - 2, + 3, 0 ], - "commit": "a9d67cea595bfeff73cf6281fa735df98dee9a45", - "sha256": "1nzs6g2mg3jhfhhfcxjhd9sbvwzhmr6j6mc80ln2nr4gzjqgaa4k" + "commit": "b49ab2fe497d61d7d00ed1ad0c3b5a1d6a65e5c4", + "sha256": "0krxhcay5s9s7i41q7ga5skj31vaz2qx3djcrlwajf203bl8j4m9" } }, { @@ -62296,36 +62378,36 @@ 20210303, 1751 ], - "commit": "be7ff92e4dfb06ed51baaa10157d9a1ee1cd666a", - "sha256": "067i605hk3qy01106l90bbl91ivr3zqv2yqr41jf5pfysafykx4x" + "commit": "95538837d93c9d05e35ea85d6c25527fac715df7", + "sha256": "0p3v41vrsfjv866gjys2izmiyxl7vaiy7m93ra9kx45mrslyjcyg" }, "stable": { "version": [ 0, - 17, + 19, 0 ], - "commit": "ec97fdf14ce7a65398ecc2755654db46a3ef3b14", - "sha256": "067i605hk3qy01106l90bbl91ivr3zqv2yqr41jf5pfysafykx4x" + "commit": "0169d3ef40403c1bb41b5ce81c7ae2ec01a6ba1d", + "sha256": "0p3v41vrsfjv866gjys2izmiyxl7vaiy7m93ra9kx45mrslyjcyg" } }, { "ename": "line-reminder", - "commit": "6c2287c7b4c543e92ccfab120388b2c05174d2db", - "sha256": "1s3ibn7c1j6m7wdkb0z37apgfc0g8vhhrqcnmldf19zi3k13bm0x", + "commit": "eb151125750b06c2cf6fcc5d762c980fdc89b0dc", + "sha256": "1l7bf0lvncn645v7c3rr5gxd9jkz5jfyaps864mzwvmasbx6d3p4", "fetcher": "github", - "repo": "jcs-elpa/line-reminder", + "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20210531, - 743 + 20210627, + 2121 ], "deps": [ "fringe-helper", "indicators" ], - "commit": "1856034d0ed8ce41a29a1ea051184ee7c2f3e276", - "sha256": "0ni73ybrg21l63hs51pixkxf77bl288hzji03bm8v1hzsm72vxxs" + "commit": "355cdcb6888fe6668e85a96dfe694d4bd050372e", + "sha256": "0hs5js38djfid0aqz0ygswqj26j3dpqjbaidghlfhdhcvifixsvw" }, "stable": { "version": [ @@ -62352,8 +62434,8 @@ 20180219, 1024 ], - "commit": "68e59d0fff1eb76c7b1a72c438f344c251115e81", - "sha256": "1ipqf3qfgzcrrp6xwgxb6wkk8a6ii5jx5im5gfhghdhy45z2m3ii" + "commit": "a52bd2bce9d6fb73dc7fe1e867e3ea804b5abd07", + "sha256": "18fl0f3j6bfv85pjcf0fggd0k6l6gxwvi19jrp3slzf0mhrlxd8k" }, "stable": { "version": [ @@ -62944,8 +63026,8 @@ "deps": [ "s" ], - "commit": "29bb40a7150b6cfe1a96948ae1f36e9c107eb759", - "sha256": "1dznafcfwmd52jakkzzk3dhji55aal7hsfkglr3051fz8pkz7xfx" + "commit": "18d523d5b6a8cecc3e93c550d2ceab2d1035de02", + "sha256": "1d8dlb2xsqk88lac7f9n0y8ridkn6gfl5pb6sr2n66v9mq75j6rq" } }, { @@ -62985,11 +63067,11 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20210605, - 1238 + 20210612, + 1056 ], - "commit": "41f0946037b50323901ce708c1af82e59a334433", - "sha256": "1hjb1f835xq5jgq4s0dpr85vs5cap001lxv9n02l198gb2qppq6k" + "commit": "1a6465d4190491ddf927698554b13352a7babb3a", + "sha256": "1nbzrxfrz209dgnlhkqq9bpf2h678laac2wsrrmf9flw65dpafv9" }, "stable": { "version": [ @@ -63082,11 +63164,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20210413, - 205 + 20210701, + 1735 ], - "commit": "c191b149f93ed473f3900e506cfc762d53145237", - "sha256": "0likjz2q0pbs3cbqczdfhh6k0c1j8y6j32cxkcpjm9wakp1vzxq2" + "commit": "96ca0e9058d8c1e533ce9aa1396e49f086362b06", + "sha256": "0bcilb7mcf9al3qs8i63idw97025b193sslrwkd7w8pphk2g9cqi" }, "stable": { "version": [ @@ -63658,11 +63740,14 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210601, - 133 + 20210701, + 216 ], - "commit": "50494b545b9a909fc6570216230beda1ebeedf36", - "sha256": "0wag0hhpak0i1k2bmzz896jkpadrmacj1m0bbb3y7rrl9sw1dcqg" + "deps": [ + "map" + ], + "commit": "27df47157a0a1753065172a346a2ffeb1778a99c", + "sha256": "0cwqyggc9hf5kwpypw0230p5fl3j8a6b2k3cgsrfk4i4lwkfnr5c" } }, { @@ -63673,15 +63758,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210601, - 129 + 20210701, + 216 ], "deps": [ "dash", "loopy" ], - "commit": "50494b545b9a909fc6570216230beda1ebeedf36", - "sha256": "0wag0hhpak0i1k2bmzz896jkpadrmacj1m0bbb3y7rrl9sw1dcqg" + "commit": "27df47157a0a1753065172a346a2ffeb1778a99c", + "sha256": "0cwqyggc9hf5kwpypw0230p5fl3j8a6b2k3cgsrfk4i4lwkfnr5c" } }, { @@ -63748,8 +63833,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210601, - 420 + 20210608, + 2101 ], "deps": [ "dap-mode", @@ -63760,14 +63845,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "7ef909a1c9e0e1c924b43637899e0d53b0d1b00f", - "sha256": "1vsfs0jpk7fdfb3zmpxs3f7fy0s7d9b8jha5p7y6g0afhxz4iqn1" + "commit": "01d89d43f17a15c7ccad5a458250d5d6b0f70b09", + "sha256": "0vnzzfap7ndr26016n1c1q21ga2lgw9vb555mn4dql6ny191ri0r" }, "stable": { "version": [ 1, - 18, - 5 + 19, + 0 ], "deps": [ "dap-mode", @@ -63778,8 +63863,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "90a06dfc23750c3861628256a4af4e3b00b2e23d", - "sha256": "1cabxsz7gbjywhsqjqp32vdgycg2mq21mdxvwbfcs6k0cf319dwh" + "commit": "49bb4d597e30c95d66a96739ea10c1c4f74ac649", + "sha256": "0kwzi6f3ig6lq95h2y9nddwkisml1fig290vn1sm7wkl3r9ci8bd" } }, { @@ -63797,8 +63882,8 @@ "dash", "lsp-mode" ], - "commit": "fa304ea402ac492e97bee14496a41afa8508cc5e", - "sha256": "0y0z4ind08jj93qsxgvi5zqa5f8lnamg8fv2dvkgipx1qvq25r4c" + "commit": "49a6bab0b1ad88d220305dbe3a0a14d368f62354", + "sha256": "1i3gywik5m9j797c69ng70bs28qdww9662sjl6y232rw19rya93b" } }, { @@ -63841,8 +63926,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20210523, - 403 + 20210616, + 1021 ], "deps": [ "grammarly", @@ -63851,8 +63936,8 @@ "request", "s" ], - "commit": "f34f0d50a91a82ab9c49e2cf5ddcb42a98cc2ede", - "sha256": "1hqilkbxa63gkl6sc8km6j0m4lxindf184c1zl91h4sfh4kg67zb" + "commit": "57a698e69c0dacbcad30398c262cdc5711efba71", + "sha256": "17jhfzy7bk645402yi65dsw19rvyjqm5wfd8y73hcfniihdrnqzp" }, "stable": { "version": [ @@ -63879,15 +63964,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20210209, - 2150 + 20210621, + 1334 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "7efbef3d206989faa8b691a4230a3ed872542187", - "sha256": "15xp3gjj9zdvxbhcgw21108s9y99rfmih5sqlk7f0m9hw5mqw4zm" + "commit": "eb37ac4a6a43277263bbb17aed6a862a0992ae8e", + "sha256": "04pcwcw5bq6hs0zr553sf9isbslp4pbahbch0yb0l472ihlbcxwh" } }, { @@ -63949,8 +64034,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20210520, - 1747 + 20210701, + 725 ], "deps": [ "dap-mode", @@ -63962,8 +64047,8 @@ "request", "treemacs" ], - "commit": "b6f14d8ae3cddcbacacf245aeef46e5407e5b401", - "sha256": "1xb051wgllmfm87bw4kiznfbsv54jqr9q02h2zy9np74n51q6jp7" + "commit": "28c56ec59a8c1b197727f4d56cec724445661fd9", + "sha256": "0g544mxv362ypwg79kyvjmnr63ss5psp89dmmzbx0bfpk8z4ib0j" }, "stable": { "version": [ @@ -64074,14 +64159,14 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20210607, - 1206 + 20210608, + 1330 ], "deps": [ "lsp-mode" ], - "commit": "a5de6b7166935af4a1e05d254fc1a44600518066", - "sha256": "0i5mbz7mwnax7jwv9c1bkwp5jwqrvwvh51fgwkmnz0kpjxhzfpsm" + "commit": "0e4c96a625bd83930cac338eb7a998c024a15f38", + "sha256": "11gvqbp9j585g86ir610lb3fq87nbwr44j3xzifh4rga6cwdb6yj" }, "stable": { "version": [ @@ -64104,14 +64189,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20210405, - 1702 + 20210616, + 1021 ], "deps": [ "lsp-mode" ], - "commit": "0fd8baec7e5f92d74b8b80d02c926d32332d86bd", - "sha256": "04jx5bknns1fyany1x8wzs6yx9qxzwrwj8m1iardxy8la3jp6ncd" + "commit": "cd6fa0b32118792e9f7bcbf4a26032bfff05d603", + "sha256": "16hn5wbfa4f958pyl47l4nvqx092ws16l99dcwijzk9xs4wrkipn" }, "stable": { "version": [ @@ -64134,8 +64219,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20210529, - 752 + 20210615, + 1413 ], "deps": [ "dap-mode", @@ -64147,8 +64232,8 @@ "scala-mode", "treemacs" ], - "commit": "4c11fe47ef3c71a2fc7cd67a055ea0bc5883a0c6", - "sha256": "16laslmvsamvcn58gsi6hfs53p12q0nz7zx993ipa2xhy6n04hcg" + "commit": "9f82ebee48d32cd7bbc3e64b84d1ef5b0926195b", + "sha256": "1l4sxkmlif6dlh6j11fgy6z7hs4739jdcazm0y35cbhq9bspxsnx" }, "stable": { "version": [ @@ -64178,8 +64263,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210605, - 1854 + 20210630, + 2003 ], "deps": [ "dash", @@ -64189,8 +64274,8 @@ "markdown-mode", "spinner" ], - "commit": "7b75d6bf01bed9ccb108cf1406d0e2af29d7e39b", - "sha256": "1lbb3bpizibpnw77bgdf8j2303gwh2133n8s518frmz6gcb7kz8s" + "commit": "7b183d397f8bc17eceb4d156e24575a47a1d807f", + "sha256": "15br2gf55436jm5a3iygr8cp3vriiar85kmgmap88ws8z83qg17x" }, "stable": { "version": [ @@ -64477,8 +64562,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20210502, - 1804 + 20210618, + 1722 ], "deps": [ "dash", @@ -64487,8 +64572,8 @@ "lsp-mode", "treemacs" ], - "commit": "f360d54fa68a00baec228d9582bc67c1a327d757", - "sha256": "0wbni6njz98c23pns4wxg4mq26zrvpyxh0qcz0a4l46zdn1962vm" + "commit": "905cc74726438cf06d8ad7cabb2efae75aeb2359", + "sha256": "0kh8yn80x1fgpcvrgj9bqmlhpnkxqsy57w8m06gws8lhlnrh4yk9" }, "stable": { "version": [ @@ -64515,16 +64600,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210604, - 1158 + 20210619, + 905 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "c4ffa7abf6706d591300c608c51d2b72178848ad", - "sha256": "1qr7is4k5w6dcfkcvg7crna6r26lqmb02v08i3yggq09qd01c08g" + "commit": "240a7de26400cf8b13312c3f9acf7ce653bdaa8a", + "sha256": "1zscdjlnkx43i4kw2qmlvji23xfpw7n5y4v99ld33205dg905fsy" }, "stable": { "version": [ @@ -64550,11 +64635,11 @@ "repo": "immerrr/lua-mode", "unstable": { "version": [ - 20201110, - 1250 + 20210619, + 652 ], - "commit": "2d9a468b94acd8480299d47449b53136060b7b23", - "sha256": "1586k3friamcyfg1xszhkh1vaddrfxji1mn7rd7s8id8f7sp8mnv" + "commit": "2bd9077dd0405efc9276f612e24a345698c539c4", + "sha256": "0ldk6v7c3xamyhq6zwp2l79iyxfan0qmlycsvj39z3fljaz953z0" }, "stable": { "version": [ @@ -64632,8 +64717,8 @@ 20210607, 1130 ], - "commit": "b5391e8dc088d95d8f131f49982d5c7cbaa23677", - "sha256": "08bfjg51ydznfk8w7hwznzyybl42mqa5l0pvb4xapqcq2na3d3yf" + "commit": "d158bb78029705a6ee848f8e00c09ba1f3575564", + "sha256": "1dkx6xas7dg07pgk4h3f7cdr6hmccw00qv3fi8l2vj462nd7cr5w" } }, { @@ -65002,8 +65087,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210531, - 1524 + 20210701, + 1554 ], "deps": [ "dash", @@ -65012,8 +65097,8 @@ "transient", "with-editor" ], - "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", - "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" + "commit": "2ae376e4923e02355828350b81cdc1b0f8fa72ff", + "sha256": "1h07rg0fvr7av69bcks1n63digafq145mlsaddyv6xixxqjp0vbg" }, "stable": { "version": [ @@ -65352,15 +65437,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210525, - 814 + 20210701, + 1551 ], "deps": [ "libgit", "magit" ], - "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", - "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" + "commit": "2ae376e4923e02355828350b81cdc1b0f8fa72ff", + "sha256": "1h07rg0fvr7av69bcks1n63digafq145mlsaddyv6xixxqjp0vbg" }, "stable": { "version": [ @@ -65435,14 +65520,14 @@ "repo": "dickmao/magit-patch-changelog", "unstable": { "version": [ - 20210607, - 1635 + 20210616, + 1302 ], "deps": [ "magit" ], - "commit": "5cd99a6336ad4b60e9e8ce766b8a9c0395289775", - "sha256": "17s5268kcqhgd141fvjqnn2wrny7v03yz940k2whr383l1253k6v" + "commit": "623d1a6a3bfa0f01bcaaffa13ad5ce5ae29cdb0a", + "sha256": "1dds83a6fcpakmhny5n3s4ibcvjba4p07pg8bpy37k32c704lw27" } }, { @@ -65521,14 +65606,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210525, - 844 + 20210701, + 1554 ], "deps": [ "dash" ], - "commit": "4a8646a30df99bbafc95d4f21a0b2bf0a6f6566f", - "sha256": "0y3wzvyaxn5zybjak77r1cngaqqm462s3d4f1cwmzvrnpv99f3r9" + "commit": "2ae376e4923e02355828350b81cdc1b0f8fa72ff", + "sha256": "1h07rg0fvr7av69bcks1n63digafq145mlsaddyv6xixxqjp0vbg" }, "stable": { "version": [ @@ -66322,19 +66407,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210605, - 1213 + 20210620, + 1943 ], - "commit": "4c6272ffc4836de052c8b06f681b0e700cb01602", - "sha256": "0l4sl4w4yq3hkpvvw7w1mh046f95bkg1c3av07kwk9cm038rwhvg" + "commit": "9796fada769f44cb8e05914bd6be3fcc15d791e2", + "sha256": "0yn6dybvsdhr37hnadmbfqi7pf7scxr9z6a6ghsqbrghycddd0mc" }, "stable": { "version": [ 0, - 6 + 7 ], - "commit": "ca9a5e35913569d66d34193a87d8511b2bb9d2b2", - "sha256": "1lisns2vghmqlg8wiv6jy15cfgnc8j83khz0vfnmrjwgcmjw3bbz" + "commit": "9796fada769f44cb8e05914bd6be3fcc15d791e2", + "sha256": "0yn6dybvsdhr37hnadmbfqi7pf7scxr9z6a6ghsqbrghycddd0mc" } }, { @@ -66442,11 +66527,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210530, - 1825 + 20210616, + 122 ], - "commit": "58f2d22526ac1e4abd4ee1afff8624d2dd3123d3", - "sha256": "1k17zpx05yafxfsw89dlkymqc5xajzv28qby12kdhwwlsbarqvd0" + "commit": "1c7d29d52986b2cb153b5f643167ea49417de469", + "sha256": "0jgfxvhx5z3hjzpdxikx75ikgc0w7ap442svqpyigf78rb32wsjl" }, "stable": { "version": [ @@ -66516,16 +66601,16 @@ "repo": "ardumont/markdown-toc", "unstable": { "version": [ - 20210515, - 902 + 20210629, + 931 ], "deps": [ "dash", "markdown-mode", "s" ], - "commit": "86a4a2b092b0f23b9edb3ee0ab7da483b7f10a5b", - "sha256": "0n1fzla3dkscz70fy81fsbiyi2hj7swjy7zvxprhn36jjkb6b5hf" + "commit": "f78cba9b5761c91058fed3a781bd3fed7f996e1f", + "sha256": "12dddxa14ppa7gaayify67w4sc6ncbc68wdg4madfqj7s71lnm45" }, "stable": { "version": [ @@ -67363,16 +67448,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210606, - 1056 + 20210622, + 931 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "1cf2508f8e95311aa9ca405f899c3596cf8c2bc7", - "sha256": "12xzq9sxczjppqpx75bny2dp647m3f9ww6zf9a22rgmmspzkk5cx" + "commit": "174cb2fb5f1ae674a405667ed432cd6601f53656", + "sha256": "0ix0ph82j12v1x5bi9w643q0a9cik4yd02bmk5c919wnyfz1syy7" } }, { @@ -67383,11 +67468,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210408, - 1014 + 20210623, + 1512 ], - "commit": "7d929be2e9c1ae1a32e680591c5a224a96198e47", - "sha256": "0gpis7r2c7sppk4fx6alq9g2asva71xj05fjjq60zg87paimfdx4" + "commit": "a69ef83f2894c7e019c9b487b9646f7a63456471", + "sha256": "1v0pc3yglbgdpmviz45h1zcnc2kkz35jbvdzkrks122736nz1dli" }, "stable": { "version": [ @@ -67408,15 +67493,15 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210409, - 1323 + 20210615, + 1208 ], "deps": [ "auto-complete", "merlin" ], - "commit": "7d929be2e9c1ae1a32e680591c5a224a96198e47", - "sha256": "0gpis7r2c7sppk4fx6alq9g2asva71xj05fjjq60zg87paimfdx4" + "commit": "a69ef83f2894c7e019c9b487b9646f7a63456471", + "sha256": "1v0pc3yglbgdpmviz45h1zcnc2kkz35jbvdzkrks122736nz1dli" }, "stable": { "version": [ @@ -67441,15 +67526,15 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210409, - 1323 + 20210615, + 1208 ], "deps": [ "company", "merlin" ], - "commit": "7d929be2e9c1ae1a32e680591c5a224a96198e47", - "sha256": "0gpis7r2c7sppk4fx6alq9g2asva71xj05fjjq60zg87paimfdx4" + "commit": "a69ef83f2894c7e019c9b487b9646f7a63456471", + "sha256": "1v0pc3yglbgdpmviz45h1zcnc2kkz35jbvdzkrks122736nz1dli" }, "stable": { "version": [ @@ -67503,15 +67588,15 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20210409, - 1323 + 20210615, + 1208 ], "deps": [ "iedit", "merlin" ], - "commit": "7d929be2e9c1ae1a32e680591c5a224a96198e47", - "sha256": "0gpis7r2c7sppk4fx6alq9g2asva71xj05fjjq60zg87paimfdx4" + "commit": "a69ef83f2894c7e019c9b487b9646f7a63456471", + "sha256": "1v0pc3yglbgdpmviz45h1zcnc2kkz35jbvdzkrks122736nz1dli" }, "stable": { "version": [ @@ -67777,11 +67862,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20210416, - 33 + 20210625, + 240 ], - "commit": "380d6059fa9f102e736969d086749980820a9e0e", - "sha256": "03fxicfl7yvxj6ac636544km1khhmrjqi97r0smwqfxvlm2gs037" + "commit": "fc4bca6d95d8b8d5e169ecf1433d968c2eec299d", + "sha256": "0lcy73df204ww4kmbkfz5cbpmdwbsn7z47j5by89izn14dczllvq" }, "stable": { "version": [ @@ -68237,11 +68322,11 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20210603, - 2150 + 20210615, + 1510 ], - "commit": "aed285155dc8f073d766e752520ec599e77ce8b7", - "sha256": "1qxszcx9n1yfc9j9ihvrdwb57n19w03600z3v4z2ybxap1y0nq3v" + "commit": "1be68e8571336672d6cbec86246d1bf7844976be", + "sha256": "0lg704kwc851spp69745np8hsk0h6rl2hvfpid0j412278ds1qi8" }, "stable": { "version": [ @@ -68438,8 +68523,8 @@ 20210601, 2158 ], - "commit": "db502020ffe6bc65576b93527a20c0bf3df562da", - "sha256": "0gw6xw38x8h72gbvhmddgzijs4xvkrgs6c7v552db56hrlsj9lhp" + "commit": "d912fec98698c4f72a5f408d5a3f80e95327817d", + "sha256": "0gby38fd5vvfbm3pl2cvp6jsfjqi17xgh1m8vv9z9s6zang4knsy" }, "stable": { "version": [ @@ -68877,11 +68962,20 @@ "repo": "SidharthArya/modular-config.el", "unstable": { "version": [ - 20200824, - 442 + 20210629, + 2319 ], - "commit": "c0a6d3dac1aa176deb8417c77dfeac06e9f18e1f", - "sha256": "1pky409m3mip42k6qw4sf28ja50lsw17318kwgcrkl0nrvnbs31j" + "commit": "222ed4aab718ebcc2944c6cca87ebc3370d5ac3c", + "sha256": "0bdh5akywlj3grwclkl4vk82iij2jlvinmcp3xbi973n7y9i4s49" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], + "commit": "222ed4aab718ebcc2944c6cca87ebc3370d5ac3c", + "sha256": "0bdh5akywlj3grwclkl4vk82iij2jlvinmcp3xbi973n7y9i4s49" } }, { @@ -68892,11 +68986,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210607, - 917 + 20210630, + 1252 ], - "commit": "a2c8796fcbcbdd332165e02476c6de5799996d31", - "sha256": "0p9yzj70kx3s740dl7k3vwwkr1g9zxsirwl83n1nvswc4csgv20j" + "commit": "9b1d1594efa5d7389300b93c78f1b1dd389f9c27", + "sha256": "1m4wmcjhd7hck3rdg9anynlxzr9lnswkdzwypgwfwmabnvsyqvrm" }, "stable": { "version": [ @@ -69239,11 +69333,11 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20210522, - 1100 + 20210615, + 1511 ], - "commit": "392c77174ace6c57921f237f41eaa4c3a83ac303", - "sha256": "0b4kg4dxy4ywwin96vz6x3rpvgr718y5rgrdarmwym9wv1qz0a0c" + "commit": "9d8b2f758098d19781c7c5cdaeda5785e41be039", + "sha256": "1z9pspjrpclxznc9d16lix1zc0yx520jx1nqjbxj3kcwfxzkbbl4" }, "stable": { "version": [ @@ -69305,8 +69399,8 @@ "repo": "ageldama/moonshot", "unstable": { "version": [ - 20200210, - 2356 + 20210627, + 2244 ], "deps": [ "cl-lib", @@ -69318,8 +69412,8 @@ "s", "seq" ], - "commit": "c9f363b1b5f2b92006e03116580540dadb7364ea", - "sha256": "0r6sn8f5la1sxw7af2h349p8p5ybmgpc7aisc96wjilp1zrmdh8v" + "commit": "ec37a12825888047a90d9ee8131aa4bea348edf7", + "sha256": "0vd9m2zs3rch361ykmf0l3fjsrk1rwlb7w1dc7zz3gwpb6nas845" } }, { @@ -69598,8 +69692,8 @@ 20210306, 1053 ], - "commit": "d031469630c70188c20598c0f3a3c3c46c6c7a14", - "sha256": "13mbkpzfdy136y5w6ns73qy1fsxwqzsvnnfcid2x7rrrqbxrcm5r" + "commit": "171aebaf3a1fb76d1a460d12c7199bc6fbcec473", + "sha256": "06dw5blx8r6wzkwwwbi7p3fxs4flgsf2vlkz8vv9gar4cg9w7wy7" }, "stable": { "version": [ @@ -70256,14 +70350,14 @@ "repo": "ReanGD/emacs-multi-compile", "unstable": { "version": [ - 20210604, - 140 + 20210620, + 48 ], "deps": [ "dash" ], - "commit": "948ee25878c509d0f9ba8715b209eae79143b76e", - "sha256": "0lgp64pgblidm4jyr3wlv5xq2x81znzi0xvqm8h0f8af9jzl2b38" + "commit": "65699ac6a2f787a07908466e1cbfe3333ace7532", + "sha256": "05h4rh5g8kqz8sl31r8800rkrcv9ir6jh6qr38qwj1zrcd77zk02" } }, { @@ -70828,14 +70922,14 @@ "repo": "mallt/mysql-to-org-mode", "unstable": { "version": [ - 20200602, - 2019 + 20210622, + 447 ], "deps": [ "s" ], - "commit": "f3afc506f8b0d037238e49290de4b028c6ad9dd1", - "sha256": "19g21zvvamlhy1yrqhqbd1x3km6q2m650xsvl613rpcdqsk8l2ic" + "commit": "c5eefc71200f2e1d0d67a13ed897b3cdfa835117", + "sha256": "1ll7n8gxmzk7grlwh5igbxh7lvf7c08hi1xir2n0fj9wyzd432ny" }, "stable": { "version": [ @@ -71921,8 +72015,8 @@ 20181024, 1439 ], - "commit": "8fa4d05fea5140f80ff5f4629d19c6ce0d6f5cca", - "sha256": "0dn53fjq4dl8szpjqxn91md0xvr4sa458j1p0w8vgskc0iibzn4c" + "commit": "c8f8f2a9e3016ab7a9ecb2e8b084cf441f3ae88e", + "sha256": "1nj7w0dgvhmqy5hkdn0idf468x7s2h2y5372j13w3x1fkdcnyln8" }, "stable": { "version": [ @@ -72020,11 +72114,11 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20210523, - 326 + 20210629, + 2024 ], - "commit": "e4844f7a711c8d7dceb82b6b841a1e8485e12586", - "sha256": "0g05qa926xkayd79n2zi9ypd4m5245jjxwv2vp4hqn2cl76pnpak" + "commit": "d27820b0408b3e9067c264e25c009bd5cd9dfcd1", + "sha256": "0hrhzm703k86a4wlx0hwnivklniziy2xbrs1q0mvijmsvks60f57" }, "stable": { "version": [ @@ -72312,14 +72406,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20210605, - 1753 + 20210619, + 2158 ], "deps": [ "cl-lib" ], - "commit": "a6c8e0575766eb573a7add103836d578bd205962", - "sha256": "1r8rarcp0q0rl19kc6q7lll0djkvf3iw17rrsjswsq3z9fyq8iyr" + "commit": "b12a85a5afff7b5d60f889c1c2e8f5deab7fdbae", + "sha256": "193kyvj2f3zgb39shhcf2qk33rzbp8qp9mkc9p0cvnrc517h6y5r" }, "stable": { "version": [ @@ -72617,20 +72711,20 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20210605, - 1839 + 20210627, + 1741 ], - "commit": "6f0f83660e222cfdd05b05ad134763a7ab26f097", - "sha256": "0rs37inh95c1r91mjjwf1kssmxq8mliblzvdjypijps13fxk7m60" + "commit": "1768b0c416ce1034a5726ff0037e5a605cb45ab6", + "sha256": "0cynllvnhiibxa9a06xg9qzybvsl802l7lcc2jwzhja05l2wrdps" }, "stable": { "version": [ 0, 32, - 1 + 2 ], - "commit": "b580009e2bc69efb019983bf2f7dc5052c19545a", - "sha256": "06r0hdz8mxnzag74md62a9m6c2zm0fxn45n4n1c26j5cmrys7j16" + "commit": "af56f3bcdc8a644564a1182f58bd311907193a4a", + "sha256": "1f0xccc51z2fijj4cyx4pcxmam9pygq0z1rb4zrybz1vpsr7zrvk" } }, { @@ -72700,14 +72794,14 @@ "url": "https://git.sr.ht/~tarsius/notmuch-maildir", "unstable": { "version": [ - 20210416, - 1043 + 20210615, + 1513 ], "deps": [ "notmuch" ], - "commit": "e34c470521e83c3100f0d6eb9e7402ae35e19321", - "sha256": "0pmikf1djkr07067nkgmdcxyn7l7ibswx6qlnai8v1v51f9h1g9q" + "commit": "fd0e2199da746906eca080d4ca5bca17068cdce5", + "sha256": "1fqnx6hhg0cqj82yjpl7llg6vvppc3y8q9k6g67mqr7z3712bw0x" }, "stable": { "version": [ @@ -73121,15 +73215,15 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20210523, - 1746 + 20210616, + 1532 ], "deps": [ "dash", "s" ], - "commit": "dcbc06429084e209f081a8c6318b46c1c9ff7309", - "sha256": "0bggm5ssxpj49km8q8z9hj351garl1xydz1dya7r0yvz12y6wn5g" + "commit": "9209d52ddf43eddc983763b77f6932be61982475", + "sha256": "1sx7jj9w20gxxsqx5wa9m6da0971qp8mgp76hpdc1crqrx1mj55b" }, "stable": { "version": [ @@ -74199,6 +74293,25 @@ } }, { + "ename": "ob-swiftui", + "commit": "ed83f297fcccfc44be9d1a20f3b96071dd7b8a58", + "sha256": "0hxdacxqxqkjl6gi2j909vymjnnlpv8zsmlxw3r7g5i8f468d4qr", + "fetcher": "github", + "repo": "xenodium/ob-swiftui", + "unstable": { + "version": [ + 20210618, + 856 + ], + "deps": [ + "org", + "swift-mode" + ], + "commit": "31cfe991eb171bb0d2f53cf621be1b9d91573ac3", + "sha256": "1l2n4ijf3sfgj05xzvnb1cd9k24ynh2cg36yj386bq7kadamympc" + } + }, + { "ename": "ob-tmux", "commit": "a3f47fbfe745972e690e8028f893bb38ba30978d", "sha256": "12c0m2xxd75lbc98h7cwprmdn823mh2ii59pxr6fgnq7araqkz20", @@ -74416,11 +74529,11 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20210601, - 901 + 20210617, + 1726 ], - "commit": "be14af363e9338e86173c2d96732f59b3c76e73e", - "sha256": "10q2xd4mqdi9h6dbjfx5081l8sc025rgkxsz9hwm93yrb5xw1rwd" + "commit": "a54914c8f4bc5e2d57aac5ed15f1192c2f53abbc", + "sha256": "0625kwk1k8c4j92w4v5160zxcqxa2bf7kdmkii26m25fzw1az1d1" }, "stable": { "version": [ @@ -74613,26 +74726,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210521, - 1311 + 20210623, + 653 ], "deps": [ "org-re-reveal" ], - "commit": "fe1feb913bf69b1e854053e3f07026c14c6c91dc", - "sha256": "0w4x18srwhznd4xicr2sk7m3lhzgw6pyza7skar5i4n7y30q38xp" + "commit": "e828f86ee607de487cb60393b41c6919d0b66356", + "sha256": "0m3s68n31whryzwjz8iyd9mdzvdm2r9rh9cwlw8br5qh40jbl67b" }, "stable": { "version": [ 3, 20, - 1 + 2 ], "deps": [ "org-re-reveal" ], - "commit": "fe1feb913bf69b1e854053e3f07026c14c6c91dc", - "sha256": "0w4x18srwhznd4xicr2sk7m3lhzgw6pyza7skar5i4n7y30q38xp" + "commit": "26d6d8946ddd5f71954564f26e63f6b5f1e9c0aa", + "sha256": "0m3s68n31whryzwjz8iyd9mdzvdm2r9rh9cwlw8br5qh40jbl67b" } }, { @@ -74676,6 +74789,38 @@ } }, { + "ename": "ol-notmuch", + "commit": "b6d136b1033d9afdea965ab07ba7c05e9ecf56e5", + "sha256": "1hsc5xj9mj3p1fz4svwqam5gxhcnfrpx5s97c4rzf8fq0cnf5pd1", + "fetcher": "git", + "url": "https://git.sr.ht/~tarsius/ol-notmuch", + "unstable": { + "version": [ + 20210530, + 2054 + ], + "deps": [ + "notmuch", + "org" + ], + "commit": "126fb446d8fa9e54cf21103afaf506fd81273c02", + "sha256": "1pkb333m1rryhxf26p8661y7w9fnsaarn0qkzys1pyfj09q9rsmj" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "deps": [ + "notmuch", + "org" + ], + "commit": "126fb446d8fa9e54cf21103afaf506fd81273c02", + "sha256": "1pkb333m1rryhxf26p8661y7w9fnsaarn0qkzys1pyfj09q9rsmj" + } + }, + { "ename": "olc", "commit": "1e21abd021d72c491ed1503146c51761e18c56c4", "sha256": "0kcqwnhhy5wa0r61yqg9gly9jd6b1846q2w43fmhzk3l4nzky32r", @@ -75328,11 +75473,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20210603, - 1335 + 20210613, + 1723 ], - "commit": "e85084e733d6eb50893974fc5fd569b944a5010c", - "sha256": "1lmjmp0iwp8n9nrqvygav7y2fxxwqpv4kk2wy2gg4bi056arbx5a" + "commit": "2646dad28c0819fbe9ee521d39efb9ae40e03982", + "sha256": "0vxfinsx69fqpcgbsv6g26klim3yasds3ha9v3xkk32y9sb783lr" }, "stable": { "version": [ @@ -75491,26 +75636,26 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20210603, - 1352 + 20210628, + 2141 ], "deps": [ "request" ], - "commit": "03c1ca90a7f2583074f020619c7cb92a783fb375", - "sha256": "1pwgs9xm6i0cqhrwpl60y3xbd0k64nr48kfa83x3yk9x38i6ddp0" + "commit": "8cc47ecef5d90d4f0f2bba669bbd89f88fda4be1", + "sha256": "11a44kfbpa2w54kqqc9mg3bzz0p0jrdjsz8l9sn11irl8xlgrm67" }, "stable": { "version": [ 0, 0, - 2 + 3 ], "deps": [ "request" ], - "commit": "03c1ca90a7f2583074f020619c7cb92a783fb375", - "sha256": "1pwgs9xm6i0cqhrwpl60y3xbd0k64nr48kfa83x3yk9x38i6ddp0" + "commit": "8cc47ecef5d90d4f0f2bba669bbd89f88fda4be1", + "sha256": "11a44kfbpa2w54kqqc9mg3bzz0p0jrdjsz8l9sn11irl8xlgrm67" } }, { @@ -75521,14 +75666,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20210605, - 904 + 20210627, + 612 ], "deps": [ "org" ], - "commit": "cf87546d6458d36492a89661a1e097e5596aa26a", - "sha256": "18p8s0syqhqpk21ylbk8np3srknhi4ckxfxn7i4jkscsy8282lcb" + "commit": "12056f697fce51958e7baf837d250341bd86194e", + "sha256": "0p3h2inqqf9ighr9sig1spbni9mq0k4iy8w10w5bpjd3xm37qx80" } }, { @@ -76654,8 +76799,8 @@ "stable": { "version": [ 1, - 6, - 1 + 7, + 0 ], "deps": [ "dash", @@ -76697,16 +76842,16 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20210602, - 358 + 20210630, + 1503 ], "deps": [ "dash", "org", "s" ], - "commit": "40716a4cfd36304b4a16977020b1e82870faec15", - "sha256": "1wncx69rqlvx9pnr5mlwn9i00nrfhi1icxv0zpc7z2kzf03wn930" + "commit": "ddb1b95ac139676e4aa8a0b787e57feba34cc7cb", + "sha256": "0l563j9m8zcmsn8vqv3qchk4yqrfbigk5k4iqcw8p7cbix57sjah" }, "stable": { "version": [ @@ -76780,16 +76925,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20210527, - 1629 + 20210622, + 130 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "a01f0453667f9baccf0b8a514e9c9f0a9fb9fb6e", - "sha256": "1gn2sflvcc4gvgci3m12d16mjrwxywrd8vvrs7s87k0cf7yl74vf" + "commit": "f4599dd5dfd7f97a22ca98502f809a8d14551c09", + "sha256": "0i8rqila62qamv3mxh66g678kbang3sxjbf3x70nmrx7fyy2m2jv" }, "stable": { "version": [ @@ -76933,14 +77078,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20210222, - 227 + 20210628, + 1124 ], "deps": [ "all-the-icons" ], - "commit": "4662b3a7b9244aa35aae2f469f87be4a44a6b1bb", - "sha256": "1wb00rm6zdlb8hrhph783wi8zjra8m09gi6m2nnfr37al3986g0s" + "commit": "f78924c06c9f3902bab8e390d91402516d2bb502", + "sha256": "1v847kpc3fh4sxi1rw8pp6xlb89r6z224831xkd82gys74ya0724" } }, { @@ -77111,30 +77256,30 @@ "repo": "ndwarshuis/org-ml", "unstable": { "version": [ - 20210328, - 1655 + 20210627, + 1623 ], "deps": [ "dash", "org", "s" ], - "commit": "9d8c26d12c972a60b94bcc3b364d857db997cfa3", - "sha256": "102lrlf25i30xbpszr1mh6mkxd6wwgbwg32dafccxm4dmj3v9hqq" + "commit": "e14205312c54a1c97491c7f847d296b09f5f57b0", + "sha256": "030fsgdp8cg2h8mlxq6769l158pqcwnv4r3bl36lpjs950lv9pas" }, "stable": { "version": [ 5, - 6, - 2 + 7, + 0 ], "deps": [ "dash", "org", "s" ], - "commit": "5aeed6d0f7f878b20483975200df43b6fc7f32f9", - "sha256": "102lrlf25i30xbpszr1mh6mkxd6wwgbwg32dafccxm4dmj3v9hqq" + "commit": "e14205312c54a1c97491c7f847d296b09f5f57b0", + "sha256": "030fsgdp8cg2h8mlxq6769l158pqcwnv4r3bl36lpjs950lv9pas" } }, { @@ -77541,17 +77686,16 @@ "repo": "org-pivotal/org-pivotal", "unstable": { "version": [ - 20200607, - 1505 + 20210701, + 342 ], "deps": [ "a", "dash", - "dash-functional", "request" ], - "commit": "125e70f9a682751e4ed7c3a350b2794af9600f47", - "sha256": "1w91wb6l3vsri015awig1kfs986zf49466x4ni0m24hcg00n2m7n" + "commit": "f55b9773b2f4a502e636688bc1caa21ee0396abe", + "sha256": "1ipxr8s384pljlz9rzpdhmrsa7q7jzk27dblrrapgbgi52h3n5np" } }, { @@ -77594,14 +77738,14 @@ "repo": "rlister/org-present", "unstable": { "version": [ - 20200204, - 1647 + 20210619, + 1614 ], "deps": [ "org" ], - "commit": "9709ca2d04a59959354222ac4d3f8b750785739a", - "sha256": "08f8gh2zg4gr4d5ajlcnlj2lsp8nywni4mhw4w4nfa4dwyq7mxgv" + "commit": "5010b90fd09f484268f731b855d394deb8b5fc3d", + "sha256": "0k8l7qmxbxbzc4g0xh4ipssls78fky0cq2lg3864qdli820wzy5b" } }, { @@ -77655,14 +77799,14 @@ "repo": "lujun9972/org-preview-html", "unstable": { "version": [ - 20180625, - 619 + 20210623, + 1523 ], "deps": [ "org" ], - "commit": "8ba7ecd7ac624f33b3e2395f477bbff4f1ec4efe", - "sha256": "1h46v0ckhfzv3fixcfxk7pkmh56c5lana8kpwiknm447q1wmlbx4" + "commit": "3fe7dd85b8a7dc4ead7495095a3abaad28e2f809", + "sha256": "1vih94z3k8qz2vkzvcqbxpipijsxyfn2kvimylfwjrfbkrmvigsp" } }, { @@ -77767,12 +77911,11 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20201213, - 1358 + 20210624, + 1314 ], "deps": [ "dash", - "dash-functional", "f", "map", "org", @@ -77783,13 +77926,14 @@ "transient", "ts" ], - "commit": "208e103ecc146db71d878df3bd09c6eb60c2797d", - "sha256": "09vdndp3935iy4flynbjpkvfax7vs1ppswl19wx4nn2rp7hdz8kp" + "commit": "8342656b2d9af4bb6af9daa0a8b037d3693bd940", + "sha256": "0alrs2dsd5k4xjrs2zs7hcr5fbfrr3rdq705s04943ic4kzvhrc9" }, "stable": { "version": [ 0, - 5 + 5, + 2 ], "deps": [ "dash", @@ -77804,8 +77948,8 @@ "transient", "ts" ], - "commit": "3924b023e0f1e8fa93cfa79bdd71f9f0c0fb4679", - "sha256": "14nsy2dbln3m5bpqzyfqycn18sb3qh407hjbkk1l0x2nqs3lrkqn" + "commit": "d3b0ef2f5194452d88bf23ec31ebfef822c47c24", + "sha256": "0b3xxnbhnrz0263fnrrdbs3gif4pjkfws4mxkfqqpg0fc8azp2rx" } }, { @@ -77891,8 +78035,8 @@ "htmlize", "org" ], - "commit": "4538c06fab9a7259aa1fb40e93a43dcfacef27c1", - "sha256": "1w6zvgfcyjqlxy4s13h7w66vv0fcid57s6vigzgnzi666w86fdyh" + "commit": "cf000894f6e5d0627151e2bec5b1a54a311ad53e", + "sha256": "1lfvhc4gly06rq5i2fgjydg4rsy7vgksa8hpydsvklr0ypvc1hcc" }, "stable": { "version": [ @@ -78159,8 +78303,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210513, - 804 + 20210609, + 1221 ], "deps": [ "dash", @@ -78170,8 +78314,8 @@ "org", "s" ], - "commit": "8ad141403065bebd5a72f0ef53cf5ef8f2034419", - "sha256": "126s444r0baylrmxw1z0lkbx7f40srk3wwk55li7is225qz2jlmb" + "commit": "756f6215b672e267f986a3d6e494f5309825b91a", + "sha256": "16rjqzj872y1240w15gawxcwj5gg1cds162wq1hswzplmx8wp9d1" }, "stable": { "version": [ @@ -78207,8 +78351,8 @@ "org-ref", "org-roam" ], - "commit": "f7b5be2ce0b43dd4d842484fc0ec37fdc8526907", - "sha256": "1cqx2izzchwd6yi0gmskdb0kiqjwk2m7rgk074bzzq0dzbpl180j" + "commit": "c9865196efe7cfdfcced0d47ea3e5b39bdddd162", + "sha256": "0c9y76r1bagz39m74kb2jcxqsc2q461407bbsib3f512sdf93lyg" }, "stable": { "version": [ @@ -78371,11 +78515,11 @@ "repo": "lordnik22/org-shoplist", "unstable": { "version": [ - 20210514, - 1041 + 20210629, + 2157 ], - "commit": "1c534662719222e315d970e2fa871d222f80ea87", - "sha256": "1m6a37bw60xjkqaffzk1kjpcy76i5dd17925hzz2fbbhlxkac67x" + "commit": "71ea7643e66c97d21df49fb8b600578ca0464f83", + "sha256": "0pjcpry9hzma87f8isyi0q5si0i67g0gd8shj2y3qyizi9ns64a2" } }, { @@ -78582,11 +78726,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20210606, - 1806 + 20210616, + 809 ], - "commit": "0bd38b604405ba8e6ba00dd32ce4773eb02eb901", - "sha256": "1d9kdcdiz600swcy318hd56l751w2qyafdibnkzfkhjzw63c2hwh" + "commit": "4738a7bdb24cb4e1d1d5effc23f953e4c76e7713", + "sha256": "0kpa1rnpxfar8xkah29f9h6q26fgdxcb8gimsfqvrj145vama7pr" }, "stable": { "version": [ @@ -79188,8 +79332,8 @@ 20210414, 1844 ], - "commit": "246120647e28a27506ca0894ba98e371086881fd", - "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" + "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", + "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" } }, { @@ -79617,15 +79761,15 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20210525, - 1956 + 20210620, + 1943 ], "deps": [ "magit", "org" ], - "commit": "26242895ef1642bf30c63683fb224fdba25e0853", - "sha256": "1xd58yqqsb79lgxkhxs4s50jq8f3639k6fhlza9hsy53apfczkal" + "commit": "f956d802f19ea495efa95af6c673588afeb3adc5", + "sha256": "0mbcr98xq3zim01dk1fbyc1vajnjwx90k62mygv343rhrd05v44m" }, "stable": { "version": [ @@ -79649,8 +79793,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20210525, - 1957 + 20210615, + 1516 ], "deps": [ "forge", @@ -79658,8 +79802,8 @@ "org", "orgit" ], - "commit": "ea2a1cf9d337901b413e9df258b8e07af55c00f6", - "sha256": "07ia3b6bfilnpify93kq5g10xhh794v5pmc9cmmb312c3qyqi7b4" + "commit": "365b75609a9454dccf5681eb6075ca53bd32af85", + "sha256": "1y7rywlqhsvkism9dmzlb3sijd8isp6qqhgba79aqgk9wz593rkv" }, "stable": { "version": [ @@ -79759,8 +79903,8 @@ 20201129, 604 ], - "commit": "5aec071702c21dcc777e75b575d3875141688e46", - "sha256": "13405irnpwb1fgwv5d9mwywpbvb6d7smmi7nsd140l0i0m7anx1c" + "commit": "649fd0cdcb831dcd840c66ee324005165ce970ca", + "sha256": "1iarfqdxryj5p43hsch2jgqslrpyfkza9x9fpshmbpwjkbf1548x" }, "stable": { "version": [ @@ -80713,8 +80857,8 @@ "deps": [ "org" ], - "commit": "074c3abf0a6aa5d671da1a39a20137140ba41d24", - "sha256": "1a134x8pmgas5k1m769clk3yhrzdh4n0cwmh23bf22avk6n3bz8z" + "commit": "290b5d6b659addf99cb96a316fb24caa90ad0e77", + "sha256": "04isqw4wfn5hq772sf0szq2rc3b8finhgjc5cna2sw7bhfgycywb" }, "stable": { "version": [ @@ -81136,36 +81280,6 @@ } }, { - "ename": "ox-slimhtml", - "commit": "6fae8e3c4abd37a651d4cbdb337a74f1a7c7366a", - "sha256": "16jrw8n26iy69ibr29bp3pqp4lm66alihks37qipd2g5grqqfdnd", - "fetcher": "github", - "repo": "balddotcat/ox-slimhtml", - "unstable": { - "version": [ - 20210330, - 1941 - ], - "deps": [ - "cl-lib" - ], - "commit": "72cffc4292c82d5f3a24717ed386a953862485d8", - "sha256": "0p22dmyrcny82k0r1w84kcwi513xy03h848knzhm9zj7360dlkiw" - }, - "stable": { - "version": [ - 0, - 4, - 5 - ], - "deps": [ - "cl-lib" - ], - "commit": "a764ef64235845e4f5cfd73244d6cf1e7fee903b", - "sha256": "14h0kks7i2k53fwbsqb4giafacm58inppqpr5mbj904cy146g29f" - } - }, - { "ename": "ox-spectacle", "commit": "f441e1b3ee30065f8a68c9b0b45d9db0cac8a289", "sha256": "1nf4765dihlcjbifhb9dinqin27ivqj2s8wzh1hj4vc3n8mdx5pr", @@ -81504,14 +81618,14 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20210421, - 1333 + 20210616, + 2110 ], "deps": [ "cl-lib" ], - "commit": "b4eec13201093070a12f37396afce83eb6771df5", - "sha256": "1kr9iwsrpxbalhjz91pqplwkb44msdl2qv4rwsbapz8z8hs4xzji" + "commit": "95e021756ee5c5255a63cce8351178e298c68363", + "sha256": "05qm6a0dy2iszrlwkiw5x2v0h5whk7d4qn7qjlf5qpns5fl0fwg2" }, "stable": { "version": [ @@ -81608,11 +81722,11 @@ "repo": "tttuuu888/package-loading-notifier", "unstable": { "version": [ - 20210603, - 1138 + 20210608, + 1406 ], - "commit": "8fd10303e19a2a1e8b5544ce8c34c8466af5d08a", - "sha256": "11d9mc9ca9bn9x3by8fqcan2c8wn85d8xnmkfvzxcmw7dz87kis2" + "commit": "1e30d097de8939c4aa380915d3ba3060a87ce3c6", + "sha256": "0wmf3pfjvxrv86mpvbkn5n4drc20yc12fwm4k6a613br0bs75gan" } }, { @@ -82030,8 +82144,8 @@ 20200510, 5 ], - "commit": "246120647e28a27506ca0894ba98e371086881fd", - "sha256": "15gqzj4h0w33w38i8ihl74iy7aqxlds97gm93r72z69pm2l1d7dm" + "commit": "8a3b529d5ece261a8847298ea03ed35615cc9bfa", + "sha256": "16zalqjd2llwkp7v0218crgf3k34py8zx6lj6z7i3kbmxm9nb27q" } }, { @@ -82584,22 +82698,22 @@ "s", "with-editor" ], - "commit": "4e73cdc4c376ad61d2e4858bc87cf01eab0dd403", - "sha256": "0pvn8djsm8bvx2msrfvm12b778w9yl7sw517l2x0bdm48apz3ifx" + "commit": "3dd14690c7c81ac80e32e942cf5976732faf0fb3", + "sha256": "10015qvf98j4m26rprrvhbfj4dg4j5sg2c0ps7x94cjjxrph7kf6" }, "stable": { "version": [ 1, 7, - 3 + 4 ], "deps": [ - "f", + "auth-source-pass", "s", "with-editor" ], - "commit": "74fdfb5022f317ad48d449e29543710bdad1afda", - "sha256": "0nixbsyckkp1qjszgac74m00vj10vc3vyw2wic1zgc2rx795k228" + "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad", + "sha256": "17zp9pnb3i9sd2zn9qanngmsywrb7y495ngcqs6313pv3gb83v53" } }, { @@ -82932,11 +83046,11 @@ "repo": "JonWaltman/pcmpl-args.el", "unstable": { "version": [ - 20190223, - 1613 + 20210625, + 2116 ], - "commit": "0b8a05fc6e370fa9c466250659619f8d6b53d446", - "sha256": "1zhjpgnd8n95fv2z5d9360cx2vhw88yqz7gyc0qc563p6l3xmffg" + "commit": "e6957896b065e2fda80a8258dfebb86b49742c15", + "sha256": "0fx7v5b3v7y9qxr8n8pm6449rdf4ljc0fb6kp0vpdzfzc4yzgdni" } }, { @@ -83492,21 +83606,21 @@ "repo": "bbatsov/persp-projectile", "unstable": { "version": [ - 20180616, - 1944 + 20210618, + 708 ], "deps": [ "cl-lib", "perspective", "projectile" ], - "commit": "533808b3e4f8f95a1e3ed9c55d9aa720277ebd5f", - "sha256": "17i1srw1k771i3a5wlydbyasyd9z39ryf48mxfs0dsbx1zjbj0pg" + "commit": "4e374d7650c7e041df5af5ac280a44d4a4ec705a", + "sha256": "0cpf1739cd6ylyaz7pspsmh1dsmvymdqfpypahca0nn169vdrzk9" }, "stable": { "version": [ + 1, 0, - 2, 0 ], "deps": [ @@ -83514,8 +83628,8 @@ "perspective", "projectile" ], - "commit": "7686633acf44402fa90429759cca6a155e4df2b9", - "sha256": "0rqyzsmg32sdr4k9i2lf3jfyr9bskkl7gfb5ndl16iip9py7403z" + "commit": "6e4c2e017d59d10d627cf95b2bb9f9fa2b22a3a3", + "sha256": "0566zm9gbac9b1niszl0jhwizxw2a0f8b4b2idvihpsi93iwa8vi" } }, { @@ -83526,14 +83640,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20210523, - 2254 + 20210610, + 548 ], "deps": [ "cl-lib" ], - "commit": "b37c6756700a167742c8ab06fa5a850d9d94f4bd", - "sha256": "1ciab9xz4lbnnnx9407bagyf10dv6h9nalzm2wj6w6x7kckb4105" + "commit": "68b13cef8435cae581850415cdda17e245dd0eae", + "sha256": "1iwqg1y47lp54qn9cjr3w9pca294mn92qlil3a4lr8xi57jbi3iz" }, "stable": { "version": [ @@ -83988,8 +84102,8 @@ 20210519, 1728 ], - "commit": "9561a6c0a92a3d7c00e7e57972f42cb5be775898", - "sha256": "189imf8dvmsfhcy0p9f8a7l0z8dfdsnialk58f4p1l06p67s21df" + "commit": "cbf27232649c39e3749eefd23f962750bd249a49", + "sha256": "0r20y2hrgy1gmnx6izzvmvjh4axwb4x4pgcxn4bjmpzypand5xfp" }, "stable": { "version": [ @@ -84101,8 +84215,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20210517, - 1838 + 20210619, + 1706 ], "deps": [ "async", @@ -84110,8 +84224,8 @@ "f", "php-runtime" ], - "commit": "debf66848c6099415c731b179dcd47e96db3b50b", - "sha256": "0i5g4gh5i5y8wsrqw89lwi2s2sn67pvvj2y6p7lnyv0i201v5bs8" + "commit": "272217fbb6b7e7f70615fc518d77c6d75f33a44f", + "sha256": "0hm96i9vdbkcq6mypjpl94dn3gzyk23iql5zzy2d221vmjhqvn7d" }, "stable": { "version": [ @@ -84135,14 +84249,14 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20201122, - 950 + 20210617, + 2234 ], "deps": [ "php-mode" ], - "commit": "6863a5278fc656cddb604b0c6e165f05d0171d0a", - "sha256": "05q1y6xshh5csr672jwplp2xmp87gvj9rc65ybpa687dkdmq8cdh" + "commit": "56617fa87c9bec037d4e4a0a143b7d70a989c082", + "sha256": "02k4pmmxq3h8mi0dsjh0s0002gjkpg6g9pxsnxgalwb6rakfirbh" }, "stable": { "version": [ @@ -84445,11 +84559,11 @@ "repo": "EricCrosson/pine-script-mode", "unstable": { "version": [ - 20210605, - 1527 + 20210629, + 1257 ], - "commit": "e465c0264958cbed0fb29dad2b30b9f18fbf1064", - "sha256": "0crc2q5mzflyz13zx0ghsf2kdmj67lcqb2vnnsw0z2sk7wafrz2i" + "commit": "c04309be9fb73012b4c5c839741b1abcfe0b8aa9", + "sha256": "1hahd9w5pww3nx1xvbci4pscpbzb0k5xv3yff896jg66di36fvwg" }, "stable": { "version": [ @@ -84595,21 +84709,21 @@ }, { "ename": "pippel", - "commit": "6d1796688ed0d6957557d960ca28e450f9bcb6cf", - "sha256": "1li4h0dff1n7njy2lk3d50ndrlw84fphmdg16j0srkbgy7xz90yn", + "commit": "45459106a88b5bb8ce5afdef9a7cb95a0fb447bf", + "sha256": "1gn944k09r78lfn1nqg69fnwx91y9lvw1k2i9czk7yhx4zmyinpl", "fetcher": "github", - "repo": "brotzeit/pippel", + "repo": "arifer612/pippel", "unstable": { "version": [ - 20180710, - 856 + 20210614, + 1655 ], "deps": [ "dash", "s" ], - "commit": "21a5200e8e5ccaa1911abb4ebf090b76ca839756", - "sha256": "1amqjm6kn1xda058kdwq3xgk7raz6y9iw0mzrac78sgf57qaczyb" + "commit": "2480fd376b8f69691b45b0141fca0d900a5ac64a", + "sha256": "190cd66bhvlmyxki7hl43s0h4rvflw9r36xm4ky3c1mhbkrfsz1p" } }, { @@ -85579,15 +85693,15 @@ "repo": "polymode/poly-markdown", "unstable": { "version": [ - 20200316, - 1315 + 20210625, + 803 ], "deps": [ "markdown-mode", "polymode" ], - "commit": "1536cf0c32f71d5cd05c90f7905905e38006e95d", - "sha256": "1q4qq0ql08hxkdrd2aal03560k612my7bvnfpfij3g432hn0p7v6" + "commit": "e79d811d78da668556a694bb840bea3515b4c6f8", + "sha256": "02jpak60jl6nrz5zkkc0cw5i95vl4h6g31qvgb3qsidimav305n6" }, "stable": { "version": [ @@ -85985,11 +86099,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20210602, - 847 + 20210610, + 1945 ], - "commit": "2be084a77cc2bc79ea7dc23edada161f4ff6dfdb", - "sha256": "118sbcm6qavckxva81vamrs98dj38yv0qccqqj4p3a4q7brfi8cw" + "commit": "4c51182f5f5dd7a1ffa69fb994ef5ef6f9592686", + "sha256": "028wfdi240r8xdz7j77fv29brk5ck6yhhh1vj9p58m4f4ff8r9ik" } }, { @@ -86000,11 +86114,11 @@ "repo": "auto-complete/popup-el", "unstable": { "version": [ - 20210317, - 138 + 20210625, + 400 ], - "commit": "866a091b83369873b4d1c5d62a590fbb0a150bd0", - "sha256": "059x15zlc6c17yg5ahdca3bryr10nh9xbb61dv0gdc2wg2c0pzzi" + "commit": "cf899f8012f4189e76a009bebb589ff71631b1e9", + "sha256": "09nf95bin4dq50vapax8xndm0bay2cbsws4zvpb4hp3kk0gdzrl6" }, "stable": { "version": [ @@ -86245,11 +86359,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20210604, - 647 + 20210617, + 42 ], - "commit": "3257a52e3599bc1d5c9a4b646d36d7a49b0dd025", - "sha256": "13p7122100ywg6dc32wq0hvcn52x8djxq6vgcmdpdsdy7k4fkxwc" + "commit": "f97c4aff2c2c376ca62276d5597aa108546633a9", + "sha256": "18w06fdz63w2arwgbgbl9wghb9fin4cqpxnyajppyqk5lpnsn7iq" }, "stable": { "version": [ @@ -86771,10 +86885,10 @@ }, { "ename": "private", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "1mvma2xgjy9vkh468x80xlri6qfr7d494la1j6r1clkjsn5kg7hr", + "commit": "e036ca25bced52cdacc4e56dcdea4282360aa5da", + "sha256": "1rq4vyfjr8b2fnwjnw28if9y9svvaxw1pwisys5p8rx0mff48cn3", "fetcher": "github", - "repo": "zhangkaiyulw/private", + "repo": "victorteokw/private", "unstable": { "version": [ 20150122, @@ -87059,6 +87173,21 @@ } }, { + "ename": "project-mode-line-tag", + "commit": "9a739b3a77aaf0033161c6687e1e9c5592bb18bd", + "sha256": "0syr5lpn0xmvf54k65lif181y6kcvs96j8wykzzlmsf9zdkkdg20", + "fetcher": "github", + "repo": "fritzgrabo/project-mode-line-tag", + "unstable": { + "version": [ + 20210615, + 1825 + ], + "commit": "ed6adf9287d2aa526d85451623f1aa281cfa7e0a", + "sha256": "0xryvjsb2r4rj22wgjpixa31kg4sp7xww63hldnf7c1cvcc9g305" + } + }, + { "ename": "project-persist", "commit": "bd81d1f8a30ed951ed94b9a4db13a2f7735ea878", "sha256": "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24", @@ -87143,14 +87272,14 @@ "repo": "hying-caritas/project-shells", "unstable": { "version": [ - 20201026, - 748 + 20210625, + 647 ], "deps": [ "seq" ], - "commit": "382b3d48a797ea56383732ebf9cd219aeec676df", - "sha256": "04zsk6mwxkp71fbjq64k78nwx3gvgbp2fmm5f8ah2ap2g65j5kq3" + "commit": "900369828f1a213c60a2207a71d46bc43fd5405c", + "sha256": "1igs3dr3j9lw8lyww1wp69v5i9k2ifvblmsh862vx7l6rvy98f5h" } }, { @@ -87161,14 +87290,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210607, - 1513 + 20210701, + 441 ], "deps": [ "pkg-info" ], - "commit": "155fdb44176347c9599357c7935993033260a930", - "sha256": "040g4frdjabpa8ddhag81dx3kphh5kp3iv34x4zsbkhb6gryd5zf" + "commit": "da08a9103b5ba3b38ef031a9627a19436eb318b5", + "sha256": "08y36qvr20888jc2b5172qgah0xpp9bc3iwp38w8clfrjfd28g2s" }, "stable": { "version": [ @@ -87241,34 +87370,36 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20210325, - 2120 + 20210625, + 708 ], "deps": [ + "dash", "f", "inf-ruby", "inflections", "projectile", "rake" ], - "commit": "f1fe6e8eff485dc560e6ffe7f0b9c46a61509a58", - "sha256": "1b9wsn6mm1ajh81f6bmp3ajxch3j05bzslzxjakw93gjg69w74y1" + "commit": "6a18ada3566ab2cb795129e3dfca2a32cc413fb8", + "sha256": "1xr6ha5jkczpbdqpxf8s4qggvx4arwky6mfwaji2kjnkk0ajjyda" }, "stable": { "version": [ 0, - 21, + 22, 0 ], "deps": [ + "dash", "f", "inf-ruby", "inflections", "projectile", "rake" ], - "commit": "8d6b3734958f5dc7a620dc1b44754986d3726f3d", - "sha256": "03cj0cpmqyxcvqscnjcgcfz5k1ga6knr5jcb5prnv9hfjfqgk3pb" + "commit": "6a18ada3566ab2cb795129e3dfca2a32cc413fb8", + "sha256": "1xr6ha5jkczpbdqpxf8s4qggvx4arwky6mfwaji2kjnkk0ajjyda" } }, { @@ -87679,17 +87810,17 @@ 20200619, 1742 ], - "commit": "4644980d818ec9d987f74c74b1a1d45de9ab01fd", - "sha256": "1mzblak9s46wsfh3l1798k9pjwbddnz030y0cfx831lfpr20227b" + "commit": "4b77b733699f9c39b517a124da737c018b1164e2", + "sha256": "1mfvmpwxayrzp07vl72djv162vlf0xg29mxh030lqf7jc9h11gxq" }, "stable": { "version": [ 3, 17, - 2 + 3 ], - "commit": "70db61a91bae270dca5db2f9837deea11118b148", - "sha256": "08a7rnflhklbabqm5yyz2nwyzzfbh24miiy3wsxphaanjz4xr6yi" + "commit": "909a0f36a10075c4b4bc70fdee2c7e32dd612a72", + "sha256": "08644kaxhpjs38q5q4fp01yr0wakg1ijha4g3lzp2ifg7y3c465d" } }, { @@ -88533,15 +88664,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20210607, - 427 + 20210623, + 415 ], "deps": [ "async", "xr" ], - "commit": "eaf331f67ad3d6ea5b63c92bcd0cfc0134466b53", - "sha256": "0prrkn2yaj6wm2hn17jgfxb1vz58mdm3ivmqsncrfhl1vdll73jm" + "commit": "70d488f9233a578f0c7f8906aa83a1a690ec10fa", + "sha256": "14zczmikgsxqf3klx17n1imgpqhj3gjmz4hs95lkxs3a50qbqh7z" }, "stable": { "version": [ @@ -88588,14 +88719,14 @@ "repo": "p1uxtar/pyim-cangjiedict", "unstable": { "version": [ - 20210507, - 928 + 20210617, + 934 ], "deps": [ "pyim" ], - "commit": "455e20e90044a1fcd6c4b45252745fa233e0107d", - "sha256": "0dv5l8cpccvc7jsc4qdijnz76dp2rznmcnkkn3w75xw46ai8chnk" + "commit": "d17e3d32a6480939b350a91a915ebe8e6efad819", + "sha256": "1bszpqsm15az0wvbgsk012manxnvigbk38qr5iqzkgd4d13yv5fs" } }, { @@ -88703,17 +88834,17 @@ 20210411, 1931 ], - "commit": "6c7bc2b576a705fcc7bc52494163e9a1a240ea80", - "sha256": "1m4swr0v998c6iq589mzx6glq7g2gc109469wcsjyi9j4cv7qgkr" + "commit": "6f066733e23a61d83580cd1898e6b8afab8fafea", + "sha256": "1m7365k7a624mp33v5x23knkcahpa9gvb3sbr8idqlk8n8k3f6mk" }, "stable": { "version": [ 2, - 8, + 9, 3 ], - "commit": "735c958d3b36fb5d343b7bcb81b1055a430cb042", - "sha256": "1m8f8qv88bvqbviszwf0n4ch5dpyqa33067ampy706cpg7mwjvn0" + "commit": "aa688de05e469e33a20478144013946ccb752736", + "sha256": "0r2xp90bwwqnya3gq0q0gh2qdn7i9fcsq8ab890bnd0b44ivx0nk" } }, { @@ -88984,11 +89115,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20210601, - 1845 + 20210620, + 1854 ], - "commit": "198ba8e15e848825b2215e9fc363f06d8c173a28", - "sha256": "1z6vnbnqvn20gs131d0rjncr4nk11amahvmfaffkhiwmpsl1b3gv" + "commit": "3f0be5ace492d2ddd8405f4b5186ef89caee762e", + "sha256": "17clkgs94dgq5nsjlwkr52m5s446ibfss3qc8a8m0zaz6j4f8l1m" }, "stable": { "version": [ @@ -89162,11 +89293,11 @@ "repo": "psaris/q-mode", "unstable": { "version": [ - 20210307, - 2102 + 20210620, + 1712 ], - "commit": "a30a84afae9bb72bc601b213ae68821479b0bb03", - "sha256": "1q85vxvv76vmb9zhc91p2aqh333h1p48737spriv5sw9wvis0gdm" + "commit": "86d937854c45f6b2a102b42c1a991ba713532f9e", + "sha256": "1hbb0m5kjczyri6hbgkk1par53zfnsp7m133xqzfhg2sibrvbz2x" } }, { @@ -89628,15 +89759,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20210604, - 1431 + 20210629, + 2000 ], "deps": [ "faceup", "pos-tip" ], - "commit": "4b46a818c08820e04d25df7fe830e80ea82e1126", - "sha256": "0kr1sd819rvyfw34g6sqcnygkllcx07ccc5zc773kn0ngiqd0zvn" + "commit": "4f8eafe2a016e2e78872e4006939ee82397e57a0", + "sha256": "0fa9kipg1ihfr16ljsfgxd6z8a5fj31npfxhqv7q9ysi4nq479c0" } }, { @@ -90293,11 +90424,11 @@ "repo": "pfchen/read-only-cfg", "unstable": { "version": [ - 20210517, - 749 + 20210608, + 1259 ], - "commit": "c128c9412f768adf89ff5c4ad433cf0beab6656a", - "sha256": "11zj4ysmacvz82j1siqlcp30i05my20lscls8wkdjl75g9d2b12l" + "commit": "a02395b37a68b2e20e365c2e3752f966c71d4c02", + "sha256": "0jihqc16knvws5w2y5djdir4h52mpwk86nbjlap47lh2r18qk6q6" } }, { @@ -92023,11 +92154,11 @@ "repo": "galdor/rfc-mode", "unstable": { "version": [ - 20210510, - 1104 + 20210615, + 1721 ], - "commit": "b885d6bd2b3be69a2413c4dc5cc34344d821cba2", - "sha256": "0qqvab5n5y70mv9dq06xnqmpxy9pr994k3b83kw70pq43gb03nxd" + "commit": "3ef663203b157e7c5b2cd3c425ec8fbe7977a24c", + "sha256": "0lrmgvrj69rs49vjfwkm3w9z4y5mkndra1kdqmr9s7z9f1558is1" }, "stable": { "version": [ @@ -92050,28 +92181,28 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20210305, - 1621 + 20210625, + 939 ], "deps": [ "transient", "wgrep" ], - "commit": "10e64887c224002572e1f1e19c74453cba606c3f", - "sha256": "1519lh5j5zki2dfzd1a1hl1d24nap99hv80647rvpr3mzbcsg29s" + "commit": "0fa6d33d2f3123aecd0b0dbc5fa3d884edf10a92", + "sha256": "17f11znjyfnxs5y0zafcx9aa055wkw3igzk9gy0cipnyp42yb4v7" }, "stable": { "version": [ 2, - 0, - 3 + 1, + 0 ], "deps": [ "transient", "wgrep" ], - "commit": "bb89400d4d5e4eb22917f7048256745ea566a844", - "sha256": "0d8habjr4nv0xbgsk7nj5zid5zywf00vbl5zcx7anda5w1cy2zvr" + "commit": "0fa6d33d2f3123aecd0b0dbc5fa3d884edf10a92", + "sha256": "17f11znjyfnxs5y0zafcx9aa055wkw3igzk9gy0cipnyp42yb4v7" } }, { @@ -92230,8 +92361,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20210207, - 1432 + 20210628, + 1648 ], "deps": [ "cl-lib", @@ -92239,14 +92370,14 @@ "popup", "posframe" ], - "commit": "519e6eb3b5e8e668c2835d27f54fcf5776242576", - "sha256": "1q0kzdy3nxswsriq4fxr00wmw43x737dd7pnkf9g6v8hd7gsqkzc" + "commit": "b93e761209211f8a6de1bb4b8f1d36651564a8d9", + "sha256": "0z0iwsqr92g8ykxb51gkawwxwzx0faw0027zgdi7c38ngjqld237" }, "stable": { "version": [ 1, 0, - 4 + 5 ], "deps": [ "cl-lib", @@ -92254,8 +92385,8 @@ "popup", "posframe" ], - "commit": "ee7f951f0bc3b55034634019dd385706bc413dbb", - "sha256": "1a50cziwg7lpgh26yvwxs46jfyfq1m0l6igbg5g5m288mz4d3an9" + "commit": "b93e761209211f8a6de1bb4b8f1d36651564a8d9", + "sha256": "0z0iwsqr92g8ykxb51gkawwxwzx0faw0027zgdi7c38ngjqld237" } }, { @@ -92430,11 +92561,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20191218, - 257 + 20210624, + 417 ], - "commit": "2bc1afe528b70b8aad4243a3b2b72bcf09a599e1", - "sha256": "0pg2q275qd83i8c1g0f1xlwvbqd40xm3gw2ahl80blyllsvz04j9" + "commit": "ff496660cc52a6dd33d358ef0acc6d4bb70cc340", + "sha256": "05i0101238yy1da6z543nr9x5gpvgdxrrdn3sw5dibcn6z62ml3p" } }, { @@ -92445,14 +92576,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20210608, - 17 + 20210626, + 137 ], "deps": [ "inf-ruby" ], - "commit": "bcddba77ba11b46f94730708fff2215f4b620428", - "sha256": "04az3rk7h606pv2l16wf2bmad9nqb7nx6r7cwap90dvnfjn56a3y" + "commit": "e1304d123d729aa063671d0ca526b01e72f0f5ed", + "sha256": "1ghwjymcmmr99z060l1shm9sqbjxxdgq6b7ayn8s9mldcqm5pa3q" }, "stable": { "version": [ @@ -92695,8 +92826,8 @@ 20210313, 1541 ], - "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", - "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" + "commit": "65113e2a137baa9f85dc2157b893291470788dc4", + "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" }, "stable": { "version": [ @@ -92721,8 +92852,8 @@ "deps": [ "rtags" ], - "commit": "63f18acb21e664fd92fbc19465f0b5df085b5e93", - "sha256": "0wzyn9qzyly71yfwhlk5m94ygjnbk459pgbpgkhp9fqgchx12p1r" + "commit": "65113e2a137baa9f85dc2157b893291470788dc4", + "sha256": "1qc4hy6r2sz59nb28xrrqiad91xbmsrr9jzhi4k915qgds6m029h" }, "stable": { "version": [ @@ -93255,8 +93386,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210502, - 1646 + 20210609, + 1900 ], "deps": [ "dash", @@ -93269,8 +93400,8 @@ "spinner", "xterm-color" ], - "commit": "ed68fd3bb410869e1a4ce3943b5913ea88d9b509", - "sha256": "0896m5ajlq90pp7ds6iw7plqkffm6k01v3rfqfhb3qwd92nxgcf0" + "commit": "bbf129cd128105de51b6c242b2551094b8d8987d", + "sha256": "09dnlvi8kf683n6q3yp4gy9d4idiyg4x6rcij8d90cvygh8i30wd" } }, { @@ -93305,11 +93436,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20210523, - 757 + 20210625, + 2046 ], - "commit": "ab6417d8e546f1836618ee72d074ec65431ebc80", - "sha256": "1yy0jr7n55qbraxif2zhgmyr31jd5sd62jyhd3cg327vl5ga1ajg" + "commit": "fc9e227127fa327183d39d28c3afdb2f395a51a2", + "sha256": "1j05dyg77fpdh7gl29bq48fdba7kwbhsq3ryn6b8vzhncapsqj99" } }, { @@ -93320,11 +93451,11 @@ "repo": "magnars/s.el", "unstable": { "version": [ - 20210603, - 736 + 20210616, + 619 ], - "commit": "e1710af8d058faca32529d1129deb5d57871385a", - "sha256": "1zm9zqa1479kn74a1hbs7jc8rli7vzz5hk8k2rqpi34yf569yjhj" + "commit": "08661efb075d1c6b4fa812184c1e5e90c08795a9", + "sha256": "02hcjnf8n0nzqysqi9g7kqykxmn8nwhsx1scrq6wj1iibc16nh0p" }, "stable": { "version": [ @@ -93740,8 +93871,8 @@ 20200830, 301 ], - "commit": "393a5f2be890c1e90b3d5f331ce1bf34dad09742", - "sha256": "16y5njqb9v58fmsp9nn38wvzx71jgy0di2m8933a8dkirddi324v" + "commit": "32c5c18e1cac173b79fc37b85dca51f4e8d57e45", + "sha256": "1vzg370393yfw1msgdyq2bwv3rc765z30vsrxssm0zifjqimkab6" } }, { @@ -94084,10 +94215,10 @@ }, { "ename": "scratches", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "116bjy1m35h83r2c354i2xk1br87nmvd99kbzax0wgkkkcjff8c4", + "commit": "991ef46a458c9301283dd440d79448fb25374c98", + "sha256": "0gq5ar2v50sxddf0lccm75kl2fq3g4zacq8wd2hf9kp3cq7mylh9", "fetcher": "github", - "repo": "zhangkaiyulw/scratches", + "repo": "victorteokw/scratches", "unstable": { "version": [ 20151006, @@ -94647,15 +94778,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20210529, - 1313 + 20210613, + 948 ], "deps": [ "apel", "flim" ], - "commit": "95259568446f32c1af56dfc27e3614815322a1bf", - "sha256": "09xld1vpxdz1kvw039g7hk89p2d8pi95j9hgls6iviwzs6ni41yl" + "commit": "509f6f0bc2f5d020c63e47d9ad89410dc20bcb6f", + "sha256": "0lnr5kyc59rs2p3lnhyr6cc126rh17szp68xpsx4brym3blb37yc" } }, { @@ -94767,15 +94898,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20210521, - 1050 + 20210630, + 1805 ], "deps": [ "dash", "edit-indirect" ], - "commit": "900fdc33b647e92d0f464872da1b12d724de7d43", - "sha256": "1ji8qjg3qsxprsqjp4hks999f0rfqnl3nyj08hr4vra5nqk6x4cg" + "commit": "4fbbd85c0f809593f6d26edf1388ff059f77e82f", + "sha256": "0jyz0cz1c6bimkd48iv09lgmzgbb63v5dybcgrjcmcg630c8yh87" }, "stable": { "version": [ @@ -94837,6 +94968,25 @@ } }, { + "ename": "seriestracker", + "commit": "9370b3c06f065ee50ed7e4ffcfd9d503b6e9563f", + "sha256": "03vg4y262yy0y3xh0imx4mh59z2lhzif5jxnad2w385khnyj1n21", + "fetcher": "github", + "repo": "MaximeWack/seriestracker", + "unstable": { + "version": [ + 20210629, + 2303 + ], + "deps": [ + "dash", + "transient" + ], + "commit": "a5ce1bfd06ed90bba9947a9045659d13f3362a96", + "sha256": "0gjwp0h9ip58da1p8q9s9pjfh0g6pav4gam9s51xnx8mv0vbgb68" + } + }, + { "ename": "servant", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", "sha256": "0h8xsg37cvc5r8vkclf7d3gbf6gh4k5pmbiyhwpkbrxwjyl1sl21", @@ -95279,11 +95429,11 @@ "repo": "ieure/shell-here", "unstable": { "version": [ - 20191011, - 1959 + 20210616, + 2338 ], - "commit": "88b80deb1337a97b403b20fc467fa2d579b3bfd5", - "sha256": "1x9zcxsc6cnh0h051377asbqhcx3mzcarrnj9zmyg6fcszgas5v1" + "commit": "a3679c52d31d1dc6ed29bcab087cb5455a992eda", + "sha256": "0w0mlggb5gnvm109qn50ric3lb9znxvfkzvc7xla2qnmaz037ppz" } }, { @@ -95402,6 +95552,30 @@ } }, { + "ename": "shellcop", + "commit": "51f723347f56e150852bf82d163c04aa846a3d9c", + "sha256": "19281hh73m898187ksb0wl409iwgr49z6mqx3dr5ggajbs7jp4yn", + "fetcher": "github", + "repo": "redguardtoo/shellcop", + "unstable": { + "version": [ + 20210622, + 721 + ], + "commit": "7c025b10173ef380ea539dbbdcd7d60977119e24", + "sha256": "1rjiyz3sx387b8559k01j6149jw729zlk5s3ah2jaxj6p9cag418" + }, + "stable": { + "version": [ + 0, + 0, + 6 + ], + "commit": "7c025b10173ef380ea539dbbdcd7d60977119e24", + "sha256": "1rjiyz3sx387b8559k01j6149jw729zlk5s3ah2jaxj6p9cag418" + } + }, + { "ename": "shelldoc", "commit": "551623175e55629be6cfe44a595f25f09bd889e8", "sha256": "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx", @@ -95558,11 +95732,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210606, - 124 + 20210621, + 534 ], - "commit": "0e18a7e96c8e425ac7c2e69aa26fa6a1e8e6e51a", - "sha256": "1jxp447d8xnk4ixpni7rsph7fd3p58ydmi39yrx201hbqh15jxiz" + "commit": "70b985b1d00c8703acb1ebf16875616903470f45", + "sha256": "0djvaxbxjic4m8nqmj1gs0h77gf0fik00ia7ayfha3fc7fabiif9" } }, { @@ -95950,6 +96124,36 @@ } }, { + "ename": "side-hustle", + "commit": "f75ebbbec4736474a745487cecebdd70a3edde21", + "sha256": "01avgnswjq4jflgxfkrcgc56il6v6qgxblv1zn70n2p31x7n8y63", + "fetcher": "github", + "repo": "rnkn/side-hustle", + "unstable": { + "version": [ + 20210627, + 701 + ], + "deps": [ + "seq" + ], + "commit": "1f4cd5e7cfbabb00c6d87e913770f21e3d16c957", + "sha256": "0qcaqfsnw90prch3x1flccanys4bh72x2pdmf27nh5b3i9jbrbv2" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "seq" + ], + "commit": "786932352ce2f10214b801e872690e05b6102851", + "sha256": "09i5ds9ayid570x97glcy6cb8qdr5jc8riqfs7wl3hi4dif0z61a" + } + }, + { "ename": "side-notes", "commit": "67d23bdaefb563d88b206a9ed822316f3d5be9a2", "sha256": "07hrrplgvp3fvl10fsmxifnim8wz34w7fhzzzkxpdj1zlwls6h83", @@ -96090,14 +96294,14 @@ "repo": "vapniks/simple-call-tree", "unstable": { "version": [ - 20210608, - 33 + 20210625, + 2001 ], "deps": [ "anaphora" ], - "commit": "d776c801d773e535d1647524e2c4f63b200d8ef1", - "sha256": "1jh1h09l4vkzj40l8nskkilbggfl889l3rhi8b70jm4yvmk9np62" + "commit": "26de24bcde0eae911a0185bb5a6b74b9864fcfc3", + "sha256": "0589ns2v6jxyd7adjkj34zlcnnxbfs6c7hm56yskbs2s4qkkf369" } }, { @@ -96605,15 +96809,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20210512, - 1220 + 20210614, + 1523 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "bdda756a5667a537497a35f5a0fc5b7c28bf3bd3", - "sha256": "0xm3fdwla8axag1zpc7361mgyjpf1qg907l86w4v8ald8z4qcvl9" + "commit": "98a656d96b177edce57b552a2fa9d139cdce8c9a", + "sha256": "133p6yj5vdw6i4j2v8ac2g9ayrwxlvvimh2qs5fmxi8vklvn7h3a" }, "stable": { "version": [ @@ -96845,11 +97049,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20210604, - 937 + 20210629, + 2009 ], - "commit": "c783ba6576b554f3fc15a70bf30d225f277d1863", - "sha256": "1lwghrqw81dr7mhx8i92nn4xhamnpqwdvmzx1lg1fzy7g5qx7fl6" + "commit": "954e5dad72fb5712dfa968222e2b46dfdf9a476c", + "sha256": "06m2vwxga1rys98z97abajqq89k2dlfrrab21hhgqwc0zmdmb9fv" }, "stable": { "version": [ @@ -97124,10 +97328,10 @@ }, { "ename": "smart-mark", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "0kx34983qqxkx2afql1daj155294dkbinw861lhx537614fq7wmn", + "commit": "debbf9d7069436641a4ea922c3e44dd8176cb072", + "sha256": "01crd7bv6r1iz414s8044qp3560n52f4pmbq0qniin2dya7si681", "fetcher": "github", - "repo": "zhangkaiyulw/smart-mark", + "repo": "victorteokw/smart-mark", "unstable": { "version": [ 20150912, @@ -98118,8 +98322,8 @@ "flycheck", "solidity-mode" ], - "commit": "383ac144727c716c65989c079ae76127e25144c3", - "sha256": "1q4b8623mygzp3qwy5bmb3hipzjfri9007x0ilq3i7k5bs34jz9r" + "commit": "5f6ef3156fadae5af6f381d674d20535529a20e4", + "sha256": "02rmc7naspjfl757k7zdfg9xd6nvfpsiqfcxkj6ywc7mnndpq2c0" }, "stable": { "version": [ @@ -98143,11 +98347,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20210505, - 1704 + 20210622, + 931 ], - "commit": "383ac144727c716c65989c079ae76127e25144c3", - "sha256": "1q4b8623mygzp3qwy5bmb3hipzjfri9007x0ilq3i7k5bs34jz9r" + "commit": "5f6ef3156fadae5af6f381d674d20535529a20e4", + "sha256": "02rmc7naspjfl757k7zdfg9xd6nvfpsiqfcxkj6ywc7mnndpq2c0" }, "stable": { "version": [ @@ -98643,11 +98847,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20210206, - 1428 + 20210618, + 2001 ], - "commit": "c8c468580048e2464f012d171b2101bfb208e33d", - "sha256": "1rbv04smfyhm5qm3ghn9vsl0sm4lv20gkpw2zdzrf0l3nkb7dx45" + "commit": "f98150e8e254e6bf94dee2de3e8baaf02e2aae80", + "sha256": "02jm3v3bnbc45rd4fl9kkln0pn49ix2igm254yz33cg0ykgkj2nf" } }, { @@ -98718,14 +98922,14 @@ "repo": "ljos/sparql-mode", "unstable": { "version": [ - 20200429, - 1719 + 20210701, + 1202 ], "deps": [ "cl-lib" ], - "commit": "e8c9345e2e2427282b3dc9cd1e297e3c76d34f7f", - "sha256": "1i799cq0dydq7jdhc1b2ridlsmmkk85286g9r6nj6kif3177l171" + "commit": "ceb370b3879841f8809cc3f9b1b87e898f10562f", + "sha256": "05vbsfyck0nxa0bsg7jjshjzh7719gx6z6i9i4ayxcfygh3wh6xz" }, "stable": { "version": [ @@ -98763,11 +98967,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20210415, - 1821 + 20210629, + 1739 ], - "commit": "86c223a2db529768fd815dc0635ed432c1a215e8", - "sha256": "1bz6186w83xmajnw489dc1la7b6gly9vrp40mh58gknk5fjdx86w" + "commit": "b915b063f9de2eff4b9a37c04559a3f2fbfdba84", + "sha256": "1skwcsv8cvjfsgncgd4hybkhjdf6clb65pnpqfh9jxc866aw9n39" } }, { @@ -98805,11 +99009,11 @@ "repo": "brailcom/speechd-el", "unstable": { "version": [ - 20210607, - 2032 + 20210619, + 1753 ], - "commit": "2ffae385139936a03e1d1a96993d3bf5f9509bbf", - "sha256": "1kwg74qy66kwhsl2pqn4cvkrqrfdvyyaz13h4h1bqpxckb1dc05z" + "commit": "bd21335668ac7ea4d8c992490b4a710053434e74", + "sha256": "1jlb1mfigcqxvm1aibf803xypmbj3x1145nmf2q0v2aaipd6s912" } }, { @@ -98894,11 +99098,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20210415, - 1326 + 20210617, + 426 ], - "commit": "fae15427a1027e5eafdff7e5627cd399f73dbc37", - "sha256": "05xarav1dw4315rh4qchvf6p9vsdyg09nm9rc6k657n4r8ip725c" + "commit": "1abcb5594e1bfe35716d29e64523e4cebdce737c", + "sha256": "0hk3cly374sgiwdf3crjj45afr8nv4jq4bda1vkdb9yqjla0xw8s" } }, { @@ -99482,11 +99686,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210528, - 2053 + 20210701, + 23 ], - "commit": "c4ff94490dd8124e633f907f94955b30b7a4d8d4", - "sha256": "065n3x1mzhjgkyvy5j3fgqa75npxqp1dq05xgac9pqgcr2j09mi6" + "commit": "a92d2a4f748f124910d406a9386979688f7f28a5", + "sha256": "1gfqskdng23dpacvmypyc2jsrw15hrrwq84qmlnwyibf0g0pjj1f" }, "stable": { "version": [ @@ -99614,11 +99818,11 @@ "repo": "cjohansson/emacs-ssh-deploy", "unstable": { "version": [ - 20201016, - 1439 + 20210626, + 2228 ], - "commit": "fce4ea35f09ed5899c1a2dfa3527bc2dd5ca3ba5", - "sha256": "10banrq8p0v10237yy2f04i0vvpjdz0by9cp92ambw94c3l3ii8f" + "commit": "7c5fe8af2d62d8f6d32ebe2d3bfc53051a9432d1", + "sha256": "1ca1ai742g2901pni08clk37h1ls4n65pzxpsfzsxnr7i46yh989" }, "stable": { "version": [ @@ -99910,8 +100114,8 @@ 20200606, 1308 ], - "commit": "311caea3f11330a42a37efe078305b4ce42e53ae", - "sha256": "1hfr36xb24y829pcd4maw206lyhrb3qwxxzj6gwh3a0nw8s1sr1m" + "commit": "097c527a40797e1b3f3a954cfc5e04987fbb61a9", + "sha256": "0yidmzdkrw66hga7nna337jk8rkml6plhr1mzfsyfazpb9da0zsj" }, "stable": { "version": [ @@ -99960,11 +100164,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20210430, - 839 + 20210610, + 1256 ], - "commit": "eac0f54da5ff116622a6448b68057b45c337f2de", - "sha256": "0b7glyq3z98vi7f79zg0phqm6ibc30lq2m4mwy22gg0941rr2zja" + "commit": "e69b7532ceb27126fb9516c9a8aff652b032088a", + "sha256": "1jcqcf34d55r1z786gpkj7jwap646izk498pn2dia7skiwwljx5b" } }, { @@ -100268,11 +100472,11 @@ "repo": "PythonNut/su.el", "unstable": { "version": [ - 20210226, - 42 + 20210626, + 2025 ], - "commit": "787f78989253f4568942a4cece5f135f005e135f", - "sha256": "1sr6lwjd2py0pncbx4qxa8wfxa3fnmfhxr944aid672hba2pdx7s" + "commit": "36db018de8423a6e380a49d4e602d376a0740f6d", + "sha256": "08vma290dxzjxyn4df2i1kjzm24myxvsll9cxky277asbb8ja74z" } }, { @@ -100933,26 +101137,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20210518, - 728 + 20210613, + 543 ], "deps": [ "seq" ], - "commit": "4a5f57722e06dad3bbbb1a496ef7d1b732ac7c46", - "sha256": "05x6xy29dym9pn8kssiwhn34c1vwxgsb9jnfq6n0ii5inlw0vx2g" + "commit": "1b47a09f1c0e15c543e0551e7f1e643f437e7711", + "sha256": "1f12rmsxzjz0ixrzvi37gj6kqkjp08mym0qvnxdmqiackagxp2rq" }, "stable": { "version": [ 8, - 2, + 3, 0 ], "deps": [ "seq" ], - "commit": "fd3c824c3622aef4ad29983667f34ebad91e9f69", - "sha256": "1s60j7778n8vl53capi1bs5mbb1g2vwaaa4y7wdv6ajrlxh95a5x" + "commit": "1b47a09f1c0e15c543e0551e7f1e643f437e7711", + "sha256": "1f12rmsxzjz0ixrzvi37gj6kqkjp08mym0qvnxdmqiackagxp2rq" } }, { @@ -101354,8 +101558,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210528, - 406 + 20210630, + 1816 ], "deps": [ "evil", @@ -101367,8 +101571,8 @@ "seq", "undo-tree" ], - "commit": "1b6466e75295bbf7847253dfb6bf580b1c68eb9f", - "sha256": "1rbb7zl45x9xkf05601j05vq3f3hj0nh3rbv16a3n8d0ab5qnvhr" + "commit": "740d80599c0a1ff0882e231e46c61ba16c83cd84", + "sha256": "1zfjdrm88c16czmi4i6rm87nafpyrjpjkj79cg44l9cizyv5198q" }, "stable": { "version": [ @@ -101761,14 +101965,14 @@ "repo": "fritzgrabo/tab-bar-groups", "unstable": { "version": [ - 20210526, - 2044 + 20210615, + 1915 ], "deps": [ "s" ], - "commit": "63af8dced377a346b4559145b2e6e1767263f916", - "sha256": "16628wjk14h99z9i822xjv8fkxra6n65nafm3cr3ci86qd00j7a2" + "commit": "a2e456097322d0b1cfdb7aa37c32a628bcca3bf0", + "sha256": "19ni9bl34hzmqsb9wiznbghw67m7g9zz3z5m3wgndn9zsj37ccka" } }, { @@ -101803,10 +102007,10 @@ }, { "ename": "tab-jump-out", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "1p2hkj0d9hbiwbf746l3rad8a5x6hk97b0ajl6q6cwbmy2qm3cca", + "commit": "f84b8d995a13b8d30d15b3bf9f671dd06fb8522b", + "sha256": "0yyncbgdbw8lgjaycmky7wxhhxaqydks25qf565n2xj87snc5l7n", "fetcher": "github", - "repo": "zhangkaiyulw/tab-jump-out", + "repo": "victorteokw/tab-jump-out", "unstable": { "version": [ 20151006, @@ -101985,11 +102189,11 @@ "repo": "tmalsburg/tango-plus-theme", "unstable": { "version": [ - 20210505, - 1051 + 20210615, + 1229 ], - "commit": "f31d282a70b0eb24470935438af59de96ddace2e", - "sha256": "1f3kxc9l0f4r7fxhrz77lghn4847f3b7dk8j84sn6d5zr436by8n" + "commit": "6ad64d82c8bd8c559b9023cd70b1c2d0c18e9060", + "sha256": "0ig8ng5ycdf256phigh3fzalvd0ncvs54f7kfpq0gp43ky9sgvz0" } }, { @@ -102230,28 +102434,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210607, - 1622 + 20210701, + 1035 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "0fcca201db99fbe93e8b0fd404dc00fd55cd658a", - "sha256": "0nqx5sddfa9442dgsssp022rfarznnq69gclj4h5kk726rkf9cid" + "commit": "a4054e9517d68109212f9d69342a49d4d65dd56f", + "sha256": "010b2rkpr8cib1c6s1ysg5wllrsg4rxc7h7cxqrjq1978bi499cw" }, "stable": { "version": [ 0, 7, - 24 + 25 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "9187e6e3d903474645f3e64806bc62ef687ec205", - "sha256": "1ra04cp49zzx8vy8aswd00l46ixyc44sxh1s3nw880b4ywzxmc6j" + "commit": "f979ac79070c39a4c483c08df96080763287ce4e", + "sha256": "1fdvghwpmja94d65p02j7wa09lwjs3ah1kfb1v17b6l9qd5g80nc" } }, { @@ -102839,10 +103043,10 @@ "version": [ 1, 1, - 0 + 1 ], - "commit": "77181c75cbde5954542688659cd4f2352ed29fbe", - "sha256": "1bcwja7hm11hxd1nmf1z93hkzcvkkpxavvbivg6j336ygzr1r82g" + "commit": "5d35efbf2c1619d9385ef00ed74e9de1ea7cf32d", + "sha256": "11df5606hiqgglxi6xrrljwh70h2wgkib447ggvs2r3f2jayilr4" } }, { @@ -102853,15 +103057,15 @@ "repo": "emacsorphanage/terraform-mode", "unstable": { "version": [ - 20201208, - 1827 + 20210621, + 1953 ], "deps": [ "dash", "hcl-mode" ], - "commit": "a9fa5bdaf58e9cae32ee44b7d0883f5600441b05", - "sha256": "12v8mldxpa32v63zg4y3c7dihbw4v5agy3kd9rpiyymf6z0pcad5" + "commit": "e560caaa9d9a11b0868adf6d9dcae5ebb5055730", + "sha256": "0r4zw6jwn5v1xzzbc1195jblhcg3ikbmz3wiwy462qzib56bj8d3" }, "stable": { "version": [ @@ -103321,18 +103525,18 @@ 20200212, 1903 ], - "commit": "a67ce1533462256ff418027a3aa56516a1139d02", - "sha256": "0f20x4bklq32lcwa2ihnlnb6ri884xx7dyhg62yqz9y4w8filhhv" + "commit": "6c2a7567772f3954006c77a8bdc041df83802a00", + "sha256": "0g1j346s8jhw830byzjvgsjg6a03kza19xsghza1bzncwqjbv1n5" }, "stable": { "version": [ 2021, 6, - 7, + 28, 0 ], - "commit": "ec71afa89573c92de4a2a2ab87a51bd9021f5819", - "sha256": "0h3b89nb8sshhc52fxsgpdiqr85mfg1rpzp69qmiiwx1yz0b66wi" + "commit": "32036a5505970a5a8c905543ebc6de1b20a662d8", + "sha256": "0nc9d88ydm5x4nynyxq4rqbp63ypjd1mwf18vancwigv7jxc62an" } }, { @@ -103388,20 +103592,20 @@ "deps": [ "haskell-mode" ], - "commit": "cfc231660a642b2451f874824365931419ab45a0", - "sha256": "06wqsljigm7hvycvg4p5rilivr8g7im300jlnm1r463dc1d12kjh" + "commit": "60a1c271b39dac22783a4f892446f08d3faeb025", + "sha256": "18spz3lvb3df0rr2cqxkqa6rfzrpwwryh4gkzp68znbbfl655l8d" }, "stable": { "version": [ 1, 7, - 4 + 7 ], "deps": [ "haskell-mode" ], - "commit": "652d7a4e374d3c171278e6bdfccfa41c7621d4d3", - "sha256": "11590ifnh9ynwcfv31f5m59wr6ckrm3xi2g40wvk4ddxslj4yxnh" + "commit": "b7399a878622173bf9fdc076ec72a8353e1b924c", + "sha256": "1qbywv182gzbdk27bzah273mb8brmqrpxcgv1pmdy10fc7fv2z0f" } }, { @@ -103637,11 +103841,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20210607, - 1412 + 20210621, + 1857 ], - "commit": "34a4499fac484c369774e356373b1f4994d65176", - "sha256": "11cjyiwi87rv9lj09810aazxgphdhpxpfhbhzr64176vqgmb8khr" + "commit": "80d29c0f29925775fb00e90669a153d94eae01db", + "sha256": "1hdxis28ngrl0d1gafckah7srad4rnpmn4dh5dxd0a5vph63cxhw" } }, { @@ -104282,8 +104486,8 @@ 20210528, 754 ], - "commit": "c0b2f997b3b73640d635ee84627bb8cf36c9adfe", - "sha256": "1kjfch0fhq67iivad56s071c8qlsssdsdg83h5v9iz2x4jipm0wa" + "commit": "d6f1fa18646f6ed2a1c0f06a4888130bd694ff19", + "sha256": "1l6v02aa072jvhq4b9dpkprqs14py0d4jm3xvihm05lvrbf9v6c6" }, "stable": { "version": [ @@ -104386,20 +104590,20 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210530, - 2252 + 20210701, + 1116 ], - "commit": "a96818c93a10d9ef9bb14e5c0b9fdc1a808b13b9", - "sha256": "1mvccsfalnr4ybsgqazxcw62vfhigxg61y6v98k2fqncnmsbripa" + "commit": "51e833e5152e9fdcdc1dbbf34ad2d4905bde1f69", + "sha256": "10k9dzs8y6i0rfckclxm5n3maylmh95993n5dvrs8rbmlcpmihvy" }, "stable": { "version": [ 0, 3, - 4 + 5 ], - "commit": "b47e9d7d769437e279628d801a95c173c4ff26b4", - "sha256": "16z0j69sk7k51sd1vri3y2v0xjj0w7wpf5mmwnsxp8y6d3m0yjbv" + "commit": "b711543401dafc159943d8a703cf30fabdc78e1f", + "sha256": "0wzfnzv2304a737zwp163aajjhm8i3ix9v7palgg1r3jskvbghmw" } }, { @@ -104773,8 +104977,8 @@ "pfuture", "s" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" }, "stable": { "version": [ @@ -104810,8 +105014,8 @@ "all-the-icons", "treemacs" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" } }, { @@ -104829,8 +105033,8 @@ "evil", "treemacs" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" }, "stable": { "version": [ @@ -104853,14 +105057,14 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210605, - 1118 + 20210630, + 1953 ], "deps": [ "treemacs" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" }, "stable": { "version": [ @@ -104891,8 +105095,8 @@ "pfuture", "treemacs" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" }, "stable": { "version": [ @@ -104924,8 +105128,8 @@ "persp-mode", "treemacs" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" }, "stable": { "version": [ @@ -104957,8 +105161,8 @@ "perspective", "treemacs" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" } }, { @@ -104976,8 +105180,8 @@ "projectile", "treemacs" ], - "commit": "c2b0beaeb0383c3e6cbc453d6c42cdbc87c6da5e", - "sha256": "1plbkalmqi94ikb61yzbs07cr18my1s5p9fli4yd4qkw4mbwc3s4" + "commit": "2655a8976d56719add893cec45a18e018626842d", + "sha256": "060m6gwwvv82p7jry6viqzdf5fw6ljq4gbdkmqc5ilpkrcnmscv8" }, "stable": { "version": [ @@ -105314,14 +105518,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20210605, - 1629 + 20210628, + 1257 ], "deps": [ "caml" ], - "commit": "24c1a1adbe51d93f681e72442fa73f885eb33776", - "sha256": "1cp6g117kfmwfqb7sq4y4jx8ggp29f4hz2kz5g3355s8zhjlld2y" + "commit": "2e8482e23f45f0e6246a8d075a3b8696c5f49070", + "sha256": "04wblkb0jqzq67p1d96i284wfqv3ddffrwz3i3wf537wyi8bmn4k" }, "stable": { "version": [ @@ -105738,6 +105942,30 @@ } }, { + "ename": "uci-mode", + "commit": "0779d9728de07e3115b48997f2623d1fc5c313c7", + "sha256": "0idk3flaq316ynf02226j4hww8rlb60ssikqkjh69n0r31ygg0q3", + "fetcher": "github", + "repo": "dwcoates/uci-mode", + "unstable": { + "version": [ + 20210626, + 1956 + ], + "commit": "2cdf4de5af96d56108a0a5716416ef3c8ac7bb7c", + "sha256": "133vrnbann0ibsm14h7ghdx8f9i92niazbw8r49srx2xx0jv3lk6" + }, + "stable": { + "version": [ + 0, + 5, + 5 + ], + "commit": "2cdf4de5af96d56108a0a5716416ef3c8ac7bb7c", + "sha256": "133vrnbann0ibsm14h7ghdx8f9i92niazbw8r49srx2xx0jv3lk6" + } + }, + { "ename": "ucs-utils", "commit": "c9db386ab3910940addae6e925b2ac17e64e0f87", "sha256": "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2", @@ -105990,11 +106218,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20210418, - 920 + 20210617, + 1327 ], - "commit": "243d93b4c7c1224e7067cd323f64d23dfdfe7c0e", - "sha256": "1gdx6kir0a0v7q2ai59miibch9hccqlnx2y88qswfpqr9pf7z6vm" + "commit": "579936966b41d2d6782f587509fef21477141374", + "sha256": "1sqjp84hi81q62pyx7py7zvmkwdywh106i6jqqnmgkv0ai9cb2ml" } }, { @@ -106224,11 +106452,11 @@ "repo": "astoff/unicode-math-input.el", "unstable": { "version": [ - 20210110, - 1431 + 20210612, + 847 ], - "commit": "b46fc1d4cc5ab5c2bca3de1e5e43c8f53f1d343b", - "sha256": "1g84ynppdv46lhsrl0bgvdvlkijhzns4knkldgmbdhsjafvnz8cw" + "commit": "2788d7824d23749a6e5b33f653c47471455da187", + "sha256": "1kqaqzlgf9gqxf3fzy41m606h7ridp5iik1w5a0dpq86ni23r77c" } }, { @@ -106880,17 +107108,20 @@ "deps": [ "tuareg" ], - "commit": "bac3946079a98df00f31656dc10c6c9f1a8bc422", - "sha256": "1wbmr0n384501i97x0akcfwcigklwqgwvhdwgxw6zxxn5wdg60b2" + "commit": "c87b8b2817eefd0cd53564618911386b89b587c5", + "sha256": "1zf4hg33sblzh2f65vk0292jg4jlwa8702kfwpsg1kcg4w6nsfdp" }, "stable": { "version": [ 2, - 7, + 8, 0 ], - "commit": "a5ff52bbf608e1112b5c0d41a36e3267f39f4084", - "sha256": "125cv7kwvr1xj52yfb5qlra2li2hikbqnqvqdasn0rq3pkj7f02b" + "deps": [ + "tuareg" + ], + "commit": "c87b8b2817eefd0cd53564618911386b89b587c5", + "sha256": "1zf4hg33sblzh2f65vk0292jg4jlwa8702kfwpsg1kcg4w6nsfdp" } }, { @@ -106939,15 +107170,15 @@ "repo": "damon-kwok/v-mode", "unstable": { "version": [ - 20210425, - 411 + 20210608, + 629 ], "deps": [ "dash", "hydra" ], - "commit": "96ca8dad3a3a402a44bf9066591fe27fa2e4fd9a", - "sha256": "08n577b8xr1pv2mdzqzdbkd5j0pih7zd4z4p5y5w4hq72mcid43q" + "commit": "3afbd72180417ada6aeeec861081495aca962124", + "sha256": "0is9hdh8w87l9x84ihhcd040z8m7cy2321q2rmbfmpffaaja90cl" } }, { @@ -107205,19 +107436,19 @@ "repo": "muffinmad/emacs-vc-hgcmd", "unstable": { "version": [ - 20201211, - 1339 + 20210608, + 1030 ], - "commit": "d23de9d10ff68b4c2302ab956f3ba3bb5d3858ee", - "sha256": "14c2brvw6vnf1h3lbpap4jh5d7mjnzxrbny4jk77832v09mj2ria" + "commit": "c00d792b34219a387832f8f9b4a689d7972f592a", + "sha256": "05gjyq4cpc79ipiyl3j263cw6mdbfxmh7wvsxsxavp21q588fb0y" }, "stable": { "version": [ 1, - 13 + 14 ], - "commit": "d23de9d10ff68b4c2302ab956f3ba3bb5d3858ee", - "sha256": "14c2brvw6vnf1h3lbpap4jh5d7mjnzxrbny4jk77832v09mj2ria" + "commit": "12e102f8359095953e06ed17c7223cd6638e5cea", + "sha256": "1mm8lnwii53j32v54aahl8sf3ciwymrvc1rgy4nw2m7hcrnjsb78" } }, { @@ -107374,16 +107605,16 @@ "repo": "justbur/emacs-vdiff-magit", "unstable": { "version": [ - 20190304, - 1707 + 20210614, + 1630 ], "deps": [ "magit", "transient", "vdiff" ], - "commit": "b100d126c69e5c26a61ae05aa1778bcc4302b597", - "sha256": "16cjmrzflf2i1w01973sl944xrfanakba8sb4dpwi79d92xp03xy" + "commit": "fa62a260411387702dd4cc4791075c737519001f", + "sha256": "04n47g3ffnh3bjq5575b6l046cpy7dixksfjy8pzsgh9ah1h37lz" }, "stable": { "version": [ @@ -108264,17 +108495,17 @@ }, { "ename": "vs-dark-theme", - "commit": "60b9b00d18334f2d7b737e3cc6b3c733e1b163e4", - "sha256": "0didkb2zd9ac7h1ccwi9y1q5mcqpwxyws7nsk5g8rhrkygdf9lds", + "commit": "094a9cbc18882daa4f2efd3d72bb0a34e6bd9f63", + "sha256": "1rz2flacnh6h40k559l0r1vwcnx89w4j9ipp1ysnh8rzji3wl07k", "fetcher": "github", - "repo": "jcs-elpa/vs-dark-theme", + "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20210427, - 727 + 20210627, + 2121 ], - "commit": "5a826e6ea3e9edd9241e3253ce97333955c8ae1a", - "sha256": "0q94crd6m6m000gjxwv92jz9rphmnr5wg7jzf6yig1hlhfqjgw9v" + "commit": "bda27d3a7f11fee0550055b0552c2633c167dd96", + "sha256": "1y8ycsm4d72v86prg87dffis5q853k2w0fvx5vz732jryzp18lda" }, "stable": { "version": [ @@ -108287,17 +108518,17 @@ }, { "ename": "vs-light-theme", - "commit": "c997456be95ece85fdef87905e9e14fe308fd827", - "sha256": "02w5zyxf34r1lvk56s3xbkzpvinbwsyv1h685hg9vhn0yy0a23ns", + "commit": "a1258f6afe69d0a13c19246a8b8bd2e5b1a67b48", + "sha256": "14wbqim0bghxwp45qwjh7nc3gi91jaapakaq3x0ypyw8l6xxrbnm", "fetcher": "github", - "repo": "jcs-elpa/vs-light-theme", + "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20210427, - 727 + 20210627, + 2121 ], - "commit": "e324120248c1d513a6516edff250d161f876aad9", - "sha256": "1jw9cbbvm76ijvcrkkn27r3n6qw14jxbirdc0bryv4k12yiwla9m" + "commit": "a8bff6913f603a30bd98bef882ace01476c440bf", + "sha256": "1rshwvfggjb7amgxcl31xhll28kfbgh14aw33khlp32gq6p3vqyh" }, "stable": { "version": [ @@ -108334,8 +108565,8 @@ 20210530, 629 ], - "commit": "961c8c1fdd7eb874d4e2ce386d5e6d1f318b5b72", - "sha256": "1dga7yhb5pnqj5d86pvzbabrq05xj1ppx6g0hinhm8z6m8h6y540" + "commit": "bcae11818d74aa0de8e592b8349d90e512444758", + "sha256": "1rmdin9z68xkxqjhvhyklbby5mxs3qf4wx9c07945p4ps80w8z5g" }, "stable": { "version": [ @@ -108370,11 +108601,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20210409, - 1558 + 20210618, + 1922 ], - "commit": "2b1392cb2b14ec5bd0b7355197d5f353aa5d3983", - "sha256": "0cz0zfq5lannqq2ivmp6zv9r3fybkykx2vl4vn614rij23lylbwc" + "commit": "d9dfa624679afdd5db6ad25429ef86d3dd91401e", + "sha256": "07nk6bw70mi9r3kgs5b11pfwfvfa73xwdl3xgclv8l7k87yysd69" } }, { @@ -108385,14 +108616,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20210531, - 1453 + 20210629, + 927 ], "deps": [ "vterm" ], - "commit": "afe60b814d9d045b968f4a464bbedb241b35392b", - "sha256": "007spqyc474k8fxi6l3s0jh8dg18d9b07wvz3lvbyrgdqwdw2a0p" + "commit": "2258eb19e8bde75f79505c4306f3476bcedce56c", + "sha256": "0k5hmn2wnag6hirnk2ch3xviymbxha5pcb3p1j1lj2likbhwizw8" } }, { @@ -108606,11 +108837,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210606, - 2300 + 20210615, + 103 ], - "commit": "0e18a7e96c8e425ac7c2e69aa26fa6a1e8e6e51a", - "sha256": "1jxp447d8xnk4ixpni7rsph7fd3p58ydmi39yrx201hbqh15jxiz" + "commit": "70b985b1d00c8703acb1ebf16875616903470f45", + "sha256": "0djvaxbxjic4m8nqmj1gs0h77gf0fik00ia7ayfha3fc7fabiif9" } }, { @@ -108831,16 +109062,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20210312, - 843 + 20210629, + 1252 ], "deps": [ "apel", "flim", "semi" ], - "commit": "6e189fc944a9bbde76c5a6d9b6a38d57e85e6390", - "sha256": "0yphp7bqgmhd89hgqy8rg6kmkkzmhz3sjkzm9b1paic7fx9s0maj" + "commit": "769699d60aa033049804083b459ee562b82db77e", + "sha256": "0mgl28xsvc0421pysy6hh0hymr0li8iayaa330r41cbqsk3gz4nw" } }, { @@ -109614,20 +109845,20 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20210601, - 252 + 20210630, + 1217 ], - "commit": "fc29864395fdaf688e2ef5111831663bad89a020", - "sha256": "1adv32z8dmpygbrk14l1pj2535c10ncv8znfzgi1s908ds20kad1" + "commit": "27d9fec33abb989b030f7677ccf5f799287d6472", + "sha256": "1vdvp3iavh57mwhmgxwalrha7h7hgxsfnkxbrspl9x9cx7fx98f3" }, "stable": { "version": [ 3, 5, - 2 + 3 ], - "commit": "5fb30301cb3b4fca5a0e1ce8ec1ef59290b79199", - "sha256": "1wgygby4zwlbx6ry6asraaixl169qdz092zgk1brvg63w7f8vkkb" + "commit": "1f9c37d50f08995c8671822591c8babb893ccc6f", + "sha256": "144i3hkgm36wnfmqk5vq390snziy3zhwifbh6q6dzs99ic77d5g6" } }, { @@ -109638,15 +109869,15 @@ "repo": "yanghaoxie/which-key-posframe", "unstable": { "version": [ - 20190427, - 1103 + 20210615, + 944 ], "deps": [ "posframe", "which-key" ], - "commit": "e7f28608c7fc9507e407c6b840dff09062df533a", - "sha256": "0954llm57gfy3lvq8s32mqdswbv20na0v28gi61kw7023f1wg7ri" + "commit": "90e85d74899fc23d95798048cc0bbdb4bab9c1b7", + "sha256": "173a04s00rydqpkrwdd9khwijbslkwmzqa557x6r1vpp0pdgaz0l" }, "stable": { "version": [ @@ -109932,11 +110163,11 @@ "repo": "progfolio/wikinfo", "unstable": { "version": [ - 20210121, - 1642 + 20210630, + 1730 ], - "commit": "afa32f2b3c23e6d1565698faf9697fa445059bb9", - "sha256": "1wxdb34xsvqydr54w44b84hbins8ay1md49vphp6jqbj99q992dg" + "commit": "bd60451f661609b1b7bfb25662b8b68c0a842c8a", + "sha256": "07jplxs05bwac7i6ksxwl7pm30qk8mc3dvdx0pvim59l67vb61wh" } }, { @@ -109947,15 +110178,15 @@ "repo": "progfolio/wikinforg", "unstable": { "version": [ - 20210602, - 1459 + 20210615, + 2334 ], "deps": [ "org", "wikinfo" ], - "commit": "3aecd23e68b9117a03c65fafa85a0805b58609d1", - "sha256": "0m1fj06x9r941k2842v2091xbff89wp704ifrcdgb6zbksx5d8i2" + "commit": "7df42a260fb93cb743a08e67ea92d77f62dec72b", + "sha256": "05qqs4b0gmnwjl6d29xns93p2lyh1x2xzl0qpydbnxjirwp2bamx" } }, { @@ -110125,27 +110356,28 @@ "repo": "bmag/emacs-purpose", "unstable": { "version": [ - 20210423, - 454 + 20210628, + 715 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "1a556294131a78b557f88bd28d42b43d5c6bd79a", - "sha256": "15v3225irmgg6zsv4h3zyqrbcgx9kbr6rzx5v5hgf9h16fgibi8j" + "commit": "bb462f12f836414425edac32ebd069b4fd5b98d4", + "sha256": "1cw513mh3gyl21qpmgwqjgpi8kwddmd4n69l4ax5a5pv3vvwrcx9" }, "stable": { "version": [ 1, - 8 + 8, + 1 ], "deps": [ "imenu-list", "let-alist" ], - "commit": "8f84defbb4d80ecaada37a2bbde2c1d8699f98af", - "sha256": "1bq0s56wj6ibyh625zfnisy8yniz72dpg4mcgq55azsbnd4fblqq" + "commit": "bb462f12f836414425edac32ebd069b4fd5b98d4", + "sha256": "1cw513mh3gyl21qpmgwqjgpi8kwddmd4n69l4ax5a5pv3vvwrcx9" } }, { @@ -110979,8 +111211,8 @@ 20210316, 156 ], - "commit": "2e57f792edc371e7105ee388f878d52d5801f5de", - "sha256": "0qyx41yawaamfs8k3dr7b48kf09snlklja0pa1n8nw80q355w94p" + "commit": "986c9d96ff898d346b453422e8e312f7976e6089", + "sha256": "17wls9mn097kwpcg9f4dxa6is0yshxgmjh2z1pk1nwfd8mdpczvg" }, "stable": { "version": [ @@ -111000,11 +111232,11 @@ "repo": "ag91/writer-word-goals", "unstable": { "version": [ - 20210503, - 656 + 20210614, + 1527 ], - "commit": "ef94f78b2c4e4fcf1a59d492637cbc84396cb032", - "sha256": "0xf2nvwvag21ds566r90rlf98hf80mz3zj2svhwmqrj6nm70p6z3" + "commit": "46c8a7c71275ced2c662c1222d4b85319f80dd83", + "sha256": "15qxs91inbpr9qk2xlaijargkvj9c6rmw0m4b05qrqni0cgb75dk" } }, { @@ -111115,11 +111347,11 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20201229, - 837 + 20210627, + 505 ], - "commit": "5d9db23bbb982c28cbcf351957ef96ecd80e4c0b", - "sha256": "0f1dwl1nljxw94g6jkqv7rsyxnr9na0xxj447jhmsjyd3iry3g7n" + "commit": "62b7162198ca6659e025feb058e5662c55333ad4", + "sha256": "0xk5wa209pgc2sfz0j4dac57apy45si87628bqc21fnf877ga8qv" } }, { @@ -111130,11 +111362,11 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20210208, - 2056 + 20210627, + 508 ], - "commit": "3ae341944297d59bf33f5580364af2858198781e", - "sha256": "09w44nmxdvc7pxyz959qj59dfqxplj22qqdal7206bb12r1l88zr" + "commit": "86ddb3ce73bb2a844a126e42386571ca8e884260", + "sha256": "1ks43xdfv287n3sy8n25widkwwx388pm3b8p4r2ld6qz200wqjdq" } }, { @@ -111145,11 +111377,11 @@ "repo": "xahlee/xah-find", "unstable": { "version": [ - 20210111, - 334 + 20210624, + 327 ], - "commit": "8948fa8f18023868731a1666f9893abc08f370e1", - "sha256": "1qk1scf085fc650km5hx2fp2chxj1a2hwp4bffxmp59mg78qpb71" + "commit": "16b8d62ddb1d5548fcd78a0371481434390ebd54", + "sha256": "10scxxxg84b38rjlmk0r486r7b1nvla57yq6v1h1ymlbp0addvby" } }, { @@ -111160,11 +111392,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210520, - 540 + 20210701, + 145 ], - "commit": "3022cbf1e0b16c4fe632d03bd49832afac12510c", - "sha256": "0bv9r4kak8gjwcvws1vygdr9ppfyi9m34y5a5alm606y8qmzjxs6" + "commit": "6465e77d57a30a0a82ca4f4756593207b2ada510", + "sha256": "1bzlpwxkjmzgypagdp9qj4jf6crm3yhjnr98ipr1f49dl8178j6s" } }, { @@ -111356,8 +111588,8 @@ "repo": "dandavison/xenops", "unstable": { "version": [ - 20210504, - 1106 + 20210630, + 740 ], "deps": [ "aio", @@ -111367,8 +111599,8 @@ "f", "s" ], - "commit": "4994ae4a660ee94d341ce1905c12b4cf39fee574", - "sha256": "0cqvz8bkpjc4fmdn10zq70q3bvixx25yn13ihxygsdi1mjmn30fh" + "commit": "95b0b37cf5bb6474f054056b0dad9402c700c5b7", + "sha256": "09xiabicada3ziyinlc9fczcdy2nr01fn3fqlq1vpjzb5882k63l" } }, { @@ -111670,10 +111902,10 @@ }, { "ename": "xresources-theme", - "commit": "35763febad20f29320d459394f810668db6c3353", - "sha256": "1vsbvg9w5g6y2qlb8ssn12ax31r7fbslfi9vcgvmjydcr8r1z0zs", + "commit": "8ff729d95709a9e0f458e54dbdab4724ca3c09f3", + "sha256": "0n359mjv4j6n002v5bimas77y1507x1797qj6l1kcdwym8pk0rvg", "fetcher": "github", - "repo": "cqql/xresources-theme", + "repo": "martenlienen/xresources-theme", "unstable": { "version": [ 20190108, @@ -111960,20 +112192,20 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20210604, - 1500 + 20210625, + 528 ], - "commit": "5b352258f50ec9d2e7ff8bd16323a24fb484b52b", - "sha256": "1zaj7w0jfzz7iwsnd8ql3pxgiw108dx0ggk2q5rqxdz5902hksqs" + "commit": "69c699a15af342199d0dbbbe7676a85487781ae7", + "sha256": "1j1yqpnpn5k17jnrax56and4yss1bimxck3zigbgy5fpng89l8sb" }, "stable": { "version": [ 0, 3, - 2 + 3 ], - "commit": "5b352258f50ec9d2e7ff8bd16323a24fb484b52b", - "sha256": "1zaj7w0jfzz7iwsnd8ql3pxgiw108dx0ggk2q5rqxdz5902hksqs" + "commit": "9382bf5a3b1cad1c404bfd13fab8cf6688fe8442", + "sha256": "0xm6c4lk62ifwpc03wmn6602r1izfbk9kpyv3wg3p8ksxllvd0ns" } }, { @@ -112095,11 +112327,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20210205, - 1318 + 20210625, + 1951 ], - "commit": "fb9cb7753af971701dcd96a51efb4d70e2b2a18f", - "sha256": "1xaal77cqics6fdm51j7pm12k61v0qxg68krgb7yi1fd90fm2iy3" + "commit": "6f5c7e5171030663ebda4f1f872c30d0e165b6b7", + "sha256": "08f5qn1dsikv9dkdvdrb8mmjb3himlnh9bcany2w4pj0apgcwn4d" }, "stable": { "version": [ @@ -112218,11 +112450,11 @@ "repo": "emacsorphanage/yascroll", "unstable": { "version": [ - 20210427, - 645 + 20210625, + 803 ], - "commit": "bd20a61ab7cd610625137c051c7f15e7404b7829", - "sha256": "0mxl8qxj9vdr8cg9xkh2v901n8m1drk0wzf4di34vkgkmrlkigyg" + "commit": "0ddf70ec214e2b1fade0594ec44c55adb48c06da", + "sha256": "1mkk07j3bayzprimiq95blbyj7idl01p6jv43hh226r427c89bcs" }, "stable": { "version": [ @@ -112348,11 +112580,11 @@ "url": "https://www.yatex.org/hgrepos/yatex", "unstable": { "version": [ - 20200208, - 931 + 20210630, + 2200 ], - "commit": "f4c2dca86202c2da5b4f0f6ec97c49dd1cb01e6c", - "sha256": "1dh4i2dj2cfg693bvwdi4frmi2892h4q25xdacdm63c7fmn3ap6l" + "commit": "d4831b3672f87affbb0f7f69135e7824d0bd325b", + "sha256": "0fga8zicxgmfw4px2zwfvwycl9hcqcwnf65izrbrj6rrljdbb3yv" } }, { @@ -112581,11 +112813,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20210509, - 520 + 20210623, + 544 ], - "commit": "9a26f361083ed1d0dd56e659fae913ffea51c739", - "sha256": "1da39wyb8zhpyvqxld19cna0jdjhpdiwsmac6ari7nw8i8dvbbhw" + "commit": "4aa2a0d0c3e3b7c408d680df8cc5ede53c18e923", + "sha256": "0psb3ff0f0wia7vmxqhframl8vnyzk6xx3dmv1g1j7b0njk259ij" }, "stable": { "version": [ @@ -113121,14 +113353,14 @@ "repo": "nnicandro/emacs-zmq", "unstable": { "version": [ - 20210424, - 1943 + 20210613, + 343 ], "deps": [ "cl-lib" ], - "commit": "790033363cf0e78c616cfe117a2f681381e96f29", - "sha256": "0vssi5d02s7f9rhsgqnbh4ql2nvjcc4hsrmihwrk1ij50pn927yj" + "commit": "38dc6c4119aee57666caf8f97c8a3d7f678823e0", + "sha256": "0j7szww8fi2pyvln1bppyq8nly0vkbncz63kzqhi1zx7dfz127ry" }, "stable": { "version": [ diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 38ea3054a60..b962ab6e22b 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -255,12 +255,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1znb4m7sv7xqi1mq3yw0m51m06wfwmhhxmvck0xkv8s0cfg18qim"; /* updated by script */ + sha256 = "0lhi3vwhwb359va4sa17y071i03l4mfwqpsp7haqxjf900dcld7d"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -268,12 +268,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "Up and Coming Go IDE"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0g20r7yn4r2h08wv3i8bnnma8x4jljixsbmfml8kixk0pzfhv4px"; /* updated by script */ + sha256 = "0xy9k90v3kcm9sj48l809qn0vws4ygsxxyqwsg6y9a3r1raqgqxd"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -281,12 +281,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "03i5f6p0abr9yfs9fg90fg7hb1a7zar9q4d4iiag30cmndwpslg2"; /* updated by script */ + sha256 = "1phpfa9i3k7g92ankmibp53c1469ifnb12g6s8gklln7v7xxakmi"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -294,12 +294,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "0mw4acaik1bkr7gqbwgs3i8f8px8zw95hm1zxgd5gd5kh88n17x5"; /* updated by script */ + sha256 = "13c7a96zbw05w1gy4ds4wzac853hdlnbflww2xaz60jnr1k24gnp"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -320,12 +320,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2021.1.3"; /* updated by script */ + version = "2021.1.4"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "05hjv1nz1b82bkakadjvsy23v0qv8fyni6h31lcg9198h1890f7v"; /* updated by script */ + sha256 = "0p9a8l2bpjm25x4af1hlqhmw5xsirsfajznd6y723yqmjy8hs46l"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -333,12 +333,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "PyCharm Community Edition"; license = lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0sp7w1xrl0y36dai08kqfd0jk06yr7jdbaf1a9f3fgxp5pmspxp1"; /* updated by script */ + sha256 = "0c03grsrjydb6jcnbq1qi4158c14vni3znr7vysnbvldi8al6w8m"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -346,12 +346,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2021.1.2"; /* updated by script */ + version = "2021.1.3"; /* updated by script */ description = "PyCharm Professional Edition"; license = lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0ny7rbl8g5azpqnlcq8l6bwh6hrp8rgp06lf4a8gdr9rpvw9xsqb"; /* updated by script */ + sha256 = "01nwc9nprlyrwyij98px915w66g6vxbznsmmmg56rv3rvjvjp7yl"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; diff --git a/pkgs/applications/editors/jetbrains/update.pl b/pkgs/applications/editors/jetbrains/update.pl index cd3d2193a28..abb4e5f7223 100755 --- a/pkgs/applications/editors/jetbrains/update.pl +++ b/pkgs/applications/editors/jetbrains/update.pl @@ -14,7 +14,7 @@ sub semantic_less { } sub get_latest_versions { - my @channels = get("http://www.jetbrains.com/updates/updates.xml") =~ /(<channel .+?<\/channel>)/gs; + my @channels = get("https://www.jetbrains.com/updates/updates.xml") =~ /(<channel .+?<\/channel>)/gs; my %h = {}; for my $ch (@channels) { my ($id) = $ch =~ /^<channel id="[^"]+" name="([^"]+)"/; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 1b4835064f9..bfa7e8e2009 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -2,6 +2,7 @@ , libuv, lua, ncurses, pkg-config , unibilium, xsel, gperf , libvterm-neovim +, tree-sitter , glibcLocales ? null, procps ? null # now defaults to false because some tests can be flaky (clipboard etc) @@ -31,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.4.4"; + version = "0.5.0"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - sha256 = "11zyj6jvkwas3n6w1ckj3pk6jf81z1g7ngg4smmwm7c27y2a6f2m"; + sha256 = "0lgbf90sbachdag1zm9pmnlbn35964l3khs27qy4462qzpqyi9fi"; }; patches = [ @@ -58,6 +59,7 @@ in msgpack ncurses neovimLuaEnv + tree-sitter unibilium ] ++ optional stdenv.isDarwin libiconv ++ optionals doCheck [ glibcLocales procps ] @@ -96,6 +98,7 @@ in "-DGPERF_PRG=${gperf}/bin/gperf" "-DLUA_PRG=${neovimLuaEnv.interpreter}" "-DLIBLUV_LIBRARY=${luvpath}" + "-DUSE_BUNDLED=OFF" ] ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" diff --git a/pkgs/applications/editors/spacevim/default.nix b/pkgs/applications/editors/spacevim/default.nix index 661bec463a7..9f6f895efac 100644 --- a/pkgs/applications/editors/spacevim/default.nix +++ b/pkgs/applications/editors/spacevim/default.nix @@ -1,8 +1,19 @@ -{ ripgrep, git, fzf, makeWrapper, vim_configurable, vimPlugins, fetchFromGitHub -, lib, stdenv, formats, runCommand, spacevim_config ? import ./init.nix }: +{ ripgrep +, git +, fzf +, makeWrapper +, vim_configurable +, vimPlugins +, fetchFromGitHub +, lib +, stdenv +, formats +, runCommand +, spacevim_config ? import ./init.nix +}: let - format = formats.toml {}; + format = formats.toml { }; vim-customized = vim_configurable.customize { name = "vim"; # Not clear at the moment how to import plugins such that @@ -14,17 +25,18 @@ let mkdir -p $out cp ${format.generate "init.toml" spacevim_config} $out/init.toml ''; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "spacevim"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; rev = "v${version}"; - sha256 = "sha256-QQdtjEdbuzmf0Rw+u2ZltLihnJt8LqkfTrLDWLAnCLE="; + sha256 = "sha256-TmfPeaGkH1Wq2b5lB29PUYDVddJVN3mBuPAmu9EtiGY="; }; - nativeBuildInputs = [ makeWrapper vim-customized]; + nativeBuildInputs = [ makeWrapper vim-customized ]; buildInputs = [ vim-customized ]; buildPhase = '' diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index ef7458d7394..09c1fddbda2 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas libLAS proj-datumgrid ] - ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); + ++ (with python2Packages; [ python python-dateutil wxPython30 numpy ]); # On Darwin the installer tries to symlink the help files into a system # directory diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 2ebe0ac253f..3ed11aa8b70 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -12,7 +12,7 @@ let numpy psycopg2 chardet - dateutil + python-dateutil pyyaml pytz requests diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 469437c6c95..cc15b96b4b6 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.4.1"; + version = "3.6.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "sha256-f8P4UdqbzXxQU+zQnyGqPrYQO+mKbFj1IBC28iF0lB4="; + sha256 = "sha256:0f8aqwkgw4gs97b5i4ygiqk5zilwq7ax7zwdd31r72zk98cd1g46"; }; nativeBuildInputs = [ cmake ninja llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 05e94bb164c..5bb94baf76f 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { homepage = "https://about.draw.io/"; license = licenses.asl20; changelog = "https://github.com/jgraph/drawio-desktop/releases/tag/v${version}"; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 9fd629ca8e9..f9120ca0ee4 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -55,7 +55,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { psutil pyxdg arrow - dateutil + python-dateutil easygui colour pymediainfo diff --git a/pkgs/applications/misc/1password-gui/default.nix b/pkgs/applications/misc/1password-gui/default.nix index 436e4d7831f..b4b55fa264d 100644 --- a/pkgs/applications/misc/1password-gui/default.nix +++ b/pkgs/applications/misc/1password-gui/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { description = "Multi-platform password manager"; homepage = "https://1password.com/"; license = licenses.unfree; - maintainers = with maintainers; [ danieldk timstott savannidgerinel ]; + maintainers = with maintainers; [ timstott savannidgerinel ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0ee374ac695..d27c9c9af65 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -77,7 +77,7 @@ mkDerivation rec { cchardet css-parser cssselect - dateutil + python-dateutil dnspython feedparser html2text diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index a33cb7b2ce6..32b9085b3de 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -3,20 +3,20 @@ mkDerivation rec { pname = "cura"; - version = "4.9.0"; + version = "4.10.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "1q515qwrzla3ikbsjmk91y0nrbwih11jycgmd50lkrmnkh7qj0r2"; + sha256 = "0v65xg31rw4kc7f98k8zz0kmhrp9m55k8ahblha9r1vr4krcf30z"; }; materials = fetchFromGitHub { owner = "Ultimaker"; repo = "fdm_materials"; rev = version; - sha256 = "0hi9w1fsnazlr0vvxdr3alsdb8m1vjjfp5zhmlz4kyyxhsy3bc33"; + sha256 = "0ykf14j4yx4cf12qw0d4bff9ixrx96m6wxqvi83sn721y7dsd2rs"; }; buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 05f63c54803..d0dfde5b382 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.9.1"; + version = "4.10.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "sha256-1hCjtnI1EnfyQ0QfU8qZoSLIjE5pyDYpu8H4J91cWYM="; + sha256 = "sha256-t5i6s0KKcaoMqzDxZ6JL1NyKP33uxWdmyziK3xh8q88="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index b48640c1d2a..a15157a9370 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.1.1"; # When updating also update fetchedMavenDeps.sha256 + version = "21.1.2"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-enUwX+BxgPy4c1Vwo1+vN3lFYz4LgofgKvZOYuz/050="; + sha256 = "sha256-3q5LTllyqw7s8unJHTuasBCM4iaJ9lLpwgbXwBGUtIw="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-vNC+LmGEepZCepPodY3c783moReppqNw32d7AUuvBZc="; + outputHash = "sha256-QPDnIXP3yB1Dn0LBbBBLvRDbCyguWvG9Zzb1Vjh72UA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/free42/default.nix b/pkgs/applications/misc/free42/default.nix index feadf159092..2dd70acb9a7 100644 --- a/pkgs/applications/misc/free42/default.nix +++ b/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZoW5gBAUp/5U8Is3Nhx+SHY4d0F3PGOS1/WOokKRnCU="; + sha256 = "sha256-ytRPIBE8KcuM+pyfdKt/b+Vi03x8nowdgZjSt8EddSc="; }; nativeBuildInputs = [ copyDesktopItems pkg-config ]; diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 392e2c312f7..23e42539d79 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - dateutil gflags httplib2 parsedatetime six vobject + python-dateutil gflags httplib2 parsedatetime six vobject google-api-python-client oauth2client uritemplate libnotify ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 0eca08907e9..a2280e8bb01 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "9.1"; + version = "9.2"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "sha256-szq1i2/NEtMK4paSkxtkKXc8yY8qGj2U/p6CzNIecAY="; + sha256 = "sha256-pU02Eaq6tB7X6EPOo8YAyryJRbSV3KebQv8VELxXaBw="; }; patches = (substituteAll { diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index c2e55be1134..42683318840 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hugo"; - version = "0.84.3"; + version = "0.84.4"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3SbF4JsanNup0JmtEoZlyu3SvMn01r+nhnPgIi/W8pA="; + sha256 = "sha256-nD2UBDSDG6OFfUvDBXCfhOCiJyFMP2pDXSlIESaEfqE="; }; vendorSha256 = "sha256-ImXTOtN6kQL7Q8IBlmK7+i47cWtyZT0xcnQdCw3NvWM="; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 5c6b505dd68..c7c184febe1 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -9,16 +9,12 @@ with python3.pkgs; buildPythonApplication rec { sha256 = "sha256-L92PwU/ll+Wn1unGPHho2WC07QIbVjxoSnHwcJDtpDI="; }; - patches = [ - ./skip-broken-test.patch - ]; - propagatedBuildInputs = [ atomicwrites click click-log configobj - dateutil + python-dateutil icalendar lxml pkgs.vdirsyncer @@ -31,16 +27,12 @@ with python3.pkgs; buildPythonApplication rec { freezegun ]; nativeBuildInputs = [ setuptools-scm sphinx sphinxcontrib_newsfeed ]; - checkInputs = [ pytest glibcLocales ]; + checkInputs = [ + glibcLocales + pytestCheckHook + ]; LC_ALL = "en_US.UTF-8"; - postPatch = '' - sed -i \ - -e "s/Invalid value for \"ics\"/Invalid value for \\\'ics\\\'/" \ - -e "s/Invalid value for \"\[ICS\]\"/Invalid value for \\\'\[ICS\]\\\'/" \ - tests/cli_test.py - ''; - postInstall = '' # zsh completion install -D misc/__khal $out/share/zsh/site-functions/__khal @@ -56,11 +48,13 @@ with python3.pkgs; buildPythonApplication rec { doCheck = !stdenv.isAarch64; - checkPhase = '' - py.test -k "not test_vertical_month_abbr_fr and not test_vertical_month_unicode_weekdeays_gr \ - and not test_event_different_timezones and not test_default_calendar and not test_birthdays \ - and not test_birthdays_no_year" - ''; + disabledTests = [ + # This test is failing due to https://github.com/pimutils/khal/issues/1065 + "test_print_ics_command" + + # Mocking breaks in this testcase + "test_import_from_stdin" + ]; meta = with lib; { homepage = "http://lostpackets.de/khal/"; diff --git a/pkgs/applications/misc/khal/skip-broken-test.patch b/pkgs/applications/misc/khal/skip-broken-test.patch deleted file mode 100644 index fc37f6acc86..00000000000 --- a/pkgs/applications/misc/khal/skip-broken-test.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/tests/cli_test.py b/tests/cli_test.py -index 5e354a5..d8fbcd5 100644 ---- a/tests/cli_test.py -+++ b/tests/cli_test.py -@@ -493,6 +493,7 @@ def test_import_invalid_choice_and_prefix(runner): - assert result.output == '09.04.-09.04. An Event\n' - - -+@pytest.mark.skip(reason="Mocking breaks in this testcase") - def test_import_from_stdin(runner, monkeypatch): - ics_data = 'This is some really fake icalendar data' - -diff --git a/tests/ui/test_editor.py b/tests/ui/test_editor.py -index 27b7fa5..5978d72 100644 ---- a/tests/ui/test_editor.py -+++ b/tests/ui/test_editor.py -@@ -1,5 +1,7 @@ - import datetime as dt - -+import pytest -+ - import icalendar - from khal.ui.editor import RecurrenceEditor, StartEndEditor - -@@ -19,7 +21,7 @@ palette = { - 'edit': 'blue', - } - -- -+@pytest.mark.skip(reason="Mocking breaks in this testcase") - def test_popup(monkeypatch): - """making sure the popup calendar gets callend with the right inital value - diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 2fd217e3cd6..72028478e6e 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://code-industry.net/free-pdf-editor/"; license = licenses.unfreeRedistributable; platforms = with platforms; [ "x86_64-linux" ]; - maintainers = with maintainers; [ cmcdragonkai flokli ]; + broken = true; + maintainers = with maintainers; [ cmcdragonkai ]; }; } diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index d5f2a4b2462..46da03b8a88 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "1.0.6"; + version = "1.0.7"; format = "other"; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = "metadata-cleaner"; rev = "v${version}"; - sha256 = "0k9qnycaqxnmsjsyxqgip6xr5w9affzxjc4zyb38ajbq4arfq5wv"; + sha256 = "sha256-HlP/QahVFCAct06pKanjozFqeyTdHoHanIemq5ID2CQ="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/otpclient/default.nix b/pkgs/applications/misc/otpclient/default.nix new file mode 100644 index 00000000000..b15eb1a78b4 --- /dev/null +++ b/pkgs/applications/misc/otpclient/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, lib +, fetchFromGitHub +, cmake +, pkg-config +, gtk3 +, wrapGAppsHook +, jansson +, libgcrypt +, libzip +, libpng +, libcotp +, zbar +}: + +stdenv.mkDerivation rec { + pname = "otpclient"; + version = "2.4.4"; + + src = fetchFromGitHub { + owner = "paolostivanin"; + repo = pname; + rev = "v${version}"; + sha256 = "0zjvhcx9q8nsf97zikddxriky0kghi4j4i7312s94pl8c7kb4abr"; + }; + + buildInputs = [ gtk3 jansson libgcrypt libzip libpng libcotp zbar ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + + meta = with lib; { + description = "Highly secure and easy to use OTP client written in C/GTK that supports both TOTP and HOTP"; + homepage = "https://github.com/paolostivanin/OTPClient"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ alexbakker ]; + }; +} diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 235d14b4cda..5657c7f7e1a 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { pikepdf img2pdf setuptools - dateutil + python-dateutil ]; # incompatible with wrapGAppsHook diff --git a/pkgs/applications/misc/seatd/default.nix b/pkgs/applications/misc/seatd/default.nix index e07356d0c33..98f278e0c3a 100644 --- a/pkgs/applications/misc/seatd/default.nix +++ b/pkgs/applications/misc/seatd/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "man" ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ systemd ]; diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index 4eb0981d81f..1d1aed3c926 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "slides"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "maaslalani"; repo = "slides"; rev = "v${version}"; - sha256 = "00sml6b9q3df9dgl7fpsn6a3qkq6xklnbfvvblf91xdf4ssn7wrx"; + sha256 = "15f4sn1zsqqhzxnmwb1igh8xhka6li31ygdqgbjvxzm93lkarxvs"; }; checkInputs = [ diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 7420267aa7d..d5a7d6f0fd6 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -5,13 +5,13 @@ }: let - version = "5.0.1"; + version = "5.0.2"; subsurfaceSrc = (fetchFromGitHub { owner = "Subsurface"; repo = "subsurface"; rev = "v${version}"; - sha256 = "01r836ckvrmgprjf4cqxn2n3w5w4pa2fjrhspjndsspic8nwlrwg"; + sha256 = "1yay06m8p9qp2ghrg8dxavdq55y09apcgdnb7rihgs3hq86k539n"; fetchSubmodules = true; }); diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index 562a0f0bdcb..f28bd665a5e 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -3,7 +3,7 @@ , buildPythonApplication , click , pyfiglet -, dateutil +, python-dateutil , setuptools }: @@ -18,7 +18,7 @@ buildPythonApplication rec { owner = "trehn"; }; - propagatedBuildInputs = [ dateutil click pyfiglet setuptools ]; + propagatedBuildInputs = [ python-dateutil click pyfiglet setuptools ]; meta = with lib; { description = "Starts a countdown to or from TIMESPEC"; diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 3994541f48b..4901eda54aa 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "0.0.17"; + version = "0.0.20"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "0g4kbprsdjk2lbx81azdvz8kkhyk370id3622xxssr894v0i7iwj"; + sha256 = "03jiv5m807z96796fbpi6ny22am3sq4jfni37fxbld05sxdzwcnd"; }; - vendorSha256 = "1kf7ynmxrzvhl028b4nbz9h9v9x5srarsbynpgpp4vicmxqlvrmh"; + vendorSha256 = "1in5b7ixnm5iizkzziqclvgaq87ccdh507amkgfhfy5sxsgbfb1g"; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; diff --git a/pkgs/applications/misc/usb-reset/default.nix b/pkgs/applications/misc/usb-reset/default.nix new file mode 100644 index 00000000000..db05eda0d41 --- /dev/null +++ b/pkgs/applications/misc/usb-reset/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "usb-reset"; + # not tagged, but changelog has this with the date of the e9a9d6c commit + # and no significant change occured between bumping the version in the Makefile and that + # and the changes since then (up to ff822d8) seem snap related + version = "0.3"; + + src = fetchFromGitHub { + owner = "ralight"; + repo = pname; + rev = "e9a9d6c4a533430e763e111a349efbba69e7a5bb"; + sha256 = "0k9qmhqi206gcnv3z4vwya82g5nm225972ylf67zjiikk8pn8m0s"; + }; + + buildInputs = [ libusb1 ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace /usr/include/libusb-1.0 ${libusb1.dev}/include/libusb-1.0 + ''; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "prefix=" + ]; + + meta = with lib; { + description = "Perform a bus reset on a USB device using its vendor and product ID"; + homepage = "https://github.com/ralight/usb-reset"; + changelog = "https://github.com/ralight/usb-reset/blob/master/ChangeLog.txt"; + license = licenses.mit; + maintainers = [ maintainers.evils ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix index 9663d09304f..7851000a7a0 100644 --- a/pkgs/applications/misc/visidata/default.nix +++ b/pkgs/applications/misc/visidata/default.nix @@ -2,7 +2,7 @@ , lib , buildPythonApplication , fetchFromGitHub -, dateutil +, python-dateutil , pandas , requests , lxml @@ -36,7 +36,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ # from visidata/requirements.txt # packages not (yet) present in nixpkgs are commented - dateutil + python-dateutil pandas requests lxml diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index 20defe41988..10d519efa45 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonApplication, dateutil, +{ lib, fetchurl, buildPythonApplication, python-dateutil, sqlalchemy, setproctitle, icalendar }: buildPythonApplication rec { @@ -11,7 +11,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil sqlalchemy setproctitle icalendar diff --git a/pkgs/applications/networking/3proxy/default.nix b/pkgs/applications/networking/3proxy/default.nix index f9221d06d02..b83f93b3b68 100644 --- a/pkgs/applications/networking/3proxy/default.nix +++ b/pkgs/applications/networking/3proxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "3proxy"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "z3APA3A"; repo = pname; rev = version; - sha256 = "9aopwyz0U2bYTvx5YWLJo9EE8Xfb51IOguHRJodjpm8="; + sha256 = "sha256-4bLlQ/ULvpjs6fr19yBBln5mRRc+yj+zVLiTs1e/Ypc="; }; makeFlags = [ diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 7d5b437b0ac..7b2acbd6b3d 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.26.67"; + version = "1.26.74"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "Kg6ExXZYdSkyBoivu9h4blytHN9hOc4bUSuFR+1YZOY="; + sha256 = "ULmoUXyPWHCewK4FPP7SX1Ena6n0aM/EWR7ZnMN1ztY="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index cc443764447..602e2e6a829 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -62,7 +62,7 @@ mkChromiumDerivation (base: rec { -e '/\[Desktop Entry\]/a\' \ -e 'StartupWMClass=chromium-browser' \ $out/share/applications/chromium-browser.desktop - '' + lib.optionalString (channel == "dev") '' + '' + lib.optionalString (channel != "stable") '' cp -v "$buildPath/crashpad_handler" "$libExecPath/" ''; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 14ee3290c71..535b87a87fd 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -149,9 +149,11 @@ in stdenv.mkDerivation { + "chromium${suffix}-${version}"; inherit version; - buildInputs = [ + nativeBuildInputs = [ makeWrapper ed + ]; + buildInputs = [ # needed for GSETTINGS_SCHEMAS_PATH gsettings-desktop-schemas glib gtk3 diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 9dc9c40df0c..863510ded66 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -18,9 +18,9 @@ } }, "beta": { - "version": "92.0.4515.70", - "sha256": "06yhpxr5bg0gx7hmrhc6zg4gr1d9s34y2rb98rpl4dilmc548i6q", - "sha256bin64": "1fkakh1r87pg5nr101m6v86y8iyyfba8vnzrg0229kcar7v8wzf7", + "version": "92.0.4515.80", + "sha256": "142v8y275mysgksvfprc83a7r1dlcnb5rqi8a451fmfnj6wrsq8i", + "sha256bin64": "0sz2fvg6l7q7syc5pysa246p03sganmgjdfvind42i8cqxw8gycp", "deps": { "gn": { "version": "2021-05-07", diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 725205c5c20..d16c625e2db 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -203,6 +203,7 @@ stdenv.mkDerivation { url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; platforms = builtins.attrNames mozillaPlatforms; + timeout = 86400; # 24 hours (increased from the Hydra default of 10h, c.f. #129115) maintainers = with maintainers; [ taku0 lovesegfault ]; }; } diff --git a/pkgs/applications/networking/browsers/vieb/default.nix b/pkgs/applications/networking/browsers/vieb/default.nix index 0eeb5231159..f97e8d8250e 100644 --- a/pkgs/applications/networking/browsers/vieb/default.nix +++ b/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,13 +2,13 @@ mkYarnPackage rec { pname = "vieb"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - sha256 = "sha256-wLaOqjDxgjfv4+TJeLE0dkrhfdnNSjiDqtFcHTm8uG4="; + sha256 = "sha256-NKWqSnUO8SScEodHYSptRHwVNOa5C4M61ac85d+wYK0="; }; packageJSON = ./package.json; diff --git a/pkgs/applications/networking/browsers/vieb/package.json b/pkgs/applications/networking/browsers/vieb/package.json index e12d86356c2..1836efdb8ad 100644 --- a/pkgs/applications/networking/browsers/vieb/package.json +++ b/pkgs/applications/networking/browsers/vieb/package.json @@ -1,7 +1,7 @@ { "name": "vieb", "productName": "Vieb", - "version": "5.2.0", + "version": "5.3.0", "description": "Vim Inspired Electron Browser", "main": "app/index.js", "scripts": { @@ -29,18 +29,18 @@ "license": "GPL-3.0-or-later", "devDependencies": { "archiver": "5.3.0", - "electron": "13.1.2", + "electron": "13.1.4", "electron-builder": "22.11.7", "eslint": "7.29.0", "eslint-plugin-compat": "3.9.0", "eslint-plugin-sort-keys-fix": "1.1.1", - "jest-environment-jsdom": "27.0.3", - "jest": "27.0.4" + "jest": "27.0.6", + "jest-environment-jsdom": "27.0.6" }, "dependencies": { "7zip-bin": "5.1.1", - "@cliqz/adblocker-electron": "1.22.1", - "@cliqz/adblocker-electron-preload": "1.22.1", + "@cliqz/adblocker-electron": "1.22.2", + "@cliqz/adblocker-electron-preload": "1.22.2", "is-svg": "4.3.1", "rimraf": "3.0.2" }, diff --git a/pkgs/applications/networking/browsers/vieb/yarn.lock b/pkgs/applications/networking/browsers/vieb/yarn.lock index af42526610d..33e9604c06d 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.lock +++ b/pkgs/applications/networking/browsers/vieb/yarn.lock @@ -22,9 +22,9 @@ "@babel/highlight" "^7.14.5" "@babel/compat-data@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz#8ef4c18e58e801c5c95d3c1c0f2874a2680fadea" - integrity sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w== + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08" + integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw== "@babel/core@^7.1.0", "@babel/core@^7.7.2", "@babel/core@^7.7.5": version "7.14.6" @@ -90,9 +90,9 @@ "@babel/types" "^7.14.5" "@babel/helper-member-expression-to-functions@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz#d5c70e4ad13b402c95156c7a53568f504e2fb7b8" - integrity sha512-UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ== + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970" + integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA== dependencies: "@babel/types" "^7.14.5" @@ -181,10 +181,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.7.2": - version "7.14.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz#d85cc68ca3cac84eae384c06f032921f5227f4b2" - integrity sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6", "@babel/parser@^7.14.7", "@babel/parser@^7.7.2": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz#6099720c8839ca865a2637e6c85852ead0bdb595" + integrity sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA== "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -287,16 +287,16 @@ "@babel/types" "^7.14.5" "@babel/traverse@^7.1.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.7.2": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz#c111b0f58afab4fea3d3385a406f692748c59870" - integrity sha512-G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg== + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz#64007c9774cfdc3abd23b0780bc18a3ce3631753" + integrity sha512-9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ== dependencies: "@babel/code-frame" "^7.14.5" "@babel/generator" "^7.14.5" "@babel/helper-function-name" "^7.14.5" "@babel/helper-hoist-variables" "^7.14.5" "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.14.5" + "@babel/parser" "^7.14.7" "@babel/types" "^7.14.5" debug "^4.1.0" globals "^11.1.0" @@ -314,34 +314,27 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@cliqz/adblocker-content@^1.22.1", "@cliqz/adblocker-content@^1.22.2": +"@cliqz/adblocker-content@^1.22.2": version "1.22.2" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-content/-/adblocker-content-1.22.2.tgz#643849d5f08c167eb84a2e7e3f1f9fbc41a3889b" integrity sha512-EsV00IdW8sGujGnylOGR8dm401FdIfPRAjuevsRlZjgDE+hQKj6n5wwrZaylPIh994hWesg6bxWTmXpJ2Sy2QQ== dependencies: "@cliqz/adblocker-extended-selectors" "^1.22.2" -"@cliqz/adblocker-electron-preload@1.22.1": - version "1.22.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.1.tgz#8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af" - integrity sha512-etkb6LNUaCViZ2Bg7Z0fwpKsdsrmHF6Qjqs5u7FcfS4fSZ2TgDv7Ir5PunUWd6MOUW7mapx5CdPIupnlVkiTLA== - dependencies: - "@cliqz/adblocker-content" "^1.22.1" - -"@cliqz/adblocker-electron-preload@^1.22.1": +"@cliqz/adblocker-electron-preload@1.22.2", "@cliqz/adblocker-electron-preload@^1.22.2": version "1.22.2" resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.2.tgz#eea674767a60abe4e5f9ccb46188d33656f551d0" integrity sha512-4JSqNNYo4hXMoZjnyBVTd3z2yV2n5qeoNPk+WaeOFEF9uJXhqPR+Sz7scNB6nMYnRuSQfraeogtdaA4s0JkJWQ== dependencies: "@cliqz/adblocker-content" "^1.22.2" -"@cliqz/adblocker-electron@1.22.1": - version "1.22.1" - resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.1.tgz#13fe6de4be0c3beb2851634b27ea1223d10ca92b" - integrity sha512-RZUog6ogMZnOx9Rz1LWIHE5MOWdDStfzkbfLpelka6PerRSKKltUvV4qwqM455eUMqHqPd27ZMM183+MQ85WpQ== +"@cliqz/adblocker-electron@1.22.2": + version "1.22.2" + resolved "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.2.tgz#85af3b49f7f653e6fb0d008b6523e3b3ba0dd41e" + integrity sha512-uSQjbcv9/csjQOO0AgqK8AnqdpKseebPkwXozglU1uFVVnuSOTs/4RohL3yac9uMkJtfyAIhT3mnbw9Cf4o+gQ== dependencies: - "@cliqz/adblocker" "^1.22.1" - "@cliqz/adblocker-electron-preload" "^1.22.1" + "@cliqz/adblocker" "^1.22.2" + "@cliqz/adblocker-electron-preload" "^1.22.2" tldts-experimental "^5.6.21" "@cliqz/adblocker-extended-selectors@^1.22.2": @@ -349,7 +342,7 @@ resolved "https://registry.yarnpkg.com/@cliqz/adblocker-extended-selectors/-/adblocker-extended-selectors-1.22.2.tgz#1cad3c1569b765d9e7f8672c85b2a7b1e8e9ee90" integrity sha512-/u4SmQ1wr7d80iGP705fZrfHjJUTf/1MyRXz5Wltt7i3OHvOCQEoST2mqNlfx0W/9gIWzxA7cFRLY0/aITmzTw== -"@cliqz/adblocker@^1.22.1": +"@cliqz/adblocker@^1.22.2": version "1.22.2" resolved "https://registry.yarnpkg.com/@cliqz/adblocker/-/adblocker-1.22.2.tgz#99a14d56327734d3083a077d96fe7b91c236bf7a" integrity sha512-P+a8gYbRbQy38mYsr7932h2cnK/7AEuQrmCEfLTO1+abCr2v5RM2Qb+cCn/JVnQSeqnysebAIXoV+PUzrjfpiQ== @@ -429,94 +422,94 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== -"@jest/console@^27.0.2": - version "27.0.2" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.0.2.tgz#b8eeff8f21ac51d224c851e1729d2630c18631e6" - integrity sha512-/zYigssuHLImGeMAACkjI4VLAiiJznHgAl3xnFT19iWyct2LhrH3KXOjHRmxBGTkiPLZKKAJAgaPpiU9EZ9K+w== +"@jest/console@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.0.6.tgz#3eb72ea80897495c3d73dd97aab7f26770e2260f" + integrity sha512-fMlIBocSHPZ3JxgWiDNW/KPj6s+YRd0hicb33IrmelCcjXo/pXPwvuiKFmZz+XuqI/1u7nbUK10zSsWL/1aegg== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^27.0.2" - jest-util "^27.0.2" + jest-message-util "^27.0.6" + jest-util "^27.0.6" slash "^3.0.0" -"@jest/core@^27.0.4": - version "27.0.4" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.0.4.tgz#679bf9ac07900da2ddbb9667bb1afa8029038f53" - integrity sha512-+dsmV8VUs1h/Szb+rEWk8xBM1fp1I///uFy9nk3wXGvRsF2lBp8EVPmtWc+QFRb3MY2b7u2HbkGF1fzoDzQTLA== +"@jest/core@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.0.6.tgz#c5f642727a0b3bf0f37c4b46c675372d0978d4a1" + integrity sha512-SsYBm3yhqOn5ZLJCtccaBcvD/ccTLCeuDv8U41WJH/V1MW5eKUkeMHT9U+Pw/v1m1AIWlnIW/eM2XzQr0rEmow== dependencies: - "@jest/console" "^27.0.2" - "@jest/reporters" "^27.0.4" - "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/console" "^27.0.6" + "@jest/reporters" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" emittery "^0.8.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-changed-files "^27.0.2" - jest-config "^27.0.4" - jest-haste-map "^27.0.2" - jest-message-util "^27.0.2" - jest-regex-util "^27.0.1" - jest-resolve "^27.0.4" - jest-resolve-dependencies "^27.0.4" - jest-runner "^27.0.4" - jest-runtime "^27.0.4" - jest-snapshot "^27.0.4" - jest-util "^27.0.2" - jest-validate "^27.0.2" - jest-watcher "^27.0.2" + jest-changed-files "^27.0.6" + jest-config "^27.0.6" + jest-haste-map "^27.0.6" + jest-message-util "^27.0.6" + jest-regex-util "^27.0.6" + jest-resolve "^27.0.6" + jest-resolve-dependencies "^27.0.6" + jest-runner "^27.0.6" + jest-runtime "^27.0.6" + jest-snapshot "^27.0.6" + jest-util "^27.0.6" + jest-validate "^27.0.6" + jest-watcher "^27.0.6" micromatch "^4.0.4" p-each-series "^2.1.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^27.0.3": - version "27.0.3" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.3.tgz#68769b1dfdd213e3456169d64fbe9bd63a5fda92" - integrity sha512-pN9m7fbKsop5vc3FOfH8NF7CKKdRbEZzcxfIo1n2TT6ucKWLFq0P6gCJH0GpnQp036++yY9utHOxpeT1WnkWTA== +"@jest/environment@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.6.tgz#ee293fe996db01d7d663b8108fa0e1ff436219d2" + integrity sha512-4XywtdhwZwCpPJ/qfAkqExRsERW+UaoSRStSHCCiQTUpoYdLukj+YJbQSFrZjhlUDRZeNiU9SFH0u7iNimdiIg== dependencies: - "@jest/fake-timers" "^27.0.3" - "@jest/types" "^27.0.2" + "@jest/fake-timers" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" - jest-mock "^27.0.3" + jest-mock "^27.0.6" -"@jest/fake-timers@^27.0.3": - version "27.0.3" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.3.tgz#9899ba6304cc636734c74478df502e18136461dd" - integrity sha512-fQ+UCKRIYKvTCEOyKPnaPnomLATIhMnHC/xPZ7yT1Uldp7yMgMxoYIFidDbpSTgB79+/U+FgfoD30c6wg3IUjA== +"@jest/fake-timers@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.6.tgz#cbad52f3fe6abe30e7acb8cd5fa3466b9588e3df" + integrity sha512-sqd+xTWtZ94l3yWDKnRTdvTeZ+A/V7SSKrxsrOKSqdyddb9CeNRF8fbhAU0D7ZJBpTTW2nbp6MftmKJDZfW2LQ== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@sinonjs/fake-timers" "^7.0.2" "@types/node" "*" - jest-message-util "^27.0.2" - jest-mock "^27.0.3" - jest-util "^27.0.2" + jest-message-util "^27.0.6" + jest-mock "^27.0.6" + jest-util "^27.0.6" -"@jest/globals@^27.0.3": - version "27.0.3" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.3.tgz#1cf8933b7791bba0b99305cbf39fd4d2e3fe4060" - integrity sha512-OzsIuf7uf+QalqAGbjClyezzEcLQkdZ+7PejUrZgDs+okdAK8GwRCGcYCirHvhMBBQh60Jr3NlIGbn/KBPQLEQ== +"@jest/globals@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.6.tgz#48e3903f99a4650673d8657334d13c9caf0e8f82" + integrity sha512-DdTGCP606rh9bjkdQ7VvChV18iS7q0IMJVP1piwTWyWskol4iqcVwthZmoJEf7obE1nc34OpIyoVGPeqLC+ryw== dependencies: - "@jest/environment" "^27.0.3" - "@jest/types" "^27.0.2" - expect "^27.0.2" + "@jest/environment" "^27.0.6" + "@jest/types" "^27.0.6" + expect "^27.0.6" -"@jest/reporters@^27.0.4": - version "27.0.4" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.4.tgz#95609b1be97afb80d55d8aa3d7c3179c15810e65" - integrity sha512-Xa90Nm3JnV0xCe4M6A10M9WuN9krb+WFKxV1A98Y4ePCw40n++r7uxFUNU7DT1i9Behj7fjrAIju9oU0t1QtCg== +"@jest/reporters@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.6.tgz#91e7f2d98c002ad5df94d5b5167c1eb0b9fd5b00" + integrity sha512-TIkBt09Cb2gptji3yJXb3EE+eVltW6BjO7frO7NEfjI9vSIYoISi5R3aI3KpEDXlB1xwB+97NXIqz84qYeYsfA== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^27.0.2" - "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/console" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -527,70 +520,70 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^27.0.2" - jest-resolve "^27.0.4" - jest-util "^27.0.2" - jest-worker "^27.0.2" + jest-haste-map "^27.0.6" + jest-resolve "^27.0.6" + jest-util "^27.0.6" + jest-worker "^27.0.6" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" terminal-link "^2.0.0" - v8-to-istanbul "^7.0.0" + v8-to-istanbul "^8.0.0" -"@jest/source-map@^27.0.1": - version "27.0.1" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.1.tgz#2afbf73ddbaddcb920a8e62d0238a0a9e0a8d3e4" - integrity sha512-yMgkF0f+6WJtDMdDYNavmqvbHtiSpwRN2U/W+6uztgfqgkq/PXdKPqjBTUF1RD/feth4rH5N3NW0T5+wIuln1A== +"@jest/source-map@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.6.tgz#be9e9b93565d49b0548b86e232092491fb60551f" + integrity sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g== dependencies: callsites "^3.0.0" graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/test-result@^27.0.2": - version "27.0.2" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.2.tgz#0451049e32ceb609b636004ccc27c8fa22263f10" - integrity sha512-gcdWwL3yP5VaIadzwQtbZyZMgpmes8ryBAJp70tuxghiA8qL4imJyZex+i+USQH2H4jeLVVszhwntgdQ97fccA== +"@jest/test-result@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.6.tgz#3fa42015a14e4fdede6acd042ce98c7f36627051" + integrity sha512-ja/pBOMTufjX4JLEauLxE3LQBPaI2YjGFtXexRAjt1I/MbfNlMx0sytSX3tn5hSLzQsR3Qy2rd0hc1BWojtj9w== dependencies: - "@jest/console" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/console" "^27.0.6" + "@jest/types" "^27.0.6" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^27.0.4": - version "27.0.4" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz#976493b277594d81e589896f0ed21f198308928a" - integrity sha512-6UFEVwdmxYdyNffBxVVZxmXEdBE4riSddXYSnFNH0ELFQFk/bvagizim8WfgJTqF4EKd+j1yFxvhb8BMHfOjSQ== +"@jest/test-sequencer@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz#80a913ed7a1130545b1cd777ff2735dd3af5d34b" + integrity sha512-bISzNIApazYOlTHDum9PwW22NOyDa6VI31n6JucpjTVM0jD6JDgqEZ9+yn575nDdPF0+4csYDxNNW13NvFQGZA== dependencies: - "@jest/test-result" "^27.0.2" + "@jest/test-result" "^27.0.6" graceful-fs "^4.2.4" - jest-haste-map "^27.0.2" - jest-runtime "^27.0.4" + jest-haste-map "^27.0.6" + jest-runtime "^27.0.6" -"@jest/transform@^27.0.2": - version "27.0.2" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz#b073b7c589e3f4b842102468875def2bb722d6b5" - integrity sha512-H8sqKlgtDfVog/s9I4GG2XMbi4Ar7RBxjsKQDUhn2XHAi3NG+GoQwWMER+YfantzExbjNqQvqBHzo/G2pfTiPw== +"@jest/transform@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.6.tgz#189ad7107413208f7600f4719f81dd2f7278cc95" + integrity sha512-rj5Dw+mtIcntAUnMlW/Vju5mr73u8yg+irnHwzgtgoeI6cCPOvUwQ0D1uQtc/APmWgvRweEb1g05pkUpxH3iCA== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" babel-plugin-istanbul "^6.0.0" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^27.0.2" - jest-regex-util "^27.0.1" - jest-util "^27.0.2" + jest-haste-map "^27.0.6" + jest-regex-util "^27.0.6" + jest-util "^27.0.6" micromatch "^4.0.4" pirates "^4.0.1" slash "^3.0.0" source-map "^0.6.1" write-file-atomic "^3.0.0" -"@jest/types@^27.0.2": - version "27.0.2" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.0.2.tgz#e153d6c46bda0f2589f0702b071f9898c7bbd37e" - integrity sha512-XpjCtJ/99HB4PmyJ2vgmN7vT+JLP7RW1FBT9RgnMFS4Dt7cvIyBee8O3/j98aUZ34ZpenPZFqmaaObWSeL65dg== +"@jest/types@^27.0.6": + version "27.0.6" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.0.6.tgz#9a992bc517e0c49f035938b8549719c2de40706b" + integrity sha512-aSquT1qa9Pik26JK5/3rvnYb4bGtm1VFNesHKmNTwmPIgOrixvhL2ghIvFRNEpzy3gU+rUgjIF/KodbkFAl++g== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^3.0.0" @@ -715,9 +708,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.11.1" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz#654f6c4f67568e24c23b367e947098c6206fa639" - integrity sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw== + version "7.14.0" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.0.tgz#a34277cf8acbd3185ea74129e1f100491eb1da7f" + integrity sha512-IilJZ1hJBUZwMOVDNTdflOOLzJB/ZtljYVa7k3gEZN/jqIJIPkWHC6dvbX+DD2CwZDHB9wAKzZPzzqMIkW37/w== dependencies: "@babel/types" "^7.3.0" @@ -735,9 +728,9 @@ integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== "@types/filesystem@*": - version "0.0.30" - resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.30.tgz#a7373a2edf34d13e298baf7ee1101f738b2efb7e" - integrity sha512-NCoRgmGmLpTT9VFL6Bb6z0jQuqI3d0E5FGl7M0JOv/J5RQYo9s5aOItPYnpckx9MbYQk1APLXcF8f20Vqnf2yA== + version "0.0.31" + resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.31.tgz#121a1ded274a2dc731d5e0d90163a920ad6a9ef1" + integrity sha512-9Dj1Gb7ZhknhJ8J1H/lTQrEorwIHWZlO9Tfi0WMrvyO1+2GUIUF8Sg4zrID77hj0ywArzQRJ1MwlT9H7c9QmEQ== dependencies: "@types/filewriter" "*" @@ -803,14 +796,14 @@ integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA== "@types/node@*": - version "15.12.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz#e1cf817d70a1e118e81922c4ff6683ce9d422e26" - integrity sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA== + version "15.12.5" + resolved "https://registry.yarnpkg.com/@types/node/-/node-15.12.5.tgz#9a78318a45d75c9523d2396131bd3cca54b2d185" + integrity sha512-se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg== "@types/node@^14.6.2": - version "14.17.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.3.tgz#6d327abaa4be34a74e421ed6409a0ae2f47f4c3d" - integrity sha512-e6ZowgGJmTuXa3GyaPbTGxX17tnThl2aSSizrFthQ7m9uLGZBXiGhgE55cjRZTF5kjZvYn9EOPOMljdjwbflxw== + version "14.17.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.4.tgz#218712242446fc868d0e007af29a4408c7765bc0" + integrity sha512-8kQ3+wKGRNN0ghtEn7EGps/B8CzuBz1nXZEIGGLP2GnwbqYn4dbTs7k+VKLTq1HvZLRCIDtN3Snx1Ege8B7L5A== "@types/plist@^3.0.1": version "3.0.2" @@ -876,9 +869,9 @@ acorn@^7.1.1, acorn@^7.4.0: integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== acorn@^8.2.4: - version "8.4.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz#af53266e698d7cffa416714b503066a82221be60" - integrity sha512-ULr0LDaEqQrMFGyQ3bhJkLsbtrQ8QibAseGZeaSUiT/6zb9IvIkomWHJIvgvwad+hinRAgsI51JcWk2yvwyL+w== + version "8.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" + integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== agent-base@6: version "6.0.2" @@ -1100,16 +1093,16 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -babel-jest@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz#7dc18adb01322acce62c2af76ea2c7cd186ade37" - integrity sha512-9OThPl3/IQbo4Yul2vMz4FYwILPQak8XelX4YGowygfHaOl5R5gfjm4iVx4d8aUugkW683t8aq0A74E7b5DU1Q== +babel-jest@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.6.tgz#e99c6e0577da2655118e3608b68761a5a69bd0d8" + integrity sha512-iTJyYLNc4wRofASmofpOc5NK9QunwMk+TLFgGXsTFS8uEqmd8wdI7sga0FPe2oVH3b5Agt/EAK1QjPEuKL8VfA== dependencies: - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/babel__core" "^7.1.14" babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^27.0.1" + babel-preset-jest "^27.0.6" chalk "^4.0.0" graceful-fs "^4.2.4" slash "^3.0.0" @@ -1125,10 +1118,10 @@ babel-plugin-istanbul@^6.0.0: istanbul-lib-instrument "^4.0.0" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.1.tgz#a6d10e484c93abff0f4e95f437dad26e5736ea11" - integrity sha512-sqBF0owAcCDBVEDtxqfYr2F36eSHdx7lAVGyYuOBRnKdD6gzcy0I0XrAYCZgOA3CRrLhmR+Uae9nogPzmAtOfQ== +babel-plugin-jest-hoist@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.6.tgz#f7c6b3d764af21cb4a2a1ab6870117dbde15b456" + integrity sha512-CewFeM9Vv2gM7Yr9n5eyyLVPRSiBnk6lKZRjgwYnGKSl9M14TMn2vkN02wTF04OGuSDLEzlWiMzvjXuW9mB6Gw== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" @@ -1153,12 +1146,12 @@ babel-preset-current-node-syntax@^1.0.0: "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-jest@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.1.tgz#7a50c75d16647c23a2cf5158d5bb9eb206b10e20" - integrity sha512-nIBIqCEpuiyhvjQs2mVNwTxQQa2xk70p9Dd/0obQGBf8FBzbnI8QhQKzLsWMN2i6q+5B0OcWDtrboBX5gmOLyA== +babel-preset-jest@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.6.tgz#909ef08e9f24a4679768be2f60a3df0856843f9d" + integrity sha512-WObA0/Biw2LrVVwZkF/2GqbOdzhKD6Fkdwhoy9ASIrOWr/zodcSpQh72JOkEn6NWyjmnPDjNSqaGN4KnpKzhXw== dependencies: - babel-plugin-jest-hoist "^27.0.1" + babel-plugin-jest-hoist "^27.0.6" babel-preset-current-node-syntax "^1.0.0" balanced-match@^1.0.0: @@ -1337,9 +1330,9 @@ camelcase@^6.2.0: integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== caniuse-lite@^1.0.30001166, caniuse-lite@^1.0.30001219: - version "1.0.30001239" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz#66e8669985bb2cb84ccb10f68c25ce6dd3e4d2b8" - integrity sha512-cyBkXJDMeI4wthy8xJ2FvDU6+0dtcZSJW3voUF8+e9f1bBeuvyZfc3PNbkOETyhbR+dGCPzn9E7MA3iwzusOhQ== + version "1.0.30001241" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001241.tgz#cd3fae47eb3d7691692b406568d7a3e5b23c7598" + integrity sha512-1uoSZ1Pq1VpH0WerIMqwptXHNNGfdl7d1cJUFs80CwQ/lVzdhTvsFZCeNFslze7AjsQnb4C85tzclPa1VShbeQ== chalk@^2.0.0, chalk@^2.4.2: version "2.4.2" @@ -1528,9 +1521,9 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: safe-buffer "~5.1.1" core-js@^3.6.5: - version "3.15.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz#db9554ebce0b6fd90dc9b1f2465c841d2d055044" - integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw== + version "3.15.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61" + integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -1622,9 +1615,9 @@ debug@^4.3.2: ms "2.1.2" decimal.js@^10.2.1: - version "10.2.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3" - integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== + version "10.3.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" + integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== decompress-response@^3.3.0: version "3.3.0" @@ -1680,10 +1673,10 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -diff-sequences@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.1.tgz#9c9801d52ed5f576ff0a20e3022a13ee6e297e7c" - integrity sha512-XPLijkfJUh/PIBnfkcSHgvD6tlYixmcMAn3osTk6jt+H0v/mgURto1XUiD9DKuGX5NDoVS6dSlA23gd9FUaCFg== +diff-sequences@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz#3305cb2e55a033924054695cc66019fd7f8e5723" + integrity sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ== dir-compare@^2.4.0: version "2.4.0" @@ -1799,14 +1792,14 @@ electron-publish@22.11.7: mime "^2.5.2" electron-to-chromium@^1.3.723: - version "1.3.752" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz#0728587f1b9b970ec9ffad932496429aef750d09" - integrity sha512-2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A== + version "1.3.763" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.763.tgz#93f6f02506d099941f557b9db9ba50b30215bf15" + integrity sha512-UyvEPae0wvzsyNJhVfGeFSOlUkHEze8xSIiExO5tZQ8QTr7obFiJWGk3U4e7afFOJMQJDszqU/3Pk5jtKiaSEg== -electron@13.1.2: - version "13.1.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz#8c9abf9015766c9cbc16f10c99282d00d6ae1b90" - integrity sha512-aNT9t+LgdQaZ7FgN36pN7MjSEoj+EWc2T9yuOqBApbmR4HavGRadSz7u9N2Erw2ojdIXtei2RVIAvVm8mbDZ0g== +electron@13.1.4: + version "13.1.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.4.tgz#6d20d932a0651c3cba9f09a3d08cbaf5b69aa84b" + integrity sha512-4qhRZbRvGqHmMWsCG/kRVF4X8VIq9Nujgm+gXZLBSpiR6uUtMHy7ViBTQZl1PGf6O9Ppxhpr9Yz+k6Um9WoP3Q== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2" @@ -2052,17 +2045,17 @@ exit@^0.1.2: resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= -expect@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/expect/-/expect-27.0.2.tgz#e66ca3a4c9592f1c019fa1d46459a9d2084f3422" - integrity sha512-YJFNJe2+P2DqH+ZrXy+ydRQYO87oxRUonZImpDodR1G7qo3NYd3pL+NQ9Keqpez3cehczYwZDBC3A7xk3n7M/w== +expect@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/expect/-/expect-27.0.6.tgz#a4d74fbe27222c718fff68ef49d78e26a8fd4c05" + integrity sha512-psNLt8j2kwg42jGBDSfAlU49CEZxejN1f1PlANWDZqIhBOVU/c2Pm888FcjWJzFewhIsNWfZJeLjUjtKGiPuSw== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" ansi-styles "^5.0.0" - jest-get-type "^27.0.1" - jest-matcher-utils "^27.0.2" - jest-message-util "^27.0.2" - jest-regex-util "^27.0.1" + jest-get-type "^27.0.6" + jest-matcher-utils "^27.0.6" + jest-message-util "^27.0.6" + jest-regex-util "^27.0.6" extend@3.0.2: version "3.0.2" @@ -2669,226 +2662,226 @@ jake@^10.6.1: filelist "^1.0.1" minimatch "^3.0.4" -jest-changed-files@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.2.tgz#997253042b4a032950fc5f56abf3c5d1f8560801" - integrity sha512-eMeb1Pn7w7x3wue5/vF73LPCJ7DKQuC9wQUR5ebP9hDPpk5hzcT/3Hmz3Q5BOFpR3tgbmaWhJcMTVgC8Z1NuMw== +jest-changed-files@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.6.tgz#bed6183fcdea8a285482e3b50a9a7712d49a7a8b" + integrity sha512-BuL/ZDauaq5dumYh5y20sn4IISnf1P9A0TDswTxUi84ORGtVa86ApuBHqICL0vepqAnZiY6a7xeSPWv2/yy4eA== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" execa "^5.0.0" throat "^6.0.1" -jest-circus@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.4.tgz#3b261514ee3b3da33def736a6352c98ff56bb6e6" - integrity sha512-QD+eblDiRphta630WRKewuASLs/oY1Zki2G4bccntRvrTHQ63ljwFR5TLduuK4Zg0ZPzW0+8o6AP7KRd1yKOjw== +jest-circus@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.6.tgz#dd4df17c4697db6a2c232aaad4e9cec666926668" + integrity sha512-OJlsz6BBeX9qR+7O9lXefWoc2m9ZqcZ5Ohlzz0pTEAG4xMiZUJoacY8f4YDHxgk0oKYxj277AfOk9w6hZYvi1Q== dependencies: - "@jest/environment" "^27.0.3" - "@jest/test-result" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/environment" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" dedent "^0.7.0" - expect "^27.0.2" + expect "^27.0.6" is-generator-fn "^2.0.0" - jest-each "^27.0.2" - jest-matcher-utils "^27.0.2" - jest-message-util "^27.0.2" - jest-runtime "^27.0.4" - jest-snapshot "^27.0.4" - jest-util "^27.0.2" - pretty-format "^27.0.2" + jest-each "^27.0.6" + jest-matcher-utils "^27.0.6" + jest-message-util "^27.0.6" + jest-runtime "^27.0.6" + jest-snapshot "^27.0.6" + jest-util "^27.0.6" + pretty-format "^27.0.6" slash "^3.0.0" stack-utils "^2.0.3" throat "^6.0.1" -jest-cli@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.4.tgz#491b12c754c0d7c6873b13a66f26b3a80a852910" - integrity sha512-E0T+/i2lxsWAzV7LKYd0SB7HUAvePqaeIh5vX43/G5jXLhv1VzjYzJAGEkTfvxV774ll9cyE2ljcL73PVMEOXQ== +jest-cli@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.6.tgz#d021e5f4d86d6a212450d4c7b86cb219f1e6864f" + integrity sha512-qUUVlGb9fdKir3RDE+B10ULI+LQrz+MCflEH2UJyoUjoHHCbxDrMxSzjQAPUMsic4SncI62ofYCcAvW6+6rhhg== dependencies: - "@jest/core" "^27.0.4" - "@jest/test-result" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/core" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/types" "^27.0.6" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" - jest-config "^27.0.4" - jest-util "^27.0.2" - jest-validate "^27.0.2" + jest-config "^27.0.6" + jest-util "^27.0.6" + jest-validate "^27.0.6" prompts "^2.0.1" yargs "^16.0.3" -jest-config@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.4.tgz#c4f41378acf40ca77860fb4e213b12109d87b8cf" - integrity sha512-VkQFAHWnPQefdvHU9A+G3H/Z3NrrTKqWpvxgQz3nkUdkDTWeKJE6e//BL+R7z79dXOMVksYgM/z6ndtN0hfChg== +jest-config@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.6.tgz#119fb10f149ba63d9c50621baa4f1f179500277f" + integrity sha512-JZRR3I1Plr2YxPBhgqRspDE2S5zprbga3swYNrvY3HfQGu7p/GjyLOqwrYad97tX3U3mzT53TPHVmozacfP/3w== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^27.0.4" - "@jest/types" "^27.0.2" - babel-jest "^27.0.2" + "@jest/test-sequencer" "^27.0.6" + "@jest/types" "^27.0.6" + babel-jest "^27.0.6" chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" is-ci "^3.0.0" - jest-circus "^27.0.4" - jest-environment-jsdom "^27.0.3" - jest-environment-node "^27.0.3" - jest-get-type "^27.0.1" - jest-jasmine2 "^27.0.4" - jest-regex-util "^27.0.1" - jest-resolve "^27.0.4" - jest-runner "^27.0.4" - jest-util "^27.0.2" - jest-validate "^27.0.2" + jest-circus "^27.0.6" + jest-environment-jsdom "^27.0.6" + jest-environment-node "^27.0.6" + jest-get-type "^27.0.6" + jest-jasmine2 "^27.0.6" + jest-regex-util "^27.0.6" + jest-resolve "^27.0.6" + jest-runner "^27.0.6" + jest-util "^27.0.6" + jest-validate "^27.0.6" micromatch "^4.0.4" - pretty-format "^27.0.2" + pretty-format "^27.0.6" -jest-diff@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.2.tgz#f315b87cee5dc134cf42c2708ab27375cc3f5a7e" - integrity sha512-BFIdRb0LqfV1hBt8crQmw6gGQHVDhM87SpMIZ45FPYKReZYG5er1+5pIn2zKqvrJp6WNox0ylR8571Iwk2Dmgw== +jest-diff@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.6.tgz#4a7a19ee6f04ad70e0e3388f35829394a44c7b5e" + integrity sha512-Z1mqgkTCSYaFgwTlP/NUiRzdqgxmmhzHY1Tq17zL94morOHfHu3K4bgSgl+CR4GLhpV8VxkuOYuIWnQ9LnFqmg== dependencies: chalk "^4.0.0" - diff-sequences "^27.0.1" - jest-get-type "^27.0.1" - pretty-format "^27.0.2" + diff-sequences "^27.0.6" + jest-get-type "^27.0.6" + pretty-format "^27.0.6" -jest-docblock@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.1.tgz#bd9752819b49fa4fab1a50b73eb58c653b962e8b" - integrity sha512-TA4+21s3oebURc7VgFV4r7ltdIJ5rtBH1E3Tbovcg7AV+oLfD5DcJ2V2vJ5zFA9sL5CFd/d2D6IpsAeSheEdrA== +jest-docblock@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz#cc78266acf7fe693ca462cbbda0ea4e639e4e5f3" + integrity sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA== dependencies: detect-newline "^3.0.0" -jest-each@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.2.tgz#865ddb4367476ced752167926b656fa0dcecd8c7" - integrity sha512-OLMBZBZ6JkoXgUenDtseFRWA43wVl2BwmZYIWQws7eS7pqsIvePqj/jJmEnfq91ALk3LNphgwNK/PRFBYi7ITQ== +jest-each@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.6.tgz#cee117071b04060158dc8d9a66dc50ad40ef453b" + integrity sha512-m6yKcV3bkSWrUIjxkE9OC0mhBZZdhovIW5ergBYirqnkLXkyEn3oUUF/QZgyecA1cF1QFyTE8bRRl8Tfg1pfLA== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" chalk "^4.0.0" - jest-get-type "^27.0.1" - jest-util "^27.0.2" - pretty-format "^27.0.2" - -jest-environment-jsdom@27.0.3, jest-environment-jsdom@^27.0.3: - version "27.0.3" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.3.tgz#ed73e913ddc03864eb9f934b5cbabf1b63504e2e" - integrity sha512-5KLmgv1bhiimpSA8oGTnZYk6g4fsNyZiA/6gI2tAZUgrufd7heRUSVh4gRokzZVEj8zlwAQYT0Zs6tuJSW/ECA== - dependencies: - "@jest/environment" "^27.0.3" - "@jest/fake-timers" "^27.0.3" - "@jest/types" "^27.0.2" + jest-get-type "^27.0.6" + jest-util "^27.0.6" + pretty-format "^27.0.6" + +jest-environment-jsdom@27.0.6, jest-environment-jsdom@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz#f66426c4c9950807d0a9f209c590ce544f73291f" + integrity sha512-FvetXg7lnXL9+78H+xUAsra3IeZRTiegA3An01cWeXBspKXUhAwMM9ycIJ4yBaR0L7HkoMPaZsozCLHh4T8fuw== + dependencies: + "@jest/environment" "^27.0.6" + "@jest/fake-timers" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" - jest-mock "^27.0.3" - jest-util "^27.0.2" + jest-mock "^27.0.6" + jest-util "^27.0.6" jsdom "^16.6.0" -jest-environment-node@^27.0.3: - version "27.0.3" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.3.tgz#b4acb3679d2552a4215732cab8b0ca7ec4398ee0" - integrity sha512-co2/IVnIFL3cItpFULCvXFg9us4gvWXgs7mutAMPCbFhcqh56QAOdKhNzC2+RycsC/k4mbMj1VF+9F/NzA0ROg== +jest-environment-node@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.6.tgz#a6699b7ceb52e8d68138b9808b0c404e505f3e07" + integrity sha512-+Vi6yLrPg/qC81jfXx3IBlVnDTI6kmRr08iVa2hFCWmJt4zha0XW7ucQltCAPhSR0FEKEoJ3i+W4E6T0s9is0w== dependencies: - "@jest/environment" "^27.0.3" - "@jest/fake-timers" "^27.0.3" - "@jest/types" "^27.0.2" + "@jest/environment" "^27.0.6" + "@jest/fake-timers" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" - jest-mock "^27.0.3" - jest-util "^27.0.2" + jest-mock "^27.0.6" + jest-util "^27.0.6" -jest-get-type@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.1.tgz#34951e2b08c8801eb28559d7eb732b04bbcf7815" - integrity sha512-9Tggo9zZbu0sHKebiAijyt1NM77Z0uO4tuWOxUCujAiSeXv30Vb5D4xVF4UR4YWNapcftj+PbByU54lKD7/xMg== +jest-get-type@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz#0eb5c7f755854279ce9b68a9f1a4122f69047cfe" + integrity sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg== -jest-haste-map@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz#3f1819400c671237e48b4d4b76a80a0dbed7577f" - integrity sha512-37gYfrYjjhEfk37C4bCMWAC0oPBxDpG0qpl8lYg8BT//wf353YT/fzgA7+Dq0EtM7rPFS3JEcMsxdtDwNMi2cA== +jest-haste-map@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.6.tgz#4683a4e68f6ecaa74231679dca237279562c8dc7" + integrity sha512-4ldjPXX9h8doB2JlRzg9oAZ2p6/GpQUNAeiYXqcpmrKbP0Qev0wdZlxSMOmz8mPOEnt4h6qIzXFLDi8RScX/1w== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/graceful-fs" "^4.1.2" "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.4" - jest-regex-util "^27.0.1" - jest-serializer "^27.0.1" - jest-util "^27.0.2" - jest-worker "^27.0.2" + jest-regex-util "^27.0.6" + jest-serializer "^27.0.6" + jest-util "^27.0.6" + jest-worker "^27.0.6" micromatch "^4.0.4" walker "^1.0.7" optionalDependencies: fsevents "^2.3.2" -jest-jasmine2@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz#c669519ccf4904a485338555e1e66cad36bb0670" - integrity sha512-yj3WrjjquZwkJw+eA4c9yucHw4/+EHndHWSqgHbHGQfT94ihaaQsa009j1a0puU8CNxPDk0c1oAPeOpdJUElwA== +jest-jasmine2@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz#fd509a9ed3d92bd6edb68a779f4738b100655b37" + integrity sha512-cjpH2sBy+t6dvCeKBsHpW41mjHzXgsavaFMp+VWRf0eR4EW8xASk1acqmljFtK2DgyIECMv2yCdY41r2l1+4iA== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^27.0.3" - "@jest/source-map" "^27.0.1" - "@jest/test-result" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/environment" "^27.0.6" + "@jest/source-map" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^27.0.2" + expect "^27.0.6" is-generator-fn "^2.0.0" - jest-each "^27.0.2" - jest-matcher-utils "^27.0.2" - jest-message-util "^27.0.2" - jest-runtime "^27.0.4" - jest-snapshot "^27.0.4" - jest-util "^27.0.2" - pretty-format "^27.0.2" + jest-each "^27.0.6" + jest-matcher-utils "^27.0.6" + jest-message-util "^27.0.6" + jest-runtime "^27.0.6" + jest-snapshot "^27.0.6" + jest-util "^27.0.6" + pretty-format "^27.0.6" throat "^6.0.1" -jest-leak-detector@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.2.tgz#ce19aa9dbcf7a72a9d58907a970427506f624e69" - integrity sha512-TZA3DmCOfe8YZFIMD1GxFqXUkQnIoOGQyy4hFCA2mlHtnAaf+FeOMxi0fZmfB41ZL+QbFG6BVaZF5IeFIVy53Q== +jest-leak-detector@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz#545854275f85450d4ef4b8fe305ca2a26450450f" + integrity sha512-2/d6n2wlH5zEcdctX4zdbgX8oM61tb67PQt4Xh8JFAIy6LRKUnX528HulkaG6nD5qDl5vRV1NXejCe1XRCH5gQ== dependencies: - jest-get-type "^27.0.1" - pretty-format "^27.0.2" + jest-get-type "^27.0.6" + pretty-format "^27.0.6" -jest-matcher-utils@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.2.tgz#f14c060605a95a466cdc759acc546c6f4cbfc4f0" - integrity sha512-Qczi5xnTNjkhcIB0Yy75Txt+Ez51xdhOxsukN7awzq2auZQGPHcQrJ623PZj0ECDEMOk2soxWx05EXdXGd1CbA== +jest-matcher-utils@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz#2a8da1e86c620b39459f4352eaa255f0d43e39a9" + integrity sha512-OFgF2VCQx9vdPSYTHWJ9MzFCehs20TsyFi6bIHbk5V1u52zJOnvF0Y/65z3GLZHKRuTgVPY4Z6LVePNahaQ+tA== dependencies: chalk "^4.0.0" - jest-diff "^27.0.2" - jest-get-type "^27.0.1" - pretty-format "^27.0.2" + jest-diff "^27.0.6" + jest-get-type "^27.0.6" + pretty-format "^27.0.6" -jest-message-util@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.2.tgz#181c9b67dff504d8f4ad15cba10d8b80f272048c" - integrity sha512-rTqWUX42ec2LdMkoUPOzrEd1Tcm+R1KfLOmFK+OVNo4MnLsEaxO5zPDb2BbdSmthdM/IfXxOZU60P/WbWF8BTw== +jest-message-util@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.6.tgz#158bcdf4785706492d164a39abca6a14da5ab8b5" + integrity sha512-rBxIs2XK7rGy+zGxgi+UJKP6WqQ+KrBbD1YMj517HYN3v2BG66t3Xan3FWqYHKZwjdB700KiAJ+iES9a0M+ixw== dependencies: "@babel/code-frame" "^7.12.13" - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.4" micromatch "^4.0.4" - pretty-format "^27.0.2" + pretty-format "^27.0.6" slash "^3.0.0" stack-utils "^2.0.3" -jest-mock@^27.0.3: - version "27.0.3" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.3.tgz#5591844f9192b3335c0dca38e8e45ed297d4d23d" - integrity sha512-O5FZn5XDzEp+Xg28mUz4ovVcdwBBPfAhW9+zJLO0Efn2qNbYcDaJvSlRiQ6BCZUCVOJjALicuJQI9mRFjv1o9Q== +jest-mock@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.6.tgz#0efdd40851398307ba16778728f6d34d583e3467" + integrity sha512-lzBETUoK8cSxts2NYXSBWT+EJNzmUVtVVwS1sU9GwE1DLCfGsngg+ZVSIe0yd0ZSm+y791esiuo+WSwpXJQ5Bw== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/node" "*" jest-pnp-resolver@^1.2.2: @@ -2896,76 +2889,76 @@ jest-pnp-resolver@^1.2.2: resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c" integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w== -jest-regex-util@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.1.tgz#69d4b1bf5b690faa3490113c47486ed85dd45b68" - integrity sha512-6nY6QVcpTgEKQy1L41P4pr3aOddneK17kn3HJw6SdwGiKfgCGTvH02hVXL0GU8GEKtPH83eD2DIDgxHXOxVohQ== +jest-regex-util@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz#02e112082935ae949ce5d13b2675db3d8c87d9c5" + integrity sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ== -jest-resolve-dependencies@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz#a07a242d70d668afd3fcf7f4270755eebb1fe579" - integrity sha512-F33UPfw1YGWCV2uxJl7wD6TvcQn5IC0LtguwY3r4L7R6H4twpLkp5Q2ZfzRx9A2I3G8feiy0O0sqcn/Qoym71A== +jest-resolve-dependencies@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz#3e619e0ef391c3ecfcf6ef4056207a3d2be3269f" + integrity sha512-mg9x9DS3BPAREWKCAoyg3QucCr0n6S8HEEsqRCKSPjPcu9HzRILzhdzY3imsLoZWeosEbJZz6TKasveczzpJZA== dependencies: - "@jest/types" "^27.0.2" - jest-regex-util "^27.0.1" - jest-snapshot "^27.0.4" + "@jest/types" "^27.0.6" + jest-regex-util "^27.0.6" + jest-snapshot "^27.0.6" -jest-resolve@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.4.tgz#8a27bc3f2f00c8ea28f3bc99bbf6f468300a703d" - integrity sha512-BcfyK2i3cG79PDb/6gB6zFeFQlcqLsQjGBqznFCpA0L/3l1L/oOsltdUjs5eISAWA9HS9qtj8v2PSZr/yWxONQ== +jest-resolve@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.6.tgz#e90f436dd4f8fbf53f58a91c42344864f8e55bff" + integrity sha512-yKmIgw2LgTh7uAJtzv8UFHGF7Dm7XfvOe/LQ3Txv101fLM8cx2h1QVwtSJ51Q/SCxpIiKfVn6G2jYYMDNHZteA== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" chalk "^4.0.0" escalade "^3.1.1" graceful-fs "^4.2.4" jest-pnp-resolver "^1.2.2" - jest-util "^27.0.2" - jest-validate "^27.0.2" + jest-util "^27.0.6" + jest-validate "^27.0.6" resolve "^1.20.0" slash "^3.0.0" -jest-runner@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.4.tgz#2787170a9509b792ae129794f6944d27d5d12a4f" - integrity sha512-NfmvSYLCsCJk2AG8Ar2NAh4PhsJJpO+/r+g4bKR5L/5jFzx/indUpnVBdrfDvuqhGLLAvrKJ9FM/Nt8o1dsqxg== +jest-runner@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.6.tgz#1325f45055539222bbc7256a6976e993ad2f9520" + integrity sha512-W3Bz5qAgaSChuivLn+nKOgjqNxM7O/9JOJoKDCqThPIg2sH/d4A/lzyiaFgnb9V1/w29Le11NpzTJSzga1vyYQ== dependencies: - "@jest/console" "^27.0.2" - "@jest/environment" "^27.0.3" - "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/console" "^27.0.6" + "@jest/environment" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" emittery "^0.8.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-docblock "^27.0.1" - jest-environment-jsdom "^27.0.3" - jest-environment-node "^27.0.3" - jest-haste-map "^27.0.2" - jest-leak-detector "^27.0.2" - jest-message-util "^27.0.2" - jest-resolve "^27.0.4" - jest-runtime "^27.0.4" - jest-util "^27.0.2" - jest-worker "^27.0.2" + jest-docblock "^27.0.6" + jest-environment-jsdom "^27.0.6" + jest-environment-node "^27.0.6" + jest-haste-map "^27.0.6" + jest-leak-detector "^27.0.6" + jest-message-util "^27.0.6" + jest-resolve "^27.0.6" + jest-runtime "^27.0.6" + jest-util "^27.0.6" + jest-worker "^27.0.6" source-map-support "^0.5.6" throat "^6.0.1" -jest-runtime@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.4.tgz#2e4a6aa77cac32ac612dfe12768387a8aa15c2f0" - integrity sha512-voJB4xbAjS/qYPboV+e+gmg3jfvHJJY4CagFWBOM9dQKtlaiTjcpD2tWwla84Z7PtXSQPeIpXY0qksA9Dum29A== - dependencies: - "@jest/console" "^27.0.2" - "@jest/environment" "^27.0.3" - "@jest/fake-timers" "^27.0.3" - "@jest/globals" "^27.0.3" - "@jest/source-map" "^27.0.1" - "@jest/test-result" "^27.0.2" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" +jest-runtime@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.6.tgz#45877cfcd386afdd4f317def551fc369794c27c9" + integrity sha512-BhvHLRVfKibYyqqEFkybsznKwhrsu7AWx2F3y9G9L95VSIN3/ZZ9vBpm/XCS2bS+BWz3sSeNGLzI3TVQ0uL85Q== + dependencies: + "@jest/console" "^27.0.6" + "@jest/environment" "^27.0.6" + "@jest/fake-timers" "^27.0.6" + "@jest/globals" "^27.0.6" + "@jest/source-map" "^27.0.6" + "@jest/test-result" "^27.0.6" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/yargs" "^16.0.0" chalk "^4.0.0" cjs-module-lexer "^1.0.0" @@ -2973,30 +2966,30 @@ jest-runtime@^27.0.4: exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-haste-map "^27.0.2" - jest-message-util "^27.0.2" - jest-mock "^27.0.3" - jest-regex-util "^27.0.1" - jest-resolve "^27.0.4" - jest-snapshot "^27.0.4" - jest-util "^27.0.2" - jest-validate "^27.0.2" + jest-haste-map "^27.0.6" + jest-message-util "^27.0.6" + jest-mock "^27.0.6" + jest-regex-util "^27.0.6" + jest-resolve "^27.0.6" + jest-snapshot "^27.0.6" + jest-util "^27.0.6" + jest-validate "^27.0.6" slash "^3.0.0" strip-bom "^4.0.0" yargs "^16.0.3" -jest-serializer@^27.0.1: - version "27.0.1" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.1.tgz#2464d04dcc33fb71dc80b7c82e3c5e8a08cb1020" - integrity sha512-svy//5IH6bfQvAbkAEg1s7xhhgHTtXu0li0I2fdKHDsLP2P2MOiscPQIENQep8oU2g2B3jqLyxKKzotZOz4CwQ== +jest-serializer@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.6.tgz#93a6c74e0132b81a2d54623251c46c498bb5bec1" + integrity sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA== dependencies: "@types/node" "*" graceful-fs "^4.2.4" -jest-snapshot@^27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.4.tgz#2b96e22ca90382b3e93bd0aae2ce4c78bf51fb5b" - integrity sha512-hnjrvpKGdSMvKfbHyaG5Kul7pDJGZvjVy0CKpzhu28MmAssDXS6GpynhXzgst1wBQoKD8c9b2VS2a5yhDLQRCA== +jest-snapshot@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.6.tgz#f4e6b208bd2e92e888344d78f0f650bcff05a4bf" + integrity sha512-NTHaz8He+ATUagUgE7C/UtFcRoHqR2Gc+KDfhQIyx+VFgwbeEMjeP+ILpUTLosZn/ZtbNdCF5LkVnN/l+V751A== dependencies: "@babel/core" "^7.7.2" "@babel/generator" "^7.7.2" @@ -3004,79 +2997,79 @@ jest-snapshot@^27.0.4: "@babel/plugin-syntax-typescript" "^7.7.2" "@babel/traverse" "^7.7.2" "@babel/types" "^7.0.0" - "@jest/transform" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/transform" "^27.0.6" + "@jest/types" "^27.0.6" "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.1.5" babel-preset-current-node-syntax "^1.0.0" chalk "^4.0.0" - expect "^27.0.2" + expect "^27.0.6" graceful-fs "^4.2.4" - jest-diff "^27.0.2" - jest-get-type "^27.0.1" - jest-haste-map "^27.0.2" - jest-matcher-utils "^27.0.2" - jest-message-util "^27.0.2" - jest-resolve "^27.0.4" - jest-util "^27.0.2" + jest-diff "^27.0.6" + jest-get-type "^27.0.6" + jest-haste-map "^27.0.6" + jest-matcher-utils "^27.0.6" + jest-message-util "^27.0.6" + jest-resolve "^27.0.6" + jest-util "^27.0.6" natural-compare "^1.4.0" - pretty-format "^27.0.2" + pretty-format "^27.0.6" semver "^7.3.2" -jest-util@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.2.tgz#fc2c7ace3c75ae561cf1e5fdb643bf685a5be7c7" - integrity sha512-1d9uH3a00OFGGWSibpNYr+jojZ6AckOMCXV2Z4K3YXDnzpkAaXQyIpY14FOJPiUmil7CD+A6Qs+lnnh6ctRbIA== +jest-util@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.6.tgz#e8e04eec159de2f4d5f57f795df9cdc091e50297" + integrity sha512-1JjlaIh+C65H/F7D11GNkGDDZtDfMEM8EBXsvd+l/cxtgQ6QhxuloOaiayt89DxUvDarbVhqI98HhgrM1yliFQ== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" "@types/node" "*" chalk "^4.0.0" graceful-fs "^4.2.4" is-ci "^3.0.0" picomatch "^2.2.3" -jest-validate@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.2.tgz#7fe2c100089449cd5cbb47a5b0b6cb7cda5beee5" - integrity sha512-UgBF6/oVu1ofd1XbaSotXKihi8nZhg0Prm8twQ9uCuAfo59vlxCXMPI/RKmrZEVgi3Nd9dS0I8A0wzWU48pOvg== +jest-validate@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.6.tgz#930a527c7a951927df269f43b2dc23262457e2a6" + integrity sha512-yhZZOaMH3Zg6DC83n60pLmdU1DQE46DW+KLozPiPbSbPhlXXaiUTDlhHQhHFpaqIFRrInko1FHXjTRpjWRuWfA== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" camelcase "^6.2.0" chalk "^4.0.0" - jest-get-type "^27.0.1" + jest-get-type "^27.0.6" leven "^3.1.0" - pretty-format "^27.0.2" + pretty-format "^27.0.6" -jest-watcher@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.2.tgz#dab5f9443e2d7f52597186480731a8c6335c5deb" - integrity sha512-8nuf0PGuTxWj/Ytfw5fyvNn/R80iXY8QhIT0ofyImUvdnoaBdT6kob0GmhXR+wO+ALYVnh8bQxN4Tjfez0JgkA== +jest-watcher@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.6.tgz#89526f7f9edf1eac4e4be989bcb6dec6b8878d9c" + integrity sha512-/jIoKBhAP00/iMGnTwUBLgvxkn7vsOweDrOTSPzc7X9uOyUtJIDthQBTI1EXz90bdkrxorUZVhJwiB69gcHtYQ== dependencies: - "@jest/test-result" "^27.0.2" - "@jest/types" "^27.0.2" + "@jest/test-result" "^27.0.6" + "@jest/types" "^27.0.6" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^27.0.2" + jest-util "^27.0.6" string-length "^4.0.1" -jest-worker@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz#4ebeb56cef48b3e7514552f80d0d80c0129f0b05" - integrity sha512-EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg== +jest-worker@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.6.tgz#a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed" + integrity sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA== dependencies: "@types/node" "*" merge-stream "^2.0.0" supports-color "^8.0.0" -jest@27.0.4: - version "27.0.4" - resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.4.tgz#91d4d564b36bcf93b98dac1ab19f07089e670f53" - integrity sha512-Px1iKFooXgGSkk1H8dJxxBIrM3tsc5SIuI4kfKYK2J+4rvCvPGr/cXktxh0e9zIPQ5g09kOMNfHQEmusBUf/ZA== +jest@27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/jest/-/jest-27.0.6.tgz#10517b2a628f0409087fbf473db44777d7a04505" + integrity sha512-EjV8aETrsD0wHl7CKMibKwQNQc3gIRBXlTikBmmHUeVMKaPFxdcUIBfoDqTSXDoGJIivAYGqCWVlzCSaVjPQsA== dependencies: - "@jest/core" "^27.0.4" + "@jest/core" "^27.0.6" import-local "^3.0.2" - jest-cli "^27.0.4" + jest-cli "^27.0.6" js-tokens@^4.0.0: version "4.0.0" @@ -3622,12 +3615,12 @@ prepend-http@^2.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= -pretty-format@^27.0.2: - version "27.0.2" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.2.tgz#9283ff8c4f581b186b2d4da461617143dca478a4" - integrity sha512-mXKbbBPnYTG7Yra9qFBtqj+IXcsvxsvOBco3QHxtxTl+hHKq6QdzMZ+q0CtL4ORHZgwGImRr2XZUX2EWzORxig== +pretty-format@^27.0.6: + version "27.0.6" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.6.tgz#ab770c47b2c6f893a21aefc57b75da63ef49a11f" + integrity sha512-8tGD7gBIENgzqA+UBzObyWqQ5B778VIFZA/S66cclyd5YkFLYs2Js7gxDKf0MXtTc9zcS7t1xhdfcElJ3YIvkQ== dependencies: - "@jest/types" "^27.0.2" + "@jest/types" "^27.0.6" ansi-regex "^5.0.0" ansi-styles "^5.0.0" react-is "^17.0.1" @@ -4364,10 +4357,10 @@ v8-compile-cache@^2.0.3: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== -v8-to-istanbul@^7.0.0: - version "7.1.2" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1" - integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow== +v8-to-istanbul@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz#4229f2a99e367f3f018fa1d5c2b8ec684667c69c" + integrity sha512-LkmXi8UUNxnCC+JlH7/fsfsKr5AU110l+SYGJimWNkWhxbN5EyeOtm1MJ0hhvqMMOhGwBj1Fp70Yv9i+hX0QAg== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -4426,9 +4419,9 @@ whatwg-mimetype@^2.3.0: integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== whatwg-url@^8.0.0, whatwg-url@^8.5.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.6.0.tgz#27c0205a4902084b872aecb97cf0f2a7a3011f4c" - integrity sha512-os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw== + version "8.7.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" + integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== dependencies: lodash "^4.7.0" tr46 "^2.1.0" @@ -4478,9 +4471,9 @@ write-file-atomic@^3.0.0: typedarray-to-buffer "^3.1.5" ws@^7.4.5: - version "7.5.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.0.tgz#0033bafea031fb9df041b2026fc72a571ca44691" - integrity sha512-6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw== + version "7.5.1" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.1.tgz#44fc000d87edb1d9c53e51fbc69a0ac1f6871d66" + integrity sha512-2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow== xdg-basedir@^4.0.0: version "4.0.0" diff --git a/pkgs/applications/networking/browsers/vieb/yarn.nix b/pkgs/applications/networking/browsers/vieb/yarn.nix index 14e1b9902cc..a92d6defef9 100644 --- a/pkgs/applications/networking/browsers/vieb/yarn.nix +++ b/pkgs/applications/networking/browsers/vieb/yarn.nix @@ -26,11 +26,11 @@ }; } { - name = "_babel_compat_data___compat_data_7.14.5.tgz"; + name = "_babel_compat_data___compat_data_7.14.7.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz"; - sha1 = "8ef4c18e58e801c5c95d3c1c0f2874a2680fadea"; + name = "_babel_compat_data___compat_data_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz"; + sha1 = "7b047d7a3a89a67d2258dc61f604f098f1bc7e08"; }; } { @@ -82,11 +82,11 @@ }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.5.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.7.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz"; - sha1 = "d5c70e4ad13b402c95156c7a53568f504e2fb7b8"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz"; + sha1 = "97e56244beb94211fe277bd818e3a329c66f7970"; }; } { @@ -178,11 +178,11 @@ }; } { - name = "_babel_parser___parser_7.14.6.tgz"; + name = "_babel_parser___parser_7.14.7.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.14.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz"; - sha1 = "d85cc68ca3cac84eae384c06f032921f5227f4b2"; + name = "_babel_parser___parser_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz"; + sha1 = "6099720c8839ca865a2637e6c85852ead0bdb595"; }; } { @@ -298,11 +298,11 @@ }; } { - name = "_babel_traverse___traverse_7.14.5.tgz"; + name = "_babel_traverse___traverse_7.14.7.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz"; - sha1 = "c111b0f58afab4fea3d3385a406f692748c59870"; + name = "_babel_traverse___traverse_7.14.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.7.tgz"; + sha1 = "64007c9774cfdc3abd23b0780bc18a3ce3631753"; }; } { @@ -330,14 +330,6 @@ }; } { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.1.tgz"; - path = fetchurl { - name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron-preload/-/adblocker-electron-preload-1.22.1.tgz"; - sha1 = "8ce8c18d0ce5f7afa7c1dfe1f4cba30ada86f4af"; - }; - } - { name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.2.tgz"; path = fetchurl { name = "_cliqz_adblocker_electron_preload___adblocker_electron_preload_1.22.2.tgz"; @@ -346,11 +338,11 @@ }; } { - name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.22.2.tgz"; path = fetchurl { - name = "_cliqz_adblocker_electron___adblocker_electron_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.1.tgz"; - sha1 = "13fe6de4be0c3beb2851634b27ea1223d10ca92b"; + name = "_cliqz_adblocker_electron___adblocker_electron_1.22.2.tgz"; + url = "https://registry.yarnpkg.com/@cliqz/adblocker-electron/-/adblocker-electron-1.22.2.tgz"; + sha1 = "85af3b49f7f653e6fb0d008b6523e3b3ba0dd41e"; }; } { @@ -418,91 +410,91 @@ }; } { - name = "_jest_console___console_27.0.2.tgz"; + name = "_jest_console___console_27.0.6.tgz"; path = fetchurl { - name = "_jest_console___console_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/console/-/console-27.0.2.tgz"; - sha1 = "b8eeff8f21ac51d224c851e1729d2630c18631e6"; + name = "_jest_console___console_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/console/-/console-27.0.6.tgz"; + sha1 = "3eb72ea80897495c3d73dd97aab7f26770e2260f"; }; } { - name = "_jest_core___core_27.0.4.tgz"; + name = "_jest_core___core_27.0.6.tgz"; path = fetchurl { - name = "_jest_core___core_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/@jest/core/-/core-27.0.4.tgz"; - sha1 = "679bf9ac07900da2ddbb9667bb1afa8029038f53"; + name = "_jest_core___core_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/core/-/core-27.0.6.tgz"; + sha1 = "c5f642727a0b3bf0f37c4b46c675372d0978d4a1"; }; } { - name = "_jest_environment___environment_27.0.3.tgz"; + name = "_jest_environment___environment_27.0.6.tgz"; path = fetchurl { - name = "_jest_environment___environment_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.3.tgz"; - sha1 = "68769b1dfdd213e3456169d64fbe9bd63a5fda92"; + name = "_jest_environment___environment_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/environment/-/environment-27.0.6.tgz"; + sha1 = "ee293fe996db01d7d663b8108fa0e1ff436219d2"; }; } { - name = "_jest_fake_timers___fake_timers_27.0.3.tgz"; + name = "_jest_fake_timers___fake_timers_27.0.6.tgz"; path = fetchurl { - name = "_jest_fake_timers___fake_timers_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.3.tgz"; - sha1 = "9899ba6304cc636734c74478df502e18136461dd"; + name = "_jest_fake_timers___fake_timers_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.0.6.tgz"; + sha1 = "cbad52f3fe6abe30e7acb8cd5fa3466b9588e3df"; }; } { - name = "_jest_globals___globals_27.0.3.tgz"; + name = "_jest_globals___globals_27.0.6.tgz"; path = fetchurl { - name = "_jest_globals___globals_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.3.tgz"; - sha1 = "1cf8933b7791bba0b99305cbf39fd4d2e3fe4060"; + name = "_jest_globals___globals_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/globals/-/globals-27.0.6.tgz"; + sha1 = "48e3903f99a4650673d8657334d13c9caf0e8f82"; }; } { - name = "_jest_reporters___reporters_27.0.4.tgz"; + name = "_jest_reporters___reporters_27.0.6.tgz"; path = fetchurl { - name = "_jest_reporters___reporters_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.4.tgz"; - sha1 = "95609b1be97afb80d55d8aa3d7c3179c15810e65"; + name = "_jest_reporters___reporters_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.0.6.tgz"; + sha1 = "91e7f2d98c002ad5df94d5b5167c1eb0b9fd5b00"; }; } { - name = "_jest_source_map___source_map_27.0.1.tgz"; + name = "_jest_source_map___source_map_27.0.6.tgz"; path = fetchurl { - name = "_jest_source_map___source_map_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.1.tgz"; - sha1 = "2afbf73ddbaddcb920a8e62d0238a0a9e0a8d3e4"; + name = "_jest_source_map___source_map_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.0.6.tgz"; + sha1 = "be9e9b93565d49b0548b86e232092491fb60551f"; }; } { - name = "_jest_test_result___test_result_27.0.2.tgz"; + name = "_jest_test_result___test_result_27.0.6.tgz"; path = fetchurl { - name = "_jest_test_result___test_result_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.2.tgz"; - sha1 = "0451049e32ceb609b636004ccc27c8fa22263f10"; + name = "_jest_test_result___test_result_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.0.6.tgz"; + sha1 = "3fa42015a14e4fdede6acd042ce98c7f36627051"; }; } { - name = "_jest_test_sequencer___test_sequencer_27.0.4.tgz"; + name = "_jest_test_sequencer___test_sequencer_27.0.6.tgz"; path = fetchurl { - name = "_jest_test_sequencer___test_sequencer_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz"; - sha1 = "976493b277594d81e589896f0ed21f198308928a"; + name = "_jest_test_sequencer___test_sequencer_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.0.6.tgz"; + sha1 = "80a913ed7a1130545b1cd777ff2735dd3af5d34b"; }; } { - name = "_jest_transform___transform_27.0.2.tgz"; + name = "_jest_transform___transform_27.0.6.tgz"; path = fetchurl { - name = "_jest_transform___transform_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.2.tgz"; - sha1 = "b073b7c589e3f4b842102468875def2bb722d6b5"; + name = "_jest_transform___transform_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/transform/-/transform-27.0.6.tgz"; + sha1 = "189ad7107413208f7600f4719f81dd2f7278cc95"; }; } { - name = "_jest_types___types_27.0.2.tgz"; + name = "_jest_types___types_27.0.6.tgz"; path = fetchurl { - name = "_jest_types___types_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.2.tgz"; - sha1 = "e153d6c46bda0f2589f0702b071f9898c7bbd37e"; + name = "_jest_types___types_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-27.0.6.tgz"; + sha1 = "9a992bc517e0c49f035938b8549719c2de40706b"; }; } { @@ -642,11 +634,11 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; + name = "_types_babel__traverse___babel__traverse_7.14.0.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.11.1.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.1.tgz"; - sha1 = "654f6c4f67568e24c23b367e947098c6206fa639"; + name = "_types_babel__traverse___babel__traverse_7.14.0.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.0.tgz"; + sha1 = "a34277cf8acbd3185ea74129e1f100491eb1da7f"; }; } { @@ -666,11 +658,11 @@ }; } { - name = "_types_filesystem___filesystem_0.0.30.tgz"; + name = "_types_filesystem___filesystem_0.0.31.tgz"; path = fetchurl { - name = "_types_filesystem___filesystem_0.0.30.tgz"; - url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.30.tgz"; - sha1 = "a7373a2edf34d13e298baf7ee1101f738b2efb7e"; + name = "_types_filesystem___filesystem_0.0.31.tgz"; + url = "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.31.tgz"; + sha1 = "121a1ded274a2dc731d5e0d90163a920ad6a9ef1"; }; } { @@ -754,19 +746,19 @@ }; } { - name = "_types_node___node_15.12.4.tgz"; + name = "_types_node___node_15.12.5.tgz"; path = fetchurl { - name = "_types_node___node_15.12.4.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz"; - sha1 = "e1cf817d70a1e118e81922c4ff6683ce9d422e26"; + name = "_types_node___node_15.12.5.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-15.12.5.tgz"; + sha1 = "9a78318a45d75c9523d2396131bd3cca54b2d185"; }; } { - name = "_types_node___node_14.17.3.tgz"; + name = "_types_node___node_14.17.4.tgz"; path = fetchurl { - name = "_types_node___node_14.17.3.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.3.tgz"; - sha1 = "6d327abaa4be34a74e421ed6409a0ae2f47f4c3d"; + name = "_types_node___node_14.17.4.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.4.tgz"; + sha1 = "218712242446fc868d0e007af29a4408c7765bc0"; }; } { @@ -858,11 +850,11 @@ }; } { - name = "acorn___acorn_8.4.0.tgz"; + name = "acorn___acorn_8.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_8.4.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz"; - sha1 = "af53266e698d7cffa416714b503066a82221be60"; + name = "acorn___acorn_8.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz"; + sha1 = "56c36251fc7cabc7096adc18f05afe814321a28c"; }; } { @@ -1098,11 +1090,11 @@ }; } { - name = "babel_jest___babel_jest_27.0.2.tgz"; + name = "babel_jest___babel_jest_27.0.6.tgz"; path = fetchurl { - name = "babel_jest___babel_jest_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.2.tgz"; - sha1 = "7dc18adb01322acce62c2af76ea2c7cd186ade37"; + name = "babel_jest___babel_jest_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.0.6.tgz"; + sha1 = "e99c6e0577da2655118e3608b68761a5a69bd0d8"; }; } { @@ -1114,11 +1106,11 @@ }; } { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.1.tgz"; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.6.tgz"; path = fetchurl { - name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.1.tgz"; - sha1 = "a6d10e484c93abff0f4e95f437dad26e5736ea11"; + name = "babel_plugin_jest_hoist___babel_plugin_jest_hoist_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.0.6.tgz"; + sha1 = "f7c6b3d764af21cb4a2a1ab6870117dbde15b456"; }; } { @@ -1130,11 +1122,11 @@ }; } { - name = "babel_preset_jest___babel_preset_jest_27.0.1.tgz"; + name = "babel_preset_jest___babel_preset_jest_27.0.6.tgz"; path = fetchurl { - name = "babel_preset_jest___babel_preset_jest_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.1.tgz"; - sha1 = "7a50c75d16647c23a2cf5158d5bb9eb206b10e20"; + name = "babel_preset_jest___babel_preset_jest_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.0.6.tgz"; + sha1 = "909ef08e9f24a4679768be2f60a3df0856843f9d"; }; } { @@ -1322,11 +1314,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001239.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001241.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001239.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001239.tgz"; - sha1 = "66e8669985bb2cb84ccb10f68c25ce6dd3e4d2b8"; + name = "caniuse_lite___caniuse_lite_1.0.30001241.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001241.tgz"; + sha1 = "cd3fae47eb3d7691692b406568d7a3e5b23c7598"; }; } { @@ -1554,11 +1546,11 @@ }; } { - name = "core_js___core_js_3.15.0.tgz"; + name = "core_js___core_js_3.15.2.tgz"; path = fetchurl { - name = "core_js___core_js_3.15.0.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz"; - sha1 = "db9554ebce0b6fd90dc9b1f2465c841d2d055044"; + name = "core_js___core_js_3.15.2.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz"; + sha1 = "740660d2ff55ef34ce664d7e2455119c5bdd3d61"; }; } { @@ -1666,11 +1658,11 @@ }; } { - name = "decimal.js___decimal.js_10.2.1.tgz"; + name = "decimal.js___decimal.js_10.3.1.tgz"; path = fetchurl { - name = "decimal.js___decimal.js_10.2.1.tgz"; - url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz"; - sha1 = "238ae7b0f0c793d3e3cea410108b35a2c01426a3"; + name = "decimal.js___decimal.js_10.3.1.tgz"; + url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz"; + sha1 = "d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"; }; } { @@ -1754,11 +1746,11 @@ }; } { - name = "diff_sequences___diff_sequences_27.0.1.tgz"; + name = "diff_sequences___diff_sequences_27.0.6.tgz"; path = fetchurl { - name = "diff_sequences___diff_sequences_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.1.tgz"; - sha1 = "9c9801d52ed5f576ff0a20e3022a13ee6e297e7c"; + name = "diff_sequences___diff_sequences_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.0.6.tgz"; + sha1 = "3305cb2e55a033924054695cc66019fd7f8e5723"; }; } { @@ -1858,19 +1850,19 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.752.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.763.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.752.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz"; - sha1 = "0728587f1b9b970ec9ffad932496429aef750d09"; + name = "electron_to_chromium___electron_to_chromium_1.3.763.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.763.tgz"; + sha1 = "93f6f02506d099941f557b9db9ba50b30215bf15"; }; } { - name = "electron___electron_13.1.2.tgz"; + name = "electron___electron_13.1.4.tgz"; path = fetchurl { - name = "electron___electron_13.1.2.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-13.1.2.tgz"; - sha1 = "8c9abf9015766c9cbc16f10c99282d00d6ae1b90"; + name = "electron___electron_13.1.4.tgz"; + url = "https://registry.yarnpkg.com/electron/-/electron-13.1.4.tgz"; + sha1 = "6d20d932a0651c3cba9f09a3d08cbaf5b69aa84b"; }; } { @@ -2122,11 +2114,11 @@ }; } { - name = "expect___expect_27.0.2.tgz"; + name = "expect___expect_27.0.6.tgz"; path = fetchurl { - name = "expect___expect_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/expect/-/expect-27.0.2.tgz"; - sha1 = "e66ca3a4c9592f1c019fa1d46459a9d2084f3422"; + name = "expect___expect_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/expect/-/expect-27.0.6.tgz"; + sha1 = "a4d74fbe27222c718fff68ef49d78e26a8fd4c05"; }; } { @@ -2866,131 +2858,131 @@ }; } { - name = "jest_changed_files___jest_changed_files_27.0.2.tgz"; + name = "jest_changed_files___jest_changed_files_27.0.6.tgz"; path = fetchurl { - name = "jest_changed_files___jest_changed_files_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.2.tgz"; - sha1 = "997253042b4a032950fc5f56abf3c5d1f8560801"; + name = "jest_changed_files___jest_changed_files_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.0.6.tgz"; + sha1 = "bed6183fcdea8a285482e3b50a9a7712d49a7a8b"; }; } { - name = "jest_circus___jest_circus_27.0.4.tgz"; + name = "jest_circus___jest_circus_27.0.6.tgz"; path = fetchurl { - name = "jest_circus___jest_circus_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.4.tgz"; - sha1 = "3b261514ee3b3da33def736a6352c98ff56bb6e6"; + name = "jest_circus___jest_circus_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.0.6.tgz"; + sha1 = "dd4df17c4697db6a2c232aaad4e9cec666926668"; }; } { - name = "jest_cli___jest_cli_27.0.4.tgz"; + name = "jest_cli___jest_cli_27.0.6.tgz"; path = fetchurl { - name = "jest_cli___jest_cli_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.4.tgz"; - sha1 = "491b12c754c0d7c6873b13a66f26b3a80a852910"; + name = "jest_cli___jest_cli_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.0.6.tgz"; + sha1 = "d021e5f4d86d6a212450d4c7b86cb219f1e6864f"; }; } { - name = "jest_config___jest_config_27.0.4.tgz"; + name = "jest_config___jest_config_27.0.6.tgz"; path = fetchurl { - name = "jest_config___jest_config_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.4.tgz"; - sha1 = "c4f41378acf40ca77860fb4e213b12109d87b8cf"; + name = "jest_config___jest_config_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-config/-/jest-config-27.0.6.tgz"; + sha1 = "119fb10f149ba63d9c50621baa4f1f179500277f"; }; } { - name = "jest_diff___jest_diff_27.0.2.tgz"; + name = "jest_diff___jest_diff_27.0.6.tgz"; path = fetchurl { - name = "jest_diff___jest_diff_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.2.tgz"; - sha1 = "f315b87cee5dc134cf42c2708ab27375cc3f5a7e"; + name = "jest_diff___jest_diff_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.0.6.tgz"; + sha1 = "4a7a19ee6f04ad70e0e3388f35829394a44c7b5e"; }; } { - name = "jest_docblock___jest_docblock_27.0.1.tgz"; + name = "jest_docblock___jest_docblock_27.0.6.tgz"; path = fetchurl { - name = "jest_docblock___jest_docblock_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.1.tgz"; - sha1 = "bd9752819b49fa4fab1a50b73eb58c653b962e8b"; + name = "jest_docblock___jest_docblock_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.0.6.tgz"; + sha1 = "cc78266acf7fe693ca462cbbda0ea4e639e4e5f3"; }; } { - name = "jest_each___jest_each_27.0.2.tgz"; + name = "jest_each___jest_each_27.0.6.tgz"; path = fetchurl { - name = "jest_each___jest_each_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.2.tgz"; - sha1 = "865ddb4367476ced752167926b656fa0dcecd8c7"; + name = "jest_each___jest_each_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-each/-/jest-each-27.0.6.tgz"; + sha1 = "cee117071b04060158dc8d9a66dc50ad40ef453b"; }; } { - name = "jest_environment_jsdom___jest_environment_jsdom_27.0.3.tgz"; + name = "jest_environment_jsdom___jest_environment_jsdom_27.0.6.tgz"; path = fetchurl { - name = "jest_environment_jsdom___jest_environment_jsdom_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.3.tgz"; - sha1 = "ed73e913ddc03864eb9f934b5cbabf1b63504e2e"; + name = "jest_environment_jsdom___jest_environment_jsdom_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.0.6.tgz"; + sha1 = "f66426c4c9950807d0a9f209c590ce544f73291f"; }; } { - name = "jest_environment_node___jest_environment_node_27.0.3.tgz"; + name = "jest_environment_node___jest_environment_node_27.0.6.tgz"; path = fetchurl { - name = "jest_environment_node___jest_environment_node_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.3.tgz"; - sha1 = "b4acb3679d2552a4215732cab8b0ca7ec4398ee0"; + name = "jest_environment_node___jest_environment_node_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.0.6.tgz"; + sha1 = "a6699b7ceb52e8d68138b9808b0c404e505f3e07"; }; } { - name = "jest_get_type___jest_get_type_27.0.1.tgz"; + name = "jest_get_type___jest_get_type_27.0.6.tgz"; path = fetchurl { - name = "jest_get_type___jest_get_type_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.1.tgz"; - sha1 = "34951e2b08c8801eb28559d7eb732b04bbcf7815"; + name = "jest_get_type___jest_get_type_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.0.6.tgz"; + sha1 = "0eb5c7f755854279ce9b68a9f1a4122f69047cfe"; }; } { - name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; + name = "jest_haste_map___jest_haste_map_27.0.6.tgz"; path = fetchurl { - name = "jest_haste_map___jest_haste_map_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.2.tgz"; - sha1 = "3f1819400c671237e48b4d4b76a80a0dbed7577f"; + name = "jest_haste_map___jest_haste_map_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.0.6.tgz"; + sha1 = "4683a4e68f6ecaa74231679dca237279562c8dc7"; }; } { - name = "jest_jasmine2___jest_jasmine2_27.0.4.tgz"; + name = "jest_jasmine2___jest_jasmine2_27.0.6.tgz"; path = fetchurl { - name = "jest_jasmine2___jest_jasmine2_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz"; - sha1 = "c669519ccf4904a485338555e1e66cad36bb0670"; + name = "jest_jasmine2___jest_jasmine2_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.0.6.tgz"; + sha1 = "fd509a9ed3d92bd6edb68a779f4738b100655b37"; }; } { - name = "jest_leak_detector___jest_leak_detector_27.0.2.tgz"; + name = "jest_leak_detector___jest_leak_detector_27.0.6.tgz"; path = fetchurl { - name = "jest_leak_detector___jest_leak_detector_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.2.tgz"; - sha1 = "ce19aa9dbcf7a72a9d58907a970427506f624e69"; + name = "jest_leak_detector___jest_leak_detector_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.0.6.tgz"; + sha1 = "545854275f85450d4ef4b8fe305ca2a26450450f"; }; } { - name = "jest_matcher_utils___jest_matcher_utils_27.0.2.tgz"; + name = "jest_matcher_utils___jest_matcher_utils_27.0.6.tgz"; path = fetchurl { - name = "jest_matcher_utils___jest_matcher_utils_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.2.tgz"; - sha1 = "f14c060605a95a466cdc759acc546c6f4cbfc4f0"; + name = "jest_matcher_utils___jest_matcher_utils_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.0.6.tgz"; + sha1 = "2a8da1e86c620b39459f4352eaa255f0d43e39a9"; }; } { - name = "jest_message_util___jest_message_util_27.0.2.tgz"; + name = "jest_message_util___jest_message_util_27.0.6.tgz"; path = fetchurl { - name = "jest_message_util___jest_message_util_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.2.tgz"; - sha1 = "181c9b67dff504d8f4ad15cba10d8b80f272048c"; + name = "jest_message_util___jest_message_util_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.0.6.tgz"; + sha1 = "158bcdf4785706492d164a39abca6a14da5ab8b5"; }; } { - name = "jest_mock___jest_mock_27.0.3.tgz"; + name = "jest_mock___jest_mock_27.0.6.tgz"; path = fetchurl { - name = "jest_mock___jest_mock_27.0.3.tgz"; - url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.3.tgz"; - sha1 = "5591844f9192b3335c0dca38e8e45ed297d4d23d"; + name = "jest_mock___jest_mock_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.0.6.tgz"; + sha1 = "0efdd40851398307ba16778728f6d34d583e3467"; }; } { @@ -3002,99 +2994,99 @@ }; } { - name = "jest_regex_util___jest_regex_util_27.0.1.tgz"; + name = "jest_regex_util___jest_regex_util_27.0.6.tgz"; path = fetchurl { - name = "jest_regex_util___jest_regex_util_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.1.tgz"; - sha1 = "69d4b1bf5b690faa3490113c47486ed85dd45b68"; + name = "jest_regex_util___jest_regex_util_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.0.6.tgz"; + sha1 = "02e112082935ae949ce5d13b2675db3d8c87d9c5"; }; } { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.4.tgz"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.6.tgz"; path = fetchurl { - name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz"; - sha1 = "a07a242d70d668afd3fcf7f4270755eebb1fe579"; + name = "jest_resolve_dependencies___jest_resolve_dependencies_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.6.tgz"; + sha1 = "3e619e0ef391c3ecfcf6ef4056207a3d2be3269f"; }; } { - name = "jest_resolve___jest_resolve_27.0.4.tgz"; + name = "jest_resolve___jest_resolve_27.0.6.tgz"; path = fetchurl { - name = "jest_resolve___jest_resolve_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.4.tgz"; - sha1 = "8a27bc3f2f00c8ea28f3bc99bbf6f468300a703d"; + name = "jest_resolve___jest_resolve_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.0.6.tgz"; + sha1 = "e90f436dd4f8fbf53f58a91c42344864f8e55bff"; }; } { - name = "jest_runner___jest_runner_27.0.4.tgz"; + name = "jest_runner___jest_runner_27.0.6.tgz"; path = fetchurl { - name = "jest_runner___jest_runner_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.4.tgz"; - sha1 = "2787170a9509b792ae129794f6944d27d5d12a4f"; + name = "jest_runner___jest_runner_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.0.6.tgz"; + sha1 = "1325f45055539222bbc7256a6976e993ad2f9520"; }; } { - name = "jest_runtime___jest_runtime_27.0.4.tgz"; + name = "jest_runtime___jest_runtime_27.0.6.tgz"; path = fetchurl { - name = "jest_runtime___jest_runtime_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.4.tgz"; - sha1 = "2e4a6aa77cac32ac612dfe12768387a8aa15c2f0"; + name = "jest_runtime___jest_runtime_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.0.6.tgz"; + sha1 = "45877cfcd386afdd4f317def551fc369794c27c9"; }; } { - name = "jest_serializer___jest_serializer_27.0.1.tgz"; + name = "jest_serializer___jest_serializer_27.0.6.tgz"; path = fetchurl { - name = "jest_serializer___jest_serializer_27.0.1.tgz"; - url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.1.tgz"; - sha1 = "2464d04dcc33fb71dc80b7c82e3c5e8a08cb1020"; + name = "jest_serializer___jest_serializer_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.0.6.tgz"; + sha1 = "93a6c74e0132b81a2d54623251c46c498bb5bec1"; }; } { - name = "jest_snapshot___jest_snapshot_27.0.4.tgz"; + name = "jest_snapshot___jest_snapshot_27.0.6.tgz"; path = fetchurl { - name = "jest_snapshot___jest_snapshot_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.4.tgz"; - sha1 = "2b96e22ca90382b3e93bd0aae2ce4c78bf51fb5b"; + name = "jest_snapshot___jest_snapshot_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.0.6.tgz"; + sha1 = "f4e6b208bd2e92e888344d78f0f650bcff05a4bf"; }; } { - name = "jest_util___jest_util_27.0.2.tgz"; + name = "jest_util___jest_util_27.0.6.tgz"; path = fetchurl { - name = "jest_util___jest_util_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.2.tgz"; - sha1 = "fc2c7ace3c75ae561cf1e5fdb643bf685a5be7c7"; + name = "jest_util___jest_util_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-util/-/jest-util-27.0.6.tgz"; + sha1 = "e8e04eec159de2f4d5f57f795df9cdc091e50297"; }; } { - name = "jest_validate___jest_validate_27.0.2.tgz"; + name = "jest_validate___jest_validate_27.0.6.tgz"; path = fetchurl { - name = "jest_validate___jest_validate_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.2.tgz"; - sha1 = "7fe2c100089449cd5cbb47a5b0b6cb7cda5beee5"; + name = "jest_validate___jest_validate_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.0.6.tgz"; + sha1 = "930a527c7a951927df269f43b2dc23262457e2a6"; }; } { - name = "jest_watcher___jest_watcher_27.0.2.tgz"; + name = "jest_watcher___jest_watcher_27.0.6.tgz"; path = fetchurl { - name = "jest_watcher___jest_watcher_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.2.tgz"; - sha1 = "dab5f9443e2d7f52597186480731a8c6335c5deb"; + name = "jest_watcher___jest_watcher_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.0.6.tgz"; + sha1 = "89526f7f9edf1eac4e4be989bcb6dec6b8878d9c"; }; } { - name = "jest_worker___jest_worker_27.0.2.tgz"; + name = "jest_worker___jest_worker_27.0.6.tgz"; path = fetchurl { - name = "jest_worker___jest_worker_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz"; - sha1 = "4ebeb56cef48b3e7514552f80d0d80c0129f0b05"; + name = "jest_worker___jest_worker_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.6.tgz"; + sha1 = "a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed"; }; } { - name = "jest___jest_27.0.4.tgz"; + name = "jest___jest_27.0.6.tgz"; path = fetchurl { - name = "jest___jest_27.0.4.tgz"; - url = "https://registry.yarnpkg.com/jest/-/jest-27.0.4.tgz"; - sha1 = "91d4d564b36bcf93b98dac1ab19f07089e670f53"; + name = "jest___jest_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/jest/-/jest-27.0.6.tgz"; + sha1 = "10517b2a628f0409087fbf473db44777d7a04505"; }; } { @@ -3786,11 +3778,11 @@ }; } { - name = "pretty_format___pretty_format_27.0.2.tgz"; + name = "pretty_format___pretty_format_27.0.6.tgz"; path = fetchurl { - name = "pretty_format___pretty_format_27.0.2.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.2.tgz"; - sha1 = "9283ff8c4f581b186b2d4da461617143dca478a4"; + name = "pretty_format___pretty_format_27.0.6.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.0.6.tgz"; + sha1 = "ab770c47b2c6f893a21aefc57b75da63ef49a11f"; }; } { @@ -4682,11 +4674,11 @@ }; } { - name = "v8_to_istanbul___v8_to_istanbul_7.1.2.tgz"; + name = "v8_to_istanbul___v8_to_istanbul_8.0.0.tgz"; path = fetchurl { - name = "v8_to_istanbul___v8_to_istanbul_7.1.2.tgz"; - url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz"; - sha1 = "30898d1a7fa0c84d225a2c1434fb958f290883c1"; + name = "v8_to_istanbul___v8_to_istanbul_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz"; + sha1 = "4229f2a99e367f3f018fa1d5c2b8ec684667c69c"; }; } { @@ -4754,11 +4746,11 @@ }; } { - name = "whatwg_url___whatwg_url_8.6.0.tgz"; + name = "whatwg_url___whatwg_url_8.7.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_8.6.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.6.0.tgz"; - sha1 = "27c0205a4902084b872aecb97cf0f2a7a3011f4c"; + name = "whatwg_url___whatwg_url_8.7.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz"; + sha1 = "656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"; }; } { @@ -4810,11 +4802,11 @@ }; } { - name = "ws___ws_7.5.0.tgz"; + name = "ws___ws_7.5.1.tgz"; path = fetchurl { - name = "ws___ws_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.5.0.tgz"; - sha1 = "0033bafea031fb9df041b2026fc72a571ca44691"; + name = "ws___ws_7.5.1.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.5.1.tgz"; + sha1 = "44fc000d87edb1d9c53e51fbc69a0ac1f6871d66"; }; } { diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 27222887873..a49879e5352 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.0.8"; + version = "3.1.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-TOPJvOQKEMEsQ/wAJNF+08g4z75GGkNom6gRCrNOO2I="; + sha256 = "sha256-WErNPofVnV6L7DkYU/dh4mWm+u7UJNFUmRN6IZzMb2g="; }; - vendorSha256 = "sha256-YjVAoMyGKMHLGEPeOOkCKCzeWFiUsXfJIKcw5GYoljg="; + vendorSha256 = "sha256-99N//woGPx9QEtkFsktaiAbu7TS+3DHArBA52OUJFU4="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index fadaa94995c..bba0b74172a 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.22.2"; + version = "1.23.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-qYdVplNHyD31m4IbIeL3x3nauZLl1XquslS3WrtUXBk="; + sha256 = "sha256-CJY7XjHJ6suJrjhnG+w5oM1FtVnegcbkCVGjyoBtBag="; }; - vendorSha256 = "sha256-4uSw/9lI/rdDqy78jNC9eHYW/v/sMFb+sQvwYG6GZks="; + vendorSha256 = "sha256-aC6E+PpuUqFhZKvQT5AuxpPmHfhjCwHzwFHDzk5wazw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 4d7e170c201..ec3f21c69d1 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "3.7.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-AM+TLeSrXjn10DiQzXSqSwTqsc7CjTdnf6TWetden7g="; + hash = "sha256-UZu3jChEK59UrtUR2ze68Kkc6MkHRtTsfTOS/B96sLM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index cb2ca48b907..b2788f8b070 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.24.11"; + version = "0.24.12"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-UWY4r7pasFsmlRRKFANyxPIoNNuMPNg1gMXrAXEcqdw="; + sha256 = "sha256-GuN+OAzuNus1B32ZSsnrJPrE7MQ0ZqNKDmoNe7Sa7Zs="; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "sha256-EEN3nKQBtAGG7MAa9h11KFPZ9g7xtNxhFB1i/2QS66g="; + vendorSha256 = "sha256-JBWQxRaMvIbUiOD7sJiZH1SHNCdysgh5FeSmYf+FdG4="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kubeconform/default.nix b/pkgs/applications/networking/cluster/kubeconform/default.nix index c62cbb2a67a..cc0f1e0bf64 100644 --- a/pkgs/applications/networking/cluster/kubeconform/default.nix +++ b/pkgs/applications/networking/cluster/kubeconform/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeconform"; - version = "0.4.7"; + version = "0.4.8"; src = fetchFromGitHub { owner = "yannh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ahVdKMx3u2KnJ30wi9rV8JCVg9wPmbgdrtG8IpWWlCs="; + sha256 = "sha256-XD8xGqtE7eaBxPL4Z0Kw4BEqM2fdgww7wl8wJ1U3u0U="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index ef85494bd14..2c839e84a4e 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb"; }; - propagatedBuildInputs = with python3.pkgs; [ dateutil tornado python-daemon boto3 ]; + propagatedBuildInputs = with python3.pkgs; [ python-dateutil tornado python-daemon boto3 ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 21c42ad786b..69f71a7479e 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnscontrol"; - version = "3.10.0"; + version = "3.10.1"; src = fetchFromGitHub { owner = "StackExchange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-22wYc6W4a5P9+JW7NW+s85IlQ+tfLhYzDarN6PGkFk4="; + sha256 = "sha256-fYQqH/J027XJPML/qKMpuu2Nxuvb0cyjOu2czLH8SoM="; }; - vendorSha256 = "sha256-TPvO/E/uOyVSMNRQ3zzt15+i0UK0uHvI4qM5PqmHY20="; + vendorSha256 = "sha256-225TR9jTZSGEJZz3csl/pR/v2unUK67l08x5ESQTJzA="; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix index 62ffe15e618..9b173e85682 100644 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix +++ b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 - dateutil + python-dateutil feedparser html5lib listparser diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 228c6b47150..61e42ce22ec 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { pynzb pyparsing PyRSS2Gen - dateutil + python-dateutil pyyaml rebulk requests diff --git a/pkgs/applications/networking/giara/default.nix b/pkgs/applications/networking/giara/default.nix index 940756855b9..1f4d2e0a2d9 100644 --- a/pkgs/applications/networking/giara/default.nix +++ b/pkgs/applications/networking/giara/default.nix @@ -48,7 +48,7 @@ python3.pkgs.buildPythonApplication rec { pythonPath = with python3.pkgs; [ pygobject3 pycairo - dateutil + python-dateutil praw pillow mistune diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 22a7d74e14d..5d24f589abc 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -34,11 +34,11 @@ in stdenv.mkDerivation rec { pname = "suricata"; - version = "6.0.2"; + version = "6.0.3"; src = fetchurl { url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-XkZHoHyzG11tAEmXKkU3XBN96QipZKROLW0jH6OtS1I="; + sha256 = "sha256-2vE0uy18mAA16a5g96rzEzI6gJNAAJ8m5IEQzN6B9gI="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix index 89154ad939e..4918a4d91f8 100644 --- a/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix +++ b/pkgs/applications/networking/instant-messengers/kdeltachat/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "kdeltachat"; - version = "unstable-2021-06-14"; + version = "unstable-2021-07-04"; src = fetchFromSourcehut { owner = "~link2xt"; repo = "kdeltachat"; - rev = "25da4228768e260ea9f67d5aa10558e7cf9cf7ee"; - sha256 = "17igh34cbd0w5mzra4k779nxc5s8hk6sj25h308w079y0b21lf7w"; + rev = "5d3cddc47773b49d4a801d031c1de96c38617908"; + sha256 = "1sah27pvdkilnyj41xf4awri9ya14gxayr99qksllz92ywd9lxad"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix new file mode 100644 index 00000000000..3bdecf504ce --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, glibmm, pidgin, pkg-config, modemmanager, fetchFromGitLab } : + +stdenv.mkDerivation rec { + pname = "purple-mm-sms"; + version = "0.1.7"; + + src = fetchFromGitLab { + domain = "source.puri.sm"; + owner = "Librem5"; + repo = pname; + rev = "v${version}"; + sha256 = "0917gjig35hmi6isqb62vhxd3lkc2nwdn13ym2gvzgcjfgjzjajr"; + }; + + makeFlags = [ + "DATA_ROOT_DIR_PURPLE=$(out)/share" + "PLUGIN_DIR_PURPLE=$(out)/lib/purple-2" + ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ glibmm pidgin modemmanager ]; + + meta = with lib; { + homepage = "https://source.puri.sm/Librem5/purple-mm-sms"; + description = "A libpurple plugin for sending and receiving SMS via Modemmanager"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ tomfitzhenry ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix index 8277028ac7b..a8e711c447d 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/requirements.nix @@ -55,7 +55,7 @@ in { sha256 = "0rnshrzw8605x05mpd8ndrx3ri8h6cx713mp8sl4f04f4gcrz8ml"; }; - propagatedBuildInputs = with pythonPackages; [twisted dateutil]; + propagatedBuildInputs = with pythonPackages; [twisted python-dateutil]; meta = with lib; { description = "Some (mainly XMPP-related) additions to twisted"; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 30f90006239..a9de901cd87 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -28,7 +28,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.7.0"; # Please backport all updates to the stable channel. + version = "5.7.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "170x2zsp3z95b123ybs8zqr8sasd5jgd4gl1q32wvhk7m41fvkmd"; + sha256 = "1hjykjqf3n20aab9g3bwk5w8x8v61320xv6z4iqrwwdzfkb3ly20"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 76d149048a3..47aa7c7330f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchFromGitHub, callPackage , pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo -, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash -, dee, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 +, qtbase, qtimageformats, gtk3, libsForQt5, lz4, xxHash +, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 , tl-expected, hunspell, glibmm, webkitgtk , libtgvoip, rnnoise, abseil-cpp, extra-cmake-modules # Transitive dependencies: @@ -23,7 +23,7 @@ let tg_owt = callPackage ./tg_owt.nix {}; in mkDerivation rec { pname = "telegram-desktop"; - version = "2.8.3"; + version = "2.8.4"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -32,12 +32,10 @@ in mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1ywxsy3a99sdibipriblbzskmkqbnxwrz3lavfdr134wq8w8rjf7"; + sha256 = "sha256-IN3GQgdNM66/GxKa5EGKB/LIkgBxS8Y4mkPBaSEphmw="; }; postPatch = '' - substituteInPlace Telegram/lib_spellcheck/spellcheck/platform/linux/linux_enchant.cpp \ - --replace '"libenchant-2.so.2"' '"${enchant2}/lib/libenchant-2.so.2"' substituteInPlace Telegram/CMakeLists.txt \ --replace '"''${TDESKTOP_LAUNCHER_BASENAME}.appdata.xml"' '"''${TDESKTOP_LAUNCHER_BASENAME}.metainfo.xml"' ''; @@ -49,8 +47,8 @@ in mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; buildInputs = [ - qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu enchant2 lz4 xxHash - dee ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 + qtbase qtimageformats gtk3 libsForQt5.kwayland libsForQt5.libdbusmenu lz4 xxHash + ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 tl-expected hunspell glibmm webkitgtk libtgvoip rnnoise abseil-cpp extra-cmake-modules tg_owt diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index e0c5b50be0f..d93fea1f702 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -63,7 +63,7 @@ let description = "Low-latency, high quality voice chat software"; homepage = "https://mumble.info"; license = licenses.bsd3; - maintainers = with maintainers; [ petabyteboy infinisil ]; + maintainers = with maintainers; [ petabyteboy infinisil felixsinger ]; platforms = platforms.linux; }; }); diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 6b73f03531d..446da4cdea3 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,27 +1,18 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, qtbase, qttools +{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools , seafile-shared, jansson, libsearpc , withShibboleth ? true, qtwebengine }: mkDerivation rec { pname = "seafile-client"; - version = "8.0.1"; + version = "8.0.3"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; - rev = "b4b944921c7efef13a93d693c45c997943899dec"; - sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw="; + rev = "v${version}"; + sha256 = "cG3OSqRhYnxlzfauQia6pM/1gu+iE5mtHTGk3kGMFH0="; }; - patches = [ - # Fix compilation failure with "error: template with C linkage", fixes #122505 - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_build_with_glib2.diff?h=seafile-client&id=7be253aaa2bdb6771721f45aa08bc875c8001c5a"; - name = "fix_build_with_glib2.diff"; - sha256 = "0hl7rcqfr8k62c1pr133bp3j63b905izaaggmgvr1af4jibal05v"; - }) - ]; - nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ] ++ lib.optional withShibboleth qtwebengine; diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index 519242b887c..f630cb4071a 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonApplication, fuse -, appdirs, colorama, dateutil, requests, requests_toolbelt +, appdirs, colorama, python-dateutil, requests, requests_toolbelt , fusepy, sqlalchemy, setuptools }: buildPythonApplication rec { @@ -15,7 +15,7 @@ buildPythonApplication rec { sha256 = "0a0fr632l24a3jmgla3b1vcm50ayfa9hdbp677ch1chwj5dq4zfp"; }; - propagatedBuildInputs = [ appdirs colorama dateutil fusepy requests + propagatedBuildInputs = [ appdirs colorama python-dateutil fusepy requests requests_toolbelt setuptools sqlalchemy ]; makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${fuse}/lib/libfuse.so" ]; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 158999f86fe..caa46942ca9 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook -, gnome, buildPythonApplication, dateutil, pyinotify, pygobject3 +, gnome, buildPythonApplication, python-dateutil, pyinotify, pygobject3 , bcrypt, gobject-introspection, gsettings-desktop-schemas , pango, gdk-pixbuf, atk }: @@ -30,7 +30,7 @@ buildPythonApplication rec { ]; propagatedBuildInputs = [ - dateutil pyinotify pygobject3 bcrypt + python-dateutil pyinotify pygobject3 bcrypt ]; patches = [ diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index c2578696c68..68032ebe849 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -122,7 +122,7 @@ let runtimePackages = with python.pkgs; [ dateparser - dateutil + python-dateutil django django-cors-headers django-crispy-forms diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 8f1278d9926..16ee7733ed2 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -122,7 +122,7 @@ python3Packages.buildPythonApplication rec { openpaperwork-core pypillowfight pyxdg - dateutil + python-dateutil setuptools ]; diff --git a/pkgs/applications/office/pyspread/default.nix b/pkgs/applications/office/pyspread/default.nix index 54d3b8f5c3e..3c68c19aa97 100644 --- a/pkgs/applications/office/pyspread/default.nix +++ b/pkgs/applications/office/pyspread/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with python3.pkgs; [ - dateutil + python-dateutil markdown2 matplotlib numpy diff --git a/pkgs/applications/office/softmaker/generic.nix b/pkgs/applications/office/softmaker/generic.nix index 56a951919e3..3c139e1eead 100644 --- a/pkgs/applications/office/softmaker/generic.nix +++ b/pkgs/applications/office/softmaker/generic.nix @@ -123,7 +123,7 @@ in stdenv.mkDerivation { description = "An office suite with a word processor, spreadsheet and presentation program"; homepage = "https://www.softmaker.com/"; license = licenses.unfree; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/office/super-productivity/default.nix b/pkgs/applications/office/super-productivity/default.nix index 7793db2138c..7cb9a9b7e99 100644 --- a/pkgs/applications/office/super-productivity/default.nix +++ b/pkgs/applications/office/super-productivity/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "super-productivity"; - version = "6.5.2"; + version = "7.2.1"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "1ivl7chsv9axgk6nqkf580pav651hchi3di0mrp0pylpsqgk6f1f"; + sha256 = "93eeb56fe923c48a9384cde0633e98a9d9dc5c0869fce63b9724ff74bb400049"; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index b3a5ae44c93..ff4835411ef 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { ]; propagatedBuildInputs = with python3Packages; [ - dateutil + python-dateutil pygobject3 goocalendar pycairo diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index ca80262eb76..43007cb1f0f 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -35,10 +35,10 @@ in stdenv.mkDerivation rec { pname = "gwyddion"; - version = "2.58"; + version = "2.59"; src = fetchurl { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; - sha256 = "sha256-0xNnzYkuW3nEsO2o+0WEA+Z71XWoq6FYXm342OWO9Sw="; + sha256 = "sha256-APMOJeZt/zp8JvXghKZ5lQFRKWO/4TVDORok8qAgEBk="; }; nativeBuildInputs = [ pkg-config file ]; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index c645693e19a..92606f3f909 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.41"; + version = "14.31.42"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-dI1WkQgFikxaIjjqVKZcsGvc3QIu/NMIcRW3N8PGbkY="; + sha256 = "sha256-q81dUSxrKT3nzX0bFclolsyguQxXKlsiX9GCwEvOpAw="; }; patchPhase = '' diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index d20be86daf0..a49262e7cb6 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -7,16 +7,16 @@ in rustPlatform.buildRustPackage rec { pname = "elan"; - version = "1.0.2"; + version = "1.0.6"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-nK4wvxK5Ne1+4kaMts6pIr5FvXBgXJsGdn68gGEZUdk="; + sha256 = "sha256-Ns8vSS/PDlfopigW4Nz3fdR9PCMG8gDoL36+/s0Qkeo="; }; - cargoSha256 = "sha256-ptSbpq1ePNWmdBGfKtqFGfkdimDjU0YEo4F8VPtQMt4="; + cargoSha256 = "sha256-NDtldiVo4SyE88f6ntKn1WJDFdvwN5Ps4DxQH15iNZE="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 569c455e653..8427249c4ce 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation { ''; homepage = "http://hol.sourceforge.net/"; license = licenses.bsd3; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ mudri ]; }; } diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 214f4e218fd..ea2cd356e31 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.30.0"; + version = "3.31.0"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "a5822ea47ebc52eec6323d8f1b60f6ec025daf99"; - sha256 = "sha256-gJhbkl19iilNyfCt2TfPmghYA3yCjg6kS+yk/x/k14Y="; + rev = "333783350cd3fe38f25fed1da7d6a433d8f85b77"; + sha256 = "sha256-N8Ju7pSGssvt84/0e1o6G/p7fWM1c0Mzw+ftL1/++J4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index defe218b119..ef2d97ef6bf 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -1,5 +1,5 @@ { lib, fetchzip, makeWrapper, makeDesktopItem, stdenv -, gtk3, libXtst, glib, zlib +, gtk3, libXtst, glib, zlib, wrapGAppsHook }: let @@ -25,7 +25,11 @@ in stdenv.mkDerivation rec { sha256 = "02a2y2mkfab5cczw8g604m61h4xr0apir49zbd1aq6mmgcgngw80"; }; - nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ gtk3 ]; + + nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; + + dontWrapGApps = true; phases = [ "installPhase" ]; @@ -36,6 +40,9 @@ in stdenv.mkDerivation rec { cp -r "$src" "$out/toolbox" chmod -R +w "$out/toolbox" + fixupPhase + gappsWrapperArgsHook + patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/toolbox/toolbox" @@ -52,7 +59,8 @@ in stdenv.mkDerivation rec { makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ --run "set -x; cd $out/toolbox" \ --add-flags "-data ~/.tla-toolbox" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk3 libXtst glib zlib ]}" \ + "''${gappsWrapperArgs[@]}" echo -e "\nCreating TLA Toolbox icons..." pushd "$src" diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 565c6a17672..08bf84be7c8 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { let pp = python.pkgs; in ([ pp.numpy pp.scipy pp.scikitimage pp.h5py pp.matplotlib pp.ipython pp.networkx pp.nose - pp.pandas pp.dateutil pp.protobuf pp.gflags + pp.pandas pp.python-dateutil pp.protobuf pp.gflags pp.pyyaml pp.pillow pp.six ] ++ lib.optional leveldbSupport pp.leveldb) ); diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 56b6df94e8f..7807ae613e8 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-hE0di7B6dCnMmMBLgFkb6vPS4hS/7zD6BbviIucrn1I="; + sha256 = "1nrx7gp6f1yalbdda1gb97azhbr4xclq2xf08vvbvsk8jfd6fd2v"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/math/sage/patches/sphinx-3.5-code-output.patch b/pkgs/applications/science/math/sage/patches/sphinx-3.5-code-output.patch deleted file mode 100644 index f17897d4c89..00000000000 --- a/pkgs/applications/science/math/sage/patches/sphinx-3.5-code-output.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py -index 6bad826a88..f4d7b8651c 100644 ---- a/src/sage/misc/sagedoc.py -+++ b/src/sage/misc/sagedoc.py -@@ -24,7 +24,7 @@ see :trac:`12849`:: - ....: for line in fobj: - ....: if "#sage.symbolic.expression.Expression.numerical_approx" in line: - ....: print(line) -- <code class="sig-name descname">numerical_approx</code><span class="sig-paren">(</span><em class="sig-param"><span class="n">prec</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="n">digits</span><span class="o">=</span><span class="default_value">None</span></em>, <em class="sig-param"><span class="n">algorithm</span><span class="o">=</span><span class="default_value">None</span></em><span class="sig-paren">)</span>... -+ <code class="sig-name descname"><span class="pre">numerical_approx</span></code><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">prec</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">digits</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em>, <em class="sig-param"><span class="n"><span class="pre">algorithm</span></span><span class="o"><span class="pre">=</span></span><span class="default_value"><span class="pre">None</span></span></em><span class="sig-paren">)</span>... - - Check that sphinx is not imported at Sage start-up:: - diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 57234c660a5..1ed174ebd46 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -16,7 +16,12 @@ let fetchSageDiff = { base, name, rev, sha256, ...}@args: ( fetchpatch ({ inherit name sha256; - url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}"; + + # We used to use + # "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}" + # but the former way does not squash multiple patches together. + url = "https://github.com/sagemath/sage/compare/${base}...${rev}.diff"; + # We don't care about sage's own build system (which builds all its dependencies). # Exclude build system changes to avoid conflicts. excludes = [ "build/*" ]; @@ -79,13 +84,6 @@ stdenv.mkDerivation rec { # ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests ./patches/ignore-cmp-deprecation.patch - # sphinx 3.5 pretty-prints code slightly differently than sphinx - # 3.1--3.3. a similar patch is available at the sphinx 4 ticket - # (https://trac.sagemath.org/ticket/31696), but sphinx 3.5 uses - # <code> tags while sphinx 4 uses <span> tags so we cannot just - # import the patch from trac. - ./patches/sphinx-3.5-code-output.patch - # remove use of matplotlib function deprecated in 3.4 # https://trac.sagemath.org/ticket/31827 (fetchSageDiff { @@ -95,16 +93,38 @@ stdenv.mkDerivation rec { sha256 = "sha256-SXcUGBMOoE9HpuBzgKC3P6cUmM5MiktXbe/7dVdrfWo="; }) - # https://trac.sagemath.org/ticket/30801. this patch has - # positive_review but has not been merged upstream yet, so we - # don't use fetchSageDiff because it returns a file that contains - # each commit as a separate patch instead of a single diff, and - # some commits from the pari update branch are already in 9.3.rc5 - # (auto-resolvable merge conflicts). - (fetchpatch { + # pari 2.13 update + # https://trac.sagemath.org/ticket/30801 + # + # the last commit in that ticket is + # c78b1470fccd915e2fa93f95f2fefba6220fb1f7, but commits after + # 10a4531721d2700fd717e2b3a1364508ffd971c3 only deal with 32-bit + # and post-26635 breakage, none of which is relevant to us. since + # there are post-9.4.beta0 rebases after that, we just skip later + # commits. + (fetchSageDiff { + base = "9.3"; name = "pari-2.13.1.patch"; - url = "https://github.com/sagemath/sagetrac-mirror/compare/d6c5cd9be78cc448ee4c54bac93385b1244a234c...10a4531721d2700fd717e2b3a1364508ffd971c3.diff"; - sha256 = "sha256-zMjRMEReoiTvmt+vvV0Ij1jtyLSLwSXBEVXqgvmq1D4="; + rev = "10a4531721d2700fd717e2b3a1364508ffd971c3"; + sha256 = "sha256-gffWKK9CMREaNOb5zb63iZUgON4FvsPrMQNqe+5ZU9E="; + }) + + # sympy 1.8 update + # https://trac.sagemath.org/ticket/31647 + (fetchSageDiff { + base = "9.4.beta0"; + name = "sympy-1.8.patch"; + rev = "fa864b36e15696450c36d54215b1e68183b29d25"; + sha256 = "sha256-fj/9QEZlVF0fw9NpWflkTuBSKpGjCE6b96ECBgdn77o="; + }) + + # sphinx 4 update + # https://trac.sagemath.org/ticket/31696 + (fetchSageDiff { + base = "9.4.beta3"; + name = "sphinx-4.patch"; + rev = "bc84af8c795b7da433d2000afc3626ee65ba28b8"; + sha256 = "sha256-5Kvs9jarC8xRIU1rdmvIWxQLC25ehiTLJpg5skh8WNM="; }) ]; diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix index c142ba12bc2..0fc85cea05c 100644 --- a/pkgs/applications/system/glances/default.nix +++ b/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.1.7"; + version = "3.2.0"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "sha256-82ZD32dqRYGbGM/uyaJ5VqVZbhDZthiEcTihkV43JOU="; + sha256 = "126xpx8i85giy3hkhqh0qcln9i1qj5bfciaqh9486rkl54xm8zsr"; }; # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): @@ -48,7 +48,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://nicolargo.github.io/glances/"; description = "Cross-platform curses-based monitoring tool"; - changelog = "https://github.com/nicolargo/glances/releases/tag/v${version}"; + changelog = "https://github.com/nicolargo/glances/blob/v${version}/NEWS.rst"; license = licenses.lgpl3Only; maintainers = with maintainers; [ jonringer primeos koral ]; }; diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix new file mode 100644 index 00000000000..31c256f46c8 --- /dev/null +++ b/pkgs/applications/system/qjournalctl/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, qtbase +, qmake +, pkg-config +, libssh +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "qjournalctl"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "pentix"; + repo = pname; + rev = "v${version}"; + sha256 = "0j27cmfq29mwrbjfrrwi6m1grcamhbfhk47xzlfsx5wr2q9m6qkz"; + }; + + postPatch = '' + substituteInPlace qjournalctl.pro --replace /usr/ $out/ + ''; + + nativeBuildInputs = [ + qmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + libssh + qtbase + ]; + + meta = with lib; { + description = "Qt-based graphical user interface for systemd's journalctl command"; + homepage = "https://github.com/pentix/qjournalctl"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ dtzWill srgom romildo ]; + }; +} diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index f69625e16cd..4f8d6832edd 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -26,7 +26,7 @@ }: let - version = "1.8.0"; + version = "1.8.1"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://codeberg.org/dnkl/${pname}/archive/${version}.tar.gz"; - sha256 = "07irlhkvziv51cp5zn1yz8ljfnrnfjcykv5pgfwmpslw3nl5szxv"; + sha256 = "0yrz7n0wls8g8w7ja934icwxmng3sxh70x87qmzc9c9cb1wyd989"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index df58b2162fc..3394d44a4be 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,95 +1,158 @@ -{ lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext +{ lib, stdenv, fetchurl, fetchpatch, python3Packages, makeWrapper, gettext, installShellFiles , re2Support ? true , rustSupport ? stdenv.hostPlatform.isLinux, rustPlatform -, guiSupport ? false, tk ? null +, fullBuild ? false +, gitSupport ? fullBuild +, guiSupport ? fullBuild, tk +, highlightSupport ? fullBuild , ApplicationServices }: let - inherit (python3Packages) docutils python fb-re2; + inherit (python3Packages) docutils python fb-re2 pygit2 pygments; -in python3Packages.buildPythonApplication rec { - pname = "mercurial"; - version = "5.8"; + self = python3Packages.buildPythonApplication rec { + pname = "mercurial"; + version = "5.8"; - src = fetchurl { - url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "17rhlmmkqz5ll3k68jfzpcifg3nndbcbc2nx7kw8xn3qcj7nlpgw"; - }; + src = fetchurl { + url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; + sha256 = "17rhlmmkqz5ll3k68jfzpcifg3nndbcbc2nx7kw8xn3qcj7nlpgw"; + }; + + patches = [ + # https://phab.mercurial-scm.org/D10638, needed for below patch to apply + (fetchpatch { + url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c365850b611490a5fdb235eb1cea310a542c2f84"; + sha256 = "1gn3xvahbjdhbglffqpmj559w1bkqqsk70wqcanwv7nh972aqy9g"; + }) + # https://phab.mercurial-scm.org/D10639, fixes https://bz.mercurial-scm.org/show_bug.cgi?id=6514 + (fetchpatch { + url = "https://www.mercurial-scm.org/repo/hg/raw-rev/c8f62920f07a40af3403ba9aefa1dac8a97d53ea"; + sha256 = "1kw0xjg2c4jby0ncarjvpa5qafsyl1wzbk6jxls4hnxlxdl53nmn"; + }) + ]; + + format = "other"; + + passthru = { inherit python; }; # pass it so that the same version can be used in hg2git + + cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "1kc2giqvfwsdl5fb0qmz96ws1gdrs3skfdzvpiif2i8f7r4nqlhd"; + sourceRoot = "${pname}-${version}/rust"; + } else null; + cargoRoot = if rustSupport then "rust" else null; + + propagatedBuildInputs = lib.optional re2Support fb-re2 + ++ lib.optional gitSupport pygit2 + ++ lib.optional highlightSupport pygments; + nativeBuildInputs = [ makeWrapper gettext installShellFiles ] + ++ lib.optionals rustSupport (with rustPlatform; [ + cargoSetupHook + rust.cargo + rust.rustc + ]); + buildInputs = [ docutils ] + ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; - patches = [ - # https://phab.mercurial-scm.org/D10638, needed for below patch to apply - (fetchpatch { - url = "https://phab.mercurial-scm.org/file/data/l7p2r4zcctcr3pzlybv2/PHID-FILE-bwjzxlz6sbegk3s4irik/D10638.diff"; - sha256 = "0mfi324is02l7cnd3j0gbmg5rpyyqn3afg3f73flnfwmz5njqa5f"; - }) - # https://phab.mercurial-scm.org/D10639, fixes https://bz.mercurial-scm.org/show_bug.cgi?id=6514 - (fetchpatch { - url = "https://phab.mercurial-scm.org/file/data/v53nhburhtkhpccyecei/PHID-FILE-6v34oll6r2gkqo4ng5nt/D10639.diff"; - sha256 = "0h5ilrd2x1789fr6sf4k1mcvxdh0xdyr94yawdacw87v3x12c8cb"; - }) - ]; - - format = "other"; - - passthru = { inherit python; }; # pass it so that the same version can be used in hg2git - - cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { - inherit src; - name = "${pname}-${version}"; - sha256 = "1kc2giqvfwsdl5fb0qmz96ws1gdrs3skfdzvpiif2i8f7r4nqlhd"; - sourceRoot = "${pname}-${version}/rust"; - } else null; - cargoRoot = if rustSupport then "rust" else null; - - propagatedBuildInputs = lib.optional re2Support fb-re2; - nativeBuildInputs = [ makeWrapper gettext ] - ++ lib.optionals rustSupport (with rustPlatform; [ - cargoSetupHook - rust.cargo - rust.rustc - ]); - buildInputs = [ docutils ] - ++ lib.optionals stdenv.isDarwin [ ApplicationServices ]; - - makeFlags = [ "PREFIX=$(out)" ] - ++ lib.optional rustSupport "PURE=--rust"; - - postInstall = (lib.optionalString guiSupport '' - mkdir -p $out/etc/mercurial - cp contrib/hgk $out/bin - cat >> $out/etc/mercurial/hgrc << EOF - [extensions] - hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py - EOF - # setting HG so that hgk can be run itself as well (not only hg view) - WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} - --set HG $out/bin/hg - --prefix PATH : ${tk}/bin " - '') + '' - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i \ - $WRAP_TK - done - - # copy hgweb.cgi to allow use in apache - mkdir -p $out/share/cgi-bin - cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin - chmod u+x $out/share/cgi-bin/hgweb.cgi - - # install bash/zsh completions - install -v -m644 -D contrib/bash_completion $out/share/bash-completion/completions/_hg - install -v -m644 -D contrib/zsh_completion $out/share/zsh/site-functions/_hg - ''; - - meta = with lib; { - inherit version; - description = "A fast, lightweight SCM system for very large distributed projects"; - homepage = "https://www.mercurial-scm.org"; - downloadPage = "https://www.mercurial-scm.org/release/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ eelco lukegb ]; - updateWalker = true; - platforms = platforms.unix; + makeFlags = [ "PREFIX=$(out)" ] + ++ lib.optional rustSupport "PURE=--rust"; + + postInstall = (lib.optionalString guiSupport '' + mkdir -p $out/etc/mercurial + cp contrib/hgk $out/bin + cat >> $out/etc/mercurial/hgrc << EOF + [extensions] + hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py + EOF + # setting HG so that hgk can be run itself as well (not only hg view) + WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix} + --set HG $out/bin/hg + --prefix PATH : ${tk}/bin " + '') + '' + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i \ + $WRAP_TK + done + + # copy hgweb.cgi to allow use in apache + mkdir -p $out/share/cgi-bin + cp -v hgweb.cgi contrib/hgweb.wsgi $out/share/cgi-bin + chmod u+x $out/share/cgi-bin/hgweb.cgi + + installShellCompletion --cmd hg \ + --bash contrib/bash_completion \ + --zsh contrib/zsh_completion + ''; + + passthru.tests = {}; + + meta = with lib; { + inherit version; + description = "A fast, lightweight SCM system for very large distributed projects"; + homepage = "https://www.mercurial-scm.org"; + downloadPage = "https://www.mercurial-scm.org/release/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ eelco lukegb ]; + updateWalker = true; + platforms = platforms.unix; + }; }; -} +in + self.overridePythonAttrs (origAttrs: { + passthru = origAttrs.passthru // rec { + # withExtensions takes a function which takes the python packages set and + # returns a list of extensions to install. + # + # for instance: mercurial.withExtension (pm: [ pm.hg-evolve ]) + withExtensions = f: let + python = self.python; + mercurialHighPrio = ps: (ps.toPythonModule self).overrideAttrs (oldAttrs: { + meta = oldAttrs.meta // { + priority = 50; + }; + }); + plugins = (f python.pkgs) ++ [ (mercurialHighPrio python.pkgs) ]; + env = python.withPackages (ps: plugins); + in stdenv.mkDerivation { + pname = "${self.pname}-with-extensions"; + + inherit (self) src version meta; + + buildInputs = self.buildInputs ++ self.propagatedBuildInputs; + nativeBuildInputs = self.nativeBuildInputs; + + phases = [ "installPhase" "installCheckPhase" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + for bindir in ${lib.concatStringsSep " " (map (d: "${lib.getBin d}/bin") plugins)}; do + for bin in $bindir/*; do + ln -s ${env}/bin/$(basename $bin) $out/bin/ + done + done + + ln -s ${self}/share $out/share + + runHook postInstall + ''; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/hg help >/dev/null || exit 1 + + runHook postInstallCheck + ''; + }; + + tests = origAttrs.passthru.tests // { + withExtensions = withExtensions (pm: [ pm.hg-evolve ]); + }; + }; + }) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index a51e8c199bc..d7aa8c8f068 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.48"; + version = "1.0.0-alpha.50"; src = fetchCrate { inherit version pname; - sha256 = "09sz5665nwj2jppx2695hbwdqr3ws6z6rg7mmc4ldb7hkp4yilig"; + sha256 = "1hinnpbk83470sdif11v1wy1269jm7cpl0ycj2m89cxwk5g54cxg"; }; - cargoSha256 = "1v5w5za7l3hy9anz136x0vgdmgg090f5sawzgrg5ylgxy2l9s2gn"; + cargoSha256 = "0bc116nyykq8ddy7lnhxibx6hphn344d0fs7fbl2paax9ahbh2g0"; cargoBuildFlags = lib.optional gitImportSupport "--features=git"; diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index a0fa9318a13..17cde4c8a54 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -1,25 +1,16 @@ { lib, fetchurl, python3Packages , mercurial, qt5 -}@args: +}: let tortoisehgSrc = fetchurl rec { meta.name = "tortoisehg-${meta.version}"; - meta.version = "5.6"; + meta.version = "5.8"; url = "https://www.mercurial-scm.org/release/tortoisehg/targz/tortoisehg-${meta.version}.tar.gz"; - sha256 = "031bafj88wggpvw0lgvl0djhlbhs9nls9vzwvni8yn0m0bgzc9gr"; + sha256 = "154q7kyrdk045wx7rsblzx41k3wbvp2f40kzkxmiiaa5n35srsm3"; }; - tortoiseMercurial = (mercurial.override { - rustSupport = false; - re2Support = lib.versionAtLeast tortoisehgSrc.meta.version "5.8"; - }).overridePythonAttrs (old: rec { - inherit (tortoisehgSrc.meta) version; - src = fetchurl { - url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1hk2y30zzdnlv8f71kabvh0xi9c7qhp28ksh20vpd0r712sv79yz"; - }; - patches = []; - }); + # Extension point for when thg's mercurial is lagging behind mainline. + tortoiseMercurial = mercurial; in python3Packages.buildPythonApplication { inherit (tortoisehgSrc.meta) name version; @@ -49,7 +40,7 @@ in python3Packages.buildPythonApplication { meta = { description = "Qt based graphical tool for working with Mercurial"; homepage = "https://tortoisehg.bitbucket.io/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ danbst ]; }; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index da18a8d7abe..9ab35b92a86 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -72,6 +72,6 @@ in mkDerivation { license = licenses.unfree; homepage = "http://makemkv.com"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ danieldk titanous ]; + maintainers = with maintainers; [ titanous ]; }; } diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix index df42bbec156..d7e1e03733c 100644 --- a/pkgs/applications/video/pyca/default.nix +++ b/pkgs/applications/video/pyca/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, pycurl, dateutil, configobj, sqlalchemy, sdnotify, flask }: +{ lib, buildPythonApplication, fetchFromGitHub, pycurl, python-dateutil, configobj, sqlalchemy, sdnotify, flask }: buildPythonApplication rec { pname = "pyca"; @@ -13,7 +13,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pycurl - dateutil + python-dateutil configobj sqlalchemy sdnotify diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index ed597615130..6098aeba051 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -24,11 +24,11 @@ with lib; stdenv.mkDerivation rec { pname = "${optionalString onlyLibVLC "lib"}vlc"; - version = "3.0.12"; + version = "3.0.16"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/vlc-${version}.tar.xz"; - sha256 = "0ygqihw2c5vvzv8950dlf7rdwz1cpz1668jgyja604ljibrmix7g"; + sha256 = "sha256-/641/GT2JcF1Vx0jRrxfYge+mXYlF/FUI+dPGDmUEPY="; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index f6d7ce3d619..cbd7d8e5512 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - version = "0.23"; + version = "0.24"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "sha256-JQNidKqJROFVm+O1exTDon1fwU91zONqgKJIpe9gspY="; + sha256 = "sha256-kdaVlwE3vdCxsmJTOUwx8J+9UcBuXbKDwS2MHX2ZPPM="; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index ba7228f5b96..08b3a9834b6 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -39,7 +39,7 @@ python37Packages.buildPythonApplication rec { cairocffi-xcffib setuptools setuptools-scm - dateutil + python-dateutil dbus-python mpd2 psutil diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index acfbb1ad36b..8c1ae0b3592 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc +, meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, systemd }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace "version: '1.5'" "version: '${version}'" ''; - nativeBuildInputs = [ meson ninja pkg-config scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols systemd ]; mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=enabled" ]; diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 9b1523421ee..6dccedad827 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, meson, ninja, pkg-config, scdoc +, meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { --replace "version: '1.4'" "version: '${version}'" ''; - nativeBuildInputs = [ meson ninja pkg-config scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; mesonFlags = [ diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 9369e7d3158..ffe5d69ec90 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -117,7 +117,8 @@ rec { --tmpdir=$TMPDIR \ --override-os ${os} \ --override-arch ${arch} \ - copy "$sourceURL" "docker-archive://$out:$destNameTag" + copy "$sourceURL" "docker-archive://$out:$destNameTag" \ + | cat # pipe through cat to force-disable progress bar ''; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix index 44b40c72b58..6639cb57d8b 100644 --- a/pkgs/data/fonts/charis-sil/default.nix +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "5.000"; + version = "6.000"; in fetchzip rec { name = "charis-sil-${version}"; @@ -14,7 +14,7 @@ in unzip -j $downloadedFile \*OFL.txt \*OFL-FAQ.txt \*README.txt \*FONTLOG.txt -d "$out/share/doc/${name}" ''; - sha256 = "1a220s8n0flvcdkazqf5g10v6r55s2an308slvvarynpj6l7x27n"; + sha256 = "sha256-eMmC893rI42qzZVCI17i9XSAbQzXCK2fHVe5Pf1/VnM="; meta = with lib; { homepage = "https://software.sil.org/charis"; diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index 3622e1c3b3c..9d0daf7182d 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "5.000"; + version = "6.000"; in fetchzip rec { name = "gentium-${version}"; @@ -10,12 +10,20 @@ in fetchzip rec { postFetch = '' mkdir -p $out/share/{doc,fonts} unzip -l $downloadedFile - unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*/FONTLOG.txt \*/GENTIUM-FAQ.txt \*/README.txt -d $out/share/doc/${name} - unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation + unzip -j $downloadedFile \*.ttf \ + -d $out/share/fonts/truetype + unzip -j $downloadedFile \ + \*/FONTLOG.txt \ + \*/README.txt \ + -d $out/share/doc/${name} + unzip -j $downloadedFile \ + \*/documentation/\*.html \ + \*/documentation/\*.txt \ + -x \*/documentation/source/\* \ + -d $out/share/doc/${name}/documentation ''; - sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp"; + sha256 = "zhSpAYK3Lfzsx6Z1IA6aRFNNXdDGq/jWxsQ20c2HcxI="; meta = with lib; { homepage = "https://software.sil.org/gentium/"; diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 322dcfd68c9..bc8396a7a21 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.55.1"; + version = "0.55.2"; in fetchzip { name = "sudo-font-${version}"; url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - sha256 = "17vmcdz73mvy5m5zblgm2fi98v520hsl4lglww8gkhzl5zc6wb9y"; + sha256 = "0r7w58r80yblyzlh6qb57pmafxb3frg1iny644bfr3p64j4cbzzb"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index f9d25a0128e..1a65798891f 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "4.47.0"; + version = "4.49.1"; in fetchzip { name = "terminus-font-ttf-${version}"; @@ -18,7 +18,7 @@ in fetchzip { install -Dm 644 COPYING "$out/share/doc/terminus-font-ttf/COPYING" ''; - sha256 = "1mnx3vlnl0r15yzsa4zb9qqab4hpi603gdwhlbw960wg03i3xn8z"; + sha256 = "sha256-UaTnCamIRN/3xZsYt5nYzvykXQ3ri94a047sWOJ2RfU="; meta = with lib; { description = "A clean fixed width TTF font"; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index e7543aff666..adc2c5fb197 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210601"; + version = "20210701"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-AX51udzIv/DO0n8ba2Gm6Leikep6x4tgUuRUdPX/Cds="; + sha256 = "sha256-eqSZBcypwnNX92SGG17MWlnsVzk0jOTdjtEaWMbQsMs="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/misc/fedora-backgrounds/generic.nix b/pkgs/data/misc/fedora-backgrounds/generic.nix index 3e2e0928c3b..5ebc6ff367e 100644 --- a/pkgs/data/misc/fedora-backgrounds/generic.nix +++ b/pkgs/data/misc/fedora-backgrounds/generic.nix @@ -38,6 +38,6 @@ stdenvNoCC.mkDerivation { description = "A set of default and supplemental wallpapers for Fedora"; license = licenses.cc-by-sa-40; platforms = platforms.unix; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 8a8cfa74d70..b44bcc92378 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "8005ce7c7ba90fa92db65f86c544623353a96cf8", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8005ce7c7ba90fa92db65f86c544623353a96cf8.tar.gz", - "sha256": "1kzhh7h0csb0vh9avbjsm6hziaa3lbpmzp4pkij4s3bbl4l664aa", - "msg": "Update from Hackage at 2021-06-22T07:13:30Z" + "commit": "1567e96c400fcd62dfc0d9412881591d6e1e9f22", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1567e96c400fcd62dfc0d9412881591d6e1e9f22.tar.gz", + "sha256": "04z26ypfp3nip2x6gwrv5k1lmckmmi03ry3z97syc72qqj59n9hq", + "msg": "Update from Hackage at 2021-06-26T12:56:56Z" } diff --git a/pkgs/data/misc/rime-data/default.nix b/pkgs/data/misc/rime-data/default.nix new file mode 100644 index 00000000000..371a07d3ec1 --- /dev/null +++ b/pkgs/data/misc/rime-data/default.nix @@ -0,0 +1,66 @@ +{ lib, stdenv, fetchFromGitHub, librime }: + +stdenv.mkDerivation { + pname = "rime-data"; + version = "0.38.20210628"; + + src = fetchFromGitHub { + owner = "rime"; + repo = "plum"; + rev = "0b835e347cad9c2d7038cfe82df5b5d1fe1c0327"; + sha256 = "0mja4wyazxdc6fr7pzij5ah4rzwxv4s12s64vfn5ikx1ias1f8ib"; + }; + + buildInputs = [ librime ]; + + buildFlags = [ "all" ]; + makeFlags = [ "PREFIX=$(out)" ]; + + preBuild = import ./fetchSchema.nix fetchFromGitHub; + + postPatch = '' + # Disable git operations. + sed -i /fetch_or_update_package$/d scripts/install-packages.sh + ''; + + meta = with lib; { + description = "Schema data of Rime Input Method Engine"; + longDescription = '' + Rime-data provides schema data for Rime Input Method Engine. + ''; + homepage = "https://rime.im"; + license = with licenses; [ + # rime-array + # rime-combo-pinyin + # rime-double-pinyin + # rime-middle-chinese + # rime-scj + # rime-soutzoe + # rime-stenotype + # rime-wugniu + gpl3Only + + # plum + # rime-bopomofo + # rime-cangjie + # rime-emoji + # rime-essay + # rime-ipa + # rime-jyutping + # rime-luna-pinyin + # rime-prelude + # rime-quick + # rime-stroke + # rime-terra-pinyin + # rime-wubi + lgpl3Only + + # rime-pinyin-simp + asl20 + + # rime-cantonese + cc-by-40 + ]; + maintainers = [ maintainers.pengmeiyu ]; + }; +} diff --git a/pkgs/data/misc/rime-data/fetchSchema.nix b/pkgs/data/misc/rime-data/fetchSchema.nix new file mode 100644 index 00000000000..7bf7d8477c5 --- /dev/null +++ b/pkgs/data/misc/rime-data/fetchSchema.nix @@ -0,0 +1,137 @@ +# Generated using generateFetchSchema.sh +fetchFromGitHub: +'' +mkdir -p package/rime +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-array"; + rev = "8514193da939bc8888ad6a744f5e5921d4baebc7"; + sha256 = "1fy7pcq7d8m0wzkkhklmv6p370ms9lqc1zpndyy2xjamzrbb9l83"; +}} package/rime/array +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-bopomofo"; + rev = "c7618f4f5728e1634417e9d02ea50d82b71956ab"; + sha256 = "0g77nv0jrwqnbqqna0ib0kqcy6l5zl62kh49ny67d6bjwnwz9186"; +}} package/rime/bopomofo +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-cangjie"; + rev = "8dfad9e537f18821b71ba28773315d9c670ae245"; + sha256 = "029kw9nx6x0acg4f0m8wj1ziqffffhy9yyj51nlx17cnia0qcrby"; +}} package/rime/cangjie +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-cantonese"; + rev = "b6f800c74eb639816d56d0d5601aaa96c8963178"; + sha256 = "1a4ksacbz8l30y3y5c017d0hzwik8knplglb3yswy7l4hsvaanyh"; +}} package/rime/cantonese +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-combo-pinyin"; + rev = "a84065a86b272c76215215bd6f03c506b6e7097c"; + sha256 = "1f0b4kakw0x26gmx7xi4f94nbjlb8lvi9bks4f92jswa045vnd87"; +}} package/rime/combo-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-double-pinyin"; + rev = "69bf85d4dfe8bac139c36abbd68d530b8b6622ea"; + sha256 = "093wif5avvvw45fqbwj5wkbxrychy4pagl4mwsmbrayc8jkp69ak"; +}} package/rime/double-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-emoji"; + rev = "4c8c51f4a3bc7298c99376eda9bbd86070fc4fa1"; + sha256 = "0175jqh210fncafqckr9zzaw55qpswmqjrykwms1apmc68l43122"; +}} package/rime/emoji +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-essay"; + rev = "9db2e77305e75798baf3ec8dcf1f82785b5e1be9"; + sha256 = "03ypkkaadd5qmyg26n24a66cll90xvcimgbmiyv4d33jradiqg22"; +}} package/rime/essay +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-ipa"; + rev = "22b71710e029bcb412e9197192a638ab11bc2abf"; + sha256 = "0zdk4f9qkfj3q5hmjnairj1lv6f6y27mic12k886n6sxywwbwr2k"; +}} package/rime/ipa +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-jyutping"; + rev = "1e24baa6998815c716c581effe8ec65ee87c4e8c"; + sha256 = "0s2rckpwlrm3n7w1csnqyi5p9mkpp3z87s7mrm2vc9sv06rpv7zl"; +}} package/rime/jyutping +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-luna-pinyin"; + rev = "623adb022b094d540218b287c2e601509eee3347"; + sha256 = "06pcwp09l5wkqv7792gbsl31xnlb3gr9q6bgbp94vvq6m2ycahqz"; +}} package/rime/luna-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-middle-chinese"; + rev = "9fad7a7c0c26167d5e6e85db8df48a15c7f7d4f0"; + sha256 = "0a0bqrlzg0k692xblqnh1rh1fwwqqb205xwxlihgji85n8ibcgph"; +}} package/rime/middle-chinese +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-pinyin-simp"; + rev = "b0e84cda02c613ebdedc127a26131b3800f45a8e"; + sha256 = "05v804qr3a9xvjzp9yid7231fi2l2yrl47ybbvql61z9k36ab094"; +}} package/rime/pinyin-simp +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-prelude"; + rev = "3de303ffaa731dba07b0462ce59f4767e1219ad2"; + sha256 = "0g7a0bla58rh1v3md59k6adk185pilb4z8i2i0pqdl4nwqp40n2p"; +}} package/rime/prelude +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-quick"; + rev = "3fe5911ba608cb2df1b6301b76ad1573bd482a76"; + sha256 = "08bh87ym5qvw55lyw20l3m7jd4c2z5rvil8h5q8790r7z6j6ijy9"; +}} package/rime/quick +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-scj"; + rev = "cab5a0858765eff0553dd685a2d61d5536e9149c"; + sha256 = "0ard2bjp4896a8dimmcwyjwgmp9kl4rz92yc92jnd3y4rgwl6fvk"; +}} package/rime/scj +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-soutzoe"; + rev = "beeaeca72d8e17dfd1e9af58680439e9012987dc"; + sha256 = "0jyqx0q9s0qxn168l5n8zav8jcl2g5ppr7pa8jm1vwrllf20slcc"; +}} package/rime/soutzoe +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-stenotype"; + rev = "f3e9189d5ce33c55d3936cc58e39d0c88b3f0c88"; + sha256 = "0dl6px7lrh3xa87knjzwzdcwjj1k1dg4l72q7lb48an4s9f1cy5d"; +}} package/rime/stenotype +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-stroke"; + rev = "ea8576d1accd6fda339e96b415caadb56e2a07d1"; + sha256 = "07h6nq9867hjrd2v3h1pnr940sdrw4mqrzj43siz1rzjxz3s904r"; +}} package/rime/stroke +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-terra-pinyin"; + rev = "ce7b9249612f575d2f43d51fcacd31d1b4e0ef1b"; + sha256 = "0vm303f4lrdmdmif5klrp6w29vn9z2vzw33cw0y83pcnz39wiads"; +}} package/rime/terra-pinyin +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-wubi"; + rev = "f1876f08f1d4a9696395be0070c0e8e4353c44cb"; + sha256 = "1d9y9rqssacria9d0hla96czsqv2wkfm6z926m1x269ryv96zxvk"; +}} package/rime/wubi +ln -sv ${fetchFromGitHub { + owner = "rime"; + repo = "rime-wugniu"; + rev = "abd1ee98efbf170258fcf43875c21a4259e00b61"; + sha256 = "0qn54d3cclny106ixdw08r5n6wn52ffs1hgrma3k0j4pv0kr9nlq"; +}} package/rime/wugniu +'' diff --git a/pkgs/data/misc/rime-data/generateFetchSchema.sh b/pkgs/data/misc/rime-data/generateFetchSchema.sh new file mode 100755 index 00000000000..e7c05c41028 --- /dev/null +++ b/pkgs/data/misc/rime-data/generateFetchSchema.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix-prefetch-git -p jq + +imlist=( + array + bopomofo + cangjie + cantonese + combo-pinyin + double-pinyin + emoji + essay + ipa + jyutping + luna-pinyin + middle-chinese + pinyin-simp + prelude + quick + scj + soutzoe + stenotype + stroke + terra-pinyin + wubi + wugniu +) + +echo "# Generated using generateFetchSchema.sh" +echo "fetchFromGitHub:" +echo \'\' +echo "mkdir -p package/rime" +for im in ${imlist[@]}; do + tempFile=$(mktemp) + echo "ln -sv \${fetchFromGitHub {" + echo " owner = \"rime\";" + echo " repo = \"rime-$im\";" + nix-prefetch-git --quiet https://github.com/rime/rime-$im \ + | jq '{ rev: .rev, sha256: .sha256 }' \ + | jq -r 'to_entries | map(" \(.key) = \"\(.value)\";") | .[]' + echo "}} package/rime/$im" +done +echo \'\' diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 16d4e1400e3..511cb6a1c09 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - sha256 = "sha256-cO6AhQ0g1N43du74fljfI1M68jb9N04FKUyzjbzC3K0="; + sha256 = "sha256-+3OoeuGuyiHWlUrxm5A7CmNR+ijxdlmecmvqk+i+h08="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index b529a65026d..ae2255acb91 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -339,8 +339,6 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) gnome-user-docs; # added 2019-11-20 - inherit (pkgs) gegl_0_4; # added 2019-10-31 - inherit (pkgs) gjs; # added 2019-01-05 inherit (pkgs) yelp-tools; # added 2019-11-20 diff --git a/pkgs/development/beam-modules/rebar3-nix/default.nix b/pkgs/development/beam-modules/rebar3-nix/default.nix index ff248700d78..50bd2965835 100644 --- a/pkgs/development/beam-modules/rebar3-nix/default.nix +++ b/pkgs/development/beam-modules/rebar3-nix/default.nix @@ -1,12 +1,12 @@ { lib, buildRebar3, fetchFromGitHub }: buildRebar3 rec { name = "rebar3_nix"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "erlang-nix"; repo = name; rev = "v${version}"; - sha256 = "17w8m4aqqgvhpx3xyc7x2qzsrd3ybzc83ay50zs1gyd1b8csh2wf"; + sha256 = "10ijc06qvv5hqv0qy3w7mbv9pshdb8bvy0f3phr1vd5hksbk731y"; }; meta = { diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index be03f53a76e..e85404c58b5 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -1,8 +1,9 @@ -{ stdenv, lib, fetchFromGitHub }: +{ stdenv, lib, jekyll, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "jsonnet"; version = "0.17.0"; + outputs = ["out" "doc"]; src = fetchFromGitHub { rev = "v${version}"; @@ -11,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "1ddz14699v5lqx3dh0mb7hfffr6fk5zhmzn3z8yxkqqvriqnciim"; }; + nativeBuildInputs = [ jekyll ]; + enableParallelBuilding = true; makeFlags = [ @@ -19,12 +22,19 @@ stdenv.mkDerivation rec { "libjsonnet.so" ]; + # Upstream writes documentation in html, not in markdown/rst, so no + # other output formats, sorry. + preBuild = '' + jekyll build --source ./doc --destination ./html + ''; + installPhase = '' - mkdir -p $out/bin $out/lib $out/include + mkdir -p $out/bin $out/lib $out/include $out/share/doc/jsonnet cp jsonnet $out/bin/ cp jsonnetfmt $out/bin/ cp libjsonnet*.so $out/lib/ cp -a include/*.h $out/include/ + cp -r ./html $out/share/doc/jsonnet ''; meta = { diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index 30e273271ae..0b88bc1ab1c 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -4,12 +4,12 @@ , parsec, process, regex-compat, text, time }: let - version = "2.1.4"; + version = "2.1.9"; src = fetchFromGitHub { owner = "koka-lang"; repo = "koka"; rev = "v${version}"; - sha256 = "sha256-MPMA8ZErEKv1SrkliLsy35k88GrdsPqIK6yokQreIjE="; + sha256 = "0xny4x1a2lzwgmng60bni7rxfjx5ns70qbfp703qwms54clvj5wy"; fetchSubmodules = true; }; kklib = stdenv.mkDerivation { diff --git a/pkgs/development/compilers/llvm/12/clang/default.nix b/pkgs/development/compilers/llvm/12/clang/default.nix index dbd6ea1e1ac..87cdca834ea 100644 --- a/pkgs/development/compilers/llvm/12/clang/default.nix +++ b/pkgs/development/compilers/llvm/12/clang/default.nix @@ -17,6 +17,9 @@ let mv clang-* clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} + mv clang-tools-extra-* $sourceRoot/tools/extra + substituteInPlace $sourceRoot/tools/extra/clangd/quality/CompletionModel.cmake \ + --replace ' ''${CMAKE_SOURCE_DIR}/../clang-tools-extra' ' ''${CMAKE_SOURCE_DIR}/tools/extra' ''; nativeBuildInputs = [ cmake python3 ] diff --git a/pkgs/development/compilers/llvm/rocm/clang.nix b/pkgs/development/compilers/llvm/rocm/clang.nix index 6ab0f894ca9..45c0bfda192 100644 --- a/pkgs/development/compilers/llvm/rocm/clang.nix +++ b/pkgs/development/compilers/llvm/rocm/clang.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { description = "ROCm fork of the clang C/C++/Objective-C/Objective-C++ LLVM compiler frontend"; homepage = "https://llvm.org/"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/llvm/rocm/lld/default.nix b/pkgs/development/compilers/llvm/rocm/lld/default.nix index ef60747b013..c8ca83f76c1 100644 --- a/pkgs/development/compilers/llvm/rocm/lld/default.nix +++ b/pkgs/development/compilers/llvm/rocm/lld/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "ROCm fork of the LLVM Linker"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; license = licenses.ncsa; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/llvm/rocm/llvm/default.nix b/pkgs/development/compilers/llvm/rocm/llvm/default.nix index b3e8c06195f..6d1ff664972 100644 --- a/pkgs/development/compilers/llvm/rocm/llvm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/llvm/default.nix @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { description = "ROCm fork of the LLVM compiler infrastructure"; homepage = "https://github.com/RadeonOpenCompute/llvm-project"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/coq-modules/itauto/default.nix b/pkgs/development/coq-modules/itauto/default.nix new file mode 100644 index 00000000000..66791b13061 --- /dev/null +++ b/pkgs/development/coq-modules/itauto/default.nix @@ -0,0 +1,24 @@ +{ lib, mkCoqDerivation, coq, version ? null }: +with lib; + +mkCoqDerivation rec { + pname = "itauto"; + owner = "fbesson"; + domain = "gitlab.inria.fr"; + + release."8.13+no".sha256 = "sha256-gXoxtLcHPoyjJkt7WqvzfCMCQlh6kL2KtCGe3N6RC/A="; + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.13"; out = "8.13+no"; } + ] null; + + mlPlugin = true; + extraBuildInputs = (with coq.ocamlPackages; [ ocamlbuild ]); + enableParallelBuilding = false; + + meta = { + description = "A reflexive SAT solver parameterised by a leaf tactic and Nelson-Oppen support"; + maintainers = with maintainers; [ siraben ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1c3cbbbbe31..b6e5274be00 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -706,10 +706,6 @@ self: super: { uuid-types = doJailbreak super.uuid-types; uuid = doJailbreak super.uuid; - # Bypass version check for random < 1.2 (1.2 works fine). - # https://github.com/yeyan/xmonad-wallpaper/issues/2 - xmonad-wallpaper = doJailbreak super.xmonad-wallpaper; - # The tests spuriously fail libmpd = dontCheck super.libmpd; @@ -1936,4 +1932,12 @@ EOT # https://github.com/dagit/zenc/issues/5 zenc = doJailbreak super.zenc; + # Indeterministic tests + # Fixed on upstream: https://github.com/softwarefactory-project/matrix-client-haskell/commit/4ca4963cfd06379d9bdce49742af854aed6a0d37 + matrix-client = dontCheck super.matrix-client; + + # Flakey tests + # upstream https://github.com/circuithub/rel8/issues/86 + rel8 = dontCheck super.rel8; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 0c4b46360ba..492af32edb1 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -173,6 +173,7 @@ self: super: { hls-brittany-plugin = dontCheck super.hls-brittany-plugin; hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; hls-module-name-plugin = dontCheck super.hls-module-name-plugin; + hls-splice-plugin = dontCheck super.hls-splice-plugin; # We are lacking pure pgrep at the moment for tests to work tmp-postgres = dontCheck super.tmp-postgres; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d960d4ed8f0..f21266e5004 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -617,6 +617,7 @@ broken-packages: - chunky - church - church-maybe + - churros - cielo - cil - cinvoke @@ -1640,7 +1641,6 @@ broken-packages: - gitter - git-vogue - gi-vips - - gi-wnck - glade - glapp - Gleam @@ -2289,6 +2289,7 @@ broken-packages: - hs-rs-notify - hs-scrape - hsseccomp + - hssh - hs-snowtify - hs-speedscope - hsSqlite3 @@ -2453,6 +2454,7 @@ broken-packages: - initialize - inject-function - inline-asm + - inline-r - inserts - instana-haskell-trace-sdk - instance-map @@ -2963,6 +2965,7 @@ broken-packages: - mi - miconix-test - microbase + - microformats2-parser - microgroove - microlens-each - micrologger @@ -3597,6 +3600,7 @@ broken-packages: - plat - platinum-parsing - PlayingCards + - plex - plist - plist-buddy - plot-gtk @@ -3979,6 +3983,7 @@ broken-packages: - reversi - ReviewBoard - rewrite-inspector + - rfc - rfc-prelude - rhbzquery - ribbit @@ -4869,6 +4874,7 @@ broken-packages: - turing-music - turtle-options - tweak + - twee - twentefp-websockets - twfy-api-client - twhs diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index fa4e798d1d3..45d0bdcd0cb 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -218,6 +218,7 @@ package-maintainers: - hlint - hmatrix - iCalendar + - matrix-client - neuron - optics - reflex-dom @@ -356,6 +357,7 @@ unsupported-platforms: gi-ibus: [ x86_64-darwin ] gi-ostree: [ x86_64-darwin ] gi-vte: [ x86_64-darwin ] + gi-wnck: [ x86_64-darwin ] gnome-keyring: [ x86_64-darwin ] gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ] gtk-sni-tray: [ x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 5c38f0b040f..fdad31819ac 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -5,35 +5,395 @@ dont-distribute-packages: - 4Blocks - - a50 - - abcBridge + - AC-Vector-Fancy + - ADPfusionForest + - ADPfusionSet + - AERN-Net + - AERN-Real + - AERN-Real-Double + - AERN-Real-Interval + - AERN-RnToRm + - AERN-RnToRm-Plot + - ASN1 - AbortT-monadstf - AbortT-mtl + - Advgame + - Advise-me + - AlgoRhythm + - AlignmentAlgorithms + - AndroidViewHierarchyImporter + - Annotations + - ApplePush + - AttoJson + - AutoForms + - AvlTree + - BASIC + - Barracuda + - BerlekampAlgorithm + - BioHMM + - Biobase + - BiobaseBlast + - BiobaseDotP + - BiobaseENA + - BiobaseEnsembl + - BiobaseFR3D + - BiobaseFasta + - BiobaseHTTP + - BiobaseHTTPTools + - BiobaseInfernal + - BiobaseMAF + - BiobaseTrainingData + - BiobaseTurner + - BiobaseTypes + - BiobaseVienna + - BiobaseXNA + - BirdPP + - Bitly + - BlastHTTP + - Blobs + - BlogLiterately + - BlogLiterately-diagrams + - Bookshelf + - CBOR + - CC-delcont-alt + - CMCompare + - CPBrainfuck + - CPL + - CSPM-Interpreter + - CSPM-ToProlog + - CSPM-cspm + - CarneadesIntoDung + - Chart-fltkhs + - ClustalParser + - Coadjute + - Combinatorrent + - ComonadSheet + - Condor + - Configger + - Control-Monad-MultiPass + - CoreFoundation + - DMuCheck + - DOM + - DP + - DSH + - DSTM + - Dangerous + - DarcsHelpers + - DefendTheKing + - DifferenceLogic + - DisTract + - DnaProteinAlignment + - DocTest + - DrHylo + - Dust + - Dust-tools + - Dust-tools-pcap + - DysFRP-Cairo + - DysFRP-Craftwerk + - EditTimeReport + - EntrezHTTP + - EsounD + - EtaMOO + - Etage-Graph + - Eternal10Seconds + - Etherbunny + - EventSocket + - FComp + - FM-SBLEX + - FTPLine + - Facts + - FailureT + - FermatsLastMargin + - FieldTrip + - FilePather + - Finance-Treasury + - FiniteMap + - FirstOrderTheory + - Flippi + - Forestry + - FormalGrammars + - Foster + - Frames-beam + - Frames-dsv + - Frank + - GLFW-OGL + - GLFW-task + - GPX + - GPipe-Collada + - GPipe-Examples + - GPipe-GLFW + - GPipe-GLFW4 + - GPipe-TextureLoad + - Gamgine + - GeBoP + - GenI + - GenSmsPdu + - Genbank + - Gene-CluEDO + - GenussFold + - GlomeView + - GoogleDirections + - GoogleSB + - GoogleTranslate + - GrammarProducts + - GraphHammer + - GraphHammer-examples + - GrowlNotify + - Gtk2hsGenerics + - GtkGLTV + - GuiHaskell + - GuiTV + - H + - HAppS-Data + - HAppS-IxSet + - HAppS-Server + - HAppS-State + - HGamer3D-API + - HGamer3D-CAudio-Binding + - HGamer3D-OIS-Binding + - HJScript + - HLearn-algebra + - HLearn-approximation + - HLearn-classification + - HLearn-datastructures + - HLearn-distributions + - HNM + - HPlot + - HPong + - HROOT + - HROOT-core + - HROOT-graf + - HROOT-hist + - HROOT-io + - HROOT-math + - HROOT-tree + - HRay + - HSGEP + - HSHHelpers + - HSoundFile + - HStringTemplateHelpers + - HTab + - HXMPP + - HaMinitel + - HaRe + - HaTeX-meta + - HaTeX-qq + - HaVSA + - Hach + - HarmTrace + - HasGP + - Hashell + - HaskRel + - Hate + - Hawk + - Hayoo + - Hedi + - Hieroglyph + - HiggsSet + - Hipmunk-Utils + - HipmunkPlayground + - Hoed + - Holumbus-Distribution + - Holumbus-MapReduce + - Holumbus-Searchengine + - Holumbus-Storage + - HongoDB + - Hs2lib + - HsParrot + - HsWebots + - Hsed + - Hydrogen + - INblobs + - IORefCAS + - IndexedList + - InfixApplicative + - JSON-Combinator + - JSON-Combinator-Examples + - JSONb + - Javasf + - JsContracts + - JsonGrammar + - JuPyTer-notebook + - JunkDB-driver-gdbm + - JunkDB-driver-hashtables + - KiCS + - KiCS-debugger + - KiCS-prophecy + - LDAPv3 + - LambdaDesigner + - LambdaINet + - LambdaPrettyQuote + - LambdaShell + - LinearSplit + - LinkChecker + - LogicGrowsOnTrees + - LogicGrowsOnTrees-MPI + - LogicGrowsOnTrees-network + - LogicGrowsOnTrees-processes + - LslPlus + - Lucu + - Lykah + - MC-Fold-DP + - MFlow + - MIP-glpk + - MSQueue + - MaybeT-transformers + - MetaObject + - Metrics + - Mhailist + - Michelangelo + - MicrosoftTranslator + - MissingPy + - MonadCatchIO-mtl + - MonadCatchIO-mtl-foreign + - MonadCatchIO-transformers-foreign + - MonadLab + - Monaris + - Monatron-IO + - Monocle + - MuCheck-HUnit + - MuCheck-Hspec + - MuCheck-QuickCheck + - MuCheck-SmallCheck + - MutationOrder + - NXT + - NaperianNetCDF + - NearContextAlgebra + - Ninjas + - NoSlow + - Nomyx + - Nomyx-Core + - Nomyx-Language + - Nomyx-Rules + - Nomyx-Web + - NonEmptyList + - Nussinov78 + - OSM + - OnRmt + - OpenAFP-Utils + - OpenGLCheck + - OpenSCAD + - OpenVG + - PCLT-DB + - PageIO + - Paraiso + - Parallel-Arrows-Eden + - PermuteEffects + - Plot-ho-matic + - PlslTools + - Printf-TH + - ProbabilityMonads + - Pugs + - Pup-Events + - Pup-Events-Demo + - Quelea + - RESTng + - RMP + - RNAFold + - RNAFoldProgs + - RNAdesign + - RNAdraw + - RNAlien + - RNAwolf + - Ranka + - Rlang-QQ + - RollingDirectory + - S3 + - SBench + - SCRIPTWriter + - SCalendar + - SFML-control + - SFont + - SGdemo + - STLinkUSB + - STM32-Zombie + - SVG2Q + - SciFlow + - SciFlow-drmaa + - Scurry + - SelectSequencesFromMSA + - Shellac-compatline + - Shellac-editline + - Shellac-haskeline + - Shellac-readline + - ShortestPathProblems + - Shpadoinkle-backend-pardiff + - Shpadoinkle-backend-static + - Shpadoinkle-developer-tools + - Shpadoinkle-disembodied + - Shpadoinkle-examples + - Shpadoinkle-html + - Shpadoinkle-router + - Shpadoinkle-template + - Shpadoinkle-widgets + - SimpleGL + - SimpleLog + - SimpleServer + - Smooth + - Snusmumrik + - SoccerFun + - SoccerFunGL + - SourceGraph + - SpinCounter + - Spock-auth + - Spock-lucid + - Spock-worker + - StockholmAlignment + - Strafunski-Sdf2Haskell + - SyntaxMacros + - Taxonomy + - TaxonomyTools + - TeX-my-math + - TeaHS + - TreeCounter + - Treiber + - TrieMap + - TypeClass + - TypeIlluminator + - UMM + - URLT + - UrlDisp + - ViennaRNA-extras + - WAVE + - WEditorBrick + - WEditorHyphen + - WL500gPControl + - WURFL + - WXDiffCtrl + - WashNGo + - WaveFront + - WebBits-Html + - WebBits-multiplate + - WebCont + - WordAlignment + - WxGeneric + - XML + - XMPP + - XSaiga + - YACPong + - Yablog + - Yogurt + - Yogurt-Standalone + - Z-Botan + - Z-IO + - Z-MessagePack + - Z-YAML + - a50 + - abcBridge + - ac-machine-conduit - accelerate-arithmetic - accelerate-fourier - accelerate-typelits - access-token-provider - - ac-machine-conduit - acme-php - acme-safe - acousticbrainz-client - activehs - actor - - AC-Vector-Fancy - adhoc-network - adict - - ADPfusionForest - - ADPfusionSet - adp-multi-monadiccp - - Advgame - - Advise-me - aern2-real - - AERN-Net - - AERN-Real - - AERN-Real-Double - - AERN-Real-Interval - - AERN-RnToRm - - AERN-RnToRm-Plot - aeson-native - afv - agda-server @@ -46,8 +406,6 @@ dont-distribute-packages: - algebra-driven-design - algebra-sql - algolia - - AlgoRhythm - - AlignmentAlgorithms - alms - alpha - alsa-gui @@ -58,18 +416,18 @@ dont-distribute-packages: - amqp-streamly - analyze-client - anatomy - - AndroidViewHierarchyImporter - animate-example - animate-frames - animate-preview - animate-sdl2 - annah - - Annotations - anonymous-sums-tests - antagonist - anticiv - antlrc - apelsin + - api-rpc-pegnet + - api-yoti - apiary - apiary-authenticate - apiary-clientsession @@ -85,11 +443,8 @@ dont-distribute-packages: - apiary-redis - apiary-session - apiary-websockets - - api-rpc-pegnet - apis - - api-yoti - apotiki - - ApplePush - approx-rand-test - arbor-monad-metric-datadog - arch-hs @@ -104,7 +459,6 @@ dont-distribute-packages: - arraylist - ascii-table - asic - - ASN1 - assert4hs-hspec - assert4hs-tasty - assimp @@ -114,7 +468,6 @@ dont-distribute-packages: - atmos-dimensional-tf - atomic-primops-foreign - atp - - AttoJson - attoparsec-enumerator - attoparsec-iteratee - attoparsec-text-enumerator @@ -122,13 +475,11 @@ dont-distribute-packages: - audiovisual - aura - authoring - - AutoForms - autonix-deps-kf5 - avers - avers-api - avers-api-docs - avers-server - - AvlTree - avro-piper - awesomium - awesomium-glut @@ -150,6 +501,7 @@ dont-distribute-packages: - azure-functions-worker - azure-service-api - azure-servicebus + - b-tree - babylon - backblaze-b2-hs - backdropper @@ -162,12 +514,10 @@ dont-distribute-packages: - bamboo-theme-mini-html5 - bamse - bamstats - - Barracuda - base16-lens - base32-bytestring - base64-bytes - baserock-schema - - BASIC - batchd - battlenet-yesod - battleships @@ -184,9 +534,9 @@ dont-distribute-packages: - beam-th - beautifHOL - bech32-th + - bech32-th_1_1_1 - bein - belka - - BerlekampAlgorithm - berp - bff - bglib @@ -197,32 +547,15 @@ dont-distribute-packages: - binary-file - binary-protocol-zmq - binary-streams + - binding-wx - bindings-apr-util - bindings-linux-videodev2 - bindings-ppdev - - binding-wx - binembed-example - bioace - bioalign - - Biobase - - BiobaseBlast - - BiobaseDotP - - BiobaseENA - - BiobaseEnsembl - - BiobaseFasta - - BiobaseFR3D - - BiobaseHTTP - - BiobaseHTTPTools - - BiobaseInfernal - - BiobaseMAF - - BiobaseTrainingData - - BiobaseTurner - - BiobaseTypes - - BiobaseVienna - - BiobaseXNA - biofasta - biofastq - - BioHMM - bioinformatics-toolkit - biophd - biopsl @@ -231,27 +564,24 @@ dont-distribute-packages: - bip32 - birch-beer - bird - - BirdPP - bit-array - bitcoin-address - bitcoin-api - bitcoin-api-extra - bitcoin-block - bitcoin-compact-filters - - bitcoind-regtest - - bitcoind-rpc - bitcoin-keys - bitcoin-rpc - bitcoin-scripting - bitcoin-tx - bitcoin-types - - Bitly + - bitcoind-regtest + - bitcoind-rpc - bitly-cli - bitmaps - bittorrent - bla - blakesum-demo - - BlastHTTP - blastxml - blatex - blaze-builder-enumerator @@ -259,10 +589,7 @@ dont-distribute-packages: - ble - blink1 - blip - - Blobs - blogination - - BlogLiterately - - BlogLiterately-diagrams - bloodhound-amazonka-auth - bloxorz - blubber @@ -273,7 +600,6 @@ dont-distribute-packages: - bond-haskell - bond-haskell-compiler - bookkeeper-permissions - - Bookshelf - boomslang - boopadoop - boots-cloud @@ -292,7 +618,6 @@ dont-distribute-packages: - bronyradiogermany-streaming - brotli-conduit - brotli-streams - - b-tree - btree - buchhaltung - buildbox-tools @@ -309,14 +634,14 @@ dont-distribute-packages: - bytelog - bytestring-read - c0check - - cabal2arch - cabal-bounds - cabal-cache - cabal-cargs - - cabalmdvrpm - cabal-query - - cabalrpmdeps - cabal-test + - cabal2arch + - cabalmdvrpm + - cabalrpmdeps - cake - cakyrespa - cal3d-examples @@ -332,9 +657,8 @@ dont-distribute-packages: - canteven-http - cao - cap - - carboncopy - - CarneadesIntoDung - car-pool + - carboncopy - cartel - casadi-bindings - casadi-bindings-control @@ -348,8 +672,6 @@ dont-distribute-packages: - casui - categorical-algebra - category-extras - - CBOR - - CC-delcont-alt - cctools-workqueue - cef3-simple - ceilometer-common @@ -363,11 +685,9 @@ dont-distribute-packages: - cfopu - cgrep - chainweb-mining-client - - chakra - chalkboard-viewer - charade - chart-cli - - Chart-fltkhs - chart-svg - chart-svg-various - chart-unit @@ -423,38 +743,33 @@ dont-distribute-packages: - cloud-seeder - cloudyfs - clua - - ClustalParser - clustertools - clutterhs - cmathml3 - - CMCompare - cmptype - cmv - cnc-spec-compiler - - Coadjute - - codec + - co-feldspar + - co-log-polysemy-formatting - code-conjure + - codec - codec-rpm - codemonitor - - co-feldspar - cognimeta-utils - coinbase-exchange - colada - collapse-duplication - collection-json - collections-base-instances - - co-log-polysemy-formatting - color-counter - colorless-http-client - colorless-scotty - colour-space - columbia - comark - - Combinatorrent - comic - commsec-keyexchange - comonad-random - - ComonadSheet - compact-mutable - complexity - computational-algebra @@ -464,7 +779,6 @@ dont-distribute-packages: - concrete-haskell - concrete-haskell-autogen - condor - - Condor - conductive-hsc3 - conductive-song - conduit-vfs-zip @@ -474,9 +788,8 @@ dont-distribute-packages: - conferer-source-dhall - conferer-source-yaml - conffmt - - Configger - - configifier - config-select + - configifier - configurator-ng - constraint-manip - constructible @@ -488,7 +801,6 @@ dont-distribute-packages: - control - control-monad-attempt - control-monad-exception-monadsfd - - Control-Monad-MultiPass - conversions - convert - convertible-ascii @@ -500,13 +812,10 @@ dont-distribute-packages: - copilot-language - copilot-libraries - copilot-theorem - - CoreFoundation - coroutine-enumerator - coroutine-iteratee - - couchdb-enumerator - couch-simple - - CPBrainfuck - - CPL + - couchdb-enumerator - cprng-aes-effect - cql-io-tinylog - cqrs-example @@ -526,17 +835,14 @@ dont-distribute-packages: - criu-rpc - crockford - cron-compat - - cryptocipher - crypto-conduit + - cryptocipher - cryptoids - cryptoids-class - cryptol - crystalfontz - csg - cspmchecker - - CSPM-cspm - - CSPM-Interpreter - - CSPM-ToProlog - csv-enumerator - ctpl - cube @@ -544,13 +850,11 @@ dont-distribute-packages: - cursor-fuzzy-time-gen - cv-combinators - cypher - - Dangerous - dapi - darcs-benchmark - darcs-beta - - darcsden - darcs-fastconvert - - DarcsHelpers + - darcsden - darcswatch - darkplaces-demo - darkplaces-rcon-util @@ -558,9 +862,7 @@ dont-distribute-packages: - data-accessor-monads-fd - data-basic - data-cycle - - datadog-tracing - data-elf - - dataflow - data-layer - data-lens-fd - data-lens-ixset @@ -570,6 +872,8 @@ dont-distribute-packages: - data-result - data-rtuple - data-structure-inferrer + - datadog-tracing + - dataflow - date-conversions - dbjava - dbus-client @@ -584,11 +888,11 @@ dont-distribute-packages: - ddc-core-simpl - ddc-core-tetra - ddc-driver - - ddci-core - ddc-interface - ddc-source-tetra - ddc-tools - ddc-war + - ddci-core - debug - debug-trace-var - decidable @@ -597,7 +901,6 @@ dont-distribute-packages: - deeplearning-hs - deepzoom - defargs - - DefendTheKing - definitive-graphics - deka-tests - delaunay @@ -606,9 +909,9 @@ dont-distribute-packages: - delimiter-separated - delta - delta-h + - dep-t-advice - dependent-state - dephd - - dep-t-advice - deptrack-devops - deptrack-dot - dequeue @@ -618,6 +921,7 @@ dont-distribute-packages: - dewdrop - dfinity-radix-tree - dhall-docs + - di-polysemy - dia-functions - diagrams-haddock - diagrams-html5 @@ -625,7 +929,6 @@ dont-distribute-packages: - diagrams-pgf - diagrams-reflex - diagrams-wx - - DifferenceLogic - difference-monoid - digestive-functors-hsp - dingo-core @@ -633,14 +936,12 @@ dont-distribute-packages: - dingo-widgets - diplomacy - diplomacy-server - - di-polysemy - dirfiles - discogs-haskell - discord-gateway - discord-hs - discord-register - discord-rest - - DisTract - distributed-process-async - distributed-process-azure - distributed-process-client-server @@ -665,18 +966,13 @@ dont-distribute-packages: - dmenu-pkill - dmenu-pmount - dmenu-search - - DMuCheck - - DnaProteinAlignment - doc-review - - DocTest - doi - - DOM - domain - domain-core - domain-optics - dow - download-media-content - - DP - dph-examples - dph-lifted-base - dph-lifted-copy @@ -684,25 +980,17 @@ dont-distribute-packages: - dph-prim-interface - dph-prim-par - dph-prim-seq - - DrHylo - dropbox-sdk - dropsolve - - DSH - dsh-sql - dsmc-tools - - DSTM - dtd - dumb-cas - - Dust - - Dust-tools - - Dust-tools-pcap - dvda - dynamic-cabal - dynamic-pipeline - dynamic-plot - dynobud - - DysFRP-Cairo - - DysFRP-Craftwerk - eccrypto-ed25519-bindings - ecdsa - edenskel @@ -710,7 +998,6 @@ dont-distribute-packages: - edge - edges - editable - - EditTimeReport - effective-aspects-mzv - egison - egison-pattern-src-haskell-mode @@ -729,7 +1016,6 @@ dont-distribute-packages: - embroidery - engine-io-growler - entangle - - EntrezHTTP - enumerate - enumerate-function - enumerator-fd @@ -742,25 +1028,19 @@ dont-distribute-packages: - errors-ext - ersatz-toysat - esotericbot - - EsounD - estreps - - Etage-Graph - - EtaMOO - - Eternal10Seconds - eternity - eternity-timestamped - ether - - Etherbunny - ethereum-analyzer - ethereum-analyzer-cli - ethereum-analyzer-webui - ethereum-client-haskell - ethereum-merkle-patricia-db - evdev-streamly + - event-monad - eventful-postgresql - eventful-sqlite - - event-monad - - EventSocket - eventsource-geteventstore-store - every-bit-counts - exception-monads-fd @@ -777,25 +1057,22 @@ dont-distribute-packages: - extensible-data - extract-dependencies - extrapolate - - Facts - factual-api - - FailureT - fakedata-quickcheck - - fallingblocks - falling-turnip + - fallingblocks - family-tree - fast-digits - fastirc - fault-tree - fbrnch - fcd - - FComp - feature-flipper-postgres - fedora-img-dl - - feed2lj - - feed2twitter - feed-gipeda - feed-translator + - feed2lj + - feed2twitter - fei-base - fei-cocoapi - fei-dataiter @@ -805,33 +1082,26 @@ dont-distribute-packages: - fei-nn - feldspar-compiler - feldspar-language - - FermatsLastMargin - festung - ffmpeg-tutorials - ficketed - fields - - FieldTrip - filepath-crypto - - filepather - - FilePather - filepath-io-access + - filepather - filesystem-enumerator - - Finance-Treasury - find-clumpiness - findhttp - - FiniteMap - firstify - - FirstOrderTheory + - fix-parser-simple - fixed-point-vector - fixed-point-vector-space - fixhs - - fix-parser-simple - flac-picture - flashblast - flatbuffers - flexiwrap - flexiwrap-smallcheck - - Flippi - flite - flowdock-api - flower @@ -843,13 +1113,10 @@ dont-distribute-packages: - fltkhs-themes - fluent-logger - fluent-logger-conduit - - FM-SBLEX - foldl-transduce-attoparsec - follower - foo - - Forestry - formal - - FormalGrammars - format - format-status - forml @@ -859,28 +1126,23 @@ dont-distribute-packages: - fortran-src-extras - foscam-directory - foscam-sort - - Foster - fp-ieee - fplll - fpnla-examples - frame-markdown - - Frames-beam - - Frames-dsv - - Frank - - freekick2 - - freelude - - freer-converse - free-theorems-counterexamples - free-theorems-seq - free-theorems-seq-webui - free-theorems-webui + - freekick2 + - freelude + - freer-converse - frpnow-gloss - frpnow-gtk - frpnow-gtk3 - frpnow-vty - ftdi - ftp-client-conduit - - FTPLine - ftree - ftshell - funbot @@ -888,8 +1150,8 @@ dont-distribute-packages: - funcons-lambda-cbv-mp - funcons-simple - funcons-tools - - functional-arrow - function-combine + - functional-arrow - functor-combo - funflow-nix - funion @@ -903,12 +1165,10 @@ dont-distribute-packages: - g2q - gact - galois-fft - - Gamgine - gargoyle-postgresql-connect - gbu - gdax - gdiff-ig - - GeBoP - gedcom - geek - geek-server @@ -917,18 +1177,13 @@ dont-distribute-packages: - gelatin-gl - gelatin-sdl2 - gelatin-shaders - - Genbank - - Gene-CluEDO - generics-mrsop-gdiff - genesis - genesis-test - - GenI - - geniconvert - geni-gui - - geniserver - geni-util - - GenSmsPdu - - GenussFold + - geniconvert + - geniserver - geodetic - geolite-csv - getemx @@ -938,11 +1193,11 @@ dont-distribute-packages: - ghc-debug-stub - ghc-imported-from - ghc-instances - - ghci-pretty - - ghcjs-hplay - ghc-mod - ghc-tags-plugin - ghc-vis + - ghci-pretty + - ghcjs-hplay - ght - gi-cairo-again - gi-gsk @@ -950,11 +1205,11 @@ dont-distribute-packages: - gi-gtk_4_0_4 - git-fmt - git-gpush + - git-object + - git-remote-ipfs - github-webhook-handler-snap - gitlib-cross - gitlib-s3 - - git-object - - git-remote-ipfs - givegif - gladexml-accessor - glazier @@ -962,12 +1217,9 @@ dont-distribute-packages: - glazier-react - glazier-react-examples - glazier-react-widget - - GLFW-OGL - - GLFW-task - global - global-config - glome-hs - - GlomeView - gloss-accelerate - gloss-devil - gloss-examples @@ -983,14 +1235,11 @@ dont-distribute-packages: - goal-probability - goal-simulation - goat - - GoogleDirections - google-drive - google-mail-filters - google-maps-geocoding - - googleplus - - GoogleSB - google-static-maps - - GoogleTranslate + - googleplus - gore-and-ash-actor - gore-and-ash-async - gore-and-ash-demo @@ -1000,27 +1249,15 @@ dont-distribute-packages: - gore-and-ash-network - gore-and-ash-sdl - gore-and-ash-sync - - GPipe-Collada - - GPipe-Examples - - GPipe-GLFW - - GPipe-GLFW4 - - GPipe-TextureLoad - gps - gps2htmlReport - - GPX - grab-form - graflog - grammar-combinators - - GrammarProducts - grapefruit-examples - grapefruit-records - grapefruit-ui - grapefruit-ui-gtk - - GraphHammer - - GraphHammer-examples - - graphicsFormats - - graphicstools - - graphql-client - graph-rewriting-cl - graph-rewriting-gl - graph-rewriting-lambdascope @@ -1029,13 +1266,15 @@ dont-distribute-packages: - graph-rewriting-strategies - graph-rewriting-trs - graph-rewriting-ww - - graphtype - graph-visit + - graphicsFormats + - graphicstools + - graphql-client + - graphtype - greencard-lib + - grid-proto - gridbounds - gridland - - grid-proto - - GrowlNotify - grpc-etcd-client - grpc-haskell - grpc-haskell-core @@ -1046,28 +1285,22 @@ dont-distribute-packages: - gsmenu - gstorable - gtfs + - gtk-serialized-event - gtk2hs-cast-glade - gtk2hs-cast-gnomevfs - gtk2hs-cast-gtkglext - gtk2hs-cast-gtksourceview2 - - Gtk2hsGenerics - - GtkGLTV - gtkimageview - gtkrsync - - gtk-serialized-event - guarded-rewriting - guess-combinator - - GuiHaskell - - GuiTV + - hArduino + - hOff-display + - hPDB + - hPDB-examples - habit - hablo - hablog - - Hach - - hack2-handler-happstack-server - - hack2-handler-mongrel2-http - - hack2-handler-snap-server - - hackage2twitter - - hackage-server - hack-contrib - hack-contrib-press - hack-handler-epoll @@ -1075,10 +1308,15 @@ dont-distribute-packages: - hack-handler-fastcgi - hack-handler-hyena - hack-handler-simpleserver - - hackmanager - hack-middleware-cleanpath - hack-middleware-clientsession - hack-middleware-jsonp + - hack2-handler-happstack-server + - hack2-handler-mongrel2-http + - hack2-handler-snap-server + - hackage-server + - hackage2twitter + - hackmanager - haddock - haddock_2_23_1 - haddocset @@ -1093,16 +1331,12 @@ dont-distribute-packages: - halma-gui - halma-telegram-bot - ham - - HaMinitel - hamusic - hans-pcap - happlets-lib-gtk - - HAppS-Data - happs-hsp - happs-hsp-template - - HAppS-IxSet - - HAppS-Server - - HAppS-State + - happs-tutorial - happstack-auth - happstack-authenticate - happstack-contrib @@ -1117,48 +1351,26 @@ dont-distribute-packages: - happstack-state - happstack-static-routing - happstack-yui - - happs-tutorial - happybara-webkit - haquil - - hArduino - hardware-edsl - - HaRe - harg - hark - harmony - - HarmTrace - haroonga-httpd + - has-th - hascat - hascat-lib - hascat-setup - hascat-system - - HasGP - - Hashell - hashflare + - hask-home - haskarrow - haskdeep - haskeem - haskell-abci - haskell-aliyun - haskell-bitmex-client - - haskelldb-connect-hdbc - - haskelldb-connect-hdbc-catchio-mtl - - haskelldb-connect-hdbc-catchio-tf - - haskelldb-connect-hdbc-catchio-transformers - - haskelldb-connect-hdbc-lifted - - haskelldb-dynamic - - haskelldb-flat - - haskelldb-hdbc - - haskelldb-hdbc-mysql - - haskelldb-hdbc-odbc - - haskelldb-hdbc-postgresql - - haskelldb-hdbc-sqlite3 - - haskelldb-hsql - - haskelldb-hsql-mysql - - haskelldb-hsql-odbc - - haskelldb-hsql-postgresql - - haskelldb-hsql-sqlite3 - - haskelldb-th - haskell-docs - haskell-eigen-util - haskell-ftp @@ -1182,10 +1394,27 @@ dont-distribute-packages: - haskell-tools-refactor - haskell-tools-rewrite - haskell-tor + - haskelldb-connect-hdbc + - haskelldb-connect-hdbc-catchio-mtl + - haskelldb-connect-hdbc-catchio-tf + - haskelldb-connect-hdbc-catchio-transformers + - haskelldb-connect-hdbc-lifted + - haskelldb-dynamic + - haskelldb-flat + - haskelldb-hdbc + - haskelldb-hdbc-mysql + - haskelldb-hdbc-odbc + - haskelldb-hdbc-postgresql + - haskelldb-hdbc-sqlite3 + - haskelldb-hsql + - haskelldb-hsql-mysql + - haskelldb-hsql-odbc + - haskelldb-hsql-postgresql + - haskelldb-hsql-sqlite3 + - haskelldb-th - haskelm - haskey-mtl - haskgame - - hask-home - haskoin-bitcoind - haskoin-core - haskoin-crypto @@ -1201,7 +1430,6 @@ dont-distribute-packages: - haskore-realtime - haskore-supercollider - haskore-synthesizer - - HaskRel - hasktorch - hasktorch-ffi-thc - hasktorch-indef @@ -1222,16 +1450,9 @@ dont-distribute-packages: - haste-lib - haste-markup - haste-perch - - has-th - - Hate - - HaTeX-meta - hatexmpp3 - - HaTeX-qq - - HaVSA - hawitter - - Hawk - haxy - - Hayoo - hback - hbayes - hbb @@ -1252,15 +1473,14 @@ dont-distribute-packages: - hdph - heart-app - heatitup + - heavy-log-shortcuts - heavy-logger - heavy-logger-amazon - heavy-logger-instances - - heavy-log-shortcuts - hecc - hedgehog-checkers-lens - hedgehog-fakedata - hedgehog-gen-json - - Hedi - hedis-pile - heist-aeson - helics @@ -1287,16 +1507,11 @@ dont-distribute-packages: - hfd - hfiar - hgalib - - HGamer3D-API - - HGamer3D-CAudio-Binding - - HGamer3D-OIS-Binding - hgen - hgeometry-svg - hgithub - hiccup - hierarchical-spectral-clustering - - Hieroglyph - - HiggsSet - highjson-swagger - highjson-th - himpy @@ -1307,8 +1522,6 @@ dont-distribute-packages: - hinvaders - hinze-streams - hipbot - - HipmunkPlayground - - Hipmunk-Utils - hipsql-client - hipsql-server - hirt @@ -1319,15 +1532,9 @@ dont-distribute-packages: - hist-pl-lmf - hit - hit-graph - - HJScript - hjsonschema - hjugement-cli - hlcm - - HLearn-algebra - - HLearn-approximation - - HLearn-classification - - HLearn-datastructures - - HLearn-distributions - hledger-api - hlrdb - hls @@ -1339,20 +1546,12 @@ dont-distribute-packages: - hmm-lapack - hmt - hmt-diagrams - - HNM - hnormalise - hob - - Hoed - - hOff-display - hogre - hogre-examples - - Holumbus-Distribution - - Holumbus-MapReduce - - Holumbus-Searchengine - - Holumbus-Storage - holy-project - hommage - - HongoDB - hood - hoodie - hoodle @@ -1371,11 +1570,7 @@ dont-distribute-packages: - hpage - hpaste - hpc-tracer - - hPDB - - hPDB-examples - hplayground - - HPlot - - HPong - hpqtypes-extras - hprotoc-fork - hps @@ -1383,26 +1578,21 @@ dont-distribute-packages: - hpython - hquantlib - hranker - - HRay - hreader - hreader-lens - hreq-client - hreq-conduit - - HROOT - - HROOT-core - - HROOT-graf - - HROOT-hist - - HROOT-io - - HROOT-math - - HROOT-tree + - hs-blake2 + - hs-brotli + - hs-ffmpeg + - hs-gen-iface + - hs-pkpass + - hs-swisstable-hashtables-class - hs2dot - - Hs2lib - hsautogui - hsbackup - hsbencher-codespeed - hsbencher-fusion - - hs-blake2 - - hs-brotli - hsc3-auditor - hsc3-cairo - hsc3-data @@ -1422,24 +1612,16 @@ dont-distribute-packages: - hscassandra - hscope - hsdev - - Hsed - hset - hsfacter - - hs-ffmpeg - - hs-gen-iface - - HSGEP - - HSHHelpers - hslogstash - hsnock - - HSoundFile - - HsParrot - hspec-expectations-pretty - hspec-pg-transact - hspec-setup - hspec-shouldbe - hspec-test-sandbox - hspecVariant - - hs-pkpass - hsprocess - hsql-mysql - hsql-odbc @@ -1450,24 +1632,20 @@ dont-distribute-packages: - hsqml-morris - hsreadability - hssqlppp-th - - hs-swisstable-hashtables-class - hstar - hstox - hstradeking - - HStringTemplateHelpers - hstzaar - hsubconvert - - HsWebots - hswip - hsx-jmacro - hsx-xhtml - - HTab - hts - - http2-client-exe - - http2-client-grpc - http-client-auth - http-enumerator - http-io-streams + - http2-client-exe + - http2-client-grpc - https-everywhere-rules - https-everywhere-rules-raw - httpspec @@ -1488,14 +1666,13 @@ dont-distribute-packages: - hw-json-simple-cursor - hw-json-standard-cursor - hw-kafka-avro + - hw-simd-cli + - hw-uri - hworker-ses - hwormhole - hws - - hw-simd-cli - hwsl2-bytevector - hwsl2-reducers - - hw-uri - - HXMPP - hxmppc - hxournal - hxt-binary @@ -1503,7 +1680,6 @@ dont-distribute-packages: - hxthelper - hxweb - hybrid - - Hydrogen - hydrogen-cli - hydrogen-cli-args - hydrogen-data @@ -1517,13 +1693,14 @@ dont-distribute-packages: - hyloutils - hyperpublic - ice40-prim - - ideas-math - - ideas-math-types - - ideas-statistics - ide-backend - ide-backend-common - ide-backend-server + - ideas-math + - ideas-math-types + - ideas-statistics - ige-mac-integration + - ihaskell-inline-r - ihaskell-rlangqq - ihttp - imap @@ -1539,7 +1716,6 @@ dont-distribute-packages: - importify - imprevu-happstack - improve - - INblobs - inch - incremental-computing - incremental-maps @@ -1548,10 +1724,8 @@ dont-distribute-packages: - indentation-parsec - indentation-trifecta - indexation - - IndexedList - indieweb-algorithms - infernu - - InfixApplicative - inline-java - inspector-wrecker - instant-aeson @@ -1566,7 +1740,6 @@ dont-distribute-packages: - intset - invertible-hlist - ion - - IORefCAS - ipatch - ipc - ipld-cid @@ -1581,12 +1754,12 @@ dont-distribute-packages: - ismtp - isobmff-builder - isohunt + - iter-stats - iteratee-compress - iteratee-mtl - iteratee-parsec - iteratee-stm - iterio-server - - iter-stats - ivor - ivory-avr-atmega328p-registers - ivory-backend-c @@ -1604,10 +1777,9 @@ dont-distribute-packages: - jail - java-bridge-extras - java-character - - javaclass - java-reflect + - javaclass - javasf - - Javasf - jmacro - jmacro-rpc - jmacro-rpc-happstack @@ -1616,26 +1788,18 @@ dont-distribute-packages: - jobs-ui - join - jot - - JsContracts - jsmw - - json2-hdbc - json-ast-json-encoder - json-autotype - json-b - - JSONb - - JSON-Combinator - - JSON-Combinator-Examples - json-enumerator - - JsonGrammar - json-incremental-decoder - json-query - - jsons-to-schema - json-togo - json-tokens + - json2-hdbc + - jsons-to-schema - jspath - - JunkDB-driver-gdbm - - JunkDB-driver-hashtables - - JuPyTer-notebook - jvm - jvm-batching - jvm-streaming @@ -1662,20 +1826,17 @@ dont-distribute-packages: - keera-hails-reactive-fs - keera-hails-reactive-gtk - keera-hails-reactive-htmldom - - keera-hails-reactivelenses - keera-hails-reactive-network - keera-hails-reactive-polling - keera-hails-reactive-wx - keera-hails-reactive-yampa + - keera-hails-reactivelenses - keera-posture - kevin - keysafe - keyvaluehash - keyword-args - kicad-data - - KiCS - - KiCS-debugger - - KiCS-prophecy - kif-parser - kit - kleene @@ -1694,8 +1855,12 @@ dont-distribute-packages: - labyrinth - labyrinth-server - laika - - lambdabot-zulip - lambda-calculator + - lambda-devs + - lambda-options + - lambdaFeed + - lambdaLit + - lambdabot-zulip - lambdacms-media - lambdacube - lambdacube-bullet @@ -1706,21 +1871,13 @@ dont-distribute-packages: - lambdacube-examples - lambdacube-gl - lambdacube-samples - - LambdaDesigner - - lambda-devs - - lambdaFeed - - LambdaINet - - lambdaLit - - lambda-options - - LambdaPrettyQuote - - LambdaShell - lambdaya-bus - lambdiff - lang + - language-Modula2 - language-boogie - language-eiffel - language-kort - - language-Modula2 - language-ninja - language-oberon - language-python-colour @@ -1740,7 +1897,6 @@ dont-distribute-packages: - lazy-hash - lazy-hash-cache - ldapply - - LDAPv3 - leaky - lean - legion @@ -1776,8 +1932,6 @@ dont-distribute-packages: - linear-circuit - linearmap-category - linearscan-hoopl - - LinearSplit - - LinkChecker - linkchk - linkcore - linux-ptrace @@ -1787,15 +1941,15 @@ dont-distribute-packages: - liquid-bytestring - liquid-containers - liquid-ghc-prim - - liquidhaskell-cabal-demo - liquid-parallel - liquid-platform - liquid-prelude - liquid-vector - - listenbrainz-client + - liquidhaskell-cabal-demo - list-t-attoparsec - list-t-html-parser - list-witnesses + - listenbrainz-client - live-sequencer - llvm - llvm-analysis @@ -1811,57 +1965,51 @@ dont-distribute-packages: - llvm-tf - llvm-tools - lmonad-yesod - - localize - local-search + - localize - locked-poll - log - - logging-effect-extra - - logic-classes - - LogicGrowsOnTrees - - LogicGrowsOnTrees-MPI - - LogicGrowsOnTrees-network - - LogicGrowsOnTrees-processes - log-postgres - log-utils + - logging-effect-extra + - logic-classes - lojban - lojysamban - lol-apps - lol-benches - lol-cpp - - loli - lol-repa - lol-tests - lol-typing + - loli - longshot - loop-effin - lorentz - lostcities - loup - - LslPlus - ls-usb - lsystem - lti13 - luachunk - lucid-colonnade - lucienne - - Lucu - luhn - lui - luminance-samples - lvish - - Lykah - lz4-conduit - lzma-enumerator + - mDNSResponder-client - macbeth-lib - machines-amazonka - macosx-make-standalone + - magic-wormhole - magicbane - magico - - magic-wormhole - mahoro - maid - - mailgun - mail-pool + - mailgun - majordomo - majority - manatee @@ -1881,27 +2029,24 @@ dont-distribute-packages: - manifold-random - manifolds - marionetta - - markdown2svg - markdown-pap + - markdown2svg - markov-processes - marmalade-upload - marquise - marvin - masakazu-bot - matchers - - mathblog - - mathlink - math-programming-glpk - math-programming-tests + - mathblog + - mathlink - matsuri - maxent - maxent-learner-hw-gui - maxsharing - - MaybeT-transformers - - MC-Fold-DP - mcmc - mcmc-samplers - - mDNSResponder-client - mealy - mediabus-fdk-aac - mediabus-rtp @@ -1911,20 +2056,13 @@ dont-distribute-packages: - mergeful-persistent - mergeless-persistent - merkle-patricia-db - - MetaObject - meta-par-accelerate - metaplug - metar - metar-http - - Metrics - metronome - - MFlow - - Mhailist - - Michelangelo - - microformats2-parser - - microformats2-types - micro-gateway - - MicrosoftTranslator + - microformats2-types - midimory - mighttpd - minecraft-data @@ -1934,11 +2072,9 @@ dont-distribute-packages: - minilight-lua - minimung - minioperational - - MIP-glpk - miss - - MissingPy - - missing-py2 - miss-porcelain + - missing-py2 - mixed-strategies - mkbndl - mkcabal @@ -1949,25 +2085,18 @@ dont-distribute-packages: - moan - modify-fasta - modsplit - - modularity - modular-prelude-classy + - modularity - modulo - mole - - MonadCatchIO-mtl - - MonadCatchIO-mtl-foreign - - MonadCatchIO-transformers-foreign - monad-exception - - monadiccp-gecode - - MonadLab - monad-state - monad-stlike-stm + - monadiccp-gecode - monarch - - Monaris - - Monatron-IO - monetdb-mapi - mongrel2-handler - monky - - Monocle - monte-carlo - moo - moo-nad @@ -1987,16 +2116,12 @@ dont-distribute-packages: - msgpack-idl - msgpack-rpc - msgpack-rpc-conduit - - MSQueue - mtgoxapi - - MuCheck-Hspec - - MuCheck-HUnit - - MuCheck-QuickCheck - - MuCheck-SmallCheck - mu-grpc-client - mu-grpc-server - - multibase + - mu-tracing - multi-cabal + - multibase - multifocal - multihash-serialise - multilinear-io @@ -2006,7 +2131,6 @@ dont-distribute-packages: - multisetrewrite - murder - murmurhash3 - - musicbrainz-email - music-graphics - music-parts - music-pitch @@ -2014,39 +2138,36 @@ dont-distribute-packages: - music-score - music-sibelius - music-suite + - musicbrainz-email - musicxml2 - mutable-iter - - MutationOrder - mute-unmute - - mu-tracing - - mvclient - mvc-updates + - mvclient - mxnet-dataiter - mxnet-examples - mxnet-nn + - myTestlll - mysnapsession-example - mysql-haskell-openssl - mysql-simple-typed - - myTestlll - mywatch - n2o-web - nakadi-client - nanovg-simple - - NaperianNetCDF - nats-queue - natural-number - - NearContextAlgebra - nemesis-titan - nerf - nero-wai - nero-warp - nested-routes - - netcore - - netlines - net-spider-cli - net-spider-pangraph - net-spider-rpl - net-spider-rpl-cli + - netcore + - netlines - netstring-enumerator - nettle-frp - nettle-netkit @@ -2071,31 +2192,21 @@ dont-distribute-packages: - ngrams-loader - ngx-export-tools-extra - nikepub - - Ninjas - nirum - nlp-scores-scripts - - Nomyx - nomyx-api - nomyx-core - - Nomyx-Core - nomyx-language - - Nomyx-Language - nomyx-library - - Nomyx-Rules - nomyx-server - - Nomyx-Web - - NonEmptyList - - NoSlow - notmuch-haskell - notmuch-web - - numerical - numeric-ode + - numerical - numhask-hedgehog - numhask-histogram - numhask-range - numhask-test - - Nussinov78 - - NXT - nymphaea - obd - obdd @@ -2115,17 +2226,12 @@ dont-distribute-packages: - one-liner_2_0 - online - online-csv - - OnRmt - open-adt-tutorial - - OpenAFP-Utils - - OpenGLCheck + - open-union - openpgp-crypto-api - - OpenSCAD - openssh-github-keys - opentracing-jaeger - opentracing-zipkin-v1 - - open-union - - OpenVG - optima-for-hasql - optimal-blocks - optimusprime @@ -2133,11 +2239,9 @@ dont-distribute-packages: - orchid-demo - order-maintenance - org-mode-lucid - - OSM - osm-download - otp-authenticator - padKONTROL - - PageIO - pairing - panda - pandoc-japanese-filters @@ -2148,11 +2252,9 @@ dont-distribute-packages: - papa-implement - papa-semigroupoids - paprika - - Paraiso - - Parallel-Arrows-Eden - parco-attoparsec - - parconc-examples - parco-parsec + - parconc-examples - parquet-hs - parse-help - parsestar @@ -2165,7 +2267,6 @@ dont-distribute-packages: - pcapng - pcf - pcf-font-embed - - PCLT-DB - pdf-slave - peakachu - pec @@ -2182,7 +2283,6 @@ dont-distribute-packages: - periodic-client-exe - periodic-server - perm - - PermuteEffects - persistent-audit - persistent-hssqlppp - persistent-map @@ -2217,17 +2317,16 @@ dont-distribute-packages: - planet-mitchell - plocketed - ploterific - - Plot-ho-matic - - PlslTools - png-file - pngload - pocket-dns + - point-octree - pointless-lenses - pointless-rewrite - - point-octree - poke - polh-lexicon - polydata + - polysemy-RandomFu - polysemy-chronos - polysemy-conc - polysemy-extra @@ -2244,7 +2343,7 @@ dont-distribute-packages: - polysemy-optics - polysemy-path - polysemy-plugin - - polysemy-RandomFu + - polysemy-readline - polysemy-resume - polysemy-test - polysemy-time @@ -2277,15 +2376,13 @@ dont-distribute-packages: - powerqueue-sqs - pqueue-mtl - practice-room - - prednote-test - pred-set - pred-trie + - prednote-test - presto-hdbc - preview - primula-board - primula-bot - - Printf-TH - - ProbabilityMonads - proc - process-iterio - process-progress @@ -2303,19 +2400,16 @@ dont-distribute-packages: - proplang - prosidyc - proteome + - proto-lens-descriptors - proto3-suite - protobuf-native - protocol-buffers-descriptor-fork - - proto-lens-descriptors - proton - psc-ide - puffytools - - Pugs - pugs-compat - pugs-hsregex - punkt - - Pup-Events - - Pup-Events-Demo - puppetresources - pure-cdb - pure-priority-queue-tests @@ -2332,7 +2426,6 @@ dont-distribute-packages: - qhs - qr-repa - quantum-random - - Quelea - queryparser - queryparser-demo - queryparser-hive @@ -2376,7 +2469,6 @@ dont-distribute-packages: - random-effin - random-hypergeometric - range-space - - Ranka - rasa - rasa-example-config - rasa-ext-bufs @@ -2409,10 +2501,10 @@ dont-distribute-packages: - record-aeson - record-gl - record-preprocessor - - records-th - record-syntax - - reddit + - records-th - redHandlers + - reddit - reduce-equations - refh - reflex-animation @@ -2428,8 +2520,8 @@ dont-distribute-packages: - regex-genex - regex-pcre-text - regex-pderiv - - regexp-tries - regex-xmlschema + - regexp-tries - regional-pointers - regions-monadsfd - regions-monadstf @@ -2462,20 +2554,18 @@ dont-distribute-packages: - rest-client - rest-core - rest-example - - restful-snap - rest-gen - rest-happstack - - RESTng - - restricted-workers - rest-snap - rest-stringmap - rest-types - rest-wai + - restful-snap + - restricted-workers - rethinkdb-model - rewrite - rewriting - rezoom - - rfc - rfc-env - rfc-http-client - rfc-psql @@ -2491,16 +2581,8 @@ dont-distribute-packages: - ripple - risc-v - rivet - - Rlang-QQ - rlwe-challenges - rmonad - - RMP - - RNAdesign - - RNAdraw - - RNAFold - - RNAFoldProgs - - RNAlien - - RNAwolf - rncryptor - rob - robot @@ -2512,7 +2594,6 @@ dont-distribute-packages: - rollbar-cli - rollbar-wai - rollbar-yesod - - RollingDirectory - ron-schema - ron-storage - rose-trie @@ -2531,7 +2612,7 @@ dont-distribute-packages: - ruler - ruler-core - runtime-arbitrary - - S3 + - s-expression - safer-file-handles - safer-file-handles-bytestring - safer-file-handles-text @@ -2549,29 +2630,25 @@ dont-distribute-packages: - samtools-iteratee - sarsi - sasl + - sat-micro-hs - satchmo-backends - satchmo-examples - satchmo-funsat - satchmo-minisat - satchmo-toysat - - sat-micro-hs - - SBench - - sc2hs - sc2-lowlevel - sc2-support + - sc2hs - sc3-rdu - scalable-server - - SCalendar - - scalpel-search - scalp-webhooks + - scalpel-search - scan-vector-machine - schema - schematic - scholdoc - scholdoc-citeproc - scholdoc-texmath - - SciFlow - - SciFlow-drmaa - scion - scion-browser - scope @@ -2580,15 +2657,12 @@ dont-distribute-packages: - scp-streams - scrabble-bot - scrapbook - - SCRIPTWriter - - Scurry - sde-solver - seakale-postgresql - seakale-tests - secrm - sednaDBXML - seitz-symbol - - SelectSequencesFromMSA - selenium-server - self-extract - semi-iso @@ -2603,6 +2677,7 @@ dont-distribute-packages: - sequor - serpentine - serv + - serv-wai - servant-auth-token - servant-auth-token-acid - servant-auth-token-leveldb @@ -2631,12 +2706,7 @@ dont-distribute-packages: - servant-zeppelin-client - servant-zeppelin-server - servant-zeppelin-swagger - - serv-wai - sessiontypes-distributed - - s-expression - - SFML-control - - SFont - - SGdemo - sgf - sgrep - sha1 @@ -2645,27 +2715,13 @@ dont-distribute-packages: - shapefile - shapely-data - shelduck - - Shellac-compatline - - Shellac-editline - - Shellac-haskeline - - Shellac-readline - shellmate-extras - shine-varying - - ShortestPathProblems - showdown - - Shpadoinkle-backend-pardiff - - Shpadoinkle-backend-static - - Shpadoinkle-developer-tools - - Shpadoinkle-disembodied - - Shpadoinkle-examples - - Shpadoinkle-html - - Shpadoinkle-router - - Shpadoinkle-template - - Shpadoinkle-widgets - shpider - shuffle - - sibe - si-clock + - sibe - sigma-ij - signable - signals @@ -2675,12 +2731,9 @@ dont-distribute-packages: - simgi - simple-c-value - simple-firewire - - SimpleGL - - simpleirc-lens - - SimpleLog - simple-nix - simple-pascal - - SimpleServer + - simpleirc-lens - simseq - singleton-nats_0_4_6 - singletons-base @@ -2697,7 +2750,6 @@ dont-distribute-packages: - smcdel - smith-cli - smith-client - - Smooth - smtlib2-debug - smtlib2-pipe - smtlib2-quickcheck @@ -2706,6 +2758,7 @@ dont-distribute-packages: - snap-auth-cli - snap-elm - snap-extras + - snap-utils - snaplet-actionlog - snaplet-auth-acid - snaplet-coffee @@ -2728,17 +2781,13 @@ dont-distribute-packages: - snaplet-tasks - snaplet-wordpress - snappy-iteratee - - snap-utils - sndfile-enumerators - sneathlane-haste - snm - snmp + - snow-white - snowflake-core - snowflake-server - - snow-white - - Snusmumrik - - SoccerFun - - SoccerFunGL - sock2stream - sockets - solga-swagger @@ -2747,7 +2796,6 @@ dont-distribute-packages: - sounddelay - soundgen - source-code-server - - SourceGraph - sparkle - sparrow - sparsebit @@ -2762,49 +2810,41 @@ dont-distribute-packages: - sphero - sphinx-cli - spice - - SpinCounter - spline3 - splines - - Spock-auth - - Spock-lucid - - Spock-worker - sprinkles - sproxy - - sproxy2 - sproxy-web - - sqlite-simple-typed + - sproxy2 - sql-simple-mysql - sql-simple-pool - sql-simple-postgresql - sql-simple-sqlite + - sqlite-simple-typed - sr-extra - sscgi - sshd-lint - sssp - sstable - stable-tree + - stack-hpc-coveralls + - stack-network + - stack-run-auto - stackage - - stackage2nix - stackage-build-plan - stackage-cabal - stackage-query - stackage-sandbox - stackage-setup - stackage-upload - - stack-hpc-coveralls - - stack-network - - stack-run-auto + - stackage2nix - starrover2 - stateful-mtl - static-closure - statsd-client - statsdi - - STLinkUSB - - STM32-Zombie - stmcontrol - - StockholmAlignment - storablevector-streamfusion - - Strafunski-Sdf2Haskell - stratux - stratux-demo - stratux-http @@ -2837,38 +2877,36 @@ dont-distribute-packages: - superconstraints - sv - sv-cassava + - sv-svfactor - svg2q - - SVG2Q - svgone - - sv-svfactor - swapper - swearjure - sweet-egison - switch - sylvia + - sym-plot - symantic-atom - symantic-lib - symbiote - symmetry-operations-symbols - - sym-plot - syncthing-hs - syntax - syntax-attoparsec - syntax-example - syntax-example-json - - SyntaxMacros - - syntaxnet-haskell - syntax-pretty - syntax-printer + - syntaxnet-haskell - synthesizer-llvm - systemstats - t3-client - ta + - tag-stream - tagged-list - tagged-th - tagsoup-navigate - tagstew - - tag-stream - tal - tamarin-prover - tamarin-prover-term @@ -2883,15 +2921,12 @@ dont-distribute-packages: - tasty-laws - tasty-lens - tateti-tateti - - Taxonomy - - TaxonomyTools - tbox - tccli - tdd-util - tdlib - tdlib-gen - tdlib-types - - TeaHS - techlab - telegram-bot - telegram-raw-api @@ -2901,35 +2936,34 @@ dont-distribute-packages: - tensorflow-ops - terminal-text - terrahs - - testbench - test-framework-sandbox - test-sandbox-compose - test-sandbox-hunit - test-sandbox-quickcheck - test-simple - - TeX-my-math - - textmatetags + - testbench - text-plus - text-trie - text-xml-generic + - textmatetags - th-alpha - th-context + - th-instances + - th-typegraph - theatre - theoremquest-client - thimk - - th-instances - - th-typegraph - thumbnail-polish - - tickle - tic-tac-toe + - tickle - tidal-serial - tighttp - timberc - time-exts - time-http - time-io-access - - timeprint - time-warp + - timeprint - timezone-unix - tinyMesh - tip-haskell-frontend @@ -2937,13 +2971,13 @@ dont-distribute-packages: - titan - tls-extra - tn + - to-string-instances - toboggan - todos - toktok - too-many-cells - top - topkata - - to-string-instances - total-map - toxcore - toxcore-c @@ -2963,14 +2997,11 @@ dont-distribute-packages: - trasa-reflex - trasa-server - trasa-th - - TreeCounter - treemap-html-tools - treersec - - Treiber - trek-app - trek-db - triangulation - - TrieMap - tries - trimpolya - truelevel @@ -2997,22 +3028,20 @@ dont-distribute-packages: - type-assertions - type-cache - type-cereal - - TypeClass - type-combinators-quote - type-combinators-singletons - - typed-encoding-encoding - type-digits - - typed-spreadsheet - - typed-streams - - TypeIlluminator - - typelevel - - typelevel-rewrite-rules - type-ord - type-ord-spine-cereal - - typescript-docs - type-sets - type-structure - type-sub-th + - typed-encoding-encoding + - typed-spreadsheet + - typed-streams + - typelevel + - typelevel-rewrite-rules + - typescript-docs - typson-beam - typson-esqueleto - typson-selda @@ -3021,20 +3050,19 @@ dont-distribute-packages: - ucam-webauth - uhc-light - uhc-util - - UMM - unagi-bloomfilter - unbound - unfoldable-restricted - - unicode-normalization - uni-events - - uniformBase - - uniform-io - uni-graphs - uni-htk - uni-posixutil - - uniqueness-periods-vector-examples - uni-reactor - uni-uDrawGraph + - unicode-normalization + - uniform-io + - uniformBase + - uniqueness-periods-vector-examples - universe-th - unix-fcntl - unix-simple @@ -3050,8 +3078,6 @@ dont-distribute-packages: - urembed - uri-enumerator - uri-enumerator-file - - UrlDisp - - URLT - usb - usb-enumerator - usb-hid @@ -3087,7 +3113,6 @@ dont-distribute-packages: - vformat-aeson - vformat-time - vfr-waypoints - - ViennaRNA-extras - vigilance - vimeta - vinyl-operational @@ -3101,7 +3126,6 @@ dont-distribute-packages: - vty-ui-extras - waargonaut - wahsp - - wai-cli - wai-devel - wai-dispatch - wai-handler-snap @@ -3116,26 +3140,18 @@ dont-distribute-packages: - wai-thrift - waldo - warped - - WashNGo - - WAVE - - WaveFront - wavesurfer - wavy - - web3 - - webapi - - WebBits-Html - - WebBits-multiplate - - WebCont - - webcrank-wai - - webdriver-w3c - web-mongrel2 - web-page - web-rep - web-routes-regular - web-routing + - web3 + - webapi + - webcrank-wai + - webdriver-w3c - webserver - - WEditorBrick - - WEditorHyphen - weighted - werewolf-slack - what4 @@ -3146,13 +3162,11 @@ dont-distribute-packages: - wikipedia4epub - windowslive - winio - - WL500gPControl - - wlc-hs - wl-pprint-ansiterm - wl-pprint-terminfo + - wlc-hs - wobsurv - wolf - - WordAlignment - workflow-extra - workflow-pure - workflow-types @@ -3163,28 +3177,23 @@ dont-distribute-packages: - writer-cps-full - wss-client - wtk-gtk + - wu-wei - wumpus-basic - wumpus-drawing - wumpus-microprint - wumpus-tree - - WURFL - - wu-wei - wx - wxAsteroids + - wxFruit + - wxSimpleCanvas - wxc - wxcore - - WXDiffCtrl - - wxFruit - - WxGeneric - wxhnotepad - - wxSimpleCanvas - wxturtle - wyvern - xdcc - xhb-atom-cache - xhb-ewmh - - XML - - xml2x - xml-catalog - xml-enumerator - xml-enumerator-combinators @@ -3193,34 +3202,31 @@ dont-distribute-packages: - xml-push - xml-query-xml-conduit - xml-query-xml-types - - xmltv - xml-tydom-conduit + - xml2x + - xmltv - xmms2-client - xmms2-client-glib - xmonad-contrib-bluetilebranch - xmpipe - - XMPP - xournal-builder - xournal-convert - xournal-parser - xournal-render - - XSaiga - xtc - - Yablog - - YACPong - yajl-enumerator - yam - yam-datasource - yam-job - yam-logger - - yaml-rpc-scotty - - yaml-rpc-snap - - yaml-unscrambler - yam-redis - yam-transaction - yam-transaction-odbc - yam-transaction-postgresql - yam-web + - yaml-rpc-scotty + - yaml-rpc-snap + - yaml-unscrambler - yarr-image-io - yavie - ycextra @@ -3243,15 +3249,12 @@ dont-distribute-packages: - yesod-session-redis - yjftp - yjftp-libs - - Yogurt - - Yogurt-Standalone - yoko - york-lava - yql - yu-launch - yuuko - zasni-gerna - - Z-Botan - zephyr - zerobin - zeromq3-conduit @@ -3263,16 +3266,13 @@ dont-distribute-packages: - zifter-hindent - zifter-hlint - zifter-stack - - Z-IO - zipper - zippo - ziptastic-client - zlib-enum - zmcat - - Z-MessagePack - zoom-cache - zoom-cache-pcm - zoom-cache-sndfile - zoovisitor - zuramaru - - Z-YAML diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2b2f23e20ea..e76f5012f95 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -44,6 +44,7 @@ in , libraryFrameworkDepends ? [], executableFrameworkDepends ? [] , homepage ? "https://hackage.haskell.org/package/${pname}" , platforms ? with lib.platforms; all # GHC can cross-compile +, badPlatforms ? lib.platforms.none , hydraPlatforms ? null , hyperlinkSource ? true , isExecutable ? false, isLibrary ? !isExecutable @@ -52,6 +53,7 @@ in , enableParallelBuilding ? true , maintainers ? null , changelog ? null +, mainProgram ? null , doCoverage ? false , doHaddock ? !(ghc.isHaLVM or false) , passthru ? {} @@ -289,7 +291,7 @@ in lib.fix (drv: assert allPkgconfigDepends != [] -> pkg-config != null; stdenv.mkDerivation ({ - name = "${pname}-${version}"; + inherit pname version; outputs = [ "out" ] ++ (optional enableSeparateDataOutput "data") @@ -663,7 +665,9 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? description) { inherit description; } // optionalAttrs (args ? maintainers) { inherit maintainers; } // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; } + // optionalAttrs (args ? badPlatforms) { inherit badPlatforms; } // optionalAttrs (args ? changelog) { inherit changelog; } + // optionalAttrs (args ? mainProgram) { inherit mainProgram; } ; } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 87864a11e56..4e8e61c05b0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7753,6 +7753,7 @@ self: { ]; description = "The Haskell/R mixed programming environment"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "HABQT" = callPackage @@ -8818,17 +8819,17 @@ self: { ({ mkDerivation, base, constraints, containers, data-default , deepseq, directory, doctest-exitcode-stdio, doctest-lib , exceptions, extra, hspec, monad-control, mono-traversable, mtl - , QuickCheck, regex-tdfa, syb, template-haskell, transformers-base - , unliftio + , QuickCheck, regex-tdfa, stm, syb, template-haskell + , transformers-base, unliftio }: mkDerivation { pname = "HMock"; - version = "0.1.0.1"; - sha256 = "1viv8aggapxvk1akm1z3976h4b12wa8zwkr5qinfpvmsgvlkhhlz"; + version = "0.2.0.0"; + sha256 = "1i5b9fxb5fii3ib97dncr5pfsylj5bsppi45qx7wq1idmz0fq3rj"; libraryHaskellDepends = [ base constraints containers data-default exceptions extra - monad-control mono-traversable mtl regex-tdfa syb template-haskell - transformers-base unliftio + monad-control mono-traversable mtl regex-tdfa stm syb + template-haskell transformers-base unliftio ]; testHaskellDepends = [ base containers data-default deepseq directory @@ -35089,8 +35090,8 @@ self: { }: mkDerivation { pname = "attoparsec-data"; - version = "1.0.5.1"; - sha256 = "1fn28rg79w5kkv3lrmqjcff8fhn1kc2b84vnblr0xqbfdjdbzgp6"; + version = "1.0.5.2"; + sha256 = "05x7xij5jyfzcl0hyjjw4lxlzgkmi55q48s5vbgvba48a2crv0qj"; libraryHaskellDepends = [ attoparsec attoparsec-time base bytestring scientific text time uuid @@ -35234,16 +35235,12 @@ self: { }) {}; "attoparsec-time" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, scientific, text - , time - }: + ({ mkDerivation, attoparsec, base, bytestring, text, time }: mkDerivation { pname = "attoparsec-time"; - version = "1.0.1.1"; - sha256 = "1g3wfc499zdz79i06hgg4286ky9yv4mi3jgq1zf92ik1wcw23q6l"; - libraryHaskellDepends = [ - attoparsec base bytestring scientific text time - ]; + version = "1.0.1.2"; + sha256 = "1pc4dy4d6q11cfmgrg41h2nm34vgnnarah85gnwbd6x48cissrpp"; + libraryHaskellDepends = [ attoparsec base bytestring text time ]; description = "Attoparsec parsers of time"; license = lib.licenses.mit; }) {}; @@ -38232,6 +38229,8 @@ self: { pname = "base32"; version = "0.2.1.0"; sha256 = "1c1qzbri6m8b2m1cr68vrjbny6wlvfyrbfyzd61s83a3y3w39plp"; + revision = "1"; + editedCabalFile = "0apyphnlsnr16s5xb9b9g7d5aw3ny4qx8nz8y71zpglk63sy0cq0"; libraryHaskellDepends = [ base bytestring deepseq ghc-byteorder text text-short ]; @@ -39495,6 +39494,35 @@ self: { broken = true; }) {}; + "bech32_1_1_1" = callPackage + ({ mkDerivation, array, base, base58-bytestring, bytestring + , containers, deepseq, extra, hspec, hspec-discover, memory + , optparse-applicative, process, QuickCheck, text, vector + }: + mkDerivation { + pname = "bech32"; + version = "1.1.1"; + sha256 = "0ibdibki3f51wpxby3cl6p0xzd32ddczlg2dcqxy7lgx7j3h9xgn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring containers extra text + ]; + executableHaskellDepends = [ + base base58-bytestring bytestring extra memory optparse-applicative + text + ]; + testHaskellDepends = [ + base base58-bytestring bytestring containers deepseq extra hspec + memory process QuickCheck text vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "bech32-th" = callPackage ({ mkDerivation, base, bech32, hspec, hspec-discover , template-haskell, text @@ -39513,6 +39541,22 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "bech32-th_1_1_1" = callPackage + ({ mkDerivation, base, bech32, hspec, hspec-discover + , template-haskell, text + }: + mkDerivation { + pname = "bech32-th"; + version = "1.1.1"; + sha256 = "0548an9v6y14qalb1agl5bskcmpb9865lxyap162xzgskd9s4iik"; + libraryHaskellDepends = [ base bech32 template-haskell text ]; + testHaskellDepends = [ base bech32 hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Template Haskell extensions to the Bech32 library"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "bed-and-breakfast" = callPackage ({ mkDerivation, array, base, binary, cpphs, deepseq, QuickCheck , template-haskell @@ -44256,8 +44300,8 @@ self: { }: mkDerivation { pname = "blucontrol"; - version = "0.5.1.1"; - sha256 = "0v3ifwxjbxm86ybn5daqqfdm4nmbfzlbkyc19d4nawnzjyf8v2p9"; + version = "0.6.0.0"; + sha256 = "1rywy6r5wachz3y9vw1iy5b46fvlxcv5s33lrriffimqprkglbcj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47353,8 +47397,8 @@ self: { }: mkDerivation { pname = "bytebuild"; - version = "0.3.7.0"; - sha256 = "1vckm98sarxzqh6ib89y5kzhbf1yxc9wgrbpwbsrh0dv5gi3pclj"; + version = "0.3.8.0"; + sha256 = "19gg4qjlj595j8zd0n6cz2kgz70g8z6w666c6wlf5lj32j8p6yh5"; libraryHaskellDepends = [ base byteslice bytestring integer-logarithms natural-arithmetic primitive primitive-offset primitive-unlifted run-st text-short @@ -50184,8 +50228,8 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.30.2"; - sha256 = "0i0v8cb0a3mbkrb3liw60gb7zflnps5w04a6nx5aynini7mpwanj"; + version = "0.1.30.3"; + sha256 = "0r6vrcdqqf6a8rihjgppmp625ws5vmsmq98i177xfg14hsal49pp"; libraryHaskellDepends = [ aeson async base bytestring calamity-commands colour concurrent-extra connection containers data-default-class @@ -53125,7 +53169,6 @@ self: { ]; description = "A REST Web Api server template for building (micro)services"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "chalk" = callPackage @@ -54638,6 +54681,8 @@ self: { ]; description = "Channel/Arrow based streaming computation library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cielo" = callPackage @@ -58667,6 +58712,24 @@ self: { license = lib.licenses.mit; }) {}; + "colour_2_3_6" = callPackage + ({ mkDerivation, base, QuickCheck, random, test-framework + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "colour"; + version = "2.3.6"; + sha256 = "0wgqj64mh2y2zk77kv59k3xb3dk4wmgfp988y74sp9a4d76mvlrc"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base QuickCheck random test-framework test-framework-quickcheck2 + ]; + description = "A model for human colour/color perception"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "colour-accelerate" = callPackage ({ mkDerivation, accelerate, base }: mkDerivation { @@ -67215,8 +67278,8 @@ self: { }: mkDerivation { pname = "cuckoo"; - version = "0.2.1"; - sha256 = "1bv39vfg0yzancyya1cdbrcdc0gasp0djcc9ryiwrc3kf9y0nbzn"; + version = "0.2.2"; + sha256 = "1wm81a5fsq0wdvx3ayxfrljya7rm9c0vfmy5dhxa6h9zxnqrkvav"; libraryHaskellDepends = [ base memory primitive random vector ]; testHaskellDepends = [ base bytestring cryptonite doctest hashable memory primitive @@ -69699,6 +69762,18 @@ self: { license = lib.licenses.mit; }) {}; + "data-lens-light_0_1_2_3" = callPackage + ({ mkDerivation, base, mtl, template-haskell }: + mkDerivation { + pname = "data-lens-light"; + version = "0.1.2.3"; + sha256 = "1xczbmgin315qh9wpl6v2vvnp6hv1irfbfqs7pk034qcpx61fwdl"; + libraryHaskellDepends = [ base mtl template-haskell ]; + description = "Simple lenses, minimum dependencies"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "data-lens-template" = callPackage ({ mkDerivation, base, data-lens, template-haskell }: mkDerivation { @@ -73854,6 +73929,8 @@ self: { pname = "dhall-docs"; version = "1.0.6"; sha256 = "004n8kh8riw67aqwp6z9199jwv2c9r1dbkg92s71vd9zc04wxljv"; + revision = "1"; + editedCabalFile = "1m8ms4y4pxiays620k4zjf7hnfk103y990pnhnb6hr0h70n7i157"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -74537,6 +74614,8 @@ self: { pname = "diagrams-graphviz"; version = "1.4.1.1"; sha256 = "0lscrxd682jvyrl5bj4dxp7593qwyis01sl0p4jm2jfn335wdq40"; + revision = "1"; + editedCabalFile = "1qx69541pxf71whfz2a913yzbhfcks2pyzfprkgrcmiiyv0a3i7b"; libraryHaskellDepends = [ base containers diagrams-lib fgl graphviz split ]; @@ -75620,8 +75699,8 @@ self: { }: mkDerivation { pname = "digraph"; - version = "0.2"; - sha256 = "0k6kr1vr25i2jvv2q1xby06b7xkpg2dr4sq2ffnv0lmznshjy8y5"; + version = "0.2.1"; + sha256 = "04x8y6snlfm8w22l0mn58sqbgdsc3av9l6qz2wqfdjmcp7h7s79r"; libraryHaskellDepends = [ base containers deepseq hashable massiv mwc-random streaming transformers unordered-containers @@ -78678,8 +78757,8 @@ self: { }: mkDerivation { pname = "domain"; - version = "0.1.1.1"; - sha256 = "1vy789dv1lpha2bxvr0x1vk2vvgb9z43abkqi1rbj2vvirqsbr1n"; + version = "0.1.1.2"; + sha256 = "0s4x7jhhcx94fzi8cg5bqfqn2vajdlv1yjrakfnfdqk187zbdc6r"; libraryHaskellDepends = [ attoparsec base bytestring domain-core foldl hashable parser-combinators template-haskell template-haskell-compat-v0208 @@ -78687,7 +78766,8 @@ self: { ]; testHaskellDepends = [ base domain-core QuickCheck quickcheck-instances rerebase tasty - tasty-hunit tasty-quickcheck template-haskell text th-orphans + tasty-hunit tasty-quickcheck template-haskell + template-haskell-compat-v0208 text th-orphans ]; description = "Codegen helping you define domain models"; license = lib.licenses.mit; @@ -85429,7 +85509,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "esqueleto_3_5_1_0" = callPackage + "esqueleto_3_5_2_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql @@ -85439,8 +85519,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.5.1.0"; - sha256 = "1r77lym11gh53059b3hg5wyzb4ymaynk5awrmzgnwfkmx041sqp8"; + version = "3.5.2.0"; + sha256 = "06z5n0nbyrdvzlfqmx3jvh76kkss3bis19k5ppqkifsfgwi07rzw"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -88678,8 +88758,8 @@ self: { }: mkDerivation { pname = "fakedata-quickcheck"; - version = "0.1.0"; - sha256 = "0al5brin9bs0553rrw073za4jzw2whrf05yj6h34lmx4kxzciv6s"; + version = "0.2.0"; + sha256 = "0m70r66vbkgi1d016cpgahaas17hysabp44nigz4cda9l3x6qmh6"; libraryHaskellDepends = [ base fakedata QuickCheck random ]; testHaskellDepends = [ base fakedata hspec hspec-core QuickCheck random regex-tdfa text @@ -96670,8 +96750,8 @@ self: { }: mkDerivation { pname = "funcons-tools"; - version = "0.2.0.11"; - sha256 = "1gi7db5mjq25xwl27ihsrg0ya1jgw5zhki5c1431rizj72yx5ji9"; + version = "0.2.0.13"; + sha256 = "0favv5lfhhhsjasn0gfx2m9q18j8qjk3w92ih78nqaam8gfg59vm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96693,10 +96773,10 @@ self: { ({ mkDerivation, base, bv, containers, multiset, text, vector }: mkDerivation { pname = "funcons-values"; - version = "0.1.0.7"; - sha256 = "0jdgwv44gs4zr8z5pg6lzikrgn3dzna8z0vriq71anlifjyci8yq"; + version = "0.1.0.9"; + sha256 = "1817jhp9vpipkvxdqvn4yj88z7z3pyrxs22h4d51c3056ighq6wn"; revision = "1"; - editedCabalFile = "1aam84wminmcy530vkv8g2qkag6gz45yyx5xks7gq1y7jifm1kkb"; + editedCabalFile = "1g807b4lpz0whz0v4xl7y0qj0682y9lvmng06rxxyabn2lcvx5sc"; libraryHaskellDepends = [ base bv containers multiset text vector ]; @@ -97353,6 +97433,8 @@ self: { pname = "futhark-data"; version = "1.0.0.1"; sha256 = "126b7igrk0aldj4kjwkyvvsy3v64g9iv6w9ladbbfnd4qw7svswm"; + revision = "1"; + editedCabalFile = "08p820dmdlg5x6ikgi69sddkywj71cnnjwz2fppnv901bbn55fav"; libraryHaskellDepends = [ base binary bytestring bytestring-to-vector containers megaparsec mtl text vector vector-binary-instances @@ -104049,8 +104131,9 @@ self: { libraryPkgconfigDepends = [ libwnck ]; description = "Wnck bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {inherit (pkgs) libwnck;}; "gi-xlib" = callPackage @@ -104890,6 +104973,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "githash_0_1_6_1" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , process, template-haskell, temporary, th-compat, unliftio + }: + mkDerivation { + pname = "githash"; + version = "0.1.6.1"; + sha256 = "0g922g2l3xv795gvhri5ccrh751dnyckjs7mzv1d8pg2lffpj0bi"; + libraryHaskellDepends = [ + base bytestring directory filepath process template-haskell + th-compat + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec process template-haskell + temporary th-compat unliftio + ]; + description = "Compile git revision info into Haskell projects"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , binary, binary-instances, bytestring, containers, cryptohash-sha1 @@ -105266,6 +105370,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "gitlab-haskell_0_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection, http-conduit + , http-types, tasty, tasty-hunit, temporary, text, time + , transformers, unix, unliftio, unliftio-core + }: + mkDerivation { + pname = "gitlab-haskell"; + version = "0.3.0"; + sha256 = "0krcan8i9lkickl77r9dyf93k96yxj5zp0asmzq86ds13m8f3s9i"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring connection http-conduit http-types temporary + text time transformers unix unliftio unliftio-core + ]; + testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; + description = "A Haskell library for the GitLab web API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "gitlib" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, conduit , conduit-combinators, containers, directory, exceptions, filepath @@ -129646,8 +129770,8 @@ self: { }: mkDerivation { pname = "hledger-flow"; - version = "0.14.3.0"; - sha256 = "113lr6b47fs3900wrn8fg1kxcbvfh91gla7585h13miz3wyjbdyf"; + version = "0.14.4"; + sha256 = "1qvh5vgnk6vrhhr1kjqsycz13acxa7ynpqnd1bmchfl4q3aga9gw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -138853,6 +138977,8 @@ self: { ]; description = "SSH protocol implementation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hsshellscript" = callPackage @@ -139686,8 +139812,8 @@ self: { pname = "html-parse"; version = "0.2.0.2"; sha256 = "0dm771lrrqc87ygbr3dzyl1vsyi30jgr7l0isvsbqyah7s4zyg38"; - revision = "1"; - editedCabalFile = "1hr9bskwwx3svxqaxcyaz8v0brli1bb03xcvg7zpgbisf8x6r316"; + revision = "2"; + editedCabalFile = "1arck1sfcnqfczpi6zq4rja3svd3vcxxdi69dv9983v3sl01hk2g"; libraryHaskellDepends = [ attoparsec base containers deepseq text ]; @@ -144402,8 +144528,8 @@ self: { }: mkDerivation { pname = "hypertypes"; - version = "0.1.0.1"; - sha256 = "0b3cnjw07pryqslnx0k6lxdpwnihnk6pnhp6l9d09mqyxymd9nyx"; + version = "0.1.0.2"; + sha256 = "1zh10884a2fvj06ndh4hz2vk97x4nibr57b30kgq731x4q50zgfs"; libraryHaskellDepends = [ array base base-compat binary constraints containers deepseq generic-constraints generic-data lattices lens monad-st mtl pretty @@ -145703,6 +145829,7 @@ self: { ]; description = "Embed R quasiquotes and plots in IHaskell notebooks"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ihaskell-juicypixels" = callPackage @@ -147694,6 +147821,8 @@ self: { ]; description = "Seamlessly call R from Haskell and vice versa. No FFI required."; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) R;}; "inliterate" = callPackage @@ -149399,8 +149528,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2location"; - version = "8.2.1"; - sha256 = "1ccr15yn2ska5wgwlcnfpi9w1xxkly0pwqibmdl9a1ggmwfsskv0"; + version = "8.3.1"; + sha256 = "01sdx0j0rm7rgylac51mk4ph5krdnzdd8532di5g5ik3p112dzg8"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Location Haskell package for IP geolocation"; license = lib.licenses.mit; @@ -153778,8 +153907,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.5.3"; - sha256 = "00774gby970jxa69zw8baki40r6nw7vrprc670n8skmlp03p38j2"; + version = "0.5.4"; + sha256 = "10lmx9xwikk4sbc3ffpzqff9qxpphgp2q8w2rdm2iskaa7qi3skn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156121,8 +156250,8 @@ self: { }: mkDerivation { pname = "knit"; - version = "0.2.0.0"; - sha256 = "0a1swv5w9fxissxqr2x61qijqyhdxs71fv21fjz4r0kcqywnvy6x"; + version = "0.3.0.0"; + sha256 = "0wp16yrlibfl32b4akcwali074wxar96mvaykgh0xsf4pq1czx3q"; libraryHaskellDepends = [ base bytestring containers deepseq hashtables vector ]; @@ -164941,6 +165070,31 @@ self: { license = lib.licenses.mit; }) {}; + "literatex_0_2_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, conduit + , filepath, optparse-applicative, tasty, tasty-hunit, text, ttc + , unliftio + }: + mkDerivation { + pname = "literatex"; + version = "0.2.0.0"; + sha256 = "1j5x1hfh71jpywgwpbyir74h58b6lzaj7gpk2f07xlcwqmm68syz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring conduit text ttc unliftio + ]; + executableHaskellDepends = [ + ansi-wl-pprint base optparse-applicative ttc + ]; + testHaskellDepends = [ + base bytestring filepath tasty tasty-hunit text ttc unliftio + ]; + description = "transform literate source code to Markdown"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "little-earley" = callPackage ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }: mkDerivation { @@ -166064,8 +166218,8 @@ self: { }: mkDerivation { pname = "log-elasticsearch"; - version = "0.12.0.0"; - sha256 = "05cvk93s61k42bmsmj4997hdij4xk74a6jrd1qvdbkq13w20260m"; + version = "0.12.1.0"; + sha256 = "07z0p5jcd5gjhk4dyf9ny74l68ja58ffa80mbfsyaz66ff6k4y6s"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq http-client http-client-tls http-types log-base network-uri @@ -171134,6 +171288,29 @@ self: { broken = true; }) {}; + "matrix-client" = callPackage + ({ mkDerivation, aeson, base, base64, bytestring, doctest + , exceptions, hashable, hspec, http-client, http-client-tls, retry + , SHA, text, time, unordered-containers + }: + mkDerivation { + pname = "matrix-client"; + version = "0.1.0.0"; + sha256 = "10w1q846b4jnyg9yb87d69ixfyhl205ryrib6a53pbk0bx6zn59w"; + libraryHaskellDepends = [ + aeson base base64 bytestring exceptions hashable http-client + http-client-tls retry SHA text time unordered-containers + ]; + testHaskellDepends = [ + aeson base base64 bytestring doctest exceptions hashable hspec + http-client http-client-tls retry SHA text time + unordered-containers + ]; + description = "A matrix client library"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ maralorn ]; + }) {}; + "matrix-lens" = callPackage ({ mkDerivation, base, hedgehog, lens, matrix, tasty , tasty-discover, tasty-hedgehog, tasty-hspec, vector @@ -172903,16 +173080,14 @@ self: { }) {}; "merkle-log" = callPackage - ({ mkDerivation, base, bytestring, cereal, criterion, cryptonite - , deepseq, exceptions, hash-tree, memory, merkle-tree, mwc-random - , QuickCheck, random, random-bytestring, text + ({ mkDerivation, base, bytestring, criterion, cryptonite, deepseq + , exceptions, hash-tree, memory, mwc-random, QuickCheck, random + , random-bytestring, text }: mkDerivation { pname = "merkle-log"; - version = "0.1.0.0"; - sha256 = "07q0ifgwq8agwm62k1k83sdrln4zbj6ln90nw9p9g3pgxnp3inia"; - revision = "1"; - editedCabalFile = "1vrzsflvmx0mrsdb7i7pbz4d74k6yjccrb7979yw0r91qhmzlcir"; + version = "0.1.1"; + sha256 = "17a6s9xbv460289avbwdnf8c4vhw9qzj5xddxvfmnjjwp58qxvj1"; libraryHaskellDepends = [ base bytestring cryptonite deepseq exceptions memory text ]; @@ -172920,8 +173095,8 @@ self: { base bytestring cryptonite deepseq exceptions memory QuickCheck ]; benchmarkHaskellDepends = [ - base bytestring cereal criterion cryptonite deepseq hash-tree - memory merkle-tree mwc-random QuickCheck random random-bytestring + base bytestring criterion cryptonite deepseq hash-tree memory + mwc-random QuickCheck random random-bytestring ]; description = "Merkle Tree Logs"; license = lib.licenses.bsd3; @@ -173594,31 +173769,33 @@ self: { }) {}; "microformats2-parser" = callPackage - ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base - , base-compat, blaze-html, blaze-markup, bytestring, containers - , data-default, either, errors, hspec - , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl - , network, network-uri, options, pcre-heavy, raw-strings-qq, safe - , scotty, tagsoup, template-haskell, text, time, transformers - , unordered-containers, vector, wai-cli, wai-extra, xml-lens - , xss-sanitize + ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec + , aws-lambda-haskell-runtime, aws-lambda-haskell-runtime-wai, base + , base-compat, blaze-html, blaze-markup, bytestring + , case-insensitive, containers, data-default, either, errors + , githash, hspec, hspec-expectations-pretty-diff, html-conduit + , lens, lens-aeson, mtl, network, network-uri, options, pcre-heavy + , raw-strings-qq, safe, scotty, tagsoup, template-haskell, text + , time, transformers, unordered-containers, vector, wai, wai-cli + , wai-extra, xml-lens, xss-sanitize }: mkDerivation { pname = "microformats2-parser"; - version = "1.0.1.9"; - sha256 = "1lxbw825yg16nmflf93l1sy6mxa3dnd7a5mdalc034brsnf1vish"; + version = "1.0.2.0"; + sha256 = "1vrw60az8jb3m9kk2vsn1v5l68jmwxsfw3p7lfwl9a8d4gk5m1gp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-qq attoparsec base base-compat blaze-markup bytestring - containers data-default either errors html-conduit lens-aeson - network-uri pcre-heavy safe tagsoup text time transformers - unordered-containers vector xml-lens xss-sanitize + case-insensitive containers data-default either errors html-conduit + lens lens-aeson network-uri pcre-heavy safe tagsoup text time + transformers unordered-containers vector xml-lens xss-sanitize ]; executableHaskellDepends = [ - aeson aeson-pretty base base-compat blaze-html blaze-markup - data-default network network-uri options scotty text wai-cli - wai-extra + aeson aeson-pretty aws-lambda-haskell-runtime + aws-lambda-haskell-runtime-wai base base-compat blaze-html + blaze-markup data-default githash network network-uri options + scotty text wai wai-cli wai-extra ]; testHaskellDepends = [ aeson-qq base base-compat bytestring data-default hspec @@ -173628,6 +173805,7 @@ self: { description = "A Microformats 2 parser"; license = lib.licenses.publicDomain; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "microformats2-types" = callPackage @@ -189008,8 +189186,8 @@ self: { pname = "nvim-hs"; version = "2.1.0.4"; sha256 = "0bg94adja6xvzlv1x849nrfpb0i5mjbp19f9cwhaa4iw1qs532rf"; - revision = "1"; - editedCabalFile = "0yzdq8nxf2n7n4ns6frgl5nhgb3vj3nkh7336mz994iydam17wcl"; + revision = "2"; + editedCabalFile = "0bd90ndkk4lll4rvr87b9vil2h8jlchkh1fag1nrhj90lnczgpnl"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -189033,6 +189211,44 @@ self: { license = lib.licenses.asl20; }) {}; + "nvim-hs_2_1_0_5" = callPackage + ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit + , containers, data-default, deepseq, foreign-store, hslogger, hspec + , hspec-discover, HUnit, megaparsec, messagepack, mtl, network + , optparse-applicative, path, path-io, prettyprinter + , prettyprinter-ansi-terminal, QuickCheck, resourcet, stm + , streaming-commons, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , typed-process, unliftio, unliftio-core, utf8-string, vector, void + }: + mkDerivation { + pname = "nvim-hs"; + version = "2.1.0.5"; + sha256 = "11ld5bgrica3ma54f7x37hcbcl0ms3x6gi0326by3jsnskxplz0z"; + libraryHaskellDepends = [ + base bytestring cereal cereal-conduit conduit containers + data-default deepseq foreign-store hslogger megaparsec messagepack + mtl network optparse-applicative path path-io prettyprinter + prettyprinter-ansi-terminal resourcet stm streaming-commons + template-haskell text time time-locale-compat transformers + transformers-base typed-process unliftio unliftio-core utf8-string + vector void + ]; + testHaskellDepends = [ + base bytestring cereal cereal-conduit conduit containers + data-default foreign-store hslogger hspec hspec-discover HUnit + megaparsec messagepack mtl network optparse-applicative path + path-io prettyprinter prettyprinter-ansi-terminal QuickCheck + resourcet stm streaming-commons template-haskell text time + time-locale-compat transformers transformers-base typed-process + unliftio unliftio-core utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell plugin backend for neovim"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "nvim-hs-contrib" = callPackage ({ mkDerivation, base, bytestring, data-default, directory , filepath, hspec, hspec-discover, messagepack, mtl, nvim-hs @@ -192465,12 +192681,12 @@ self: { }) {}; "optparse-declarative" = callPackage - ({ mkDerivation, base, mtl }: + ({ mkDerivation, base, exceptions, mtl }: mkDerivation { pname = "optparse-declarative"; - version = "0.4.1"; - sha256 = "0paa7r64y0nb9yv3x387pdid68lnc1gn2m28kcli55dvh1x4wwxr"; - libraryHaskellDepends = [ base mtl ]; + version = "0.4.2"; + sha256 = "0a8b4aa5zvj36nj81kfylxcqfp9ahi5lnak61wvwv9bw68r2a2jn"; + libraryHaskellDepends = [ base exceptions mtl ]; description = "Declarative command line option parser"; license = lib.licenses.mit; }) {}; @@ -192541,6 +192757,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "optparse-simple_0_1_1_4" = callPackage + ({ mkDerivation, base, bytestring, directory, githash + , optparse-applicative, template-haskell, th-compat, transformers + }: + mkDerivation { + pname = "optparse-simple"; + version = "0.1.1.4"; + sha256 = "0y3qgab8csiwyv60cnpzpv65n3c0ikvdx5b5mfkfahkv8xfdh08x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base githash optparse-applicative template-haskell th-compat + transformers + ]; + testHaskellDepends = [ base bytestring directory ]; + description = "Simple interface to optparse-applicative"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "optparse-text" = callPackage ({ mkDerivation, base, hspec, optparse-applicative, text }: mkDerivation { @@ -194186,6 +194422,65 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "pandoc_2_14_0_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base + , base64-bytestring, binary, blaze-html, blaze-markup, bytestring + , case-insensitive, citeproc, commonmark, commonmark-extensions + , commonmark-pandoc, connection, containers, data-default, deepseq + , Diff, directory, doclayout, doctemplates, emojis, exceptions + , file-embed, filepath, Glob, haddock-library, hslua + , hslua-module-path, hslua-module-system, hslua-module-text, HsYAML + , HTTP, http-client, http-client-tls, http-types, ipynb + , jira-wiki-markup, JuicyPixels, mtl, network, network-uri + , pandoc-types, parsec, process, QuickCheck, random, safe + , scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-collation, unicode-transforms, unix + , unordered-containers, xml, xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "pandoc"; + version = "2.14.0.3"; + sha256 = "1pgd6125mrvzj2faxbsfmackb7kchzcr6bjkrwqbyn9hzxdzbqw2"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty array attoparsec base base64-bytestring binary + blaze-html blaze-markup bytestring case-insensitive citeproc + commonmark commonmark-extensions commonmark-pandoc connection + containers data-default deepseq directory doclayout doctemplates + emojis exceptions file-embed filepath Glob haddock-library hslua + hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP + http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels mtl network network-uri pandoc-types parsec process + random safe scientific SHA skylighting skylighting-core split syb + tagsoup temporary texmath text text-conversions time + unicode-collation unicode-transforms unix unordered-containers xml + xml-conduit zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring containers Diff directory doctemplates exceptions + filepath Glob hslua mtl pandoc-types process QuickCheck tasty + tasty-golden tasty-hunit tasty-lua tasty-quickcheck text time xml + zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers deepseq mtl tasty-bench text time + ]; + postInstall = '' + mkdir -p $out/share/man/man1 + mv "man/"*.1 $out/share/man/man1/ + ''; + description = "Conversion between markup formats"; + license = lib.licenses.gpl2Plus; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -196066,8 +196361,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parsec1"; - version = "1.0.0.7"; - sha256 = "1v9kq4g378v8pkj8ldpqwh9dwlng5idbxqqb8ywmzdjnglih34rf"; + version = "1.0.0.8"; + sha256 = "02zagbrn4w6gjl9awh4si5b6ia14p4rx22cssd03zx4ddb8kcwf7"; libraryHaskellDepends = [ base ]; description = "Portable monadic parser combinators"; license = lib.licenses.bsd3; @@ -199002,7 +199297,7 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; - "persistent_2_13_0_3" = callPackage + "persistent_2_13_0_4" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, bytestring, conduit, containers, criterion, deepseq , fast-logger, file-embed, hspec, http-api-data, lift-type @@ -199013,8 +199308,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.13.0.3"; - sha256 = "0jlrkyy10cz6rq47r75q9l5ycyrdjwxs810x7v5ijrimdd9cv24d"; + version = "2.13.0.4"; + sha256 = "04q4x50p2jpsp7fzrb61rs225hnrl8n1khmdvf0z6inkwq462w6a"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html bytestring conduit containers fast-logger http-api-data lift-type monad-logger @@ -203390,6 +203685,8 @@ self: { ]; description = "run a subprocess, combining stdout and stderr"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "plist" = callPackage @@ -203588,8 +203885,8 @@ self: { }: mkDerivation { pname = "ploterific"; - version = "0.2.1.2"; - sha256 = "1ywg09amxngan23c5724c5s2s79yhynqha6c5xivg1ls58nc7yk5"; + version = "0.2.1.3"; + sha256 = "0ggi653hjg9s3v9zqsapm3ryb37hfdbw21pznhsvzhyy3n0fv7jv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -204883,6 +205180,25 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "polysemy-readline" = callPackage + ({ mkDerivation, base, exceptions, haskeline, polysemy + , polysemy-plugin + }: + mkDerivation { + pname = "polysemy-readline"; + version = "0.1.0.0"; + sha256 = "19nic0n5k3r5qbmhnrzwrkncj61ba43qmg86mx0y190mvx540yz1"; + libraryHaskellDepends = [ + base exceptions haskeline polysemy polysemy-plugin + ]; + testHaskellDepends = [ + base exceptions haskeline polysemy polysemy-plugin + ]; + description = "Readline effect for polysemy"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "polysemy-resume" = callPackage ({ mkDerivation, base, hedgehog, polysemy, polysemy-plugin , polysemy-test, relude, tasty, tasty-hedgehog, text, transformers @@ -216627,24 +216943,24 @@ self: { , filepath, hashable, html-entities, http-conduit, HUnit , lifted-base, mmorph, mtl, network-uri, parsec, parsers , QuickCheck, safe, selective, tasty, tasty-hunit, tasty-quickcheck - , text, unordered-containers, xeno + , template-haskell, temporary, text, unordered-containers, xeno }: mkDerivation { pname = "rdf4h"; - version = "4.0.2"; - sha256 = "1gkz1i1v2509aa5c9jp2lgmsnnsr7d1314gq3xmcs21dfgf7xibw"; + version = "5.0.1"; + sha256 = "0i6sza600fzrk92pp9qc4ji361js5adg7ijf30hb9fdl854hjgk9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ algebraic-graphs attoparsec base binary bytestring containers deepseq exceptions filepath hashable html-entities http-conduit - lifted-base mmorph mtl network-uri parsec parsers selective text - unordered-containers xeno + lifted-base mmorph mtl network-uri parsec parsers selective + template-haskell text unordered-containers xeno ]; executableHaskellDepends = [ base containers text ]; testHaskellDepends = [ - base containers directory filepath HUnit QuickCheck safe tasty - tasty-hunit tasty-quickcheck text + base bytestring containers directory filepath HUnit QuickCheck safe + tasty tasty-hunit tasty-quickcheck temporary text ]; benchmarkHaskellDepends = [ base criterion deepseq text ]; description = "A library for RDF processing in Haskell"; @@ -222901,6 +223217,7 @@ self: { description = "Robert Fischer's Common library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "rfc-env" = callPackage @@ -223672,8 +223989,8 @@ self: { }: mkDerivation { pname = "rio-process-pool"; - version = "1.0.0"; - sha256 = "09v95wyrsa6yg5q5zaf9gqmn2xhh1i1q2mmxq52xhpc8pqwj93b9"; + version = "1.0.1"; + sha256 = "1r3w7p9yf2k2czdwm739y191x25ravbsn948wwgqxsqamsqs7l18"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231554,14 +231871,41 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant_0_18_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors + , bytestring, case-insensitive, deepseq, hspec, hspec-discover + , http-api-data, http-media, http-types, mmorph, mtl, network-uri + , QuickCheck, quickcheck-instances, singleton-bool, sop-core + , string-conversions, tagged, text, transformers, vault + }: + mkDerivation { + pname = "servant"; + version = "0.18.3"; + sha256 = "033ykm8l7a9bjcwb3v9d0ljglq1sxpjm1iss7nqakpyxljcg2sxp"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bifunctors bytestring + case-insensitive deepseq http-api-data http-media http-types mmorph + mtl network-uri QuickCheck singleton-bool sop-core + string-conversions tagged text transformers vault + ]; + testHaskellDepends = [ + aeson base base-compat bytestring hspec http-media mtl QuickCheck + quickcheck-instances string-conversions text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-JuicyPixels" = callPackage ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant , servant-server, wai, warp }: mkDerivation { pname = "servant-JuicyPixels"; - version = "0.3.0.6"; - sha256 = "16bdlgrz71h03lr2xcd2isclfzgr9h2xdl5lbnbs0v1czaxx7m6h"; + version = "0.3.1.0"; + sha256 = "1mi9b84myy3sg35xxrna5pwjwkn51v0xsd300ssvy8xaj4k96wjk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231611,8 +231955,8 @@ self: { pname = "servant-auth"; version = "0.4.0.0"; sha256 = "0v2g80kakjwpws92bk3anzy4k8vgxq99y7g3ib4amc5x6kxcmjh1"; - revision = "2"; - editedCabalFile = "0mbx44l1jnvfvppv6diiixqx5rdkb68djxl36m5sd12qz6rqmcx0"; + revision = "3"; + editedCabalFile = "1hq0mz4fm2f6v57jzyahk5wfip285v3yh20dawvmwdh7wq6104zr"; libraryHaskellDepends = [ aeson base jose lens servant text unordered-containers ]; @@ -231631,8 +231975,8 @@ self: { pname = "servant-auth-client"; version = "0.4.1.0"; sha256 = "16rmwdrx0qyqa821ipayczzl3gv8gvqgx8k9q8qaw19w87hwkh83"; - revision = "1"; - editedCabalFile = "0q7bazq4ilijclpz23fshpjcspnrfalh7jhqi5gg03m00wwibn4n"; + revision = "2"; + editedCabalFile = "0mq9nhrlh44jxkngj06pasrrjzv5193lj6d2szprnncgrk36zi31"; libraryHaskellDepends = [ base bytestring containers servant servant-auth servant-client-core ]; @@ -231687,8 +232031,8 @@ self: { pname = "servant-auth-docs"; version = "0.2.10.0"; sha256 = "0j1ynnrb6plrhpb2vzs2p7a9jb41llp0j1jwgap7hjhkwhyc7wxd"; - revision = "7"; - editedCabalFile = "10178ahxq36l9mik7dcn1c1f97fpp8b4r7xiqwiv21llp95s7cqp"; + revision = "8"; + editedCabalFile = "01mb003lajxs1x82k20dbnxzdvxdla51vi4dh4f0a1xycvyhfpyi"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base lens servant servant-auth servant-docs text @@ -231753,8 +232097,8 @@ self: { pname = "servant-auth-server"; version = "0.4.6.0"; sha256 = "0isl9pzzhfbs8pgh3qr2vbgfp0bh741dfa59sq7n3cmbkc6ndpkk"; - revision = "2"; - editedCabalFile = "1vf0mnbq0wmwha3aa2fn593dwibaw00l4agspgvchx7574jyr5wp"; + revision = "3"; + editedCabalFile = "0iasfns12wab45hf4qkwm5bx1z63ass9n5sh926wnn82g1v6qdyw"; libraryHaskellDepends = [ aeson base base64-bytestring blaze-builder bytestring case-insensitive cookie data-default-class entropy http-types jose @@ -231779,8 +232123,8 @@ self: { pname = "servant-auth-swagger"; version = "0.2.10.1"; sha256 = "029nvb4wxwl98ah26bgcq1b7izrnvssxwn1682liimvsh4a8bady"; - revision = "2"; - editedCabalFile = "0b8fawx2wv9zshn9i4abnwy4lgf3fkhbhm8bhfpgm9d867dx21y4"; + revision = "3"; + editedCabalFile = "1hkszdp7c7c34b2yp2gb7khzlzq8iw5ma066r30kq2nw5jj895k0"; libraryHaskellDepends = [ base lens servant servant-auth servant-swagger swagger2 text ]; @@ -232112,6 +232456,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-client_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring, containers + , deepseq, entropy, exceptions, hspec, hspec-discover + , http-api-data, http-client, http-media, http-types, HUnit + , kan-extensions, markdown-unlit, monad-control, mtl, network + , QuickCheck, semigroupoids, servant, servant-client-core + , servant-server, sop-core, stm, tdigest, text, time, transformers + , transformers-base, transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.18.3"; + sha256 = "0ddn7x9z2znkkyn6l2x6a85vq673q4vppr0q9n56ibvl3k3saxj0"; + libraryHaskellDepends = [ + base base-compat bytestring containers deepseq exceptions + http-client http-media http-types kan-extensions monad-control mtl + semigroupoids servant servant-client-core stm text time + transformers transformers-base transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring entropy hspec http-api-data + http-client http-types HUnit kan-extensions markdown-unlit mtl + network QuickCheck servant servant-client-core servant-server + sop-core stm tdigest text transformers transformers-compat wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-client-core" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, deepseq, exceptions, free, hspec @@ -232135,6 +232510,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-client-core_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, containers, deepseq, exceptions, free, hspec + , hspec-discover, http-media, http-types, network-uri, QuickCheck + , safe, servant, sop-core, template-haskell, text, transformers + }: + mkDerivation { + pname = "servant-client-core"; + version = "0.18.3"; + sha256 = "1iln4axymmmk3ib0wxmpzjgq16lip8nz7xich3ysgzx6g2n15xsd"; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring containers + deepseq exceptions free http-media http-types network-uri safe + servant sop-core template-haskell text transformers + ]; + testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Core functionality and class for client function generation for servant APIs"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-client-js" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive , containers, exceptions, http-media, http-types, jsaddle @@ -232187,6 +232584,8 @@ self: { pname = "servant-conduit"; version = "0.15.1"; sha256 = "1vy3ihypb0zm2yd16rq120qw3898i3c0mahh2jysssv65g0avdwp"; + revision = "1"; + editedCabalFile = "0j7jrwyj6vnfr8wyyzjjm6gakx401aylrq8shc2y9ciy0mhf8lrv"; libraryHaskellDepends = [ base bytestring conduit mtl resourcet servant unliftio-core ]; @@ -232310,6 +232709,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-docs_0_11_9" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring + , case-insensitive, hashable, http-media, http-types, lens, servant + , string-conversions, tasty, tasty-golden, tasty-hunit, text + , transformers, universe-base, unordered-containers + }: + mkDerivation { + pname = "servant-docs"; + version = "0.11.9"; + sha256 = "0ynjyyxlzb2j5d92rryqqa97rp16582mbmvnv7syczha5ziq24nk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat bytestring case-insensitive + hashable http-media http-types lens servant string-conversions text + universe-base unordered-containers + ]; + executableHaskellDepends = [ + aeson base lens servant string-conversions text + ]; + testHaskellDepends = [ + aeson base base-compat lens servant string-conversions tasty + tasty-golden tasty-hunit transformers + ]; + description = "generate API docs for your servant webservice"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-docs-simple" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hspec , hspec-core, ordered-containers, prettyprinter, raw-strings-qq @@ -232552,6 +232980,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-foreign_0_15_4" = callPackage + ({ mkDerivation, base, base-compat, hspec, hspec-discover + , http-types, lens, servant, text + }: + mkDerivation { + pname = "servant-foreign"; + version = "0.15.4"; + sha256 = "0bznb73rbgfgkg7n4pxghkqsfca0yw9vak73c6w8sqvc2mjnc7mz"; + libraryHaskellDepends = [ + base base-compat http-types lens servant text + ]; + testHaskellDepends = [ base hspec servant ]; + testToolDepends = [ hspec-discover ]; + description = "Helpers for generating clients for servant APIs in any programming language"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-gdp" = callPackage ({ mkDerivation, aeson, base, gdp, servant-server, text }: mkDerivation { @@ -232737,6 +233183,41 @@ self: { broken = true; }) {}; + "servant-http-streams_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, bytestring + , case-insensitive, containers, deepseq, entropy, exceptions, hspec + , hspec-discover, http-api-data, http-common, http-media + , http-streams, http-types, HUnit, io-streams, kan-extensions + , markdown-unlit, monad-control, mtl, network, QuickCheck + , semigroupoids, servant, servant-client-core, servant-server, stm + , tdigest, text, time, transformers, transformers-base + , transformers-compat, wai, warp + }: + mkDerivation { + pname = "servant-http-streams"; + version = "0.18.3"; + sha256 = "0cc4qmbzq4n1yp5yfg76w1skkksh13qlbza9i2pgsxa9sc39s5fa"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive containers deepseq + exceptions http-common http-media http-streams http-types + io-streams kan-extensions monad-control mtl semigroupoids servant + servant-client-core text time transformers transformers-base + transformers-compat + ]; + testHaskellDepends = [ + aeson base base-compat bytestring deepseq entropy hspec + http-api-data http-streams http-types HUnit kan-extensions + markdown-unlit mtl network QuickCheck servant servant-client-core + servant-server stm tdigest text transformers transformers-compat + wai warp + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "Automatic derivation of querying functions for servant"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "servant-http2-client" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring , case-insensitive, containers, data-default-class, exceptions @@ -232916,6 +233397,8 @@ self: { pname = "servant-machines"; version = "0.15.1"; sha256 = "0k8abcc72s5bzcf2vmjkxxjnhk45rww6hr3l93msm2510hi6gda4"; + revision = "1"; + editedCabalFile = "0zplgs1kqfmnnx8yv8ay594misiamgmvy41b8w1h3mr7n4vrgk8j"; libraryHaskellDepends = [ base bytestring machines mtl servant ]; testHaskellDepends = [ base base-compat bytestring http-client http-media machines servant @@ -233213,6 +233696,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-pipes_0_15_3" = callPackage + ({ mkDerivation, base, base-compat, bytestring, http-client + , http-media, monad-control, mtl, pipes, pipes-bytestring + , pipes-safe, servant, servant-client, servant-server, wai, warp + }: + mkDerivation { + pname = "servant-pipes"; + version = "0.15.3"; + sha256 = "1sd01f95rkraa0zdqqg2vwx91zsih0i0hqqkz55nnw9bsbsqhq1n"; + libraryHaskellDepends = [ + base bytestring monad-control mtl pipes pipes-safe servant + ]; + testHaskellDepends = [ + base base-compat bytestring http-client http-media pipes + pipes-bytestring pipes-safe servant servant-client servant-server + wai warp + ]; + description = "Servant Stream support for pipes"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-polysemy" = callPackage ({ mkDerivation, base, deepseq, http-client, http-client-tls, lens , mtl, polysemy, polysemy-plugin, polysemy-zoo, servant @@ -233641,6 +234146,42 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-server_0_18_3" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, containers, directory, exceptions, filepath, hspec + , hspec-discover, hspec-wai, http-api-data, http-media, http-types + , monad-control, mtl, network, network-uri, QuickCheck, resourcet + , safe, servant, should-not-typecheck, sop-core, string-conversions + , tagged, temporary, text, transformers, transformers-base + , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 + }: + mkDerivation { + pname = "servant-server"; + version = "0.18.3"; + sha256 = "1gng0in85as45aprwy19xaqlgmwfx0pkly150d2v96knhbcwsshk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat base64-bytestring bytestring containers exceptions + filepath http-api-data http-media http-types monad-control mtl + network network-uri resourcet servant sop-core string-conversions + tagged text transformers transformers-base wai wai-app-static word8 + ]; + executableHaskellDepends = [ + aeson base base-compat servant text wai warp + ]; + testHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring directory hspec + hspec-wai http-types mtl QuickCheck resourcet safe servant + should-not-typecheck sop-core string-conversions temporary text + transformers transformers-compat wai wai-extra + ]; + testToolDepends = [ hspec-discover ]; + description = "A family of combinators for defining webservices APIs and serving them"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "servant-server-namedargs" = callPackage ({ mkDerivation, base, bytestring, http-api-data, http-types, named , servant, servant-namedargs, servant-server, string-conversions @@ -248528,6 +249069,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "streaming-bytestring_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, ghc-prim + , mmorph, mtl, resourcet, smallcheck, streaming, tasty, tasty-hunit + , tasty-smallcheck, transformers, transformers-base + }: + mkDerivation { + pname = "streaming-bytestring"; + version = "0.2.1"; + sha256 = "1yri2g0wx2fila25ang04nsv4i12b4yhwqwcfkkpx1sz8fhzibxy"; + libraryHaskellDepends = [ + base bytestring deepseq exceptions ghc-prim mmorph mtl resourcet + streaming transformers transformers-base + ]; + testHaskellDepends = [ + base bytestring resourcet smallcheck streaming tasty tasty-hunit + tasty-smallcheck transformers + ]; + description = "Fast, effectful byte streams"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "streaming-cassava" = callPackage ({ mkDerivation, base, bytestring, cassava, hspec, mtl, QuickCheck , quickcheck-instances, streaming, streaming-bytestring, text @@ -250074,8 +250637,8 @@ self: { }: mkDerivation { pname = "stripeapi"; - version = "0.1.0.2"; - sha256 = "1zls2k2bzrkwcqav8s416gjsc4rp6glb4rv0ljkjab55ym3fkbqq"; + version = "1.0.0.0"; + sha256 = "0wg3b08gvkcqinc5r9jcrcfrgw0c3mh57ca5hzcrknddwd23flbj"; libraryHaskellDepends = [ aeson base bytestring ghc-prim http-client http-conduit http-types mtl scientific text time transformers unordered-containers vector @@ -251957,13 +252520,13 @@ self: { }: mkDerivation { pname = "swiss-ephemeris"; - version = "1.2.1.1"; - sha256 = "1k584gv36xgj87qbrvcl5w9v8z2k7y4csmz737d5r2a8mvf8sf33"; + version = "1.3.0.1"; + sha256 = "1y30qx18ps412r28grlxpfxw3ikirbf3kkxmqwd75ydxp9apn52k"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings for the Swiss Ephemeris C library"; - license = lib.licenses.gpl2Only; + license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; broken = true; }) {}; @@ -255452,6 +256015,18 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-bench_0_3" = callPackage + ({ mkDerivation, base, containers, deepseq, tasty }: + mkDerivation { + pname = "tasty-bench"; + version = "0.3"; + sha256 = "06c7n1dslxr1m15m8kf35zfn544jm36vk8s3yfrf6h047gd1bs2k"; + libraryHaskellDepends = [ base containers deepseq tasty ]; + description = "Featherlight benchmark framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-checklist" = callPackage ({ mkDerivation, base, exceptions, parameterized-utils, tasty , tasty-expected-failure, tasty-hunit, text @@ -255821,6 +256396,8 @@ self: { pname = "tasty-json"; version = "0.1.0.0"; sha256 = "0k6zzi2w675pghxfv5y6m67n2cv8bb22dq9zgb5yfwycfj3va4bp"; + revision = "1"; + editedCabalFile = "0jk27ld4l435nnzc80wg6b46ibmc0cmbb0k3hpp58yxbyldr6xdr"; libraryHaskellDepends = [ base bytestring containers stm tagged tasty text ]; @@ -256206,8 +256783,8 @@ self: { pname = "tasty-wai"; version = "0.1.1.1"; sha256 = "1bnq2mbgv1ksn9sq33dq1q91pzndy7gn61mlnkybk89k0bsw5i7y"; - revision = "1"; - editedCabalFile = "033s0aap50r7y3sbxc1jf60lpv66nljwyypc8smyccgiv5l8khzr"; + revision = "2"; + editedCabalFile = "13f0rmdyfd8wx9w9d6vj40akskq763gjj89p7dzy6zyaiyllgk64"; libraryHaskellDepends = [ base bytestring http-types HUnit tasty wai wai-extra ]; @@ -257031,6 +257608,18 @@ self: { license = lib.licenses.mit; }) {}; + "template-haskell-compat-v0208_0_1_6" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "template-haskell-compat-v0208"; + version = "0.1.6"; + sha256 = "1s2ba86y2r9n4r1dwfg734y3nfqxak560s8srd04kbn623hnrkw8"; + libraryHaskellDepends = [ base template-haskell ]; + description = "A backwards compatibility layer for Template Haskell newer than 2.8"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "template-haskell-optics" = callPackage ({ mkDerivation, base, containers, optics-core, template-haskell }: mkDerivation { @@ -258769,8 +259358,8 @@ self: { pname = "texrunner"; version = "0.0.1.2"; sha256 = "1fxyxwgvn0rxhkl1fs2msr88jqwx5wwfnjsjlcankrwcn7gyk7jy"; - revision = "2"; - editedCabalFile = "0zv8xp8z2gx9zjqn1f81hri4hn0bws7cq39g5i2g2axrkm9nwj5q"; + revision = "3"; + editedCabalFile = "1l3cpi7yx8jm3653rf3v7midf19i7khc6in75m7zz66124c6i350"; libraryHaskellDepends = [ attoparsec base bytestring directory filepath io-streams mtl process semigroups temporary @@ -266567,6 +267156,23 @@ self: { license = lib.licenses.mit; }) {}; + "ttc_1_1_0_1" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "ttc"; + version = "1.1.0.1"; + sha256 = "0vngp6md5viz4r57q0qn3pf09ph6kpkzvdigsxmgqcic2ha1a4n1"; + libraryHaskellDepends = [ base bytestring template-haskell text ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit template-haskell text + ]; + description = "Textual Type Classes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "ttl-hashtables" = callPackage ({ mkDerivation, base, clock, containers, data-default, failable , hashable, hashtables, hspec, mtl, transformers @@ -267088,6 +267694,8 @@ self: { ]; description = "An equational theorem prover"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "twee-lib" = callPackage @@ -276926,23 +277534,19 @@ self: { "wai-cli" = callPackage ({ mkDerivation, ansi-terminal, base, http-types, iproute - , monads-tf, network, options, socket-activation, stm - , streaming-commons, unix, wai, wai-extra, warp, warp-tls + , monads-tf, network, options, stm, streaming-commons, transformers + , unix, wai, wai-extra, warp, warp-tls }: mkDerivation { pname = "wai-cli"; - version = "0.2.1"; - sha256 = "1r4lxbjzb5qzn7y0kanlgm8s9a3j1j93cvs74s2bmcc82ysc3x9f"; - revision = "1"; - editedCabalFile = "1h0ip8r0zdm0xzaprfiyfdm40286apyvn6psqnx7pif8acfhpq8m"; + version = "0.2.3"; + sha256 = "0fflvxfc9ibkrrgqdsr89gl77b0b706a8g7ylydaqqz6z089qbi3"; libraryHaskellDepends = [ - ansi-terminal base http-types iproute monads-tf network options - socket-activation stm streaming-commons unix wai wai-extra warp - warp-tls + ansi-terminal base http-types iproute monads-tf network options stm + streaming-commons transformers unix wai wai-extra warp warp-tls ]; description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "wai-conduit" = callPackage @@ -286307,8 +286911,8 @@ self: { }: mkDerivation { pname = "yaml-unscrambler"; - version = "0.1.0.2"; - sha256 = "03wvb5skx41kdmdc6zhydr7zddzyshy2cgk8zmwy26q70z3g01zf"; + version = "0.1.0.3"; + sha256 = "1n8q5dsvs6sh2gzs24m49cz5pg1pavn9sma4fk5jizrjrabik4sj"; libraryHaskellDepends = [ acc attoparsec attoparsec-data attoparsec-time base base64 bytestring conduit containers foldl hashable libyaml mtl scientific @@ -291303,8 +291907,8 @@ self: { ({ mkDerivation, base, hspec, Z-Data, Z-IO, zookeeper_mt }: mkDerivation { pname = "zoovisitor"; - version = "0.1.1.1"; - sha256 = "1mg3wz3drddxdrbr1b0yw5wayzqi99zfdlgiwvgcc5pxb98i6wk3"; + version = "0.1.2.0"; + sha256 = "0s0svxa7y7a35jg4f0qq6zdg187c2g1s0f3payd26vpwa6rp8f8k"; libraryHaskellDepends = [ base Z-Data Z-IO ]; librarySystemDepends = [ zookeeper_mt ]; testHaskellDepends = [ base hspec ]; diff --git a/pkgs/development/interpreters/alda/default.nix b/pkgs/development/interpreters/alda/default.nix index 85c48ee2014..96d4207dbe8 100644 --- a/pkgs/development/interpreters/alda/default.nix +++ b/pkgs/development/interpreters/alda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alda"; - version = "1.4.4"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/alda-lang/alda/releases/download/${version}/alda"; - sha256 = "sha256-zIq8coSh4B9VGrixkQfhySK7qhlFG2p7O0suvbiScKY="; + sha256 = "sha256-OHbOsgYN87ThU7EgjCgxADnOv32qIi+7XwDwcW0dmV0="; }; dontUnpack = true; diff --git a/pkgs/development/interpreters/erlang/R24.nix b/pkgs/development/interpreters/erlang/R24.nix index a4fe839bff4..7f4b49c5c32 100644 --- a/pkgs/development/interpreters/erlang/R24.nix +++ b/pkgs/development/interpreters/erlang/R24.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "24.0.2"; - sha256 = "gAiQc+AVj5xjwAnn9mF4xprjZOft1JvfEFVJMG5isxg="; + version = "24.0.3"; + sha256 = "KVMISrWNBkk+w37gB4M5TQkgm4odZ+GqLvKN4stzOUI="; } diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index c0438d1e007..35631174e26 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -11,7 +11,20 @@ stdenv.mkDerivation rec { sha256 = "sha256-TzJbHmHIySlf3asQ02HOdehMR+s0KkPifBiaQ4FvFCg="; }; + # we don't have /usr/bin/env in the sandbox, so substitute for a proper, + # absolute path to janet + postPatch = '' + substituteInPlace jpm \ + --replace '/usr/bin/env janet' $out/bin/janet \ + --replace /usr/local/lib/janet $out/lib \ + --replace /usr/local $out + + substituteInPlace janet.1 \ + --replace /usr/local/lib/janet $out/lib + ''; + nativeBuildInputs = [ meson ninja ]; + mesonFlags = [ "-Dgit_hash=release" ]; doCheck = true; @@ -20,7 +33,7 @@ stdenv.mkDerivation rec { description = "Janet programming language"; homepage = "https://janet-lang.org/"; license = licenses.mit; + maintainers = with maintainers; [ andrewchambers peterhoeg ]; platforms = platforms.all; - maintainers = with maintainers; [ andrewchambers ]; }; } diff --git a/pkgs/development/interpreters/php/7.4.nix b/pkgs/development/interpreters/php/7.4.nix index 7640e6bc646..1e72f7b48b4 100644 --- a/pkgs/development/interpreters/php/7.4.nix +++ b/pkgs/development/interpreters/php/7.4.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "7.4.20"; - sha256 = "0d5ncz97y0271dsmz269wl4721vhq2fn6pmm9rxglc756p36pnha"; + version = "7.4.21"; + sha256 = "0al2697d5hwq0f39rgncl1pwfxzzpc0afmr0fjvw5qjpww163v1n"; }); in diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 294f100dedd..82d78d95314 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.7"; - sha256 = "0yazcc9x66xg1gmi3rpgk891g6s3mm7aywcadqfqnx1mdz4z5ckj"; + version = "8.0.8"; + sha256 = "0vyi9hhy7yl4l589dniwb3gq29sp3giq7ni4nca3x54q3bbpgg8l"; }); in diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index f181db108a4..dbe01acb6df 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -195,8 +195,6 @@ let # PCRE ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" ] - ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] - ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre2.dev}" ] ++ [ "PCRE_LIBDIR=${pcre2}" ] diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix index 5d5277afcd3..2ef3f3d3920 100644 --- a/pkgs/development/libraries/amdvlk/default.nix +++ b/pkgs/development/libraries/amdvlk/default.nix @@ -85,6 +85,6 @@ in stdenv.mkDerivation rec { changelog = "https://github.com/GPUOpen-Drivers/AMDVLK/releases/tag/v-${version}"; license = licenses.mit; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = with maintainers; [ danieldk Flakebi ]; + maintainers = with maintainers; [ Flakebi ]; }; } diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 9fdccfb3faa..fcc64989606 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "10.5.2"; + version = "10.5.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-Y/I87cVIpelASBblDPj4/MSSqxqtxsDO8wv8Kvzq2V8="; + sha256 = "sha256-5sUdjVKm94ucZFn2mGE1CT4O5wWmdDBxEPYXXyzV7jc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index d6e1d75437e..c0765922de5 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "babl"; - version = "0.1.86"; + version = "0.1.88"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://download.gimp.org/pub/babl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Cz9ZUVmtGyFs1ynAUEw6X2z3gMZB9Nxj/BZPPAOCyPA="; + sha256 = "sha256-Tw1/SqoLsucl80mt97NRqVfZ+ybVVdmJWnr4FrQWcDk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 60ccf5aeeb2..e63f2c3cfd6 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.2.2"; + version = "0.2.7"; src = fetchFromGitHub { owner = "cwida"; repo = "duckdb"; rev = "v${version}"; - sha256 = "1pzz2zjzpvji5am21vd9kjxj0pnxsjmrsfqrym9h2rk2mi7p2cx8"; + sha256 = "0cnqq2n1424fqg7gfyvrwkk6nvjal2fm5n08xc8q28ynyhq4sfmj"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index b3654087ffd..9e7beb0a4f8 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -4,6 +4,7 @@ , pkg-config , meson , ninja +, wayland-scanner , libX11 , mesa , libGL @@ -51,10 +52,15 @@ in stdenv.mkDerivation rec { sha256 = "1n9lg8hpjgxlf7dpddkjhbslsfd0symla2wk6jjmnl9n9jv2gmzk"; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja pkg-config + wayland-scanner ]; buildInputs = [ diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix deleted file mode 100644 index 11f4f070c08..00000000000 --- a/pkgs/development/libraries/gegl/4.0.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, vala -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, glib -, babl -, libpng -, cairo -, libjpeg -, librsvg -, lensfun -, libspiro -, maxflow -, netsurf -, pango -, poly2tri-c -, poppler -, bzip2 -, json-glib -, gettext -, meson -, ninja -, libraw -, gexiv2 -, libwebp -, luajit -, openexr -, OpenCL -, suitesparse -}: - -stdenv.mkDerivation rec { - pname = "gegl"; - version = "0.4.30"; - - outputs = [ "out" "dev" "devdoc" ]; - outputBin = "dev"; - - src = fetchurl { - url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0="; - }; - - nativeBuildInputs = [ - pkg-config - gettext - meson - ninja - vala - gobject-introspection - gtk-doc - docbook-xsl-nons - docbook_xml_dtd_43 - ]; - - buildInputs = [ - libpng - cairo - libjpeg - librsvg - lensfun - libspiro - maxflow - netsurf.libnsgif - pango - poly2tri-c - poppler - bzip2 - libraw - libwebp - gexiv2 - luajit - openexr - suitesparse - ] ++ lib.optional stdenv.isDarwin OpenCL; - - # for gegl-4.0.pc - propagatedBuildInputs = [ - glib - json-glib - babl - ]; - - mesonFlags = [ - "-Ddocs=true" - "-Dmrg=disabled" # not sure what that is - "-Dsdl2=disabled" - "-Dpygobject=disabled" - "-Dlibav=disabled" - "-Dlibv4l=disabled" - "-Dlibv4l2=disabled" - # Disabled due to multiple vulnerabilities, see - # https://github.com/NixOS/nixpkgs/pull/73586 - "-Djasper=disabled" - ]; - - # TODO: Fix missing math symbols in gegl seamless clone. - # It only appears when we use packaged poly2tri-c instead of vendored one. - NIX_CFLAGS_COMPILE = "-lm"; - - postPatch = '' - chmod +x tests/opencl/opencl_test.sh - patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh - ''; - - # tests fail to connect to the com.apple.fonts daemon in sandboxed mode - doCheck = !stdenv.isDarwin; - - meta = with lib; { - description = "Graph-based image processing framework"; - homepage = "https://www.gegl.org"; - license = licenses.lgpl3Plus; - maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index bd67f3e6b7c..11f4f070c08 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,43 +1,115 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config +, vala +, gobject-introspection +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 +, glib , babl , libpng , cairo , libjpeg , librsvg +, lensfun +, libspiro +, maxflow +, netsurf , pango -, gtk2 +, poly2tri-c +, poppler , bzip2 -, intltool -, libintl -, OpenGL ? null }: +, json-glib +, gettext +, meson +, ninja +, libraw +, gexiv2 +, libwebp +, luajit +, openexr +, OpenCL +, suitesparse +}: stdenv.mkDerivation rec { pname = "gegl"; - version = "0.2.0"; + version = "0.4.30"; + + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; src = fetchurl { - url = "ftp://ftp.gtk.org/pub/gegl/0.2/${pname}-${version}.tar.bz2"; - sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426"; + url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0="; }; - patches = [( fetchurl { - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/" - + "gegl-0.2.0-CVE-2012-4433.patch?h=packages/gegl&id=57a60fbda5d7bbbd1cc4767cb0724baa80c5e3e9"; - sha256 = "0p8mxj3w09nn1cc6cbxrd9hx742c5y27903i608wx6ja3kdjis59"; - name = "CVE-2012-4433.patch"; - })]; + nativeBuildInputs = [ + pkg-config + gettext + meson + ninja + vala + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 + ]; + + buildInputs = [ + libpng + cairo + libjpeg + librsvg + lensfun + libspiro + maxflow + netsurf.libnsgif + pango + poly2tri-c + poppler + bzip2 + libraw + libwebp + gexiv2 + luajit + openexr + suitesparse + ] ++ lib.optional stdenv.isDarwin OpenCL; + + # for gegl-4.0.pc + propagatedBuildInputs = [ + glib + json-glib + babl + ]; - # needs fonts otherwise don't know how to pass them - configureFlags = [ "--disable-docs" ]; + mesonFlags = [ + "-Ddocs=true" + "-Dmrg=disabled" # not sure what that is + "-Dsdl2=disabled" + "-Dpygobject=disabled" + "-Dlibav=disabled" + "-Dlibv4l=disabled" + "-Dlibv4l2=disabled" + # Disabled due to multiple vulnerabilities, see + # https://github.com/NixOS/nixpkgs/pull/73586 + "-Djasper=disabled" + ]; - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ] - ++ lib.optional stdenv.isDarwin OpenGL; + # TODO: Fix missing math symbols in gegl seamless clone. + # It only appears when we use packaged poly2tri-c instead of vendored one. + NIX_CFLAGS_COMPILE = "-lm"; - nativeBuildInputs = [ pkg-config ]; + postPatch = '' + chmod +x tests/opencl/opencl_test.sh + patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh + ''; - doCheck = false; # fails 3 out of 19 tests + # tests fail to connect to the com.apple.fonts daemon in sandboxed mode + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Graph-based image processing framework"; diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index 37375f52c32..7aefaa9d493 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.2.2"; + version = "21.2.3"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0cz2zr5qmhlsb1ydffakpkw9adyvn5n2y269fp0k2sskqwlykn48"; + sha256 = "0nldd1yfyvwnpkh0v3ni09z2zwmj84px0pcd1w50brvny36r814c"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 47a3ca4f9f9..00c80277ea2 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "21.2.2"; + version = "21.2.3"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-iSrr9g6C8YRcmu92sTyDCh76Cdu8wbDL3COwiVxox4Q="; + sha256 = "sha256-Id2/d6rRKiei6UQ0pywdcbNLfIQR8gEseiDgqeaT3p8="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/libraries/libbaseencode/default.nix b/pkgs/development/libraries/libbaseencode/default.nix new file mode 100644 index 00000000000..c40f9bafb47 --- /dev/null +++ b/pkgs/development/libraries/libbaseencode/default.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "libbaseencode"; + version = "1.0.11"; + + src = fetchFromGitHub { + owner = "paolostivanin"; + repo = pname; + rev = "v${version}"; + sha256 = "1f52yh052z8k90d1ag6nk01p1gf4i1zxp1daw8mashs8avqr2m7g"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "Library written in C for encoding and decoding data using base32 or base64 (RFC-4648)"; + homepage = "https://github.com/paolostivanin/libbaseencode"; + license = licenses.asl20; + maintainers = with maintainers; [ alexbakker ]; + }; +} diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index 7387e9edc5b..10d688d89b6 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libconfig"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { url = "https://hyperrealm.github.io/${pname}/dist/${pname}-${version}.tar.gz"; - sha256 = "1ngs2qx3cx5cbwinc5mvadly0b5n7s86zsc68c404czzfff7lg3w"; + sha256 = "sha256-VFFm1srAN3RDgdHpzFpUBQlOe/rRakEWmbz/QLuzHuc="; }; doCheck = true; diff --git a/pkgs/development/libraries/libcotp/default.nix b/pkgs/development/libraries/libcotp/default.nix new file mode 100644 index 00000000000..986890102dc --- /dev/null +++ b/pkgs/development/libraries/libcotp/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, libgcrypt, libbaseencode }: + +stdenv.mkDerivation rec { + pname = "libcotp"; + version = "1.2.3"; + + src = fetchFromGitHub { + owner = "paolostivanin"; + repo = pname; + rev = "v${version}"; + sha256 = "1qq4shwiz1if9vys052dnsbm4dfw1ynlj6nsb0v4zjly3ndspfsk"; + }; + + buildInputs = [ libbaseencode libgcrypt ]; + nativeBuildInputs = [ cmake pkg-config ]; + + meta = with lib; { + description = "C library that generates TOTP and HOTP"; + homepage = "https://github.com/paolostivanin/libcotp"; + license = licenses.asl20; + maintainers = with maintainers; [ alexbakker ]; + }; +} diff --git a/pkgs/development/libraries/libliftoff/default.nix b/pkgs/development/libraries/libliftoff/default.nix new file mode 100644 index 00000000000..759549dbb28 --- /dev/null +++ b/pkgs/development/libraries/libliftoff/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub +, meson, pkg-config, ninja +, libdrm +}: + +stdenv.mkDerivation rec { + pname = "libliftoff"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "emersion"; + repo = pname; + rev = "v${version}"; + sha256 = "1s53jsll3c7272bhmh4jr6k5m1nvn8i1ld704qmzsm852ilmgrla"; + }; + + nativeBuildInputs = [ meson pkg-config ninja ]; + + buildInputs = [ libdrm ]; + + meta = with lib; { + description = "A lightweight KMS plane library"; + longDescription = '' + libliftoff eases the use of KMS planes from userspace without standing in + your way. Users create "virtual planes" called layers, set KMS properties + on them, and libliftoff will pick planes for these layers if possible. + ''; + inherit (src.meta) homepage; + changelog = "https://github.com/emersion/libliftoff/releases/tag/v${version}"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 45b79571b43..9368469f26d 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.18.0"; + version = "3.19.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "sha256-cQNcKa/mEdeH1MaLhj203MOphfYDTQ5pn/GzUmSZGcE="; + sha256 = "1w44407wb552q21dz4m2nwwdi8b9hzjb2w1l3ffsikzqckc7wbyj"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index c4b945bed44..1410822a1ca 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libvmaf"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256 = "0dynk1pmsyf23vfxljaazqkr27vfrvhj3dyjzm06zxpzsn59aif3"; + sha256 = "1jlmivmdzlhizljbmsvqqxnhjfyjh8zxyf5xv6j040vbfj4mf14f"; }; sourceRoot = "source/libvmaf"; diff --git a/pkgs/development/libraries/libxlsxwriter/default.nix b/pkgs/development/libraries/libxlsxwriter/default.nix index 4bb80cb04a4..ce9a72f00c1 100644 --- a/pkgs/development/libraries/libxlsxwriter/default.nix +++ b/pkgs/development/libraries/libxlsxwriter/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "libxlsxwriter"; - version = "1.0.6"; + version = "1.0.8"; src = fetchFromGitHub { owner = "jmcnamara"; repo = "libxlsxwriter"; rev = "RELEASE_${version}"; - sha256 = "03fdcbm0xnkxwv6fir4yy4x9q2p5h08j099w9xh5gc2ni7ygjlyx"; + sha256 = "1z9bkg0pfkzxbpj2rys4mx9wmcxyjjqsg0nbiaabsg455q00plki"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 522c8cfa4a1..b93e517def6 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -1,5 +1,5 @@ { - stdenv, lib, fetchFromGitHub, + stdenv, lib, fetchFromGitHub, symlinkJoin, cmake, expat, libyamlcpp, ilmbase, pystring, # Base dependencies glew, freeglut, # Only required on Linux @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { sha256 = "194j9jp5c8ws0fryiz936wyinphnpzwpqnzvw9ryx6rbiwrba487"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ expat libyamlcpp ilmbase pystring ] + nativeBuildInputs = [ cmake (symlinkJoin { name = "expat"; paths = [ expat.out expat.dev ]; }) ]; + buildInputs = [ expat.out libyamlcpp ilmbase pystring ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ] ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ] diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index f4dba00d351..cfd0ff23259 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -19,11 +19,15 @@ , x11Support? !stdenv.isDarwin, libXft }: +let + withDocs = stdenv.buildPlatform == stdenv.hostPlatform; +in stdenv.mkDerivation rec { pname = "pango"; version = "1.48.4"; - outputs = [ "bin" "out" "dev" "devdoc" ]; + outputs = [ "bin" "out" "dev" ] + ++ lib.optionals withDocs [ "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -58,9 +62,11 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=true" + "-Dgtk_doc=${lib.boolToString withDocs}" ] ++ lib.optionals (!x11Support) [ "-Dxft=disabled" # only works with x11 + ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ + "-Dintrospection=disabled" ]; # Fontconfig error: Cannot load default config file @@ -70,7 +76,7 @@ stdenv.mkDerivation rec { doCheck = false; # test-font: FAIL - postInstall = '' + postInstall = lib.optionalString withDocs '' # So that devhelp can find this. # https://gitlab.gnome.org/GNOME/pango/merge_requests/293/diffs#note_1058448 mkdir -p "$devdoc/share/devhelp" diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index c93ea5ba78b..cf085d50edb 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = "Radeon Open Compute common language runtime"; homepage = "https://github.com/ROCm-Developer-Tools/ROCclr"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; # rocclr seems to have some AArch64 ifdefs, but does not seem # to be supported yet by the build infrastructure. Recheck in # the future. diff --git a/pkgs/development/libraries/rocm-comgr/default.nix b/pkgs/development/libraries/rocm-comgr/default.nix index b9a34b113eb..95fe28ce9fd 100644 --- a/pkgs/development/libraries/rocm-comgr/default.nix +++ b/pkgs/development/libraries/rocm-comgr/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "APIs for compiling and inspecting AMDGPU code objects"; homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/tree/amd-stg-open/lib/comgr"; license = licenses.ncsa; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-device-libs/default.nix b/pkgs/development/libraries/rocm-device-libs/default.nix index e62d6f0076f..383d91bd08c 100644 --- a/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/pkgs/development/libraries/rocm-device-libs/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Set of AMD-specific device-side language runtime libraries"; homepage = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs"; license = licenses.ncsa; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-opencl-icd/default.nix b/pkgs/development/libraries/rocm-opencl-icd/default.nix index 903c238f455..0a9d124561e 100644 --- a/pkgs/development/libraries/rocm-opencl-icd/default.nix +++ b/pkgs/development/libraries/rocm-opencl-icd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OpenCL ICD definition for AMD GPUs using the ROCm stack"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/pkgs/development/libraries/rocm-opencl-runtime/default.nix index d721cfece96..40ffcae7924 100644 --- a/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { description = "OpenCL runtime for AMD GPUs, part of the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"; license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rocm-runtime/default.nix b/pkgs/development/libraries/rocm-runtime/default.nix index c63e8249cfc..eb4ce3c19fb 100644 --- a/pkgs/development/libraries/rocm-runtime/default.nix +++ b/pkgs/development/libraries/rocm-runtime/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { description = "Platform runtime for ROCm"; homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime"; license = with licenses; [ ncsa ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/rocm-thunk/default.nix b/pkgs/development/libraries/rocm-thunk/default.nix index 1339e035ebf..770dd16740c 100644 --- a/pkgs/development/libraries/rocm-thunk/default.nix +++ b/pkgs/development/libraries/rocm-thunk/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "Radeon open compute thunk interface"; homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"; license = with licenses; [ bsd2 mit ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index 332806c495c..85a73ccd569 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "blas"; - version = "3.8.0"; + version = "3.10.0"; src = fetchurl { url = "http://www.netlib.org/blas/${pname}-${version}.tgz"; - sha256 = "1s24iry5197pskml4iygasw196bdhplj0jmbsb9jhabcjqj2mpsm"; + sha256 = "sha256-LjYNmcm9yEB6YYiMQKqFP7QhlCDruCZNtIbLiGBGirM="; }; buildInputs = [ gfortran ]; @@ -20,17 +20,17 @@ stdenv.mkDerivation rec { echo >>make.inc "NOOPT = -O0 -fPIC" echo >>make.inc "LOADER = gfortran" echo >>make.inc "LOADOPTS =" - echo >>make.inc "ARCH = gfortran" - echo >>make.inc "ARCHFLAGS = -shared -o" + echo >>make.inc "AR = gfortran" + echo >>make.inc "ARFLAGS = -shared -o" echo >>make.inc "RANLIB = echo" echo >>make.inc "BLASLIB = libblas.so.${version}" ''; buildPhase = '' make - echo >>make.inc "ARCHFLAGS = " + echo >>make.inc "ARFLAGS = " echo >>make.inc "BLASLIB = libblas.a" - echo >>make.inc "ARCH = ar rcs" + echo >>make.inc "AR = ar rcs" echo >>make.inc "RANLIB = ranlib" make ''; diff --git a/pkgs/development/libraries/science/math/p4est-sc/default.nix b/pkgs/development/libraries/science/math/p4est-sc/default.nix index 222380e15b2..00ce1e3b17c 100644 --- a/pkgs/development/libraries/science/math/p4est-sc/default.nix +++ b/pkgs/development/libraries/science/math/p4est-sc/default.nix @@ -1,13 +1,14 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, pkg-config , p4est-sc-debugEnable ? true, p4est-sc-mpiSupport ? true -, mpi, openmpi, openssh, zlib +, mpi, openssh, zlib }: let dbg = if debugEnable then "-dbg" else ""; debugEnable = p4est-sc-debugEnable; mpiSupport = p4est-sc-mpiSupport; + isOpenmpi = mpiSupport && mpi.pname == "openmpi"; in stdenv.mkDerivation { pname = "p4est-sc${dbg}"; @@ -24,7 +25,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ zlib ] ++ lib.optional mpiSupport mpi - ++ lib.optional (mpiSupport && mpi == openmpi) openssh + ++ lib.optional isOpenmpi openssh ; inherit debugEnable mpiSupport; @@ -36,15 +37,17 @@ stdenv.mkDerivation { ${if mpiSupport then "unset CC" else ""} ''; - configureFlags = lib.optional debugEnable "--enable-debug" + configureFlags = [ "--enable-pthread=-pthread" ] + ++ lib.optional debugEnable "--enable-debug" ++ lib.optional mpiSupport "--enable-mpi" ; makeFlags = [ "V=0" ]; + checkFlags = lib.optional isOpenmpi "-j1"; dontDisableStatic = true; enableParallelBuilding = true; - doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + doCheck = !stdenv.isAarch64 && stdenv.hostPlatform == stdenv.buildPlatform; meta = { branch = "prev3-develop"; diff --git a/pkgs/development/libraries/science/math/p4est/default.nix b/pkgs/development/libraries/science/math/p4est/default.nix index 99c4b0be3f3..b0bb543c760 100644 --- a/pkgs/development/libraries/science/math/p4est/default.nix +++ b/pkgs/development/libraries/science/math/p4est/default.nix @@ -35,13 +35,12 @@ stdenv.mkDerivation { ${if mpiSupport then "unset CC" else ""} ''; - configureFlags = [ "--with-sc=${p4est-sc}" ] + configureFlags = p4est-sc.configureFlags + ++ [ "--with-sc=${p4est-sc}" ] ++ lib.optional withMetis "--with-metis" - ++ lib.optional debugEnable "--enable-debug" - ++ lib.optional mpiSupport "--enable-mpi" ; - inherit (p4est-sc) makeFlags dontDisableStatic enableParallelBuilding doCheck; + inherit (p4est-sc) makeFlags checkFlags dontDisableStatic enableParallelBuilding doCheck; meta = { branch = "prev3-develop"; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 45c2fd228f2..9dc717c3479 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; + depsBuildBuild = [ pkg-config ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; buildInputs = [ diff --git a/pkgs/development/mobile/checkra1n/default.nix b/pkgs/development/mobile/checkra1n/default.nix new file mode 100644 index 00000000000..110bb187f61 --- /dev/null +++ b/pkgs/development/mobile/checkra1n/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "checkra1n"; + version = "0.12.4"; + + src = fetchurl { + url = "https://assets.checkra.in/downloads/linux/cli/x86_64/dac9968939ea6e6bfbdedeb41d7e2579c4711dc2c5083f91dced66ca397dc51d/checkra1n"; + sha256 = "07f5glwwlrpdvj8ky265q8fp3i3r4mz1vd6yvvxnnvpa764rdjfs"; + }; + + dontUnpack = true; + + installPhase = '' + install -dm755 "$out/bin" + install -m755 $src $out/bin/${pname} + ''; + + meta = with lib; { + description = "Jailbreak for iPhone 5s though iPhone X, iOS 12.0 and up"; + homepage = "https://checkra.in/"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ onny ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index ea8f2ef7a18..6b322a903f9 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -126,7 +126,7 @@ , "indium" , "insect" , "ionic" -, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v7.0.4.tar.gz"} +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v7.2.4.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" @@ -182,6 +182,7 @@ , "patch-package" , "peerflix" , "peerflix-server" +, "pkg" , "pm2" , "pnpm" , "poor-mans-t-sql-formatter-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 27ca53ba6ad..ace40185565 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,13 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1201.0" = { + "@angular-devkit/architect-0.1201.1" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1201.0"; + version = "0.1201.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.0.tgz"; - sha512 = "tqIhGccWjI32xmLs0UIr2umET18Le+r5PxCf30ueOE5pv1q7XKD06EzGx9J05B1aUgDFb3LP/ArlKel5JnD+3g=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1201.1.tgz"; + sha512 = "n7ycxrIPbtnV7q8PH5Uvs8Jd++u6hWUiB+8EUxznSfdHGA+fE7TTnJTkc27LoMlYZAImc/Axp/uyYZ6Awt72ZQ=="; }; }; "@angular-devkit/core-11.2.4" = { @@ -76,13 +76,13 @@ let sha512 = "3dA0Z6sIIxCDjZS/DucgmIKti7EZ/LgHoHgCO72Q50H5ZXbUSNBz5wGl5hVq2+gzrnFgU/0u40MIs6eptk30ZA=="; }; }; - "@angular-devkit/core-12.1.0" = { + "@angular-devkit/core-12.1.1" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.0.tgz"; - sha512 = "y6q/hn9/j6LwNgDzTBXe5pTXouU7nuc3KZFq3JwfTdo4yTIxN1Rdv9+zfzDkzEcYtyFoqLqqskQFme/DqdbEZw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-12.1.1.tgz"; + sha512 = "z5+O3ugXbo8djKPjUtf/UfnYCmco2K1LVhQ6cWLhKi3NKRBiHeNmZh5nAycqFD8/Q+oI/+Ao40MkmkK1Tq0jsw=="; }; }; "@angular-devkit/schematics-11.2.4" = { @@ -103,13 +103,13 @@ let sha512 = "bhi2+5xtVAjtr3bsXKT8pnoBamQrArd/Y20ueA4Od7cd38YT97nzTA1wyHBFG0vWd0HMyg42ZS0aycNBuOebaA=="; }; }; - "@angular-devkit/schematics-12.1.0" = { + "@angular-devkit/schematics-12.1.1" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.0.tgz"; - sha512 = "KlE1fnvqWItt9dYCaQ89b9WoqFvOK64kemCLGGx49CllQ3con1lwXW2iauzT/29UoK1rSzvTVMvTJcDQOJ7isQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.1.1.tgz"; + sha512 = "oRsvlhJQLXkGWdJvArOby+G4j8UX2uCHwrN4EC1hXUKs84UsD+UATYOAh4h2auy+I+sdrmELUaHwdI4wdKpqnw=="; }; }; "@angular-devkit/schematics-cli-0.1102.6" = { @@ -625,6 +625,15 @@ let sha512 = "qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg=="; }; }; + "@babel/parser-7.13.13" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.13.13"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz"; + sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; + }; + }; "@babel/parser-7.14.7" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; @@ -1534,6 +1543,15 @@ let sha512 = "9vDr5NzHu27wgwejuKL7kIOm4bwEtaPQ4Z6cpCmjSuaRqpH/7xc4qcGEscwMqlkwgcXl6MvqoAjZkQ24uSdIZQ=="; }; }; + "@babel/types-7.13.12" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.13.12"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.13.12.tgz"; + sha512 = "K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA=="; + }; + }; "@babel/types-7.14.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -2245,6 +2263,15 @@ let sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ=="; }; }; + "@fluentui/date-time-utilities-8.2.0" = { + name = "_at_fluentui_slash_date-time-utilities"; + packageName = "@fluentui/date-time-utilities"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.2.0.tgz"; + sha512 = "OunpRZ8hyDPLNWwrx8w17eUwGdNYjG4kGR9+jzvQQJjswk94KMxc6SY33mlTLVEbagjdHMHw9jR7STS+JCQNcA=="; + }; + }; "@fluentui/dom-utilities-1.1.2" = { name = "_at_fluentui_slash_dom-utilities"; packageName = "@fluentui/dom-utilities"; @@ -2254,6 +2281,33 @@ let sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw=="; }; }; + "@fluentui/dom-utilities-2.1.2" = { + name = "_at_fluentui_slash_dom-utilities"; + packageName = "@fluentui/dom-utilities"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.1.2.tgz"; + sha512 = "9LxI3iLbBkyoudRyk0nPTjMdMB2+ClDfM8V3A0SM82e5cDss5qlo0fog/2T2aoaon+hwfeinpiY4e3znx+Nn0w=="; + }; + }; + "@fluentui/font-icons-mdl2-8.1.4" = { + name = "_at_fluentui_slash_font-icons-mdl2"; + packageName = "@fluentui/font-icons-mdl2"; + version = "8.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.4.tgz"; + sha512 = "v0NRk+W2qJQtBsH9hqYNG5Xnic8C1kfB0I+OTGasFYPvxdd0APcWw2vajrlE49ijgVjXS0AByCgF6mu8LiYlHg=="; + }; + }; + "@fluentui/foundation-legacy-8.1.4" = { + name = "_at_fluentui_slash_foundation-legacy"; + packageName = "@fluentui/foundation-legacy"; + version = "8.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.4.tgz"; + sha512 = "Kd+XpHsv3UEnDTwEnUm93Au+QGpYZ5x/VuQsv8K1sDM+gjb3BDohuwR6MWgzgCMJiVW0NMlbS4I2OpUZa6k5eg=="; + }; + }; "@fluentui/keyboard-key-0.2.17" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; @@ -2263,6 +2317,24 @@ let sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; + "@fluentui/keyboard-key-0.3.2" = { + name = "_at_fluentui_slash_keyboard-key"; + packageName = "@fluentui/keyboard-key"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.3.2.tgz"; + sha512 = "Hjes+WUgVRqikyvmBEuyovw89inYZ1qVmdp4kKi/6BGvQlAcHgGIVfmdnlFumP4lmFpBW8uUh2K1ZmfY0xwQ6Q=="; + }; + }; + "@fluentui/merge-styles-8.1.2" = { + name = "_at_fluentui_slash_merge-styles"; + packageName = "@fluentui/merge-styles"; + version = "8.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.1.2.tgz"; + sha512 = "r0EGKfJUjZw9yJ21VMXjaqLoujvBkRIWRQVMM6CUxbY+02dhKUt6Sa9QA/8m8klsEWBENOaKZ4uX5U2vWWBlyw=="; + }; + }; "@fluentui/react-7.172.1" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; @@ -2272,6 +2344,15 @@ let sha512 = "XJhYEo0fn/30i4m+qJkT1y5kNTZ8DAwzWhdGSyTiOrxiJ7pKWOoXAdWnvhtk3iY0SPVWSD9jTn5lMT/2WkZbJw=="; }; }; + "@fluentui/react-8.22.0" = { + name = "_at_fluentui_slash_react"; + packageName = "@fluentui/react"; + version = "8.22.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.22.0.tgz"; + sha512 = "mn/zUd7vJNFLqpXZhc3ePNpDcNx4mhYdQ5vCC6kqcFIYjMg2ve5WqBP9tpFlbD3LEBa8NyOvIWfdG0NZdKejLg=="; + }; + }; "@fluentui/react-focus-7.17.6" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; @@ -2281,6 +2362,24 @@ let sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg=="; }; }; + "@fluentui/react-focus-8.1.5" = { + name = "_at_fluentui_slash_react-focus"; + packageName = "@fluentui/react-focus"; + version = "8.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.5.tgz"; + sha512 = "zvHwta+lRmw2kYRif0Zz6+skmfxUzagd15iMlUPRIVAcsj+rxOkoE7g8NlhXym7HsgMiKRAYJM0CdfMauCnkvQ=="; + }; + }; + "@fluentui/react-hooks-8.2.3" = { + name = "_at_fluentui_slash_react-hooks"; + packageName = "@fluentui/react-hooks"; + version = "8.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.3.tgz"; + sha512 = "JqQNLIc0WOwwMZ3rAnBkcy0oHZD83Bi1hs7qpvwGUW1OrL3QoJqEnmiKPowxWb8NUeKEP51cBfGi+/7aqbDZAg=="; + }; + }; "@fluentui/react-window-provider-1.0.2" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; @@ -2290,6 +2389,33 @@ let sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw=="; }; }; + "@fluentui/react-window-provider-2.1.2" = { + name = "_at_fluentui_slash_react-window-provider"; + packageName = "@fluentui/react-window-provider"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.1.2.tgz"; + sha512 = "VWtesIAZR5fdlZMwYco/M5EBb3jawUkslQYOKsneNq+mq8ThkUs1Bol5bpK6jwmouROscu76HD1QfjdACAfkLQ=="; + }; + }; + "@fluentui/set-version-8.1.2" = { + name = "_at_fluentui_slash_set-version"; + packageName = "@fluentui/set-version"; + version = "8.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.1.2.tgz"; + sha512 = "uCPwdBsahBbLuN8UkbmXtp+u8Gxqtm5+fZ1UuOUBhEL7MKl86LrWmxoy4IW3JD2rcbaYpCb7KFpnMB5s0Nx0ZA=="; + }; + }; + "@fluentui/style-utilities-8.1.4" = { + name = "_at_fluentui_slash_style-utilities"; + packageName = "@fluentui/style-utilities"; + version = "8.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.1.4.tgz"; + sha512 = "tR/ntfobJvuCtLyi7jpEbsq67iTaBNq/lpq+tYuvIqI8Gl90L9a8g8344ADP4+9/i3TKsrAZgnV9vze66ybHOw=="; + }; + }; "@fluentui/theme-1.7.4" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; @@ -2299,6 +2425,24 @@ let sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ=="; }; }; + "@fluentui/theme-2.1.3" = { + name = "_at_fluentui_slash_theme"; + packageName = "@fluentui/theme"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.1.3.tgz"; + sha512 = "o/So4091GtwtEkxujd6QT9M8kuLOde0Z7by/zLNQBU00wX3PeBxM4mpSLmnz2vt5CN5IT7OWhRRsiyve/7hLAg=="; + }; + }; + "@fluentui/utilities-8.2.0" = { + name = "_at_fluentui_slash_utilities"; + packageName = "@fluentui/utilities"; + version = "8.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.2.0.tgz"; + sha512 = "kq8xyFHkWUbzzbkGLuDACEhH+K5oqM/wEU9+zRuM/qI2bIS1B6Cr0ruq7FHxVrtAnMhvXKzM8DPn0W8uf775qQ=="; + }; + }; "@google-cloud/paginator-3.0.5" = { name = "_at_google-cloud_slash_paginator"; packageName = "@google-cloud/paginator"; @@ -2524,6 +2668,15 @@ let sha512 = "AtMWwb7kY8DdtwIQh2hC4YFM1MzZ22lMA+gjbnCYDgICt14vX2tCa59bDrEjFyOI4LvORjpvT/UhHUdKvsX8og=="; }; }; + "@grpc/proto-loader-0.6.4" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.4.tgz"; + sha512 = "7xvDvW/vJEcmLUltCUGOgWRPM8Oofv0eCFSVMuKqaqWJaXSzmB+m9hiyqe34QofAl4WAzIKUZZlinIF9FOHyTQ=="; + }; + }; "@gulp-sourcemaps/identity-map-1.0.2" = { name = "_at_gulp-sourcemaps_slash_identity-map"; packageName = "@gulp-sourcemaps/identity-map"; @@ -2641,13 +2794,13 @@ let sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; - "@hapi/topo-5.0.0" = { + "@hapi/topo-5.1.0" = { name = "_at_hapi_slash_topo"; packageName = "@hapi/topo"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/topo/-/topo-5.0.0.tgz"; - sha512 = "tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw=="; + url = "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz"; + sha512 = "foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="; }; }; "@heroku-cli/color-1.1.14" = { @@ -3802,13 +3955,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.186" = { + "@microsoft/load-themed-styles-1.10.190" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.186"; + version = "1.10.190"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.186.tgz"; - sha512 = "1EmEk1+ms0637dejhkMpSnWvAkZa+L85qUmsQClK+ClAlp4jmWbolWJIirmCpcUbTwkr1I/O6SAFiqKkVkhB5A=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.190.tgz"; + sha512 = "4Lhme3yHQgcIt05+BwgeJ0ClnY5wkmMXAFw4mGL8tO5jSkscd6lRKEtmQoGSTAy5S21FJzEUhnDJUqaK9M8P9Q=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -3883,13 +4036,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-12.11.0" = { + "@netlify/build-12.26.0" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "12.11.0"; + version = "12.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-12.11.0.tgz"; - sha512 = "kPY8qLpcAKOrjkgxil+c/C2Ivt0Vobklez+WFEQ5pQBYCPyjtw5kTAHABb8USc+CBaE4CWL1kehcvdbSJiO6Kg=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-12.26.0.tgz"; + sha512 = "wRBOxaZXJ0OCzg2YVp+SsKIE6fmLzwk68X7I8X6/jEL7np4Rq1H0BornxSGu9ewbCJseCl3zGKgd6aiBR4E8Pg=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -3901,13 +4054,13 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-9.1.0" = { + "@netlify/config-9.5.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "9.1.0"; + version = "9.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-9.1.0.tgz"; - sha512 = "XP3z4bm/D5KsZZB85lzgciJp6v2tF3jxJaeuq7hB7bEfVaHqGJfHesalhrqEXjB9lATD63UR6h7YmzRq2DmIpQ=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-9.5.0.tgz"; + sha512 = "Kt5xukNclUtraXVX1xnrseMwvIA1WnFjR6i4GuwgvM2MreS6zb5LIV5XGJ/vDCEpH9uxI609gj2iu9FNy543rA=="; }; }; "@netlify/esbuild-0.13.6" = { @@ -3919,22 +4072,22 @@ let sha512 = "tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw=="; }; }; - "@netlify/framework-info-5.4.0" = { + "@netlify/framework-info-5.5.0" = { name = "_at_netlify_slash_framework-info"; packageName = "@netlify/framework-info"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.4.0.tgz"; - sha512 = "eelZCGCm0F3wUClqSfKqeYXHn/hHyHzm+QhMBr3iBVcOQI7uujfwXjq5mS1gD3quJHF3jGrJ3QgzPa9X5v5Fwg=="; + url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.5.0.tgz"; + sha512 = "kAGcUnFlJgP2lQXez1c0RKJNF1reoefLVXMzTTTCoKqt1OcfzQnWzgCT6rJbsS7wia02JoLAb7TrdMdpWDAGTg=="; }; }; - "@netlify/functions-utils-1.3.47" = { + "@netlify/functions-utils-1.4.1" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.47"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.47.tgz"; - sha512 = "lJoa3aIuyBiPNo7XawtGQRTDFCmO9wSpoVDhO+e6t2YoCoCFXlJxZulZdalJ+JnRphlEMKHCMA3jeaVhVjjHuQ=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.4.1.tgz"; + sha512 = "11WhjgX74b+AgROL/w0iDrZg1cjhX7+hyCUrzOagJbkC2v83qZaVff+4RFTA7damuO9zc9BHw2+LHe0wLVvEbg=="; }; }; "@netlify/git-utils-1.0.11" = { @@ -3964,22 +4117,22 @@ let sha512 = "SAsVNIxF0asduPXbsr3wbyAB7lPZQxhG90EeOu0/Fo+BLhpO4g+6eH13I60qJpWCI/ucXXqSrUw8y6Oy5wpY0g=="; }; }; - "@netlify/plugins-list-2.18.0" = { + "@netlify/plugins-list-2.18.1" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.18.0"; + version = "2.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.18.0.tgz"; - sha512 = "lbI7P0CaSH23r2sF4z3DX02PqQ8ENUtRullQXEQXUareZfrXlOV6F8sl/LAWcgjE/kuh51eIAu/hWstsZFEQIQ=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.18.1.tgz"; + sha512 = "UFXVAlmuwmA0s7xDpL1pF3ksyB+5UDNVQDqkwobb+HlxjKNU0hy0c+aL8G8EoBjtX9iGP7Xr+QawtytAWlIyXw=="; }; }; - "@netlify/routing-local-proxy-0.30.1" = { + "@netlify/routing-local-proxy-0.30.2" = { name = "_at_netlify_slash_routing-local-proxy"; packageName = "@netlify/routing-local-proxy"; - version = "0.30.1"; + version = "0.30.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.30.1.tgz"; - sha512 = "9IfNBXDJA2JLvHA5GRDTpOgPpU3dovL8ezB1+igxvtinnl4Nnl9G4D9N6leqf1ecC6aZrx9St4OATqVwY2LryQ=="; + url = "https://registry.npmjs.org/@netlify/routing-local-proxy/-/routing-local-proxy-0.30.2.tgz"; + sha512 = "rQnv383/vFF1x3iKnY/2Q2i7Z7RhugfoVfAIbEJ2bIaWFMQ2YcGMVpwj1w8rK+4MGH5uwvlNNlfE0gGYQOq+4Q=="; }; }; "@netlify/run-utils-1.0.7" = { @@ -3991,13 +4144,13 @@ let sha512 = "YFi1Sf+ktQICS3tAKu7/uiGzLXgi8RNVwH9naUkziXwXQNH2oxDhKgy0/Zv5Nw0zMDJyKWrJ3xObWEC57mJ/KA=="; }; }; - "@netlify/zip-it-and-ship-it-4.4.2" = { + "@netlify/zip-it-and-ship-it-4.8.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "4.4.2"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.4.2.tgz"; - sha512 = "627ZNqfc4mdhU5mYDpcKUbmx8RoAUu8ZQiW/RIt5s7uDhruba3bK776Ygzog5b14hYWthT41/bf+9wQ+O9NFWw=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.8.0.tgz"; + sha512 = "Dq0hBeX2LW62eny22d+isU4SvEilT/4eusjP1EFA0XYaDCgQ9rFJ50+NySXfxxu20qbfZmt34XKiby+tO7EcRA=="; }; }; "@node-red/editor-api-1.3.5" = { @@ -4351,13 +4504,13 @@ let sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg=="; }; }; - "@octokit/openapi-types-7.3.5" = { + "@octokit/openapi-types-8.1.4" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "7.3.5"; + version = "8.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-7.3.5.tgz"; - sha512 = "6bm5lzGDOeSnWHM5W8OZ86RD2KpchynU+/Qlm5hNEFjfLDhwfAY2lSe68YRUEYFGlxSHe0HmakyhvmtWoD3Zog=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-8.1.4.tgz"; + sha512 = "NnGr4NNDqO5wjSDJo5nxrGtzZUwoT23YasqK2H4Pav/6vSgeVTxuqCL9Aeh+cWfTxDomj1M4Os5BrXFsvl7qiQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4369,13 +4522,13 @@ let sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw=="; }; }; - "@octokit/plugin-paginate-rest-2.13.5" = { + "@octokit/plugin-paginate-rest-2.13.6" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "2.13.5"; + version = "2.13.6"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.5.tgz"; - sha512 = "3WSAKBLa1RaR/7GG+LQR/tAZ9fp9H9waE9aPXallidyci9oZsfgsLn5M836d3LuDC6Fcym+2idRTBpssHZePVg=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.6.tgz"; + sha512 = "ai7TNKLi8tGkDvLM7fm0X1fbIP9u1nfXnN49ZAw2PgSoQou9yixKn5c3m0awuLacbuX2aXEvJpv1gKm3jboabg=="; }; }; "@octokit/plugin-request-log-1.0.4" = { @@ -4387,13 +4540,13 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.3.4" = { + "@octokit/plugin-rest-endpoint-methods-5.3.7" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.3.4"; + version = "5.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.3.4.tgz"; - sha512 = "2Y2q/FYCsW5tcwIqgnLOgzZXEb3I1VoSQGyHs/Zki/Ufs5H+uT0maPVHatLKw90LQbqK7ON8NpL3Y8IyzG6pNA=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.3.7.tgz"; + sha512 = "LAgTLOsJ86ig2wYSpcSx+UWt7aQYYsEZ/Tf/pksAVQWKNcGuTVCDl9OUiPhQ7DZelNozYVWTO9Iyjd/soe4tug=="; }; }; "@octokit/request-5.6.0" = { @@ -4414,22 +4567,22 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-18.6.3" = { + "@octokit/rest-18.6.6" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.6.3"; + version = "18.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.3.tgz"; - sha512 = "BeV2P48RR3MVPhSBq6KXXHMVHEJg5vnFBkFN1GKPXBohXTp+eb0gJq+5iYgkjbOMG6biNvkKllPDWJchpQHHiA=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.6.6.tgz"; + sha512 = "kCLvz8MSh+KToXySdqUp80caBom1ZQmsX3gbT3osfbJy6fD86QObUjzAOD3D3Awz3X7ng24+lB+imvSr5EnM7g=="; }; }; - "@octokit/types-6.16.7" = { + "@octokit/types-6.17.4" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.16.7"; + version = "6.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.16.7.tgz"; - sha512 = "OuQELiwIKeDySgNID52vm33wDRc2aaX8lKYgAw9Hmw939ITow1HspT8/AH3M3jgGFUMDmHlMNBNEmH7xV7ggXQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.17.4.tgz"; + sha512 = "Ghk/JC4zC/1al1GwH6p8jVX6pLdypSWmbnx6h79C/yo3DeaDd6MsNsBFlHu22KbkFh+CdcAzFqdP7UdPaPPmmA=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -5026,22 +5179,22 @@ let sha512 = "s4f489h5+EJksn4CfheLgv5PGOM0CDmK1UEBLw2t/ncWs3cW2VI7vXzndcd/WJHTv3GntJhXDcJMuL+Z2IAOgg=="; }; }; - "@redocly/ajv-6.12.4" = { + "@redocly/ajv-8.6.2" = { name = "_at_redocly_slash_ajv"; packageName = "@redocly/ajv"; - version = "6.12.4"; + version = "8.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/ajv/-/ajv-6.12.4.tgz"; - sha512 = "RB6vWO78v6c+SW/3bZh+XZMr4nGdJKAiPGsBALuUZnLuCiQ7aXCT1AuFHqnfS2gyXbEUEj+kw8p4ux8KdAfs3A=="; + url = "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.6.2.tgz"; + sha512 = "tU8fQs0D76ZKhJ2cWtnfQthWqiZgGBx0gH0+5D8JvaBEBaqA8foPPBt3Nonwr3ygyv5xrw2IzKWgIY86BlGs+w=="; }; }; - "@redocly/openapi-core-1.0.0-beta.50" = { + "@redocly/openapi-core-1.0.0-beta.53" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.50"; + version = "1.0.0-beta.53"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.50.tgz"; - sha512 = "GuXn4IETxpbRd8dlAQDQPtvqOpbMvPMeC/e5mv5MOXkLIznNk4vjiQVe6QSCbZbCHzzpb2+89B6S7asebPm4Rg=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.53.tgz"; + sha512 = "n5WixBRb7oWS31v3/cdOW/eNXbr2M4N8+HjHfCA/oQX6Z4ZYqPOJCekw64sQ/fnUQMIQyT6fKqyaf+iO4tG7YA=="; }; }; "@redocly/react-dropdown-aria-2.0.12" = { @@ -5143,13 +5296,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-12.1.0" = { + "@schematics/angular-12.1.1" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.0.tgz"; - sha512 = "BUCBiW+DQsOofSs4TE26M2OhlS0g9Mdyd0xWF4FD2Ab3xwQgkV1gogZgCl9dZtNfiimYebdM9LOeHqYWmvqCdw=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-12.1.1.tgz"; + sha512 = "ukSKoAWfXt28TiHlRrEzKFW63V3jroRF3xnBKtsaL3AZ4MVJiHzOWXkzDAZBaEOLUH/l6Xhm64NMgOqMEAg1rQ=="; }; }; "@schematics/schematics-0.1102.6" = { @@ -5188,13 +5341,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.12.0" = { + "@serverless/components-3.13.2" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.12.0"; + version = "3.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.12.0.tgz"; - sha512 = "USK6QCREd/SjsDDhumrsORkyQYew9WvXGjSbh5GvoGNKbqZlMiNWnua/DXmpz1uf2qaXzJO0LZEtpsiDBPX59w=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.13.2.tgz"; + sha512 = "fIYqo9cONxQeNpyWFTTLi6+r2S1KivOU5sys6nVQSR24jRVqxSpPN2eMz6BCUB8rw7N4kf+wbQDLwlyFbIroyQ=="; }; }; "@serverless/core-1.1.2" = { @@ -5206,13 +5359,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/dashboard-plugin-5.4.2" = { + "@serverless/dashboard-plugin-5.4.3" = { name = "_at_serverless_slash_dashboard-plugin"; packageName = "@serverless/dashboard-plugin"; - version = "5.4.2"; + version = "5.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.4.2.tgz"; - sha512 = "yFugs3TBPjZh6Gt/8lPca8H7n2/ICin17r/zmhiOhIscYMgIJT1EOY9EyCFWIQi9AMAmZD0a3ZR8U8gSYYTT9A=="; + url = "https://registry.npmjs.org/@serverless/dashboard-plugin/-/dashboard-plugin-5.4.3.tgz"; + sha512 = "lgQh7NG5B0T+jr5/CWLZUvW2EqQ5Phzf+XTybM/I+Obwc5jxtpOmPgItDs52kBgyNLDJAqzUN+YRpfE/HBGsoQ=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -5233,13 +5386,13 @@ let sha512 = "dyELLbrf/9+O+sjuIL7ymlH8zwCOsG+tf2TjeEjXooVSvNqUoZ4ZadENjxInUV841l0ddwkihwzH/54Yw+/qkg=="; }; }; - "@serverless/platform-client-china-2.1.14" = { + "@serverless/platform-client-china-2.1.17" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.1.14"; + version = "2.1.17"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.14.tgz"; - sha512 = "ciXVcYcdLlSB9ph94sX/8jmDuY85Yq0fJvwKGzndKPngjVkXs6Gw2tqj91act9nqW541Ycqb/HFh1BhgcDWP7Q=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.1.17.tgz"; + sha512 = "knJeb559PBJ72f/+RMH1iMavSiCJiXnTIWH88vdhlON+Tx7RPOTT5p48Modgbs8xONugmqbHjw9Z+fcyXZ2ajg=="; }; }; "@serverless/template-1.1.4" = { @@ -5278,13 +5431,13 @@ let sha512 = "cUt1ZYXZ/6Khe/foCucqraRpaTtejc4mICWVjQynwaPaK86/3g4Afu4pV1kEumnbet7N0PLbi+SKr8SHTf6tNQ=="; }; }; - "@serverless/utils-china-1.1.2" = { + "@serverless/utils-china-1.1.4" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.1.2.tgz"; - sha512 = "svZV9zZx2vSqR6EPstgaaLu1YHFfQ5PB2rvZAb66XuXwcPGMwAQN1c836H9L35Y/cUXLhFxv0UCpRHShJLYQSw=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.1.4.tgz"; + sha512 = "8s73M1k+mST7Z/Rp8wgmZh50tjpwX+fqsbYYRuFGgyuWTvgqAlUflDOWAeQuDx4pEndWEqjbG09ZrZNqlHuZqQ=="; }; }; "@sideway/address-4.1.2" = { @@ -5440,13 +5593,13 @@ let sha512 = "T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw=="; }; }; - "@snyk/cloud-config-parser-1.9.2" = { + "@snyk/cloud-config-parser-1.9.3" = { name = "_at_snyk_slash_cloud-config-parser"; packageName = "@snyk/cloud-config-parser"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.9.2.tgz"; - sha512 = "m8Y2+3l4fxj96QMrTfiCEaXgCpDkCkJIX/5wv0V0RHuxpUiyh+KxC2yJ8Su4wybBj6v6hB9hB7h5/L+Gy4V4PA=="; + url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.9.3.tgz"; + sha512 = "qv9NsIESPtyC2vKkqA7wEFePNuklksnQWJTWX8Cy3CQoCpZk80XwH50OVpDIU2szgnkWUm1XNSahG/IwVMSbOw=="; }; }; "@snyk/cocoapods-lockfile-parser-3.6.2" = { @@ -5476,13 +5629,13 @@ let sha512 = "wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ=="; }; }; - "@snyk/dep-graph-1.28.0" = { + "@snyk/dep-graph-1.28.1" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.28.0"; + version = "1.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.0.tgz"; - sha512 = "Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.1.tgz"; + sha512 = "ti5fPYivhBGCJ7rZGznMX2UJE1M5lR811WvVyBWTRJwLYVFYkhxRXKfgZUXEB0tq8vpo3V7tm3syrBd5TLPIMA=="; }; }; "@snyk/docker-registry-v2-client-2.2.2" = { @@ -5503,13 +5656,13 @@ let sha512 = "E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg=="; }; }; - "@snyk/fix-1.649.0" = { + "@snyk/fix-1.650.0" = { name = "_at_snyk_slash_fix"; packageName = "@snyk/fix"; - version = "1.649.0"; + version = "1.650.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.649.0.tgz"; - sha512 = "yYm6f8UmRPeQglDde8mDZU6ymQTyvlKcgJfG2dWjA0nQTbIo+aSqLGB9A5JyqVcJCEbwJrylNcPbYaxE9udnFg=="; + url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.650.0.tgz"; + sha512 = "qzwb0+DMrjxTsBXAcC74gb2X17925SapCBNo6DybLbOZXNJ6IFvtdN5ucd2FguEojfVyB4HVqkpbawc0bbfGtA=="; }; }; "@snyk/fix-pipenv-pipfile-0.5.4" = { @@ -6205,13 +6358,13 @@ let sha512 = "C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="; }; }; - "@types/debug-4.1.5" = { + "@types/debug-4.1.6" = { name = "_at_types_slash_debug"; packageName = "@types/debug"; - version = "4.1.5"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz"; - sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ=="; + url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.6.tgz"; + sha512 = "7fDOJFA/x8B+sO1901BmHlf5dE1cxBU8mRXj8QOEDnn16hhGJv/IHxJtZhvsabZsIMn0eLIyeOKAeqSNJJYTpA=="; }; }; "@types/decompress-4.2.3" = { @@ -6313,22 +6466,22 @@ let sha512 = "laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg=="; }; }; - "@types/estree-0.0.47" = { + "@types/estree-0.0.48" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "0.0.47"; + version = "0.0.48"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.47.tgz"; - sha512 = "c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.48.tgz"; + sha512 = "LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew=="; }; }; - "@types/estree-0.0.48" = { + "@types/estree-0.0.49" = { name = "_at_types_slash_estree"; packageName = "@types/estree"; - version = "0.0.48"; + version = "0.0.49"; src = fetchurl { - url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.48.tgz"; - sha512 = "LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew=="; + url = "https://registry.npmjs.org/@types/estree/-/estree-0.0.49.tgz"; + sha512 = "K1AFuMe8a+pXmfHTtnwBvqoEylNKVeaiKYkjmcEAdytMQVJ/i9Fu7sc13GxgXdO49gkE7Hy8SyJonUZUn+eVaw=="; }; }; "@types/expect-1.20.4" = { @@ -6889,6 +7042,15 @@ let sha512 = "se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg=="; }; }; + "@types/node-15.14.0" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "15.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-15.14.0.tgz"; + sha512 = "um/+/ip3QZmwLfIkWZSNtQIJNVAqrJ92OkLMeuZrjZMTAJniI7fh8N8OICyDhAJ2mzgk/fmYFo72jRr5HyZ1EQ=="; + }; + }; "@types/node-15.6.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7393,13 +7555,13 @@ let sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw=="; }; }; - "@typescript-eslint/eslint-plugin-4.28.0" = { + "@typescript-eslint/eslint-plugin-4.28.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.0.tgz"; - sha512 = "KcF6p3zWhf1f8xO84tuBailV5cN92vhS+VT7UJsPzGBm9VnQqfI9AsiMUFUCYHTYPg1uCCo+HyiDnpDuvkAMfQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.1.tgz"; + sha512 = "9yfcNpDaNGQ6/LQOX/KhUFTR1sCKH+PBr234k6hI9XJ0VP5UqGxap0AnNwBnWFk1MNyWBylJH9ZkzBXC+5akZQ=="; }; }; "@typescript-eslint/experimental-utils-3.10.1" = { @@ -7411,13 +7573,13 @@ let sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/experimental-utils-4.28.0" = { + "@typescript-eslint/experimental-utils-4.28.1" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.0.tgz"; - sha512 = "9XD9s7mt3QWMk82GoyUpc/Ji03vz4T5AYlHF9DcoFNfJ/y3UAclRsfGiE2gLfXtyC+JRA3trR7cR296TEb1oiQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.1.tgz"; + sha512 = "n8/ggadrZ+uyrfrSEchx3jgODdmcx7MzVM2sI3cTpI/YlfSm0+9HEUaWw3aQn2urL2KYlWYMDgn45iLfjDYB+Q=="; }; }; "@typescript-eslint/parser-3.10.1" = { @@ -7429,22 +7591,22 @@ let sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/parser-4.28.0" = { + "@typescript-eslint/parser-4.28.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.0.tgz"; - sha512 = "7x4D22oPY8fDaOCvkuXtYYTQ6mTMmkivwEzS+7iml9F9VkHGbbZ3x4fHRwxAb5KeuSkLqfnYjs46tGx2Nour4A=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.1.tgz"; + sha512 = "UjrMsgnhQIIK82hXGaD+MCN8IfORS1CbMdu7VlZbYa8LCZtbZjJA26De4IPQB7XYZbL8gJ99KWNj0l6WD0guJg=="; }; }; - "@typescript-eslint/scope-manager-4.28.0" = { + "@typescript-eslint/scope-manager-4.28.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.0.tgz"; - sha512 = "eCALCeScs5P/EYjwo6se9bdjtrh8ByWjtHzOkC4Tia6QQWtQr3PHovxh3TdYTuFcurkYI4rmFsRFpucADIkseg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.1.tgz"; + sha512 = "o95bvGKfss6705x7jFGDyS7trAORTy57lwJ+VsYwil/lOUxKQ9tA7Suuq+ciMhJc/1qPwB3XE2DKh9wubW8YYA=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -7456,13 +7618,13 @@ let sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/types-4.28.0" = { + "@typescript-eslint/types-4.28.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.0.tgz"; - sha512 = "p16xMNKKoiJCVZY5PW/AfILw2xe1LfruTcfAKBj3a+wgNYP5I9ZEKNDOItoRt53p4EiPV6iRSICy8EPanG9ZVA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.1.tgz"; + sha512 = "4z+knEihcyX7blAGi7O3Fm3O6YRCP+r56NJFMNGsmtdw+NCdpG5SgNz427LS9nQkRVTswZLhz484hakQwB8RRg=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -7474,13 +7636,13 @@ let sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/typescript-estree-4.28.0" = { + "@typescript-eslint/typescript-estree-4.28.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.0.tgz"; - sha512 = "m19UQTRtxMzKAm8QxfKpvh6OwQSXaW1CdZPoCaQuLwAq7VZMNuhJmZR4g5281s2ECt658sldnJfdpSZZaxUGMQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.1.tgz"; + sha512 = "GhKxmC4sHXxHGJv8e8egAZeTZ6HI4mLU6S7FUzvFOtsk7ZIDN1ksA9r9DyOgNqowA9yAtZXV0Uiap61bIO81FQ=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -7492,13 +7654,13 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@typescript-eslint/visitor-keys-4.28.0" = { + "@typescript-eslint/visitor-keys-4.28.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "4.28.0"; + version = "4.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.0.tgz"; - sha512 = "PjJyTWwrlrvM5jazxYF5ZPs/nl0kHDZMVbuIcbpawVXaDPelp3+S9zpOz5RmVUfS/fD5l5+ZXNKnWhNYjPzCvw=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.1.tgz"; + sha512 = "K4HMrdFqr9PFquPu178SaSb92CaWe2yErXyPumc8cYWxFmhgJsNY9eSePmO05j0JhBvf2Cdhptd6E6Yv9HVHcg=="; }; }; "@uifabric/foundation-7.9.26" = { @@ -7636,31 +7798,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.1.2" = { + "@vue/compiler-core-3.1.3" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.2.tgz"; - sha512 = "nHmq7vLjq/XM2IMbZUcKWoH5sPXa2uR/nIKZtjbK5F3TcbnYE/zKsrSUR9WZJ03unlwotNBX1OyxVt9HbWD7/Q=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.3.tgz"; + sha512 = "I58MDtVa8AYEIa3waLO6/89JdmgpkDAEcL3Vrmlsbnt07KZ5sIGLqaXjzGrOT57j9s8ty0WTYlLQq2rWUVYGCg=="; }; }; - "@vue/compiler-dom-3.1.2" = { + "@vue/compiler-dom-3.1.3" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.2.tgz"; - sha512 = "k2+SWcWH0jL6WQAX7Or2ONqu5MbtTgTO0dJrvebQYzgqaKMXNI90RNeWeCxS4BnNFMDONpHBeFgbwbnDWIkmRg=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.3.tgz"; + sha512 = "BunLXKP+UvY1XJ0L6M7KD/De0XP+kOlIxFg3OfXtVQZcLLgnLcTgSK3t/ylvIpYJOadGaHhb+BfCK/hdqOVAyw=="; }; }; - "@vue/shared-3.1.2" = { + "@vue/shared-3.1.3" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.1.2.tgz"; - sha512 = "EmH/poaDWBPJaPILXNI/1fvUbArJQmmTyVCwvvyDYDFnkPoTclAbHRAtyIvqfez7jybTDn077HTNILpxlsoWhg=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.1.3.tgz"; + sha512 = "uGBX4bZVFvgranxzpH3q1gGmICUjEUnNrMIBFeZRw8hBfCPhT+VnuY8+mG2l/yEyY73J9e6d36CtbFUqDXa12w=="; }; }; "@webassemblyjs/ast-1.11.0" = { @@ -10840,13 +11002,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.935.0" = { + "aws-sdk-2.938.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.935.0"; + version = "2.938.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.935.0.tgz"; - sha512 = "OeoqkZ0fXPC1xjumoFQmPccASXmGBBNBsI3l9vs/NCQk3WyBfiYh07H6RO5owtCmp0a8hAjKSZAHjnRe2JlmEA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.938.0.tgz"; + sha512 = "e+KWYRyJ4Tvlg+6kQTze9Hxmkn+4/H8m+D8AXlfgUbtzyc1OBDf7cMCcl8IvCD3xoqELsgEunPC014v2JTTfZg=="; }; }; "aws-sign2-0.6.0" = { @@ -11227,13 +11389,13 @@ let sha512 = "Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg=="; }; }; - "babel-plugin-styled-components-1.12.0" = { + "babel-plugin-styled-components-1.13.1" = { name = "babel-plugin-styled-components"; packageName = "babel-plugin-styled-components"; - version = "1.12.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz"; - sha512 = "FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA=="; + url = "https://registry.npmjs.org/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.1.tgz"; + sha512 = "iY11g5orsdBnvWtXKCFBzDyTxZ9jvmkcYCCs5ONlvASYltDRhieCVzeDC7Do0fSW7psAL0zfVoXB3FHz2CkUSg=="; }; }; "babel-plugin-syntax-flow-6.18.0" = { @@ -12514,13 +12676,13 @@ let sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129"; }; }; - "blessed-contrib-4.9.0" = { + "blessed-contrib-4.10.0" = { name = "blessed-contrib"; packageName = "blessed-contrib"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.9.0.tgz"; - sha512 = "lqvb+6WeqMh7AO8zudSDnvKPGqzkmxqMAwpv83qzeL35MfmROkmjwnY3pi5dvgxfwg5i1UJnDMpj8OroCqpAPw=="; + url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.10.0.tgz"; + sha512 = "NbMkaBNPNZikQo5XBKsXTGIu/gxAywRANHPt2Zc4oFmtiXGHgAGgl6Q6mg6sr9SvG08zidPxokRDcgso+HGmzw=="; }; }; "blgr-0.1.8" = { @@ -13981,6 +14143,15 @@ let sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; }; }; + "cache-chunk-store-3.2.2" = { + name = "cache-chunk-store"; + packageName = "cache-chunk-store"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cache-chunk-store/-/cache-chunk-store-3.2.2.tgz"; + sha512 = "2lJdWbgHFFxcSth9s2wpId3CR3v1YC63KjP4T9WhpW7LWlY7Hiiei3QwwqzkWqlJTfR8lSy9F5kRQECeyj+yQA=="; + }; + }; "cache-directory-2.0.0" = { name = "cache-directory"; packageName = "cache-directory"; @@ -14278,13 +14449,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001240" = { + "caniuse-lite-1.0.30001241" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001240"; + version = "1.0.30001241"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001240.tgz"; - sha512 = "nb8mDzfMdxBDN7ZKx8chWafAdBp5DAAlpWvNyUGe5tcDWd838zpzDN3Rah9cjCqhfOKkrvx40G2SDtP0qiWX/w=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001241.tgz"; + sha512 = "1uoSZ1Pq1VpH0WerIMqwptXHNNGfdl7d1cJUFs80CwQ/lVzdhTvsFZCeNFslze7AjsQnb4C85tzclPa1VShbeQ=="; }; }; "canvas-2.8.0" = { @@ -15340,6 +15511,15 @@ let sha512 = "g7rLWfhAo/7pF+a/STFH/xPyosaL1zgADhI0OM83hl3c7S43iGvJWEAV2QuDOnQ8i6EMBj/u4+NTd0d5L+4JfA=="; }; }; + "cli-progress-footer-1.1.1" = { + name = "cli-progress-footer"; + packageName = "cli-progress-footer"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-progress-footer/-/cli-progress-footer-1.1.1.tgz"; + sha512 = "J0uW2u06pWI0tMKCbcCiMOZd8TbWj4EpuYgPo4Jiwih/FfGbd4dbLcJieO0Ior1pY1HBrnmCuHFk6GB9azE4pg=="; + }; + }; "cli-spinner-0.2.10" = { name = "cli-spinner"; packageName = "cli-spinner"; @@ -16195,15 +16375,6 @@ let sha512 = "GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw=="; }; }; - "command-exists-1.2.6" = { - name = "command-exists"; - packageName = "command-exists"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.6.tgz"; - sha512 = "Qst/zUUNmS/z3WziPxyqjrcz09pm+2Knbs5mAZL4VAE0sSrNY1/w8+/YxeHcoBTsO6iojA6BW7eFf27Eg2MRuw=="; - }; - }; "command-exists-1.2.9" = { name = "command-exists"; packageName = "command-exists"; @@ -16960,13 +17131,13 @@ let sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; }; }; - "constructs-3.3.92" = { + "constructs-3.3.94" = { name = "constructs"; packageName = "constructs"; - version = "3.3.92"; + version = "3.3.94"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-3.3.92.tgz"; - sha512 = "fy4mwH1yyNZe+fykEsVeBYhBI2GNYBoJoRS3St8Scl/RcoFUj1inHvxMDrcRHm78K0kZ/U1oZ5gzuMHBnQxWlQ=="; + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.94.tgz"; + sha512 = "P2Sfaa+CHt6lVlIdSry4hj1cQsg71J7eXJm9zyPpZNi/FDeHu/vcOmon84v8effvBoF5e7ef2tfVCwwMXcu9Jw=="; }; }; "consume-http-header-1.0.0" = { @@ -17042,13 +17213,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.25.1" = { + "contentful-management-7.27.0" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.25.1"; + version = "7.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.25.1.tgz"; - sha512 = "V8tcSHw3MwWKWHWMW+AZB6lP31hreos+v2gtayZczWXYRcfd+owt+qVjbkLZk1pL80ewSmc8Pl1A7rM/oB2ldw=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.27.0.tgz"; + sha512 = "HGwUmR0160TI9RNiqLWjlFpPmjiXGC2VAgtzqM0mXMCJKJTzLBmsETVycQ7Nwip+2+CHdDRta5a9vQEN89UNTw=="; }; }; "contentful-sdk-core-6.8.0" = { @@ -17474,31 +17645,31 @@ let sha512 = "SaMnchL//WwU2Ot1hhkPflE8gzo7uq1FGvUJ8GKmi3TOU7rGTHIU+eir1WGf6qOtTyxdfdcp10yPdGZ59sQ3hw=="; }; }; - "core-js-3.15.1" = { + "core-js-3.15.2" = { name = "core-js"; packageName = "core-js"; - version = "3.15.1"; + version = "3.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.15.1.tgz"; - sha512 = "h8VbZYnc9pDzueiS2610IULDkpFFPunHwIpl8yRwFahAEEdSpHlTy3h3z3rKq5h11CaUdBEeRViu9AYvbxiMeg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz"; + sha512 = "tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q=="; }; }; - "core-js-compat-3.15.1" = { + "core-js-compat-3.15.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.15.1"; + version = "3.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.1.tgz"; - sha512 = "xGhzYMX6y7oEGQGAJmP2TmtBLvR4nZmRGEcFa3ubHOq5YEp51gGN9AovVa0AoujGZIq+Wm6dISiYyGNfdflYww=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.15.2.tgz"; + sha512 = "Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ=="; }; }; - "core-js-pure-3.15.1" = { + "core-js-pure-3.15.2" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.15.1"; + version = "3.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.1.tgz"; - sha512 = "OZuWHDlYcIda8sJLY4Ec6nWq2hRjlyCqCZ+jCflyleMkVt3tPedDVErvHslyS2nbO+SlBFMSBJYvtLMwxnrzjA=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.15.2.tgz"; + sha512 = "D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA=="; }; }; "core-util-is-1.0.2" = { @@ -21560,13 +21731,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.759" = { + "electron-to-chromium-1.3.765" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.759"; + version = "1.3.765"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.759.tgz"; - sha512 = "nM76xH0t2FBH5iMEZDVc3S/qbdKjGH7TThezxC8k1Q7w7WHvIAyJh8lAe2UamGfdRqBTjHfPDn82LJ0ksCiB9g=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.765.tgz"; + sha512 = "4NhcsfZYlr1x4FehYkK+R9CNNTOZ8vLcIu8Y1uWehxYp5r/jlCGAfBqChIubEfdtX+rBQpXx4yJuX/dzILH/nw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -22732,6 +22903,15 @@ let sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; }; + "eslint-visitor-keys-3.0.0" = { + name = "eslint-visitor-keys"; + packageName = "eslint-visitor-keys"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz"; + sha512 = "mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q=="; + }; + }; "esmangle-1.0.1" = { name = "esmangle"; packageName = "esmangle"; @@ -22786,6 +22966,15 @@ let sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; }; + "espree-8.0.0" = { + name = "espree"; + packageName = "espree"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-8.0.0.tgz"; + sha512 = "y/+i23dwTjIDJrYCcjcAMr3c3UGbPIjC6THMQKjWmhP97fW0FPiI89kmpKfmgV/5jrkIi6toQP+CMm3qBE1Hig=="; + }; + }; "esprima-1.1.1" = { name = "esprima"; packageName = "esprima"; @@ -24676,13 +24865,13 @@ let sha512 = "LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="; }; }; - "filesize-6.3.0" = { + "filesize-6.4.0" = { name = "filesize"; packageName = "filesize"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-6.3.0.tgz"; - sha512 = "ytx0ruGpDHKWVoiui6+BY/QMNngtDQ/pJaFwfBpQif0J63+E8DLdFyqS3NkKQn7vIruUEpoGD9JUJSg7Kp+I0g=="; + url = "https://registry.npmjs.org/filesize/-/filesize-6.4.0.tgz"; + sha512 = "mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ=="; }; }; "filestream-5.0.0" = { @@ -25054,13 +25243,13 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; - "flatted-3.1.1" = { + "flatted-3.2.0" = { name = "flatted"; packageName = "flatted"; - version = "3.1.1"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz"; - sha512 = "zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.0.tgz"; + sha512 = "XprP7lDrVT+kE2c2YlfiV+IfS9zxukiIOvNamPNsImNhXadSsQEbosItdL9bUQlCZXR13SvPk20BjWSWLA7m4A=="; }; }; "flatten-0.0.1" = { @@ -26629,13 +26818,13 @@ let sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ=="; }; }; - "git-url-parse-11.4.4" = { + "git-url-parse-11.5.0" = { name = "git-url-parse"; packageName = "git-url-parse"; - version = "11.4.4"; + version = "11.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.4.tgz"; - sha512 = "Y4o9o7vQngQDIU9IjyCmRJBin5iYjI5u9ZITnddRZpD7dcCFQj2sL2XuMNbLRE4b4B/4ENPsp2Q8P44fjAZ0Pw=="; + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.5.0.tgz"; + sha512 = "TZYSMDeM37r71Lqg1mbnMlOqlHd7BSij9qN7XwTkRqSAYFMihGLGhfHwgqQob3GUhEneKnV4nskN9rbQw2KGxA=="; }; }; "gitconfiglocal-1.0.0" = { @@ -27161,15 +27350,6 @@ let sha1 = "2edeeb958084d0f8ea7988e5d995b1c7dfc14777"; }; }; - "goldengate-10.0.6" = { - name = "goldengate"; - packageName = "goldengate"; - version = "10.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/goldengate/-/goldengate-10.0.6.tgz"; - sha512 = "6nwFndjr71Od5XL53oVtlwf3gk8EI/zkKrcjeRAS/G6XLFzPsrOe4npeuom+mgkfgE0rRJFtoOY0wrYgDGuYSg=="; - }; - }; "goldengate-10.1.0" = { name = "goldengate"; packageName = "goldengate"; @@ -27197,13 +27377,13 @@ let sha512 = "Q+ZjUEvLQj/lrVHF/IQwRo6p3s8Nc44Zk/DALsN+ac3T4HY/g/3rrufkgtl+nZ1TW7DNAw5cTChdVp4apUXVgQ=="; }; }; - "google-auth-library-7.1.2" = { + "google-auth-library-7.2.0" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "7.1.2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.1.2.tgz"; - sha512 = "FMipHgfe2u1LzWsf2n9zEB9KsJ8M3n8OYTHbHtlkzPCyo7IknXQR5X99nfvwUHGuX+iEpihUZxDuPm7+qBYeXg=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-7.2.0.tgz"; + sha512 = "F5mnidUaIXfZZl2FzhZOhboLNR6pIgIPrmP4QAbDKMy+kkb3GOc4r7KndAV9+Kx3VijrQTi4FI/AMLg8VWG6nw=="; }; }; "google-closure-compiler-js-20170910.0.1" = { @@ -30213,6 +30393,15 @@ let sha1 = "96fb0a936c12babd6ff1752a17d05616abd094c6"; }; }; + "into-stream-6.0.0" = { + name = "into-stream"; + packageName = "into-stream"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/into-stream/-/into-stream-6.0.0.tgz"; + sha512 = "XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA=="; + }; + }; "invariant-2.2.4" = { name = "invariant"; packageName = "invariant"; @@ -30276,6 +30465,15 @@ let sha512 = "b1yeWevW04/jMmkzJ3Fk91d8cAd+pYYg/w0S7XCGAI4yo8jSnAD+S4oAWjfFkwNa+GV8WwCOTDuotWcI5md87A=="; }; }; + "invoices-2.0.0" = { + name = "invoices"; + packageName = "invoices"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invoices/-/invoices-2.0.0.tgz"; + sha512 = "UnU0bS3+cMA2UvYrF5RXp/Hm7v/nYiA3F0GVCOeRmDiZmXAt/eO7KdqyRzewopvhBlev7F7t7GZzRRYY1XE3xg=="; + }; + }; "iota-array-1.0.0" = { name = "iota-array"; packageName = "iota-array"; @@ -32220,13 +32418,13 @@ let sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; - "jest-worker-27.0.2" = { + "jest-worker-27.0.6" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.0.2"; + version = "27.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.2.tgz"; - sha512 = "EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.0.6.tgz"; + sha512 = "qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA=="; }; }; "jimp-0.12.1" = { @@ -32238,13 +32436,13 @@ let sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; }; }; - "jitdb-3.1.4" = { + "jitdb-3.1.5" = { name = "jitdb"; packageName = "jitdb"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.4.tgz"; - sha512 = "UEzC68eqFIQJPQnmPm2/KGirX2pE+GebhA2EZss3b0UZZca7eGgxpvQ7+sIPcwLKAcZr5rmkFhQHGIQJyf20bg=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.5.tgz"; + sha512 = "O3z6dmk4FY+Il3zt4CEnDwgbCWP89dsGvCK1Gx7pVOSsKML31WupDJMTICZ3PUagYi52NNUhvCZHUeJVJFdgTA=="; }; }; "jju-1.4.0" = { @@ -32688,13 +32886,13 @@ let sha512 = "ChFg5qhvxCaM2bspCqizs48yMtsm5YLHjBoNZLCkbXyc3yMM5l8pnn787B5ww5TI3+tKxKYWkbiKf356kQ1OgQ=="; }; }; - "jsii-srcmak-0.1.295" = { + "jsii-srcmak-0.1.297" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.295"; + version = "0.1.297"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.295.tgz"; - sha512 = "xqi5ItFZktdHGzc2XsgNhHsz7egFoFxMpnT0r3ZIbdS6CI1GgBChLEnwxlrE1D6L7c4O4CUImczWgA8b63adPA=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.297.tgz"; + sha512 = "CeBsxrdz22C7j7CyO0hqlz/T6MjpeR1jKy1wY5BHyKXc8mSCoTQDuCMHnmTGg9ifiuRUbOsNSbPMiHYEq2sanQ=="; }; }; "json-bigint-0.2.3" = { @@ -32994,13 +33192,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.262" = { + "json2jsii-0.1.264" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.262"; + version = "0.1.264"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.262.tgz"; - sha512 = "EuPkRDhoG5nH95KzXeDrD6ZExFQp6wwRHsz/h1+hrcRBMX5xusEx0kJoYx7R65i7WNavIw/zdJzVVPwhEl+qHw=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.264.tgz"; + sha512 = "IOe1PBV1h7feIUXO3HMRwK56TntzfEeRTMYMWwZYjRwZD6cbBS9yLsteW2fSlnhBVWkJsgZWQPP931aCulPBxw=="; }; }; "json3-3.2.6" = { @@ -33832,13 +34030,13 @@ let sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw=="; }; }; - "lambda-local-1.7.4" = { + "lambda-local-2.0.0" = { name = "lambda-local"; packageName = "lambda-local"; - version = "1.7.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lambda-local/-/lambda-local-1.7.4.tgz"; - sha512 = "uLrFPGj2//glOgJGLZn8hNTNlhU+eGx0WFRLZxIoC39nfjLRZ1fncHcPK2t5gA2GcvgtGUT2dnw60M8vJAOIkQ=="; + url = "https://registry.npmjs.org/lambda-local/-/lambda-local-2.0.0.tgz"; + sha512 = "5Z7ZEhqVYJSm3djoq7QLDkEk7Ao+jNYbARo3nk3wtjKpgCnEbzOuraxDPDWg7OlZ4JKcsRDP+wNLeORMdbF2ow=="; }; }; "last-call-webpack-plugin-3.0.0" = { @@ -34354,6 +34552,15 @@ let sha512 = "bD57EjMVMBplyEMjXDMo8MvBfPymufU81kYbixqrvaLHoqsmyTMwLzqpa4CurJ5YKAXLJw68ZReDzDb6rj90Sg=="; }; }; + "lightning-3.3.12" = { + name = "lightning"; + packageName = "lightning"; + version = "3.3.12"; + src = fetchurl { + url = "https://registry.npmjs.org/lightning/-/lightning-3.3.12.tgz"; + sha512 = "tq7AAMpjQ9sl58pW/qis/vOBzN7MCQ4F4n+ox4VQhyv1qVA+P2LgJq36I1Y6b4RX68+hK48u1eHDzSt527fEXA=="; + }; + }; "lightning-3.3.9" = { name = "lightning"; packageName = "lightning"; @@ -34498,13 +34705,13 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "ln-accounting-4.3.0" = { + "ln-accounting-4.3.1" = { name = "ln-accounting"; packageName = "ln-accounting"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-4.3.0.tgz"; - sha512 = "JfnHWP6hNmA5DCx0OHq7WKwiwPKyD1lb7GPmRqg0NFr8jj9p/PNnxayfjRD2PsmA5C3OxXO53wCy1XymG4I8+Q=="; + url = "https://registry.npmjs.org/ln-accounting/-/ln-accounting-4.3.1.tgz"; + sha512 = "EBEeBymqktoaViGAG5aVmgIOZpWc6IwDqxq93ZYYIw+Uc9Vy/86nUDPx8A/jJC0f8lwEGcqT+hnSIiBF4SyqeA=="; }; }; "ln-service-51.8.2" = { @@ -34525,6 +34732,15 @@ let sha512 = "8jTfQWtdAJJ2pipprNnUrUUpMxq6wQpT1bhN+ZwyMCdHVo72r58TrFoy0UQsutbgN9OjHMHSsBoyTd5cPmUfWA=="; }; }; + "ln-service-51.8.5" = { + name = "ln-service"; + packageName = "ln-service"; + version = "51.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.8.5.tgz"; + sha512 = "1SU0eG9/LDy6k3UGXaahmoe1wOahAJkaidWpLX5Nmlfq72I0arad420smma5ZGXAW4wNlGR/gx68KZzzYI5D4A=="; + }; + }; "ln-sync-0.4.5" = { name = "ln-sync"; packageName = "ln-sync"; @@ -36946,13 +37162,13 @@ let sha512 = "34RwOXZT8kyuOJy25oJNJoulO8L0bTHYWXcdZBYZqFnjIy3NgjeoM3FmPXIOFQ26/lSHYMr8oc62B6adxXcb3Q=="; }; }; - "markdown-it-12.0.6" = { + "markdown-it-12.1.0" = { name = "markdown-it"; packageName = "markdown-it"; - version = "12.0.6"; + version = "12.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.0.6.tgz"; - sha512 = "qv3sVLl4lMT96LLtR7xeRJX11OUFjsaD5oVat2/SNBIb21bJXwal2+SklcRbTwGwqWpWH/HRtYavOoJE+seL8w=="; + url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.1.0.tgz"; + sha512 = "7temG6IFOOxfU0SgzhqR+vr2diuMhyO5uUIEZ3C5NbXhqC9uFUHoU41USYuDFoZRsaY7BEIEei874Z20VMLF6A=="; }; }; "markdown-it-8.4.2" = { @@ -40728,13 +40944,13 @@ let sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; }; }; - "node-ipc-9.1.4" = { + "node-ipc-9.2.0" = { name = "node-ipc"; packageName = "node-ipc"; - version = "9.1.4"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.4.tgz"; - sha512 = "A+f0mn2KxUt1uRTSd5ktxQUsn2OEhj5evo7NUi/powBzMSZ0vocdzDjlq9QN2v3LH6CJi3e5xAenpZ1QwU5A8g=="; + url = "https://registry.npmjs.org/node-ipc/-/node-ipc-9.2.0.tgz"; + sha512 = "m4A/wueUS2PqrhM6Z8rzD1J2qvG4QG8NkKY0v3lgdntQI2NTDDL3YbfU6qkDc0RgUiA9UqZTO9CtIiDAIjrVwA=="; }; }; "node-libs-browser-2.2.1" = { @@ -41223,15 +41439,6 @@ let sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; }; }; - "normalize-url-4.5.0" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; - sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; - }; - }; "normalize-url-4.5.1" = { name = "normalize-url"; packageName = "normalize-url"; @@ -42421,13 +42628,13 @@ let sha512 = "Su8jA45PhegUgJnEAT15DYt2spPJgvjyTtXqg+Lw5AtGePfcQskV6ACEzsL0XPoAXIFf09Vx6sBor9pek+tl+Q=="; }; }; - "openapi-sampler-1.0.1" = { + "openapi-sampler-1.1.0" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.1.tgz"; - sha512 = "qBjxkSLJV183zTTs4fgxtU/iWSLUUu2aH2+5ddWkNhV7p8CSe/mnAgoLkEbMfHtel6yr9NF+vjUWqfM+iiwORQ=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.1.0.tgz"; + sha512 = "/LhZYKNBWphLEpbAG5BdpBZbIbmLgC4vTiTj8N/MV0LF9ptmKOiJ2nETVlacNjXHt7iqDgZDELJCIoZ3q5ZG6A=="; }; }; "openapi-schema-validator-3.0.3" = { @@ -42997,13 +43204,13 @@ let sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; }; }; - "p-debounce-1.0.0" = { + "p-debounce-2.1.0" = { name = "p-debounce"; packageName = "p-debounce"; - version = "1.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-debounce/-/p-debounce-1.0.0.tgz"; - sha1 = "cb7f2cbeefd87a09eba861e112b67527e621e2fd"; + url = "https://registry.npmjs.org/p-debounce/-/p-debounce-2.1.0.tgz"; + sha512 = "M9bMt62TTnozdZhqFgs+V7XD2MnuKCaz+7fZdlu2/T7xruI3uIE5CicQ0vx1hV7HIUYF0jF+4/R1AgfOkl74Qw=="; }; }; "p-defer-1.0.0" = { @@ -43096,6 +43303,15 @@ let sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="; }; }; + "p-is-promise-3.0.0" = { + name = "p-is-promise"; + packageName = "p-is-promise"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz"; + sha512 = "Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ=="; + }; + }; "p-limit-1.3.0" = { name = "p-limit"; packageName = "p-limit"; @@ -43870,13 +44086,13 @@ let sha1 = "32d4b6afde631420e5f415919a222b774b575707"; }; }; - "parse-url-5.0.6" = { + "parse-url-5.0.7" = { name = "parse-url"; packageName = "parse-url"; - version = "5.0.6"; + version = "5.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.6.tgz"; - sha512 = "nZp+U7NFVTsBXTh6oGxdwvd7ncz3hJCl74q0lC0pLc3ypXJMKFUpfUEAd4r1x8zVVF5UHFik+CBNOQKN0ayByA=="; + url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.7.tgz"; + sha512 = "CgbjyWT6aOh2oNSUS0cioYQsGysj9hQ2IdbOfeNwq5KOaKM7dOw/yTupiI0cnJhaDHJEIGybPkQz7LF9WNIhyw=="; }; }; "parse5-1.5.1" = { @@ -44095,13 +44311,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "passport-oauth2-1.5.0" = { + "passport-oauth2-1.6.0" = { name = "passport-oauth2"; packageName = "passport-oauth2"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.5.0.tgz"; - sha512 = "kqBt6vR/5VlCK8iCx1/KpY42kQ+NEHZwsSyt4Y6STiNjU+wWICG1i8ucc1FapXDGO15C5O5VZz7+7vRzrDPXXQ=="; + url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.6.0.tgz"; + sha512 = "emXPLqLcVEcLFR/QvQXZcwLmfK8e9CqvMgmOFJxcNT3okSFMtUbRRKpY20x5euD+01uHsjjCa07DYboEeLXYiw=="; }; }; "passport-oauth2-client-password-0.1.2" = { @@ -44851,6 +45067,15 @@ let sha512 = "NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA=="; }; }; + "pkg-fetch-3.1.1" = { + name = "pkg-fetch"; + packageName = "pkg-fetch"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.1.1.tgz"; + sha512 = "3GfpNwbwoTxge2TrVp6Oyz/FZJOoxF1r0+1YikOhnBXa2Di/VOJKtUObFHap76BFnyFo1fwh5vARWFR9TzLKUg=="; + }; + }; "pkg-up-2.0.0" = { name = "pkg-up"; packageName = "pkg-up"; @@ -45887,6 +46112,15 @@ let sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg=="; }; }; + "prebuild-install-6.0.1" = { + name = "prebuild-install"; + packageName = "prebuild-install"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.0.1.tgz"; + sha512 = "7GOJrLuow8yeiyv75rmvZyeMGzl8mdEX5gY69d6a6bHWmiPevwqFw+tQavhK0EYMaSg3/KD24cWqeQv1EWsqDQ=="; + }; + }; "prebuild-install-6.1.3" = { name = "prebuild-install"; packageName = "prebuild-install"; @@ -46364,6 +46598,24 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; + "process-utils-2.6.0" = { + name = "process-utils"; + packageName = "process-utils"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-utils/-/process-utils-2.6.0.tgz"; + sha512 = "2zKFADQDvHiUDyJQTsBTdu1+Q2D/WtReBotZwXmD9oUueb0kNv4rXulK/78hMM+nclBNFZ/ZlHOJtobt8oHpqQ=="; + }; + }; + "process-utils-4.0.0" = { + name = "process-utils"; + packageName = "process-utils"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/process-utils/-/process-utils-4.0.0.tgz"; + sha512 = "fMyMQbKCxX51YxR7YGCzPjLsU3yDzXFkP4oi1/Mt5Ixnk7GO/7uUTj8mrCHUwuvozWzI+V7QSJR9cZYnwNOZPg=="; + }; + }; "progress-1.1.8" = { name = "progress"; packageName = "progress"; @@ -47732,13 +47984,13 @@ let sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; - "puppeteer-10.0.0" = { + "puppeteer-10.1.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "10.0.0"; + version = "10.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.0.0.tgz"; - sha512 = "AxHvCb9IWmmP3gMW+epxdj92Gglii+6Z4sb+W+zc2hTTu10HF0yg6hGXot5O74uYkVqG3lfDRLfnRpi6WOwi5A=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.1.0.tgz"; + sha512 = "bsyDHbFBvbofZ63xqF7hMhuKBX1h4WsqFIAoh1GuHr/Y9cewh+EFNAOdqWSkQRHLiBU/MY6M+8PUnXXjAPtuSg=="; }; }; "purgecss-2.3.0" = { @@ -47786,13 +48038,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.153" = { + "pyright-1.1.154" = { name = "pyright"; packageName = "pyright"; - version = "1.1.153"; + version = "1.1.154"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.153.tgz"; - sha512 = "t5Y9IojL2Sifm1Q04BEBJDLP86rF4RpXma28HEP/EXJRHyyNxu8css77HC+tZqJXXXZVtAjaJxJSAEwq5afGjg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.154.tgz"; + sha512 = "J2P5Iurkl7smCyB8CH5fsm8GOGeKRk7d1HWcFiro94E0vJW/5sSKXrkfjPxo7XZ+e96UiW1qyiVTCC++db3Tfg=="; }; }; "q-0.9.7" = { @@ -50432,13 +50684,13 @@ let sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; }; }; - "retry-request-4.2.0" = { + "retry-request-4.2.1" = { name = "retry-request"; packageName = "retry-request"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/retry-request/-/retry-request-4.2.0.tgz"; - sha512 = "rIwHm2pipUX7MFTpscNr9CNfOsW3gzcosqUOvS7MbuURgdDeIzNVjA/sNgs4BTt0g3L748hB7Q/Yt6StRFHD4w=="; + url = "https://registry.npmjs.org/retry-request/-/retry-request-4.2.1.tgz"; + sha512 = "afiCoZZ7D/AR2mf+9ajr75dwGFgWmPEshv3h+oKtf9P1AsHfHvcVXumdbAEq2qNy4UXFEXsEX5HpyGj4axvoaA=="; }; }; "reusify-1.0.4" = { @@ -50639,13 +50891,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.52.3" = { + "rollup-2.52.7" = { name = "rollup"; packageName = "rollup"; - version = "2.52.3"; + version = "2.52.7"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.52.3.tgz"; - sha512 = "QF3Sju8Kl2z0osI4unyOLyUudyhOMK6G0AeqJWgfiyigqLAlnNrfBcDWDx+f1cqn+JU2iIYVkDrgQ6/KtwEfrg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.52.7.tgz"; + sha512 = "55cSH4CCU6MaPr9TAOyrIC+7qFCHscL7tkNsm1MBfIJRRqRbCEY0mmeFn4Wg8FKsHtEH8r389Fz38r/o+kgXLg=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -52808,13 +53060,13 @@ let sha512 = "XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg=="; }; }; - "snyk-python-plugin-1.19.9" = { + "snyk-python-plugin-1.19.11" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.19.9"; + version = "1.19.11"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.9.tgz"; - sha512 = "vkqBJP+wOtrBKpqrFRP5EfAs5wZ/fGNI14Mb+EMnmu+ebP1ze9AnHxfiqMl/+ITzeYElZ2H5DX9sXXiqpJRhRg=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.11.tgz"; + sha512 = "zUKbSbw+wU1FCUDYt+IDjaES0pc1UKBECOqjHSJMxWm9VhstvPtI4KccetwOfne2oUcmaEJJvcEp4s9VTK04XQ=="; }; }; "snyk-resolve-1.1.0" = { @@ -54158,13 +54410,13 @@ let sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA=="; }; }; - "sscaff-1.2.15" = { + "sscaff-1.2.17" = { name = "sscaff"; packageName = "sscaff"; - version = "1.2.15"; + version = "1.2.17"; src = fetchurl { - url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.15.tgz"; - sha512 = "yGGLgLcLpd/wCs01BGWZwkT9s5qsvpUXm2+DQ0aBGCCPvA/eJbC7aNCL3eips1R3z/XJ9R7azWvi7VhCMeg/Dg=="; + url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.17.tgz"; + sha512 = "0QF6J4B6lJKXKuUdiRDm576Ix1nVO3hdiHZYwEQJujcshJriHnny8kpOch1L6VykLPifg2g3hkHKas6WuNkqsg=="; }; }; "ssh-config-1.1.6" = { @@ -54662,6 +54914,15 @@ let sha512 = "y+ChhCov2A5nDqC2aZ6HKXs3OvDlvAp0Ps3BF1P/Iv8tUZJQQsMVaSzk0WryVTVoGITKv01UYahCXMpAs7I0lQ=="; }; }; + "stream-meter-1.0.4" = { + name = "stream-meter"; + packageName = "stream-meter"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-meter/-/stream-meter-1.0.4.tgz"; + sha1 = "52af95aa5ea760a2491716704dbff90f73afdd1d"; + }; + }; "stream-parser-0.3.1" = { name = "stream-parser"; packageName = "stream-parser"; @@ -55949,13 +56210,13 @@ let sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.51.0" = { + "swagger-ui-dist-3.51.1" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.51.0"; + version = "3.51.1"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.51.0.tgz"; - sha512 = "DX8RuAyXBjd2J4mjCLLUaodbtZ2z6dF05l6IF3hO++erXM+CR3QVX9TqYX3374hW5BOeLrr7gujoSdY8jIvI2A=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.51.1.tgz"; + sha512 = "df2mEeVgnJp/FcXY3DRh3CsTfvHVTaO6g3FJP/kfwhxfOD1+YTXqBZrOIIsYTPtcRIFBkCAto0NFCxAV4XFRbw=="; }; }; "swagger2openapi-7.0.7" = { @@ -58533,13 +58794,13 @@ let sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="; }; }; - "typegram-3.3.1" = { + "typegram-3.4.0" = { name = "typegram"; packageName = "typegram"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/typegram/-/typegram-3.3.1.tgz"; - sha512 = "Y1bR17IZ9Shj1Ih8wTLtrmOOMHJ20ve0Bd5SPymmw53uO4WLp/JjNM55s2b6PEziBvMISRdCQSZ+m6JiUKEobA=="; + url = "https://registry.npmjs.org/typegram/-/typegram-3.4.0.tgz"; + sha512 = "GUE1LV3LJruTThJaUBUvTnaEpTswFhuxhEx9LaVLIA6WRw9CdPQmb87OIA0rCvoMSPBC8gZiHrrPqX9VJGDXwQ=="; }; }; "typescript-2.9.2" = { @@ -58605,13 +58866,13 @@ let sha512 = "qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw=="; }; }; - "typescript-4.3.4" = { + "typescript-4.3.5" = { name = "typescript"; packageName = "typescript"; - version = "4.3.4"; + version = "4.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz"; - sha512 = "uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz"; + sha512 = "DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -59109,13 +59370,13 @@ let sha512 = "JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA=="; }; }; - "unified-9.2.1" = { + "unified-9.2.2" = { name = "unified"; packageName = "unified"; - version = "9.2.1"; + version = "9.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-9.2.1.tgz"; - sha512 = "juWjuI8Z4xFg8pJbnEZ41b5xjGUWGHqXALmBZ3FC3WX0PIx1CZBIIJ6mXbYMcf6Yw4Fi0rFUTA1cdz/BglbOhA=="; + url = "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz"; + sha512 = "Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ=="; }; }; "unified-diff-3.1.0" = { @@ -59136,13 +59397,13 @@ let sha512 = "iDJYH82TgcezQA4IZzhCNJQx7vBsGk4h9s4Q7Fscrb3qcPsxBqVrVNYez2W3sBVTxuU1bFAhyRpA6ba/R4j93A=="; }; }; - "unified-engine-8.1.0" = { + "unified-engine-8.2.0" = { name = "unified-engine"; packageName = "unified-engine"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-8.1.0.tgz"; - sha512 = "ptXTWUf9HZ2L9xto7tre+hSdSN7M9S0rypUpMAcFhiDYjrXLrND4If+8AZOtPFySKI/Zhfxf7GVAR34BqixDUA=="; + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-8.2.0.tgz"; + sha512 = "ZlMm62ejrf+tJHdyOjQfljszngQjRor95q2XZMGk6rpJUYi7ZIHY/EXEhOcj9PZkMKKdLIM+dqL4s0ceyk9wbA=="; }; }; "unified-message-control-3.0.3" = { @@ -60271,13 +60532,13 @@ let sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w=="; }; }; - "utp-native-2.5.1" = { + "utp-native-2.5.3" = { name = "utp-native"; packageName = "utp-native"; - version = "2.5.1"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-2.5.1.tgz"; - sha512 = "wbrJwR8DZx8N9s1ffTcMuBK7tMBQ9tvKpIL+mWHrDvGUYfV7ivroEGFTXUr4meqy/PVbUdMfURSoBbwuGtt/YQ=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-2.5.3.tgz"; + sha512 = "sWTrWYXPhhWJh+cS2baPzhaZc89zwlWCfwSthUjGhLkZztyPhcQllo+XVVCbNGi7dhyRlxkWxN4NKU6FbA9Y8w=="; }; }; "uuid-2.0.3" = { @@ -61324,13 +61585,13 @@ let sha512 = "QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA=="; }; }; - "vscode-json-languageservice-4.1.4" = { + "vscode-json-languageservice-4.1.5" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "4.1.4"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.4.tgz"; - sha512 = "/UqaE58BVFdePM9l971L6xPRLlCLNk01aovf1Pp9hB/8pytmd2s9ZNEnS1JqYyQEJ1k5/fEBsWOdhQlNo4H7VA=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.5.tgz"; + sha512 = "oRVPj2UY6BQ8PQ1LIz/FigUEZQVqsB9msNCFlxRBHE9sSEIJkCbYG6aCB2n7WR17VIisYQdO3MDheuoyI48G2w=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -61810,13 +62071,13 @@ let sha512 = "8FdXi0gieEwh1IprIBafpiJWcApwrU+l2FEj8c1HtHFdNXMd0+2jUSjBVmcQYohf/E72irwAXEXLga6TQcB3FA=="; }; }; - "vue-eslint-parser-7.6.0" = { + "vue-eslint-parser-7.7.1" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "7.6.0"; + version = "7.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.6.0.tgz"; - sha512 = "QXxqH8ZevBrtiZMZK0LpwaMfevQi9UL7lY6Kcp+ogWHC88AuwUPwwCIzkOUc1LR4XsYAt/F9yHXAB/QoD17QXA=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-7.7.1.tgz"; + sha512 = "rUGUCKH5rSGTvF9QlxYXi6MyoSATcrTbLwiCqFuFRhaSJLlDYBmsXJ08xIZoLdsUl/OfCC1ibnkj7SWHRTrStQ=="; }; }; "vue-onsenui-helper-json-1.0.2" = { @@ -62044,13 +62305,13 @@ let sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A=="; }; }; - "web3-utils-1.3.6" = { + "web3-utils-1.4.0" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.3.6"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.3.6.tgz"; - sha512 = "hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.4.0.tgz"; + sha512 = "b8mEhwh/J928Xk+SQFjtqrR2EGPhpknWLcIt9aCpVPVRXiqjUGo/kpOHKz0azu9c6/onEJ9tWXZt0cVjmH0N5Q=="; }; }; "webassemblyjs-1.11.0" = { @@ -62134,13 +62395,13 @@ let sha512 = "1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg=="; }; }; - "webpack-5.40.0" = { + "webpack-5.42.0" = { name = "webpack"; packageName = "webpack"; - version = "5.40.0"; + version = "5.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.40.0.tgz"; - sha512 = "c7f5e/WWrxXWUzQqTBg54vBs5RgcAgpvKE4F4VegVgfo4x660ZxYUF2/hpMkZUnLjgytVTitjeXaN4IPlXCGIw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.42.0.tgz"; + sha512 = "Ln8HL0F831t1x/yPB/qZEUVmZM4w9BnHZ1EQD/sAUHv8m22hthoPniWTXEzFMh/Sf84mhrahut22TX5KxWGuyQ=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -62332,13 +62593,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-1.0.2" = { + "webtorrent-1.1.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.0.2.tgz"; - sha512 = "uv9fq5md/98JyeDDyziy1H28Wc/idO80AKv+9pQ4XK0WNNjdE3FMtCKfrvU2VNS1PdAOrA6sFuUq2x0mV7k7WQ=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.1.0.tgz"; + sha512 = "v5TS7MXmNRJqTWv7+a2wE4KGGZI/RyG4XpxWb1oJ4/CwpQaO5mJ5UA6Aj9unVbgEMLpyIy4xcHgOjE82wpyeUQ=="; }; }; "well-known-symbols-2.0.0" = { @@ -63286,6 +63547,15 @@ let sha512 = "6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw=="; }; }; + "ws-7.5.1" = { + name = "ws"; + packageName = "ws"; + version = "7.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.5.1.tgz"; + sha512 = "2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -63773,13 +64043,13 @@ let sha512 = "2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ=="; }; }; - "xstate-4.20.1" = { + "xstate-4.20.2" = { name = "xstate"; packageName = "xstate"; - version = "4.20.1"; + version = "4.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.20.1.tgz"; - sha512 = "oLqFEYKUG3Y4t3Pg5tb7ZXz2kZcrRA1inrEVfzDVf1JoBb+KGpKlNaLzxF5bE7swo0xcc8H+B/gdPb1feyO1gg=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.20.2.tgz"; + sha512 = "HvU+NCYffTOC1oiopNKve3IdLNRpuvNa3tv+fhM8mo9+TGCF35wIMQJON7bWG/2041ySBKw78PW2goV+Ug073w=="; }; }; "xstream-11.14.0" = { @@ -64436,22 +64706,22 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "12.1.0"; + version = "12.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.0.tgz"; - sha512 = "3xvweF9oiR1X9KlXIFPGQtylctqPi9t7SjI/8M2z/qRP4GkMu2CiScNysWFMdJsNsrRvLGQdtAbJFBWfW1vmkA=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-12.1.1.tgz"; + sha512 = "rQZItn3kpYEX6tH7wquAEhJuxVpW6sYKO2tSi8Suxrm+iz1RPRnfhSwS1WIEumnwpFRtH/8P+lOrScax1ldYkg=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1201.0" - sources."@angular-devkit/core-12.1.0" - sources."@angular-devkit/schematics-12.1.0" + sources."@angular-devkit/architect-0.1201.1" + sources."@angular-devkit/core-12.1.1" + sources."@angular-devkit/schematics-12.1.1" sources."@npmcli/git-2.1.0" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" - sources."@schematics/angular-12.1.0" + sources."@schematics/angular-12.1.1" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -65268,7 +65538,7 @@ in sources."@types/estree-0.0.46" sources."@types/json-schema-7.0.7" sources."@types/json5-0.0.29" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" @@ -65306,7 +65576,7 @@ in sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.1" @@ -65326,7 +65596,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -65394,7 +65664,7 @@ in sources."is-stream-2.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" - (sources."jest-worker-27.0.2" // { + (sources."jest-worker-27.0.6" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -65731,7 +66001,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."@types/qs-6.9.6" sources."@types/range-parser-1.2.3" @@ -65746,13 +66016,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.13" sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.1.2" // { + (sources."@vue/compiler-core-3.1.3" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.1.2" - sources."@vue/shared-3.1.2" + sources."@vue/compiler-dom-3.1.3" + sources."@vue/shared-3.1.3" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -65874,7 +66144,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -65931,12 +66201,12 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.15.1" + sources."core-js-pure-3.15.2" sources."core-util-is-1.0.2" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -66002,7 +66272,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -66325,7 +66595,7 @@ in sources."nice-try-1.0.5" sources."node-dir-0.1.17" sources."node-fetch-2.6.1" - sources."node-ipc-9.1.4" + sources."node-ipc-9.2.0" sources."node-modules-regexp-1.0.0" (sources."node-notifier-9.0.1" // { dependencies = [ @@ -66742,7 +67012,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xss-1.0.9" @@ -66968,10 +67238,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.16.2"; + version = "1.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.16.2.tgz"; - sha512 = "9/MIehoAx0KtmGIlH408LVU99ms+JycCCLY+DI1CvI8HwwRxS1d5clbKj/7JmCPm5cRYnD7798x4JDNMVNaSIA=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.16.3.tgz"; + sha512 = "Y4pSzPpJHovMA6uqpRTztraKFtchQm9rPbYd9s6UkEuqpYs45hFSY4j+ezkvGxU6Hvn2L6OLc+5dlaOr+P+QKQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -67012,18 +67282,18 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."browserslist-4.16.6" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colorette-1.2.2" sources."colors-1.4.0" - sources."commander-7.2.0" + sources."commander-8.0.0" sources."concat-map-0.0.1" sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -67117,7 +67387,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -67152,14 +67422,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.935.0" // { + (sources."aws-sdk-2.938.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -67288,7 +67558,7 @@ in sources."proxy-from-env-1.1.0" sources."pump-3.0.0" sources."punycode-1.3.2" - (sources."puppeteer-10.0.0" // { + (sources."puppeteer-10.1.0" // { dependencies = [ sources."debug-4.3.1" ]; @@ -67363,10 +67633,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.4.1"; + version = "10.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.4.1.tgz"; - sha512 = "IuMSykvEN1aMW0E+BvNo1CoTfcO1+EPB59D8NVKkNuoafb+dZbIvk1f9T6UfPEwzlOHdXLOsjmQ5AkBKumwo/A=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.4.3.tgz"; + sha512 = "mphALvASQBcm5CEaLP4BSo+/JFQ9L8i0Hmr7az49RnTFFqeZLuLPx+eac9cTA24sbSK3I9sRtbLYQv59dW/1VQ=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -67379,7 +67649,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -67639,7 +67909,9 @@ in sources."global-dirs-3.0.0" (sources."goldengate-10.1.0" // { dependencies = [ + sources."bech32-2.0.0" sources."bn.js-5.2.0" + sources."invoices-1.2.1" sources."ln-service-51.8.2" ]; }) @@ -67701,7 +67973,7 @@ in sources."tmp-0.0.33" ]; }) - (sources."invoices-1.2.1" // { + (sources."invoices-2.0.0" // { dependencies = [ sources."bech32-2.0.0" sources."bn.js-5.2.0" @@ -67750,22 +68022,20 @@ in (sources."lightning-3.3.9" // { dependencies = [ sources."@types/node-15.6.1" + sources."bech32-2.0.0" sources."bn.js-5.2.0" + sources."invoices-1.2.1" ]; }) - (sources."ln-accounting-4.3.0" // { - dependencies = [ - sources."bn.js-5.2.0" - sources."goldengate-10.0.6" - sources."ln-service-51.8.2" - ]; - }) - (sources."ln-service-51.8.4" // { + sources."ln-accounting-4.3.1" + (sources."ln-service-51.8.5" // { dependencies = [ - sources."@types/node-15.12.4" + sources."@grpc/grpc-js-1.3.4" + sources."@grpc/proto-loader-0.6.3" + sources."@types/node-15.12.5" sources."@types/ws-7.4.5" sources."bn.js-5.2.0" - sources."lightning-3.3.11" + sources."lightning-3.3.12" sources."ws-7.5.0" ]; }) @@ -67791,7 +68061,18 @@ in sources."psbt-1.1.8" ]; }) - sources."ln-telegram-3.2.6" + (sources."ln-telegram-3.2.6" // { + dependencies = [ + sources."@types/node-15.12.4" + sources."@types/ws-7.4.5" + sources."bech32-2.0.0" + sources."bn.js-5.2.0" + sources."invoices-1.2.1" + sources."lightning-3.3.11" + sources."ln-service-51.8.4" + sources."ws-7.5.0" + ]; + }) sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" @@ -67876,7 +68157,18 @@ in sources."p-cancelable-1.1.0" sources."p-timeout-4.1.0" sources."package-json-6.5.0" - sources."paid-services-2.0.0" + (sources."paid-services-2.0.0" // { + dependencies = [ + sources."@types/node-15.12.4" + sources."@types/ws-7.4.5" + sources."bech32-2.0.0" + sources."bn.js-5.2.0" + sources."invoices-1.2.1" + sources."lightning-3.3.11" + sources."ln-service-51.8.4" + sources."ws-7.5.0" + ]; + }) sources."parseurl-1.3.3" sources."path-to-regexp-0.1.7" sources."performance-now-2.1.0" @@ -67886,13 +68178,16 @@ in sources."prettyjson-1.2.1" (sources."probing-1.3.6" // { dependencies = [ + sources."bech32-2.0.0" + sources."bn.js-5.2.0" + sources."invoices-1.2.1" sources."ln-service-51.8.2" ]; }) sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" ]; }) sources."proxy-addr-2.0.7" @@ -68003,7 +68298,7 @@ in sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."typeforce-1.18.0" - sources."typegram-3.3.1" + sources."typegram-3.4.0" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-5.1.0" // { @@ -68841,7 +69136,7 @@ in sources."lodash-4.17.21" sources."lru-cache-6.0.0" sources."map-obj-4.2.1" - (sources."markdown-it-12.0.6" // { + (sources."markdown-it-12.1.0" // { dependencies = [ sources."argparse-2.0.1" sources."entities-2.1.0" @@ -69069,7 +69364,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -69503,7 +69798,7 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.29.3" - sources."constructs-3.3.92" + sources."constructs-3.3.94" sources."date-format-3.0.0" sources."debug-4.3.2" sources."decamelize-5.0.0" @@ -69576,13 +69871,13 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.295" // { + (sources."jsii-srcmak-0.1.297" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.3.0" - sources."json2jsii-0.1.262" + sources."json2jsii-0.1.264" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -69618,7 +69913,7 @@ in sources."snake-case-3.0.4" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.15" + sources."sscaff-1.2.17" (sources."streamroller-2.2.4" // { dependencies = [ sources."date-format-2.1.0" @@ -69733,7 +70028,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.1" sources."concat-map-0.0.1" - sources."constructs-3.3.92" + sources."constructs-3.3.94" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -69852,7 +70147,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.295" // { + (sources."jsii-srcmak-0.1.297" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -69935,7 +70230,7 @@ in sources."slice-ansi-3.0.0" sources."sort-json-2.0.0" sources."spdx-license-list-6.4.0" - sources."sscaff-1.2.15" + sources."sscaff-1.2.17" sources."stack-utils-2.0.3" sources."stream-buffers-3.0.2" (sources."streamroller-2.2.4" // { @@ -69974,7 +70269,7 @@ in sources."widest-line-3.1.0" sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xmlbuilder-15.1.1" sources."xmldom-0.6.0" sources."y18n-5.0.8" @@ -70393,7 +70688,7 @@ in sha512 = "7SHQYzpRKPrpaLcTm1UUk1zu9VvFEJKFqxwDIuqv/CL0cBTtEvlsfpVh9DOaMHlZPu8U8Lgyf04bHV/sFS1zJw=="; }; dependencies = [ - sources."typescript-4.3.4" + sources."typescript-4.3.5" ]; buildInputs = globalBuildInputs; meta = { @@ -70481,7 +70776,7 @@ in sources."ms-2.0.0" sources."request-light-0.4.0" sources."vscode-json-languageserver-1.3.4" - (sources."vscode-json-languageservice-4.1.4" // { + (sources."vscode-json-languageservice-4.1.5" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -70832,7 +71127,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { @@ -70894,7 +71189,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.15.1" + sources."core-js-3.15.2" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -70930,7 +71225,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -71049,7 +71344,7 @@ in sources."fill-range-2.2.4" sources."find-up-2.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."for-in-1.0.2" sources."for-own-0.1.5" sources."fragment-cache-0.2.1" @@ -71729,13 +72024,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.152"; + version = "1.1.154"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.152.tgz"; - sha512 = "drJV17TbLxAqfl1oXfab66CW51TxDbbppmP9yM4+NnpDRn/ESYwY0Uf9wp2EzfkfLhoavUTbrB9o/z14FuuScw=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.154.tgz"; + sha512 = "SUaGghNwGq4dD6DFWbmsMF0eqwydbO/OKknCmjx0kvLXniIkEkQUnfS3wc3dm3MIWBNYsZ2x3fM0J7a83WhHgA=="; }; dependencies = [ - sources."pyright-1.1.153" + sources."pyright-1.1.154" ]; buildInputs = globalBuildInputs; meta = { @@ -71845,10 +72140,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.2.tgz"; - sha512 = "e+gsnzl//ilZNhfdVNkzI3lvJoMdB/aLVrMbaecimJG+gabVI/MvjmpsvrOLu9KFkBmECFjpM3T2Hxd6DuvY2Q=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.4.3.tgz"; + sha512 = "1vIMSDI8zKbr7J/jD4Ey9EFfYnipRaYzbaY9WZHnStEb0H2M/obIjwl5k9gRFGfJV00vB7zDpHp19FXLXVqzhQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -71941,7 +72236,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -71979,7 +72274,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -71996,7 +72291,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -72184,7 +72479,7 @@ in sources."trough-1.0.5" sources."type-fest-0.18.1" sources."typedarray-to-buffer-3.1.5" - sources."unified-9.2.1" + sources."unified-9.2.2" sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" @@ -72359,7 +72654,7 @@ in sha512 = "qkVsa46XLmOCmohpQhhz1SG9vUQN/54b/zZsDI5fnuBM49GX9f+Aya8m9ZidAzuwFKV+ostgvdWaB+GeQPPNPQ=="; }; dependencies = [ - sources."typescript-4.3.4" + sources."typescript-4.3.5" ]; buildInputs = globalBuildInputs; meta = { @@ -72454,7 +72749,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" @@ -72536,14 +72831,19 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" sources."vls-0.7.4" - (sources."vue-eslint-parser-7.6.0" // { + (sources."vue-eslint-parser-7.7.1" // { dependencies = [ + sources."acorn-8.4.1" sources."eslint-visitor-keys-1.3.0" - sources."espree-6.2.1" + (sources."espree-8.0.0" // { + dependencies = [ + sources."eslint-visitor-keys-3.0.0" + ]; + }) ]; }) sources."which-2.0.2" @@ -73441,7 +73741,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -73812,7 +74112,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -74727,7 +75027,7 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - (sources."utp-native-2.5.1" // { + (sources."utp-native-2.5.3" // { dependencies = [ sources."node-gyp-build-4.2.3" sources."readable-stream-3.6.0" @@ -75126,7 +75426,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.1" sources."abbrev-1.1.1" @@ -75202,7 +75502,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-js-3.15.1" + sources."core-js-3.15.2" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."currently-unhandled-0.4.1" @@ -75758,7 +76058,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -75793,7 +76093,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -75830,7 +76130,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -76041,7 +76341,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" @@ -76105,7 +76405,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.186" + sources."@microsoft/load-themed-styles-1.10.190" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.7" @@ -77729,7 +78029,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."y18n-3.2.2" @@ -77850,7 +78150,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" @@ -78012,7 +78312,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.7" @@ -78335,7 +78635,7 @@ in sources."@hapi/hoek-9.2.0" sources."@hapi/joi-17.1.1" sources."@hapi/pinpoint-2.0.0" - sources."@hapi/topo-5.0.0" + sources."@hapi/topo-5.1.0" (sources."@jest/types-25.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -78662,7 +78962,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."caseless-0.12.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -78796,7 +79096,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -78930,7 +79230,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -81439,11 +81739,11 @@ in sources."@google-cloud/promisify-2.0.3" (sources."@google-cloud/pubsub-2.15.1" // { dependencies = [ - sources."google-auth-library-7.1.2" + sources."google-auth-library-7.2.0" ]; }) sources."@grpc/grpc-js-1.3.4" - sources."@grpc/proto-loader-0.6.3" + sources."@grpc/proto-loader-0.6.4" sources."@jsdevtools/ono-7.1.3" (sources."@npmcli/move-file-1.1.2" // { dependencies = [ @@ -81471,7 +81771,7 @@ in sources."@types/json-schema-7.0.7" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -81758,7 +82058,7 @@ in sources."fecha-4.2.1" sources."figures-2.0.0" sources."file-uri-to-path-2.0.0" - sources."filesize-6.3.0" + sources."filesize-6.4.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ @@ -81825,7 +82125,7 @@ in sources."google-auth-library-6.1.6" (sources."google-gax-2.17.0" // { dependencies = [ - sources."google-auth-library-7.1.2" + sources."google-auth-library-7.2.0" ]; }) sources."google-p12-pem-3.1.0" @@ -82123,7 +82423,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."retry-0.12.0" - sources."retry-request-4.2.0" + sources."retry-request-4.2.1" sources."rimraf-3.0.2" (sources."router-1.3.5" // { dependencies = [ @@ -82320,7 +82620,7 @@ in sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xdg-basedir-4.0.0" sources."xregexp-2.0.0" sources."xtend-4.0.2" @@ -82580,7 +82880,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -82753,7 +83053,7 @@ in sources."utf8-3.0.0" sources."uuid-3.4.0" sources."verror-1.10.0" - (sources."web3-utils-1.3.6" // { + (sources."web3-utils-1.4.0" // { dependencies = [ sources."underscore-1.12.1" ]; @@ -83361,12 +83661,12 @@ in sources."@turist/fetch-7.1.7" sources."@turist/time-0.0.1" sources."@types/common-tags-1.8.0" - sources."@types/debug-4.1.5" + sources."@types/debug-4.1.6" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/node-fetch-2.5.10" sources."@types/readable-stream-2.3.10" sources."@types/unist-2.0.3" @@ -83433,7 +83733,7 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."ccount-1.1.0" (sources."chalk-4.1.1" // { dependencies = [ @@ -83483,7 +83783,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.25.1" + sources."contentful-management-7.27.0" sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { @@ -83529,7 +83829,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -83712,7 +84012,7 @@ in (sources."joi-17.4.0" // { dependencies = [ sources."@hapi/hoek-9.2.0" - sources."@hapi/topo-5.0.0" + sources."@hapi/topo-5.1.0" ]; }) sources."js-tokens-4.0.0" @@ -83778,7 +84078,7 @@ in sources."node-object-hash-2.3.7" sources."node-releases-1.1.73" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npm-run-path-2.0.2" sources."nth-check-2.0.0" sources."object-assign-4.1.1" @@ -83802,7 +84102,7 @@ in }) sources."parse-entities-2.0.0" sources."parse-path-4.0.3" - sources."parse-url-5.0.6" + sources."parse-url-5.0.7" sources."parseurl-1.3.3" sources."pascal-case-3.1.2" sources."path-exists-4.0.0" @@ -84007,9 +84307,9 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xdg-basedir-4.0.0" - sources."xstate-4.20.1" + sources."xstate-4.20.2" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -84264,7 +84564,7 @@ in sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" sources."typedarray-to-buffer-4.0.0" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; @@ -84756,7 +85056,7 @@ in sources."@nodelib/fs.walk-1.2.7" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -85445,7 +85745,7 @@ in sources."ansi-term-0.0.2" sources."ansicolors-0.3.2" sources."blessed-0.1.81" - sources."blessed-contrib-4.9.0" + sources."blessed-contrib-4.10.0" sources."bresenham-0.0.3" sources."buffers-0.1.1" sources."cardinal-2.1.1" @@ -87413,7 +87713,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -87882,7 +88182,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.935.0" // { + (sources."aws-sdk-2.938.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -88508,7 +88808,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -89344,7 +89644,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -90487,19 +90787,19 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-7.3.5" + sources."@octokit/openapi-types-8.1.4" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-2.13.5" + sources."@octokit/plugin-paginate-rest-2.13.6" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.3.4" + sources."@octokit/plugin-rest-endpoint-methods-5.3.7" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.3" - sources."@octokit/types-6.16.7" + sources."@octokit/rest-18.6.6" + sources."@octokit/types-6.17.4" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" @@ -90712,7 +91012,7 @@ in ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.4.4" + sources."git-url-parse-11.5.0" sources."gitconfiglocal-1.0.0" sources."glob-7.1.7" sources."glob-parent-5.1.2" @@ -90889,7 +91189,7 @@ in sources."semver-5.7.1" ]; }) - sources."normalize-url-4.5.0" + sources."normalize-url-4.5.1" sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" (sources."npm-lifecycle-3.1.5" // { @@ -90948,7 +91248,7 @@ in sources."qs-6.10.1" ]; }) - sources."parse-url-5.0.6" + sources."parse-url-5.0.7" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -92167,13 +92467,13 @@ in sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.4.0" sources."@types/babel__traverse-7.14.0" - sources."@types/estree-0.0.48" + sources."@types/estree-0.0.49" sources."@types/graceful-fs-4.1.5" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.7" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.13" @@ -92346,7 +92646,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -92418,7 +92718,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -92470,7 +92770,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -93360,10 +93660,10 @@ in mastodon-bot = nodeEnv.buildNodePackage { name = "mastodon-bot"; packageName = "mastodon-bot"; - version = "1.12.1-20210625203706"; + version = "1.13.5-20210701203013"; src = fetchurl { - url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.12.1-20210625203706.tgz"; - sha512 = "WRIp5LGsTxBO0zGm2KjaxLZCVsUX1Lv15hu96W0vx2sKflGAgiHUSf3RFxQFaNhII1hdglnyuwulmOu/0/gHNA=="; + url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.13.5-20210701203013.tgz"; + sha512 = "d5HCg9yu6xhFWnUPKBFSzPoXsxXRCYrmy4AGMvjlifWqQnCf9EklbocqVZSO1j50JRymlfDELq1QO/WYKZ5TYQ=="; }; dependencies = [ sources."acorn-5.7.4" @@ -93718,7 +94018,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/yauzl-2.9.1" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -93812,7 +94112,7 @@ in sources."progress-2.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-10.0.0" + sources."puppeteer-10.1.0" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" sources."rw-1.3.3" @@ -93843,29 +94143,30 @@ in mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.5.0.tgz"; - sha512 = "j2ukrvANZQUreLl2grOQxPl0pbRSoJthYLqujdphZdwJyDwYjPqGOs+KrWwY26QbfqG2Toy06qFnYTaGx9txIg=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.6.0.tgz"; + sha512 = "LrJqn/26CxH9aQ9j7iPqnk9fS6ywI3gpCt7HS26UXeycC3VBfhkoONLZQW/JXW3aJGoUHUlxunsQBI0h89EJIw=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-7.9.1" - sources."@fluentui/dom-utilities-1.1.2" - sources."@fluentui/keyboard-key-0.2.17" - sources."@fluentui/react-7.172.1" - sources."@fluentui/react-focus-7.17.6" - sources."@fluentui/react-window-provider-1.0.2" - sources."@fluentui/theme-1.7.4" - sources."@microsoft/load-themed-styles-1.10.186" + sources."@fluentui/date-time-utilities-8.2.0" + sources."@fluentui/dom-utilities-2.1.2" + sources."@fluentui/font-icons-mdl2-8.1.4" + sources."@fluentui/foundation-legacy-8.1.4" + sources."@fluentui/keyboard-key-0.3.2" + sources."@fluentui/merge-styles-8.1.2" + sources."@fluentui/react-8.22.0" + sources."@fluentui/react-focus-8.1.5" + sources."@fluentui/react-hooks-8.2.3" + sources."@fluentui/react-window-provider-2.1.2" + sources."@fluentui/set-version-8.1.2" + sources."@fluentui/style-utilities-8.1.4" + sources."@fluentui/theme-2.1.3" + sources."@fluentui/utilities-8.2.0" + sources."@microsoft/load-themed-styles-1.10.190" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.26" - sources."@uifabric/icons-7.5.23" - sources."@uifabric/merge-styles-7.19.2" - sources."@uifabric/react-hooks-7.14.0" - sources."@uifabric/set-version-7.0.24" - sources."@uifabric/styling-7.19.0" - sources."@uifabric/utilities-7.33.5" + sources."@types/cors-2.8.10" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ansi-escapes-1.4.0" @@ -93907,6 +94208,7 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."core-js-2.6.12" + sources."cors-2.8.5" sources."crc-3.8.0" sources."debug-2.6.9" sources."decompress-response-3.3.0" @@ -93960,7 +94262,11 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-stream-1.1.0" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" + (sources."js-yaml-4.1.0" // { + dependencies = [ + sources."argparse-2.0.1" + ]; + }) sources."json-buffer-3.0.0" sources."json-schema-traverse-0.4.1" sources."keyv-3.1.0" @@ -93992,13 +94298,16 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.1" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.172.1" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."openapi-default-setter-7.2.3" - sources."openapi-framework-7.5.0" + (sources."openapi-framework-7.5.0" // { + dependencies = [ + sources."js-yaml-3.14.1" + ]; + }) sources."openapi-jsonschema-parameters-7.2.3" sources."openapi-request-coercer-7.5.0" sources."openapi-request-validator-7.4.0" @@ -94027,7 +94336,6 @@ in sources."pinkie-promise-2.0.1" sources."prepend-http-2.0.0" sources."promise-queue-2.2.5" - sources."prop-types-15.7.2" sources."proxy-addr-2.0.7" sources."pump-3.0.0" sources."punycode-2.1.1" @@ -94035,9 +94343,8 @@ in sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" - sources."react-16.14.0" - sources."react-dom-16.14.0" - sources."react-is-16.13.1" + sources."react-17.0.2" + sources."react-dom-17.0.2" sources."readable-stream-3.6.0" sources."regenerator-runtime-0.10.5" sources."registry-auth-token-4.2.1" @@ -94048,7 +94355,7 @@ in sources."rx-4.1.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."scheduler-0.19.1" + sources."scheduler-0.20.2" sources."semver-7.3.5" (sources."send-0.17.1" // { dependencies = [ @@ -94083,14 +94390,14 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.51.0" + sources."swagger-ui-dist-3.51.1" sources."tail-2.2.3" sources."through-2.3.8" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" sources."ts-log-2.2.3" - sources."tslib-1.14.1" + sources."tslib-2.3.0" sources."type-is-1.6.18" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -94369,10 +94676,10 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.39.0"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.39.0.tgz"; - sha512 = "XYkFp1WuWTcO7Q3LbY79ilobfCNWoL6UEYq2vhCHHKNLICSPxZtkzjDvNP628eGVzxe0L+D+Z9ce3sLdFiitMw=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-4.0.5.tgz"; + sha512 = "p1wJwMMWHM/Av5/Bsabtr0UTX4lTJVZg7Hz+G9kbA/n2wdKoWAj5P5B+shDRGRBhaFDbCiHf36baKtLJWP4SiQ=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -94506,11 +94813,10 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-12.11.0" // { + (sources."@netlify/build-12.26.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" - sources."dot-prop-5.3.0" sources."execa-3.4.0" sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" @@ -94527,7 +94833,7 @@ in sources."slash-3.0.0" ]; }) - (sources."@netlify/config-9.1.0" // { + (sources."@netlify/config-9.5.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -94539,13 +94845,13 @@ in ]; }) sources."@netlify/esbuild-0.13.6" - (sources."@netlify/framework-info-5.4.0" // { + (sources."@netlify/framework-info-5.5.0" // { dependencies = [ sources."p-limit-3.1.0" sources."p-locate-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.47" + sources."@netlify/functions-utils-1.4.1" (sources."@netlify/git-utils-1.0.11" // { dependencies = [ sources."braces-3.0.2" @@ -94562,14 +94868,14 @@ in sources."@types/node-14.17.4" ]; }) - sources."@netlify/plugins-list-2.18.0" - sources."@netlify/routing-local-proxy-0.30.1" + sources."@netlify/plugins-list-2.18.1" + sources."@netlify/routing-local-proxy-0.30.2" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" ]; }) - (sources."@netlify/zip-it-and-ship-it-4.4.2" // { + (sources."@netlify/zip-it-and-ship-it-4.8.0" // { dependencies = [ sources."cliui-7.0.4" sources."cp-file-9.1.0" @@ -94692,18 +94998,18 @@ in ]; }) sources."@octokit/graphql-4.6.4" - sources."@octokit/openapi-types-7.3.5" - sources."@octokit/plugin-paginate-rest-2.13.5" + sources."@octokit/openapi-types-8.1.4" + sources."@octokit/plugin-paginate-rest-2.13.6" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.3.4" + sources."@octokit/plugin-rest-endpoint-methods-5.3.7" (sources."@octokit/request-5.6.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.6.3" - sources."@octokit/types-6.16.7" + sources."@octokit/rest-18.6.6" + sources."@octokit/types-6.17.4" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-18.1.0" // { dependencies = [ @@ -94740,7 +95046,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.1" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/node-fetch-2.5.10" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-1.17.1" @@ -94748,8 +95054,8 @@ in sources."@types/semver-7.3.6" sources."@types/yargs-13.0.11" sources."@types/yargs-parser-20.2.0" - sources."@typescript-eslint/types-4.28.0" - (sources."@typescript-eslint/typescript-estree-4.28.0" // { + sources."@typescript-eslint/types-4.28.1" + (sources."@typescript-eslint/typescript-estree-4.28.1" // { dependencies = [ sources."@nodelib/fs.stat-2.0.5" sources."array-union-2.1.0" @@ -94766,9 +95072,10 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@typescript-eslint/visitor-keys-4.28.0" + sources."@typescript-eslint/visitor-keys-4.28.1" sources."@ungap/from-entries-0.2.1" sources."accepts-1.3.7" + sources."acorn-8.4.1" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" sources."ajv-8.6.0" @@ -94828,13 +95135,6 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" - (sources."aws-sdk-2.935.0" // { - dependencies = [ - sources."buffer-4.9.2" - sources."ieee754-1.1.13" - sources."uuid-3.3.2" - ]; - }) sources."babel-plugin-dynamic-import-node-2.3.3" (sources."babel-plugin-polyfill-corejs2-0.2.2" // { dependencies = [ @@ -94904,7 +95204,7 @@ in sources."call-me-maybe-1.0.1" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."cardinal-2.1.1" (sources."chalk-4.1.1" // { dependencies = [ @@ -95029,7 +95329,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -95175,7 +95475,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -95202,7 +95502,6 @@ in sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-4.0.7" - sources."events-1.1.1" (sources."execa-5.1.1" // { dependencies = [ sources."get-stream-6.0.1" @@ -95536,7 +95835,6 @@ in ]; }) sources."jest-worker-26.6.2" - sources."jmespath-0.15.0" sources."js-string-escape-1.0.1" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" @@ -95557,10 +95855,9 @@ in sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."kuler-2.0.0" - (sources."lambda-local-1.7.4" // { + (sources."lambda-local-2.0.0" // { dependencies = [ - sources."commander-6.2.1" - sources."dotenv-8.6.0" + sources."commander-7.2.0" ]; }) sources."latest-version-5.1.0" @@ -95933,7 +96230,6 @@ in sources."pupa-2.1.1" sources."qs-6.7.0" sources."query-string-5.1.1" - sources."querystring-0.2.0" sources."queue-microtask-1.2.3" sources."random-bytes-1.0.0" sources."randombytes-2.1.0" @@ -95996,7 +96292,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.52.3" + sources."rollup-2.52.7" (sources."rollup-plugin-inject-3.0.2" // { dependencies = [ sources."estree-walker-0.6.1" @@ -96017,7 +96313,6 @@ in sources."safe-json-stringify-1.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.1" sources."seek-bzip-1.0.6" sources."semver-7.3.5" (sources."semver-diff-3.1.1" // { @@ -96224,7 +96519,7 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."uid-safe-2.1.5" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-1.0.4" @@ -96265,11 +96560,6 @@ in }) sources."uri-js-4.4.1" sources."urix-0.1.0" - (sources."url-0.10.3" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" @@ -96325,8 +96615,6 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -97180,7 +97468,7 @@ in sources."ms-2.1.2" sources."readable-stream-3.6.0" sources."string_decoder-1.3.0" - sources."ws-7.5.0" + sources."ws-7.5.1" ]; }) (sources."mqtt-packet-6.10.0" // { @@ -97567,10 +97855,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.7"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.7.tgz"; - sha512 = "XHzK69Awgnec9UzHr1kc8EomQh4sjTQ8oRf8TsGrSmHDx9/UmiGG9E/mM3BuTfNeFwdNBvrqQq/RHL0xIeyFOA=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.9.tgz"; + sha512 = "6O4k7C8f2HQArGpaPBOqGGddjzDLQAqCYmq3tKMeNIbz7Is/hOphMHy2dcY10sSq5wl3cqyn9Iz+Ep2j51JOLg=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -97763,7 +98051,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.1" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/normalize-package-data-2.4.0" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -98267,10 +98555,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.19.0"; + version = "7.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.19.0.tgz"; - sha512 = "bak/ZycWS8kalVFJ2m1JEo2pgvSwEDA9FMGthGnufAKciu4X4kpJMDZKe8VZKNaA/cXehd9XI7QdSZXmZauR8Q=="; + url = "https://registry.npmjs.org/npm/-/npm-7.19.1.tgz"; + sha512 = "aN3hZzGkPzKOyhjXtOhnQTGumorFhgpOU6xfuQsF1nJKh4DhsgfOMG4s/SNx56r4xHPvM5m/sk914wzDgKba3A=="; }; buildInputs = globalBuildInputs; meta = { @@ -99114,7 +99402,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -99141,7 +99429,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -99252,7 +99540,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -100908,6 +101196,194 @@ in bypassCache = true; reconstructLock = true; }; + pkg = nodeEnv.buildNodePackage { + name = "pkg"; + packageName = "pkg"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg/-/pkg-5.3.0.tgz"; + sha512 = "/DGG+QcSPraMAIxaoGCNqb2A6Xkm2jBQMsj2mjb4ag236ByTY9Xhpikvj5ixwlSQV0euuJw4fphKCd5YHRPS8w=="; + }; + dependencies = [ + sources."@babel/helper-validator-identifier-7.14.5" + sources."@babel/parser-7.13.13" + sources."@babel/types-7.13.12" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" + sources."agent-base-6.0.2" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" + sources."array-union-2.1.0" + sources."at-least-node-1.0.0" + sources."base64-js-1.5.1" + (sources."bl-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."braces-3.0.2" + sources."buffer-5.7.1" + sources."chalk-4.1.1" + sources."chownr-1.1.4" + sources."cliui-7.0.4" + sources."code-point-at-1.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."console-control-strings-1.1.0" + sources."core-util-is-1.0.2" + sources."debug-4.3.2" + sources."decompress-response-4.2.1" + sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" + sources."delegates-1.0.0" + sources."detect-libc-1.0.3" + sources."dir-glob-3.0.1" + sources."emoji-regex-8.0.0" + sources."end-of-stream-1.4.4" + sources."escalade-3.1.1" + sources."escodegen-2.0.0" + sources."esprima-4.0.1" + sources."estraverse-5.2.0" + sources."esutils-2.0.3" + sources."expand-template-2.0.3" + sources."fast-glob-3.2.6" + sources."fast-levenshtein-2.0.6" + sources."fastq-1.11.0" + sources."fill-range-7.0.1" + sources."from2-2.3.0" + sources."fs-constants-1.0.0" + sources."fs-extra-9.1.0" + sources."function-bind-1.1.1" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."get-caller-file-2.0.5" + sources."github-from-package-0.0.0" + sources."glob-parent-5.1.2" + sources."globby-11.0.4" + sources."graceful-fs-4.2.6" + sources."has-1.0.3" + sources."has-flag-4.0.0" + sources."has-unicode-2.0.1" + sources."https-proxy-agent-5.0.0" + sources."ieee754-1.2.1" + sources."ignore-5.1.8" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."into-stream-6.0.0" + sources."is-core-module-2.4.0" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."isarray-1.0.0" + sources."jsonfile-6.1.0" + sources."levn-0.3.0" + sources."lodash-4.17.21" + sources."lru-cache-6.0.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.4" + sources."mimic-response-2.1.0" + sources."minimist-1.2.5" + sources."mkdirp-classic-0.5.3" + sources."ms-2.1.2" + (sources."multistream-4.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."napi-build-utils-1.0.2" + (sources."node-abi-2.30.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."node-fetch-2.6.1" + sources."noop-logger-0.1.1" + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."object-assign-4.1.1" + sources."once-1.4.0" + sources."optionator-0.8.3" + sources."p-is-promise-3.0.0" + sources."path-parse-1.0.7" + sources."path-type-4.0.0" + sources."picomatch-2.3.0" + sources."pkg-fetch-3.1.1" + sources."prebuild-install-6.0.1" + sources."prelude-ls-1.1.2" + sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" + sources."pump-3.0.0" + sources."queue-microtask-1.2.3" + sources."rc-1.2.8" + sources."readable-stream-2.3.7" + sources."require-directory-2.1.1" + sources."resolve-1.20.0" + sources."reusify-1.0.4" + sources."run-parallel-1.2.0" + sources."safe-buffer-5.1.2" + sources."semver-7.3.5" + sources."set-blocking-2.0.0" + sources."signal-exit-3.0.3" + sources."simple-concat-1.0.1" + sources."simple-get-3.1.0" + sources."slash-3.0.0" + sources."source-map-0.6.1" + sources."stream-meter-1.0.4" + sources."string-width-4.2.2" + sources."string_decoder-1.1.1" + sources."strip-ansi-6.0.0" + sources."strip-json-comments-2.0.1" + sources."supports-color-7.2.0" + sources."tar-fs-2.1.1" + (sources."tar-stream-2.2.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + sources."to-fast-properties-2.0.0" + sources."to-regex-range-5.0.1" + sources."tslib-2.1.0" + sources."tunnel-agent-0.6.0" + sources."type-check-0.3.2" + sources."universalify-2.0.0" + sources."util-deprecate-1.0.2" + sources."which-pm-runs-1.0.0" + (sources."wide-align-1.1.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + sources."word-wrap-1.2.3" + sources."wrap-ansi-7.0.0" + sources."wrappy-1.0.2" + sources."y18n-5.0.8" + sources."yallist-4.0.0" + sources."yargs-16.2.0" + sources."yargs-parser-20.2.9" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Package your Node.js project into an executable"; + homepage = "https://github.com/vercel/pkg#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; pm2 = nodeEnv.buildNodePackage { name = "pm2"; packageName = "pm2"; @@ -101666,10 +102142,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.153"; + version = "1.1.154"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.153.tgz"; - sha512 = "t5Y9IojL2Sifm1Q04BEBJDLP86rF4RpXma28HEP/EXJRHyyNxu8css77HC+tZqJXXXZVtAjaJxJSAEwq5afGjg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.154.tgz"; + sha512 = "J2P5Iurkl7smCyB8CH5fsm8GOGeKRk7d1HWcFiro94E0vJW/5sSKXrkfjPxo7XZ+e96UiW1qyiVTCC++db3Tfg=="; }; buildInputs = globalBuildInputs; meta = { @@ -102152,7 +102628,7 @@ in sources."@types/glob-7.1.3" sources."@types/json-schema-7.0.7" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.4" sources."@webassemblyjs/ast-1.9.0" @@ -102340,7 +102816,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -102425,7 +102901,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.15.1" // { + (sources."core-js-compat-3.15.2" // { dependencies = [ sources."semver-7.0.0" ]; @@ -102569,7 +103045,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103905,7 +104381,7 @@ in sources."whatwg-url-8.7.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -103955,15 +104431,15 @@ in sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" - sources."@redocly/ajv-6.12.4" - (sources."@redocly/openapi-core-1.0.0-beta.50" // { + sources."@redocly/ajv-8.6.2" + (sources."@redocly/openapi-core-1.0.0-beta.53" // { dependencies = [ sources."@types/node-14.17.4" ]; }) sources."@redocly/react-dropdown-aria-2.0.12" sources."@types/json-schema-7.0.7" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -103978,7 +104454,7 @@ in sources."util-0.10.3" ]; }) - sources."babel-plugin-styled-components-1.12.0" + sources."babel-plugin-styled-components-1.13.1" sources."babel-plugin-syntax-jsx-6.18.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" @@ -104055,7 +104531,6 @@ in sources."events-3.3.0" sources."evp_bytestokey-1.0.3" sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fill-range-7.0.1" sources."foreach-2.0.5" @@ -104093,7 +104568,7 @@ in sources."js-yaml-3.14.1" sources."jsesc-2.5.2" sources."json-pointer-0.6.1" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."lodash-4.17.21" sources."lodash.isequal-4.5.0" sources."loose-envify-1.4.0" @@ -104128,7 +104603,7 @@ in sources."oas-schema-walker-1.1.5" sources."oas-validator-5.0.7" sources."object-assign-4.1.1" - sources."openapi-sampler-1.0.1" + sources."openapi-sampler-1.1.0" sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parse-asn1-5.1.6" @@ -104173,6 +104648,7 @@ in sources."reftools-1.1.8" sources."regenerator-runtime-0.13.8" sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -104439,10 +104915,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.52.3"; + version = "2.52.7"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.52.3.tgz"; - sha512 = "QF3Sju8Kl2z0osI4unyOLyUudyhOMK6G0AeqJWgfiyigqLAlnNrfBcDWDx+f1cqn+JU2iIYVkDrgQ6/KtwEfrg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.52.7.tgz"; + sha512 = "55cSH4CCU6MaPr9TAOyrIC+7qFCHscL7tkNsm1MBfIJRRqRbCEY0mmeFn4Wg8FKsHtEH8r389Fz38r/o+kgXLg=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -104496,13 +104972,13 @@ in sources."@types/node-fetch-2.5.10" sources."@types/resolve-1.17.1" sources."@types/vscode-1.57.0" - sources."@typescript-eslint/eslint-plugin-4.28.0" - sources."@typescript-eslint/experimental-utils-4.28.0" - sources."@typescript-eslint/parser-4.28.0" - sources."@typescript-eslint/scope-manager-4.28.0" - sources."@typescript-eslint/types-4.28.0" - sources."@typescript-eslint/typescript-estree-4.28.0" - sources."@typescript-eslint/visitor-keys-4.28.0" + sources."@typescript-eslint/eslint-plugin-4.28.1" + sources."@typescript-eslint/experimental-utils-4.28.1" + sources."@typescript-eslint/parser-4.28.1" + sources."@typescript-eslint/scope-manager-4.28.1" + sources."@typescript-eslint/types-4.28.1" + sources."@typescript-eslint/typescript-estree-4.28.1" + sources."@typescript-eslint/visitor-keys-4.28.1" sources."@ungap/promise-all-settled-1.1.2" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -104627,7 +105103,7 @@ in sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."form-data-3.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" @@ -104766,7 +105242,7 @@ in sources."resolve-from-4.0.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."rollup-2.52.3" + sources."rollup-2.52.7" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" sources."semver-7.3.5" @@ -104815,7 +105291,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."typed-rest-client-1.8.4" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."typescript-formatter-7.2.2" sources."uc.micro-1.0.6" sources."underscore-1.13.1" @@ -105144,10 +105620,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.48.1"; + version = "2.50.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.48.1.tgz"; - sha512 = "G61WEeJwDWsmsXW3jBzYnnNOJzw3ysqL5/3b0UHy1Zi8RhpkzzI9J7poteJHVmDchw9Ru5tczIKYq2dCfufxsA=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.50.0.tgz"; + sha512 = "9n2Afh0vEI6guDAue3Fm1Xu1B7i7zVR+LC37AHUhhmAxYRu0hH6ao1ERdrgUhHbzmV2P42yLRD0osB4alrp8gw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -105180,7 +105656,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.12.0" // { + (sources."@serverless/components-3.13.2" // { dependencies = [ (sources."@serverless/utils-4.1.0" // { dependencies = [ @@ -105208,7 +105684,7 @@ in sources."semver-6.3.0" ]; }) - sources."@serverless/dashboard-plugin-5.4.2" + sources."@serverless/dashboard-plugin-5.4.3" sources."@serverless/event-mocks-1.1.1" (sources."@serverless/platform-client-4.2.3" // { dependencies = [ @@ -105216,7 +105692,7 @@ in sources."js-yaml-3.14.1" ]; }) - (sources."@serverless/platform-client-china-2.1.14" // { + (sources."@serverless/platform-client-china-2.1.17" // { dependencies = [ sources."dotenv-8.6.0" sources."js-yaml-3.14.1" @@ -105230,7 +105706,7 @@ in sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-1.1.2" + sources."@serverless/utils-china-1.1.4" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.8" @@ -105244,12 +105720,12 @@ in sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.1" sources."@types/caseless-0.12.2" - sources."@types/debug-4.1.5" + sources."@types/debug-4.1.6" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/lodash-4.14.170" sources."@types/long-4.0.1" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/readable-stream-2.3.10" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" @@ -105311,7 +105787,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.935.0" // { + (sources."aws-sdk-2.938.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -105401,6 +105877,13 @@ in ]; }) sources."cli-cursor-3.1.0" + (sources."cli-progress-footer-1.1.1" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."cli-color-1.4.0" + sources."process-utils-2.6.0" + ]; + }) sources."cli-width-3.0.0" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -105536,7 +106019,7 @@ in sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" - sources."filesize-6.3.0" + sources."filesize-6.4.0" sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" @@ -105794,6 +106277,7 @@ in sources."prettyoutput-1.2.0" sources."printj-1.1.2" sources."process-nextick-args-2.0.1" + sources."process-utils-4.0.0" sources."promise-queue-2.2.5" (sources."protobufjs-6.11.2" // { dependencies = [ @@ -106008,7 +106492,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xmlhttprequest-ssl-1.6.3" @@ -106657,10 +107141,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.649.0"; + version = "1.653.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.649.0.tgz"; - sha512 = "KIJYCxfuxUwaZhmtSQyOxv2Ya5ZX/r7FTqXujpCWV4X/Cx354GYFSxSX1uvi0AQk8GVO6xkzKKVNn14CtpnHiw=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.653.0.tgz"; + sha512 = "AFIsk1kgE9eQ+s31X9+b967us36UyHNes3VnHhgiVPX8YCq+uAPGNDV2rIaWDY/7c0yCtfOmFLD3mI5WxpJmdA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -106673,18 +107157,18 @@ in sources."@sindresorhus/is-4.0.1" sources."@snyk/child-process-0.3.1" sources."@snyk/cli-interface-2.11.0" - sources."@snyk/cloud-config-parser-1.9.2" + sources."@snyk/cloud-config-parser-1.9.3" sources."@snyk/cocoapods-lockfile-parser-3.6.2" sources."@snyk/code-client-3.9.0" sources."@snyk/composer-lockfile-parser-1.4.1" - (sources."@snyk/dep-graph-1.28.0" // { + (sources."@snyk/dep-graph-1.28.1" // { dependencies = [ sources."semver-7.3.5" ]; }) sources."@snyk/docker-registry-v2-client-2.2.2" sources."@snyk/fast-glob-3.2.6-patch" - (sources."@snyk/fix-1.649.0" // { + (sources."@snyk/fix-1.650.0" // { dependencies = [ sources."chalk-4.1.1" sources."strip-ansi-6.0.0" @@ -106739,7 +107223,7 @@ in }) sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" - sources."@types/debug-4.1.5" + sources."@types/debug-4.1.6" sources."@types/emscripten-1.39.4" sources."@types/flat-cache-2.0.0" sources."@types/graphlib-2.1.7" @@ -106866,7 +107350,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."configstore-5.0.1" - sources."core-js-3.15.1" + sources."core-js-3.15.2" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -107270,7 +107754,12 @@ in sources."yallist-3.1.1" ]; }) - sources."snyk-python-plugin-1.19.9" + (sources."snyk-python-plugin-1.19.11" // { + dependencies = [ + sources."rimraf-3.0.2" + sources."tmp-0.2.1" + ]; + }) sources."snyk-resolve-1.1.0" (sources."snyk-resolve-deps-4.7.2" // { dependencies = [ @@ -107411,7 +107900,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" sources."@types/cors-2.8.10" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -107973,7 +108462,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-3.1.4" // { + (sources."jitdb-3.1.5" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.1" @@ -108577,7 +109066,7 @@ in sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xtend-4.0.2" sources."zerr-1.0.4" ]; @@ -108677,7 +109166,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.935.0" // { + (sources."aws-sdk-2.938.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -109086,7 +109575,7 @@ in sources."parseuri-0.0.6" sources."parseurl-1.3.3" sources."passport-0.3.2" - sources."passport-oauth2-1.5.0" + sources."passport-oauth2-1.6.0" (sources."passport-saml-0.15.0" // { dependencies = [ sources."lodash-3.2.0" @@ -109515,7 +110004,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -109553,7 +110042,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -109569,7 +110058,7 @@ in sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -109755,7 +110244,7 @@ in sources."trough-1.0.5" sources."type-fest-0.18.1" sources."typedarray-to-buffer-3.1.5" - sources."unified-9.2.1" + sources."unified-9.2.2" sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" @@ -109795,7 +110284,7 @@ in sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/pug-2.0.4" sources."@types/sass-1.16.0" sources."anymatch-3.1.2" @@ -109841,7 +110330,7 @@ in sources."svelte2tsx-0.3.0" sources."to-regex-range-5.0.1" sources."tslib-2.3.0" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."vscode-css-languageservice-5.0.0" sources."vscode-emmet-helper-2.1.2" sources."vscode-html-languageservice-4.0.0" @@ -111023,7 +111512,7 @@ in sources."trough-1.0.5" sources."try-resolve-1.0.1" sources."type-check-0.4.0" - sources."unified-9.2.1" + sources."unified-9.2.2" sources."unique-concat-0.2.2" sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" @@ -111465,13 +111954,13 @@ in sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."unherit-1.1.3" - (sources."unified-9.2.1" // { + (sources."unified-9.2.2" // { dependencies = [ sources."is-plain-obj-2.1.0" ]; }) sources."unified-diff-3.1.0" - (sources."unified-engine-8.1.0" // { + (sources."unified-engine-8.2.0" // { dependencies = [ sources."is-plain-obj-2.1.0" ]; @@ -111916,10 +112405,10 @@ in sources."@szmarczak/http-timer-4.0.5" sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.1" - sources."@types/debug-4.1.5" + sources."@types/debug-4.1.6" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -111995,7 +112484,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.15.1" + sources."core-js-3.15.2" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -112335,7 +112824,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -112354,10 +112843,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.129.0"; + version = "0.130.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.129.0.tgz"; - sha512 = "wiWio1yVRg2Oj6WEWsTHQo5eSzYpEwSBtPSi3OofNpvFbf26HFfb9kw4FZJNjII4qxzp0b1xLB11+tKkBGB1ZA=="; + url = "https://registry.npmjs.org/three/-/three-0.130.0.tgz"; + sha512 = "4jqvbJyvgrjTsBgqE7TrdkZral78l8CXpFCdGzqQoiJHsRhGHxe5tvwqZQVaS6eodPav7jdYO5sp1c5RmMB3ng=="; }; buildInputs = globalBuildInputs; meta = { @@ -112783,10 +113272,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.3.4"; + version = "4.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.3.4.tgz"; - sha512 = "uauPG7XZn9F/mo+7MrsRjyvbxFpzemRjKEZXS4AK83oP2KKOJPvb+9cO/gmnv8arWZvhnjVOXz7B49m1l0e9Ew=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz"; + sha512 = "DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA=="; }; buildInputs = globalBuildInputs; meta = { @@ -112801,29 +113290,74 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.5.1"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.5.1.tgz"; - sha512 = "60Kguhwk/R1BB4pEIb6B9C7Ix7JzLzYnsODlmorYMPjMeEV0rCBqTR6FGAj4wVw/eHrHcpwLENmmURKUd8aybA=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.5.4.tgz"; + sha512 = "MQbCaq+ZUGfibp91reQJGYPXWbEdsY8G+iAkOaKRLOs3MDIssacEYF3v1nFne8iWWYPSsYs4HvuiIzbuUAO8GA=="; }; dependencies = [ - sources."command-exists-1.2.6" - sources."commander-2.20.3" - sources."crypto-random-string-1.0.0" - sources."fs-extra-7.0.1" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.7" + sources."aggregate-error-3.1.0" + sources."array-union-2.1.0" + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."clean-stack-2.2.0" + sources."command-exists-1.2.9" + sources."commander-7.2.0" + sources."concat-map-0.0.1" + sources."crypto-random-string-2.0.0" + sources."del-6.0.0" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.6" + sources."fastq-1.11.0" + sources."fill-range-7.0.1" + sources."fs-extra-10.0.0" + sources."fs.realpath-1.0.0" + sources."glob-7.1.7" + sources."glob-parent-5.1.2" + sources."globby-11.0.4" sources."graceful-fs-4.2.6" - sources."jsonfile-4.0.0" - sources."p-debounce-1.0.0" - sources."temp-dir-1.0.0" - sources."tempy-0.2.1" - sources."unique-string-1.0.0" - sources."universalify-0.1.2" + sources."ignore-5.1.8" + sources."indent-string-4.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-extglob-2.1.1" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-path-cwd-2.2.0" + sources."is-path-inside-3.0.3" + sources."is-stream-2.0.0" + sources."jsonfile-6.1.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.4" + sources."minimatch-3.0.4" + sources."once-1.4.0" + sources."p-debounce-2.1.0" + sources."p-map-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-type-4.0.0" + sources."picomatch-2.3.0" + sources."queue-microtask-1.2.3" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-parallel-1.2.0" + sources."slash-3.0.0" + sources."temp-dir-2.0.0" + sources."tempy-1.0.1" + sources."to-regex-range-5.0.1" + sources."type-fest-0.16.0" + sources."unique-string-2.0.0" + sources."universalify-2.0.0" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-5.3.0-next.10" sources."vscode-languageserver-protocol-3.16.0" sources."vscode-languageserver-types-3.16.0" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" + sources."wrappy-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -113485,7 +114019,7 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" @@ -113567,13 +114101,18 @@ in sources."tsutils-2.29.0" sources."type-check-0.4.0" sources."type-fest-0.20.2" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."uri-js-4.4.1" sources."v8-compile-cache-2.3.0" - (sources."vue-eslint-parser-7.6.0" // { + (sources."vue-eslint-parser-7.7.1" // { dependencies = [ + sources."acorn-8.4.1" sources."eslint-visitor-keys-1.3.0" - sources."espree-6.2.1" + (sources."espree-8.0.0" // { + dependencies = [ + sources."eslint-visitor-keys-3.0.0" + ]; + }) ]; }) sources."which-2.0.2" @@ -113679,7 +114218,7 @@ in sources."minimatch-3.0.4" sources."ms-2.0.0" sources."request-light-0.4.0" - (sources."vscode-json-languageservice-4.1.4" // { + (sources."vscode-json-languageservice-4.1.5" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -113761,7 +114300,7 @@ in sources."@discoveryjs/json-ext-0.5.3" sources."@types/eslint-7.2.13" sources."@types/eslint-scope-3.7.0" - sources."@types/estree-0.0.47" + sources."@types/estree-0.0.48" sources."@types/json-schema-7.0.7" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" @@ -113809,7 +114348,7 @@ in sources."buffer-from-1.1.1" sources."call-bind-1.0.2" sources."camelcase-6.2.0" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" (sources."chalk-4.1.1" // { dependencies = [ sources."supports-color-7.2.0" @@ -113849,7 +114388,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -113908,7 +114447,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."jest-worker-27.0.2" + sources."jest-worker-27.0.6" sources."js-yaml-4.0.0" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" @@ -114038,7 +114577,7 @@ in sources."tslib-2.3.0" sources."tunnel-0.0.6" sources."typed-rest-client-1.8.4" - sources."typescript-4.3.4" + sources."typescript-4.3.5" sources."uc.micro-1.0.6" sources."underscore-1.13.1" sources."uri-js-4.4.1" @@ -114059,7 +114598,7 @@ in sources."vscode-debugadapter-testsupport-1.47.0" sources."vscode-debugprotocol-1.47.0" sources."watchpack-2.2.0" - sources."webpack-5.40.0" + sources."webpack-5.42.0" (sources."webpack-cli-4.7.2" // { dependencies = [ sources."commander-7.2.0" @@ -114416,7 +114955,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -114611,12 +115150,19 @@ in }) (sources."eslint-plugin-vue-6.2.2" // { dependencies = [ - sources."acorn-7.4.1" + sources."acorn-8.4.1" sources."debug-4.3.2" sources."eslint-scope-5.1.1" - sources."espree-6.2.1" + sources."eslint-visitor-keys-3.0.0" + sources."espree-8.0.0" + sources."lru-cache-6.0.0" sources."ms-2.1.2" - sources."vue-eslint-parser-7.6.0" + (sources."vue-eslint-parser-7.7.1" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) + sources."yallist-4.0.0" ]; }) sources."eslint-scope-4.0.3" @@ -115387,7 +115933,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.15.1" + sources."core-js-pure-3.15.2" sources."core-util-is-1.0.2" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -115523,7 +116069,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -115584,7 +116130,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" @@ -115772,7 +116318,7 @@ in sources."first-chunk-stream-3.0.0" sources."flat-cache-3.0.4" sources."flatstr-1.0.12" - sources."flatted-3.1.1" + sources."flatted-3.2.0" sources."fluent-syntax-0.13.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -116137,17 +116683,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.40.0"; + version = "5.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.40.0.tgz"; - sha512 = "c7f5e/WWrxXWUzQqTBg54vBs5RgcAgpvKE4F4VegVgfo4x660ZxYUF2/hpMkZUnLjgytVTitjeXaN4IPlXCGIw=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.42.0.tgz"; + sha512 = "Ln8HL0F831t1x/yPB/qZEUVmZM4w9BnHZ1EQD/sAUHv8m22hthoPniWTXEzFMh/Sf84mhrahut22TX5KxWGuyQ=="; }; dependencies = [ sources."@types/eslint-7.2.13" sources."@types/eslint-scope-3.7.0" - sources."@types/estree-0.0.47" + sources."@types/estree-0.0.48" sources."@types/json-schema-7.0.7" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -116170,11 +116716,11 @@ in sources."ajv-keywords-3.5.2" sources."browserslist-4.16.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001240" + sources."caniuse-lite-1.0.30001241" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.759" + sources."electron-to-chromium-1.3.765" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.6.0" sources."escalade-3.1.1" @@ -116191,7 +116737,7 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.6" sources."has-flag-4.0.0" - sources."jest-worker-27.0.2" + sources."jest-worker-27.0.6" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.2.0" @@ -116312,7 +116858,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -116965,7 +117511,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.2" @@ -117015,6 +117561,7 @@ in sources."buffer-indexof-1.1.1" sources."buffer-xor-2.0.2" sources."bufferutil-4.0.3" + sources."cache-chunk-store-3.2.2" (sources."castv2-0.1.10" // { dependencies = [ sources."debug-4.3.2" @@ -117240,10 +117787,10 @@ in sources."ut_pex-3.0.1" sources."utf-8-validate-5.0.5" sources."util-deprecate-1.0.2" - sources."utp-native-2.5.1" + sources."utp-native-2.5.3" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-1.0.2" // { + (sources."webtorrent-1.1.0" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -117254,7 +117801,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.5.0" + sources."ws-7.5.1" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" @@ -117338,7 +117885,7 @@ in sources."minimatch-3.0.4" sources."ms-2.0.0" sources."request-light-0.2.5" - (sources."vscode-json-languageservice-4.1.4" // { + (sources."vscode-json-languageservice-4.1.5" // { dependencies = [ sources."jsonc-parser-3.0.0" sources."vscode-nls-5.0.0" @@ -117427,7 +117974,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/expect-1.20.4" sources."@types/minimatch-3.0.4" - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/vinyl-2.0.4" sources."abbrev-1.1.1" (sources."agent-base-6.0.2" // { @@ -117548,7 +118095,7 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.15.1" + sources."core-js-3.15.2" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -118323,7 +118870,7 @@ in sha512 = "omgqRVve+5dqbFrogFSjJXLUCUr4xHF2Gan+Njn/z4fumhIj3tMTFEA9iV+HgiobZ5Mgl5N96z4S4fwhaas4Pw=="; }; dependencies = [ - sources."@types/node-15.12.5" + sources."@types/node-15.14.0" sources."@types/node-fetch-2.5.10" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index 94626f3c179..abef3ef7ef4 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "alcotest"; - version = "1.2.3"; + version = "1.3.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-mirage-${version}.tbz"; - sha256 = "1bmjcivbmd4vib15v4chycgd1gl8js9dk94vzxkdg06zxqd4hp08"; + sha256 = "sha256-efnevbyolTdNb91zr4pHDcvgaLQQSD01wEu2zMM+iaw="; }; propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims uutf ]; diff --git a/pkgs/development/ocaml-modules/alcotest/lwt.nix b/pkgs/development/ocaml-modules/alcotest/lwt.nix index 82efbe91a06..5a57dc0fcc2 100644 --- a/pkgs/development/ocaml-modules/alcotest/lwt.nix +++ b/pkgs/development/ocaml-modules/alcotest/lwt.nix @@ -1,13 +1,16 @@ -{ lib, buildDunePackage, alcotest, logs, ocaml_lwt }: +{ lib, buildDunePackage, alcotest, logs, ocaml_lwt, fmt +, re, cmdliner +}: buildDunePackage { pname = "alcotest-lwt"; inherit (alcotest) version src useDune2; - propagatedBuildInputs = [ alcotest logs ocaml_lwt ]; + propagatedBuildInputs = [ alcotest logs ocaml_lwt fmt ]; doCheck = true; + checkInputs = [ re cmdliner ]; meta = alcotest.meta // { description = "Lwt-based helpers for Alcotest"; diff --git a/pkgs/development/ocaml-modules/alcotest/mirage.nix b/pkgs/development/ocaml-modules/alcotest/mirage.nix new file mode 100644 index 00000000000..b4ba4246b2c --- /dev/null +++ b/pkgs/development/ocaml-modules/alcotest/mirage.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, alcotest, lwt, logs, mirage-clock, duration }: + +buildDunePackage { + pname = "alcotest-mirage"; + + inherit (alcotest) version src useDune2; + + propagatedBuildInputs = [ alcotest lwt logs mirage-clock duration ]; + + doCheck = true; + + meta = alcotest.meta // { + description = "Mirage implementation for Alcotest"; + maintainers = with lib.maintainers; [ ulrikstrid anmonteiro ]; + }; +} diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index 18683d5f170..f496ce91c82 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -5,27 +5,17 @@ then throw "camlpdf is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.3.1"; + version = "2.4"; name = "ocaml${ocaml.version}-camlpdf-${version}"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; rev = "v${version}"; - sha256 = "1q69hhk63z836jbkv4wsng27w35w0qpz01c7ax0mqm8d8kmnr0v4"; + sha256 = "09kzrgmlxb567315p3fy59ba0kv7xhp548n9i3l4wf9n06p0ww9m"; }; buildInputs = [ which ocaml findlib ]; - # Version number in META file is wrong - patchPhase = '' - patch -p 0 META <<EOF - 3c3 - < version="1.7.1" - --- - > version="${version}" - EOF - ''; - preInstall = '' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs ''; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index cc2aad52d3d..2a0fae4a1db 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -1,6 +1,10 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }: -let version = "2.3.1"; in +if !lib.versionAtLeast ocaml.version "4.10" +then throw "cpdf is not available for OCaml ${ocaml.version}" +else + +let version = "2.4"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-cpdf-${version}"; @@ -9,19 +13,14 @@ stdenv.mkDerivation { owner = "johnwhitington"; repo = "cpdf-source"; rev = "v${version}"; - sha256 = "1gwz0iy28f67kbqap2q10nf98dalwbi03vv5j893z2an7pb4w68z"; + sha256 = "1a8lmfc76dr8x6pxgm4aypbys02pfma9yh4z3l1qxp2q1909na5l"; }; - prePatch = '' - substituteInPlace META --replace 'version="1.7"' 'version="${version}"' - ''; - buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ camlpdf ]; - createFindlibDestdir = true; - - postInstall = '' + preInstall = '' + mkdir -p $OCAMLFIND_DESTDIR mkdir -p $out/bin cp cpdf $out/bin mkdir -p $out/share/ diff --git a/pkgs/development/ocaml-modules/routes/default.nix b/pkgs/development/ocaml-modules/routes/default.nix new file mode 100644 index 00000000000..a83d0db5d84 --- /dev/null +++ b/pkgs/development/ocaml-modules/routes/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchurl, buildDunePackage }: + +buildDunePackage rec { + pname = "routes"; + version = "0.9.1"; + + useDune2 = true; + minimalOCamlVersion = "4.05"; + + src = fetchurl { + url = "https://github.com/anuragsoni/routes/releases/download/${version}/routes-${version}.tbz"; + sha256 = "0h2c1p5w6237c1lmsl5c8q2dj5dq20gf2cmb12nbmlfn12sfmcrl"; + }; + + meta = with lib; { + description = "Typed routing for OCaml applications"; + license = licenses.bsd3; + homepage = "https://anuragsoni.github.io/routes"; + maintainers = with maintainers; [ ulrikstrid anmonteiro ]; + }; +} diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 17a6e4d6a89..ae18ce5dc31 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -3,7 +3,7 @@ , Babel , blinker , buildPythonPackage -, dateutil +, python-dateutil , docutils , doit , fetchPypi @@ -53,7 +53,7 @@ buildPythonPackage rec { aiohttp Babel blinker - dateutil + python-dateutil docutils doit ghp-import diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index 31e0e73016c..b555188b4b5 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, requests, pyjwt, dateutil }: +, requests, pyjwt, python-dateutil }: buildPythonPackage rec { pname = "adal"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "d74f45b81317454d96e982fd1c50e6fb5c99ac2223728aea8764433a39f566f1"; }; - propagatedBuildInputs = [ requests pyjwt dateutil ]; + propagatedBuildInputs = [ requests pyjwt python-dateutil ]; meta = with lib; { description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources"; diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 921bfbac646..267ca5b4a5a 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.8.0"; + version = "0.8.2"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = version; - sha256 = "1x55w2vhb5mgvlg19cs887xd7fg0cwnp6hb34vajp80q4yff9xk5"; + sha256 = "sha256-XmDE704c9KJst8hrvdyQdS52Sd6RnprQZjBCIWAaiho="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiopg/default.nix b/pkgs/development/python-modules/aiopg/default.nix index cb9cd327e8c..36ea0023483 100644 --- a/pkgs/development/python-modules/aiopg/default.nix +++ b/pkgs/development/python-modules/aiopg/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiopg"; - version = "1.2.1"; + version = "1.3.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; rev = "v${version}"; - sha256 = "0c6s2p1fjbdk1ygpl6a1s1rbnsk8gw9kj99pf98nxhb9j3iahas4"; + sha256 = "sha256-/J53WqBag4ArSF7wETvmoBUtgNqp4eYGH0ytipiSKBI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index c820ee81ee2..81502a470a6 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , pytest, pytestcov, mock, coverage, setuptools -, Mako, sqlalchemy, python-editor, dateutil +, Mako, sqlalchemy, python-editor, python-dateutil }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest pytestcov mock coverage ]; - propagatedBuildInputs = [ Mako sqlalchemy python-editor dateutil setuptools ]; + propagatedBuildInputs = [ Mako sqlalchemy python-editor python-dateutil setuptools ]; # no traditional test suite doCheck = false; diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 9cc3fb82775..62db58d611e 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, dateutil +, python-dateutil , fetchPypi , isPy3k , mock @@ -17,7 +17,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil ]; checkInputs = [ diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix index 8afb9b751ee..3bc6a731866 100644 --- a/pkgs/development/python-modules/azure-storage/default.nix +++ b/pkgs/development/python-modules/azure-storage/default.nix @@ -5,7 +5,7 @@ , azure-common , cryptography , futures ? null -, dateutil +, python-dateutil , requests , isPy3k }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv"; }; - propagatedBuildInputs = [ azure-common cryptography dateutil requests ] + propagatedBuildInputs = [ azure-common cryptography python-dateutil requests ] ++ pkgs.lib.optionals (!isPy3k) [ futures ]; postPatch = '' diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix index 8e29eed2acf..0ee12c41480 100644 --- a/pkgs/development/python-modules/bashlex/default.nix +++ b/pkgs/development/python-modules/bashlex/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "bashlex"; - version = "0.14"; + version = "0.15"; src = fetchFromGitHub { owner = "idank"; repo = pname; rev = version; - sha256 = "070spmbf53y18miky5chgky4x5h8kp9czkp7dm173klv9pi2cn0k"; + sha256 = "sha256-kKVorAIKlyC9vUzLOlaZ/JrG1kBBRIvLwBmHNj9nx84="; }; checkInputs = [ nose ]; @@ -29,9 +29,11 @@ buildPythonPackage rec { ${python.interpreter} -m nose --with-doctest ''; + pythonImportsCheck = [ "bashlex" ]; + meta = with lib; { description = "Python parser for bash"; - license = licenses.gpl3; + license = licenses.gpl3Plus; homepage = "https://github.com/idank/bashlex"; maintainers = with maintainers; [ multun ]; }; diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index ec864e71498..31f8a24d8b7 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -5,7 +5,7 @@ , beautifulsoup4 , bottle , chardet -, dateutil +, python-dateutil , google-api-python-client , google-auth-oauthlib , lxml @@ -34,7 +34,7 @@ buildPythonPackage rec { beautifulsoup4 bottle chardet - dateutil + python-dateutil google-api-python-client google-auth-oauthlib lxml diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix index 3e74c17f3be..c9d317a81c3 100644 --- a/pkgs/development/python-modules/bitcoin-price-api/default.nix +++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, dateutil, requests }: +, python-dateutil, requests }: buildPythonPackage rec { pname = "bitcoin-price-api"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "bc68076f9632aaa9a8009d916d67a709c1e045dd904cfc7a3e8be33960d32029"; }; - propagatedBuildInputs = [ dateutil requests ]; + propagatedBuildInputs = [ python-dateutil requests ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 8a21eb455e0..d05c2decf49 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil , jmespath , docutils , ordereddict @@ -21,7 +21,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil jmespath docutils ordereddict diff --git a/pkgs/development/python-modules/bravado-core/default.nix b/pkgs/development/python-modules/bravado-core/default.nix index 8c65cca07b2..24db42b7a74 100644 --- a/pkgs/development/python-modules/bravado-core/default.nix +++ b/pkgs/development/python-modules/bravado-core/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "bravado-core"; - version = "5.16.1"; + version = "5.17.0"; src = fetchFromGitHub { owner = "Yelp"; repo = pname; rev = "v${version}"; - sha256 = "0r9gk5vkjbc407fjydms3ik3hnzajq54znyz58d8rm6pvqcvjjpl"; + sha256 = "sha256-okQA4YJq0lyVJuDzD8mMRlOS/K3gf1qRUpw/5M0LlZE="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 65cfa74777a..f23bc566bac 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.0.3"; + version = "4.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "0b70bc95e4e4f98b2eef7a3dadfdc50c1a40da7f50446adf43be05574a4b9f7c"; + sha256 = "sha256-3L1ZzZ7eomzJLvtlGK7YOi81b4G/1azHML/iAvsnwcE="; }; propagatedBuildInputs = [ six webob ]; diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index c59d2196d20..a29e7458d4b 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools -, twiggy, requests, offtrac, bugzilla, taskw, dateutil, pytz, keyring, six +, twiggy, requests, offtrac, bugzilla, taskw, python-dateutil, pytz, keyring, six , jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future, jira }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools - twiggy requests offtrac bugzilla taskw dateutil pytz keyring six + twiggy requests offtrac bugzilla taskw python-dateutil pytz keyring six jinja2 pycurl dogpile_cache lockfile click pyxdg future jira ]; diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 043a1cd3e13..65919542057 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k, python, twisted, jinja2, zope_interface, sqlalchemy, - sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, + sqlalchemy_migrate, python-dateutil, txaio, autobahn, pyjwt, pyyaml, unidiff, treq, txrequests, pypugjs, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint, flake8, buildbot-worker, buildbot-pkg, buildbot-plugins, parameterized, git, openssh, glibcLocales, ldap3, nixosTests }: @@ -39,7 +39,7 @@ let zope_interface sqlalchemy sqlalchemy_migrate - dateutil + python-dateutil txaio autobahn pyjwt diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 0f6b5fa2859..7c324e646a4 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface , dialog, gnureadline -, pytest_xdist, pytestCheckHook, dateutil +, pytest_xdist, pytestCheckHook, python-dateutil }: buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { buildInputs = [ dialog gnureadline ]; checkInputs = [ - dateutil + python-dateutil pytestCheckHook pytest_xdist ]; diff --git a/pkgs/development/python-modules/clize/default.nix b/pkgs/development/python-modules/clize/default.nix index 1418db69a39..0088acdb832 100644 --- a/pkgs/development/python-modules/clize/default.nix +++ b/pkgs/development/python-modules/clize/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil , sigtools , six , attrs @@ -29,7 +29,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - dateutil + python-dateutil pygments repeated_test unittest2 diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 318354786b5..563ad08381c 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -5,7 +5,7 @@ , attrs , colorlog , csvw -, dateutil +, python-dateutil , tabulate , mock , postgresql @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - dateutil + python-dateutil tabulate colorlog attrs diff --git a/pkgs/development/python-modules/cloudsmith-api/default.nix b/pkgs/development/python-modules/cloudsmith-api/default.nix index 57316ae9d6c..5c3b5f114f5 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -3,7 +3,7 @@ , fetchPypi , certifi , six -, dateutil +, python-dateutil , urllib3 }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ certifi six - dateutil + python-dateutil urllib3 ]; diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix index 8f1c1754056..2b350be0046 100644 --- a/pkgs/development/python-modules/confuse/default.nix +++ b/pkgs/development/python-modules/confuse/default.nix @@ -1,25 +1,45 @@ { buildPythonPackage , enum34 -, fetchPypi +, fetchFromGitHub +, flit-core , isPy27 , lib , pathlib , pyyaml +, pytestCheckHook }: buildPythonPackage rec { pname = "confuse"; - version = "1.4.0"; + version = "1.5.0"; + format = "flit"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-kvwEUcbiwnMqw2PQ9Z1+pgir3b7QYt2o6Y6ajJhs5GQ="; + src = fetchFromGitHub { + owner = "beetbox"; + repo = pname; + rev = "v${version}"; + sha256 = "1kvilxhjifvz6ra64jadf9jiwphrah5rcb9ryq0v7w1dywgn4qp7"; }; - propagatedBuildInputs = [ pyyaml ] ++ lib.optionals isPy27 [ enum34 pathlib ] ; + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + pyyaml + ] ++ lib.optionals isPy27 [ + enum34 + pathlib + ] ; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "confuse" ]; meta = with lib; { - description = "Confuse is a configuration library for Python that uses YAML."; + description = "Python configuration library for Python that uses YAML"; homepage = "https://github.com/beetbox/confuse"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; diff --git a/pkgs/development/python-modules/crc32c/default.nix b/pkgs/development/python-modules/crc32c/default.nix index dd2c9059ed5..f4a85fba599 100644 --- a/pkgs/development/python-modules/crc32c/default.nix +++ b/pkgs/development/python-modules/crc32c/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, fetchFromGitHub }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.2.post0"; pname = "crc32c"; src = fetchFromGitHub { owner = "ICRAR"; repo = pname; rev = "v${version}"; - sha256 = "0vyac7pchh083h5qdjwhhacfq77frkrq1bjzsn51qv1vwcdrpnrf"; + sha256 = "sha256-0FgNOVpgJTxRALuufZ7Dt1TwuX+zqw35yCq8kmq4RTc="; }; meta = { diff --git a/pkgs/development/python-modules/csvw/default.nix b/pkgs/development/python-modules/csvw/default.nix index 27f3f291113..67342d9eccc 100644 --- a/pkgs/development/python-modules/csvw/default.nix +++ b/pkgs/development/python-modules/csvw/default.nix @@ -4,7 +4,7 @@ , pythonOlder , attrs , isodate -, dateutil +, python-dateutil , rfc3986 , uritemplate , mock @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs isodate - dateutil + python-dateutil rfc3986 uritemplate ]; diff --git a/pkgs/development/python-modules/curio/default.nix b/pkgs/development/python-modules/curio/default.nix index fb1eceda7f2..1a0f4e2d9fe 100644 --- a/pkgs/development/python-modules/curio/default.nix +++ b/pkgs/development/python-modules/curio/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , isPy3k , pytestCheckHook , sphinx @@ -10,31 +9,19 @@ buildPythonPackage rec { pname = "curio"; - version = "1.4"; + version = "1.5"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "57edce81c837f3c2cf42fbb346dee26e537d1659e6605269fb13bd179e068744"; + sha256 = "sha256-rwghLlkLt9qOTMOcQgEnEUlNwg1iLxYhVbopbMLjvBA="; }; - patches = [ - # Fix the flaky test due to slow moving time on Apple Silicon chips. - # Remove when https://github.com/dabeaz/curio/pull/339 is in the next release. - (fetchpatch { - url = "https://github.com/dabeaz/curio/commit/132376724bbfaa0a52d3d63d0791aa4ac1eb6f5f.patch"; - sha256 = "sha256-AxO0xRcR9l9/NKEJFwyZIoYcyZxpqOhpdNaeaYokVb4="; - }) - # Same as above - (fetchpatch { - url = "https://github.com/dabeaz/curio/commit/8ac2f12a2cdacbc750b01fc7459cee8879bc1ee3.patch"; - sha256 = "sha256-2Si3fuDLrI09QuzJd1TrE0QY02G9e9m+1eHFTB/MrWU="; - }) + checkInputs = [ + pytestCheckHook + sphinx ]; - disabled = !isPy3k; - - checkInputs = [ pytestCheckHook sphinx ]; - __darwinAllowLocalNetworking = true; disabledTests = [ @@ -46,9 +33,11 @@ buildPythonPackage rec { "test_unix_ssl_server" # socket bind error on hydra when built with other packages ]; + pythonImportsCheck = [ "curio" ]; + meta = with lib; { homepage = "https://github.com/dabeaz/curio"; - description = "Library for performing concurrent I/O with coroutines in Python 3"; + description = "Library for performing concurrent I/O with coroutines in Python"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 359ee96f60a..9068814ffd7 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.12"; + version = "1.1.13"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-tJnr+uT8ZF6VI2IVc//LHFtoVKG1wM4dZqippFhgWAc="; + sha256 = "012avhf0a8n9xyy4g3xcr5z8z2a3m6rnqic6gfs9fq6p9bkq3ix9"; }; propagatedBuildInputs = [ @@ -42,8 +42,10 @@ buildPythonPackage rec { ''; checkInputs = [ pytestCheckHook ]; + pytestFlagsArray = [ "./cvxpy" ]; - # Disable the slowest benchmarking tests, cuts test time in half + + # Disable the slowest benchmarking tests, cuts test time in half disabledTests = [ "test_tv_inpainting" "test_diffcp_sdp_example" @@ -51,6 +53,8 @@ buildPythonPackage rec { "test_ecos_bb_mi_lp_2" # https://github.com/cvxgrp/cvxpy/issues/1241#issuecomment-780912155 ]; + pythonImportsCheck = [ "cvxpy" ]; + meta = with lib; { description = "A domain-specific language for modeling convex optimization problems in Python"; homepage = "https://www.cvxpy.org/"; diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index fc48f915012..f6d7fcac62a 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { pname = "daphne"; - version = "3.0.1"; + version = "3.0.2"; disabled = !isPy3k; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "1bkxhzvaqwz760c11nhaiwvsq1d1csmk5dz2a1j1ynypjprhvhsk"; + sha256 = "sha256-KWkMV4L7bA2Eo/u4GGif6lmDNrZAzvYyDiyzyWt9LeI="; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index b51ac1701a2..208856490b8 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "dask"; - version = "2021.06.1"; + version = "2021.06.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "dask"; repo = pname; rev = version; - sha256 = "sha256-wrUqLSmlKhd0NSjWBwbow8aX53ZBTgl2n4lEmvxC3bs="; + sha256 = "sha256-qvfjdijzlqaJQrDztRAVr5PudTaVd3WOTBid2ElZQgg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 6f11ae62c3e..50bde25cf44 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -5,7 +5,7 @@ , mock , numpy , multipledispatch -, dateutil +, python-dateutil }: let @@ -29,7 +29,7 @@ in buildPythonPackage rec { }; checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ numpy multipledispatch dateutil ]; + propagatedBuildInputs = [ numpy multipledispatch python-dateutil ]; # Disable several tests # https://github.com/blaze/datashape/issues/232 diff --git a/pkgs/development/python-modules/dateparser/0.x.nix b/pkgs/development/python-modules/dateparser/0.x.nix index 49e2d1f2796..2aab262e64d 100644 --- a/pkgs/development/python-modules/dateparser/0.x.nix +++ b/pkgs/development/python-modules/dateparser/0.x.nix @@ -4,7 +4,7 @@ , mock , parameterized , pytestCheckHook -, dateutil +, python-dateutil , pytz , regex , tzlocal @@ -39,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ # install_requires - dateutil pytz regex tzlocal + python-dateutil pytz regex tzlocal # extra_requires convertdate umalqurra jdatetime ruamel_yaml ]; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 21dcffc4a84..6cbd1df32a5 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , isPy3k , fetchFromGitHub -, dateutil +, python-dateutil , pytz , regex , tzlocal @@ -29,7 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ # install_requires - dateutil pytz regex tzlocal + python-dateutil pytz regex tzlocal # extra_requires hijri-converter convertdate ]; diff --git a/pkgs/development/python-modules/dbutils/default.nix b/pkgs/development/python-modules/dbutils/default.nix index 848e5038af8..294456cc85b 100644 --- a/pkgs/development/python-modules/dbutils/default.nix +++ b/pkgs/development/python-modules/dbutils/default.nix @@ -1,13 +1,13 @@ { lib, buildPythonPackage, fetchPypi, pytestCheckHook }: buildPythonPackage rec { - version = "2.0"; + version = "2.0.1"; pname = "dbutils"; src = fetchPypi { inherit version; pname = "DBUtils"; - sha256 = "131ifm2c2a7bipij597i8fvjka0dk2qv1xr2ghcvbc30jlkvag2g"; + sha256 = "sha256-Vw590TbBMRb+74vKGGCeP2a4ZoqcPV8hCdh0TERE2GE="; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index cd24ae0fd3e..926dadd031c 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "2.2.4"; + version = "2.3.0"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "11gqmyf350256gbppak2qv20lg2bmszand4kmks93wphq5yp2iiy"; + sha256 = "sha256-pRYC0kJHJ5SKgDdGS1KkQEbv+DkF9oPw/A1GnB0AwfQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index 44a0165d6fd..751ebaae292 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "devolo-home-control-api"; - version = "0.17.3"; + version = "0.17.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "2Fake"; repo = "devolo_home_control_api"; rev = "v${version}"; - sha256 = "1h7admqb1l28sxwhhkkhw0sfzgpn8zpczvmi3h28f68csflkv379"; + sha256 = "sha256-N/48Q2IEL194vCzrPPuy+mRNejXfkoXy2t2oe0Y6ug4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dftfit/default.nix b/pkgs/development/python-modules/dftfit/default.nix deleted file mode 100644 index 778b8c3d984..00000000000 --- a/pkgs/development/python-modules/dftfit/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, fetchPypi -, buildPythonPackage -, pymatgen -, marshmallow -, pyyaml -, pygmo -, pandas -, scipy -, numpy -, scikit-learn -, lammps-cython -, pymatgen-lammps -, pytestrunner -, isPy3k -}: - -buildPythonPackage rec { - pname = "dftfit"; - version = "0.5.1"; - disabled = (!isPy3k); - - src = fetchPypi { - inherit pname version; - sha256 = "4dcbde48948835dcf2d49d6628c9df5747a8ec505d517e374b8d6c7fe95892df"; - }; - - buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ - pymatgen - marshmallow - pyyaml - pygmo - pandas - scipy - numpy - scikit-learn - lammps-cython - pymatgen-lammps - ]; - - # tests require git lfs download. and is quite large so skip tests - doCheck = false; - pythonImportsCheck = [ "dftfit" ]; - - meta = { - description = "Ab-Initio Molecular Dynamics Potential Development"; - homepage = "https://gitlab.com/costrouc/dftfit"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index a9c2e4e8237..dd43902949a 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "dicom2nifti"; - version = "2.2.12"; + version = "2.3.0"; disabled = isPy27; # no tests in PyPI dist @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "icometrix"; repo = pname; rev = version; - sha256 = "0ddzaw0yasyi2wsh7a6r73cdcmdfbb0nh0k0n4yxp9vnkw1ag5z4"; + sha256 = "sha256-QSu9CGXFjDpI25Cy6QSbrwiQ2bwsVezCUxSovRLs6AI="; }; propagatedBuildInputs = [ nibabel numpy pydicom scipy setuptools ]; diff --git a/pkgs/development/python-modules/diff-cover/default.nix b/pkgs/development/python-modules/diff-cover/default.nix new file mode 100644 index 00000000000..7a9e1205979 --- /dev/null +++ b/pkgs/development/python-modules/diff-cover/default.nix @@ -0,0 +1,57 @@ +{ lib +, buildPythonPackage +, chardet +, fetchPypi +, inflect +, jinja2 +, jinja2_pluralize +, pycodestyle +, pyflakes +, pygments +, pylint +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "diff-cover"; + version = "5.4.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "diff_cover"; + inherit version; + sha256 = "sha256-4iQ9/QcXh/lW8HE6wFZWc6Y57xhAEWu2TQnIUZJNAMs="; + }; + + propagatedBuildInputs = [ + chardet + inflect + jinja2 + jinja2_pluralize + pygments + ]; + + checkInputs = [ + pycodestyle + pyflakes + pylint + pytest-mock + pytestCheckHook + ]; + + disabledTests = [ + "added_file_pylint_console" + "file_does_not_exist" + ]; + + pythonImportsCheck = [ "diff_cover" ]; + + meta = with lib; { + description = "Automatically find diff lines that need test coverage"; + homepage = "https://github.com/Bachmann1234/diff-cover"; + license = licenses.asl20; + maintainers = with maintainers; [ dzabraev ]; + }; +} diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix deleted file mode 100644 index 7eeb378ff41..00000000000 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, chardet -, inflect -, jinja2 -, jinja2_pluralize -, pygments -, six -# test dependencies -, coverage -, mock -, nose -, pycodestyle -, pyflakes -, pylint -, pytest -}: - -buildPythonPackage rec { - pname = "diff_cover"; - version = "5.2.0"; - - preCheck = '' - export LC_ALL=en_US.UTF-8; - ''; - - src = fetchPypi { - inherit pname version; - sha256 = "a1cd54232d2e48bd4c1eabc96cfe4a8727a9a92fd2556b52ff8f65bb8adf8768"; - }; - - propagatedBuildInputs = [ chardet jinja2 jinja2_pluralize pygments six inflect ]; - - checkInputs = [ mock coverage pytest nose pylint pyflakes pycodestyle ]; - - # ignore tests which try to write files - checkPhase = '' - pytest -k 'not added_file_pylint_console and not file_does_not_exist' - ''; - - meta = with lib; { - description = "Automatically find diff lines that need test coverage"; - homepage = "https://github.com/Bachmann1234/diff-cover"; - license = licenses.asl20; - maintainers = with maintainers; [ dzabraev ]; - }; -} diff --git a/pkgs/development/python-modules/discogs-client/default.nix b/pkgs/development/python-modules/discogs-client/default.nix new file mode 100644 index 00000000000..e47922f9577 --- /dev/null +++ b/pkgs/development/python-modules/discogs-client/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, requests +, oauthlib +, python-dateutil +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "discogs-client"; + version = "2.3.12"; + + + src = fetchFromGitHub { + owner = "joalla"; + repo = "discogs_client"; + rev = "v${version}"; + sha256 = "0y553x8rkgmqqg980n62pwdxbp75xalkhlb6k5g0cms42ggy5fsc"; + }; + + propagatedBuildInputs = [ + requests + oauthlib + python-dateutil + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "discogs_client" ]; + + meta = with lib; { + description = "Unofficial Python API client for Discogs"; + homepage = "https://github.com/joalla/discogs_client"; + license = licenses.bsd2; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/discogs_client/default.nix b/pkgs/development/python-modules/discogs_client/default.nix deleted file mode 100644 index e522ac4b6c9..00000000000 --- a/pkgs/development/python-modules/discogs_client/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, requests, oauthlib }: - -buildPythonPackage rec { - pname = "discogs-client"; - version = "2.3.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "cc979fcbb5283f74d388c7111c8ed6bef920b01614a014d6b1c5d6fbb554bfc3"; - }; - - propagatedBuildInputs = [ requests oauthlib ]; - - meta = with lib; { - description = "Official Python API client for Discogs"; - license = licenses.bsd2; - homepage = "https://github.com/discogs/discogs_client"; - }; -} diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 605e905d4ab..ce0cf13e9a9 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -6,7 +6,6 @@ , dask , msgpack , psutil -, six , sortedcontainers , tblib , toolz @@ -20,27 +19,39 @@ buildPythonPackage rec { pname = "distributed"; - version = "2021.6.1"; + version = "2021.6.2"; disabled = pythonOlder "3.6"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "sha256-Z79h/WAio5diX2myChx8HPAWe2RB4Ajw7Ybch4XUYFc="; + sha256 = "sha256-19ESqGqwSdzvo7If0brqQhKiwD0iwkvVWtONIaf10Ug="; }; propagatedBuildInputs = [ - click cloudpickle dask msgpack psutil six - sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh + bokeh + click + cloudpickle + dask + mpi4py + msgpack + psutil + pyyaml + sortedcontainers + tblib + toolz + tornado + zict ]; # when tested random tests would fail and not repeatably doCheck = false; + pythonImportsCheck = [ "distributed" ]; meta = with lib; { - description = "Distributed computation in Python."; - homepage = "https://distributed.readthedocs.io/en/latest/"; + description = "Distributed computation in Python"; + homepage = "https://distributed.readthedocs.io/"; license = licenses.bsd3; platforms = platforms.x86; # fails on aarch64 maintainers = with maintainers; [ teh costrouc ]; diff --git a/pkgs/development/python-modules/django-haystack/default.nix b/pkgs/development/python-modules/django-haystack/default.nix index 2c678e672a3..14e66a159c1 100644 --- a/pkgs/development/python-modules/django-haystack/default.nix +++ b/pkgs/development/python-modules/django-haystack/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, setuptools, setuptools-scm, django, dateutil, whoosh, pysolr +, setuptools, setuptools-scm, django, python-dateutil, whoosh, pysolr , coverage, mock, nose, geopy, requests }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "d490f920afa85471dd1fa5000bc8eff4b704daacbe09aee1a64e75cbc426f3be"; }; - checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ]; + checkInputs = [ pysolr whoosh python-dateutil geopy coverage nose mock coverage requests ]; propagatedBuildInputs = [ django setuptools ]; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index ae6187e207e..7ee41a962c7 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.2.4"; + version = "3.2.5"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "15pjwyvrx4n8gi8n51b14wp54bg4jqapr25p52597zn6ikdxijb6"; + sha256 = "1kam3301jl53vm0mhflwwsqy5d7kb5dksmjanlaj7v7xakm5z81x"; }; patches = lib.optional withGdal diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index b1d4eaec5c9..3af74be85b2 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -7,7 +7,7 @@ , django , pygments , simplejson -, dateutil +, python-dateutil , requests , setuptools-scm , sqlparse @@ -56,7 +56,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ mock ]; propagatedBuildInputs = [ - django pygments simplejson dateutil requests + django pygments simplejson python-dateutil requests sqlparse jinja2 autopep8 pytz pillow gprof2dot ]; diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index 613d2444d73..1bc5d380b08 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -7,16 +7,18 @@ , astropy , pytestCheckHook , pytest-doctestplus +, pythonOlder }: buildPythonPackage rec { pname = "drms"; - version = "0.6.0"; + version = "0.6.2"; format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "74efb903f42647ea536de0c5aea4f9a81efe027c95055ec4e72ef62479a04c89"; + sha256 = "sha256-Id8rPK8qq71gHn5DKnEi7Lp081GFbcFtGU+v89Vlt9o="; }; propagatedBuildInputs = [ @@ -31,10 +33,12 @@ buildPythonPackage rec { pytest-doctestplus ]; + pythonImportsCheck = [ "drms" ]; + meta = with lib; { description = "Access HMI, AIA and MDI data with Python"; homepage = "https://github.com/sunpy/drms"; - license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + license = licenses.bsd2; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 4a4dd279a52..fd360bfbd12 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -5,7 +5,7 @@ , pandas , pybind11 , setuptools-scm -, pytestrunner +, pytest-runner , pytestCheckHook }: @@ -28,18 +28,24 @@ buildPythonPackage rec { nativeBuildInputs = [ pybind11 setuptools-scm - pytestrunner + pytest-runner ]; - propagatedBuildInputs = [ numpy pandas ]; + propagatedBuildInputs = [ + numpy + pandas + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "duckdb" ]; meta = with lib; { - description = "DuckDB is an embeddable SQL OLAP Database Management System"; - homepage = "https://pypi.python.org/pypi/duckdb"; + description = "Python binding for DuckDB"; + homepage = "https://duckdb.org/"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 4329db98c2b..6449a3da767 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -6,29 +6,33 @@ buildPythonPackage rec { pname = "editorconfig"; - version = "0.12.2"; + version = "0.12.3"; # fetchgit used to ensure test submodule is available src = fetchgit { url = "https://github.com/editorconfig/editorconfig-core-py"; - rev = "596da5e06ebee05bdbdc6224203c79c4d3c6486a"; # Not tagged - sha256 = "05cbp971b0zix7kfxkk7ndxb4ax1l21frwc00d4g78mk4sdz6dig"; + rev = "1a8fb62b9941fded9e4fb83a3d0599427f5484cb"; # Not tagged + sha256 = "0vx8rl7kii72965jsi01mdsz9rfi1q9bwy13x47iaqm6rmcwc1rb"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; dontUseCmakeConfigure = true; checkPhase = '' cmake . - # utf_8_char fails with python3 + # utf_8_char fails with Python 3 ctest -E "utf_8_char" . ''; + pythonImportsCheck = [ "editorconfig" ]; + meta = with lib; { - homepage = "https://editorconfig.org"; description = "EditorConfig File Locator and Interpreter for Python"; + homepage = "https://editorconfig.org"; license = licenses.psfl; + maintainers = with maintainers; [ ]; }; - } diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/pkgs/development/python-modules/emailthreads/default.nix index 36553daff55..c57e58368ff 100644 --- a/pkgs/development/python-modules/emailthreads/default.nix +++ b/pkgs/development/python-modules/emailthreads/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "emailthreads"; - version = "0.1.0"; + version = "0.1.3"; disabled = !isPy3k; # pypi is missing files for tests @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "emersion"; repo = "python-emailthreads"; rev = "v${version}"; - sha256 = "17pfal8kbxhs025apkijqbkppw2lljca8x1cwcx49jv60h05c3cn"; + sha256 = "sha256-7BhYS1DQCW9QpG31asPCq5qPyJy+WW2onZpvEHhwQCs="; }; PKGVER = version; diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix index a4f2bece349..72cb9a64db0 100644 --- a/pkgs/development/python-modules/emcee/default.nix +++ b/pkgs/development/python-modules/emcee/default.nix @@ -1,20 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi -, numpy }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, pytestCheckHook +, setuptools-scm +}: buildPythonPackage rec { pname = "emcee"; - version = "3.0.2"; + version = "3.1.0"; - src = fetchPypi { - inherit pname version; - sha256 = "035a44d7594fdd03efd10a522558cdfaa080e046ad75594d0bf2aec80ec35388"; + src = fetchFromGitHub { + owner = "dfm"; + repo = pname; + rev = "v${version}"; + sha256 = "1x9y4zwlv6hl7jms2knpa2qrh89ywsl847yb7d93n94gyx2s16p0"; }; - propagatedBuildInputs = [ numpy ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "emcee" ]; meta = with lib; { description = "Kick ass affine-invariant ensemble MCMC sampling"; homepage = "https://emcee.readthedocs.io/"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index ce2beb23511..67c9c7a1abd 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -1,21 +1,33 @@ -{ lib, buildPythonPackage, fetchPypi, nose }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: buildPythonPackage rec { pname = "emoji"; - version = "1.2.0"; + version = "1.4.0"; - src = fetchPypi { - inherit pname version; - sha256 = "18siknldyqvxvjf0nv18m0a1c26ahkg7vmhkij1qayanb0h46vs9"; + src = fetchFromGitHub { + owner = "carpedm20"; + repo = pname; + rev = "v.${version}"; + sha256 = "0xksxdld20sh3c2s6pry1fm2br9xq8ypdq5pf971fpg5pk2f4iy9"; }; - checkInputs = [ nose ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = "nosetests"; + disabledTests = [ + "test_emojize_name_only" + ]; + + pythonImportsCheck = [ "emoji" ]; meta = with lib; { description = "Emoji for Python"; - homepage = "https://pypi.python.org/pypi/emoji/"; + homepage = "https://github.com/carpedm20/emoji/"; license = licenses.bsd3; maintainers = with maintainers; [ joachifm ]; }; diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index 8896c5c706a..8257af2e45f 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "enaml"; - version = "0.11.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "nucleic"; repo = pname; rev = version; - sha256 = "1in5qa5j96qs3gsv8yaxs1l6dbm69xhzvc0pbzg0dd9kpqxfdy1j"; + sha256 = "sha256-8ZahvFDYW7xUTSTZP1UXnQBCg9RVUywoO7EbqtTQPJI="; }; # qt bindings cannot be found during tests diff --git a/pkgs/development/python-modules/fabulous/default.nix b/pkgs/development/python-modules/fabulous/default.nix index 6079f22020a..b357eb0c01b 100644 --- a/pkgs/development/python-modules/fabulous/default.nix +++ b/pkgs/development/python-modules/fabulous/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "fabulous"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "jart"; repo = pname; rev = version; - sha256 = "0yxdaz6yayp1a57kdb2i8q7kwwdlwy4a3d0lr012h2ji9m89c8q7"; + sha256 = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4="; }; patches = [ diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/pkgs/development/python-modules/fake_factory/default.nix index 2e561a163ab..002df15177b 100644 --- a/pkgs/development/python-modules/fake_factory/default.nix +++ b/pkgs/development/python-modules/fake_factory/default.nix @@ -3,7 +3,7 @@ , fetchPypi , python , six -, dateutil +, python-dateutil , ipaddress , mock }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "f5bd18deb22ad8cb4402513c025877bc6b50de58902d686b6b21ba8981dce260"; }; - propagatedBuildInputs = [ six dateutil ipaddress mock ]; + propagatedBuildInputs = [ six python-dateutil ipaddress mock ]; # fake-factory is depreciated and single test will always fail doCheck = false; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 12f30b20a42..196c7e47b39 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil , text-unidecode , freezegun , pytestCheckHook @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil text-unidecode ]; diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index c036f5cacb7..fe46405eb3f 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -1,9 +1,16 @@ -{ lib, buildPythonPackage, python, fetchPypi}: +{ lib +, pythonOlder +, buildPythonPackage +, fetchPypi +, python +}: buildPythonPackage rec { pname = "fastimport"; version = "0.9.13"; + disabled = pythonOlder "3.5"; + src = fetchPypi { inherit pname version; sha256 = "486135a39edb85808fdbbe2c8009197978800a4544fca56cc2074df32e1304f3"; @@ -13,8 +20,10 @@ buildPythonPackage rec { ${python.interpreter} -m unittest discover ''; + pythonImportsCheck = [ "fastimport" ]; + meta = with lib; { - homepage = "https://launchpad.net/python-fastimport"; + homepage = "https://github.com/jelmer/python-fastimport"; description = "VCS fastimport/fastexport parser"; maintainers = with maintainers; [ koral ]; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index 59ca95a0338..9ca3627e74c 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dateutil, lxml }: +{ lib, buildPythonPackage, fetchPypi, python-dateutil, lxml }: buildPythonPackage rec { pname = "feedgen"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "0jl0b87l7v6c0f1nx6k81skjhdj5i11kmchdjls00mynpvdip0cf"; }; - propagatedBuildInputs = [ dateutil lxml ]; + propagatedBuildInputs = [ python-dateutil lxml ]; # No tests in archive doCheck = false; diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix index 46c6ac78a6c..b41ac0a4983 100644 --- a/pkgs/development/python-modules/fitbit/default.nix +++ b/pkgs/development/python-modules/fitbit/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , coverage -, dateutil +, python-dateutil , freezegun , mock , requests-mock @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "0.3.1"; checkInputs = [ coverage freezegun mock requests-mock sphinx ]; - propagatedBuildInputs = [ dateutil requests_oauthlib ]; + propagatedBuildInputs = [ python-dateutil requests_oauthlib ]; # The source package on PyPi is missing files required for unit testing. # https://github.com/orcasgit/python-fitbit/issues/148 diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 5d8359885bd..fff330946d1 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -11,6 +11,10 @@ buildPythonPackage rec { sha256 = "28352387efbbe772cfb307570019f81957a13ff718d994a9125fa705efb73680"; }; + postPatch = '' + sed -i -e 's/use_scm_version=.*/version="${version}",/' setup.py + ''; + propagatedBuildInputs = [ flask brotli ]; meta = with lib; { diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index d58ae431039..7057bb58750 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dateutil, flask, pyjwt, werkzeug, pytest }: +{ lib, buildPythonPackage, fetchPypi, python-dateutil, flask, pyjwt, werkzeug, pytest }: buildPythonPackage rec { pname = "Flask-JWT-Extended"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "76461f2dbdf502261c69ddecd858eaf4164fbcfbf05aa456f3927fc2ab0315de"; }; - propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ]; + propagatedBuildInputs = [ python-dateutil flask pyjwt werkzeug ]; checkInputs = [ pytest ]; checkPhase = '' diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index e1de7bf0d3b..4d0d89d0f14 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -20,16 +20,23 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "0.3.0"; + version = "0.4.0"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "python-restx"; repo = pname; rev = version; - sha256 = "0aj13nd3z71gb8c2kqiaz3f9k7jr0srlvrsx8hpz4nkpki8jiz2s"; + sha256 = "sha256-jM0QJ/klbWh3qho6ZQOH2n1qaguK9C98QIuSfqpI8xA="; }; + postPatch = '' + # https://github.com/python-restx/flask-restx/pull/341 + substituteInPlace requirements/install.pip \ + --replace "Flask>=0.8, <2.0.0" "Flask>=0.8, !=2.0.0" \ + --replace "werkzeug <2.0.0" "werkzeug !=2.0.0" + ''; + propagatedBuildInputs = [ aniso8601 jsonschema flask werkzeug pytz six ] ++ lib.optionals isPy27 [ enum34 ]; @@ -42,6 +49,8 @@ buildPythonPackage rec { "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" ]; + pythonImportCheck = [ "flask_restx" ]; + meta = with lib; { homepage = "https://flask-restx.readthedocs.io/en/${version}/"; description = "Fully featured framework for fast, easy and documented API development with Flask"; diff --git a/pkgs/development/python-modules/freezegun/0.3.nix b/pkgs/development/python-modules/freezegun/0.3.nix index a83a432d89d..c4444805009 100644 --- a/pkgs/development/python-modules/freezegun/0.3.nix +++ b/pkgs/development/python-modules/freezegun/0.3.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, dateutil +, python-dateutil , six , mock , nose @@ -18,7 +18,7 @@ buildPythonPackage rec { sha256 = "e2062f2c7f95cc276a834c22f1a17179467176b624cc6f936e8bc3be5535ad1b"; }; - propagatedBuildInputs = [ dateutil six ]; + propagatedBuildInputs = [ python-dateutil six ]; checkInputs = [ mock nose pytest ]; meta = with lib; { diff --git a/pkgs/development/python-modules/freezegun/default.nix b/pkgs/development/python-modules/freezegun/default.nix index 00d03435de9..742506b6089 100644 --- a/pkgs/development/python-modules/freezegun/default.nix +++ b/pkgs/development/python-modules/freezegun/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , pythonOlder , fetchPypi -, dateutil +, python-dateutil , pytestCheckHook }: @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "177f9dd59861d871e27a484c3332f35a6e3f5d14626f2bf91be37891f18927f3"; }; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; checkInputs = [ pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/pkgs/development/python-modules/gdrivefs/default.nix index 836fdee4beb..41b6a6a87f1 100644 --- a/pkgs/development/python-modules/gdrivefs/default.nix +++ b/pkgs/development/python-modules/gdrivefs/default.nix @@ -6,7 +6,7 @@ , greenlet , httplib2 , six -, dateutil +, python-dateutil , fusepy , google-api-python-client }: @@ -22,7 +22,7 @@ buildPythonPackage rec { }; buildInputs = [ gipc greenlet httplib2 six ]; - propagatedBuildInputs = [ dateutil fusepy google-api-python-client ]; + propagatedBuildInputs = [ python-dateutil fusepy google-api-python-client ]; patchPhase = '' substituteInPlace gdrivefs/resources/requirements.txt \ diff --git a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix index 3fada45d0c8..e87c766c0ca 100644 --- a/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix +++ b/pkgs/development/python-modules/georss-ign-sismologia-client/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "georss-ign-sismologia-client"; - version = "0.3"; + version = "0.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "exxamalte"; repo = "python-georss-ign-sismologia-client"; rev = "v${version}"; - sha256 = "sha256-7Jj6uWb4HyPAh3/XtVTy0N23bk33mlIiqlt9z/PW+4Y="; + sha256 = "sha256-g7lZC5ZiJV8dNZJceLROqyBRZSuqaivGFhaQrKe4B7g="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ghp-import/default.nix b/pkgs/development/python-modules/ghp-import/default.nix index 37a35febdf0..0d5506009a7 100644 --- a/pkgs/development/python-modules/ghp-import/default.nix +++ b/pkgs/development/python-modules/ghp-import/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, dateutil +, python-dateutil }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-wiqc4Qw3dT4miNFk12WnANrkuNefptsKLDEyuniBiU8="; }; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; # Does not include any unit tests doCheck = false; diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index 8a1eea40c68..68e277d0b1a 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -9,7 +9,7 @@ , mock , requests , uritemplate -, dateutil +, python-dateutil , jwcrypto , pyopenssl , ndg-httpsclient @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ betamax pytest betamax-matchers ] ++ lib.optional (pythonOlder "3") unittest2 ++ lib.optional (pythonOlder "3.3") mock; - propagatedBuildInputs = [ requests uritemplate dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ]; + propagatedBuildInputs = [ requests uritemplate python-dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ]; postPatch = '' sed -i -e 's/unittest2 ==0.5.1/unittest2>=0.5.1/' setup.py diff --git a/pkgs/development/python-modules/google-apputils/default.nix b/pkgs/development/python-modules/google-apputils/default.nix index 321837f56ae..225adf348d1 100644 --- a/pkgs/development/python-modules/google-apputils/default.nix +++ b/pkgs/development/python-modules/google-apputils/default.nix @@ -4,7 +4,7 @@ , isPy3k , pytz , gflags -, dateutil +, python-dateutil , mox , python }: @@ -23,7 +23,7 @@ buildPythonPackage rec { sed -i '/ez_setup/d' setup.py ''; - propagatedBuildInputs = [ pytz gflags dateutil mox ]; + propagatedBuildInputs = [ pytz gflags python-dateutil mox ]; checkPhase = '' ${python.executable} setup.py google_test diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 0450dfd07e5..adb131868c7 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestrunner -, dateutil +, python-dateutil , babelfish , rebulk }: @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ pytestrunner ]; propagatedBuildInputs = [ - dateutil babelfish rebulk + python-dateutil babelfish rebulk ]; meta = { diff --git a/pkgs/development/python-modules/hijri-converter/default.nix b/pkgs/development/python-modules/hijri-converter/default.nix index d7ae17ed61a..e9ce708b2cb 100644 --- a/pkgs/development/python-modules/hijri-converter/default.nix +++ b/pkgs/development/python-modules/hijri-converter/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hijri-converter"; - version = "2.1.2"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "43b5ac566e7a7deeab364a2397e94405a65fd24ea786073eb3d4c740ebda7b9b"; + sha256 = "1cq67v0fjk7cd8kbppg2kl31a5i6jm8qrkcdqxx6vxwmx65l68ks"; }; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index fe362fa86da..e09b957425a 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , convertdate -, dateutil +, python-dateutil , fetchPypi , hijri-converter , korean-lunar-calendar @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ convertdate - dateutil + python-dateutil hijri-converter korean-lunar-calendar six diff --git a/pkgs/development/python-modules/hypchat/default.nix b/pkgs/development/python-modules/hypchat/default.nix index 8337fd2230b..1f69dfe2106 100644 --- a/pkgs/development/python-modules/hypchat/default.nix +++ b/pkgs/development/python-modules/hypchat/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, fetchPypi -, requests, six, dateutil }: +, requests, six, python-dateutil }: buildPythonPackage rec { pname = "hypchat"; @@ -10,5 +10,5 @@ buildPythonPackage rec { sha256 = "1sd8f3gihagaqd848dqy6xw457fa4f9bla1bfyni7fq3h76sjdzg"; }; - propagatedBuildInputs = [ requests six dateutil ]; + propagatedBuildInputs = [ requests six python-dateutil ]; } diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 973b792f5bc..a63617ba2a2 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -38,9 +38,17 @@ buildPythonPackage rec { # Various tests try to access credential files which are not included with the source distribution disabledTests = [ - "test_iam" "test_cwd" "test_configure_service" "test_get_authenticator" - "test_read_external_sources_2" "test_files_duplicate_parts" "test_files_list" - "test_files_dict" "test_retry_config_external" "test_gzip_compression_external" + "test_configure_service" + "test_cp4d_authenticator" + "test_cwd" + "test_files_dict" + "test_files_duplicate_parts" + "test_files_list" + "test_get_authenticator" + "test_gzip_compression_external" + "test_iam" + "test_read_external_sources_2" + "test_retry_config_external" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 7684f1a689c..3698d8b2e36 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "v${version}"; - sha256 = "1abink5mv9nw506nwm9hlvnr1lq6dkxxj2j12iwphcyd7xs63n2s"; + sha256 = "sha256-0F4BZf0D0dqGm0OkJaSgmH5RxEA8KCzOlbnhIQVsgzQ="; }; checkInputs = [ @@ -40,8 +40,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace websocket-client==0.48.0 websocket-client>=0.48.0 \ - --replace ibm_cloud_sdk_core==3.3.6 ibm_cloud_sdk_core>=3.3.6 + --replace websocket-client==1.1.0 websocket-client>=1.1.0 ''; meta = with lib; { diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index 8e75a945d10..fdf490e7cb2 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , setuptools -, dateutil +, python-dateutil , pytz }: @@ -16,7 +16,7 @@ buildPythonPackage rec { }; buildInputs = [ setuptools ]; - propagatedBuildInputs = [ dateutil pytz ]; + propagatedBuildInputs = [ python-dateutil pytz ]; meta = with lib; { description = "A parser/generator of iCalendar files"; diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 6b3a46ea391..3b967270183 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, dateutil +, python-dateutil , fetchFromGitHub , fetchpatch , mock @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests - dateutil + python-dateutil pytz six msgpack diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 2c5692bf26a..cc5957d2973 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , nose -, dateutil +, python-dateutil , ipython_genutils , decorator , pyzmq @@ -25,7 +25,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; - propagatedBuildInputs = [ dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado + propagatedBuildInputs = [ python-dateutil ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado ] ++ lib.optionals (!isPy3k) [ futures ]; # Requires access to cluster diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index dd3c027bca2..348d83e1105 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub , six , pytest -, dateutil +, python-dateutil }: buildPythonPackage rec { @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ dateutil pytest ]; + checkInputs = [ python-dateutil pytest ]; checkPhase = '' rm tox.ini pytest -k 'not dumps and not time' --ignore=test/test_propclass.py diff --git a/pkgs/development/python-modules/jupyter_client/5.nix b/pkgs/development/python-modules/jupyter_client/5.nix index 201fbec02ca..e4e77cf4751 100644 --- a/pkgs/development/python-modules/jupyter_client/5.nix +++ b/pkgs/development/python-modules/jupyter_client/5.nix @@ -4,7 +4,7 @@ , traitlets , jupyter_core , pyzmq -, dateutil +, python-dateutil , isPyPy , py , tornado @@ -23,7 +23,7 @@ buildPythonPackage rec { traitlets jupyter_core pyzmq - dateutil + python-dateutil tornado ] ++ lib.optional isPyPy py; diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 5f534557a9a..fbc37c3f581 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -4,7 +4,7 @@ , traitlets , jupyter_core , pyzmq -, dateutil +, python-dateutil , isPyPy , py , tornado @@ -23,7 +23,7 @@ buildPythonPackage rec { traitlets jupyter_core pyzmq - dateutil + python-dateutil tornado ] ++ lib.optional isPyPy py; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 108d11853f0..904cd7df0c2 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -7,7 +7,7 @@ , alembic , async_generator , certipy -, dateutil +, python-dateutil , entrypoints , jinja2 , jupyter-telemetry @@ -115,7 +115,7 @@ buildPythonPackage rec { alembic async_generator certipy - dateutil + python-dateutil entrypoints jinja2 jupyter-telemetry diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index 5f560be4e88..cd3b5ff62c2 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, dateutil }: +{ lib, fetchurl, buildPythonPackage, isPy3k, pycurl, six, rpm, python-dateutil }: buildPythonPackage rec { pname = "koji"; @@ -10,7 +10,7 @@ buildPythonPackage rec { sha256 = "0a3kn3qvspvx15imgzzzjsbvw6bqmbk29apbliqwifa9cj7pvb40"; }; - propagatedBuildInputs = [ pycurl six rpm dateutil ]; + propagatedBuildInputs = [ pycurl six rpm python-dateutil ]; # Judging from SyntaxError disabled = isPy3k; diff --git a/pkgs/development/python-modules/lammps-cython/default.nix b/pkgs/development/python-modules/lammps-cython/default.nix deleted file mode 100644 index cf6bdc38ffa..00000000000 --- a/pkgs/development/python-modules/lammps-cython/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib -, fetchurl -, buildPythonPackage -, lammps-mpi -, mpi -, mpi4py -, numpy -, cython -, pymatgen -, ase -, pytestrunner -, isPy3k -}: - -buildPythonPackage rec { - pname = "lammps-cython"; - version = "0.5.7"; - disabled = (!isPy3k); - - src = fetchurl { - url = "https://gitlab.com/costrouc/${pname}/-/archive/v${version}/${pname}-v${version}.tar.gz"; - sha256 = "1wj9scmjdl00af13b5ihfccrjpikrdgkzd88ialam1nkxvxi42bl"; - }; - - buildInputs = [ cython pytestrunner ]; - propagatedBuildInputs = [ mpi4py pymatgen ase numpy ]; - - preBuild = '' - echo "Creating lammps.cfg file..." - cat << EOF > lammps.cfg - [lammps] - lammps_include_dir = ${lammps-mpi}/include - lammps_library_dir = ${lammps-mpi}/lib - lammps_library = lammps_mpi - - [mpi] - mpi_include_dir = ${mpi}/include - mpi_library_dir = ${mpi}/lib - mpi_library = mpi - EOF - ''; - - pythonImportsCheck = [ "lammps" ]; - - meta = { - description = "Pythonic Wrapper to LAMMPS using cython"; - homepage = "https://gitlab.com/costrouc/lammps-cython"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ costrouc ]; - # fails import check - broken = true; - }; -} diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index a48d70c544c..7b0b09dcb14 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.9.0"; + version = "4.10.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "0wq72nf680bwxijjajb4piw563rnvflshmw96kqln4lsny7ydjj2"; + sha256 = "1ahka8s8fjwymyr7pca7i7h51ikfr35zy4nkzfcjn946x7p0dprf"; }; disabled = pythonOlder "3.4.0"; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 7ecd09160ff..e82400b565f 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.9.0"; + version = "4.10.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "0434cb19v9phc9xicbmgpbig18ivplcpqhnsjgca4p8n8c715k9h"; + sha256 = "1zyzsrdm5aazv12h7ga35amfryrbxdsmx3abvh27hixyh9f92fdp"; }; postPatch = '' diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index cc0ba39e64e..0d8142645e1 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libusb1"; - version = "1.9.2"; + version = "1.9.3"; src = fetchPypi { inherit pname version; - sha256 = "17hqck808m59jv6m2g4hasnay44pycy3y0im01fq9jpr3ymcdbi7"; + sha256 = "60e6ce37be064f6e51d02b25da44230ecc9c0b1fdb6f14568c71457d963c1749"; }; postPatch = '' @@ -20,9 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; checkPhase = '' - # USBPollerThread is unreliable. Let's not test it. - # See: https://github.com/vpelletier/python-libusb1/issues/16 - py.test -k 'not testUSBPollerThreadExit' usb1/testUSB1.py + py.test usb1/testUSB1.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/mailman-rss/default.nix b/pkgs/development/python-modules/mailman-rss/default.nix index e2043b0d6d4..f71b62c67fc 100644 --- a/pkgs/development/python-modules/mailman-rss/default.nix +++ b/pkgs/development/python-modules/mailman-rss/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1brrik70jyagxa9l0cfmlxvqpilwj1q655bphxnvjxyganxf4c00"; }; - propagatedBuildInputs = with python3Packages; [ dateutil future requests beautifulsoup4 ] + propagatedBuildInputs = with python3Packages; [ python-dateutil future requests beautifulsoup4 ] ++ lib.optional withTwitter python3Packages.twitter ; diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index a6ee1a3bade..96d33b681eb 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, writeText, python, buildPythonPackage, pycairo, backports_functools_lru_cache -, which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver +, which, cycler, python-dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection, functools32, subprocess32 , fetchpatch , enableGhostscript ? false, ghostscript, gtk3 @@ -38,7 +38,7 @@ buildPythonPackage rec { ++ lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver + [ cycler python-dateutil nose numpy pyparsing tornado freetype kiwisolver libpng mock pytz ] ++ lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 75f75e981ce..beddaf6810d 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchPypi, writeText, buildPythonPackage, isPy3k, pycairo -, which, cycler, dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver +, which, cycler, python-dateutil, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, qhull, libpng, pkg-config, mock, pytz, pygobject3, gobject-introspection , certifi, pillow , enableGhostscript ? true, ghostscript, gtk3 @@ -36,7 +36,7 @@ buildPythonPackage rec { ++ lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil numpy pyparsing tornado freetype qhull + [ cycler python-dateutil numpy pyparsing tornado freetype qhull kiwisolver certifi libpng mock pytz pillow ] ++ lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ lib.optionals enableTk [ tcl tk tkinter libX11 ] diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index 895485cd72c..165885c0225 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "6.1.2"; + version = "6.2.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Dinnerbone"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RSxysVIP/niQh8WRSk6Z9TSz/W97PkPYIR0NXIZfAbQ="; + sha256 = "sha256-o5JVj4Tt5+VOjDC0TDlVuVbDUQPvZGX5Zeoz0vVxPJ8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mdformat/default.nix b/pkgs/development/python-modules/mdformat/default.nix index 159310035b8..780cafa599d 100644 --- a/pkgs/development/python-modules/mdformat/default.nix +++ b/pkgs/development/python-modules/mdformat/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "mdformat"; - version = "0.7.6"; + version = "0.7.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = pname; rev = version; - sha256 = "0mnbi3vp7zgllpcpf6vrjw9y6jas95shphn99ayr8b8wgxsaqkif"; + sha256 = "sha256-1qwluHxZnSuyNJENzeJzkuhIQN5njTOch2Wz45J0qRI="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/micloud/default.nix b/pkgs/development/python-modules/micloud/default.nix new file mode 100644 index 00000000000..3b3bf448449 --- /dev/null +++ b/pkgs/development/python-modules/micloud/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, click +, requests +, tzlocal +}: + +buildPythonPackage rec { + pname = "micloud"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "Squachen"; + repo = "micloud"; + rev = "v_${version}"; + sha256 = "0267zyr79nfb5f9rwdwq3ym258yrpxx1b71xiqmszyz5s83mcixm"; + }; + + propagatedBuildInputs = [ + click + requests + tzlocal + ]; + + # tests require credentials + doCheck = false; + + pythonImportsCheck = [ "micloud" ]; + + meta = with lib; { + description = "Xiaomi cloud connect library"; + homepage = "https://github.com/Squachen/micloud"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 3d72748a1e7..078c455a637 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -4,7 +4,7 @@ , isPy27 # python dependencies , click -, dateutil +, python-dateutil , etelemetry , filelock , funcsigs @@ -68,7 +68,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click - dateutil + python-dateutil etelemetry filelock funcsigs diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 41c6ffb7228..793e23d7113 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -5,7 +5,7 @@ , configparser , cryptography , pyopenssl -, dateutil +, python-dateutil , pytz }: @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - certifi configparser cryptography pyopenssl dateutil pytz + certifi configparser cryptography pyopenssl python-dateutil pytz ]; # Tests fail: https://github.com/oracle/oci-python-sdk/issues/164 diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 3ccd3d916b6..ea80fade141 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest, pyyaml } : +{ lib, buildPythonPackage, fetchPypi, python-dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; version = "0.24.1"; @@ -9,7 +9,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ dateutil pyproj pytz requests pyyaml ]; + propagatedBuildInputs = [ python-dateutil pyproj pytz requests pyyaml ]; # 'tests' dir not included in pypy distribution archive. doCheck = false; diff --git a/pkgs/development/python-modules/pandas/2.nix b/pkgs/development/python-modules/pandas/2.nix index 8af4094b0cf..9b29a844269 100644 --- a/pkgs/development/python-modules/pandas/2.nix +++ b/pkgs/development/python-modules/pandas/2.nix @@ -8,7 +8,7 @@ , pytest , glibcLocales , cython -, dateutil +, python-dateutil , scipy , moto , numexpr @@ -41,7 +41,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython ]; buildInputs = lib.optional stdenv.isDarwin libcxx; propagatedBuildInputs = [ - dateutil + python-dateutil scipy numexpr pytz @@ -68,7 +68,7 @@ buildPythonPackage rec { disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ - # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat + # since python-dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case "test_fallback_plural" "test_ambiguous_flags" diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 2d502016821..b7e237a3e3b 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -7,7 +7,7 @@ , beautifulsoup4 , bottleneck , cython -, dateutil +, python-dateutil , html5lib , jinja2 , lxml @@ -47,7 +47,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ beautifulsoup4 bottleneck - dateutil + python-dateutil html5lib numexpr lxml diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 1ae27b5ecf8..5419407d610 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 , glibcLocales, git , mock, nose, markdown, lxml, typogrify -, jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator +, jinja2, pygments, docutils, pytz, unidecode, six, python-dateutil, feedgenerator , blinker, pillow, beautifulsoup4, markupsafe, pandoc }: buildPythonPackage rec { @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jinja2 pygments docutils pytz unidecode six dateutil feedgenerator + jinja2 pygments docutils pytz unidecode six python-dateutil feedgenerator blinker pillow beautifulsoup4 markupsafe lxml ]; diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 5688090b095..d432ca271dd 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -1,5 +1,5 @@ { lib, fetchPypi, buildPythonPackage, pythonOlder -, dateutil +, python-dateutil , importlib-metadata , poetry , poetry-core @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ dateutil pytzdata ] + propagatedBuildInputs = [ python-dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/pillow-simd/default.nix b/pkgs/development/python-modules/pillow-simd/default.nix index d7b2ff8d6b3..e2ea4c71388 100644 --- a/pkgs/development/python-modules/pillow-simd/default.nix +++ b/pkgs/development/python-modules/pillow-simd/default.nix @@ -6,15 +6,16 @@ import ../pillow/generic.nix (rec { pname = "Pillow-SIMD"; - version = "8.1.2"; - + # check for release version on https://pypi.org/project/Pillow-SIMD/#history + # does not match the latest pillow release version! + version = "7.0.0.post3"; disabled = !isPy3k; src = fetchFromGitHub { owner = "uploadcare"; repo = "pillow-simd"; - rev = version; - sha256 = "1z0c1qpx7l1bhj71ww7za7kl29j5wdraqr2pdhv4dp1q74kgrr0m"; + rev = "v${version}"; + sha256 = "1h832xp1bzf951hr4dmjmxqfsv28sx9lr2cq96qdz1c72k40zj1h"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix index acee0f09b84..9844b018518 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -3,7 +3,7 @@ , fetchPypi , lxml , networkx -, dateutil +, python-dateutil , rdflib , pydot }: @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lxml networkx - dateutil + python-dateutil rdflib ]; diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index e6ee7d4f983..e3422aff024 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -14,7 +14,7 @@ , psutil , pyelftools , pyserial -, dateutil +, python-dateutil , requests , rpyc , tox @@ -63,7 +63,7 @@ buildPythonPackage rec { psutil pyelftools pyserial - dateutil + python-dateutil requests rpyc tox diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index cf7fd53d165..cef64c084f2 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "1slr6l0gw0mf1zhp40bjf5bib45arw1cy4fqkg0gvdk1hx79828m"; + sha256 = "sha256-/ccmYNOYE+RkJiJbGkQgdYE8/X4xzyRT4dkMa/qSZEc="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index e8e0809c022..49dfbf03096 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, numpy, dateutil }: +{ lib, fetchPypi, buildPythonPackage, numpy, python-dateutil }: buildPythonPackage rec { pname = "pycollada"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1rp4wlvfywgk3v6l3hnhjx61x9yqawvvivpq4dig2jj71k3mpsyj"; }; - propagatedBuildInputs = [ numpy dateutil ]; + propagatedBuildInputs = [ numpy python-dateutil ]; # Some tests fail because they refer to test data files that don't exist # (upstream packaging issue) diff --git a/pkgs/development/python-modules/pyeight/default.nix b/pkgs/development/python-modules/pyeight/default.nix index b3a2de5ed40..a714bbfaba9 100644 --- a/pkgs/development/python-modules/pyeight/default.nix +++ b/pkgs/development/python-modules/pyeight/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyeight"; - version = "0.1.5"; + version = "0.1.7"; disabled = !isPy3k; src = fetchFromGitHub { owner = "mezz64"; repo = "pyEight"; rev = version; - sha256 = "1wzmjqs8zx611b71ip7a0phyas96vxpq8xpnhrirfi9l09kdjgsw"; + sha256 = "sha256-kTxd6nRsPvCjrXApjKcoghOISIMho5x9/kK7OvHjKQM="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyflick/default.nix b/pkgs/development/python-modules/pyflick/default.nix index b1f39353c14..b6a9c2cf96d 100644 --- a/pkgs/development/python-modules/pyflick/default.nix +++ b/pkgs/development/python-modules/pyflick/default.nix @@ -3,7 +3,7 @@ , pythonOlder , fetchPypi , aiohttp -, dateutil +, python-dateutil }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp - dateutil + python-dateutil ]; # no tests implemented diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index e54a9c6fa20..5d23949eba6 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildPythonPackage , lxml, pycryptodomex, construct -, argon2_cffi, dateutil, future +, argon2_cffi, python-dateutil, future , python }: @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ lxml pycryptodomex construct - argon2_cffi dateutil future + argon2_cffi python-dateutil future ]; checkPhase = '' diff --git a/pkgs/development/python-modules/pykwalify/default.nix b/pkgs/development/python-modules/pykwalify/default.nix index b65c0fd4670..cf42c98457c 100644 --- a/pkgs/development/python-modules/pykwalify/default.nix +++ b/pkgs/development/python-modules/pykwalify/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, dateutil +, python-dateutil , docopt , fetchPypi , pytestCheckHook @@ -19,7 +19,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - dateutil + python-dateutil docopt pyyaml ruamel-yaml diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix index d10e4930ac0..128c8cbd0de 100644 --- a/pkgs/development/python-modules/pyls-black/default.nix +++ b/pkgs/development/python-modules/pyls-black/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { homepage = "https://github.com/rupert/pyls-black"; description = "Black plugin for the Python Language Server"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix index 9dc614035e0..35b43969e52 100644 --- a/pkgs/development/python-modules/pyls-isort/default.nix +++ b/pkgs/development/python-modules/pyls-isort/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { homepage = "https://github.com/paradoxxxzero/pyls-isort"; description = "Isort plugin for python-language-server"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index eaf069c8ccb..f919ac21cb7 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -46,6 +46,6 @@ buildPythonPackage rec { homepage = "https://github.com/tomv564/pyls-mypy"; description = "Mypy plugin for the Python Language Server"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/pyls-spyder/default.nix b/pkgs/development/python-modules/pyls-spyder/default.nix index 4e0029783eb..61b0fa7449b 100644 --- a/pkgs/development/python-modules/pyls-spyder/default.nix +++ b/pkgs/development/python-modules/pyls-spyder/default.nix @@ -1,18 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, python-language-server }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, python-lsp-server +, pytestCheckHook +}: buildPythonPackage rec { pname = "pyls-spyder"; version = "0.4.0"; - src = fetchPypi { - inherit pname version; - sha256 = "45a321c83f64267d82907492c55199fccabda45bc872dd23bf1efd08edac1b0b"; + src = fetchFromGitHub { + owner = "spyder-ide"; + repo = pname; + rev = "v${version}"; + sha256 = "11ajbsia60d4c9s6m6rbvaqp1d69fcdbq6a98lkzkkzv2b9pdhkk"; }; - propagatedBuildInputs = [ python-language-server ]; + propagatedBuildInputs = [ + python-lsp-server + ]; + + checkInputs = [ + pytestCheckHook + ]; - # no tests - doCheck = false; pythonImportsCheck = [ "pyls_spyder" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index 9506b8bae95..0eb13c732d7 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, dateutil +, python-dateutil , pkgs }: @@ -17,7 +17,7 @@ buildPythonPackage rec { }; buildInputs = [ pkgs.coreutils ]; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; preInstall = lib.optionalString stdenv.isDarwin '' sed -i 's|^\([ ]*\)self.bin_path.*$|\1self.bin_path = "${pkgs.terminal-notifier}/bin/terminal-notifier"|' build/lib/pync/TerminalNotifier.py diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix index f3b5b9ba685..5d6a006634e 100644 --- a/pkgs/development/python-modules/pynest2d/default.nix +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -2,7 +2,7 @@ , pythonOlder, libnest2d, sip_4, clipper }: buildPythonPackage rec { - version = "4.8.0"; + version = "4.10.0"; pname = "pynest2d"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "pynest2d"; rev = version; - sha256 = "18dn92vgr4gvf9scfh93yg9bwrhdjvq62di08rpi7pqjrrvq2nvp"; + sha256 = "03aj0whxj9rs9nz3idld7w4vpmnr6vr40vpwmzcf5w2pi2n4z4lk"; }; propagatedBuildInputs = [ libnest2d sip_4 clipper ]; diff --git a/pkgs/development/python-modules/pypoint/default.nix b/pkgs/development/python-modules/pypoint/default.nix new file mode 100644 index 00000000000..be487199b38 --- /dev/null +++ b/pkgs/development/python-modules/pypoint/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, authlib +, httpx +}: + +buildPythonPackage rec { + pname = "pypoint"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "fredrike"; + repo = "pypoint"; + rev = "v${version}"; + sha256 = "13p68d2qxfj31lfjv94wzpigjfgjw03yjpl2h16zgxbka2k8zf3x"; + }; + + propagatedBuildInputs = [ + authlib + httpx + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "pypoint" ]; + + meta = with lib; { + description = "API for Minut Point"; + homepage = "https://github.com/fredrike/pypoint"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index 30fcfc52cba..5de5ad3a0db 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , substituteAll , xmlsec -, cryptography, defusedxml, pyopenssl, dateutil, pytz, requests, six +, cryptography, defusedxml, pyopenssl, python-dateutil, pytz, requests, six , mock, pyasn1, pymongo, pytest, responses, xmlschema, importlib-resources }: @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography - dateutil + python-dateutil defusedxml importlib-resources pyopenssl diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 34fbcff42f1..9d06569dfdc 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.8.0"; + version = "2.9.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f3364a8d1e813a0b3e68485db1e1881d8653b0e03b9a41f2c59544fce4930101"; + sha256 = "sha256-LFGxTN2aaAKDFaKw6IUl03YJZziPmfqlfeiQK0VGW+Y="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index daab437c979..3ed9b75ef91 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -84,6 +84,6 @@ buildPythonPackage rec { homepage = "https://github.com/palantir/python-language-server"; description = "An implementation of the Language Server Protocol for Python"; license = licenses.mit; - maintainers = [ maintainers.mic92 ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix new file mode 100644 index 00000000000..6938bc282f8 --- /dev/null +++ b/pkgs/development/python-modules/python-lsp-jsonrpc/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, ujson +}: + +buildPythonPackage rec { + pname = "python-lsp-jsonrpc"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "python-lsp"; + repo = pname; + rev = "v${version}"; + sha256 = "0h4bs8s4axcm0p02v59amz9sq3nr4zhzdgwq7iaw6awl27v1hd0i"; + }; + + propagatedBuildInputs = [ + ujson + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ + --replace "--cov pylsp_jsonrpc --cov test" "" + ''; + + pythonImportsCheck = [ "pylsp_jsonrpc" ]; + + meta = with lib; { + description = "Python server implementation of the JSON RPC 2.0 protocol."; + homepage = "https://github.com/python-lsp/python-lsp-jsonrpc"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix new file mode 100644 index 00000000000..6a2c396ecf8 --- /dev/null +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -0,0 +1,81 @@ +{ lib +, autopep8 +, buildPythonPackage +, fetchFromGitHub +, flake8 +, flaky +, jedi +, matplotlib +, mccabe +, numpy +, pandas +, pluggy +, pycodestyle +, pydocstyle +, pyflakes +, pylint +, pyqt5 +, pytestCheckHook +, python-lsp-jsonrpc +, pythonOlder +, rope +, ujson +, yapf +}: + +buildPythonPackage rec { + pname = "python-lsp-server"; + version = "1.1.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "python-lsp"; + repo = pname; + rev = "v${version}"; + sha256 = "1akdpfnylqg2mcwpkqmdwcg6j6hab23slp5rfjfidhphig2f2yjv"; + }; + + propagatedBuildInputs = [ + autopep8 + flake8 + jedi + mccabe + pluggy + pycodestyle + pydocstyle + pyflakes + pylint + python-lsp-jsonrpc + rope + ujson + yapf + ]; + + checkInputs = [ + flaky + matplotlib + numpy + pandas + pyqt5 + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ + --replace "--cov pylsp --cov test" "" + ''; + + preCheck = '' + export HOME=$(mktemp -d); + ''; + + pythonImportsCheck = [ "pylsp" ]; + + meta = with lib; { + description = "Python implementation of the Language Server Protocol"; + homepage = "https://github.com/python-lsp/python-lsp-server"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 4d223c54838..6ddc4543d3d 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.6"; + version = "13.7"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "37cfe8faba16fb68a8b5ab41a10e787c385f6296200c84256cc54d7c16334643"; + sha256 = "sha256-JN91RZ4zW5a6/6aZFnn4RL1CaXivWmnKQZoKxDpAYCw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytile/default.nix b/pkgs/development/python-modules/pytile/default.nix index 0d269522e1a..cf445fd9681 100644 --- a/pkgs/development/python-modules/pytile/default.nix +++ b/pkgs/development/python-modules/pytile/default.nix @@ -8,23 +8,25 @@ , pytest-aiohttp , pytest-asyncio , pytestCheckHook -, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "pytile"; - version = "5.2.1"; + version = "5.2.2"; + format = "pyproject"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "0d63xga4gjlfl9fzv3i4j605rrx2qgbzam6cl609ny96s8q8h1px"; + sha256 = "sha256-oVtTR5zucYvnaPO0i4sEBBU4nafq7GUfx3kPdSvptDo="; }; - format = "pyproject"; - - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ aiohttp @@ -38,8 +40,11 @@ buildPythonPackage rec { pytestCheckHook ]; - # Ignore the examples as they are prefixed with test_ - pytestFlagsArray = [ "--ignore examples/" ]; + disabledTestPaths = [ + # Ignore the examples as they are prefixed with test_ + "examples/" + ]; + pythonImportsCheck = [ "pytile" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index 19edd7057eb..d2fc8470d48 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -4,7 +4,7 @@ , pythonOlder , pybind11 , pytestCheckHook -, dateutil +, python-dateutil , doxygen , python , pelican @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - dateutil + python-dateutil doxygen python pelican diff --git a/pkgs/development/python-modules/qcelemental/default.nix b/pkgs/development/python-modules/qcelemental/default.nix index 7d1dcdeb1c7..3a3e9bced05 100644 --- a/pkgs/development/python-modules/qcelemental/default.nix +++ b/pkgs/development/python-modules/qcelemental/default.nix @@ -1,34 +1,19 @@ -{ buildPythonPackage, lib, fetchPypi, fetchpatch, numpy +{ buildPythonPackage, lib, fetchPypi, numpy , pydantic, pint, networkx, pytestrunner, pytestcov, pytest } : buildPythonPackage rec { pname = "qcelemental"; - version = "0.20.0"; + version = "0.21.0"; checkInputs = [ pytestrunner pytestcov pytest ]; propagatedBuildInputs = [ numpy pydantic pint networkx ]; src = fetchPypi { inherit pname version; - sha256 = "141vw36fmacj897q26kq2bl9l0d23lyqjfry6q46aa9087dcs7ni"; + sha256 = "1b3c78fxbpnddrm1fnbvv4x2840jcfjg2l5cb5w4p38vzksiv238"; }; - # FIXME: Fixed upstream but not released yet. Nevertheless critical for correct behaviour. - # See https://github.com/MolSSI/QCElemental/pull/265 - patches = [ - (fetchpatch { - name = "SearchPath1.patch"; - url = "https://github.com/MolSSI/QCElemental/commit/2211a4e59690bcb14265a60f199a5efe74fe44db.diff"; - sha256 = "1ibjvmdrc103jdj79xrr11y5yji5hc966rm4ihfhfzgbvfkbjg2l"; - }) - (fetchpatch { - name = "SearchPath2.patch"; - url = "https://github.com/MolSSI/QCElemental/commit/5a32ce33e8142047b0a00d0036621fe2750e872a.diff"; - sha256 = "0gmg70vdps7k6alqclwdlxkli9d8s1fphbdvyl8wy8xrh46jw6rk"; - }) - ]; - doCheck = true; meta = with lib; { diff --git a/pkgs/development/python-modules/rainbowstream/default.nix b/pkgs/development/python-modules/rainbowstream/default.nix index e484c07f31c..02c948fd405 100644 --- a/pkgs/development/python-modules/rainbowstream/default.nix +++ b/pkgs/development/python-modules/rainbowstream/default.nix @@ -8,7 +8,7 @@ , pyfiglet , requests , arrow -, dateutil +, python-dateutil , pysocks , pocket }: @@ -42,7 +42,7 @@ buildPythonPackage rec { done ''; - buildInputs = [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales pillow twitter pyfiglet requests arrow dateutil pysocks pocket ]; + buildInputs = [ pkgs.libjpeg pkgs.freetype pkgs.zlib pkgs.glibcLocales pillow twitter pyfiglet requests arrow python-dateutil pysocks pocket ]; meta = with lib; { description = "Streaming command-line twitter client"; diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index e0c6769b07d..7bd42670688 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scp"; - version = "0.13.4"; + version = "0.13.5"; src = fetchPypi { inherit pname version; - sha256 = "e60948dd3e1aa13da21aa1bf8a025fabbbc2816ed04f1a1272410247d1a86f15"; + sha256 = "sha256-CrLukXi4vlPcXJ/i8zdh4BokNQh/XJ+1tUUZhzxlDWA="; }; propagatedBuildInputs = [ @@ -25,10 +25,12 @@ buildPythonPackage rec { #The Pypi package doesn't include the test doCheck = false; + pythonImportsCheck = [ "scp" ]; + meta = with lib; { homepage = "https://github.com/jbardin/scp.py"; description = "SCP module for paramiko"; - license = licenses.lgpl3; + license = licenses.lgpl21Only; maintainers = with maintainers; [ xnaveira ]; }; } diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index 370d2548980..7a1d1439c1f 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { ''; passthru.tests = { - testing-bitwarden = nixosTests.bitwarden; + testing-vaultwarden = nixosTests.vaultwarden; }; meta = with lib; { diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix index d1471286bb8..331f84252ce 100644 --- a/pkgs/development/python-modules/simber/default.nix +++ b/pkgs/development/python-modules/simber/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "simber"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "deepjyoti30"; repo = pname; rev = version; - sha256 = "0ksc2m61j5ijj0sq6kkc0hhkmfy9f51h9z3cl2sf8g6wbr9vc47h"; + sha256 = "04dp9b4s7zb166vlacsaypc6iw1p75azqas1wf0flp570qqf3rkx"; }; propagatedBuildInputs = [ colorama ]; diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index 838ffd47184..34b95fe781d 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -5,7 +5,7 @@ , pkgs , cython , dnspython -, dateutil +, python-dateutil , xcaplib , msrplib , lxml @@ -34,7 +34,7 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ alsa-lib ffmpeg_3 libv4l sqlite libvpx ]; - propagatedBuildInputs = [ cython pkgs.openssl dnspython dateutil xcaplib msrplib lxml python-otr ]; + propagatedBuildInputs = [ cython pkgs.openssl dnspython python-dateutil xcaplib msrplib lxml python-otr ]; meta = with lib; { description = "SIP SIMPLE implementation for Python"; diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index 1ae05cab973..cb63f8d11ba 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "cobrateam"; repo = "splinter"; rev = version; - sha256 = "0480bqprv8581cvnc80ls91rz9780wvdnfw99zsw44hvy2yg15a6"; + sha256 = "sha256-y87Cnci4gJHrttThGPeOS/h6VK8x95cQA9nZs1fBfAw="; }; propagatedBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { "samples" "tests/test_djangoclient.py" "tests/test_flaskclient.py" + "tests/test_popups.py" "tests/test_webdriver.py" "tests/test_webdriver_chrome.py" "tests/test_webdriver_firefox.py" diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index b59209f4295..dc983e20ce2 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -1,6 +1,6 @@ { lib, fetchPypi, buildPythonPackage , six, sqlalchemy -, mock, pytz, isort, flake8, jinja2, pg8000, pyodbc, pytest, pymysql, dateutil +, mock, pytz, isort, flake8, jinja2, pg8000, pyodbc, pytest, pymysql, python-dateutil , docutils, flexmock, psycopg2, pygments }: buildPythonPackage rec { @@ -30,7 +30,7 @@ buildPythonPackage rec { pyodbc pytest pymysql - dateutil + python-dateutil docutils flexmock psycopg2 diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 0681218cd0a..dc36066ec30 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "staticjinja"; - version = "2.1.0"; + version = "3.0.1"; format = "pyproject"; # No tests in pypi @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "staticjinja"; repo = pname; rev = version; - sha256 = "sha256-VKsDvWEurBdckWbPG5hQLK3dzdM7XVbrp23fR5wp1xk="; + sha256 = "sha256-W4q0vG8Kl2gCmA8UnUbdiGRtghhdnWxIJXFIIa6BogA="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/suseapi/default.nix b/pkgs/development/python-modules/suseapi/default.nix index 1c36f45090b..bcf35d1f5f7 100644 --- a/pkgs/development/python-modules/suseapi/default.nix +++ b/pkgs/development/python-modules/suseapi/default.nix @@ -7,7 +7,7 @@ , mechanize , beautifulsoup4 , pyxdg -, dateutil +, python-dateutil , requests , httpretty }: @@ -24,7 +24,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - django suds-jurko ldap mechanize beautifulsoup4 pyxdg dateutil requests + django suds-jurko ldap mechanize beautifulsoup4 pyxdg python-dateutil requests ]; buildInputs = [ httpretty ]; diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 523d3e303b3..80d86c3edb0 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -4,7 +4,7 @@ , nose , tox , six -, dateutil +, python-dateutil , kitchen , pytz , pkgs @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = false; buildInputs = [ nose pkgs.taskwarrior tox ]; - propagatedBuildInputs = [ six dateutil kitchen pytz ]; + propagatedBuildInputs = [ six python-dateutil kitchen pytz ]; meta = with lib; { homepage = "https://github.com/ralphbean/taskw"; diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix index 04bc47913d8..fed2f7c3e3f 100644 --- a/pkgs/development/python-modules/textfsm/default.nix +++ b/pkgs/development/python-modules/textfsm/default.nix @@ -9,26 +9,25 @@ buildPythonPackage rec { pname = "textfsm"; - version = "1.1.1"; + version = "1.1.2"; + format = "setuptools"; + src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "0fq2hphd89hns11nh0yifcp6brg6yy4n4hbvfk6avbjd7s40789a"; + sha256 = "1cbczg3h2841v1xk2s2xg540c69vsrkwxljm758fyr65kshrzlhm"; }; - patches = [ - (fetchpatch { - # remove pytest-runner dependency - url = "https://github.com/google/textfsm/commit/212db75fea4a79aca0f8f85a78954ffbc5667096.patch"; - sha256 = "0n6qh3sz9wy5gdpq9jjxx8firis48ypr20yacs5bqri59sziwjp0"; - }) + propagatedBuildInputs = [ + six + future ]; - propagatedBuildInputs = [ six future ]; - - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { description = "Python module for parsing semi-structured text into python tables"; diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index ac614d53fd5..f1e90114ac6 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "token-bucket"; - version = "0.2.0"; + version = "0.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "falconry"; repo = pname; rev = version; - sha256 = "0kv8j2ab4knvzik2di66bgjwjxdslm2i0hjy35kn9z0dazni585s"; + sha256 = "0a703y2d09kvv2l9vq7vc97l4pi2wwq1f2hq783mbw2238jymb3m"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index f0cb79b0a8b..d5ddf8f5880 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -6,7 +6,7 @@ , lxml , relatorio , genshi -, dateutil +, python-dateutil , polib , python-sql , werkzeug @@ -41,7 +41,7 @@ buildPythonApplication rec { lxml relatorio genshi - dateutil + python-dateutil polib python-sql werkzeug diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix deleted file mode 100644 index a9439d3e887..00000000000 --- a/pkgs/development/python-modules/tvnamer/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pytest -, tvdb_api -}: - -buildPythonPackage rec { - pname = "tvnamer"; - version = "3.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "dc2ea8188df6ac56439343630466b874c57756dd0b2538dd8e7905048f425f04"; - }; - - checkInputs = [ pytest ]; - propagatedBuildInputs = [ tvdb_api ]; - - # a ton of tests fail with: IOError: tvnamer/main.py could not be found in . or .. - doCheck = false; - - meta = with lib; { - description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api."; - homepage = "https://github.com/dbr/tvnamer"; - license = licenses.unlicense; - maintainers = with maintainers; [ peterhoeg ]; - }; - -} diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index b45218219c5..166e42ced82 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "sha256-82TOVrC7wX7E9lKsx3iGxaEEjHSzf5uZwePBvAw3hDk="; + sha256 = "sha256-HDPRpM1LDTtUbldzfCrsdh/GpbzNCVVUVGwohyMe/YE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index db8c8c8bd23..a8ce6713f2c 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.9.0"; + version = "4.10.0"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "0bqrc4g4pd7b209swlv06bm5sx7df96h9kjpqpra4mfz469km4nn"; + sha256 = "0bxbkqc4ajs52vmalmhvvqvl1aw2ss6yf7nclwx8nc2g5vchd4ng"; }; disabled = pythonOlder "3.5.0"; diff --git a/pkgs/development/python-modules/urllib3/2.nix b/pkgs/development/python-modules/urllib3/2.nix index 3fc90fe5d82..f1eea4c31d8 100644 --- a/pkgs/development/python-modules/urllib3/2.nix +++ b/pkgs/development/python-modules/urllib3/2.nix @@ -3,7 +3,7 @@ , buildPythonPackage , certifi , cryptography -, dateutil +, python-dateutil , fetchpatch , fetchPypi , idna @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; checkInputs = [ - dateutil + python-dateutil mock pytest-freezegun pytest-timeout diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index eec8e284c0e..6d73357e3bc 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -2,7 +2,7 @@ , brotli , buildPythonPackage , cryptography -, dateutil +, python-dateutil , fetchPypi , idna , isPy27 @@ -36,7 +36,7 @@ buildPythonPackage rec { ]; checkInputs = [ - dateutil + python-dateutil mock pytest-freezegun pytest-timeout diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 823d2820e1b..dc122341924 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, future, dateutil, six, pytest, mock, parameterized }: +{ lib, buildPythonPackage, fetchPypi, future, python-dateutil, six, pytest, mock, parameterized }: buildPythonPackage rec { pname = "vertica-python"; @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "94cff37e03f89fc4c5e4b2d4c913c7d5d7450f5a205d14f709b39e0a4202be95"; }; - propagatedBuildInputs = [ future dateutil six ]; + propagatedBuildInputs = [ future python-dateutil six ]; checkInputs = [ pytest mock parameterized ]; diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 1bb87d9d122..30f84150283 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPyPy, python, dateutil }: +{ lib, buildPythonPackage, fetchPypi, isPyPy, python, python-dateutil }: buildPythonPackage rec { version = "0.9.6.1"; @@ -11,7 +11,7 @@ buildPythonPackage rec { disabled = isPyPy; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; checkPhase = "${python.interpreter} tests.py"; diff --git a/pkgs/development/python-modules/webdavclient3/default.nix b/pkgs/development/python-modules/webdavclient3/default.nix index eb13cd6b9bb..fc63c1913d0 100644 --- a/pkgs/development/python-modules/webdavclient3/default.nix +++ b/pkgs/development/python-modules/webdavclient3/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, fetchPypi, isPy27, lib, dateutil, lxml, requests +{ buildPythonPackage, fetchPypi, isPy27, lib, python-dateutil, lxml, requests , pytestCheckHook }: buildPythonPackage rec { @@ -12,7 +12,7 @@ buildPythonPackage rec { sha256 = "0yw3n5m70ysjn1ch48znpn4zr4a1bd0lsm7q2grqz7q5hfjzjwk0"; }; - propagatedBuildInputs = [ dateutil lxml requests ]; + propagatedBuildInputs = [ python-dateutil lxml requests ]; checkInputs = [ pytestCheckHook ]; diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 3ce15a3fdce..b1afa242107 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, isPy27 , Babel , cssselect -, dateutil +, python-dateutil , feedparser , futures ? null , gdata @@ -52,7 +52,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ Babel cssselect - dateutil + python-dateutil feedparser gdata gnupg diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 4794843a66d..fc5e6e9dc65 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -5,7 +5,7 @@ , Babel , colorama , cssselect -, dateutil +, python-dateutil , feedparser , gdata , gnupg @@ -49,7 +49,7 @@ buildPythonPackage rec { Babel colorama cssselect - dateutil + python-dateutil feedparser gdata gnupg diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index daba39eb224..6ec5fda2ca5 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.17.3"; + version = "0.18.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-miScxT79ZAgDT0AamkN1JyqbM56Otk86LnE6HM0G1Vs="; + sha256 = "sha256-RH0ballPSZQvesdUEsulnBkbbzVA2YrGWhMzRFvuwW0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 34335c65e1a..37fbc87f3f7 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.57"; + version = "0.0.58"; src = fetchFromGitHub { owner = "zigpy"; repo = "zha-device-handlers"; rev = version; - sha256 = "sha256-ajdluj6UIzjJUK30GtoM+e5lsMQRKnn3FPNEg+RS/DM="; + sha256 = "sha256-QU5ssbnT3/gioQ3vM9zvlbwxqSWyKIylsV9NuFkNe+Q="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix index 67d9e39af62..5be2fca96fb 100644 --- a/pkgs/development/scheme-modules/scheme-bytestructures/default.nix +++ b/pkgs/development/scheme-modules/scheme-bytestructures/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/TaylanUB/scheme-bytestructures"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ethancedwards8 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 25d61d2393e..a2396314387 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.5.5"; + version = "2.5.6"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-M5O2NEGIVPWYKl11yxMMVreEtDO1VqcMkiGGrjNmk3A="; + sha256 = "sha256-YBGKIfBTU7MRm1Om4Jknd5Nu77qJftCgjuohcO/9X/w="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 600d0efc92e..5e7f6a3f2d5 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.4"; + version = "2.5"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-mGJPqOmz1/siAVkwDP5WXFvx3TtD5KT/klciqnaEoCo="; + sha256 = "sha256-s+KJpA11A4bFOXgy2eVkRMYBFwwBjU7QZgSPZ0oVKxo="; }; buildInputs = [ pcre ] ++ lib.optionals withZ3 [ z3 ]; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 9666bf006d7..a5798c6ad56 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1pkz8y3da7i4a3nm79a0640xjj4wfkx3dz6614c4hynqn5svji82"; + sha256 = "0xdn8xakywms8gcacmjvx0ivv37i3vj1d41c8sjlnf1s13q3zv7k"; }; - vendorSha256 = "0k8v49sr0jmljfl4fa5pnvzd5k3pg865h201114l6cs257sdkczk"; + vendorSha256 = "18w0wz3raysba99cxcc8pk4md9j438g4y2d2v2pk2l6qri9apscw"; doCheck = false; diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 246f42b6399..4e11d92e968 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.39.16"; + version = "0.40.7"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5We3Nk/AU5dj37vG4pvqzvNztK01PAPadQV/CgHZe8w="; + sha256 = "1cdxpmlfh76k491ldzv2flxs2wikrryr63h0zw8f6yvhkpbqf4cc"; }; goPackagePath = "github.com/tfsec/tfsec"; diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index a93de053c44..0d8ca351096 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -1,21 +1,25 @@ { lib, stdenv, fetchurl, fetchpatch -, getopt, tzdata +, getopt, tzdata, ksh +, pkgsMusl # for passthru.tests }: stdenv.mkDerivation rec { pname = "bmake"; - version = "20210420"; + version = "20210621"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "1ajq8v5rq3pl5y9h1hlscs83007fsyk3lhcp87z09ma370lm3ra7"; + sha256 = "0gpzv75ibzqz1j1h0hdjgx1v7hkl3i5cb5yf6q9sfcgx0bvb55xa"; }; # Make tests work with musl # * Disable deptgt-delete_on_error test (alpine does this too) + # * Disable shell-ksh test (ksh doesn't compile with musl) # * Fix test failing due to different strerror(3) output for musl and glibc postPatch = lib.optionalString (stdenv.hostPlatform.libc == "musl") '' - sed -i unit-tests/Makefile -e '/deptgt-delete_on_error/d' + sed -i unit-tests/Makefile \ + -e '/deptgt-delete_on_error/d' \ + -e '/shell-ksh/d' substituteInPlace unit-tests/opt-chdir.exp --replace "File name" "Filename" ''; @@ -28,6 +32,8 @@ stdenv.mkDerivation rec { ./fix-unexport-env-test.patch # Fix localtime tests without global /etc/zoneinfo directory ./fix-localtime-test.patch + # Always enable ksh test since it checks in a impure location /bin/ksh + ./unconditional-ksh-test.patch # decouple tests from build phase (fetchpatch { name = "separate-tests.patch"; @@ -68,7 +74,11 @@ stdenv.mkDerivation rec { ''; doCheck = true; - checkInputs = [ tzdata ]; + checkInputs = [ + tzdata + ] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [ + ksh + ]; checkPhase = '' runHook preCheck @@ -79,6 +89,10 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; + passthru.tests = { + bmakeMusl = pkgsMusl.bmake; + }; + meta = with lib; { description = "Portable version of NetBSD 'make'"; homepage = "http://www.crufty.net/help/sjg/bmake.html"; diff --git a/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch b/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch new file mode 100644 index 00000000000..117b85da16d --- /dev/null +++ b/pkgs/development/tools/build-managers/bmake/unconditional-ksh-test.patch @@ -0,0 +1,12 @@ +--- bmake/unit-tests/Makefile.orig 2021-07-04 19:13:09.068094922 +0200 ++++ bmake/unit-tests/Makefile 2021-07-04 19:13:14.630080696 +0200 +@@ -295,9 +295,7 @@ + TESTS+= sh-single-line + TESTS+= shell-csh + TESTS+= shell-custom +-.if exists(/bin/ksh) + TESTS+= shell-ksh +-.endif + TESTS+= shell-sh + TESTS+= suff-add-later + TESTS+= suff-clear-regular diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 9c3e99e23ad..f59e74b02f4 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -39,6 +39,22 @@ let newPython = python3.override { "test_ec_verify_should_return_false_if_signature_invalid" ]; }); + # conan needs jinja2<3 + jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec { + version = "2.11.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6"; + }; + }); + # old jinja2 needs old markupsafe + markupsafe = super.markupsafe.overridePythonAttrs (oldAttrs: rec { + version = "1.1.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b"; + }; + }); }; }; @@ -56,7 +72,7 @@ in newPython.pkgs.buildPythonApplication rec { propagatedBuildInputs = with newPython.pkgs; [ bottle colorama - dateutil + python-dateutil deprecation distro fasteners @@ -92,7 +108,8 @@ in newPython.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace conans/requirements.txt \ - --replace "deprecation>=2.0, <2.1" "deprecation" + --replace "deprecation>=2.0, <2.1" "deprecation" \ + --replace "six>=1.10.0,<=1.15.0" "six>=1.10.0,<=1.16.0" ''; meta = with lib; { diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 4fbd0365af9..4682fab41db 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.9.6"; + version = "0.9.8"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "sha256-cAhcTmSPkV5z5ryuCNrpxy9/1iWvvminiVYul9c/DwM="; + sha256 = "sha256-vWCzjit7MPrKqEYgJfQHAkam9J9NgMObOQ/A+OQr24o="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/build-managers/redo-c/Makefile b/pkgs/development/tools/build-managers/redo-c/Makefile index f2c43cc5003..5a1dd74c5b8 100644 --- a/pkgs/development/tools/build-managers/redo-c/Makefile +++ b/pkgs/development/tools/build-managers/redo-c/Makefile @@ -1,4 +1,4 @@ -CFLAGS=-Os +CFLAGS ?= -Os all: redo links diff --git a/pkgs/development/tools/build-managers/redo-c/default.nix b/pkgs/development/tools/build-managers/redo-c/default.nix index 40708b7877a..14d33cba039 100644 --- a/pkgs/development/tools/build-managers/redo-c/default.nix +++ b/pkgs/development/tools/build-managers/redo-c/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "redo-c"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = pname; rev = "v${version}"; - sha256 = "11wc2sgw1ssdm83cjdc6ndnp1bv5mzhbw7njw47mk7ri1ic1x51b"; + sha256 = "sha256-oZcaBgESIaD7/SUBE7luh7axucKTEzXPVkQAQs2NCXE="; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/pkgs/development/tools/build-managers/rocm-cmake/default.nix index 16ea0dc2831..68cd3d449ca 100644 --- a/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "CMake modules for common build tasks for the ROCm stack"; homepage = "https://github.com/RadeonOpenCompute/rocm-cmake"; license = licenses.mit; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index b947fc1ebfe..75fb29db882 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.1.30"; + version = "0.3.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uQj14arxDPc8/k1Cvp3T6hqjln30NFk9MzvYy8tAiJ8="; + sha256 = "sha256-rxWTh+iltD1kcntlu9sovwG/mQPmukYbw8V2FAFi1KE="; }; - vendorSha256 = "sha256-pl3dLisu4Oc77kgfuteKbsZaDzrHo1wUigZEkM4081Q="; + vendorSha256 = "sha256-mfNbcnJ62v6tdEhOtA0P9lDoD5HmLBAtNcrv1H3/mSE="; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 6c9cffe41b2..245aeeb4351 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, buildGoModule }: -let version = "1.2.4"; +let version = "1.3.0"; in buildGoModule rec { inherit version; pname = "drone-cli"; revision = "v${version}"; - vendorSha256 = "0v94rwxkbj85l3brbm792xf1rfs3vgnwpgjczwqip1gm159dpnd7"; + vendorSha256 = "sha256-I+UBa6gqkPRXNV72iyJcCBLYShZxMtHFHSK77mhDv+U="; doCheck = false; @@ -18,7 +18,7 @@ in buildGoModule rec { owner = "drone"; repo = "drone-cli"; rev = revision; - sha256 = "14sm5k2ifvr4g9369zqgb92vrr4rc0bxf5m52l3g8bd2s8fq8nx8"; + sha256 = "sha256-j6drDMxvAVfQ1aCFooc9g9HhMRMlFZXGZPiuJZKBbY4="; }; meta = with lib; { diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 415b22894cb..a128db527df 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.289.1"; + version = "2.289.2"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1wkm1y2bj245b9i51vhns9qfxc6xm44hg60vhgmswndcy5pwrybh"; + sha256 = "0413ymfrb00ifxl8ww8nn8y4k07jhgsaxaw2h0qnfh9s6yxifpbf"; }; buildCommand = '' diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 45b5f185880..9ff5c1b01b8 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, cmake -, qtbase, qttools, sqlite }: +, qtbase, qttools, sqlite, wrapGAppsHook }: mkDerivation rec { pname = "sqlitebrowser"; @@ -18,7 +18,7 @@ mkDerivation rec { # We *really* should get that cleaned up. buildInputs = [ qtbase sqlite ]; - nativeBuildInputs = [ cmake qttools ]; + nativeBuildInputs = [ cmake qttools wrapGAppsHook ]; meta = with lib; { description = "DB Browser for SQLite"; diff --git a/pkgs/development/tools/ecpdap/default.nix b/pkgs/development/tools/ecpdap/default.nix index 3bb12c40e35..38ba9d78712 100644 --- a/pkgs/development/tools/ecpdap/default.nix +++ b/pkgs/development/tools/ecpdap/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ecpdap"; - version = "0.1.6"; + version = "0.1.7"; src = fetchFromGitHub { owner = "adamgreig"; repo = pname; rev = "v${version}"; - sha256 = "1va96hxm22a2lfy141x1sv5f5g8f6mp965an4jsff9qzi55kfv2g"; + sha256 = "sha256-fdvpGmEy54i48H6YJ4E1LIuogimNEL8PJS5ScoW/6DM="; }; - cargoSha256 = "1dk6x2f36c546qr415kzmqr2r4550iwdmj4chrb46p3hr64jddhd"; + cargoSha256 = "sha256-2YARNoHVDBwGr8FE/oRlNZMX/vCPIre7OnZbr04eF/M="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/development/tools/fission/default.nix index 3045842d91f..56d5161b49e 100644 --- a/pkgs/development/tools/fission/default.nix +++ b/pkgs/development/tools/fission/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fission"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "fission"; repo = "fission"; rev = version; - sha256 = "sha256-WCynU5+d789d584JH99jmTZSEbyco2ysuBXIC2pW1r4="; + sha256 = "sha256-ayVEU2Dlqun8KLP+KeI0uU4p9N4aaYLZ/IHqfA2PGrI="; }; vendorSha256 = "sha256-V3/IFCbW3wXfNiFzucLeyFDc6SA2nE+NwO0sNEBmIYg="; diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/development/tools/gops/default.nix index d23aa71a8ab..bc9cba9df5f 100644 --- a/pkgs/development/tools/gops/default.nix +++ b/pkgs/development/tools/gops/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gops"; - version = "0.3.18"; + version = "0.3.19"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "0534jyravpsj73lgdmw6fns1qaqiw401jlfk04wa0as5sv09rfhy"; + sha256 = "sha256-9QEhc0OVCrIdIY220PDn2+CjUsCF84l6QRQS0HjDEZY="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index 1220ec90d90..b0d2cb71953 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.71.1"; + version = "0.72.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-+s2Wa+5Qznqpv84VEZCMmzy0bI1mN/BknPObYqJlaYs="; + sha256 = "sha256-QMbkxfGJOMNTILmGYhbUdtq4zfe0Cc/IBftFdM+rT9c="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 489b62891b6..c2453c8ff16 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "4.1.3"; + version = "4.2.0"; # rev is the commit of the tag, mainly for kustomize version command output rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245"; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "sha256-NPWKInDHOoelWqDrUn/AlRItI4e8J6dbBxgLW078ecs="; + sha256 = "sha256-mFF0Yc+j292oajY1i9SApnWaQnVoHxvkGCIurKC0t4o="; }; # TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged. @@ -26,7 +26,7 @@ buildGoModule rec { # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "sha256-6maEpEPEV436NrVnVlvWV1q6YywGVILXbxn8Z8Ku/hs="; + vendorSha256 = "sha256-VMvXDIrg/BkuxZVDHvpfHY/hgwQGz2kw1/hu5lhcYEE="; meta = with lib; { description = "Customization of kubernetes YAML configurations"; diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index c0276403516..6847aff097c 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -57,7 +57,7 @@ lib.fix (noweb: stdenv.mkDerivation rec { # NOTE: substituteInPlace breaks Icon binaries, so make sure the script # uses (n)awk before calling. if grep -q nawk "$f"; then - substituteInPlace "$f" --replace "nawk" "${nawk}/bin/awk" + substituteInPlace "$f" --replace "nawk" "${nawk}/bin/nawk" fi done diff --git a/pkgs/development/tools/misc/ccls/wrapper b/pkgs/development/tools/misc/ccls/wrapper index c92bc6b40d1..294b60893a3 100644 --- a/pkgs/development/tools/misc/ccls/wrapper +++ b/pkgs/development/tools/misc/ccls/wrapper @@ -4,6 +4,6 @@ printf -v extraArgs ',\"%s\"' \ $(cat @clang@/nix-support/libc-cflags \ @clang@/nix-support/libcxx-cxxflags) \ ${NIX_CFLAGS_COMPILE} -initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}]}}" +initString="--init={\"clang\":{\"extraArgs\":[${extraArgs:1}],\"resourceDir\":\"@clang@/resource-root\"}}" exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@" diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 739615a841c..70ec9278ae1 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -6,11 +6,11 @@ let pygments = python3Packages.pygments; in stdenv.mkDerivation rec { pname = "global"; - version = "6.6.6"; + version = "6.6.7"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - sha256 = "sha256-dYB4r/+Y1MBRxYeFx62j7Rl3+rt3+Il/9le3HMYtTV0="; + sha256 = "sha256-aaD3f1OCfFVoF2wdOCFm3zYedCY6BH8LMFiqLyrVijw="; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 2acc7e5bdf3..3945389e8cd 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.8.5"; + version = "2.9.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "0a9n8ilsi3kyx5xqvk5s7iikk6y3pkpm5mvsn5za5ivlzf1i40br"; + sha256 = "07m476kgagpd6kzm3jq30yfxqspr2hychah0xfqs14z82zxpq8dv"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 739a562227a..6737f161754 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.29.4"; + version = "0.30.0"; src = fetchFromGitHub { owner = "open-policy-agent"; @@ -10,14 +10,11 @@ buildGoModule rec { rev = "v${version}"; sha256 = "sha256-AjNr+t30ftF92+cEfvt8iHBDVD/SO52ojJRLAkYF9l4="; }; - vendorSha256 = null; subPackages = [ "." ]; - preBuild = '' - buildFlagsArray+=("-ldflags" "-s -w -X github.com/open-policy-agent/opa/version.Version=${version}") - ''; + ldflags = [ "-s" "-w" "-X github.com/open-policy-agent/opa/version.Version=${version}" ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 6ab1463917c..60704fdd780 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -28,9 +28,9 @@ let # 1) change all these hashes # 2) nix-build -A tree-sitter.updater.update-all-grammars # 3) run the ./result script that is output by that (it updates ./grammars) - version = "0.19.5"; - sha256 = "1qmb0sva28zv6r3c3j7xs9pc8bpwwhkb9vxxndw2zbdn9wkvmbmn"; - cargoSha256 = "0hnjik3pymb1s7frhfpfzvd6w2k3lgpsmh6milpriwxmqsmkwdzz"; + version = "0.20.0"; + sha256 = "0hrcisvw44fjxix09lfbrz7majaj6njbnr6c92a6a5748p2jvyng"; + cargoSha256 = "029db3yy6nj18vxfvj0ra568a9k4x7znfj08spvzl5sxfbx6442r"; src = fetchFromGitHub { owner = "tree-sitter"; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json index 5ebc9c9a0f3..8b8315e4abd 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c-sharp", - "rev": "aa429589525bb849189a0c5ddb52267ce578f988", - "date": "2021-06-07T18:47:38+02:00", - "path": "/nix/store/mclvpa5kfbl9g5ij3xjdhnqc6bqzqcj6-tree-sitter-c-sharp", - "sha256": "07alycp4bclr0ycn44dj2481xag0s10nwgyrdxar3j91hphd966s", + "rev": "3953034ee61e8639100b063092d4280e047ca9e9", + "date": "2021-06-21T12:18:46+02:00", + "path": "/nix/store/8f2bnr790zwibhyd3jqjm38zfc1md5is-tree-sitter-c-sharp", + "sha256": "0k6pb27f463y88bf6ym0zl4d36182y5cr3013j71h3vlg264z96c", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index b8ca41abcf2..1e00f279d68 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "237f4eb4417c28f643a29d795ed227246afb66f9", - "date": "2021-06-05T13:41:42+02:00", - "path": "/nix/store/wwi86c3ix0zq8czwljxxypw5w2mxnz5h-tree-sitter-haskell", - "sha256": "0gx6mr6yg053i5mif8i8qwkk9h57laf9riw5r24av1y7cal7sszd", + "rev": "a0c1adb59e390f7d839a146c57fdb33d36ed97e6", + "date": "2021-06-18T23:36:08+02:00", + "path": "/nix/store/7rl3najf8rn8ndh31vcxjz5px3r1scky-tree-sitter-haskell", + "sha256": "0a97w0qnj0fwy0yyg7hb9i1fyiwbyiz5mwx77aaw6md4jcsf4di8", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json index 65066c66d53..24fd79d5116 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-javascript", - "rev": "45b9ce2a2588c0e6d616b0ee2a710b1fcb99c5b5", - "date": "2021-06-09T14:12:41-07:00", - "path": "/nix/store/j6r7z3m4wk6baz70qg2xn2mq3jlnyq6f-tree-sitter-javascript", - "sha256": "0rzpyxbh1j9l12jxyryc06f8jhbd5ci18lfb7bw2msc685b2ckcx", + "rev": "6de6d604c243b68f90dce14130d536c694d90dcc", + "date": "2021-06-29T15:54:12-07:00", + "path": "/nix/store/mmz8s440zplg88c0mb0w3dlg94dzgxmf-tree-sitter-javascript", + "sha256": "1bz8xhs7q4lp49q1id6dvz93l7vf0gxgngsbjk3x1nvw8rg171j6", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 49b57f4d8a3..6b64a962a52 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "b065fc4ded84c30aff14c07ec6e7cf449e222b04", - "date": "2021-06-01T20:33:20+02:00", - "path": "/nix/store/czdqn2nz8pgrd64w74yskx6vl233phxn-tree-sitter-php", - "sha256": "1qr2byy344haqybd0zz2hazncay7zndkp4p3317ck50xrs05z086", + "rev": "5e89808d490d893799ebcf229130afe4cf2b0324", + "date": "2021-06-22T09:23:44+02:00", + "path": "/nix/store/5c1pn1p183czqb43a0va7whd4sz81jf1-tree-sitter-php", + "sha256": "1mp5kv305a4rrgh7kklifqfg3680krfsd0h76sxn4i0wxyqfgczi", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json index a96363af713..c8142974fd4 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ruby", - "rev": "391269d74d20154bbd0ac9be20b35eced6920290", - "date": "2021-05-04T14:02:32-07:00", - "path": "/nix/store/hamsaml0yzi13qd61abypjwbv33rd824-tree-sitter-ruby", - "sha256": "0biyhydfzybz3g6hhdd0rk6yav7xsk61j8lnmpsi60vaxabdsaiv", + "rev": "fe6a2d634da0e16b11b5aa255cc3df568a4572fd", + "date": "2021-03-03T16:54:30-08:00", + "path": "/nix/store/ragrvqj7hm98r74v5b3fljvc47gd3nhj-tree-sitter-ruby", + "sha256": "0m3h4928rbs300wcb6776h9r88hi32rybbhcaf6rdympl5nzi83v", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json index b7c214cc720..75329fc63a0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-scala", - "rev": "fb23ed9a99da012d86b7a5059b9d8928607cce29", - "date": "2021-04-01T10:11:15-07:00", - "path": "/nix/store/n1wvxkz4h38770lxvwakway34ac2a8h7-tree-sitter-scala", - "sha256": "05g95340g4labkdvfka5cbg7pr6vzigc40y54js1b5wml0w3d8f7", + "rev": "bfa2a81388019d47f6a0a6a6e9c96910dec830b4", + "date": "2021-06-23T15:37:27-07:00", + "path": "/nix/store/nc5cndwzc5pzq3x64wa51bff0rl36hc8-tree-sitter-scala", + "sha256": "0x0lq78gjfsqi225mfvrpkl2jc6fbb378jgj04syxkm941lxc4bk", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json index b224fa54daf..41c4fcfe734 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json @@ -1,9 +1,9 @@ { "url": "https://github.com/Himujjal/tree-sitter-svelte", - "rev": "10c113001acf9852817150acb3031a5e68d2b4cf", - "date": "2021-05-02T10:05:14+05:30", - "path": "/nix/store/mpfr56mfiizhwr4hq7h422glmdc4hg48-tree-sitter-svelte", - "sha256": "1n7addsnin6czm5hrbhaaqqgf0c3nz3mpcdysm2z4icgn7fjq281", + "rev": "c696a13a587b0595baf7998f1fb9e95c42750263", + "date": "2021-03-20T16:45:11+05:30", + "path": "/nix/store/8krdxqwpi95ljrb5jgalwgygz3aljqr8-tree-sitter-svelte", + "sha256": "0ckmss5gmvffm6danlsvgh6gwvrlznxsqf6i6ipkn7k5lxg1awg3", "fetchSubmodules": false, "deepClone": false, "leaveDotGit": false diff --git a/pkgs/development/tools/pgtop/default.nix b/pkgs/development/tools/pgtop/default.nix new file mode 100644 index 00000000000..03b3ef89265 --- /dev/null +++ b/pkgs/development/tools/pgtop/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, perlPackages, fetchFromGitHub, shortenPerlShebang }: + +perlPackages.buildPerlPackage rec { + pname = "pgtop"; + version = "0.11"; + + src = fetchFromGitHub { + owner = "cosimo"; + repo = "pgtop"; + rev = "v${version}"; + sha256 = "1awyl6ddfihm7dfr5y2z15r1si5cyipnlyyj3m1l19pk98s4x66l"; + }; + + outputs = [ "out" ]; + + buildInputs = with perlPackages; [ DBI DBDPg TermReadKey JSON LWPUserAgent ]; + + nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + postInstall = lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/pgtop + ''; + + meta = with lib; { + description = "a PostgreSQL clone of `mytop', which in turn is a `top' clone for MySQL"; + homepage = "https://github.com/cosimo/pgtop"; + changelog = "https://github.com/cosimo/pgtop/releases/tag/v${version}"; + maintainers = [ maintainers.hagl ]; + license = [ licenses.gpl2Only ]; + }; +} diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix new file mode 100644 index 00000000000..701c22471ee --- /dev/null +++ b/pkgs/development/tools/pscale/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pscale"; + version = "0.51.0"; + + src = fetchFromGitHub { + owner = "planetscale"; + repo = "cli"; + rev = "v${version}"; + sha256 = "sha256-ykHwDVwL30uXeCEP4EcM8TPYqZmCDDAUUpfinpYipHE="; + }; + + vendorSha256 = "sha256-3VP2fluQLZs4nWT3O6NmCFxrqKw0/j3ASNxtbXHlZEA="; + + meta = with lib; { + homepage = "https://www.planetscale.com/"; + changelog = "https://github.com/planetscale/cli/releases/tag/v${version}"; + description = "The CLI for PlanetScale Database"; + license = licenses.asl20; + maintainers = with maintainers; [ pimeys ]; + }; +} diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 385db11d7ff..67137fb1ed9 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - pyyaml cbor2 dateutil tomlkit u-msgpack-python + pyyaml cbor2 python-dateutil tomlkit u-msgpack-python ]; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index c0baf9f3964..549c3d11e3a 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "0bqzzh8vfqm7dpnb0fv4calnhsg9p3c5j06ycvg621p4zp4fydh2"; + sha256 = "sha256-VcdZ/dKqFFQs8ItNEj407z1pWJqpHwwIsuNnsQ8KU/8="; }; - cargoSha256 = "0f7hmwrs99qdvhn4lvs8cqva68w2y04fy3ca1xlhk7ncdmclcc4g"; + cargoSha256 = "sha256-1TIGv0yVhkhThqZiQW9JrvFd0eouTlr8kgN/g7b4vDM="; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix index e68eea50ff3..a86e531e7f6 100644 --- a/pkgs/development/tools/rust/crate2nix/default.nix +++ b/pkgs/development/tools/rust/crate2nix/default.nix @@ -10,18 +10,18 @@ rustPlatform.buildRustPackage rec { pname = "crate2nix"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "kolloch"; repo = pname; rev = version; - sha256 = "sha256-dB8wa3CQFw8ckD420zpBGw4TnsLrHqXf+ff/WuhPsVM="; + sha256 = "sha256-JaF9/H3m4Wrc5MtXcONkOAgKVkswLVw0yZe0dBr2e4Y="; }; sourceRoot = "source/crate2nix"; - cargoSha256 = "sha256-shWhzCaH8ZttUcq82tA7T1hwNl6F1XJy7ansA5lt+Mw="; + cargoSha256 = "sha256-PD7R1vcb3FKd4hfpViKyvfCExJ5H1Xo2HPYden5zpxQ="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/tapview/default.nix b/pkgs/development/tools/tapview/default.nix new file mode 100644 index 00000000000..966df4bed65 --- /dev/null +++ b/pkgs/development/tools/tapview/default.nix @@ -0,0 +1,32 @@ +{ asciidoctor +, fetchFromGitLab +, lib +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "tapview"; + version = "1.1"; + + nativeBuildInputs = [ asciidoctor ]; + + src = fetchFromGitLab { + owner = "esr"; + repo = pname; + rev = version; + sha256 = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g="; + }; + + # Remove unecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected. + patches = [ ./dont_check_echo.patch ]; + + makeFlags = [ "prefix=$(out)" ]; + + meta = with lib; { + description = "A minimalist pure consumer for TAP (Test Anything Protocol)"; + homepage = "https://gitlab.com/esr/tapview"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/pkgs/development/tools/tapview/dont_check_echo.patch b/pkgs/development/tools/tapview/dont_check_echo.patch new file mode 100644 index 00000000000..3b12adb84c5 --- /dev/null +++ b/pkgs/development/tools/tapview/dont_check_echo.patch @@ -0,0 +1,44 @@ +diff --git a/tapview b/tapview +index ad6a33a66d1..4cf9545d42f 100644 +--- a/tapview ++++ b/tapview +@@ -13,21 +13,6 @@ + # + # This is version 1.1 + # A newer version may be available at https://gitlab.com/esr/tapview +-# +-# POSIX allows but does not mandate that -n suppresses emission of a +-# trailing newline in echo. Thus, some shell builtin echos don't do +-# that. Cope gracefully. +-# shellcheck disable=SC2039 +-if [ "$(echo -n "a"; echo "b")" != "ab" ] +-then +- ECHO="echo" +-elif [ "$(/bin/echo -n "a"; /bin/echo "b")" = "ab" ] +-then +- ECHO="/bin/echo" +-else +- echo "tapview: bailing out, your echo lacks -n support." +- exit 3 +-fi + + OK="." + FAIL="F" +@@ -37,7 +22,7 @@ TODO_OK="u" + + ship_char() { + # shellcheck disable=SC2039 +- "${ECHO}" -n "$1" ++ echo -n "$1" + } + + ship_line() { +@@ -155,7 +140,7 @@ do + fi + done + +-/bin/echo "" ++echo "" + + if [ -z "$expect" ] + then diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 130ff9c9bcb..3c61121b035 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.227"; + version = "0.0.228"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-nql0zK2H0FDQMsnSJSNzC7YmvUZfITHH5p1efFHsj58="; + sha256 = "sha256-h8ZiAabB0IIJoeQMMvOO1lQNMdFYAoTXKcTAPmLP5Sw="; }; preBuild = '' diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 3ba900f3f69..8fcf4696d0e 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -16,12 +16,12 @@ let ]; in stdenv.mkDerivation rec { pname = "insomnia"; - version = "2021.3.0"; + version = "2021.4.0"; src = fetchurl { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb"; - sha256 = "sha256-RtEkWi0J3nYzT+IhdyBlGeUE2SCmhlnfw0L6sOvE4WI="; + sha256 = "sha256-lMQWoShlEACTrcGgQtfPGVQ4X8pCG/6SkXtz+rWAOyg="; }; nativeBuildInputs = diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 7fad6a020a8..776f84309da 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "12.22.1"; - sha256 = "12drpkffn79xx84pffg9y2cn9fiwycgaa2rjj3ix6visfzvhsrfx"; + version = "12.22.2"; + sha256 = "1p281hdw3y32pnbfr7cdc9igv2yrzqg16pn4yj3g01pi3mbhbn3z"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index 27b2a4f3319..6271401a0f4 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -7,7 +7,7 @@ let in buildNodejs { inherit enableNpm; - version = "14.17.1"; - sha256 = "0zr4b9gja8f9611rnmc9yacmh90bd76xv9ayikcyqdfzdpax5wfx"; + version = "14.17.2"; + sha256 = "0gjq61l1lm15bv47w0phil44nbh0fsq3mmqf40xxlm92gswb4psg"; patches = lib.optional stdenv.isDarwin ./bypass-xcodebuild.diff; } diff --git a/pkgs/development/web/nodejs/v15.nix b/pkgs/development/web/nodejs/v15.nix deleted file mode 100644 index e6903098b30..00000000000 --- a/pkgs/development/web/nodejs/v15.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ callPackage, icu68, python3, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix { - icu = icu68; - python = python3; - }; -in - buildNodejs { - inherit enableNpm; - version = "15.14.0"; - sha256 = "0vm6jdazqjd1plqsgngzvjrafv2d3mdahk6il4ray02gx97dq8l1"; - } diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 8514baec8b1..305baadecac 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "16.4.0"; - sha256 = "07f8g3hs0v7nsdvzlsr1p4pzgb04qn54pnhmbdsgmmb41cp227pr"; + version = "16.4.1"; + sha256 = "1a1aygksmbafxvrs8g2jv0y1jj3cwyclk0qbqxkn5qfq5r1i943n"; } diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index 88d8598e133..d114ed84800 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "0.8.0"; + version = "0.8.1"; pname = "extremetuxracer"; src = fetchurl { url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; - sha256 = "05ysaxvsgps9fxc421kdifsxmc1sn6n79cjaa0k0i3fs9qqrja2b"; + sha256 = "sha256-ktqWPtMqub/xJjRu37lUnocdfDzsdT9KxQmODVPDg0E="; }; buildInputs = [ diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index b9802bd81b5..ea154db121e 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-z+88tVsf4uyMFzNfZDKXo0cYqBCYn1ehX+A+e+aIfSg="; + sha256 = "sha256-fqV2u6vChzU8387aQGf3OKeiWX188GouYZr4ZUmXWxs="; }; buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 58e91a44842..1560a45b061 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "freeciv"; - version = "2.6.4"; + version = "2.6.5"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-MRaY10HliP8TA8/9s5caNtB5hks5SJcBJItFXOUryCI="; + sha256 = "sha256-7KVtBGihABpcbUm5ac2fuBVaDvbucEJSREPulGUdnUE="; }; postPatch = '' diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 1dffd3864de..2457cd1cf96 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -33,14 +33,14 @@ let in env.mkDerivation rec { pname = "katago"; - version = "1.9.0"; + version = "1.9.1"; githash = "b846bddd88fbc5353e4a93fa514f6cbf45358362"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; rev = "v${version}"; - sha256 = "sha256-6J1UY05NweXLw8D4kOXG3KkCxJRsrQ9NBYWu2Xzu9JI="; + sha256 = "sha256-sAtPOqGe6fZ9mAtLdp80fTALXVkP9WdWQU2iTFGXe24="; }; fakegit = writeShellScriptBin "git" "echo ${githash}"; diff --git a/pkgs/games/openttd/grfcodec.nix b/pkgs/games/openttd/grfcodec.nix new file mode 100644 index 00000000000..544cf4f06c4 --- /dev/null +++ b/pkgs/games/openttd/grfcodec.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchFromGitHub, boost, cmake, git }: + +stdenv.mkDerivation rec { + pname = "openttd-grfcodec"; + version = "unstable-2021-03-10"; + + src = fetchFromGitHub { + owner = "OpenTTD"; + repo = "grfcodec"; + rev = "045774dee7cab1a618a3e0d9b39bff78a12b6efa"; + sha256 = "0b4xnnkqc01d3r834lhkq744ymar6c8iyxk51wc4c7hvz0vp9vmy"; + }; + + buildInputs = [boost]; + nativeBuildInputs = [cmake git]; + + installPhase = '' + mkdir -p $out/bin + cp -a grfcodec grfid grfstrip nforenum $out/bin/ + ''; + + meta = with lib; { + description = "Low-level (dis)assembler and linter for OpenTTD GRF files"; + homepage = "http://openttd.org/"; + license = licenses.gpl2; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/pkgs/games/openttd/nml.nix b/pkgs/games/openttd/nml.nix new file mode 100644 index 00000000000..094330faffb --- /dev/null +++ b/pkgs/games/openttd/nml.nix @@ -0,0 +1,22 @@ +{ stdenv, lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "openttd-nml"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "OpenTTD"; + repo = "nml"; + rev = version; + sha256 = "0kfnkshff3wrxsj1wpfbbw2mmgww2q80v63p5d2pp1f38x8j33w9"; + }; + + propagatedBuildInputs = with python3Packages; [ply pillow]; + + meta = with lib; { + description = "Compiler for OpenTTD NML files"; + homepage = "http://openttdcoop.org/"; + license = licenses.gpl2; + maintainers = with maintainers; [ ToxicFrog ]; + }; +} diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index b09dc523d1a..5aa2408afd1 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -1,6 +1,4 @@ -{ lib, stdenv, fetchurl }: - -with lib; +{ lib, stdenv, fetchurl, fetchFromGitHub }: let # The x86-64-modern may need to be refined further in the future @@ -12,28 +10,29 @@ let if stdenv.isi686 then "x86-32" else if stdenv.isAarch64 then "armv8" else "unknown"; - version = "13"; - nnueFile = "nn-62ef826d1a6d.nnue"; + nnueFile = "nn-3475407dc199.nnue"; nnue = fetchurl { name = nnueFile; url = "https://tests.stockfishchess.org/api/nn/${nnueFile}"; - sha256 = "0qsy9rr4zgxrpgwhwbi96z01a2560am2b00q2klbj4bd39nq5vv2"; + sha256 = "sha256-NHVAfcGZc+pERnZ4Y0zOAj1iDkGXcMERzIk3/maJ7Ic="; }; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "stockfish"; - inherit version; + version = "14"; - src = fetchurl { - url = "https://github.com/official-stockfish/Stockfish/archive/sf_${version}.tar.gz"; - sha256 = "0qhxp2w543psanzhzn8jhfafx8aip57v9nsvafbwa5xynchlgl8m"; + src = fetchFromGitHub { + owner = "official-stockfish"; + repo = "Stockfish"; + rev = "sf_${version}"; + sha256 = "sha256-fX0Tr1yqjmNRSxmisFRKUY1E5//qF3zAfJ8innAeyxA="; }; # This addresses a linker issue with Darwin # https://github.com/NixOS/nixpkgs/issues/19098 - preBuild = optionalString stdenv.isDarwin '' + preBuild = lib.optionalString stdenv.isDarwin '' sed -i.orig '/^\#\#\# 3.*Link Time Optimization/,/^\#\#\# 3/d' Makefile ''; @@ -48,14 +47,14 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with lib; { homepage = "https://stockfishchess.org/"; description = "Strong open source chess engine"; longDescription = '' Stockfish is one of the strongest chess engines in the world. It is also much stronger than the best human chess grandmasters. ''; - maintainers = with maintainers; [ luispedro peti ]; + maintainers = with maintainers; [ luispedro peti siraben ]; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux"]; license = licenses.gpl2; }; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index 7f2ad875d8c..feadcc7f8b2 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -39,11 +39,11 @@ in stdenv.mkDerivation rec { inherit pname; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/releases/${version}/${pname}_src.tar.xz"; - sha256 = "1f8a4kflslsjl8jrryhwg034h1yc9y3y1zmllgww3fqkz3aj4xik"; + sha256 = "sha256-HQlphogK2jjTXV7cQ8lFNWjHMBnpStyvT3wKYjlDQW0="; }; buildInputs = [ @@ -84,10 +84,15 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWZ_DISTRIBUTOR=NixOS" # The cmake builder automatically sets CMAKE_INSTALL_BINDIR to an absolute - # path, but this results in an error. - # By resetting it, we let the CMakeLists set it to an accepted value - # based on prefix. - "-DCMAKE_INSTALL_BINDIR=" + # path, but this results in an error: + # + # > An absolute CMAKE_INSTALL_BINDIR path cannot be used if the following + # > are not also absolute paths: WZ_DATADIR + # + # WZ_DATADIR is based on CMAKE_INSTALL_DATAROOTDIR, so we set that. + # + # Alternatively, we could have set CMAKE_INSTALL_BINDIR to "bin". + "-DCMAKE_INSTALL_DATAROOTDIR=${placeholder "out"}/share" ]; postInstall = lib.optionalString withVideos '' diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index f6504b598cb..1f0f7ab6e91 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -41,6 +41,7 @@ in stdenv.mkDerivation { ./patches/cnijfilter-4.00-4-ppd.patch ./patches/cnijfilter-4.00-5-abi_x86_32.patch ./patches/cnijfilter-4.00-6-headers.patch + ./patches/cnijfilter-4.00-7-sysctl.patch ]; postPatch = '' diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch new file mode 100644 index 00000000000..a28ca208492 --- /dev/null +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/patches/cnijfilter-4.00-7-sysctl.patch @@ -0,0 +1,10 @@ +--- a/cnijnpr/src/cnijnpr.c ++++ b/cnijnpr/src/cnijnpr.c +@@ -33,7 +33,6 @@ + #include <signal.h> + #include <sys/ioctl.h> + #include <net/if.h> +-#include <sys/sysctl.h> + #include <sys/types.h> + #include <unistd.h> + #include <config.h> diff --git a/pkgs/misc/lightspark/default.nix b/pkgs/misc/lightspark/default.nix index 0e99767a2cb..a00e784df09 100644 --- a/pkgs/misc/lightspark/default.nix +++ b/pkgs/misc/lightspark/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "lightspark"; - version = "0.8.4.1"; + version = "0.8.5"; src = fetchFromGitHub { owner = "lightspark"; repo = "lightspark"; rev = version; - sha256 = "sha256-pIiv5wEDLvTHjlYSicXUTTI6pVAsO6FC39Gie9Z/hZ4="; + sha256 = "sha256-F+zCwKTPWkp+VWYvYN5+VbBJeQAwspKy7+Uv+ZstowA="; }; postPatch = '' diff --git a/pkgs/misc/pylode/default.nix b/pkgs/misc/pylode/default.nix index fb908151765..33e78bc1523 100644 --- a/pkgs/misc/pylode/default.nix +++ b/pkgs/misc/pylode/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - dateutil + python-dateutil falcon gunicorn isodate diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 15a129246e1..cc6d0ced6d1 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "8.0.1"; + version = "8.0.3"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; - rev = "d34499a2aafa024623a4210fe7f663cef13fe9a6"; - sha256 = "VKoGr3CTDFg3Q0X+MTlwa4BbfLB+28FeTyTJRCq37RA="; + rev = "v${version}"; + sha256 = "QflLh3fj+jOq/8etr9aG8LGrvtIlB/htVkWbdO+GIbM="; }; nativeBuildInputs = [ diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 49a45d6d24d..ea9aaae53ed 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -413,12 +413,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-06-30"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "01507625b76291bb41a3c92ca8a056d655b674cb"; - sha256 = "16n1vdgrn9rv7pzwzgisdhin81d5fhlyicp0m0md4g6sd6jfydqh"; + rev = "d66a7ec580c5e006bf44c5ffc0c17e39897b0c22"; + sha256 = "0an89qwx70gj3dzlmx9j61vmsqfzsh9p4jhqysrg1n6hx56ak7yj"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -810,12 +810,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-06-21"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "aa817559be68d9e90316bc7e5d3205fe2ffcffbe"; - sha256 = "06c9ab58rj0qx2nyl63qpx5r8lwlx320j7913nafpk268pmqdz4i"; + rev = "7df02d1bf18324d81cbc32b98c05f5aa936afc17"; + sha256 = "1vf2386xagiyh23kflcnckw5niy4xygns4pi3apq7kza05ca6861"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1364,12 +1364,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2021-06-17"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "f4a26c075f603c3d82baf56b04c9168a7e084c8b"; - sha256 = "02rsawnqixwq8cj8ryqg0nmmmzq5s1adfll9mmwa6bqh3nwxsb2s"; + rev = "1e540f25a4bb84fcc50b5f10c969fbda02d21027"; + sha256 = "17qpqiv63jpap10wgfkb6zmj2xqcl7jwjglg74y9pajkpm1l050h"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2039,12 +2039,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-06-27"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "00b0f865efdcb329629315c63e9dac5aa6a6e736"; - sha256 = "1c3bzhrsdbkwj9hj832bb9snr7b78yf8mbx9gm4fc2lbbnrxqvvp"; + rev = "0e9d4b4585f8a37d6cccbe9dd5993900b96a595b"; + sha256 = "0gpah47azk1miybwm2aa6m3vm08683z85rgrjfywx76fnih9rs66"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2316,12 +2316,12 @@ final: prev: julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "26beb1213019d56767e7f14ba1f2cbc33cb315b8"; - sha256 = "05bqimb70r646q9v7nshwapqs8n9hvbx55cxx6khd6gwvpckh22w"; + rev = "6ff9e9938badea96f64154f2991e165e8d340cf2"; + sha256 = "11k1gjsh8fibdpg5lrcq3rz90gwjb7725krhimnvhrkwhcyl1bwb"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2676,24 +2676,24 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-06-27"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "1e79310e57404e86e00ceca2c4657bb9a9072673"; - sha256 = "0v6kgjjy9ygr2vygh4zizfbnms33w3bn1b4zdljx79c358firgcx"; + rev = "b94accc40260be439b6bfa120402ebd10bd60577"; + sha256 = "19lz2l9dzq5a339rhp8xdzj1m0dxxnwm9w4kg4lizgxi1ck53dpq"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; lush-nvim = buildVimPluginFrom2Nix { pname = "lush-nvim"; - version = "2021-06-28"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "850a2aa8366bbe8b07088a19e6b6f2e8e76f2c9f"; - sha256 = "048fjsxrshlgcscs9c1y29fgpcb9l9cnhpghkj9ailpzjv4j5hxf"; + rev = "3232af465ed86b9a188389e52ce3c47cd811c3f3"; + sha256 = "1qcvi8kklggzl4k88n6zhxb08hh2srhm9vvnfrknlz751pgd8z3x"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -3084,12 +3084,12 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2021-06-28"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "b03c121c66d859fa165aaab05ba9c1c1b2098007"; - sha256 = "0b72c14sqjq8bb0xz1spp5lq2bs1fsbp651qiwvvcdlma5yf5vxk"; + rev = "3fdfd45119be64945e635bf2406fdb0430cb85df"; + sha256 = "1sd45xvvw4wgmzixlmaq6j0kvv25l561678q24l23swh77x617r4"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -3144,12 +3144,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2021-06-27"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "vhyrro"; repo = "neorg"; - rev = "639a2deb5e3783aeb8f7cddaade8e84575f3bc1e"; - sha256 = "0q890252cpcjy5a9xy6m5qlziqbqmfgy43l305aslv05yxbckk11"; + rev = "7fe4530c9a71f81444ad9fee9d89c5e2f5bfbf8d"; + sha256 = "1zyi32x8wfz3lqb2nqggrjlp8d0j4qpnkck4pfg15fgmkycrivf7"; }; meta.homepage = "https://github.com/vhyrro/neorg/"; }; @@ -3348,12 +3348,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-06-17"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "cbede2d4abef3f6054919863404ce46f3ed572a9"; - sha256 = "0w7fv6yl78inr81h57kgh5xfhha626sc2w8mmzgbwp7s7yhqxymk"; + rev = "98063a91de4179685c29acb1c765a99bf08ef0f2"; + sha256 = "18q05vfb4h94nlxylkir9chb3n62x2ibb3qlcij4rhn35fsnrfd9"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3468,12 +3468,12 @@ final: prev: nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "9a1ab398bfdb4bda1134b7a0e7a379017d3bdefa"; - sha256 = "04khvbxx5qsfzhg5ari55ka8ff9gpd2kh7s3vc27z1jz43vizrsa"; + rev = "a46dfe7d7fc8f7af5bb84006db45ba11fb7b786c"; + sha256 = "161zrqvw5kpcphn747cpa4388x4c2flps5qwxkl5yxkn320937im"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3600,12 +3600,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-06-29"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "234a8cdad1104dd562796e6ca2c6c41e22e5f77a"; - sha256 = "0w10mx66p9sil1aa6jhkfb7k2p4m2vwjbyr8f1dr2apn07cr72w8"; + rev = "161ec66bda585fd7ba402cf7434bac87c927734f"; + sha256 = "1d4qwxrkx9cbbrxddg2n9f7sszmp23jnx83g52yydsxhlxq8dj8l"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3684,24 +3684,24 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "a80ea23b4c765efe3b6eaa9440d19d298e4c709b"; - sha256 = "11m62asv3qrv5kh4gb8xvhjmxwbzxf26902cxn8gncclc79cr42i"; + rev = "a01a33f9a8aea3eb19eb76601131c01e23d8e034"; + sha256 = "1jsf6prmf1555kd87gfjdiydkvl15qk0lk6x04dwbrx6wxfvd77a"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-06-29"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "917ae3da7c0d827c819405cc747aafc8bb041dbd"; - sha256 = "00mh980ffh3k0cp4dm1qvx5x803kw8xajgvv86hw0yspmjb98d5d"; + rev = "5fa8d5741dca82a15426db659f461244975678e6"; + sha256 = "1xqq1m27w3vh1dd9g3k4kwva92hr8zf1xnlvqhy2jz1xazx4k2m1"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4008,12 +4008,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-06-19"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "268002fdba2f8f5a4e86574e3b9924ad6d42da20"; - sha256 = "07zskz9b5s4cainjqj431b2skzdrhnm8agydmjxmw13qjmwj0q7z"; + rev = "18da6621459032aa5608b760622f0bc8fdc0535c"; + sha256 = "1z1n3jpxmz3672f8bd6s898mlqjf17pv11qqy15l2npfd9crh5sv"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4057,12 +4057,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence-nvim"; - version = "2021-06-14"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "65a16b25f98891e2832daa437cdd682e546a494e"; - sha256 = "0fwxxrwad3y69bczs7rxa0brff4vp139w2ylv8rfh0v2dgx2gmay"; + rev = "774994a5b930b9e6635e6a9b83b7f476bdd7dd23"; + sha256 = "0q6d5k2rf6ci3mgmdga304ihklb10falp4g29djnfxxsi2iapvjv"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -4249,12 +4249,12 @@ final: prev: registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-06-21"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "6817136df80ae9ddb980a97f7e4cf31cc4f9fa4a"; - sha256 = "13di6mjn6wb931ak98g1xl99j97c2kphhqrbwh673nl7syqwhnrf"; + rev = "fd21f094a460bb319a8f6eac18653a1a2122d41c"; + sha256 = "0y5qga2x767blzbrlbfxidz73fpby81xpsw133wmfy3hnkg8xdam"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -4574,12 +4574,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-06-08"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "5c1fc0452387cae323692e3345238a780a942056"; - sha256 = "0j2bba7img06m6b7lzgw1q5r8g38cs70pynwisqdb34l5jbj0fqx"; + rev = "e8935bde797ce92318c60a21ee671caf04387a33"; + sha256 = "1sw8d7ipadpa4hazs2fija3rzlf6ch7h8lkm4k3hg9m9gpviygla"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4803,12 +4803,12 @@ final: prev: syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2021-05-19"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "176f364f1b4acf894cdc248944f2d5506a37cc80"; - sha256 = "01ylf4vjlisgls2f2gwlagg7x1yyhcr64kzdlzhcs3r8s3wdsf25"; + rev = "c89741ef310fd0a380ffb80b80e10f197afd6224"; + sha256 = "0n691w9mcq0ks7wvj9mpmwhqnkcd11lhzf4fz6pkki8g5i7zhqrh"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -4984,12 +4984,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-06-27"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "e5bd4963da81b5d044749ee4507061801aeb0f78"; - sha256 = "1dskr91qiark1z08yfjkbrnf1zvy2mci4avkdn574b7pz8v72lzb"; + rev = "5a53ec5c2fdab10ca8775d3979b1a85e63d57953"; + sha256 = "1mr98irwsc5pmj63ssxd3cdwb3x31lalbkk1pyp79bswdfjmx0nl"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5837,12 +5837,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-06-26"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "492eca7ff8e162ec8a8e4535860de399d7e1cd57"; - sha256 = "1xxgf3mk26pj3w2lzdr4aw8xvya02ar57v01v1yajlw0rzx23crw"; + rev = "4402c9292c4495916b075e27dac88ad391c47ceb"; + sha256 = "0hwap5z5727iq42zpl769m1w84qr41xgbg7rfjbk94qb3kkikb4m"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -9165,12 +9165,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-06-01"; + version = "2021-07-01"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "552403842b992efde3816a89b20055f7d66d9a0d"; - sha256 = "1pkkysv2mnbzm2bi33l1xccdb6sh06dgyg83dg0dgd0gmp94l7ya"; + rev = "a1d1841ecadc19eeab9efdd9fa17054cedcba6e6"; + sha256 = "0zzqxxv2jqi71p76z0fsnc25kmclazb3x6rg248npsn8pnfwwi1s"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -9502,12 +9502,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-06-28"; + version = "2021-06-30"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "299363d651c5a8c26a4440f434df613cdf66a4c4"; - sha256 = "18c9b35cjjrw2bf62j6ss5i7i21rz32nrm102bljybf2cfs700lf"; + rev = "c9b3b50427d97403e8a36b3fe2d636d0a97db0d8"; + sha256 = "1vpl02n2xy7b95mhagbsq7fiz55i0x3wpqpbmpmp16mva6r6agvr"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/pkgs/os-specific/linux/bpftools/default.nix b/pkgs/os-specific/linux/bpftools/default.nix index 3e20efa9f01..f2ca8d87471 100644 --- a/pkgs/os-specific/linux/bpftools/default.nix +++ b/pkgs/os-specific/linux/bpftools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ libopcodes libbfd libelf zlib readline ]; preConfigure = '' - patchShebangs scripts/bpf_helpers_doc.py + patchShebangs scripts/bpf_doc.py cd tools/bpf substituteInPlace ./bpftool/Makefile \ diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 650e85df517..4d2f29491fc 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "v${version}"; - sha256 = "sha256-DZO47AH506DBVH/AuvOF3JfpRxv/D/lmzVg8WOH9Dqo="; + sha256 = "sha256-BKWBdFzj0j7rAfG30A0fwyYCpOG/5NFRPODW46EP1u0="; }; buildInputs = with llvmPackages; diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index b389532c01a..fbb9bf93ed5 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,8 +1,8 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.12.13"; - suffix = "xanmod1-cacule"; + version = "5.13.0"; + suffix = "xanmod2-cacule"; in buildLinux (args // rec { inherit version; @@ -12,11 +12,10 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-eFIWlguU1hnkAgTbRxSMTStq0X7XW4IT1/9XlQSgdMQ="; + sha256 = "sha256-q+m1Ys/Gfr56cihoX8LS/w7icNcM3oefcXRtvzgx3cM="; }; structuredExtraConfig = with lib.kernel; { - # Preemptive Full Tickless Kernel at 500Hz PREEMPT_VOLUNTARY = lib.mkForce no; PREEMPT = lib.mkForce yes; @@ -47,7 +46,7 @@ buildLinux (args // rec { }; extraMeta = { - branch = "5.12-cacule"; + branch = "5.13-cacule"; maintainers = with lib.maintainers; [ fortuneteller2k ]; description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; broken = stdenv.isAarch64; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index cc335aec4c8..b58bca352e6 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,12 +1,14 @@ { lib, stdenv, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils , libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl -, zlib, withGtk ? false, gtk2 ? null +, zlib +, withGtk ? false, gtk2 +, withZstd ? true, zstd +, withLibcap ? true, libcap }: with lib; -assert withGtk -> gtk2 != null; assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { @@ -42,7 +44,9 @@ stdenv.mkDerivation { elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl libopcodes python3 perl ] ++ lib.optional withGtk gtk2 - ++ (if (versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]); + ++ (if (versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]) + ++ lib.optional withZstd zstd + ++ lib.optional withLibcap libcap; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. @@ -55,8 +59,7 @@ stdenv.mkDerivation { ]; postPatch = '' - patchShebangs scripts/bpf_helpers_doc.py - patchShebangs scripts/bpf_doc.py + patchShebangs scripts ''; doCheck = false; # requires "sparse" diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index 79271448b75..17f8b3a28c4 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders}: +{ lib, stdenv, fetchFromGitHub, kernel, linuxHeaders }: stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; - version = "3.0.5"; + version = "3.0.7"; src = fetchFromGitHub { owner = "tuxedocomputers"; repo = "tuxedo-keyboard"; rev = "v${version}"; - sha256 = "123ady2bi2dwbajy3pgv10l3g2pyhi5k31c1ii0zcrvl2qqhndck"; + sha256 = "sha256-JloLwfJfDdVowx1hOehjxPbnaKBCAMn7SZe09SE03HU="; }; buildInputs = [ linuxHeaders ]; diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 7d715cc3c09..7784aa8e03f 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -195,12 +195,12 @@ in { # to be adapted zfsStable = common { # check the release notes for compatible kernels - kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13"; + kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; # this package should point to the latest release. - version = "2.0.5"; + version = "2.1.0"; - sha256 = "0n0d8ab7ibxxa8znfsprh7jxwgighx5g291v7hi8272vfjrmk1mj"; + sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o="; }; zfsUnstable = common { @@ -208,9 +208,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.14"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc8"; + version = "2.1.0"; - sha256 = "0c53ca6xd59c30h3b2hmvyy63yqyk745x1kdfypnfqj3lnsj1pac"; + sha256 = "sha256-YdY4SStXZGBBdAHdM3R/unco7ztxI3s0/buPSNSeh5o="; isUnstable = true; }; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 843b7c34008..49beef53fe6 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.11.7.1"; + version = "20.11.8.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "0ril6k4dj96qhx5x7r4nc2ghp7n9700808731v4qn9yvcslqzg9a"; + sha256 = "0id2b01rvq81zd2p34il0gg880f94g9ip4gn1pyh20zz5bxlnbjc"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 73b1ba01844..d076f763bf9 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -8,6 +8,7 @@ , libprom , libpromhttp , libmicrohttpd +, nixosTests }: stdenv.mkDerivation rec { @@ -34,6 +35,8 @@ stdenv.mkDerivation rec { ./pure-configure.patch ]; + passthru.tests.coturn = nixosTests.coturn; + meta = with lib; { homepage = "https://coturn.net/"; license = with licenses; [ bsd3 ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b51cc9f0ba6..dbe9c938c67 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -646,7 +646,7 @@ "plugwise" = ps: with ps; [ plugwise ]; "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pycketcasts - "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint + "point" = ps: with ps; [ aiohttp-cors pypoint ]; "poolsense" = ps: with ps; [ poolsense ]; "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall "profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a9e477d3a4f..c9a4a15a87c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -606,6 +606,7 @@ in with py.pkgs; buildPythonApplication rec { "plant" "plex" "plugwise" + "point" "poolsense" "profiler" "prometheus" diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index a26dd47e024..c62ad8b75c9 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.39.0"; + version = "1.40.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-eyg2o/5k7/zagYjkYJOnJrHeoszbRkmdl7UgO+rmKyc="; + sha256 = "sha256-RgWDAvuxqZeFCU+Q2s+FDIM/AroIdnfVq/D5lG4XN7U="; }; - vendorSha256 = "sha256-aedJ7vsv70aybjqBfUnSr4qhlFdY7jUUOSas3vXskpM="; + vendorSha256 = "sha256-HbMM0IHw1DMDlNN1m2EHaG9CXnj9j9xROPQiT2xTGlM="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/servers/http/trafficserver/default.nix b/pkgs/servers/http/trafficserver/default.nix index 4a7f9854d18..e7ce72e086e 100644 --- a/pkgs/servers/http/trafficserver/default.nix +++ b/pkgs/servers/http/trafficserver/default.nix @@ -49,11 +49,11 @@ stdenv.mkDerivation rec { pname = "trafficserver"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { url = "mirror://apache/trafficserver/trafficserver-${version}.tar.bz2"; - sha256 = "1q164pvfmbqh3gzy3bqy96lwd0fdbhz78r06pd92p7rmkqwx005z"; + sha256 = "0r05iqmnnjq259nsibncgfrfsr0l4h3hsafizvgfl9zgmrkm6izz"; }; patches = [ @@ -63,13 +63,6 @@ stdenv.mkDerivation rec { url = "https://github.com/apache/trafficserver/commit/19d3af481cf74c91fbf713fc9d2f8b138ed5fbaf.diff"; sha256 = "0z1ikgpp00rzrrcqh97931586yn9wbksgai9xlkcjd5cg8gq0150"; }) - - # Fixes a bug in tspush which pushes incorrect contents to cache - # https://github.com/apache/trafficserver/pull/7696 - (fetchpatch { - url = "https://github.com/apache/trafficserver/commit/b08215272872f452787915cd3a8e0b0ea0b88385.diff"; - sha256 = "0axk8x1xvd8wvpgcxgyqqg7kgxyxwfgwmisq3xnk1da0cqv9cx9f"; - }) ]; # NOTE: The upstream README indicates that flex is needed for some features, diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index e445184b956..34bb901f671 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "389-ds-base"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "389ds"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-H0G8py4sB+2CSZKyCIb2TCIXOpnPx7udWUEK4Tg5TD8="; + sha256 = "sha256-MYLRrH3PrNdPVuRffiG39zzJK6eHJcvIDWn1q0IHrZ8="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { six pyasn1 pyasn1-modules - dateutil + python-dateutil argcomplete libselinux ])) diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 99eae786cbf..33d31fb8e72 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, isort, coverage, mock , robot-detection, django_extensions, rjsmin, cssmin, django-mailman3 -, django-haystack, flufl_lock, networkx, dateutil, defusedxml +, django-haystack, flufl_lock, networkx, python-dateutil, defusedxml , django-paintstore, djangorestframework, django, django-q , django_compressor, beautifulsoup4, six, psycopg2, whoosh, elasticsearch }: @@ -20,7 +20,7 @@ buildPythonPackage rec { nativeBuildInputs = [ isort ]; propagatedBuildInputs = [ robot-detection django_extensions rjsmin cssmin django-mailman3 - django-haystack flufl_lock networkx dateutil defusedxml + django-haystack flufl_lock networkx python-dateutil defusedxml django-paintstore djangorestframework django django-q django_compressor six psycopg2 isort ]; diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 450e454374f..570b2b40c15 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "2.28.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-AlAfs1wi3hS7cqAtGqfUgv5CIonu7TmXWgxL1zSBh54="; + sha256 = "sha256-DhSIf8fAG2Zf0mwJ/iMgQU5sugHK2jJ6WJPbFbA/mhM="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 99acc52b9de..14d0c63d90b 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.0.3"; + version = "8.0.4"; excludedPackages = [ "release_publisher" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-GGtmsz3c7Q6mEGCJ6cdz2CjOW0ovZZW8j6LMfFgrMZ4="; + sha256 = "sha256-I4TUPni2WDdpsV19nltsaF1PugB5SOtQ9Jb0YzWUwFg="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-2x0FhKinrXAFenJcUDh4Q3RJNBrqixKBNZT7BZNNOj8="; + sha256 = "sha256-GUVnw2kKxVfztvfsNMwRLxPTqRYzbxXzoH2GkmZB2JE="; }; vendorSha256 = "sha256-x7sSVIim/TOhMTbnRK/fpgxiSRSO8KwGILTE2i1gU3U="; diff --git a/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix index f87526242b8..c5189720660 100644 --- a/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/doitintl-bigquery-datasource/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "doitintl-bigquery-datasource"; - version = "2.0.1"; - zipHash = "sha256-tZyvER/rxL+mo2tgxFvwSIAmjFm/AnZ0RgvmD1YAE2U="; + version = "2.0.2"; + zipHash = "sha256-GE6DNuQ5WtS/2VmXbQBeRdVKDbLlLirWXW51i0RF6Cc="; meta = with lib; { description = "BigQuery DataSource for Grafana"; license = licenses.mit; diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix index 07694688c4a..85b4c7069a9 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-polystat-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin rec { pname = "grafana-polystat-panel"; - version = "1.2.3"; - zipHash = "sha256-Eu3dTPfJxAWwqqGT6l4El4MqviBbzERarU30OXU+eEM="; + version = "1.2.5"; + zipHash = "sha256-U9vNfK4ofNzwL7MVe43tGY85gI56Jt1eb7TrCkeNrOQ="; meta = with lib; { description = "Hexagonal multi-stat panel for Grafana"; license = licenses.asl20; diff --git a/pkgs/servers/monitoring/prometheus/bird-exporter.nix b/pkgs/servers/monitoring/prometheus/bird-exporter.nix index 67ec88332b5..f15f7b6e005 100644 --- a/pkgs/servers/monitoring/prometheus/bird-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bird-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bird-exporter"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "czerwonk"; repo = "bird_exporter"; rev = version; - sha256 = "06rlmmvr79db3lh54938yxi0ixcfb8fni0vgcv3nafqnlr2zbs58"; + sha256 = "sha256-zQKdO1E5VKZaQLNOfL3e/iCdugwNx3xFy7R7vun/Efs="; }; - vendorSha256 = "14bjdfqvxvb9gs1nm0nnlib52vd0dbvjll22x7d2cc721cbd0hj0"; + vendorSha256 = "sha256-o/OVWALLOw7eNH3xsQlQ5ZNFV3l9iD8lhyckBt6Qn3E="; passthru.tests = { inherit (nixosTests.prometheus-exporters) bird; }; diff --git a/pkgs/servers/pinnwand/default.nix b/pkgs/servers/pinnwand/default.nix index 3962ce97110..f8e3dfbc01c 100644 --- a/pkgs/servers/pinnwand/default.nix +++ b/pkgs/servers/pinnwand/default.nix @@ -21,7 +21,8 @@ with python3.pkgs; buildPythonApplication rec { substituteInPlace pyproject.toml \ --replace 'click = "^7.0"' 'click = "*"' \ --replace 'docutils = "^0.16"' 'docutils = "*"' \ - --replace 'sqlalchemy = "^1.3"' 'sqlalchemy = "*"' + --replace 'sqlalchemy = "^1.3"' 'sqlalchemy = "*"' \ + --replace 'token-bucket = "^0.2.0"' 'token-bucket = "*"' ''; nativeBuildInputs = [ diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 5973a1a190c..8ef89031c18 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "11.0.3"; + version = "11.0.4"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "sha256-oYlc6PSBLovNsEWDc6eGpDI85T6bTHgBvxA/PZP3aQU="; + sha256 = "sha256-a/IMroZ1zAgIv7Cx4kkj5byIMoC0o+seHhqVLaUUSqc="; }; buildInputs = with lib; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index d7611baad14..98a1223d279 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchpatch, stdenv, lib, pkg-config, autoreconfHook +{ fetchFromGitHub, stdenv, lib, pkg-config, autoreconfHook , ncurses, gnutls, readline , openssl, perl, sqlite, libjpeg, speex, pcre, libuuid , ldns, libedit, yasm, which, libsndfile, libtiff @@ -88,21 +88,14 @@ in stdenv.mkDerivation rec { pname = "freeswitch"; - version = "1.10.5"; + version = "1.10.6"; src = fetchFromGitHub { owner = "signalwire"; repo = pname; rev = "v${version}"; - sha256 = "18dhyb19k28dcm1i8mhqvvgm2phsrmrwyjmfn79glk8pdlalvcha"; + sha256 = "1i5n06pds3kvzhhzfwvhwxnvcb2p2fcr8k52157aplm2i7prl4q2"; }; - patches = [ - # https://github.com/signalwire/freeswitch/pull/812 fix mod_spandsp, mod_gsmopen build, drop when updating from 1.10.5 - (fetchpatch { - url = "https://github.com/signalwire/freeswitch/commit/51fba83ed3ed2d9753d8e6b13e13001aca50b493.patch"; - sha256 = "0h2bmifsyyasxjka3pczbmqym1chvz91fmb589njrdbwpkjyvqh3"; - }) - ]; postPatch = '' patchShebangs libs/libvpx/build/make/rtcd.pl substituteInPlace libs/libvpx/build/make/configure.sh \ @@ -117,10 +110,11 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ pkg-config autoreconfHook ]; + strictDeps = true; + nativeBuildInputs = [ pkg-config autoreconfHook perl which yasm ]; buildInputs = [ - openssl ncurses gnutls readline perl libjpeg - sqlite pcre speex ldns libedit yasm which + openssl ncurses gnutls readline libjpeg + sqlite pcre speex ldns libedit libsndfile libtiff libuuid ] diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index db588b3abe0..64f603a4f07 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -4,7 +4,7 @@ , bzip2, lz4, lzo, snappy, xz, zlib, zstd , fixDarwinDylibNames, cctools, CoreServices, less , numactl # NUMA Support -, withStorageMroonga ? true, kytea, msgpack, zeromq +, withStorageMroonga ? true, kytea, libsodium, msgpack, zeromq , withStorageRocks ? true }: @@ -155,7 +155,7 @@ server = stdenv.mkDerivation (common // { bzip2 lz4 lzo snappy xz zstd libxml2 judy libevent cracklib ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl - ++ optionals withStorageMroonga [ kytea msgpack zeromq ] + ++ optionals withStorageMroonga [ kytea libsodium msgpack zeromq ] ++ optional stdenv.hostPlatform.isLinux linux-pam ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; diff --git a/pkgs/servers/sql/materialize/default.nix b/pkgs/servers/sql/materialize/default.nix index 5a2a3ad8ebf..f2c6d59bd2a 100644 --- a/pkgs/servers/sql/materialize/default.nix +++ b/pkgs/servers/sql/materialize/default.nix @@ -40,17 +40,17 @@ let in rustPlatform.buildRustPackage rec { pname = "materialize"; - version = "0.8.0"; - rev = "b2fe225f1afcfec4912976bdaa4a44caf3ca0842"; + version = "0.8.1"; + rev = "ef996c54db7c9504690b9f230a4a676ae1fb617f"; src = fetchFromGitHub { owner = "MaterializeInc"; repo = pname; - inherit rev; - hash = "sha256:09q1bfgsp6j8l8wv2abgibndwfkg2w3nm4dif4qgdkd52fdg0kc5"; + rev = "v${version}"; + sha256 = "1lrv0q191rhdqk316557qk2a6b00vrf07j1g63ri6mp8ad1g8gk3"; }; - cargoSha256 = "sha256:0y2r4980dyajf2ql9vb2jxcsn0a2q0gd3f8v932fgjqw13ysmi0s"; + cargoSha256 = "0fx7m1ci4zak7sm71kdiaj2l29rlqax15hd424i9yn4aj1bd358b"; nativeBuildInputs = [ cmake perl pkg-config ] # Provides the mig command used by the krb5-src build script @@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec { ''; MZ_DEV_BUILD_SHA = rev; - cargoBuildFlags = [ "--package materialized" ]; + cargoBuildFlags = [ "--bin materialized" ]; postInstall = '' install --mode=444 -D ./misc/dist/materialized.service $out/etc/systemd/system/materialized.service diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 81f3f4fee25..4b69aca710a 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.1.2"; + version = "3.1.3"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "0ch7gry8a1i9114mlhklxryn7ja3flsz6pxj9r5p09k92xh3gp9c"; + sha256 = "1jwz6hdrym837b7dvn00qmwnbb40a7gr43va409h8fmp7dajksbi"; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index d898cc9bcca..ad96798133b 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -11,14 +11,14 @@ in buildGoModule rec { pname = "teleport"; - version = "6.2.5"; + version = "6.2.7"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-OBo1TWN7KxI7DAUcRLwXXQjErhhgpLBrJBR55ewKiYw="; + sha256 = "0ychs2pqi3awbr0vraz0ksddwk5hihrd1d9raq8mxyw5dz5124ki"; }; vendorSha256 = null; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 3ba6f327042..afcded31116 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -33,7 +33,7 @@ toPythonModule (buildPythonApplication rec { propagatedBuildInputs = [ Babel certifi - dateutil + python-dateutil flask flaskbabel gevent diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index 46d7ebfd85a..c16391a3c50 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -32,6 +32,7 @@ , stdenv , wayland , wayland-protocols +, wayland-scanner , xkbcomp , xkeyboard_config , xorgproto @@ -47,7 +48,16 @@ stdenv.mkDerivation rec { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; sha256 = "sha256-MfJhzlG77namyj7AKqNn/6K176K5hBLfV8zv16GQA84="; }; - nativeBuildInputs = [ pkg-config meson ninja ]; + + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ + pkg-config + meson + ninja + wayland-scanner + ]; buildInputs = [ egl-wayland epoxy diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index d9fd55f32c9..5b61e4828ef 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - boto3 termcolor dateutil docutils setuptools jmespath + boto3 termcolor python-dateutil docutils setuptools jmespath ]; checkInputs = [ python3Packages.pytestCheckHook ]; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 32049fd11b6..9af721f02e5 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.54.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-hWrSjkEdhb0F5lwFGwjkR2G6gQ8T8HommH2lxJE+0bk="; + sha256 = "sha256-5PrwOR70pSmNPHFSDHRvXNn0pksIQun5jJkcCFsYhCE="; }; - vendorSha256 = "sha256-499c3Y9IUV8lc+O9qcEeFKQDT4QDvOPmu0rmps7M47w="; + vendorSha256 = "sha256-N2jdaz0lb4Ut8P+FgNNjgyUeJ731fTQ5XSQgOF8KCQs="; doCheck = false; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index d6b264a4aa3..7136fecf433 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "exoscale-cli"; - version = "1.32.2"; + version = "1.34.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Yx+GA959AB6m62hDlZKYjsuT9Y9TJbIdzUVBMM8OgTg="; + sha256 = "sha256-Gu9o1aUDlhcEZPZZsfVF0FnlzT1DvbEXMXjnOxhY8tY="; }; goPackagePath = "github.com/exoscale/cli"; diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix index 8996ef5069f..729f0aa8fd9 100644 --- a/pkgs/tools/admin/oci-cli/default.nix +++ b/pkgs/tools/admin/oci-cli/default.nix @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - oci arrow certifi pinned_click configparser cryptography jmespath dateutil + oci arrow certifi pinned_click configparser cryptography jmespath python-dateutil pytz retrying six terminaltables pyopenssl pyyaml ]; diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index c619a69c111..4b4dadd4faf 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, bash, btrfs-progs, openssh, perl, perlPackages -, util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper }: +, util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper, nixosTests }: stdenv.mkDerivation rec { pname = "btrbk"; @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { --prefix PATH ':' "${lib.makeBinPath [ btrfs-progs bash mbuffer openssh ]}" ''; + passthru.tests.btrbk = nixosTests.btrbk; + meta = with lib; { description = "A backup tool for btrfs subvolumes"; homepage = "https://digint.ch/btrbk"; diff --git a/pkgs/tools/backup/rotate-backups/default.nix b/pkgs/tools/backup/rotate-backups/default.nix index c0a06e1b9ae..405fc6c3955 100644 --- a/pkgs/tools/backup/rotate-backups/default.nix +++ b/pkgs/tools/backup/rotate-backups/default.nix @@ -1,17 +1,33 @@ -{ lib, buildPythonPackage, fetchFromGitHub, update-dotdee, simpleeval, dateutil }: +{ lib +, python3 +, fetchFromGitHub +}: -buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "rotate-backups"; - version = "6.0"; + version = "8.1"; src = fetchFromGitHub { owner = "xolox"; repo = "python-rotate-backups"; rev = version; - sha256 = "0i59qfv1cfm0ss63ab2nrkn5wr4rxpqqmvfd7pf9c3pl9dbfq20c"; + sha256 = "0r4dyd7hj403rksgp3vh1azp9n4af75r3wq3x39wxcqizpms3vkx"; }; - propagatedBuildInputs = [ update-dotdee simpleeval dateutil ]; + propagatedBuildInputs = with python3.pkgs; [ + python-dateutil + simpleeval + update-dotdee + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + disabledTests = [ + # https://github.com/xolox/python-rotate-backups/issues/33 + "test_removal_command" + ]; meta = with lib; { description = "Simple command line interface for backup rotation"; @@ -20,4 +36,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ eyjhb ]; }; } - diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/tools/backup/tarsnapper/default.nix index b02ce82291a..a5ad2c3625c 100644 --- a/pkgs/tools/backup/tarsnapper/default.nix +++ b/pkgs/tools/backup/tarsnapper/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { py.test . ''; - propagatedBuildInputs = with python3Packages; [ pyyaml dateutil pexpect ]; + propagatedBuildInputs = with python3Packages; [ pyyaml python-dateutil pexpect ]; patches = [ ./remove-argparse.patch ]; diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/tools/cd-dvd/isomd5sum/default.nix index 2ca14cc4d60..9cb033e15d1 100644 --- a/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1wjnh2hlp1hjjm4a8wzdhdrm73jq41lmpmy3ls0rh715p3j7z4q9"; }; - buildInputs = [ python3 popt ] ; + strictDeps = true; + nativeBuildInputs = [ python3 ]; + buildInputs = [ popt ] ; postPatch = '' substituteInPlace Makefile --replace "#/usr/" "#" diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index a25bf744a91..0ccc96ce188 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -38,7 +38,7 @@ # Linux Only Dependencies , linuxHeaders, util-linux, libuuid, udev, keyutils, rdma-core, rabbitmq-c -, libaio ? null, libxfs ? null, zfs ? null +, libaio ? null, libxfs ? null, zfs ? null, liburing ? null , ... }: @@ -130,7 +130,9 @@ let ps.Mako ceph-common ps.cherrypy - ps.dateutil + ps.cmd2 + ps.colorama + ps.python-dateutil ps.jsonpatch ps.pecan ps.prettytable @@ -176,7 +178,7 @@ in rec { snappy lz4 oathToolkit leveldb libnl libcap_ng rdkafka cryptsetup sqlite lua icu bzip2 ] ++ lib.optionals stdenv.isLinux [ - linuxHeaders util-linux libuuid udev keyutils optLibaio optLibxfs optZfs + linuxHeaders util-linux libuuid udev keyutils liburing optLibaio optLibxfs optZfs # ceph 14 rdma-core rabbitmq-c ] ++ lib.optionals hasRadosgw [ @@ -207,11 +209,12 @@ in rec { "-DMGR_PYTHON_VERSION=${ceph-python-env.python.pythonVersion}" "-DWITH_SYSTEMD=OFF" "-DWITH_TESTS=OFF" + "-DWITH_CEPHFS_SHELL=ON" # TODO breaks with sandbox, tries to download stuff with npm "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}'' - ]; + ] ++ lib.optional stdenv.isLinux "-DWITH_SYSTEM_LIBURING=ON"; postFixup = '' wrapPythonPrograms diff --git a/pkgs/tools/graphics/adriconf/default.nix b/pkgs/tools/graphics/adriconf/default.nix new file mode 100644 index 00000000000..74ff4f1ed66 --- /dev/null +++ b/pkgs/tools/graphics/adriconf/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, lib +, fetchFromGitLab +, cmake +, pkg-config +, libdrm +, libGL +, atkmm +, pcre +, gtkmm3 +, boost +, libxmlxx3 +, mesa +, pciutils +}: + +stdenv.mkDerivation rec { + pname = "adriconf"; + version = "2.4.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mesa"; + repo = pname; + rev = "v${version}"; + sha256 = "hZy+FpKKBKuho/fALu2O+44zzK6s/M8CTbhrO00ANgo="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libdrm libGL atkmm pcre gtkmm3 boost libxmlxx3 mesa pciutils ]; + + cmakeFlags = [ "-DENABLE_UNIT_TESTS=off" ]; + + meta = with lib; { + homepage = "https://gitlab.freedesktop.org/mesa/adriconf/"; + description = "A GUI tool used to configure open source graphics drivers"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ musfay ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index c05a552f205..b200f487b23 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -7,11 +7,11 @@ with lib; stdenv.mkDerivation rec { pname = "gifsicle"; - version = "1.92"; + version = "1.93"; src = fetchurl { url = "https://www.lcdf.org/gifsicle/${pname}-${version}.tar.gz"; - sha256 = "0rffpzxcak19k6cngpxn73khvm3z1gswrqs90ycdzzb53p05ddas"; + sha256 = "sha256-kvZweXMr9MHaCH5q4JBSBYRuWsd3ulyqZtEqc6qUNEc="; }; buildInputs = optionals gifview [ xorgproto libXt libX11 ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index ea82ccaf96b..44a44b3af2b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -1,70 +1,64 @@ { lib, stdenv, fetchFromGitHub, which, ninja, pkg-config, protobuf , ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }: -let - japanese_usage_dictionary = fetchFromGitHub { - owner = "hiroyuki-komatsu"; - repo = "japanese-usage-dictionary"; - rev = "e5b3425575734c323e1d947009dd74709437b684"; - sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm"; - }; -in stdenv.mkDerivation rec { - name = "ibus-mozc-${version}"; - version = "2.23.4206.102"; - - meta = with lib; { - isIbusEngine = true; - description = "Japanese input method from Google"; - homepage = "https://github.com/google/mozc"; - license = licenses.free; - platforms = platforms.linux; - maintainers = with maintainers; [ gebner ericsagnes ]; - }; - - nativeBuildInputs = [ which ninja python3Packages.python python3Packages.six - python3Packages.gyp pkg-config qt5.wrapQtAppsHook ]; - buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ]; +stdenv.mkDerivation rec { + pname = "ibus-mozc"; + version = "2.26.4423.100"; src = fetchFromGitHub { - owner = "google"; - repo = "mozc"; - rev = "91cc1e19ef34aeb12888b697fefa52907f1a834d"; - sha256 = "1fyy9g1pnaq6s5nkf56aqmp5mgyibbmp1ylc64fqc6g1plg90zk2"; + owner = "google"; + repo = "mozc"; + rev = "7654223979067e3c5ae52ea238d43880c5508f85"; + sha256 = "aZVuhj4I9ZCsVR9dOplOd9zinYMgYw5SF5wG3IxBTO0="; fetchSubmodules = true; }; - postUnpack = '' - rm -rf $sourceRoot/src/third_party/japanese_usage_dictionary/ - ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary - '' + lib.optionalString stdenv.isLinux '' + nativeBuildInputs = [ + which ninja python3Packages.python python3Packages.six + python3Packages.gyp pkg-config qt5.wrapQtAppsHook + ]; + + buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ]; + + postUnpack = lib.optionalString stdenv.isLinux '' sed -i 's/-lc++/-lstdc++/g' $sourceRoot/src/gyp/common.gypi ''; configurePhase = '' + runHook preConfigure + export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model" cd src && python build_mozc.py gyp --gypdir=${python3Packages.gyp}/bin --server_dir=$out/lib/mozc + + runHook postConfigure ''; buildPhase = '' + runHook preBuild + PYTHONPATH="$PWD:$PYTHONPATH" python build_mozc.py build -c Release \ unix/ibus/ibus.gyp:ibus_mozc \ unix/emacs/emacs.gyp:mozc_emacs_helper \ server/server.gyp:mozc_server \ gui/gui.gyp:mozc_tool \ renderer/renderer.gyp:mozc_renderer + + runHook postBuild ''; installPhase = '' + runHook preInstall + install -d $out/share/licenses/mozc head -n 29 server/mozc_server.cc > $out/share/licenses/mozc/LICENSE - install -m 644 data/installer/*.html $out/share/licenses/mozc/ + install -m 644 data/installer/*.html $out/share/licenses/mozc/ install -D -m 755 out_linux/Release/mozc_server $out/lib/mozc/mozc_server install -m 755 out_linux/Release/mozc_tool $out/lib/mozc/mozc_tool wrapQtApp $out/lib/mozc/mozc_tool install -d $out/share/doc/mozc - install -m 644 data/installer/*.html $out/share/doc/mozc/ + install -m 644 data/installer/*.html $out/share/doc/mozc/ install -D -m 755 out_linux/Release/ibus_mozc $out/lib/ibus-mozc/ibus-engine-mozc install -D -m 644 out_linux/Release/gen/unix/ibus/mozc.xml $out/share/ibus/component/mozc.xml @@ -79,5 +73,16 @@ in stdenv.mkDerivation rec { install -m 644 data/images/unix/ui-alpha_half.png $out/share/ibus-mozc/alpha_half.png install -m 644 data/images/unix/ui-alpha_full.png $out/share/ibus-mozc/alpha_full.png install -D -m 755 out_linux/Release/mozc_renderer $out/lib/mozc/mozc_renderer + + runHook postInstall ''; + + meta = with lib; { + isIbusEngine = true; + description = "Japanese input method from Google"; + homepage = "https://github.com/google/mozc"; + license = licenses.free; + platforms = platforms.linux; + maintainers = with maintainers; [ gebner ericsagnes ]; + }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix index d444d44f233..af3fcbe4e2c 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix @@ -1,36 +1,36 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gdk-pixbuf, glib, ibus, libnotify -, librime, brise }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gdk-pixbuf +, glib +, ibus +, libnotify +, librime +, pkg-config +, rime-data +}: stdenv.mkDerivation rec { pname = "ibus-rime"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "rime"; repo = "ibus-rime"; rev = version; - sha256 = "0zbajz7i18vrqwdyclzywvsjg6qzaih64jhi3pkxp7mbw8jc5vhy"; + sha256 = "0gdxg6ia0i31jn3cvh1nrsjga1j31hf8a2zfgg8rzn25chrfr319"; }; - buildInputs = [ gdk-pixbuf glib ibus libnotify librime brise ]; + buildInputs = [ gdk-pixbuf glib ibus libnotify librime rime-data ]; nativeBuildInputs = [ cmake pkg-config ]; - makeFlags = [ "PREFIX=$(out)" ]; - dontUseCmakeConfigure = true; + cmakeFlags = [ "-DRIME_DATA_DIR=${rime-data}/share/rime-data" ]; prePatch = '' - substituteInPlace Makefile \ - --replace 'cmake' 'cmake -DRIME_DATA_DIR=${brise}/share/rime-data' - - substituteInPlace rime_config.h \ - --replace '/usr' $out - - substituteInPlace rime_config.h \ - --replace 'IBUS_RIME_SHARED_DATA_DIR IBUS_RIME_INSTALL_PREFIX' \ - 'IBUS_RIME_SHARED_DATA_DIR "${brise}"' - - substituteInPlace rime.xml \ - --replace '/usr' $out + substituteInPlace CMakeLists.txt \ + --replace 'DESTINATION "''${RIME_DATA_DIR}"' \ + 'DESTINATION "''${CMAKE_INSTALL_DATADIR}/rime-data"' ''; meta = with lib; { diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index 9c952cc7c30..3dc3fa1bbe2 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,22 +1,39 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages, unstableGitUpdater, gnupg }: python3Packages.buildPythonApplication rec { - version = "1.8.1"; pname = "apt-offline"; + version = "unstable-2021-04-11"; src = fetchFromGitHub { owner = "rickysarraf"; repo = pname; - rev = "v${version}"; - sha256 = "0k79d1d8jiwg1s684r05njmk1dz8gsb8a9bl4agz7m31snc11j84"; + rev = "4e4b3281d004d1ece4833b7680e2b5b091402a03"; + sha256 = "1lk4186h2wc8fphd592rhq7yj4kgc7jjawx4pjrs6pg4n0q32pl6"; }; + postPatch = '' + substituteInPlace org.debian.apt.aptoffline.policy \ + --replace /usr/bin/ "$out/bin" + + substituteInPlace apt_offline_core/AptOfflineCoreLib.py \ + --replace /usr/bin/gpgv "${gnupg}/bin/gpgv" + ''; + + preFixup = '' + rm "$out/bin/apt-offline-gui" + rm "$out/bin/apt-offline-gui-pkexec" + ''; + doCheck = false; - # Requires python-qt4 (feel free to get it working). - preFixup = ''rm "$out/bin/apt-offline-gui"''; + pythonimportsCheck = [ "apt-offline" ]; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/rickysarraf/apt-offline.git"; + }; meta = with lib; { + homepage = "https://github.com/rickysarraf/apt-offline"; description = "Offline APT package manager"; license = licenses.gpl3; maintainers = [ ]; diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index da79110f9a8..ef84981a9d9 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, fetchurl, lib -, dateutil, argcomplete, argh, psycopg2, boto3 +, python-dateutil, argcomplete, argh, psycopg2, boto3 }: buildPythonApplication rec { @@ -12,7 +12,7 @@ buildPythonApplication rec { sha256 = "Ts8I6tlP2GRp90OIIKXy+cRWWvUO3Sm86zq2dtVP5YE="; }; - propagatedBuildInputs = [ dateutil argh psycopg2 boto3 argcomplete ]; + propagatedBuildInputs = [ python-dateutil argh psycopg2 boto3 argcomplete ]; # Tests are not present in tarball checkPhase = '' diff --git a/pkgs/tools/misc/beats/default.nix b/pkgs/tools/misc/beats/default.nix index 1e6f155f350..3e471c76fdf 100644 --- a/pkgs/tools/misc/beats/default.nix +++ b/pkgs/tools/misc/beats/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "beats"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "j0hax"; repo = "beats"; rev = "v${version}"; - sha256 = "0qs5cmbncqhs11m4whqmrh2gvv3p3b37qz57xh78x2ma8jbhskqz"; + sha256 = "1rdvsqrjpily74y8vwch711401585xckb4p41cfwrmj6vf44jhif"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index d1f9ca80f70..a5c456c0050 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -75,7 +75,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "An interactive tree view, a fuzzy search, a balanced BFS descent and customizable commands"; homepage = "https://dystroy.org/broot/"; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; license = with licenses; [ mit ]; }; } diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 4d69f237a08..5d9790ec2be 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.0.15"; + version = "2.1.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-PUcsDyszFT4DzTwvbcCO8FQErvmotmY7gREZ2sgpcw8="; + sha256 = "sha256-TEY3oEAWnS+iuLgAgR9mp1TaEb+wzlAgN41dgLRdUs4="; }; - vendorSha256 = "sha256-7SfqBxCfOYwePK/6SsWS5StuVr0png6WjQXIDuQW0EE="; + vendorSha256 = "sha256-pr6bMO1klq/V9zkBftLleSRTg3zjl24EuA283M88HY4="; doCheck = false; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 07a2d02b0b2..e4e4868e4d9 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { homepage = "http://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = licenses.gpl2; - maintainers = with maintainers; [ funfunctor fpletz ]; + maintainers = with maintainers; [ funfunctor fpletz felixsinger ]; platforms = platforms.all; broken = stdenv.isDarwin; # requires DirectHW }; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 6f0c90517da..051e61e7af8 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, ncurses, gettext, openssl, withGeolocation ? true, libmaxminddb }: stdenv.mkDerivation rec { - version = "1.5"; + version = "1.5.1"; pname = "goaccess"; src = fetchurl { url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "sha256-liJtXfiXAyg+NBCcF+G07v4kBKWefHaitu76EPOqwWE="; + sha256 = "sha256-iEF+eOYrcN45gLdiKRHk/NcZw2YPADyIeWjnGWw5lw8="; }; configureFlags = [ diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index f5ed58f84fd..18c936befb4 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.172.0"; + version = "0.172.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QHtxrdmtmvnyMmtpvbEw5VjGz2XN1iqHu+5dHS9yiNo="; + sha256 = "sha256-xTLNAcqvk5GDs9HsNvL+4SPeT8baFMg7J0yW+E8x+Gc="; }; vendorSha256 = "sha256-Zd48I7e5zCbSXz5RVckMXQMpqvf6gAoajx5yLk2ODmU="; diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix index 286bc4cbca2..abe1872c67f 100644 --- a/pkgs/tools/misc/infracost/default.nix +++ b/pkgs/tools/misc/infracost/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "infracost"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-3dR4NZ1PiMuHNO+xl3zxeBLPOZTLAbJ0VtYJNYpJuXI="; + sha256 = "sha256-TM+7Am5hoiRk/StAwCh5yAN1GKv3oPun38pvhArBoJg="; }; - vendorSha256 = "sha256-YHewZsIiDPsgJVYwQX/FovlD+UzJflXy/0oglk8ZkKk="; + vendorSha256 = "sha256-6sMtM7MTFTDXwH8AKr5Dxq8rPqE92xzcWqBTixcPi+8="; checkInputs = [ terraform ]; checkPhase = "make test"; diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index 546dcb112a8..b1ece43154f 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -2,18 +2,21 @@ buildGoModule rec { pname = "kepubify"; - version = "3.1.6"; + version = "4.0.0"; src = fetchFromGitHub { owner = "pgaskin"; repo = pname; rev = "v${version}"; - sha256 = "129izxgvhcybipfgcwzzwsir9zhi7axxadnw822zy5rk2ky4zjpk"; + sha256 = "sha256-Mxe43U0kxkSdAzs+lSJ0x/VspbJPam59DpTpFEJVMl4="; }; - vendorSha256 = "0vwzm1c4kada7mqdkr444gj8c2vkvz7av9wkpgdpjrq0v2h0hpcc"; + vendorSha256 = "sha256-bLQH7ZY2hE8fBTcW7DNoUQxe4N3m9Mv3JjjKO4cG7DY="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + # remove when built with >= go 1.17 + buildFlags = [ "-tags" "zip117" ]; + + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; excludedPackages = [ "kobotest" ]; diff --git a/pkgs/tools/misc/mslink/default.nix b/pkgs/tools/misc/mslink/default.nix index 56354ff2527..6db1ae3275c 100644 --- a/pkgs/tools/misc/mslink/default.nix +++ b/pkgs/tools/misc/mslink/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ gccStdenv , lib , fetchurl }: -stdenv.mkDerivation rec { +gccStdenv.mkDerivation rec { pname = "mslink"; version = "1.3"; @@ -17,6 +17,9 @@ stdenv.mkDerivation rec { ''; installPhase = '' + if [[ "$(uname)" == "Darwin" ]]; then + mv mslink.exe mslink + fi install -D mslink $out/bin/mslink ''; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index 1237645ebae..66429f338ac 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ncdu"; - version = "1.15.1"; + version = "1.16"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "1c1zxalm5asyhn4p1hd51h7khw17515gbqmvdz63kc8xpx6xqbdh"; + sha256 = "1m0gk09jaz114piidiw8fkg0id5l6nhz1cg5nlaf1yl3l595g49b"; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index a80fdd56864..6e7484a7e40 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -1,18 +1,26 @@ -{ fetchFromGitHub, rustPlatform, lib, stdenv, fetchpatch -, CoreFoundation, libiconv, libresolv, Security }: +{ fetchFromGitHub +, rustPlatform +, lib +, stdenv +, fetchpatch +, CoreFoundation +, libiconv +, libresolv +, Security +}: rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.9.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-owa+HmzMXpLR7H1FssW4gQiVAQGJRXhcitgJj6pxJRc="; + sha256 = "sha256-lrRp01ZeK9bGn7L7SqAxJAU9qugpHnC06CWChhVPGGQ="; }; - cargoSha256 = "sha256-Bn2FlRESuW83ouGPiBwvGkIB0uCDDG0hdhRfRBks/0Q="; + cargoSha256 = "sha256-vNa1OF1x/MCTo9B4DTDZNWyHTsOl7Za3EgjnpsL/gWg="; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv libresolv Security ]; @@ -20,6 +28,6 @@ rustPlatform.buildRustPackage rec { description = "Git repository summary on your terminal"; homepage = "https://github.com/o2sh/onefetch"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne kloenk ]; + maintainers = with maintainers; [ Br1ght0ne kloenk SuperSandro2000 ]; }; } diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix index 916f15c94c6..8403a6c2575 100644 --- a/pkgs/tools/misc/pdd/default.nix +++ b/pkgs/tools/misc/pdd/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication, dateutil }: +{ lib, fetchFromGitHub, buildPythonApplication, python-dateutil }: buildPythonApplication rec { pname = "pdd"; @@ -13,7 +13,7 @@ buildPythonApplication rec { format = "other"; - propagatedBuildInputs = [ dateutil ]; + propagatedBuildInputs = [ python-dateutil ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/piston-cli/default.nix b/pkgs/tools/misc/piston-cli/default.nix index ec77007804b..5e1ca0242bc 100644 --- a/pkgs/tools/misc/piston-cli/default.nix +++ b/pkgs/tools/misc/piston-cli/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "qvDGVJcaMXUajdUQWl4W1dost8k0PsS9XX/o8uQrtfY="; }; - propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments pyyaml ]; + propagatedBuildInputs = with python3Packages; [ rich prompt_toolkit requests pygments pyyaml more-itertools ]; checkPhase = '' $out/bin/piston --help > /dev/null diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 3b6df828fda..36afc1d4cbb 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - argcomplete dateutil configobj feedparser bibtexparser pyyaml requests six + argcomplete python-dateutil configobj feedparser bibtexparser pyyaml requests six beautifulsoup4 ]; diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index 40e5d4d23ae..3fa088d8e2b 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -3,38 +3,59 @@ , fetchpatch }: -python3.pkgs.buildPythonApplication rec { +let + inherit (python3.pkgs) buildPythonApplication fetchPypi; +in +buildPythonApplication rec { pname = "qmk"; - version = "0.0.45"; + version = "0.0.52"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "43f297f36b21d68c34c5efa0ce1449dddb2e28753f80939cadf761ee7a2a0901"; + sha256 = "sha256-mNF+bRhaL6JhNbROmjYDHkKKokRIALd5FZbRt9Kg5XQ="; }; - patches = [ - # https://github.com/qmk/qmk_cli/pull/48 - (fetchpatch { - name = "remove-unused-install-requires.patch"; - url = "https://github.com/qmk/qmk_cli/commit/75b6ada1feccfa5a9bc2bb07a4cc749ef40d02dd.patch"; - sha256 = "0lwi1dz35p07vha5gwq2jxm5q49vm99ix4jyhd6g6ypqbq1qiwc8"; - }) - ]; - nativeBuildInputs = with python3.pkgs; [ + flake8 + nose2 + pep8-naming setuptools-scm + yapf ]; propagatedBuildInputs = with python3.pkgs; [ + appdirs + argcomplete + colorama + dotty-dict + hid + hjson + jsonschema milc + pygments + pyusb ]; # no tests implemented doCheck = false; meta = with lib; { - description = "A program to help users work with QMK Firmware"; homepage = "https://github.com/qmk/qmk_cli"; + description = "A program to help users work with QMK Firmware"; + longDescription = '' + qmk_cli is a companion tool to QMK firmware. With it, you can: + + - Interact with your qmk_firmware tree from any location + - Use qmk clone to pull down anyone's qmk_firmware fork + - Setup and work with your build environment: + - qmk setup + - qmk doctor + - qmk compile + - qmk console + - qmk flash + - qmk lint + - ... and many more! + ''; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; }; diff --git a/pkgs/tools/misc/tvnamer/default.nix b/pkgs/tools/misc/tvnamer/default.nix new file mode 100644 index 00000000000..204914c280c --- /dev/null +++ b/pkgs/tools/misc/tvnamer/default.nix @@ -0,0 +1,47 @@ +{ lib +, python3 +}: + +let + python' = python3.override { + packageOverrides = self: super: rec { + # tvdb_api v3.1.0 has a hard requirement on requests-cache < 0.6 + requests-cache = super.requests-cache.overridePythonAttrs (super: rec { + version = "0.5.2"; + src = self.fetchPypi { + inherit (super) pname; + inherit version; + sha256 = "sha256-gTAjJpaGBF+OAeIonMHn6a5asi3dHihJqQk6s6tycOs="; + }; + + # too many changes have been made to requests-cache based on version 0.6 so + # simply disable tests + doCheck = false; + }); + }; + }; + + pypkgs = python'.pkgs; + +in +pypkgs.buildPythonApplication rec { + pname = "tvnamer"; + version = "3.0.4"; + + src = pypkgs.fetchPypi { + inherit pname version; + sha256 = "dc2ea8188df6ac56439343630466b874c57756dd0b2538dd8e7905048f425f04"; + }; + + propagatedBuildInputs = with pypkgs; [ tvdb_api ]; + + # no tests from pypi + doCheck = false; + + meta = with lib; { + description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api."; + homepage = "https://github.com/dbr/tvnamer"; + license = licenses.unlicense; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/tools/misc/yajsv/default.nix b/pkgs/tools/misc/yajsv/default.nix new file mode 100644 index 00000000000..6e5f20bfbd2 --- /dev/null +++ b/pkgs/tools/misc/yajsv/default.nix @@ -0,0 +1,28 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +let version = "1.4.0"; +in buildGoModule { + pname = "yajsv"; + version = version; + + src = fetchFromGitHub { + owner = "neilpa"; + repo = "yajsv"; + rev = "v${version}"; + sha256 = "0smaij3905fqgcjmnfs58r6silhp3hyv7ccshk7n13fmllmsm7v7"; + }; + + vendorSha256 = "0rmc31i5jra2qcqhw1azflmhawxasrq0d6qwd6qp250sj1jr6ahq"; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/yajsv -v > /dev/null + ''; + + meta = { + description = "Yet Another JSON Schema Validator"; + homepage = "https://github.com/neilpa/yajsv"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rycee ]; + }; +} diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 67dce4c2e8b..bf8a1b8e4f8 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { pname = "amass"; - version = "3.11.2"; + version = "3.13.2"; src = fetchFromGitHub { owner = "OWASP"; @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-3J4yT7GTuVzkxMb+fCD3S9u0XBHa4Y0W+BnkDJ4PhWI="; }; - vendorSha256 = "sha256-8GzzihKhrf71lLKgb2i3NnmSctvKb95V5pOGoWAgclk="; + vendorSha256 = "0nbj41ha31lkwraxwvyavdr94y9nnxl6z85jjkszxbd12a5g6v7h"; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index ab26a39035e..5c9abf57892 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.3.0"; + version = "0.4.0"; src = let @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { x86_64-darwin = "darwin_amd64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-vBXNDd9p9g1joBMcwt87uI/EIAeKa+QrndCh1kTwZyM="; - aarch64-linux = "sha256-Xompe1Q8Q3gAqpQQT04CWDx/f0Yc8HbnkZQbN+faB0g="; - x86_64-darwin = "sha256-cE4YrZPNAldCR31O3gI4W/y4RgV7+64yL15obb5uRcY="; + x86_64-linux = "sha256-xHvg2Kdm7hoJ7Dwh4pLXJE+EPcl9Zta/00IN3wRnOzU="; + aarch64-linux = "sha256-Kbr7tZjVcYiejy1CB9r10mqG+0serRx+mjPXds2/TJQ="; + x86_64-darwin = "sha256-a8e3gKTTsK5QRAYrB4/DtrFFGM2In73wKEcEMcbeUTI="; }; in fetchzip { diff --git a/pkgs/tools/networking/cloud-custodian/default.nix b/pkgs/tools/networking/cloud-custodian/default.nix index a57d9f13d78..c5e1f7527da 100644 --- a/pkgs/tools/networking/cloud-custodian/default.nix +++ b/pkgs/tools/networking/cloud-custodian/default.nix @@ -3,7 +3,7 @@ , boto3 , botocore , certifi -, dateutil +, python-dateutil , jsonpatch , jsonschema , pyyaml @@ -26,7 +26,7 @@ buildPythonApplication rec { boto3 botocore certifi - dateutil + python-dateutil jsonpatch jsonschema pyyaml diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 96f806aad39..98925489e54 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "2.28.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-AlAfs1wi3hS7cqAtGqfUgv5CIonu7TmXWgxL1zSBh54="; + sha256 = "sha256-DhSIf8fAG2Zf0mwJ/iMgQU5sugHK2jJ6WJPbFbA/mhM="; }; vendorSha256 = "sha256-PWm7XnO6LPaU8g8ymmqRkQv2KSX9kLv9RVaa000mrTY="; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 8daa2f10d7e..e852fdb1c2d 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "1.9.8"; + version = "1.9.9"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-EAi1Ic3YEF0or37At48saKwmAczTwf5GtbEsQNopbl0="; + sha256 = "sha256-iVSWBR1+SkXlkwMii2PXpcxFSXYigz4lfNnMZBvS2kM="; }; patches = [ ./dont-create-var.patch ]; diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 15f6ff3dfa0..888d6a05c67 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }: +{ lib, buildPythonApplication, fetchFromGitHub, python_magic, python-dateutil }: buildPythonApplication rec { pname = "s3cmd"; @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "0p6mbgai7f0c12pkw4s7d649gj1f8hywj60pscxvj9jsna3iifhs"; }; - propagatedBuildInputs = [ python_magic dateutil ]; + propagatedBuildInputs = [ python_magic python-dateutil ]; dontUseSetuptoolsCheck = true; diff --git a/pkgs/tools/networking/stevenblack-blocklist/default.nix b/pkgs/tools/networking/stevenblack-blocklist/default.nix index 9edb878a53f..b8b04583108 100644 --- a/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.7.11"; + version = "3.7.12"; in fetchFromGitHub { name = "stevenblack-blocklist-${version}"; @@ -9,7 +9,7 @@ fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = version; - sha256 = "sha256-hoYh2FdZGY/4/QmrqZubJYHP3bBcnUQFR9C7dfVTnWE="; + sha256 = "sha256-hGaiIFHgsLb6oLJ4k4yfxqeDhK0W+diCAI5odo08Q0E="; meta = with lib; { description = "Unified hosts file with base extensions"; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index f8b6c845a52..befc1c3c3ee 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.58"; + version = "5.59"; src = fetchurl { url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "d4c14cc096577edca3f6a2a59c2f51869e35350b3988018ddf808c88e5973b79"; + sha256 = "sha256-E3d232vo8XAfHNWQt3eZMuEjR5+5HlGSFxwWeYgVzp8="; # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index f1fe0527639..6726e5b751a 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpdump"; - version = "4.99.0"; + version = "4.99.1"; src = fetchurl { url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz"; - sha256 = "0hmqh2fx8rgs9v1mk3vpywj61xvkifz260q685xllxr8jmxg3wlc"; + sha256 = "sha256-ebNphfsnAxRmGNh8Ss3j4Gi5HFU/uT8CGjN/F1/RDr4="; }; postPatch = '' diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 8228132b5c8..506869238e5 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yggdrasil"; - version = "0.3.16"; + version = "0.4.0"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "sha256-uUF0zkgtzdMZB/GKOtawjn7AQBkRoiAEj9nUUmpQSVQ="; + sha256 = "sha256-sMcbOTLdmAXp3U2XeNM0hrwOTjzr+9B6IvAaVbjhuFY="; }; - vendorSha256 = "sha256-619PSqd7pl3Akj/kzLQhDIp1adumBGhLrzQsZvMzC7w="; + vendorSha256 = "sha256-QQN8ePOQ7DT9KeuY4ohFuPtocuinh3Y3us6QMnCQ4gc="; doCheck = false; diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index 6fa0dd38127..00b3a65be0d 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -1,19 +1,36 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, openssl +, pkg-config +, Security +, libiconv +}: + rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "RustSec"; - repo = "cargo-audit"; - rev = "v${version}"; - sha256 = "sha256-apIhTgS7xzDGq2OE1o46bEQxGwkV7bTmzSxy85wHwyo="; + repo = "rustsec"; + rev = "cargo-audit%2Fv${version}"; + sha256 = "0pvb1m9277ysjzydjvx7viybi6bd23ch7sbjyx1wnz45ahrmia1j"; }; - cargoSha256 = "sha256-b4x5IxoT5KZnY6Pw3VEs/DuCPen6MlgQ2lSIxRDU+5U="; + cargoSha256 = "0cf8kg8vhfqbrkm227rzyl3394n7fsqhqgq13qks7374h5d04haw"; + + nativeBuildInputs = [ + pkg-config + ]; - buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; - nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + openssl + libiconv + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; # enables `cargo audit fix` cargoBuildFlags = [ "--features fix" ]; diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index fe8f743c71c..beb04041861 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.15"; + version = "0.9.17"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Cd0QWFeAAHSkeCVQvb+Fsg5nBoutV1k1kQpMkWpci2E="; + sha256 = "sha256-Ian/vXGoPHecguQUp2IUgdLW6Ll8OdCA2W0WmoYPDrI="; }; - cargoSha256 = "sha256-VngJMDVKIV8+ODHia2U2gKKPKskyKiuKhSnO6NJsJHI="; + cargoSha256 = "sha256-eDu1dAs543AryUEsCY9COHrvuamQocCk0nBXDIdFmYs="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index bfe003c4890..aeb18f2efde 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "sunng87"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-hEpPRAUPHz9lDTJLyDMUAS+dH6hlppvi3Bb3ahnYW9U="; + sha256 = "sha256-+vQXaI6v8HXzsfXZFxmBJe+1u9nmW0z3SBjo38orJYA="; }; - cargoSha256 = "sha256-tOiralZWA21HBTxYWVB1LZH2ArfgY7HB45dVqHoXe/Q="; + cargoSha256 = "sha256-Zcg1MAAESD6qrh7domslisT2wG4ZaYyZtPCQ5IQrLVo="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/pkgs/tools/package-management/fpm/Gemfile.lock index c8bb7d36413..b3e8b9d221a 100644 --- a/pkgs/tools/package-management/fpm/Gemfile.lock +++ b/pkgs/tools/package-management/fpm/Gemfile.lock @@ -1,40 +1,36 @@ GEM remote: https://rubygems.org/ specs: - arr-pm (0.0.10) + arr-pm (0.0.11) cabin (> 0) - backports (3.14.0) + backports (3.21.0) cabin (0.9.0) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) clamp (1.0.1) - dotenv (2.7.2) - ffi (1.10.0) - fpm (1.11.0) - arr-pm (~> 0.0.10) + dotenv (2.7.6) + fpm (1.13.0) + arr-pm (~> 0.0.11) backports (>= 2.6.2) cabin (>= 0.6.0) - childprocess (= 0.9.0) clamp (~> 1.0.0) - ffi - json (>= 1.7.7, < 2.0) + git (>= 1.3.0, < 2.0) + json (>= 1.7.7, < 3.0) pleaserun (~> 0.0.29) - ruby-xz (~> 0.2.3) + rexml stud + git (1.8.1) + rchardet (~> 1.8) insist (1.0.0) - io-like (0.3.0) - json (1.8.6) + json (2.5.1) mustache (0.99.8) - pleaserun (0.0.30) + pleaserun (0.0.32) cabin (> 0) clamp dotenv insist mustache (= 0.99.8) stud - ruby-xz (0.2.3) - ffi (~> 1.9) - io-like (~> 0.3) + rchardet (1.8.0) + rexml (3.2.5) stud (0.0.23) PLATFORMS diff --git a/pkgs/tools/package-management/fpm/gemset.nix b/pkgs/tools/package-management/fpm/gemset.nix index 654a640c6ec..dca13598e8c 100644 --- a/pkgs/tools/package-management/fpm/gemset.nix +++ b/pkgs/tools/package-management/fpm/gemset.nix @@ -5,20 +5,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07yx1g1nh4zdy38i2id1xyp42fvj4vl6i196jn7szvjfm0jx98hg"; + sha256 = "17qssricshzs2ml1jvn4bs2h85gxvrqm074pl5nl8vr74620iazi"; type = "gem"; }; - version = "0.0.10"; + version = "0.0.11"; }; backports = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn"; + sha256 = "0xqvwj3mm28g1z4npya51zjcvxaniyyzn3fwgcdwmm8xrdbl8fgr"; type = "gem"; }; - version = "3.14.0"; + version = "3.21.0"; }; cabin = { groups = ["default"]; @@ -30,17 +30,6 @@ }; version = "0.9.0"; }; - childprocess = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0a61922kmvcxyj5l70fycapr87gz1dzzlkfpq85rfqk5vdh3d28p"; - type = "gem"; - }; - version = "0.9.0"; - }; clamp = { groups = ["default"]; platforms = []; @@ -56,31 +45,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13cis6bf06hmz744xrsl163p6gb78xcm8g8q4pcabsy5ywyv6kag"; + sha256 = "0iym172c5337sm1x2ykc2i3f961vj3wdclbyg1x6sxs3irgfsl94"; type = "gem"; }; - version = "2.7.2"; + version = "2.7.6"; }; - ffi = { + fpm = { + dependencies = ["arr-pm" "backports" "cabin" "clamp" "git" "json" "pleaserun" "rexml" "stud"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p"; + sha256 = "03ss7yh628f0m6by23q3sniq660gm07mkz6wqjpvr118gc0h53sa"; type = "gem"; }; - version = "1.10.0"; + version = "1.13.0"; }; - fpm = { - dependencies = ["arr-pm" "backports" "cabin" "childprocess" "clamp" "ffi" "json" "pleaserun" "ruby-xz" "stud"]; + git = { + dependencies = ["rchardet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0khzsiqzswxpql6w2ws9dawb27zgv4nmgrjszydmm0xpv6h21jrm"; + sha256 = "0vdcv93s33d9914a9nxrn2y2qv15xk7jx94007cmalp159l08cnl"; type = "gem"; }; - version = "1.11.0"; + version = "1.8.1"; }; insist = { groups = ["default"]; @@ -92,57 +82,56 @@ }; version = "1.0.0"; }; - io-like = { + json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04nn0s2wmgxij3k760h3r8m1dgih5dmd9h4v1nn085yi824i5z6k"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "0.3.0"; + version = "2.5.1"; }; - json = { + mustache = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; + sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; type = "gem"; }; - version = "1.8.6"; + version = "0.99.8"; }; - mustache = { + pleaserun = { + dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; + sha256 = "1aykf0l8327bqkkf5xd9jcglsib973zpy37cfnlf4j0vp0cdpn2d"; type = "gem"; }; - version = "0.99.8"; + version = "0.0.32"; }; - pleaserun = { - dependencies = ["cabin" "clamp" "dotenv" "insist" "mustache" "stud"]; + rchardet = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hgnrl67zkqaxmfkwbyscawj4wqjm7h8khpbj58s6iw54wp3408p"; + sha256 = "1isj1b3ywgg2m1vdlnr41lpvpm3dbyarf1lla4dfibfmad9csfk9"; type = "gem"; }; - version = "0.0.30"; + version = "1.8.0"; }; - ruby-xz = { - dependencies = ["ffi" "io-like"]; + rexml = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11bgpvvk0098ghvlxr4i713jmi2izychalgikwvdwmpb452r3ndw"; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; type = "gem"; }; - version = "0.2.3"; + version = "3.2.5"; }; stud = { groups = ["default"]; diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix index ae01601dde4..af83d04e811 100644 --- a/pkgs/tools/package-management/nix-doc/default.nix +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-doc"; - version = "0.3.3"; + version = "0.5.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "lf-"; repo = "nix-doc"; - sha256 = "0vd7159y5w8jjgaw51kfr3z3r50299gvw7vjchpqx3nwmdink8bh"; + sha256 = "1s0nlbn5fcgqfns8gpx3i87k5qivd8ar59rklvd7fbn6ckrmzi6m"; }; doCheck = true; @@ -16,11 +16,11 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "0xsy13yxm8vblab73gynb781ya168w66c32i1lyv0ns1lnz61dmh"; + cargoSha256 = "0xmw3fyic0fcg7a6z8dr3lv367bxqdhdrlrl2hhlz59xg5kq8b3f"; meta = with lib; { description = "An interactive Nix documentation tool"; - longDescription = "An interactive Nix documentation tool providing a CLI for function search and a Nix plugin for docs in the REPL"; + longDescription = "An interactive Nix documentation tool providing a CLI for function search, a Nix plugin for docs in the REPL, and a ctags implementation for Nix script"; homepage = "https://github.com/lf-/nix-doc"; license = licenses.lgpl3; maintainers = [ maintainers.lf- ]; diff --git a/pkgs/tools/package-management/nixops/azure-storage/default.nix b/pkgs/tools/package-management/nixops/azure-storage/default.nix index 6693a7464d4..c6f3d71e98e 100644 --- a/pkgs/tools/package-management/nixops/azure-storage/default.nix +++ b/pkgs/tools/package-management/nixops/azure-storage/default.nix @@ -4,7 +4,7 @@ , python , azure-common , futures -, dateutil +, python-dateutil , requests , isPy3k }: @@ -19,7 +19,7 @@ buildPythonPackage rec { sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; }; - propagatedBuildInputs = [ azure-common dateutil requests ] + propagatedBuildInputs = [ azure-common python-dateutil requests ] ++ pkgs.lib.optionals (!isPy3k) [ futures ]; postInstall = '' diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index e15618da3f1..20735c6e578 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "age"; - version = "1.0.0-rc.1"; - vendorSha256 = "1qx6pkhq00y0lsi6f82g8hxxh65zk1c0ls91ap6hdlj7ch79bhl2"; + version = "1.0.0-rc.3"; + vendorSha256 = "sha256-sXUbfxhPmJXO+KgV/dmWmsyV49Pb6CoJLbt50yVgEvI="; src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; rev = "v${version}"; - sha256 = "1n25wip4qnd3v9ial1apc2ybx10b9z6lwz7flyss6kvj3x5g9jd1"; + sha256 = "sha256-YXdCTK9/eMvcHWg7gQQiPlLWYx2OjbOJDDNdSYO09HU="; }; meta = with lib; { diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index daddf9a71b6..39756c9e9a7 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -17,11 +17,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.26.4"; + x86_64-linux = "1.27.0"; }.${system} or ""; sha256 = { - x86_64-linux = "sha256-PYqLf1Y3SwPFjq8JJMxHrKWKuCqbVpmzugi3DjRNWUg="; + x86_64-linux = "sha256-Ik+g7jkTBHRbGwDhbiJGQorMmt6GhCXVUd82Sug9a28="; }.${system} or ""; meta = with lib; { diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index e92fe7b951f..6ef07c2c355 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cfssl"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cfssl"; rev = "v${version}"; - sha256 = "1yzxz2l7h2d3f8j6l9xlm7g9659gsa17zf4q0883s0jh3l3xgs5n"; + sha256 = "sha256-29HEaW5LCoHcuJrfVUN2hnsRtaSTrvIBo8ok2UJbfuQ="; }; subPackages = [ diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index ded48ffb273..bfcd1f81768 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-06-29"; + version = "2021-07-03"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "sha256-RF7+fo6I7rz7PTSHRDikeRpM0f4Bugn+Tt5Z7mjIKIM="; + sha256 = "sha256-q+p4OnDs7T4bfCgKg4KBRwNyutULSItFATBE/ECG8N4="; }; installPhase = '' diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index dea65ca7164..358acf376b4 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.12.6"; + version = "1.12.7"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "17y9indpgqqx261bqvckfqq1q2zciahssaalaa5c5hb6bnw5ls52"; + sha256 = "08mzm03vhc8pqyl17y8dkrcpgy3ckmb84x84b6ap3cja3y8gmj5x"; }; - vendorSha256 = "106rn0bkvzf2fw21f6wpiya88ysj8sfc2zkkm47iqr23d2202i4b"; + vendorSha256 = "0ym6f1h51bj3qlzxs936fz3p47l63nad4xckl16m13iy0k7z5flg"; subPackages = [ "." ]; diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 613d93747ed..7df1090b2b0 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nHSnDrvz0EwDnmYch/bDJOZkf1b1Vrf1960d637ZmBs="; + sha256 = "sha256-fYeZFNtftG46/QHdV5UhCNCdP7ErOgwWfEB4V14ei5k="; }; - vendorSha256 = "sha256-+1XJTr/WJIz/gvvl9KNp68OVEkjHk+KunAd4trd2T/Y="; + vendorSha256 = "sha256-mW3e4WFa9pKSpyTZYmPA2j8nZz+94G2PqdqI0BDo3wc="; propagatedBuildInputs = [ docker ]; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index f1268717a91..ec240a7c715 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.6.1"; + version = "5.7.1"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "12b0jdwhnvxb51x3pq0g0f23grv9yjbxmpsz36n8ab3j0fvmfg0g"; + sha256 = "sha256-72rVk8pYIQFESQqBu4bmFBPpAOB0oG2Iu36TbAdecBw="; }; patches = [ diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix index b2ef8d8354b..094aab1e86d 100644 --- a/pkgs/tools/security/lynis/default.nix +++ b/pkgs/tools/security/lynis/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lynis"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "CISOfy"; repo = pname; rev = version; - sha256 = "sha256-/pF1V8ZsylQOCW7K/O0R3HYYDdsdNDVmmUar21EzpcQ="; + sha256 = "sha256-IJCLj3iSPkfkYOqTu7adtU26jTgKfRmiwIfKvSApdIY="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 9f0af308cfb..79f85f2b375 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.49" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.51" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index ce054a6a480..8248f6e8181 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 2e07122e80d8ae23e6aa53ae0fcb9dfca6639c59 - ref: refs/tags/6.0.49 + revision: d9aeac3fea255c475f553be4c55f3ae7cefc8542 + ref: refs/tags/6.0.51 specs: - metasploit-framework (6.0.49) + metasploit-framework (6.0.51) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -55,6 +55,7 @@ GIT rb-readline recog redcarpet + reline (= 0.2.5) rex-arch rex-bin_tools rex-core @@ -125,13 +126,13 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.469.0) - aws-sdk-core (3.114.3) + aws-partitions (1.473.0) + aws-sdk-core (3.115.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.244.0) + aws-sdk-ec2 (1.246.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.55.0) @@ -155,7 +156,7 @@ GEM cookiejar (0.3.3) crass (1.0.6) daemons (1.4.0) - dnsruby (1.61.5) + dnsruby (1.61.7) simpleidn (~> 0.1) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -172,7 +173,7 @@ GEM eventmachine (1.2.7) faker (2.18.0) i18n (>= 1.6, < 2) - faraday (1.4.2) + faraday (1.4.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) @@ -198,8 +199,8 @@ GEM i18n (1.8.10) concurrent-ruby (~> 1.0) io-console (0.5.9) - irb (1.3.5) - reline (>= 0.1.5) + irb (1.3.6) + reline (>= 0.2.5) jmespath (1.4.0) jsobfu (0.4.2) rkelly-remix @@ -344,7 +345,7 @@ GEM rex-socket rex-text rex-struct2 (0.1.3) - rex-text (0.2.34) + rex-text (0.2.35) rex-zip (0.1.4) rex-text rexml (3.2.5) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index b8ad99b9178..c48c5e1690e 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.50"; + version = "6.0.51"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-ZtIpkUt3jIhe4st8JlxE0rvLe6P+QBGdjyTL13Avwj0="; + sha256 = "sha256-ICVF4GVOyCq7dUAvzUUzhG+NuEiHSFvVWbQ8tAqUFFg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 7f43161b5be..b52bff8aa8b 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,30 +114,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xh65jmz3s12kfi7ij0j89d638nzdvq4z6dq9amzgmiw09ycvdbr"; + sha256 = "1dw05k0l63lm631lwg5b1bx1nhkirds4rbc1v98bliwfjk5wf71a"; type = "gem"; }; - version = "1.469.0"; + version = "1.473.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10wk5y4flc04cc42cmcfgr9sj67mz4582d45xmll56mpz4cw5cfc"; + sha256 = "06cs5wj4njb2ivhv06v5d7rgy1i2g67a93c0kxly8h7fkkxh315q"; type = "gem"; }; - version = "3.114.3"; + version = "3.115.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnpxgcmacmqs98swlv3qkg7svpwydb1kqsngqciyg3jddzxrzp6"; + sha256 = "0n3m2a8jnk64ai4wb1wh1a77i8c561ncjklvp650w8723avbj5bq"; type = "gem"; }; - version = "1.244.0"; + version = "1.246.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -274,10 +274,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q7k7wn8flcdr0kzgknq40cjddd0zn3g3n4gwwwdz0kq30pinzxx"; + sha256 = "1pbhj4xmj4262in6c1nwl5ssw0qypg8ysjrrkwn2akkzbxzy9rfq"; type = "gem"; }; - version = "1.61.5"; + version = "1.61.7"; }; domain_name = { groups = ["default"]; @@ -354,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07mhk70gv453pg38md346470hknyhipdqppnplq706ll3k3lzb7v"; + sha256 = "0zmdsl6n05khwwq8gjssmfca0ifz6q82wwghf1qyzbxxjdna5mly"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.3"; }; faraday-em_http = { groups = ["default"]; @@ -494,10 +494,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i0izb1jm4ijydwk9w2jqyvz72aznaa1b386769yfi8284cnwj6"; + sha256 = "0s4yjh5p1n05cm3pglh3g4ssrgy67x2bn3bsl0sydbm8mlf3xivr"; type = "gem"; }; - version = "1.3.5"; + version = "1.3.6"; }; jmespath = { groups = ["default"]; @@ -574,12 +574,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "2e07122e80d8ae23e6aa53ae0fcb9dfca6639c59"; - sha256 = "0zxyr1r88qslw6ypjqxx188vhmikl94fmkcdg3phm8r71qa375da"; + rev = "d9aeac3fea255c475f553be4c55f3ae7cefc8542"; + sha256 = "0n0ljh5b8g5lb7amnj4792w8svw46d2wsbs0fnxjmj2fcph4a990"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.49"; + version = "6.0.51"; }; metasploit-model = { groups = ["default"]; @@ -1156,10 +1156,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01g6jr73c3hbqhmzlc80jlqz2cwn9bq1j3cc19fpkq3hdg89drjp"; + sha256 = "0idgw5z813h5dp82n07g5ldpyfnk7mhvnzl87d9fpy6invixnnbq"; type = "gem"; }; - version = "0.2.34"; + version = "0.2.35"; }; rex-zip = { groups = ["default"]; diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index 5d1244e8619..43a39010441 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "sn0int"; - version = "0.21.1"; + version = "0.21.2"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LjNOaqYGlhF0U+YxoLLmmXgxPa8f+t9BSm+qO23waaI="; + sha256 = "sha256-BKdi/o/A0fJBlcKTDTCX7uGkK6QR0S9hIn0DI3CN5Gg="; }; - cargoSha256 = "sha256-ruK+qDIqrltNcErBnrcHdPfVKmwPwiPfq42A/el206c="; + cargoSha256 = "sha256-MeMTXwb5v4iUJQSViOraXAck7n6VlIW2Qa0qNUZWu1g="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 29762fc527c..4bd7a3ff221 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "sslscan"; - version = "2.0.9"; + version = "2.0.10"; src = fetchFromGitHub { owner = "rbsec"; repo = "sslscan"; rev = version; - sha256 = "0594svwz4pya0syibar0ahmi5zdjbwd5kg6hrlhfpmmslrsyli6m"; + sha256 = "sha256-L6cNmvR6zy2tkMHh+LBsQ3VZDUr0tD5AlOEj+dTLV5k="; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 36ccb89dcfe..5fd0578bc87 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -1,22 +1,22 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { pname = "terrascan"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P16CS1W42Q/glsB9G0kagB5oSgwLb5cGMvKFc9jzd8s="; + sha256 = "sha256-eCkinYJtZNf5Fo+LXu01cHRInA9CfDONvt1OIs3XJSk="; }; - vendorSha256 = "sha256-22T7C4/ph3z+O1c9uC1p2xzg0JFV+TEdfy4iiIS4Y40="; + vendorSha256 = "sha256-eez/g0Np/vnSO6uvUA8vtqR3DEaKlBo6lyd9t25LE7s="; - # tests want to download a vulnerable Terraform project + # Tests want to download a vulnerable Terraform project doCheck = false; meta = with lib; { diff --git a/pkgs/tools/security/traitor/default.nix b/pkgs/tools/security/traitor/default.nix index 2da9262709a..e056b556aad 100644 --- a/pkgs/tools/security/traitor/default.nix +++ b/pkgs/tools/security/traitor/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "traitor"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "liamg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UuWJe4nVr87ab3yskqKxnclMg9EywlcgaM/WOREXD/c="; + sha256 = "sha256-eUeKkjSpKel6XH3/VVw/WPCG/Nq8BcZwMNFG9z9FUuU="; }; vendorSha256 = null; diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 2790a643499..4342c8f3ac9 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, nixosTests +{ lib, stdenv, rustPlatform, fetchFromGitHub, fetchurl, nixosTests , pkg-config, openssl , libiconv, Security, CoreServices , dbBackend ? "sqlite", libmysqlclient, postgresql }: @@ -7,16 +7,18 @@ let featuresFlag = "--features ${dbBackend}"; in rustPlatform.buildRustPackage rec { - pname = "bitwarden_rs"; - version = "1.20.0"; + pname = "vaultwarden"; + version = "1.22.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "1ncy4iwmdzdp8rv1gc5i4s1rp97d94n4l4bh08v6w4zdpx0zn8b9"; + sha256 = "sha256-aXbnNO3mTAgE1yNx7YVDo1vPpO8ACZpBGHQ633fNZ3k="; }; + cargoSha256 = "sha256-SFzq3OU0a0s3zlEzUkqGdZb/knYafqDamLy4ghH4i8I="; + nativeBuildInputs = [ pkg-config ]; buildInputs = with lib; [ openssl ] ++ optionals stdenv.isDarwin [ libiconv Security CoreServices ] @@ -25,7 +27,6 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "0vdi792bzqxj8g215r9r5anzs4qhqsm6sjzwpj1l9861bn7j4xsz"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' @@ -35,11 +36,11 @@ in rustPlatform.buildRustPackage rec { runHook postCheck ''; - passthru.tests = nixosTests.bitwarden; + passthru.tests = nixosTests.vaultwarden; meta = with lib; { description = "Unofficial Bitwarden compatible server written in Rust"; - homepage = "https://github.com/dani-garcia/bitwarden_rs"; + homepage = "https://github.com/dani-garcia/vaultwarden"; license = licenses.gpl3Only; maintainers = with maintainers; [ msteen ]; }; diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/vaultwarden/vault.nix index 2b0855b821d..49e7cc4f3ba 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/vaultwarden/vault.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, nixosTests }: stdenv.mkDerivation rec { - pname = "bitwarden_rs-vault"; + pname = "vaultwarden-vault"; version = "2.19.0"; src = fetchurl { @@ -10,16 +10,16 @@ stdenv.mkDerivation rec { }; buildCommand = '' - mkdir -p $out/share/bitwarden_rs/ - cd $out/share/bitwarden_rs/ + mkdir -p $out/share/vaultwarden/ + cd $out/share/vaultwarden/ tar xf $src mv web-vault vault ''; - passthru.tests = nixosTests.bitwarden; + passthru.tests = nixosTests.vaultwarden; meta = with lib; { - description = "Integrates the web vault into bitwarden_rs"; + description = "Integrates the web vault into vaultwarden"; homepage = "https://github.com/dani-garcia/bw_web_builds"; platforms = platforms.all; license = licenses.gpl3Plus; diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index ac980e6c36c..de9afdae294 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "System management interface for AMD GPUs supported by ROCm"; homepage = "https://github.com/RadeonOpenCompute/ROC-smi"; license = with licenses; [ mit ]; - maintainers = with maintainers; [ danieldk ]; + maintainers = with maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/text/hottext/default.nix b/pkgs/tools/text/hottext/default.nix index 6d361f50f35..2e9d0a909a2 100644 --- a/pkgs/tools/text/hottext/default.nix +++ b/pkgs/tools/text/hottext/default.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { nimFlags = [ "-d:release" ] ++ map (lib: "--path:${lib}/src") nimLibs; - HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-R.ttf"; + HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf"; buildPhase = '' runHook preBuild diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 810e3feaa22..791d779bf83 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "5.3"; + version = "5.4"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "1km20ajqb65vkhkrf94zy5srcss66ix8padp7ng59pa8pj11wmi2"; + sha256 = "sha256-2khadADfzwkW+J0uafPWJ6xUQRSQDm8seiBHueQGmKI="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; diff --git a/pkgs/tools/text/num-utils/default.nix b/pkgs/tools/text/num-utils/default.nix new file mode 100644 index 00000000000..14784a4e8cf --- /dev/null +++ b/pkgs/tools/text/num-utils/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl, perl }: + +stdenv.mkDerivation rec { + pname = "num-utils"; + version = "0.5"; + + src = fetchurl { + url = "https://suso.suso.org/programs/num-utils/downloads/num-utils-${version}.tar.gz"; + sha256 = "0kn6yskjww2agcqvas5l2xp55mp4njdxqkdicchlji3qzih2fn83"; + }; + + buildInputs = [ perl ]; + + patchPhase = '' + substituteInPlace Makefile --replace "-o 0 -g 0" "" --replace "\$(RPMDIR)" "" + ''; + makeFlags = [ + "TOPDIR=${placeholder "out"}" + "PERL=${perl}/bin/perl" + ]; + + meta = with lib; { + description = "Programs for dealing with numbers from the command line"; + homepage = "https://suso.suso.org/xulu/Num-utils"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.catern ]; + }; +} diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index 1536e72ad29..009150062db 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: rustPlatform.buildRustPackage rec { @@ -14,8 +14,17 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1iwgy9zzdxay6hb9pz47jchy03jrsy5csxijlq4i228qhqnvq1lr"; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + preFixup = '' + installManPage $releaseDir/build/sd-*/out/sd.1 + + installShellCompletion $releaseDir/build/sd-*/out/sd.{bash,fish} + installShellCompletion --zsh $releaseDir/build/sd-*/out/_sd + ''; + meta = with lib; { description = "Intuitive find & replace CLI (sed alternative)"; homepage = "https://github.com/chmln/sd"; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index dfd3321b6b6..1a0188127aa 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -18,14 +18,14 @@ buildPythonApplication rec { pname = "cloud-init"; - version = "20.3"; + version = "21.2"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = version; - sha256 = "1fmckxf4q4sxjqs758vw7ca0rnhl9hyq67cqpqzz2v3s1gqzjhm4"; + sha256 = "0vhjkgs49ixfa3kkj5s3v3gcxvypm3cdvfk6adrk2bx3wv2cbhvz"; }; patches = [ ./0001-add-nixos-support.patch ]; @@ -59,9 +59,7 @@ buildPythonApplication rec { ]; makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ - dmidecode cloud-utils.guest - ]}/bin" + "--prefix PATH : ${lib.makeBinPath [ dmidecode cloud-utils.guest ]}/bin" ]; disabledTests = [ @@ -71,6 +69,27 @@ buildPythonApplication rec { "test_path_env_gets_set_from_main" # tries to read from /etc/ca-certificates.conf while inside the sandbox "test_handler_ca_certs" + # Doesn't work in the sandbox + "TestEphemeralDhcpNoNetworkSetup" + "TestHasURLConnectivity" + "TestReadFileOrUrl" + "TestConsumeUserDataHttp" + # Chef Omnibus + "TestInstallChefOmnibus" + ]; + + disabledTestPaths = [ + # Oracle tests are not passing + "cloudinit/sources/tests/test_oracle.py" + # Disable the integration tests. pycloudlib would be required + "tests/unittests/test_datasource/test_aliyun.py" + "tests/unittests/test_datasource/test_azure.py" + "tests/unittests/test_datasource/test_ec2.py" + "tests/unittests/test_datasource/test_exoscale.py" + "tests/unittests/test_datasource/test_gce.py" + "tests/unittests/test_datasource/test_openstack.py" + "tests/unittests/test_datasource/test_scaleway.py" + "tests/unittests/test_ec2_util.py" ]; preCheck = '' @@ -78,6 +97,8 @@ buildPythonApplication rec { export TMPDIR=/tmp ''; + pythonImportsCheck = [ "cloudinit" ]; + meta = with lib; { homepage = "https://cloudinit.readthedocs.org"; description = "Provides configuration and customization of cloud instance"; diff --git a/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix new file mode 100644 index 00000000000..8673200172e --- /dev/null +++ b/pkgs/tools/wayland/wayland-proxy-virtwl/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, ocamlPackages +}: + +ocamlPackages.buildDunePackage rec { + pname = "wayland-proxy-virtwl"; + version = "unstable-2021-04-15"; + + src = fetchFromGitHub { + owner = "talex5"; + repo = pname; + rev = "09321a28f3d4c0fa7e41ebb3014106b62090b649"; + sha256 = "03rc2jp5d2y9y7mfis6kk9gchd49gvq0jg6fq5gi9r21ckb4k5v4"; + }; + + postPatch = '' + # no need to vendor + rm -r ocaml-wayland + ''; + + useDune2 = true; + minimumOCamlVersion = "4.08"; + + buildInputs = with ocamlPackages; [ + wayland + cmdliner + logs + ]; + + meta = { + homepage = "https://github.com/talex5/wayland-virtwl-proxy"; + description = "Proxy Wayland connections across a VM boundary"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5bfaed5ac45..d36f7e9719d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -88,6 +88,14 @@ mapAliases ({ bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 + + # bitwarden_rs renamed to vaultwarden with release 1.21.0 (2021-04-30) + bitwarden_rs = vaultwarden; + bitwarden_rs-sqlite = vaultwarden-sqlite; + bitwarden_rs-mysql = vaultwarden-mysql; + bitwarden_rs-postgresql = vaultwarden-postgresql; + bitwarden_rs-vault = vaultwarden-vault; + bs1770gain = throw "bs1770gain has been removed from nixpkgs, as it had no maintainer or reverse dependencies."; # added 2021-01-02 btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 285f9ec31b0..669fda09f8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -474,6 +474,8 @@ in pkger = callPackage ../development/libraries/pkger { }; + tapview = callPackage ../development/tools/tapview { }; + run = callPackage ../development/tools/run { }; mod = callPackage ../development/tools/mod { }; @@ -799,6 +801,8 @@ in acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; }; + adriconf = callPackage ../tools/graphics/adriconf { }; + amass = callPackage ../tools/networking/amass { }; afew = callPackage ../applications/networking/mailreaders/afew { }; @@ -1017,6 +1021,8 @@ in timedoctor = callPackage ../applications/office/timedoctor { }; + tvnamer = callPackage ../tools/misc/tvnamer { }; + twine = with python3Packages; toPythonApplication twine; wayst = callPackage ../applications/terminal-emulators/wayst { }; @@ -1308,15 +1314,6 @@ in inherit (nodePackages) bitwarden-cli; - bitwarden_rs = callPackage ../tools/security/bitwarden_rs { - inherit (darwin.apple_sdk.frameworks) Security CoreServices; - }; - bitwarden_rs-sqlite = bitwarden_rs; - bitwarden_rs-mysql = bitwarden_rs.override { dbBackend = "mysql"; }; - bitwarden_rs-postgresql = bitwarden_rs.override { dbBackend = "postgresql"; }; - - bitwarden_rs-vault = callPackage ../tools/security/bitwarden_rs/vault.nix { }; - bkyml = callPackage ../tools/misc/bkyml { }; blockbench-electron = callPackage ../applications/graphics/blockbench-electron { }; @@ -2299,6 +2296,8 @@ in wayland-utils = callPackage ../tools/wayland/wayland-utils { }; + wayland-proxy-virtwl = callPackage ../tools/wayland/wayland-proxy-virtwl { }; + wev = callPackage ../tools/wayland/wev { }; wdomirror = callPackage ../tools/wayland/wdomirror { }; @@ -2955,6 +2954,8 @@ in numworks-udev-rules = callPackage ../os-specific/linux/numworks-udev-rules { }; + num-utils = callPackage ../tools/text/num-utils { }; + iio-sensor-proxy = callPackage ../os-specific/linux/iio-sensor-proxy { }; ipvsadm = callPackage ../os-specific/linux/ipvsadm { }; @@ -3149,6 +3150,8 @@ in ps_mem = callPackage ../tools/system/ps_mem { }; + pscale = callPackage ../development/tools/pscale { }; + psstop = callPackage ../tools/system/psstop { }; precice = callPackage ../development/libraries/precice { }; @@ -4721,7 +4724,9 @@ in flatpak = callPackage ../development/libraries/flatpak { }; - flatpak-builder = callPackage ../development/tools/flatpak-builder { }; + flatpak-builder = callPackage ../development/tools/flatpak-builder { + binutils = binutils-unwrapped; + }; fltrdr = callPackage ../tools/misc/fltrdr { icu = icu63; @@ -5305,9 +5310,7 @@ in gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { }; - gnome-photos = callPackage ../applications/graphics/gnome-photos { - gegl = gegl_0_4; - }; + gnome-photos = callPackage ../applications/graphics/gnome-photos { }; gnokii = callPackage ../tools/misc/gnokii { }; @@ -5614,6 +5617,8 @@ in pgloader = callPackage ../development/tools/pgloader { }; + pgtop = callPackage ../development/tools/pgtop { }; + pigz = callPackage ../tools/compression/pigz { }; pixz = callPackage ../tools/compression/pixz { }; @@ -7668,6 +7673,8 @@ in otfcc = callPackage ../tools/misc/otfcc { }; + otpclient = callPackage ../applications/misc/otpclient { }; + otpw = callPackage ../os-specific/linux/otpw { }; ovftool = callPackage ../tools/virtualization/ovftool { }; @@ -8203,6 +8210,8 @@ in qhull = callPackage ../development/libraries/qhull { }; + qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { }; + qjoypad = callPackage ../tools/misc/qjoypad { }; qmk = callPackage ../tools/misc/qmk { }; @@ -10168,6 +10177,8 @@ in yafaray-core = callPackage ../tools/graphics/yafaray-core { }; + yajsv = callPackage ../tools/misc/yajsv { }; + yapf = with python3Packages; toPythonApplication yapf; yarn = callPackage ../development/tools/yarn { }; @@ -13194,6 +13205,8 @@ in cfr = callPackage ../development/tools/java/cfr { }; + checkra1n = callPackage ../development/mobile/checkra1n { }; + checkstyle = callPackage ../development/tools/analysis/checkstyle { }; chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome2.GConf; }; @@ -15128,10 +15141,6 @@ in }; gegl = callPackage ../development/libraries/gegl { - inherit (darwin.apple_sdk.frameworks) OpenGL; - }; - - gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix { inherit (darwin.apple_sdk.frameworks) OpenCL; }; @@ -16034,6 +16043,8 @@ in inherit (ocaml-ng.ocamlPackages) bap ocaml findlib ctypes; }; + libbaseencode = callPackage ../development/libraries/libbaseencode { }; + libbass = (callPackage ../development/libraries/audio/libbass { }).bass; libbass_fx = (callPackage ../development/libraries/audio/libbass { }).bass_fx; @@ -16147,6 +16158,8 @@ in libctemplate = callPackage ../development/libraries/libctemplate { }; + libcotp = callPackage ../development/libraries/libcotp { }; + libcouchbase = callPackage ../development/libraries/libcouchbase { }; libcue = callPackage ../development/libraries/libcue { }; @@ -16507,6 +16520,8 @@ in liblcf = callPackage ../development/libraries/liblcf { }; + libliftoff = callPackage ../development/libraries/libliftoff { }; + liblqr1 = callPackage ../development/libraries/liblqr-1 { }; liblockfile = callPackage ../development/libraries/liblockfile { }; @@ -18077,7 +18092,7 @@ in rocksdb_lite = rocksdb.override { enableLite = true; }; - rotate-backups = with python3Packages; toPythonApplication rotate-backups; + rotate-backups = callPackage ../tools/backup/rotate-backups { }; rote = callPackage ../development/libraries/rote { }; @@ -20906,8 +20921,6 @@ in dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { }; - dpdk = throw "The dpdk driver has been renamed to dpdk-kmods."; - exfat-nofuse = callPackage ../os-specific/linux/exfat { }; evdi = callPackage ../os-specific/linux/evdi { }; @@ -22488,6 +22501,8 @@ in redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; + rime-data = callPackage ../data/misc/rime-data { }; + route159 = callPackage ../data/fonts/route159 { }; sampradaya = callPackage ../data/fonts/sampradaya { }; @@ -22794,7 +22809,7 @@ in acd-cli = callPackage ../applications/networking/sync/acd_cli { inherit (python3Packages) - buildPythonApplication appdirs colorama dateutil + buildPythonApplication appdirs colorama python-dateutil requests requests_toolbelt setuptools sqlalchemy fusepy; }; @@ -24159,7 +24174,6 @@ in gimp = callPackage ../applications/graphics/gimp { autoreconfHook = buildPackages.autoreconfHook269; - gegl = gegl_0_4; lcms = lcms2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -24172,7 +24186,6 @@ in glimpse = callPackage ../applications/graphics/glimpse { autoreconfHook = buildPackages.autoreconfHook269; - gegl = gegl_0_4; lcms = lcms2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; }; @@ -25417,7 +25430,7 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices; }; - mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); + mercurialFull = appendToName "full" (pkgs.mercurial.override { fullBuild = true; }); merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; @@ -26213,6 +26226,8 @@ in pianobooster = qt5.callPackage ../applications/audio/pianobooster { }; + pianoteq = callPackage ../applications/audio/pianoteq { }; + picard = callPackage ../applications/audio/picard { }; picocom = callPackage ../tools/misc/picocom { @@ -26261,6 +26276,8 @@ in purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { }; + purple-mm-sms = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-mm-sms { }; + purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { }; purple-slack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-slack { }; @@ -27444,10 +27461,7 @@ in wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { }; wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped); neovim-unwrapped = callPackage ../applications/editors/neovim { - lua = - # neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879 - if stdenv.isAarch64 then lua5_1 else - luajit; + lua = luajit; }; neovimUtils = callPackage ../applications/editors/neovim/utils.nix { }; @@ -28975,6 +28989,8 @@ in static = true; }; }; + openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix {}; + openttd-nml = callPackage ../games/openttd/nml.nix {}; opentyrian = callPackage ../games/opentyrian { }; @@ -31554,6 +31570,8 @@ in urbit = callPackage ../misc/urbit { }; + usb-reset = callPackage ../applications/misc/usb-reset { }; + usql = callPackage ../applications/misc/usql { }; utf8cpp = callPackage ../development/libraries/utf8cpp { }; @@ -31572,6 +31590,15 @@ in vazir-code-font = callPackage ../data/fonts/vazir-code-font { }; + vaultwarden = callPackage ../tools/security/vaultwarden { + inherit (darwin.apple_sdk.frameworks) Security CoreServices; + }; + vaultwarden-sqlite = vaultwarden; + vaultwarden-mysql = vaultwarden.override { dbBackend = "mysql"; }; + vaultwarden-postgresql = vaultwarden.override { dbBackend = "postgresql"; }; + + vaultwarden-vault = callPackage ../tools/security/vaultwarden/vault.nix { }; + vazir-fonts = callPackage ../data/fonts/vazir-fonts { }; vbam = callPackage ../misc/emulators/vbam { }; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index f0e54a9ce1d..6fc0500ed53 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -49,6 +49,7 @@ let interval = callPackage ../development/coq-modules/interval {}; InfSeqExt = callPackage ../development/coq-modules/InfSeqExt {}; iris = callPackage ../development/coq-modules/iris {}; + itauto = callPackage ../development/coq-modules/itauto { }; ITree = callPackage ../development/coq-modules/ITree { }; ltac2 = callPackage ../development/coq-modules/ltac2 {}; math-classes = callPackage ../development/coq-modules/math-classes { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e040cef1575..9931a7004b4 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -22,6 +22,8 @@ let alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix {}; + alcotest-mirage = callPackage ../development/ocaml-modules/alcotest/mirage.nix {}; + angstrom = callPackage ../development/ocaml-modules/angstrom { }; angstrom-async = callPackage ../development/ocaml-modules/angstrom-async { }; @@ -1155,6 +1157,8 @@ let rope = callPackage ../development/ocaml-modules/rope { }; + routes = callPackage ../development/ocaml-modules/routes { }; + rpclib = callPackage ../development/ocaml-modules/rpclib { }; rpclib-lwt = callPackage ../development/ocaml-modules/rpclib/lwt.nix { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 16d3c71d524..3ceaf784af3 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -257,20 +257,6 @@ lib.makeScope pkgs.newScope (self: with self; { { name = "dom"; buildInputs = [ libxml2 ]; - patches = [ - # https://github.com/php/php-src/pull/7030 - (fetchpatch { - url = "https://github.com/php/php-src/commit/4cc261aa6afca2190b1b74de39c3caa462ec6f0b.patch"; - sha256 = "11qsdiwj1zmpfc2pgh6nr0sn7qa1nyjg4jwf69cgwnd57qfjcy4k"; - excludes = [ "ext/dom/tests/bug43364.phpt" "ext/dom/tests/bug80268.phpt" ]; - }) - ]; - # For some reason `patch` fails to remove these files correctly. - # Since `postPatch` is already used in `mkExtension`, we have to make it here. - preCheck = '' - rm tests/bug43364.phpt - rm tests/bug80268.phpt - ''; configureFlags = [ "--enable-dom" ] # Required to build on darwin. ++ lib.optionals (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b796d9ac442..301dcafeb29 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -35,7 +35,11 @@ in mapAliases ({ blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29 bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + dateutil = python-dateutil; # added 2021-07-03 detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 + dftfit = throw "it's dependency lammps-cython no longer builds"; + diff_cover = diff-cover; # added 2021-07-02 + discogs_client = discogs-client; # added 2021-07-02 dns = dnspython; # Alias for compatibility, 2017-12-10 faulthandler = throw "faulthandler is built into ${python.executable}"; gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 @@ -43,6 +47,7 @@ mapAliases ({ google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 HAP-python = hap-python; # added 2021-06-01 + lammps-cython = throw "no longer builds and is unmaintained"; MechanicalSoup = mechanicalsoup; # added 2021-06-01 privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 @@ -50,10 +55,12 @@ mapAliases ({ pytest-pep8 = pytestpep8; # added 2021-01-04 pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 + rotate-backups = throw "pythonPackages.rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01 selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # Added 2021-06-10 setuptools_scm = setuptools-scm; # added 2021-06-03 smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 + tvnamer = throw "python3Packages.tvnamer was moved to tvnamer"; # 2021-07-05 websocket_client = websocket-client; }) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79b17a44d90..a15a1450c78 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1905,8 +1905,6 @@ in { devpi-common = callPackage ../development/python-modules/devpi-common { }; - dftfit = callPackage ../development/python-modules/dftfit { }; - diagrams = callPackage ../development/python-modules/diagrams { }; diceware = callPackage ../development/python-modules/diceware { }; @@ -1921,7 +1919,7 @@ in { dicttoxml = callPackage ../development/python-modules/dicttoxml { }; - diff_cover = callPackage ../development/python-modules/diff_cover { }; + diff-cover = callPackage ../development/python-modules/diff-cover { }; diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; @@ -1939,7 +1937,7 @@ in { discid = callPackage ../development/python-modules/discid { }; - discogs_client = callPackage ../development/python-modules/discogs_client { }; + discogs-client = callPackage ../development/python-modules/discogs-client { }; discordpy = callPackage ../development/python-modules/discordpy { }; @@ -3914,8 +3912,6 @@ in { labmath = callPackage ../development/python-modules/labmath { }; - lammps-cython = callPackage ../development/python-modules/lammps-cython { }; - langcodes = callPackage ../development/python-modules/langcodes { }; langdetect = callPackage ../development/python-modules/langdetect { }; @@ -5235,6 +5231,8 @@ in { phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + micloud = callPackage ../development/python-modules/micloud { }; + netmap = callPackage ../development/python-modules/netmap { }; openapi-core = callPackage ../development/python-modules/openapi-core { }; @@ -5349,6 +5347,8 @@ in { pynx584 = callPackage ../development/python-modules/pynx584 { }; + pypoint = callPackage ../development/python-modules/pypoint { }; + pyrfxtrx = callPackage ../development/python-modules/pyrfxtrx { }; pyrogram = callPackage ../development/python-modules/pyrogram { }; @@ -6919,8 +6919,6 @@ in { python-daemon = callPackage ../development/python-modules/python-daemon { }; python-dateutil = callPackage ../development/python-modules/dateutil { }; - # Alias that we should deprecate - dateutil = self.python-dateutil; python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; @@ -6996,6 +6994,10 @@ in { python-louvain = callPackage ../development/python-modules/python-louvain { }; + python-lsp-jsonrpc = callPackage ../development/python-modules/python-lsp-jsonrpc { }; + + python-lsp-server = callPackage ../development/python-modules/python-lsp-server { }; + python-ly = callPackage ../development/python-modules/python-ly { }; python-lz4 = callPackage ../development/python-modules/python-lz4 { }; @@ -7622,8 +7624,6 @@ in { ropper = callPackage ../development/python-modules/ropper { }; - rotate-backups = callPackage ../tools/backup/rotate-backups { }; - routes = callPackage ../development/python-modules/routes { }; rpdb = callPackage ../development/python-modules/rpdb { }; @@ -8733,8 +8733,6 @@ in { tvdb_api = callPackage ../development/python-modules/tvdb_api { }; - tvnamer = callPackage ../development/python-modules/tvnamer { }; - tweedledum = callPackage ../development/python-modules/tweedledum { }; tweepy = callPackage ../development/python-modules/tweepy { }; |