From 2dc8d0672319973397582e332db6306dd3583741 Mon Sep 17 00:00:00 2001 From: flexagoon Date: Thu, 28 Oct 2021 10:08:50 +0300 Subject: [PATCH 01/32] gtk-theme-framework: init at 0.2.3 --- .../themes/gtk-theme-framework/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 10 ++++++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/data/themes/gtk-theme-framework/default.nix diff --git a/pkgs/data/themes/gtk-theme-framework/default.nix b/pkgs/data/themes/gtk-theme-framework/default.nix new file mode 100644 index 000000000000..99b9edfc3aca --- /dev/null +++ b/pkgs/data/themes/gtk-theme-framework/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, theme, lib }: + +stdenv.mkDerivation rec { + pname = "gtk-theme-framework"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "jaxwilko"; + repo = pname; + rev = "v${version}"; + sha256 = "1z5s5rsgiypanf2z0avaisbflnvwrc8aiy5qskrsvbbaja63jy3s"; + }; + + postPatch = '' + substituteInPlace main.sh \ + --replace "#!/usr/bin/env bash" "#!/bin/sh" + + substituteInPlace scripts/install.sh \ + --replace "#!/usr/bin/env bash" "#!/bin/sh" + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/themes + ./main.sh -i -t ${theme} -d $out/share/themes + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/jaxwilko/gtk-theme-framework"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ flexagoon ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18c5484a9b18..3e1a69963bd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22729,6 +22729,16 @@ with pkgs; gruvbox-dark-gtk = callPackage ../data/themes/gruvbox-dark-gtk { }; + palenight-theme = callPackage ../data/themes/gtk-theme-framework { theme = "palenight"; }; + + amarena-theme = callPackage ../data/themes/gtk-theme-framework { theme = "amarena"; }; + + gruvterial-theme = callPackage ../data/themes/gtk-theme-framework { theme = "gruvterial"; }; + + oceanic-theme = callPackage ../data/themes/gtk-theme-framework { theme = "oceanic"; }; + + spacx-gtk-theme = callPackage ../data/themes/gtk-theme-framework { theme = "spacx"; }; + gruvbox-dark-icons-gtk = callPackage ../data/icons/gruvbox-dark-icons-gtk { inherit (plasma5Packages) breeze-icons; }; From e832498761c888dba37a8442c4458ec4db554d80 Mon Sep 17 00:00:00 2001 From: Lennart Date: Fri, 29 Oct 2021 17:08:15 +0200 Subject: [PATCH 02/32] maintainers: add riotbib as maintainer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4e3a5f97f432..fdcadf969778 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9613,6 +9613,12 @@ githubId = 37246692; name = "Riley Inman"; }; + riotbib = { + email = "github-nix@lnrt.de"; + github = "riotbib"; + githubId = 43172581; + name = "Lennart Mühlenmeier"; + }; ris = { email = "code@humanleg.org.uk"; github = "risicle"; From f5b160b66e50ee85d624d6a6fc63022a95424199 Mon Sep 17 00:00:00 2001 From: IvarWithoutBones Date: Thu, 4 Nov 2021 00:30:47 +0100 Subject: [PATCH 03/32] jackett: 0.18.925 -> 0.19.138, use buildDotnetModule --- pkgs/servers/jackett/default.nix | 36 +++-- pkgs/servers/jackett/deps.nix | 250 +++++++++++++++++++++++++++++++ pkgs/servers/jackett/updater.sh | 34 +++++ 3 files changed, 307 insertions(+), 13 deletions(-) create mode 100644 pkgs/servers/jackett/deps.nix create mode 100755 pkgs/servers/jackett/updater.sh diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index ffbeab36ff4f..e2f0984bb93d 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -1,23 +1,32 @@ -{ lib, stdenv, fetchurl, mono, makeWrapper, curl, icu60, openssl, zlib }: +{ lib +, buildDotnetModule +, fetchFromGitHub +, dotnetCorePackages +, openssl +}: -stdenv.mkDerivation rec { +buildDotnetModule rec { pname = "jackett"; - version = "0.18.925"; + version = "0.19.138"; - src = fetchurl { - url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "1md0iy6sx0agsnvrj9m7bq1lvp5z34x7zv3pvwy4zw8b46w97mnz"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "0qaaccc95csahylzv65ndx990kcr075jffawbjpsjfkxzflfjq9n"; }; - nativeBuildInputs = [ makeWrapper ]; + projectFile = "src/Jackett.Server/Jackett.Server.csproj"; + nugetDeps = ./deps.nix; - installPhase = '' - mkdir -p $out/{bin,share/${pname}-${version}} - cp -r * $out/share/${pname}-${version} + dotnetInstallFlags = [ "-p:TargetFramework=net5.0" ]; + dotnet-runtime = dotnetCorePackages.aspnetcore_5_0; - makeWrapper "${mono}/bin/mono" $out/bin/Jackett \ - --add-flags "$out/share/${pname}-${version}/JackettConsole.exe" \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ curl icu60 openssl zlib ]} + runtimeDeps = [ openssl ]; + + postFixup = '' + # Legacy + ln -s $out/bin/jackett $out/bin/Jackett ''; meta = with lib; { @@ -27,4 +36,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ edwtjo nyanloutre purcell ]; platforms = platforms.all; }; + passthru.updateScript = ./updater.sh; } diff --git a/pkgs/servers/jackett/deps.nix b/pkgs/servers/jackett/deps.nix new file mode 100644 index 000000000000..9ac744694198 --- /dev/null +++ b/pkgs/servers/jackett/deps.nix @@ -0,0 +1,250 @@ +{ fetchNuGet }: [ + (fetchNuGet { name = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; }) + (fetchNuGet { name = "Autofac"; version = "5.2.0"; sha256 = "0yxks2nynl0mcg3m94cl94x50k3wa8xh9k3f2gmh8mxn5nrpl64r"; }) + (fetchNuGet { name = "Autofac.Extensions.DependencyInjection"; version = "6.0.0"; sha256 = "0ljgzn1jlv4k0q13l9n7gjrbw49wdfjzg8rvbwzzrg73bz77vxm3"; }) + (fetchNuGet { name = "AutoMapper"; version = "8.1.1"; sha256 = "1p2sc82lrbarhs08n2132vijfr3hv9zksb6ra12y9hfckam5lz9h"; }) + (fetchNuGet { name = "BencodeNET"; version = "3.1.4"; sha256 = "12zim3k5wnlxgkg3310djh3zy97d6g3k3xvf87qd8pk2669vb1gw"; }) + (fetchNuGet { name = "CommandLineParser"; version = "2.8.0"; sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb"; }) + (fetchNuGet { name = "DotNet4.SocksProxy"; version = "1.4.0.1"; sha256 = "1ig2a9ism041a6qrqkxa9xhvp19yxzcadlap5i1kz97f05a2msvb"; }) + (fetchNuGet { name = "FlareSolverrSharp"; version = "2.0.0"; sha256 = "15rs97ayh6s9g2vbn3r1bj7imazald0f22gfikw6mmyx5ghc3zrz"; }) + (fetchNuGet { name = "Microsoft.AspNetCore"; version = "2.2.0"; sha256 = "0vsv7hcsmnsgqhs67zp207n7m9ix3dbwm1p2ch3dizkcdvz235f9"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Antiforgery"; version = "2.2.0"; sha256 = "026wjdwjx0lgccqv0xi5gxylxzgz5ifgxf25p5pqakgrhkz0a59l"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authentication"; version = "2.2.0"; sha256 = "0yqfzd0qq5ypmk6b9gnb1yscl75fxx9frq808cxs70ay7y7jqmgn"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authentication.Abstractions"; version = "2.2.0"; sha256 = "0vj7fhpk0d95nkkxz4q0rma6pb4ym96mx6nms4603y0l19h0k5yh"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authentication.Cookies"; version = "2.2.0"; sha256 = "0x7i7dmvq5ph8f21ajgb56fjvv31r4zn6pj8d7rsx0y6067vcp5d"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authentication.Core"; version = "2.2.0"; sha256 = "1wgn45fmdi7dk9cl4cdhzgqc9mdxhfw7zg8zwns3j7qgrhlv6k8h"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authorization"; version = "2.2.0"; sha256 = "1mpq8pmxlxfa625k2ghv6xcyy2wdpwv56xzya9mvmlnh50h1i8rx"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Authorization.Policy"; version = "2.2.0"; sha256 = "1d1zh65kfjf81j21ssmhr465vx08bra8424vgnrb22gdx03mhwd2"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Connections.Abstractions"; version = "2.2.0"; sha256 = "1rl94r8b0zq14f3dhfnvfjj1ivr81iw9zh5kdgs3zkdv0xc9x21j"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Cors"; version = "2.2.0"; sha256 = "0qskbz87i74kfbklxqfyqaccyba21kkx2lcdfa54kxj9r8daq7sc"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Cryptography.Internal"; version = "2.2.0"; sha256 = "01lg2fx85b47ldgdrhs6clsivj35x54xwc9r5xk3f1v8rr3gycsv"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.DataProtection"; version = "2.2.0"; sha256 = "09lzbp084xxy1xxfbxpqdff8phv2pzd1n5v30xfm03hhl7a038gx"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.DataProtection.Abstractions"; version = "2.2.0"; sha256 = "1gi4hpssmrrdf5lm6idkhvqbfy12bx14976y4gbhmx9z8lxaqcfz"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Diagnostics"; version = "2.2.0"; sha256 = "0hq5s2h0k2714352bdz2s3c3m6spkn4ckfw3pv9c4rmn6adbw9b1"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Diagnostics.Abstractions"; version = "2.2.0"; sha256 = "061cdhjh5w2f1frhimcgk68vx8p743jb9h4qik3lm1c734r0drm0"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.HostFiltering"; version = "2.2.0"; sha256 = "06wbgkbh24w9yxz6g8446l7nnjm3rdp1wklri710zqzr7zbfcx43"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Hosting"; version = "2.2.0"; sha256 = "1nk61mj7a4ri3p47xd0j520szwj05xid16r2bld85cp70xnpxjhx"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.1.0"; sha256 = "0sdzvjf6bz0krr2bm77zdyxpjcddadq2fqd3b4yybd6my3b5f7j2"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Hosting.Abstractions"; version = "2.2.0"; sha256 = "043k651vbfshh3s997x42ymj8nb32419m7q3sjw5q2c27anrhfhv"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.1.0"; sha256 = "1xm8913slkx0cvk7gcbk1sf9518xmrajjjp3z8qhr5xdhdx1b879"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Hosting.Server.Abstractions"; version = "2.2.0"; sha256 = "0nz73bwrvhc1n7gd7xxm3p5ww2wx9qr9m9i43y20gh0c54adkygh"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Html.Abstractions"; version = "2.2.0"; sha256 = "1z5lkzb9h9wprvyxyjw4fj7bjypaibsw0cj4bz769hf0abjz8y1v"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http"; version = "2.1.0"; sha256 = "1nrhbsr58fh6hpzxq75qvrimh0lk6pdwghs3cbv0f1zk90rar1cq"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http"; version = "2.2.0"; sha256 = "1fcrafpa57sab3as18idqknzlxkx49n4sxzlzik3sj6pcji5j17q"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http"; version = "2.2.2"; sha256 = "09mgjvpqdyylz9dbngql9arx46lfkiczjdf7aqr9asd5vjqlv2c8"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.1.0"; sha256 = "0jz5w1y661cxbh1sakyjh0813sqrc456mj53w3482ilb5xh5zhbf"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Abstractions"; version = "2.2.0"; sha256 = "13s8cm6jdpydxmr0rgmzrmnp1v2r7i3rs7v9fhabk5spixdgfy6b"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Extensions"; version = "2.2.0"; sha256 = "118gp1mfb8ymcvw87fzgjqwlc1d1b0l0sbfki291ydg414cz3dfn"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Features"; version = "2.1.0"; sha256 = "1mwpvbq0z982f9r5ik6k15h18qviy735i55hld9vfk8694k9zwcj"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Http.Features"; version = "2.2.0"; sha256 = "0xrlq8i61vzhzzy25n80m7wh2kn593rfaii3aqnxdsxsg6sfgnx1"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.HttpOverrides"; version = "2.2.0"; sha256 = "1pbmmczxilgrf4qyaql88dc3av7kaixb1r36358kil68gl3irjy6"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; version = "2.2.0"; sha256 = "07cihb5sqkavg42nvircdwjp0b67mhrla97jgx285zdjphplg4h2"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.JsonPatch"; version = "5.0.0"; sha256 = "192mn6r73xjw8fvlss6vrv34iiavq7k8pg0w7advgj6khklw4dzx"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Localization"; version = "2.2.0"; sha256 = "08knc70cy7ycid5sbbbzy6my4b7ddj4j760k5xf1qnfb0njxhfh7"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc"; version = "2.2.0"; sha256 = "16jrikcywkd4r4jh551p8gxxw6hj3aizdzd5i7agb06gwpgqqv9c"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Abstractions"; version = "2.2.0"; sha256 = "09p447ipd19517vy8xx9ykvspn6b4fgbm2rskpmzyw41x9wz4k0b"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Analyzers"; version = "2.2.0"; sha256 = "1b975z00bzgh2z5hina4bzfksvc2vgnbzmi8g3q962hspg6ylh9f"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.ApiExplorer"; version = "2.2.0"; sha256 = "1ryhd1md30fgrli74qv45mhldivbasdvydw0lllg6x6jzpyrkwpa"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Core"; version = "2.2.0"; sha256 = "1k6lkgk9zak5sczvyjbwgqnfcwcg9ks74wznqfzck8c6hns1by0m"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Cors"; version = "2.2.0"; sha256 = "077vjxn0k5rr4s675g50rzkns6scgijxxh5iib59k77ldwpdr14q"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.DataAnnotations"; version = "2.2.0"; sha256 = "0vdhdjarh4az7g71gkvmhq6xpvwhh8si3sbrpdwb8p60i94cdyl6"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Formatters.Json"; version = "2.2.0"; sha256 = "0421fcf2z8a6z81ql123ili32wbr3x25zpq17xjf4s9fmsr0069a"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Localization"; version = "2.2.0"; sha256 = "0d27xirwsr3j7jacsrz6g2r4py35hgzjyy6ak6gkd07cm707wgc6"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "5.0.0"; sha256 = "1q3z35pxgvpf6l6ywh5wb6gfly055rk99a80rjqisyrbmza1msd1"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Razor"; version = "2.2.0"; sha256 = "06fqg7rfyvfj3hdppkhy37ddjff2d6pg7khj6lccs9lwc732yr7q"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; version = "2.2.0"; sha256 = "04javqbzv7mkakqjl40j429giaagjj7hmwcljrgj8q1jknk0x9xc"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.RazorPages"; version = "2.2.0"; sha256 = "0zqyqfxzl3lkqfy9chd0ipani75q3109imlxrnhdfiwmxrd8xqbm"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.TagHelpers"; version = "2.2.0"; sha256 = "16aprk81sp2i0n0dmp318cm65mk03i58rhpijm4fz4xz51j7z8li"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Mvc.ViewFeatures"; version = "2.2.0"; sha256 = "1isflvb0ff5nfqnvdlyvmszkd42axbbz0xmdaf0d7sah0qkvvi7n"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Razor"; version = "2.2.0"; sha256 = "02ybprvsi59nwa0fdq99jvx7r26bs2bg3xjxkilc495clgg98zp0"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Razor.Design"; version = "2.2.0"; sha256 = "03pcdcbmyw050hag588b7caqilnq3cb6ndq5g6j0r7j7wf3plsn6"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Razor.Language"; version = "2.2.0"; sha256 = "0n58qdipwy5wymfhgm3anickwvnf4svb9ipbrby7ksrhhrkqvx4z"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Razor.Runtime"; version = "2.2.0"; sha256 = "1n9j5hjinm5gp39nwmcf26dwg1psl7sf7xkxnvfxsnl44mbcy695"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.ResponseCaching.Abstractions"; version = "2.2.0"; sha256 = "01sp2i2bgcn6blw1mcvg5nrlc97c9czyawwvgfi6ydzdvs6ang37"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.ResponseCompression"; version = "2.2.0"; sha256 = "0madnk92752alpc7cv2bazqlihhzgl3yj1s9ajhi3w09vg8n8pz4"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Rewrite"; version = "2.2.0"; sha256 = "0f21v96wkvxcxfz5a9nvhqf1dshvgg34g9075fb0nd57nsw289af"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Routing"; version = "2.2.0"; sha256 = "12kv602j2rxp43l1v3618yz3pdd7hqc3r98ya0bqz6y2ppvhbyws"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Routing.Abstractions"; version = "2.1.0"; sha256 = "1f8xixbg749nhv10vaf3jmdv9zjdw822hw7ikwa97h70767d8xz5"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Routing.Abstractions"; version = "2.2.0"; sha256 = "0d9wwz1rsh1fslbv1y72jpkvqv2v9n28rl3vslcg0x74lp2678ly"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.IIS"; version = "2.2.0"; sha256 = "0cgyw8xjr6kgvrj7rn072mr97sh4xj95f635vmjrx10b8rnypmkk"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.IISIntegration"; version = "2.2.0"; sha256 = "1dmk68cyh02g9fcg1bxp90dxl7xpqiqikdlh1835jgm44m985mpc"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel"; version = "2.2.0"; sha256 = "0wh7hf09i9qxs9r0d5xdcx3qingsid9nxlwcyjg2r44pjs6cg1rf"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel.Core"; version = "2.2.0"; sha256 = "075ffds8hwp8ps0zf84bsv9pgiaqry9njc403qack701aybci97r"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel.Https"; version = "2.2.0"; sha256 = "08z447wrbzy3l9lmmas353nr17sg9yccwcg62l9ax9a6n1wvds8c"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions"; version = "2.2.0"; sha256 = "08bj95zy4zszyx1rsy8v2ai9kg4120ij6yi0zillwx3ndb3q7vfb"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets"; version = "2.2.0"; sha256 = "0vhicfnv12sz2c81czdgdlffcgrhnn1jzz9zwy3a9c2n4rn8k9k5"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.StaticFiles"; version = "2.2.0"; sha256 = "1bpggypnx8ai11jqlbyb6cir3x7cnw1mvqh6h88f3b0gg8wxnnpj"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.WebUtilities"; version = "2.1.0"; sha256 = "148snpiq4rhm44gzx8wn9ljfb286h7vd1axc9by4r4fxp0gix0kf"; }) + (fetchNuGet { name = "Microsoft.AspNetCore.WebUtilities"; version = "2.2.0"; sha256 = "0cs1g4ing4alfbwyngxzgvkrv7z964isv1j9dzflafda4p0wxmsi"; }) + (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.0"; sha256 = "1dq5yw7cy6s42193yl4iqscfw5vzkjkgv0zyy32scr4jza6ni1a1"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Analyzers"; version = "1.1.0"; sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; version = "2.8.0"; sha256 = "0g4h41fs0r8lqh9pk9s4mc1090kdpa6sbxq4rc866s8hnq9s1h4j"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; version = "2.8.0"; sha256 = "0p1xvw1h2fmnxywv1j4x6p3rgarpc8mfwfgn0vflk5xfnc961f6w"; }) + (fetchNuGet { name = "Microsoft.CodeAnalysis.Razor"; version = "2.2.0"; sha256 = "03cm9danxxnsnmrzfz2swz6zhckkgg6hrz1ycnvnjrbpk3w4v0d6"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) + (fetchNuGet { name = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) + (fetchNuGet { name = "Microsoft.DiaSymReader.Native"; version = "1.7.0"; sha256 = "0l2w3xpr7dpni20mqx41hqdzkrl0k6w9a0wqmjzdqv5f1jrwhfxn"; }) + (fetchNuGet { name = "Microsoft.DotNet.PlatformAbstractions"; version = "2.1.0"; sha256 = "1qydvyyinj3b5mraazjal3n2k7jqhn05b6n1a2f3qjkqkxi63dmy"; }) + (fetchNuGet { name = "Microsoft.Extensions.Caching.Abstractions"; version = "2.2.0"; sha256 = "0hhxc5dp52faha1bdqw0k426zicsv6x1kfqi30m9agr0b2hixj52"; }) + (fetchNuGet { name = "Microsoft.Extensions.Caching.Memory"; version = "2.2.0"; sha256 = "0bzrsn5vas86w66bd04xilnlb21nx4l6lz7d3acvy6y8ir2vb5dv"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "3.1.8"; sha256 = "1px3f7snw2iry7h7gfxzq0vg88cc8bf5kga22p0nkrkpgrm9hasa"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration"; version = "5.0.0"; sha256 = "01m9vzlq0vg0lhckj2dimwq42niwny8g3lm13c9a401hlyg90z1p"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.1.0"; sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.2.0"; sha256 = "1fv5277hyhfqmc0gqszyqb1ilwnijm8kc9606yia6hwr8pxyg674"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.8"; sha256 = "05mlbia6vag0a0zfflv1m3ix48230wx0yib5hp7zsc72jpcmjd7q"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.1.0"; sha256 = "0x1888w5ypavvszfmpja9krgc64527prs75vm8xbf9fv3rgsplql"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "2.2.0"; sha256 = "10qyjdkymdmag3r807kvbnwag4j3nz65i4cwikbd77jjvz92ya3j"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Binder"; version = "3.0.0"; sha256 = "1415h62v6l1yjg95zrhbarwshmdd3hyphxavdim2z10lkyhsj9vz"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.CommandLine"; version = "2.2.0"; sha256 = "09kc7a6g6r9lxcm7y445bmnmkhxkxxvmx6fxh99ixb8a1fkxrvfi"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.EnvironmentVariables"; version = "2.2.0"; sha256 = "1af6003lmw6ms53m8wsvp9rx1alr8r9pharf6azaqcw4m99vd8c5"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.FileExtensions"; version = "2.2.0"; sha256 = "0bwk1kh6q259nmnly90j5rbbzi9w5gigq5vyjr31c1br4j8cjmqd"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.Json"; version = "2.2.0"; sha256 = "18cmrvlhc71bxplldbgwfjg29qflcaf4rrg2avp4g03fqwma6vvc"; }) + (fetchNuGet { name = "Microsoft.Extensions.Configuration.UserSecrets"; version = "2.2.0"; sha256 = "15qarrjb7q463hsfkkja3yd34zf370qwjy22586w4r22rpxwirwp"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "2.2.0"; sha256 = "0lvv45rvq1xbf47lz818rjydc776zk8mf7svpzh1dml4qwlx9zck"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection"; version = "3.0.0"; sha256 = "0cqbvy49ph16rlba2f35qhi0n7vpcf5kjybvn5fbs7dchfdzw927"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.1.0"; sha256 = "0c0cx8r5xkjpxmcfp51959jnp55qjvq28d9vaslk08avvi1by12s"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.2.0"; sha256 = "1jyzfdr9651h3x6pxwhpfbb9mysfh8f8z1jvy4g117h9790r9zx5"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.0.0"; sha256 = "06s8j8v0w06f12jxw6vvsd0l5zqrmsvc3rr2gqx9z3gcq7mdnr3l"; }) + (fetchNuGet { name = "Microsoft.Extensions.DependencyModel"; version = "2.1.0"; sha256 = "0dl4qhjgifm6v3jsfzvzkvddyic77ggp9fq49ah661v45gk6ilgd"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.1.0"; sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Abstractions"; version = "2.2.0"; sha256 = "1f83ffb4xjwljg8dgzdsa3pa0582q6b4zm0si467fgkybqzk3c54"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Composite"; version = "2.2.0"; sha256 = "0k3qfxb0pn9b63grbf9jv7xw40gk6m1djmi3c4inwys7lxcj2k18"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileProviders.Physical"; version = "2.2.0"; sha256 = "0lrq4bxf67pw6n9kzwzqsnxkad2ygh2zn46hjias8j7aqljglh7x"; }) + (fetchNuGet { name = "Microsoft.Extensions.FileSystemGlobbing"; version = "2.2.0"; sha256 = "01jw7s1nb44n65qs3rk7xdzc419qwl0s5c34k031f1cc5ag3jvc2"; }) + (fetchNuGet { name = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.1.0"; sha256 = "04vm9mdjjzg3lpp2rzpgkpn8h5bzdl3bwcr22lshd3kp602ws4k9"; }) + (fetchNuGet { name = "Microsoft.Extensions.Hosting.Abstractions"; version = "2.2.0"; sha256 = "1xc7xr1nq7akfahyl5in9iyxrygap2xi9nxh39rfm37sf8lk55v1"; }) + (fetchNuGet { name = "Microsoft.Extensions.Localization"; version = "2.2.0"; sha256 = "1k73kk5qmrvdyd7l8qxp19crw18f2p5dgk3cjx59g7vf3rkgmc6k"; }) + (fetchNuGet { name = "Microsoft.Extensions.Localization.Abstractions"; version = "2.2.0"; sha256 = "1yzqs5x97rj6wlg0rylj0xi3dn1bw4ps26zdqsijx621jl1r97gy"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "2.1.0"; sha256 = "0dii8i7s6libfnspz2xb96ayagb4rwqj2kmr162vndivr9rmbm06"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "2.2.0"; sha256 = "0bx3ljyvvcbikradq2h583rl72h8bxdz33aghk026cxzpv2mm3wm"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging"; version = "3.0.0"; sha256 = "1a9laql7pnka3n8ca26rsclkiijcdrzd57jyvbyrihgpb7bmzx0r"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "2.1.0"; sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "2.2.0"; sha256 = "02w7hp6jicr7cl5p456k2cmrjvvhm6spg5kxnlncw3b72358m5wl"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Abstractions"; version = "3.0.0"; sha256 = "0453382r1f39hgvw631lk1hx2kas8xa1xjr6xq4wshan8d62xgd7"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Configuration"; version = "2.2.0"; sha256 = "1npblvkb4f251277sm6mc1xj2yww6nzag0azfz772nzkbdpj1q19"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Console"; version = "2.2.0"; sha256 = "1g4wcd1kac0b4l0k4blr3qxpyfaf092cs2wnsjb3paj60rhr5agf"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.Debug"; version = "2.2.0"; sha256 = "1z5zzf43dw5xzvylkcgdi0q2mfhig6fmw2p5mxdxx916c5s007np"; }) + (fetchNuGet { name = "Microsoft.Extensions.Logging.EventSource"; version = "2.2.0"; sha256 = "18kz2bm07zfj6d4j17zkj2zai7fmbsaq4xh312nh1x4468vi088g"; }) + (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; version = "2.1.0"; sha256 = "0i0vmfc3ch7xa3awmbw3byylprfl2d6dp7lgm8k8f215kxzl1wdn"; }) + (fetchNuGet { name = "Microsoft.Extensions.ObjectPool"; version = "2.2.0"; sha256 = "0n1q9lvc24ii1shzy575xldgmz7imnk4dswwwcgmzz93klri9r1z"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "2.1.0"; sha256 = "0w9644sryd1c6r3n4lq2cgd5pn6jl3k5m38a05m7vjffa4m2spd2"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "2.2.0"; sha256 = "1b20yh03fg4nmmi3vlf6gf13vrdkmklshfzl3ijygcs4c2hly6v0"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options"; version = "3.0.0"; sha256 = "1vzx8ha74y542n6w54vf60676aaz01ryklz6rm70w83v7sg2fxg3"; }) + (fetchNuGet { name = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.2.0"; sha256 = "0w95rpxl0fzcz7rp8zabv3c9bvkj9ma2mj1hrx9nipsc4dnqp4jd"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.1.0"; sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "3.0.0"; sha256 = "1d89yybxm7c30h5w79psybmpvy0pw7ha9r0y70f7i0kxgp8n62bk"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "3.1.8"; sha256 = "1p48hk3r9ikv36wdpwdrbvaccziazncf7nl60fr82i04199lfhgl"; }) + (fetchNuGet { name = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) + (fetchNuGet { name = "Microsoft.Extensions.WebEncoders"; version = "2.2.0"; sha256 = "1mhnichccw6mjf37d38q2i1kr7qp485m7apa1b872ji0q16yy1y3"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { name = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { name = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { name = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }) + (fetchNuGet { name = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.0"; sha256 = "00vkn4c6i0rn1l9pv912y0wgb9h6ks76qah8hvk441nari8fqbm1"; }) + (fetchNuGet { name = "Microsoft.Net.Http.Headers"; version = "2.1.0"; sha256 = "1a02bll0flsin9grd3jxbi76ycl42qamynalbp7qbqcsprabw3ai"; }) + (fetchNuGet { name = "Microsoft.Net.Http.Headers"; version = "2.2.0"; sha256 = "0w6lrk9z67bcirq2cj2ldfhnizc6id77ba6i30hjzgqjlyhh1gx5"; }) + (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) + (fetchNuGet { name = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) + (fetchNuGet { name = "MimeMapping"; version = "1.0.1.30"; sha256 = "03523g0kniwqzm30arnkds79j2gqjmhp5297xg4472l6iyfwwmln"; }) + (fetchNuGet { name = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) + (fetchNuGet { name = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "10.0.1"; sha256 = "15ncqic3p2rzs8q8ppi0irl2miq75kilw4lh8yfgjq96id0ds3hv"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "12.0.2"; sha256 = "0w2fbji1smd2y7x25qqibf1qrznmv4s6s0jvrbvr6alb7mfyqvh5"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "12.0.3"; sha256 = "17dzl305d835mzign8r15vkmav2hq8l6g7942dfjpnzr17wwl89x"; }) + (fetchNuGet { name = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { name = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) + (fetchNuGet { name = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) + (fetchNuGet { name = "NLog"; version = "4.7.5"; sha256 = "0bx890dmwpx569982m532ibxlfh0n24hz1hkkxnxkpvximm4hsm5"; }) + (fetchNuGet { name = "NLog.Extensions.Logging"; version = "1.6.4"; sha256 = "0yxx1mvz2d54kq00x38dgql8lssjxv5mk1yvx73v3qff1qxi7iyz"; }) + (fetchNuGet { name = "NLog.Web.AspNetCore"; version = "4.9.3"; sha256 = "1mv5zaiyysp9j3h90i1v1rk0b6a4cv8ll6l8gj634y6ppshb8xkj"; }) + (fetchNuGet { name = "Polly"; version = "7.2.1"; sha256 = "0cjmjkr2kq2q2cch30m95hms8mq73pzcqcirzvpzcl0rirvp3map"; }) + (fetchNuGet { name = "SharpZipLib"; version = "1.2.0"; sha256 = "0ynhx1qkjm723bwjwsrdviw1d2s9azndpa12dagrjshhma3igqm5"; }) + (fetchNuGet { name = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.5.0"; sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; }) + (fetchNuGet { name = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) + (fetchNuGet { name = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { name = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { name = "System.Collections.Immutable"; version = "1.3.1"; sha256 = "17615br2x5riyx8ivf1dcqwj6q3ipq1bi5hqhw54yfyxmx38ddva"; }) + (fetchNuGet { name = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) + (fetchNuGet { name = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) + (fetchNuGet { name = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { name = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { name = "System.Diagnostics.DiagnosticSource"; version = "4.5.0"; sha256 = "1y8m0p3127nak5yspapfnz25qc9x53gqpvwr3hdpsvrcd2r1pgyj"; }) + (fetchNuGet { name = "System.Diagnostics.EventLog"; version = "5.0.0"; sha256 = "0cii8iq25awhlc3bl8i863b9415qisnhd3fkdwf41v4bpli6i5fr"; }) + (fetchNuGet { name = "System.Diagnostics.FileVersionInfo"; version = "4.3.0"; sha256 = "094hx249lb3vb336q7dg3v257hbxvz2jnalj695l7cg5kxzqwai7"; }) + (fetchNuGet { name = "System.Diagnostics.StackTrace"; version = "4.3.0"; sha256 = "0ash4h9k0m7xsm0yl79r0ixrdz369h7y922wipp5gladmlbvpyjd"; }) + (fetchNuGet { name = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { name = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { name = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { name = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { name = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { name = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { name = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; }) + (fetchNuGet { name = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { name = "System.IO.Pipelines"; version = "4.5.2"; sha256 = "045sn3vyk5xysjjm19q4dj5c1g1rf8l98n4qsl9pl9id4fn08yq1"; }) + (fetchNuGet { name = "System.IO.Pipelines"; version = "4.6.0"; sha256 = "0r9ygjbxpyi6jgb67qnpbp42b7yvvhgmcjxnb50k3lb416claavh"; }) + (fetchNuGet { name = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { name = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.2"; sha256 = "1g24dwqfcmf4gpbgbhaw1j49xmpsz389l6bw2xxbsmnzvsf860ld"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { name = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { name = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) + (fetchNuGet { name = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { name = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { name = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { name = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { name = "System.Reflection.Metadata"; version = "1.4.2"; sha256 = "08b7b43vczlliv8k7q43jinjfrxwpljsglw7sxmc6sd7d54pd1vi"; }) + (fetchNuGet { name = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { name = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { name = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { name = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.1"; sha256 = "119br3pd85lq8zcgh4f60jzmv1g976q1kdgi3hvqdlhfbw6siz2j"; }) + (fetchNuGet { name = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { name = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { name = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) + (fetchNuGet { name = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { name = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { name = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) + (fetchNuGet { name = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { name = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { name = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) + (fetchNuGet { name = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { name = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { name = "System.Security.Cryptography.ProtectedData"; version = "5.0.0"; sha256 = "0jq1rcj5af2ydswld8ga3dyw2yi4c63wvb986b5kqsvpkwwc8x1b"; }) + (fetchNuGet { name = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { name = "System.Security.Cryptography.Xml"; version = "4.5.0"; sha256 = "1rk40x0msf9k7sxnjyizagjns1z25dh3cf22bx6hsx6vhf0sk08l"; }) + (fetchNuGet { name = "System.Security.Permissions"; version = "4.5.0"; sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) + (fetchNuGet { name = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { name = "System.ServiceProcess.ServiceController"; version = "5.0.0"; sha256 = "1annp5kwwif6vfqn1x7vv3izwznxzb8ifvw3g9q3v0rrll26i99h"; }) + (fetchNuGet { name = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "4.5.0"; sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; }) + (fetchNuGet { name = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) + (fetchNuGet { name = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { name = "System.Text.Encodings.Web"; version = "4.5.0"; sha256 = "0srd5bva52n92i90wd88pzrqjsxnfgka3ilybwh7s6sf469y5s53"; }) + (fetchNuGet { name = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { name = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.1"; sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; }) + (fetchNuGet { name = "System.Threading.Tasks.Extensions"; version = "4.5.2"; sha256 = "1sh63dz0dymqcwmprp0nadm77b83vmm7lyllpv578c397bslb8hj"; }) + (fetchNuGet { name = "System.Threading.Tasks.Parallel"; version = "4.3.0"; sha256 = "1rr3qa4hxwyj531s4nb3bwrxnxxwz617i0n9gh6x7nr7dd3ayzgh"; }) + (fetchNuGet { name = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) + (fetchNuGet { name = "System.ValueTuple"; version = "4.3.0"; sha256 = "1227k7fxbxapq7dms4lvwwjdf3pr1jcsmhy2nzzhj6g6hs530hxn"; }) + (fetchNuGet { name = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) + (fetchNuGet { name = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { name = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { name = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) + (fetchNuGet { name = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) + (fetchNuGet { name = "System.Xml.XPath.XDocument"; version = "4.3.0"; sha256 = "1wxckyb7n1pi433xzz0qcwcbl1swpra64065mbwwi8dhdc4kiabn"; }) + (fetchNuGet { name = "YamlDotNet"; version = "8.1.2"; sha256 = "1lmi5mdw4067a8yk8gv9kilv1hljflkc45pr5vvz8n09af6gn78b"; }) +] diff --git a/pkgs/servers/jackett/updater.sh b/pkgs/servers/jackett/updater.sh new file mode 100755 index 000000000000..cd0226d6b69a --- /dev/null +++ b/pkgs/servers/jackett/updater.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts nuget-to-nix dotnet-sdk_5 +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +new_version="$(curl -s "https://api.github.com/repos/jackett/jackett/releases?per_page=1" | jq -r '.[0].name')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" + +if [[ "$new_version" == "$old_version" ]]; then + echo "Already up to date!" + exit 0 +fi + +cd ../../.. +update-source-version jackett "${new_version//v}" +store_src="$(nix-build . -A jackett.src --no-out-link)" +src="$(mktemp -d /tmp/jackett-src.XXX)" +cp -rT "$store_src" "$src" +chmod -R +w "$src" + +pushd "$src" + +export DOTNET_NOLOGO=1 +export DOTNET_CLI_TELEMETRY_OPTOUT=1 + +mkdir ./nuget_pkgs +dotnet restore src/Jackett.Server/Jackett.Server.csproj --packages ./nuget_pkgs + +nuget-to-nix ./nuget_pkgs > "$deps_file" + +popd +rm -r "$src" From aa6463cae65433254ebe3fca1a4727528e484230 Mon Sep 17 00:00:00 2001 From: Lennart Date: Fri, 29 Oct 2021 17:11:32 +0200 Subject: [PATCH 04/32] python3Packages.stanza: init at 1.3.0 --- .../python-modules/stanza/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/stanza/default.nix diff --git a/pkgs/development/python-modules/stanza/default.nix b/pkgs/development/python-modules/stanza/default.nix new file mode 100644 index 000000000000..ce9719a75210 --- /dev/null +++ b/pkgs/development/python-modules/stanza/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, emoji +, numpy +, protobuf +, requests +, six +, pytorch +, tqdm +}: + +buildPythonPackage rec { + pname = "stanza"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "stanfordnlp"; + repo = pname; + rev = "v${version}"; + sha256 = "1j5918n875p3ibhzc5zp3vb97asbbnb04pj1igxwzl0xm6qcsbh8"; + }; + + disabled = pythonOlder "3.6"; + + propagatedBuildInputs = [ + emoji + numpy + protobuf + requests + six + pytorch + tqdm + ]; + + # disabled, because the tests try to connect to the internet which + # is forbidden in the sandbox + doCheck = false; + + pythonImportsCheck = [ "stanza" ]; + + meta = with lib; { + description = "Official Stanford NLP Python Library for Many Human Languages"; + homepage = "https://github.com/stanfordnlp/stanza/"; + license = licenses.asl20; + maintainers = with maintainers; [ riotbib ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ca34ed5d976..a03d2a830274 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8828,6 +8828,8 @@ in { stack-data = callPackage ../development/python-modules/stack-data { }; + stanza = callPackage ../development/python-modules/stanza { }; + starlette = callPackage ../development/python-modules/starlette { inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices; }; From 660a3447d20c2ec450f4b53bf966dc1cb3149fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 15 Nov 2021 10:20:33 -0800 Subject: [PATCH 05/32] libdeltachat: 1.64.0 -> 1.65.0 https://github.com/deltachat/deltachat-core-rust/blob/1.65.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index c401240f7d50..8f6beb01ea39 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.64.0"; + version = "1.65.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = version; - sha256 = "04a1ncikapx53jjrx0ac1qi907wlj6javylz4aksg4nfbph6y9j4"; + sha256 = "1k906pll4k8bc2xc9qd9g7q10rikbij2sy0w2wg9mf335rfym6z4"; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "0skrzxn99c1gqil7z0dv0xhg883k98v6mh96nycf7whl2d25965x"; + sha256 = "0jc9kyn5h3cn2ni5h3km47sfprpxr7hc96ca01yal2zyksm7zqxn"; }; nativeBuildInputs = [ From ef58bbf9b7ce34f1f4fcace04484b9bbea0d3ed2 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 12 Nov 2021 14:19:54 +1300 Subject: [PATCH 06/32] nixos/pam: avoid extra lines in pam files --- nixos/modules/security/pam.nix | 328 +++++++++++++++++++-------------- 1 file changed, 191 insertions(+), 137 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 40df6c67ef84..70bce783a90b 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -410,46 +410,64 @@ let # Samba stuff to the Samba module. This requires that the PAM # module provides the right hooks. text = mkDefault - ('' - # Account management. - account required pam_unix.so - ${optionalString use_ldap - "account sufficient ${pam_ldap}/lib/security/pam_ldap.so"} - ${optionalString (config.services.sssd.enable && cfg.sssdStrictAccess==false) - "account sufficient ${pkgs.sssd}/lib/security/pam_sss.so"} - ${optionalString (config.services.sssd.enable && cfg.sssdStrictAccess) - "account [default=bad success=ok user_unknown=ignore] ${pkgs.sssd}/lib/security/pam_sss.so"} - ${optionalString config.krb5.enable - "account sufficient ${pam_krb5}/lib/security/pam_krb5.so"} - ${optionalString cfg.googleOsLoginAccountVerification '' + ( + '' + # Account management. + account required pam_unix.so + '' + + optionalString use_ldap '' + account sufficient ${pam_ldap}/lib/security/pam_ldap.so + '' + + optionalString (config.services.sssd.enable && cfg.sssdStrictAccess==false) '' + account sufficient ${pkgs.sssd}/lib/security/pam_sss.so + '' + + optionalString (config.services.sssd.enable && cfg.sssdStrictAccess) '' + account [default=bad success=ok user_unknown=ignore] ${pkgs.sssd}/lib/security/pam_sss.so + '' + + optionalString config.krb5.enable '' + account sufficient ${pam_krb5}/lib/security/pam_krb5.so + '' + + optionalString cfg.googleOsLoginAccountVerification '' account [success=ok ignore=ignore default=die] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so account [success=ok default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_admin.so - ''} + '' + + '' - # Authentication management. - ${optionalString cfg.googleOsLoginAuthentication - "auth [success=done perm_denied=bad default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so"} - ${optionalString cfg.rootOK - "auth sufficient pam_rootok.so"} - ${optionalString cfg.requireWheel - "auth required pam_wheel.so use_uid"} - ${optionalString cfg.logFailures - "auth required pam_faillock.so"} - ${optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth) - "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=${lib.concatStringsSep ":" config.services.openssh.authorizedKeysFiles}"} - ${let p11 = config.security.pam.p11; in optionalString cfg.p11Auth - "auth ${p11.control} ${pkgs.pam_p11}/lib/security/pam_p11.so ${pkgs.opensc}/lib/opensc-pkcs11.so"} - ${let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth - "auth ${u2f.control} ${pkgs.pam_u2f}/lib/security/pam_u2f.so ${optionalString u2f.debug "debug"} ${optionalString (u2f.authFile != null) "authfile=${u2f.authFile}"} ${optionalString u2f.interactive "interactive"} ${optionalString u2f.cue "cue"} ${optionalString (u2f.appId != null) "appid=${u2f.appId}"}"} - ${optionalString cfg.usbAuth - "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"} - ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth - "auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"} - ${let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth - "auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"}"} - ${optionalString cfg.fprintAuth - "auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so"} - '' + + # Authentication management. + '' + + optionalString cfg.googleOsLoginAuthentication '' + auth [success=done perm_denied=bad default=ignore] ${pkgs.google-compute-engine-oslogin}/lib/pam_oslogin_login.so + '' + + optionalString cfg.rootOK '' + auth sufficient pam_rootok.so + '' + + optionalString cfg.requireWheel '' + auth required pam_wheel.so use_uid + '' + + optionalString cfg.logFailures '' + auth required pam_faillock.so + '' + + optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth) '' + auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=${lib.concatStringsSep ":" config.services.openssh.authorizedKeysFiles} + '' + + (let p11 = config.security.pam.p11; in optionalString cfg.p11Auth '' + auth ${p11.control} ${pkgs.pam_p11}/lib/security/pam_p11.so ${pkgs.opensc}/lib/opensc-pkcs11.so + '') + + (let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth '' + auth ${u2f.control} ${pkgs.pam_u2f}/lib/security/pam_u2f.so ${optionalString u2f.debug "debug"} ${optionalString (u2f.authFile != null) "authfile=${u2f.authFile}"} ${optionalString u2f.interactive "interactive"} ${optionalString u2f.cue "cue"} ${optionalString (u2f.appId != null) "appid=${u2f.appId}"} + '') + + optionalString cfg.usbAuth '' + auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so + '' + + (let oath = config.security.pam.oath; in optionalString cfg.oathAuth '' + auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits} + '') + + (let yubi = config.security.pam.yubico; in optionalString cfg.yubicoAuth '' + auth ${yubi.control} ${pkgs.yubico-pam}/lib/security/pam_yubico.so mode=${toString yubi.mode} ${optionalString (yubi.challengeResponsePath != null) "chalresp_path=${yubi.challengeResponsePath}"} ${optionalString (yubi.mode == "client") "id=${toString yubi.id}"} ${optionalString yubi.debug "debug"} + '') + + optionalString cfg.fprintAuth '' + auth sufficient ${pkgs.fprintd}/lib/security/pam_fprintd.so + '' + # Modules in this block require having the password set in PAM_AUTHTOK. # pam_unix is marked as 'sufficient' on NixOS which means nothing will run # after it succeeds. Certain modules need to run after pam_unix @@ -457,115 +475,151 @@ let # earlier point and it will run again with 'sufficient' further down. # We use try_first_pass the second time to avoid prompting password twice (optionalString (cfg.unixAuth && - (config.security.pam.enableEcryptfs - || cfg.pamMount - || cfg.enableKwallet - || cfg.enableGnomeKeyring - || cfg.googleAuthenticator.enable - || cfg.gnupg.enable - || cfg.duoSecurity.enable)) '' - auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth - ${optionalString config.security.pam.enableEcryptfs - "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} - ${optionalString cfg.pamMount - "auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive"} - ${optionalString cfg.enableKwallet - ("auth optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" + - " kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")} - ${optionalString cfg.enableGnomeKeyring - "auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"} - ${optionalString cfg.gnupg.enable - "auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so" - + optionalString cfg.gnupg.storeOnly " store-only" - } - ${optionalString cfg.googleAuthenticator.enable - "auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp"} - ${optionalString cfg.duoSecurity.enable - "auth required ${pkgs.duo-unix}/lib/security/pam_duo.so"} - '') + '' - ${optionalString cfg.unixAuth - "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth try_first_pass"} - ${optionalString cfg.otpwAuth - "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"} - ${optionalString use_ldap - "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"} - ${optionalString config.services.sssd.enable - "auth sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_first_pass"} - ${optionalString config.krb5.enable '' + (config.security.pam.enableEcryptfs + || cfg.pamMount + || cfg.enableKwallet + || cfg.enableGnomeKeyring + || cfg.googleAuthenticator.enable + || cfg.gnupg.enable + || cfg.duoSecurity.enable)) + ( + '' + auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth + '' + + optionalString config.security.pam.enableEcryptfs '' + auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap + '' + + optionalString cfg.pamMount '' + auth optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive + '' + + optionalString cfg.enableKwallet '' + auth optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5 + '' + + optionalString cfg.enableGnomeKeyring '' + auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so + '' + + optionalString cfg.gnupg.enable '' + auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so ${optionalString cfg.gnupg.storeOnly " store-only"} + '' + + optionalString cfg.googleAuthenticator.enable '' + auth required ${pkgs.googleAuthenticator}/lib/security/pam_google_authenticator.so no_increment_hotp + '' + + optionalString cfg.duoSecurity.enable '' + auth required ${pkgs.duo-unix}/lib/security/pam_duo.so + '' + )) + + optionalString cfg.unixAuth '' + auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth try_first_pass + '' + + optionalString cfg.otpwAuth '' + auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so + '' + + optionalString use_ldap '' + auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass + '' + + optionalString config.services.sssd.enable '' + auth sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_first_pass + '' + + optionalString config.krb5.enable '' auth [default=ignore success=1 service_err=reset] ${pam_krb5}/lib/security/pam_krb5.so use_first_pass auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_pass - ''} - auth required pam_deny.so + '' + + '' + auth required pam_deny.so - # Password management. - password sufficient pam_unix.so nullok sha512 - ${optionalString config.security.pam.enableEcryptfs - "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - ${optionalString cfg.pamMount - "password optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} - ${optionalString use_ldap - "password sufficient ${pam_ldap}/lib/security/pam_ldap.so"} - ${optionalString config.services.sssd.enable - "password sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_authtok"} - ${optionalString config.krb5.enable - "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"} - ${optionalString cfg.enableGnomeKeyring - "password optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"} + # Password management. + password sufficient pam_unix.so nullok sha512 + '' + + optionalString config.security.pam.enableEcryptfs '' + password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so + '' + + optionalString cfg.pamMount '' + password optional ${pkgs.pam_mount}/lib/security/pam_mount.so + '' + + optionalString use_ldap '' + password sufficient ${pam_ldap}/lib/security/pam_ldap.so + '' + + optionalString config.services.sssd.enable '' + password sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_authtok + '' + + optionalString config.krb5.enable '' + password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass + '' + + optionalString cfg.enableGnomeKeyring '' + password optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok + '' + + '' - # Session management. - ${optionalString cfg.setEnvironment '' + # Session management. + '' + + optionalString cfg.setEnvironment '' session required pam_env.so conffile=/etc/pam/environment readenv=0 - ''} - session required pam_unix.so - ${optionalString cfg.setLoginUid - "session ${ - if config.boot.isContainer then "optional" else "required" - } pam_loginuid.so"} - ${optionalString cfg.ttyAudit.enable - "session required ${pkgs.pam}/lib/security/pam_tty_audit.so + '' + + '' + session required pam_unix.so + '' + + optionalString cfg.setLoginUid '' + session ${if config.boot.isContainer then "optional" else "required"} pam_loginuid.so + '' + + optionalString cfg.ttyAudit.enable '' + session required ${pkgs.pam}/lib/security/pam_tty_audit.so open_only=${toString cfg.ttyAudit.openOnly} ${optionalString (cfg.ttyAudit.enablePattern != null) "enable=${cfg.ttyAudit.enablePattern}"} ${optionalString (cfg.ttyAudit.disablePattern != null) "disable=${cfg.ttyAudit.disablePattern}"} - "} - ${optionalString cfg.makeHomeDir - "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0077"} - ${optionalString cfg.updateWtmp - "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"} - ${optionalString config.security.pam.enableEcryptfs - "session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - ${optionalString cfg.pamMount - "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive"} - ${optionalString use_ldap - "session optional ${pam_ldap}/lib/security/pam_ldap.so"} - ${optionalString config.services.sssd.enable - "session optional ${pkgs.sssd}/lib/security/pam_sss.so"} - ${optionalString config.krb5.enable - "session optional ${pam_krb5}/lib/security/pam_krb5.so"} - ${optionalString cfg.otpwAuth - "session optional ${pkgs.otpw}/lib/security/pam_otpw.so"} - ${optionalString cfg.startSession - "session optional ${pkgs.systemd}/lib/security/pam_systemd.so"} - ${optionalString cfg.forwardXAuth - "session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99"} - ${optionalString (cfg.limits != []) - "session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf cfg.limits}"} - ${optionalString (cfg.showMotd && config.users.motd != null) - "session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd}"} - ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable) - "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"} - ${optionalString (cfg.enableKwallet) - ("session optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" + - " kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")} - ${optionalString (cfg.enableGnomeKeyring) - "session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} - ${optionalString cfg.gnupg.enable - "session optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so" - + optionalString cfg.gnupg.noAutostart " no-autostart" - } - ${optionalString (config.virtualisation.lxc.lxcfs.enable) - "session optional ${pkgs.lxc}/lib/security/pam_cgfs.so -c all"} - ''); + '' + + optionalString cfg.makeHomeDir '' + session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=${config.security.pam.makeHomeDir.skelDirectory} umask=0077 + '' + + optionalString cfg.updateWtmp '' + session required ${pkgs.pam}/lib/security/pam_lastlog.so silent + '' + + optionalString config.security.pam.enableEcryptfs '' + session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so + '' + + optionalString cfg.pamMount '' + session optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive + '' + + optionalString use_ldap '' + session optional ${pam_ldap}/lib/security/pam_ldap.so + '' + + optionalString config.services.sssd.enable '' + session optional ${pkgs.sssd}/lib/security/pam_sss.so + '' + + optionalString config.krb5.enable '' + session optional ${pam_krb5}/lib/security/pam_krb5.so + '' + + optionalString cfg.otpwAuth '' + session optional ${pkgs.otpw}/lib/security/pam_otpw.so + '' + + optionalString cfg.startSession '' + session optional ${pkgs.systemd}/lib/security/pam_systemd.so + '' + + optionalString cfg.forwardXAuth '' + session optional pam_xauth.so xauthpath=${pkgs.xorg.xauth}/bin/xauth systemuser=99 + '' + + optionalString (cfg.limits != []) '' + session required ${pkgs.pam}/lib/security/pam_limits.so conf=${makeLimitsConf cfg.limits} + '' + + optionalString (cfg.showMotd && config.users.motd != null) '' + session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd} + '' + + optionalString (cfg.enableAppArmor && config.security.apparmor.enable) '' + session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug + '' + + optionalString (cfg.enableKwallet) '' + session optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5 + '' + + optionalString (cfg.enableGnomeKeyring) '' + session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start + '' + + optionalString cfg.gnupg.enable '' + session optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so ${optionalString cfg.gnupg.noAutostart " no-autostart"} + '' + + optionalString (config.virtualisation.lxc.lxcfs.enable) '' + session optional ${pkgs.lxc}/lib/security/pam_cgfs.so -c all + '' + ); }; }; From fadae2575ba2967dcb12b6d70d52ff5a94614b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 16 Nov 2021 09:55:32 -0600 Subject: [PATCH 07/32] =?UTF-8?q?kotlin:=201.5.31=20=E2=86=92=201.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 9f2efdb409b9..4a92fd87f267 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.5.31"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "sha256-ZhERKG8+WsBqrzqUA9hp2alqF2tisUGBS+YmpHJJ/p4="; + sha256 = "sha256-F0yS4SpUwJAf2fC62s8VFMKLUZepVlTk2rF3UpPd4dw="; }; propagatedBuildInputs = [ jre ] ; From ed97d79de6225965e34c74c7af15bd0ab8b6345f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Tue, 16 Nov 2021 10:02:20 -0600 Subject: [PATCH 08/32] =?UTF-8?q?kotlin-native:=201.5.31=20=E2=86=92=201.6?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/kotlin/native.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index 34f38b3a8e9e..b1a50cdcf40f 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.5.31"; + version = "1.6.0"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "sha256-+9AF42AlPn1/8c14t8u+NN8FkoEmdt6tpmIKU9Rp2AM="; - "macos-x86_64" = "sha256-/eciSo4Eps2TTsv1XU1Rlm+KBmgQT0MWp2s/OAYtGt4="; - "linux-x86_64" = "sha256-Y2t+nlTu+j+h0oRneo7CJx0PmLAkqKYBJ+8go7rargM="; + "macos-aarch64" = "sha256-HLI6E3Y8l/5vAgjT39ezBCEYhCGV3pdjx1B1fL57qO4="; + "macos-x86_64" = "sha256-cJV+dP9/pJHlJx55HMqd7KC/OIWEzPXKmobCZLBZ+ec="; + "linux-x86_64" = "sha256-C5R2hdPg1cOA9WcSZYkN22Ca3/pslEcp554tuy/HxnQ="; }.${arch}; in fetchurl { From bb9e3fdc794f15f8a7dfc54a1b727aacd66189d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 21:07:42 +0100 Subject: [PATCH 09/32] python3Packages.archinfo: 9.0.10534 -> 9.0.10576 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index ba23fc83b539..8417d7d95af6 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.10534"; + version = "9.0.10576"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8bGDl3rHVT2JKEOfYPHzFTxJ7t3Yz7aLQMVKAUNCSBo="; + sha256 = "sha256-K36tAsVfminDFK09jE6+ruROkaLfCTNPCL5ziZJOrVk="; }; checkInputs = [ From e4fb2b331a032a2a5f67e8f14157611f3b3f5e4a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 21:07:47 +0100 Subject: [PATCH 10/32] python3Packages.ailment: 9.0.10534 -> 9.0.10576 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 025180d6869a..7e5ac1fda5c0 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.10534"; + version = "9.0.10576"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EmfbyXHoWEd2Yp1RFRkW94dzeRXw0rsBtvVcl+Vg0qI="; + sha256 = "sha256-s8GZV+hcuAZJhKVoLAtC2mwHlqr/vJ6P5mwlNDczEyY="; }; propagatedBuildInputs = [ pyvex ]; From 6df38df7484cd159f090edd2760d89d97eebc5d7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 21:07:51 +0100 Subject: [PATCH 11/32] python3Packages.pyvex: 9.0.10534 -> 9.0.10576 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index ea8bf1b72c09..ba024bf5c6a1 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.10534"; + version = "9.0.10576"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tUjASwLQy/p3Q+XnkbpUQNM6VHk94bIle2BzRd4EYsg="; + sha256 = "sha256-pOQZXymIuffUfShAUrXqlxwWCIRKZpkMZcJS1fad2bs="; }; postPatch = lib.optionalString stdenv.isDarwin '' From 5e2d1746983c7b8ea92dfada9ac649c11c652e5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 21:07:56 +0100 Subject: [PATCH 12/32] python3Packages.claripy: 9.0.10534 -> 9.0.10576 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 76d0f730401c..ab8842d40614 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.10534"; + version = "9.0.10576"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WeqfNVGQio5ugC14iv0ls5b3O1ymEjfpV8J47cCqXeQ="; + sha256 = "sha256-86ySQ/2l1h5vayMfAsr9ShyE8oRKL37sT3bfrgIGFHY="; }; # Use upstream z3 implementation From 45546f91a7c07ecb78dfdb343f562d20c51a0b2d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 21:08:01 +0100 Subject: [PATCH 13/32] python3Packages.cle: 9.0.10534 -> 9.0.10576 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 950b6c903fb2..a5e458a6eb42 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.10534"; + version = "9.0.10576"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-edZC0pZf6A2lpqJDfpMeslLQQGEokq4B9qywgS7wLxo="; + sha256 = "sha256-ftaFISU37GcCFTybxV31PwUl2vrbKVm/S00Qo+pUxgo="; }; propagatedBuildInputs = [ From 8c9879f2adc882dd032fc93bbf9c4ce7bcffdf36 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 21:08:07 +0100 Subject: [PATCH 14/32] python3Packages.angr: 9.0.10534 -> 9.0.10576 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index d7b540f50ca9..488831e80080 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.10534"; + version = "9.0.10576"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-A2dqCABkqkn/rjWGc8hrGs60BK+V8j2+jVAYxnEpx8Y="; + sha256 = "sha256-lRoJZX7HPZE6y7v5AuU1C6sjOIXXefv8M/qPiNQtobw="; }; propagatedBuildInputs = [ From 328404935b1480151b7dd2ef1b15601a11c851a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 21:08:12 +0100 Subject: [PATCH 15/32] python3Packages.angrop: 9.0.10534 -> 9.0.10576 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 35f98a172c7c..7dc8d583958d 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.10534"; + version = "9.0.10576"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PaAhEn/eJg1qfuq2sHWTGTiJKNfs60NJuvfS9hVObX4="; + sha256 = "sha256-i4F6VyJYJ6XON9G43Z2VwWAPHGRxR9DzxnEDGiJ8LSE="; }; propagatedBuildInputs = [ From 83e069f05caae869e57dc2986dc6d744d703a998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 15 Nov 2021 20:00:29 -0800 Subject: [PATCH 16/32] deltachat-desktop: use libdeltachat 1.60.0 Also make sure the update script only updates the version of deltachat-desktop. --- .../deltachat-desktop/default.nix | 30 +++++++++++++- .../deltachat-desktop/no-static-lib.patch | 39 +++++++++++++++++++ .../deltachat-desktop/update.sh | 13 ++++--- 3 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index a359f0a4ac0f..cd29268bec68 100644 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -3,6 +3,7 @@ , electron , esbuild , fetchFromGitHub +, fetchpatch , libdeltachat , makeDesktopItem , makeWrapper @@ -14,6 +15,33 @@ }: let + libdeltachat' = libdeltachat.overrideAttrs (old: rec { + version = "1.60.0"; + src = fetchFromGitHub { + owner = "deltachat"; + repo = "deltachat-core-rust"; + rev = version; + sha256 = "1agm5xyaib4ynmw4mhgmkhh4lnxs91wv0q9i1zfihv2vkckfm2s2"; + }; + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${old.pname}-${version}"; + sha256 = "09d3mw2hb1gmqg7smaqwnfm7izw40znl0h1dz7s2imms2cnkjws1"; + }; + patches = [ + # https://github.com/deltachat/deltachat-core-rust/pull/2589 + (fetchpatch { + url = "https://github.com/deltachat/deltachat-core-rust/commit/408467e85d04fbbfd6bed5908d84d9e995943487.patch"; + sha256 = "1j2ywaazglgl6370js34acrg0wrh0b7krqg05dfjf65n527lzn59"; + }) + ./no-static-lib.patch + # https://github.com/deltachat/deltachat-core-rust/pull/2660 + (fetchpatch { + url = "https://github.com/deltachat/deltachat-core-rust/commit/8fb5e038a97d8ae68564c885d61b93127a68366d.patch"; + sha256 = "088pzfrrkgfi4646dc72404s3kykcpni7hgkppalwlzg0p4is41x"; + }) + ]; + }); electronExec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else @@ -38,7 +66,7 @@ in nodePackages.deltachat-desktop.override rec { ]; buildInputs = [ - libdeltachat + libdeltachat' ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch b/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch new file mode 100644 index 000000000000..95238cf88524 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch @@ -0,0 +1,39 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fe7abe08..acdbe0d6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,7 +13,6 @@ find_program(CARGO cargo) + + add_custom_command( + OUTPUT +- "target/release/libdeltachat.a" + "target/release/libdeltachat.${DYNAMIC_EXT}" + "target/release/pkgconfig/deltachat.pc" + COMMAND +@@ -38,13 +37,11 @@ add_custom_target( + lib_deltachat + ALL + DEPENDS +- "target/release/libdeltachat.a" + "target/release/libdeltachat.${DYNAMIC_EXT}" + "target/release/pkgconfig/deltachat.pc" + ) + + include(GNUInstallDirs) + install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +-install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) +diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml +index a34a27ba..cf354abb 100644 +--- a/deltachat-ffi/Cargo.toml ++++ b/deltachat-ffi/Cargo.toml +@@ -12,7 +12,7 @@ categories = ["cryptography", "std", "email"] + + [lib] + name = "deltachat" +-crate-type = ["cdylib", "staticlib"] ++crate-type = ["cdylib"] + + [dependencies] + deltachat = { path = "../", default-features = false } diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh index 162de501e617..dbe249d56dae 100755 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh +++ b/pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p curl jq nix-prefetch +#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch set -euo pipefail cd "$(dirname "$0")" @@ -13,7 +13,7 @@ rev=$( jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output ) ver=$(echo "$rev" | sed 's/^v//') -old_ver=$(sed -n 's/.*\bversion = "\(.*\)".*/\1/p' default.nix) +old_ver=$(tac default.nix | sed -n 's/.*\bversion = "\(.*\)".*/\1/p' | head -1) if [ "$ver" = "$old_ver" ]; then echo "Up to date: $ver" exit @@ -21,9 +21,12 @@ fi echo "$old_ver -> $ver" sha256=$(nix-prefetch -f "$nixpkgs" deltachat-desktop --rev "$rev") -sed -e "s#\\bversion = \".*\"#version = \"$ver\"#" \ - -e "s#\\bsha256 = \".*\"#sha256 = \"$sha256\"#" \ - -i default.nix +tac default.nix \ + | sed -e "0,/version = \".*\"/s//version = \"$ver\"/" \ + -e "0,/sha256 = \".*\"/s//sha256 = \"$sha256\"/" \ + | tac \ + | sponge default.nix + src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link) jq '{ name, version, dependencies: (.dependencies + (.devDependencies | del(.["@typescript-eslint/eslint-plugin","@typescript-eslint/parser","esbuild","electron-builder","electron-devtools-installer","electron-notarize","esbuild","eslint","eslint-config-prettier","eslint-plugin-react-hooks","hallmark","prettier","tape","testcafe","testcafe-browser-provider-electron","testcafe-react-selectors","walk"]))) }' \ From 4366c6ca9c36a6d8c204b450bd326cddd85b6782 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Nov 2021 10:26:09 +0100 Subject: [PATCH 17/32] python3Packages.pypinyin: 0.43.0 -> 0.44.0 --- pkgs/development/python-modules/pypinyin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix index 47e41434c469..4cac927341de 100644 --- a/pkgs/development/python-modules/pypinyin/default.nix +++ b/pkgs/development/python-modules/pypinyin/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pypinyin"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "mozillazg"; repo = "python-pinyin"; rev = "v${version}"; - sha256 = "0h3lpb8bw9zp8is5sx2zg931wz12x0zfan1kksnbhx16vwv1kgw3"; + sha256 = "sha256-LYiiZvpM/V3QRyTUXGWGnSnR0AnqWfTW0xJB4Vnw7lI="; }; postPatch = '' From 97102e0b78e242fd7e43c70be94eda2e965e3d1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Nov 2021 19:15:45 +0100 Subject: [PATCH 18/32] checkov: 2.0.574 -> 2.0.580 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 0bf46ed1b13e..3fd81c749a42 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.574"; + version = "2.0.580"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-DM7fPwJcWEyOu55ThK/jP9jIUbiVCfEtltSP7puCoxQ="; + sha256 = "sha256-GnEXGXJCI9VIOKJbGjTppum6j/uwX4m4ytaZqvpfl7Q="; }; nativeBuildInputs = with py.pkgs; [ From e386217d72530651ada6d6ea55ec5a737a357a0a Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Wed, 17 Nov 2021 07:22:28 -0700 Subject: [PATCH 19/32] matrix-synapse: 1.46.0 -> 1.47.0 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 676abec8ecca..b1d42c8091c7 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.46.0"; + version = "1.47.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-RcB+RSb/LZE8Q+UunyrYh28S7c7VsTmqg4mJIDVCX5U="; + sha256 = "sha256-SS7ETkYQ3XBihOA6TQp+6f0PNhhlUvMBR6fEYmiLT3k="; }; patches = [ From ebbf93136f9ca5e4e900541b50d6154e98efcd38 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 17 Nov 2021 11:26:14 -0500 Subject: [PATCH 20/32] nixos/zabbixServer: explicitely set security.wrappers ownership --- nixos/modules/services/monitoring/zabbix-server.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/zabbix-server.nix b/nixos/modules/services/monitoring/zabbix-server.nix index 9b0fd9dbff13..0141c073da25 100644 --- a/nixos/modules/services/monitoring/zabbix-server.nix +++ b/nixos/modules/services/monitoring/zabbix-server.nix @@ -250,7 +250,12 @@ in }; security.wrappers = { - fping.source = "${pkgs.fping}/bin/fping"; + fping = + { setuid = true; + owner = "root"; + group = "root"; + source = "${pkgs.fping}/bin/fping"; + }; }; systemd.services.zabbix-server = { From 1332cffaeb4db69f873d649ebd98281617cc3b1d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Nov 2021 17:48:28 +0100 Subject: [PATCH 21/32] mpd: 0.23.2 -> 0.23.4 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 95ac59cec2ba..7c2f2ca98989 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -117,13 +117,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.2"; + version = "0.23.4"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-gn06t8S0hh5xe5V1vnXVHSb0FwxY40onUV+Bt7oL9ic="; + sha256 = "sha256-siMFLV1fKdRt8To6AhLXmAAsgqZCA/bbvmlhbb6hLic="; }; buildInputs = [ From 98426ba308658f6ea8f9208694ab3ca11cd16da6 Mon Sep 17 00:00:00 2001 From: Chua Hou Date: Wed, 17 Nov 2021 17:35:22 +0000 Subject: [PATCH 22/32] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 466 ++++++++++++++-------------- 1 file changed, 233 insertions(+), 233 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index e090effbe39f..ca190ee2b2b4 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-11-09"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "8b3b16d71c4c683da6f3ca39662d207a3e894901"; - sha256 = "1mdxgiin61630fimxm2l0zcr30br4q2ipp84l3iqxjbs0fqg11s5"; + rev = "31dc6a61a07839ea906f6f0b80be713fb8cad1c7"; + sha256 = "1j8fzyxl3lgc5xwklllvk7cq0qh7hdjjvv9r93xzbmr74w82410v"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -101,12 +101,12 @@ final: prev: aniseed = buildVimPluginFrom2Nix { pname = "aniseed"; - version = "2021-10-24"; + version = "2021-11-14"; src = fetchFromGitHub { owner = "Olical"; repo = "aniseed"; - rev = "4bb3a4c1a1e329ebefa7ff022f7b3947770f7f26"; - sha256 = "0sd81pagrrwsig1fjm4ly866wcpq4xqpf810a8q1p2bygjs95chx"; + rev = "9c8f2cd17d454a38b11cedd323579b579ee27f9c"; + sha256 = "1j7nsiikf2bl6h52pa0v2mwhsrk8irq9104jm7hy6a6wz97dqmfb"; }; meta.homepage = "https://github.com/Olical/aniseed/"; }; @@ -197,12 +197,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2021-11-06"; + version = "2021-11-13"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "ea1b3e8398acde2659e4430b17f3084c33829fcb"; - sha256 = "1xwhp8fzasiyym5yqnhdfzrbh59vjf5jl1cc10xrf00kv2l2kvwx"; + rev = "639f60317e7ccaccb6b8b6681b40897308d466b8"; + sha256 = "0b4nsdkfmd8j0v74fd4yzyx1rm2l4a968g3s9vhckrn9wnyj7khf"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -413,12 +413,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2021-11-01"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "782fab8a2352e872dc991c42f806dae18e848b2d"; - sha256 = "0j5r0cgcdgnqdd0fd6y9b0nh301xyb6b2vgqc34rdk30gam7h5d1"; + rev = "463637a3ac86dcaacbcd47aa608f53aaad749696"; + sha256 = "0nphn0ks8xqf0l8xklqn2fv2wvizzpg1x399x9yd916q4ck92588"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -473,12 +473,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-11-11"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "8bf4553d1000b2c9189f1893ac5c737b61572791"; - sha256 = "1jk795a6r8yzbjbyx121qn65njs4j3l947x3n937kygqpb7paflm"; + rev = "6202def5abfbc83acfbb86110753a03e00bc97bf"; + sha256 = "1gp0if044cqzpjfxrsn8kdk4siqm18bvdrngpqqar4rqgsx89kg1"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -581,12 +581,12 @@ final: prev: cmp-buffer = buildVimPluginFrom2Nix { pname = "cmp-buffer"; - version = "2021-11-10"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-buffer"; - rev = "2d85e76c725a389b72067f86fc3c65f3868b9a59"; - sha256 = "0lvx58nchrl08jjp2gvyfrxkqdqnyi97zj86nnx184vnx8a5qcqh"; + rev = "bfbc32a8aadbf3d21294aad45f069b7d204b34b1"; + sha256 = "11wmq4fh5nbyswcgmw17ihx7g4naqba06a55f1cxk913aqcqqnwx"; }; meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; @@ -821,24 +821,24 @@ final: prev: coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2021-10-23"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "9fc34a66e6744f52769bb0b95cba851723964faf"; - sha256 = "0lhvaygicayqpabgmdya6fq7yybch5nd7myjydmcdnpmivzh7mk8"; + rev = "60828294b9ba846c78893389d4772021043d2fa1"; + sha256 = "1y7rslksa558fdh3m4m626vpvs424pvxkkk70mr57is47cminm3m"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-11-09"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "9672c9cde3cce32720fafbdb65618d817b7022d8"; - sha256 = "1y35xqzd17c8cvlrqfa10lninql2xkkkgy40wl1bwfzl5awk9rm7"; + rev = "3a5366b11ca3c11a9e894755d365328ba36de227"; + sha256 = "0qv73ph2wgn0j7il508zb29k04r4n5q601fih2hp264zvyqkw6sf"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1098,12 +1098,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2021-10-24"; + version = "2021-11-14"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "a2831ac61c44f9fe98a0fb469b02b761d503bc9a"; - sha256 = "1r1lz397fga204i4a4g6zbaf457wmvb35kpd9m7n8476iay892j7"; + rev = "9ed390497a5013aa533a15f5d96f3fb6319b4eb9"; + sha256 = "0w8akq23s5j5kais5s67f6zpkank9wgms30kzyvq2bpslk9kwvfx"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1134,12 +1134,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-10-28"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "86b9aecfaeaed5db9064b58115ff6dc67b318f7e"; - sha256 = "10gjlxnga52f21r558xz7pqv63pbqqfw01yl71i0z46y33jnpy14"; + rev = "f38e086135c5d9b69c9a5f70f82072419d952c29"; + sha256 = "01lf10b6b07s7ywrh16p5b52jj21hzv1vn216h9bnf4xdfz5pf9a"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1170,12 +1170,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2021-11-10"; + version = "2021-11-13"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "0b17e2bb069cb388ba22d156bbe1b3b3b3585312"; - sha256 = "1d7gssvw2sl1girj8svbdzlrhxsjgp9rkfkjrr2jd7p5ilhry27a"; + rev = "dea18a76bbe84d1eb80f9474cb33c8efd377c73d"; + sha256 = "0gc47ixbjb2zf9g0qr2jzq2cmnzgml1lvvv22zdsrk7j8n9kxxqb"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1242,12 +1242,12 @@ final: prev: ctrlp-vim = buildVimPluginFrom2Nix { pname = "ctrlp.vim"; - version = "2021-10-19"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "ctrlpvim"; repo = "ctrlp.vim"; - rev = "61e964f2d168f52cb8e80e67d26605b52d726b16"; - sha256 = "0qi4ip94lxfxzbkhs779v1afmvh6q0wp8fcfxxdhzgl44qlhy6hx"; + rev = "d9388d89745bb30c20ad0051c53d301cd054f47c"; + sha256 = "1lsr0y4q57k65qk5y17gnm8cfi7rg8r6h2h7cxkmgzn11d4p34c0"; }; meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; @@ -1640,12 +1640,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2021-10-22"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "d4ee04c9eb8951dcf1aa83d7a896bededfc68228"; - sha256 = "0wfrbhnal7y82bhrf446igc6g9avavk2jx0idk5sbv24bqhi9b60"; + rev = "a38306ddf893b95b55c6cd881605b3232c658e42"; + sha256 = "1c55zhxzf3zps7fzqs4vsd81z9la2x3blvjwh45abs93rnqik8nx"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2015,12 +2015,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-11-10"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "7d4a4c4e57b7aabb9e7d1f591c29e6d5e7e382e4"; - sha256 = "19z6yjdd7q9hydzx3bw2w8c573y0xjn9s7n780w65n34iirjbh7i"; + rev = "05bfa7681b8f11b664fab657001c2efb6f3ec85e"; + sha256 = "1133f32q4g990mmvdrbnjxggk8y96w0c5zlvh553cz9j626a4zks"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2207,12 +2207,12 @@ final: prev: git-messenger-vim = buildVimPluginFrom2Nix { pname = "git-messenger.vim"; - version = "2021-09-29"; + version = "2021-11-13"; src = fetchFromGitHub { owner = "rhysd"; repo = "git-messenger.vim"; - rev = "3f08e210b3f7edd5477a73257eb8d5ca8100ccf0"; - sha256 = "0wc3jwfyr4pvzhcm3nf4rr3gqllfg0d2r66wl75g69cj6syagjj4"; + rev = "2e67899355f3f631aad6845925e4c2c13546444d"; + sha256 = "0a6c04far9ji7h7k0b195zxn62sj6drn56cacmz86zmzksqgm8wp"; }; meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; @@ -2243,24 +2243,24 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2021-10-18"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "a6fb6d1ec2746fc18f81433648416edfb1a96d43"; - sha256 = "0c417li0jx970h8qkgrww7ifzjjknfi26i7n13qx96c5axjxady5"; + rev = "003ee482a25118cdac73faea8bd35df0399e8f8f"; + sha256 = "0zpy1cpviia9l4z3b87534arnxfja48bjhqqb88mxjzm9gkc4rbf"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2021-11-11"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "e6775fa32e4904cc8bbd098ba9807db9606e816e"; - sha256 = "1w7vq9jbw3lhd8i9wbf71q344235iwcigff7jrrh3fbcq6kk7m12"; + rev = "5e49bb09f324580519d1ef41cb03bcb07536a239"; + sha256 = "1zfwazv58y4r9cpalx522hnb9wics50m90n59yabmimb2iyp323z"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2327,12 +2327,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-11-09"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "b930629c018c6b30d42e8d271a32a37e0360c628"; - sha256 = "0mly30sqbs43xmkda04jzk4knxcv7f42sddm87ky6j8ii67147ys"; + rev = "817bae89f75c8f061f7c0198ce392dca5d16ac94"; + sha256 = "0pxz7mrl4fsdi6pyk7zizxb7g3a11n8s36ndg3l9qsbihfxiqk5y"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2399,12 +2399,12 @@ final: prev: gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2021-10-27"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "526439a61a859936fe85da27fffa927e2dccdb83"; - sha256 = "1zlvrfyas257j2iqanf4i2kvxa5cdj2n3kg9xk6g8bzsjcsqw4cw"; + rev = "dc7c63320c523997610ced545007935c72d81942"; + sha256 = "16nvlli0vmqxdbcx2d8p2nsl0865444l1d3ji23z9cbz4i171rsw"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -2495,12 +2495,12 @@ final: prev: hologram-nvim = buildVimPluginFrom2Nix { pname = "hologram.nvim"; - version = "2021-08-01"; + version = "2021-11-14"; src = fetchFromGitHub { owner = "edluffy"; repo = "hologram.nvim"; - rev = "5598fea84f0bab236293793a6398fb7fbbf1cbc6"; - sha256 = "0a5fgnqh475ngv4n4xbxzisvcx9vs1w4qn1k4imh8p61n02q0h8w"; + rev = "1d1acf102de7a5eed7de62691250b064d6db9d8a"; + sha256 = "0ihr85iisjc3xr9jhm4fdgzhrjr1krnvinzb2x8cgmk7zsl5l194"; }; meta.homepage = "https://github.com/edluffy/hologram.nvim/"; }; @@ -2519,12 +2519,12 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2021-11-07"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "f0eaff8cc4e66820b17a08c518c22c687f714bb5"; - sha256 = "0a67fv1vabik4g7w5h2nl9h6j8jc2jb0yd92gzhbmfi4jjj2j19a"; + rev = "d2a9f2a6b0d075fc85ac346d3c03c4a3257bc805"; + sha256 = "1gpgln5bfvygpkqb1p2pawq1pw5rg9j5jwgl7wmal4fik9yixp0f"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -2627,12 +2627,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2021-11-08"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "bc8372815506066f3ca7885baca717cb986957be"; - sha256 = "0svhinr5qmhcskvakl71yykzxhm6m0ydymx7dp5w0jwsdcv9nnrx"; + rev = "9f663d31d4ee0672f24cd5b26ca3863665048a25"; + sha256 = "1lzdi3pgw9hf8pkmh3y8w3lrl27kac18hq4ryk0mghqyb8saabzw"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2928,12 +2928,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2021-11-11"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "27a9bba67bc9114ba9a6f48686ac983f301dd4be"; - sha256 = "1vcd1i2w9vnkmlhan62s0raa8gigxpdyyzqvn2qqv1rifxzigpfw"; + rev = "a74b5c09bee57c4c41a4fe7e4594416f92ea05aa"; + sha256 = "1zrzd0rahwzhyx46bfwz6gzwr513h3k5b1f5maf0qrc1jq2snd6g"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3048,12 +3048,12 @@ final: prev: lightline-gruvbox-vim = buildVimPluginFrom2Nix { pname = "lightline-gruvbox.vim"; - version = "2018-03-23"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "shinchu"; repo = "lightline-gruvbox.vim"; - rev = "21659af1fc980ebe7de0f475e57c3fda9a82c2d3"; - sha256 = "0h9br1r5vbrx5cplnk34xlg1kagasj3zn18f8d4ifi0pibyq6pm1"; + rev = "e94af37820d9c2e6d9eb27c735bb8ef926a66c7e"; + sha256 = "1wxhxc3aqd0z0giwi8ki5wdarzz6s5bpc5iss7q63w2sbgvbr9sh"; }; meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/"; }; @@ -3072,12 +3072,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2021-11-11"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "6429028c58a2a64916cb9132743e5301af460c1c"; - sha256 = "0qhx7axm5vg1xh5j2mg0x3l7154f4n55k28pajrak4yw7ws82232"; + rev = "d60ee2ef756e89f51ee3f41be2fbacfac965091f"; + sha256 = "0m610jvk7zx7lri33d3b2dr60w2xy8kzlssigiciynhzs0lg9pyg"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3180,12 +3180,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2021-11-06"; + version = "2021-11-13"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "e5bd090b6d01af8f5d171f4183ff01aaa63a2b99"; - sha256 = "133bapazws12g2axzw8v9vkigpsdxc708hjlnzfkg0rwbm1pw9sc"; + rev = "600111e6249bcc948e2b811ef09adf4ea84ebfc1"; + sha256 = "0w012936d42m2bs2g8mgg72wkf9mvx4w5m01qdh8daksi1wg86hy"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3228,24 +3228,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2021-11-11"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "df46c1e70a0aeb234aa9d2048d14f626a1cca317"; - sha256 = "0khkkicwcnrwpd9scdsggia916ws6hvpyx0gnszg43zq74q5h27q"; + rev = "7b608cb5731087b157bd509103b1d82d8984cba4"; + sha256 = "04nbfml4j2yr4imvdzany4r6amakiwazgfjgd4y2h3c78pnlrb41"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-11-09"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "366fd76ea226bed11966cd8b1a229cba08fa4394"; - sha256 = "17jla5yvi0vzgi0himl8fyfmc8sl8xg1k5bzl58iq0d2ycmr08as"; + rev = "6e10a30178240182781955ce062618c8d793a37b"; + sha256 = "0z1n838d8fvis88a603fzzmdh1iqm41svay8ypmkbm3wcjaafjyl"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3348,12 +3348,12 @@ final: prev: minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2021-10-15"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "5c54258d34b8ae4be70a8fbc09b400eb7be0bee8"; - sha256 = "0gy5c5v80xbgx511xk1zp2scxzmgipwad1zqpsff4grz80vzsa13"; + rev = "f699b8296c878a5d669f3a13a9d6f916f6276bef"; + sha256 = "1v4xhp82rw5f7zq8mfcj478p088qrcqbml1crhqi9v41gghwv9b5"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -3372,12 +3372,12 @@ final: prev: mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2021-07-05"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "439c518cea989c875eea44ce54a36f7e7dc561d9"; - sha256 = "19b155lfiynm450cr9acm7dk58hh2ynrs3zpvrcll7slz8fgrhql"; + rev = "aeb41655826fbeb6c412b32f2cd3acd1c7e5e958"; + sha256 = "14bslsyrxc1x13mijybcinx39nmc3gp3skn05i537xzl7lq5dnlr"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -4036,20 +4036,20 @@ final: prev: src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "a07b754552008012f2d7d3602b7a233a29d92c66"; - sha256 = "19ffxpmq82f9qxbnb2lw2hvc9gqc1vfyvf553wpc439rpi98mxja"; + rev = "e940b57f30f6035df690fb24b1e5c93ae6aafcd6"; + sha256 = "0nvg3zsgqbk0gs978gzfkc57xn3wcn1mcsf6qrgc1xz4jxdd582m"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-11-11"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "2bf885dda0ecb669ef66d1c757287c98f6c16500"; - sha256 = "1303gpdr5yzxznx0djn5q09p1vibh15d0nmj1j6n2zqbjdx6bhfw"; + rev = "e460ba050d074416a64ee7881b527fb87fbad981"; + sha256 = "1nksrmh5aj2h4r845vbz9lg7lxa8cr05p4gmcccagpmq9y0fk8fn"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4092,12 +4092,12 @@ final: prev: nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-11-09"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "f4f1c9f27d8514885cd851b3ae0a648e1eb15a17"; - sha256 = "0ipb2pvkc28zp5pdb5ih5rcnzj4wkwg5i59lb3ll4cv0yj398kr9"; + rev = "1f18e79ee9b30fec25c3f32b1ed22c3290f07bb2"; + sha256 = "0sy5p93vqbnz01blgsk085xm791iga1yk65lp147axbib7b760kq"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; @@ -4116,12 +4116,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-11-03"; + version = "2021-11-13"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "3ef30d2a754f6b47d6c696add0276519f9a8a2cf"; - sha256 = "1rd18r4113fpg7ihw87l7xprh5dpddx8s7g68qazbrxgmf1xbmd7"; + rev = "ee370769ea2d6da807533a4c2b8f55ef057d4477"; + sha256 = "1xxab1pwnvlhy9mgyyvck8w3acz7cmjpqpl2mdc3z6gagqbjjrll"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -4152,24 +4152,24 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-11-11"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "af06bd4b440c4da6b363ec2c3feb49bc0cda5510"; - sha256 = "0ckvm3kggnfqv4ngaxpl4zikbs2pwbqgy5x9fqzrdj2vydfm85wp"; + rev = "27d4c21e8ff7a68e6abc930ff0e74a486c0026ad"; + sha256 = "0hp88j9r7l82nx4fbg42hmv2vcfd74f72v6aizj4zdmx3xnxnyb1"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; nvim-code-action-menu = buildVimPluginFrom2Nix { pname = "nvim-code-action-menu"; - version = "2021-10-28"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "weilbith"; repo = "nvim-code-action-menu"; - rev = "32a02caf1cb6d5d31167945a2df9d371d68b1009"; - sha256 = "1cpl29lz2c3fahrrz8lf9dccwy2iwdj4mn71xgn12kq3qarjijdv"; + rev = "d3d059082eff3eb081167f8a232b1bde54bb2bdb"; + sha256 = "0d7imklcz39ir53nr5kr0s826yqrwhrmr5p9iabs07hshyq3khgx"; }; meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; @@ -4224,12 +4224,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-10-29"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "dd778f65dc95323f781f291fb7c5bf3c17d057b1"; - sha256 = "1nvn03rx7gvrdvfmgsmwm2ncgsyizqyvgv92v7cvfa3jv30vfb0a"; + rev = "1a87456d280e8e308df7983650a5ea2b5a6bfb63"; + sha256 = "119cmq8bnm35l7vdlf83dkldk3jxdkdjsqw98b5hs437xrjwfhjr"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -4284,24 +4284,24 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-11-10"; + version = "2021-11-14"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "14653c92c93b2e00a8cc742ee109f510350afc2a"; - sha256 = "13i1pyd5ibmczyw3r2wrhrislkych994487iv5202zv0jn6jaglm"; + rev = "4805df6a5858aea5ccff56a6d706c96fb746c5d7"; + sha256 = "13jmdnz9wxgqm5gcys42flfnwgj0pdwlcgx2vkmncfmg675fgfq6"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-11-06"; + version = "2021-11-11"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "61773fc76e0d78c1223f158605f1cd698dc83a94"; - sha256 = "1p3hz5ap16yf3720l682sclal4ycqmqa4kaiw5ljz57jg070ckz8"; + rev = "c0f6d68ea245fd2efb527fe1b7874c48084d8150"; + sha256 = "1nai09x1sc9wvz2m5j4rj6wjpdhwk88v4sapdmvb5pqvrqqylg60"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -4344,48 +4344,48 @@ final: prev: nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-10-17"; + version = "2021-11-13"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "66223954d7bd7d4358c36d157c25503168d04319"; - sha256 = "0jghq2fkvibilb1zglkckhpmq6dgi1q87fcwpvcv9slk1qlgw19d"; + rev = "cd5267d2d708e908dbd668c7de74e1325eb1e1da"; + sha256 = "1ans2kzg750d4a83hk5p9x5h51m9ywxgk6bxrcj1pwnpkhl5h75z"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2021-11-08"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "0116b78963fd24643faa34fa1bc02f8d425a73ef"; - sha256 = "07y1z3c2mqcwlbg682h9d98wghfh1l69y9j4igw77bdxrcmnlyrr"; + rev = "c3c8a247fda421b0db1f2cbf50ab4340ba0ffc61"; + sha256 = "1sa3mqm65aspa91vavg1ng36w51jsb5kdjsra4bjjmggwbphdz8w"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2021-11-11"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "1af2922c3ab7f80654c09932c55bd5d70f13f1e3"; - sha256 = "1qcska723k2ajimmib7i57clhdbrbqlcp4b18capsrrnxsl92pq0"; + rev = "825630a5d28634fbb3663d1e605ff0a82b843d81"; + sha256 = "1zj7b0g3f9kqnpzqcvh0p9wg10y7kn5mq8vzcmwsyaiwqpdijgwv"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-11-11"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "edca6c107027111ed02abe17a231d1cf0d353adf"; - sha256 = "13abx9r8p9admskallw3y1dqia288xm6l3l6idshih6wbmkx2jk2"; + rev = "27d2c116fdea5614f422dcbcae63da01a1415fcf"; + sha256 = "10ip201ihd2jjs9mb0vafa7iqzxh0f0rs5s96rrpw4zaxzq49gkn"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4416,12 +4416,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2021-11-02"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "ee79a5e2f8bde0ebdf99880a98d1312da83a3caa"; - sha256 = "1krpd6jqy73kqf63yyyp4crkrnb80hi23wks6rf31mag6ry1xr27"; + rev = "54375b724637eb6f29085c582318ae1fd042e717"; + sha256 = "1zli6vpcyk8ving7x7lh5nwgkf020rh5dixxsmiq6p8xhgi7hg53"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -4464,12 +4464,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2021-11-10"; + version = "2021-11-14"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-spectre"; - rev = "9502f162a43d18d03f6d11e2152aee39b1ed5adb"; - sha256 = "1czj2jbls3ci35mbvvzb7x2zzh3aw2rz42bvfx45ibpw6iabdgky"; + rev = "b630e04fa176ffb4e8c188b651561973a5ace077"; + sha256 = "1x0ndsgywkjb51y3zqhaxkrv9g7qjra6is3cxgiszl18d42g7nrd"; }; meta.homepage = "https://github.com/windwp/nvim-spectre/"; }; @@ -4584,12 +4584,12 @@ final: prev: nvim-web-devicons = buildVimPluginFrom2Nix { pname = "nvim-web-devicons"; - version = "2021-10-08"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-web-devicons"; - rev = "ee101462d127ed6a5561ce9ce92bfded87d7d478"; - sha256 = "097i8x5yyr0krq4jn5zwn6lild8dwv7yqdmlgrwbmywad32vfyh2"; + rev = "f936ff3e1f9d58ec0caf0bd398e9675b54fe292e"; + sha256 = "1vzrsr2m75nky1nz5hji7chqcc3d601bkx7raq88pjw4qa3s7b1r"; }; meta.homepage = "https://github.com/kyazdani42/nvim-web-devicons/"; }; @@ -4692,12 +4692,12 @@ final: prev: onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2021-11-08"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "9015d8a1313b16cf3792830eb8d77553765adb80"; - sha256 = "19mhfr8ih2hp9jadgphwq0g576qsbnggiknv6ipkl60d8jrhxflk"; + rev = "fd4dd7a09bac975c94612ce3c8fa98a51bcce412"; + sha256 = "0drjpfvkk9mmp7v2v16vwc3halxbwkwc95n0x0cz47lp2q3b7kss"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -4740,24 +4740,24 @@ final: prev: orgmode-nvim = buildVimPluginFrom2Nix { pname = "orgmode.nvim"; - version = "2021-11-10"; + version = "2021-11-14"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "orgmode.nvim"; - rev = "93779c1eed34da14ab8082933fb1e3d47869d07f"; - sha256 = "145460q9a9f4jp8l8pfqi5rf12vvz05g4jfd70h65i7i55l2v37j"; + rev = "25e1fec55362124a8300108c88bd7127e09dad03"; + sha256 = "0yhdyiwbwwg7m57983pnlawjgzm40dg77jy8dk4gb2183ldk8srs"; }; meta.homepage = "https://github.com/kristijanhusak/orgmode.nvim/"; }; package-info-nvim = buildVimPluginFrom2Nix { pname = "package-info.nvim"; - version = "2021-11-09"; + version = "2021-11-13"; src = fetchFromGitHub { owner = "vuki656"; repo = "package-info.nvim"; - rev = "037bedfa881d60f0ece93c31f31d04cf3ca29a87"; - sha256 = "0gflgccj0ymgv89paq9dp54f56g0wwz7m56sdfdycjii491q5hm4"; + rev = "8656a9305afe828b7b2664a571d309090043a0ac"; + sha256 = "0w5n1523d8la66d43w735lj57gmksj936kvlhwggmqyv64zw7jfz"; }; meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; @@ -4872,12 +4872,12 @@ final: prev: plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2021-11-08"; + version = "2021-11-14"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "b42e0cfe22ad3a0cac35cf14315e9dc22cea2ec9"; - sha256 = "09is80vcmnp0w42nahsqwliiyiyv64s9x459rl2dk4mnr7hgi7fm"; + rev = "1c31adb35fcebe921f65e5c6ff6d5481fa5fa5ac"; + sha256 = "075b6ak0hl3wqhsy1qmi91s30lh6p6vpbvqllzvyhlz3pxabh314"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -4921,12 +4921,12 @@ final: prev: presence-nvim = buildVimPluginFrom2Nix { pname = "presence.nvim"; - version = "2021-10-19"; + version = "2021-11-14"; src = fetchFromGitHub { owner = "andweeb"; repo = "presence.nvim"; - rev = "11adcec0db647625c5f4876257d2764db4621662"; - sha256 = "0jzks4nvsw69g0gvrb8qpqszhd957fmx0ly9a11h2m5wry179ppp"; + rev = "e0cab790474fe8bf952edeeaf9bba5128a2434f1"; + sha256 = "1p1knd67sf4pw88y73xakay50br4zhgxr5k7az24cxmqylnn89ra"; }; meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; @@ -5065,12 +5065,12 @@ final: prev: rainbow = buildVimPluginFrom2Nix { pname = "rainbow"; - version = "2021-11-08"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "luochen1990"; repo = "rainbow"; - rev = "f1cb0d3d4a4785428f7ccec9f0e69ad314d748d9"; - sha256 = "15227jrbhagbyvd56cq1byc32hwgbsh293r9fb96419pa3rm9j1l"; + rev = "c18071e5c7790928b763c2e88c487dfc93d84a15"; + sha256 = "1m691f3w1zraam4cmq0sj9a86bmd7g1bhirrzqy5mg089x6n3rdc"; }; meta.homepage = "https://github.com/luochen1990/rainbow/"; }; @@ -5149,12 +5149,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2021-11-11"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "c3fea5e8b377b07cd744579f8ca65e3f805ddaad"; - sha256 = "0rbn1mnyn9dhxv48qngs71n8pw25fmyaaffqgrk3qxfc1rxihf4a"; + rev = "9f730d6a87a63c7bd8cbc460882ca7e673da3cf1"; + sha256 = "1qqan1g34k11kjf9j50yfdzlgagjv3fm5yxlla9kxg2pz13b2jfc"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -5269,12 +5269,12 @@ final: prev: rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools.nvim"; - version = "2021-11-04"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "488a79a053525fd1b3ceacb9b0675ebd0ed95dc0"; - sha256 = "13vks86lswp9xl934nqmgsdwx2jkjyz4qzm806ln2mz0mwmjk7zx"; + rev = "9f98538d36b5f2e3ac1a11a524b52d11bafdff74"; + sha256 = "0dfian3xi8cn4r537c8jp5qlnhgvppifgr9crrylvgj28y7vj9mw"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -5317,24 +5317,24 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2021-11-09"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "6b3ec7db13a9935d5d948fb0985707181e07979d"; - sha256 = "18inch8c1n9b835igw8brvmxh4c8pl9cq8qiv3v64fry2pv59mqd"; + rev = "fa321a8512c199e04e3361fa0679198e1176dc68"; + sha256 = "1ahsldfzqzwy83rhibyscr745s54571h6qmcmaz96rbv6k2wqyb5"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; scrollbar-nvim = buildVimPluginFrom2Nix { pname = "scrollbar.nvim"; - version = "2021-06-04"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "Xuyuanp"; repo = "scrollbar.nvim"; - rev = "c338467dd6ef141fa8ce3172097a1f5be6c43779"; - sha256 = "1wvzdrj8gckhh6x4szipjjb6mg0v3ix5cq5dy83lfb28psyznshw"; + rev = "590b23af866a32277cf803aca0fd770d5b39c2e7"; + sha256 = "1dvlmmxykf3vyhyvv5aiqbz8fd7zvpw4xq1nxnf3wyj371caawaq"; }; meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/"; }; @@ -5606,12 +5606,12 @@ final: prev: specs-nvim = buildVimPluginFrom2Nix { pname = "specs.nvim"; - version = "2021-05-05"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "edluffy"; repo = "specs.nvim"; - rev = "a62319a224b73b70af47a48ba076d7ec67b08526"; - sha256 = "1hs7qp3fr451ziddv08nyygnxx1n6y32fr0y97s9zjc7j13d3nc3"; + rev = "e043580a65409ea071dfe34e94284959fd24e3be"; + sha256 = "1sg2i99ncx5j7al3mhwpnwyx1hila5gars0ak7q3n9yr4013i7dx"; }; meta.homepage = "https://github.com/edluffy/specs.nvim/"; }; @@ -5667,12 +5667,12 @@ final: prev: srcery-vim = buildVimPluginFrom2Nix { pname = "srcery-vim"; - version = "2021-09-25"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "0325ba54262c7d03450d877b44e692c88b17cf7a"; - sha256 = "1vrvmp3ihjb8zlg5f00hs7d6km8p30g7pakaw5rdk60pxj21sw2v"; + rev = "3d86afaa61aa45ca8d849494d9f8ceb5fc424353"; + sha256 = "16wx3wgmrslpsm1h5fskik2lkas390fj2gjz3vwii4c5mz2ijr9m"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; @@ -5691,12 +5691,12 @@ final: prev: stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; - version = "2021-11-10"; + version = "2021-11-13"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "stabilize.nvim"; - rev = "fd74d2a9d2a384a530eba3a9771a5396b4ddad26"; - sha256 = "190mf9w344db5civ122l7zdr63l811qcqf7shh89zx4qfrsllf43"; + rev = "0026672d4b6fc922bd6f80df9a2858ce1e8cc0ed"; + sha256 = "0667yh9yprym7vakm83x174srb2x2ch9q97137qlj28acks3wnqh"; }; meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; @@ -6065,12 +6065,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2021-11-10"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "f3ef5920725d719ed23195a457a86015826d3e1d"; - sha256 = "1dhczp84lhsz1ikqprg552wqi0hncigvhfb726iz01cr9y25b8mg"; + rev = "9ac89ebf6755e9a3f4bae86625ec76106526e57b"; + sha256 = "0bljlg2hwa531rp53hwx1w06awksbhxl4lm672rn74sfaxqnzv87"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -6210,12 +6210,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2021-11-07"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "0b6d65d8b45e261bc17176e86abb3f631c88fc1b"; - sha256 = "07qj7z2rrdz2n5gks7nh1xvapvdc5s641vsvg0nm54q4y72lp2ds"; + rev = "ff168c8218b963cc7fc9d80b684d840488839bb5"; + sha256 = "09ap50nln9130h6px3x0df3vxlc09iyl419hnr8qf75qa58gbhmr"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -6234,12 +6234,12 @@ final: prev: traces-vim = buildVimPluginFrom2Nix { pname = "traces.vim"; - version = "2021-08-27"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "419ce02f68b13aa892735febc1d1887a9a11d5db"; - sha256 = "07va4rr9xfmr93qq4nn0d3ssay4mwdvxzl4f92akib36kxnv0m69"; + rev = "803d97786d0fbe95d33fe3c69e213518ea296839"; + sha256 = "1hqma8pjl1ladw8iraa6cnsp9jasx4w08zxq5q63ff5mzdb1avn1"; }; meta.homepage = "https://github.com/markonm/traces.vim/"; }; @@ -6438,12 +6438,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2021-11-04"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "7aee389c0ada5677eff5872195c0e3a47c20cb76"; - sha256 = "17hph035igj8b0m8dc3qw76w7mq47rzbm7n513npfy367vicably"; + rev = "31c80d4f77056e89cabd9ea3e617feea076499f8"; + sha256 = "0p64fr5l5khs4p7d677zkjq6j81mxkh5aailzk9jr82q5sskv3wf"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -6702,12 +6702,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-11-11"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "47bf6b1716d599fa19756ce094309a3d551fac73"; - sha256 = "1c2sqkyd0zha9pchh1lbyww7v281rr488ff5b1c2rkc6inya9lcd"; + rev = "4b96f58902a34abda87fd3105e9d47a08801a891"; + sha256 = "05fn2485098kml90n5wc0qla7wwjcrz0lkhkr9qgdv4bvc9g3hyn"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -7710,12 +7710,12 @@ final: prev: vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2021-08-03"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "c9a155b88d629221628937eadb64a3e87f8d82d9"; - sha256 = "1h0y4k3xypbn4lyyksjddvcdnz8nqy73qnjxm21ahsz73xk6bpwk"; + rev = "18699186aad27dc92867527f5e3c2ad3ed51cb27"; + sha256 = "0681c6ica9xi7cvjzlhlwcvmdvq3109xx39c06d879n7yy6kjyqi"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -7842,12 +7842,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-11-11"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "2e4ee0b5d6e61c6b3bc48e844343f89615dfc6e0"; - sha256 = "0ibks13hicpv5syk6lgrzjfbacwxfp02cmp23ry8wjm2dkzmv81s"; + rev = "2dfaf17f9e9b2c8961eddc8ea51098fef500d189"; + sha256 = "1y5ac8sag0lcdkq8k6rzn1cfcwyrn8fwmm3imsiq4b9883qjw2v2"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7962,12 +7962,12 @@ final: prev: vim-glsl = buildVimPluginFrom2Nix { pname = "vim-glsl"; - version = "2021-09-05"; + version = "2021-11-13"; src = fetchFromGitHub { owner = "tikhomirov"; repo = "vim-glsl"; - rev = "373e4ec58f725910ea242e79ce03fe21f100b6e3"; - sha256 = "0hf583fkrkq0y38ic9m0rl1p2h1s6fq8gx9gxk64hh6ibqxdicgz"; + rev = "25f9a7dfca64787313fb4339866ff941b8974d61"; + sha256 = "0dm0nmglf7sr9rkxq4ya14pg1wrqfbv6pigj2f1hb0gf1n9bd6rz"; }; meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; @@ -8287,12 +8287,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2021-09-28"; + version = "2021-11-14"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "084b012ce5bc1bf302b69eb73562146afe0a9756"; - sha256 = "0rl048hny15rq5m85vl0iy11c4xiv0plr0j8b65vqmmb5r1mxmbg"; + rev = "2beae0581caa66cf8c09fad7c7c557f92d49d2bd"; + sha256 = "1qrc789a3aps99x89hiwwrmnxm5hm1qsjp8xjhhls6jk8scqq2qv"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -8395,12 +8395,12 @@ final: prev: vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2021-11-09"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "19aec7d63eda429d056586d9bcc98f61f860c668"; - sha256 = "055f58342ai117gq0021zwhv8ck5sca8bxrqqixbv5cjywck0r17"; + rev = "b5c8d305df52e0cb85b3436ca1e958c22c6e2d79"; + sha256 = "1zv6k8ld938zg000svi9q6c5jkbmvlyllxzkl41jcsx2zhqkwdiw"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -8516,12 +8516,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2021-08-17"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "a58f56960933df0b34b98ba3b025995774315adc"; - sha256 = "16vz20fvhbb2p9g68qix9s4fbr9adrgwc45g12ldi7bdgkr1006g"; + rev = "e097580586e802352f225eed467fafa90f11223e"; + sha256 = "1lzgqaxw0y53r1qrcqx3fxb1fdqkswzkl8b6yk4xmdxig6kyhm46"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -10402,12 +10402,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-11-02"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "065cf18295fa8d08ab2d458c67ea6281c81bbd26"; - sha256 = "0l0zp64jzhdyrlgfplqkpsl0jbpxkr4sijymqsiabjiyvc8p6qc7"; + rev = "be9cd2c8cd007088f69019f18fb61aff457adb8c"; + sha256 = "1r2wvkgziil4bik3g7b19cscg17skhx98pgsvm2m00czrrfdxq6v"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -10558,12 +10558,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2021-11-02"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "4d57a1f4efce38e0d05196f9beba4bcc6e9d1ed5"; - sha256 = "0p6bqhddbqnfcd0wq1wy3ix082phhgiqrx593wq54fjx4wqg9xvi"; + rev = "60ee20318550f4a5b6f7a5a8b827540c2c386898"; + sha256 = "0gl34m17pxgyfbdqghhfcgxhbhxwvjc9r048sim1gf86wga4mq39"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -10594,12 +10594,12 @@ final: prev: vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2021-11-05"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "2464b7a65c002b3ec92f8a8fc300d52582e9eefd"; - sha256 = "06i33hk0q41dvcr75kqq57jr88sqczqiwfhmssyxifhxfhcb6x2r"; + rev = "0d66dd3596e414368e2b2b77e694e431a4b0bca3"; + sha256 = "157shaarg4xdnfzp47v5nv34py0wii6s7fdgzagh4h1b5czgszyv"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -10630,12 +10630,12 @@ final: prev: vim-which-key = buildVimPluginFrom2Nix { pname = "vim-which-key"; - version = "2021-09-22"; + version = "2021-11-12"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "2c915b6de918c073fbd83809e51343651f00f9a8"; - sha256 = "05jdjmpyczcgqsm5mznyb79bq10ianv7v3rhxy9wrklkama3jrgs"; + rev = "7e3819a91a7710ce561a9c11a22a82b9437a2533"; + sha256 = "0hx5ar663ai25jj7p44sl2nn2n0jj2iif5ybx5ic7cxz4qy477wn"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; @@ -10882,12 +10882,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-11-04"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "15eddb7445c6dc9131058631a03140d03443647a"; - sha256 = "0xv1afx1yah867ksxf5a60v3fk1qg5g3vn72bhybqmcjidxz29p8"; + rev = "d80485393139d15df237e856b8ef6675cfb88f6b"; + sha256 = "1cvj7k9xxg4hp0m6lxnqklrnj5dqp4pyx4w6x0p8wh81a94r0wvw"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -10895,12 +10895,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-11-11"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "c63adb6958458b62a7b9c0e4156d11a5da5f1a9f"; - sha256 = "07q4wmckz2a1x2l11pa1m5dqbk8wz0slk28p7wcapwfn5lxf48jq"; + rev = "c3991f8a53dc8a193a23dba7645ce6b9b8d5038b"; + sha256 = "1zn094xjskqc0pjpjp21j18s9b01j5k0kpczcwf8nxi52bb8815v"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -10955,12 +10955,12 @@ final: prev: vista-vim = buildVimPluginFrom2Nix { pname = "vista.vim"; - version = "2021-10-26"; + version = "2021-11-15"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "587b6b2de244491c3fbe118ebe6739a90f3c91b2"; - sha256 = "14qxc1f8nx5ahc8809ywgrzcq08v0qkyw6hnrd9ps7mjxqgrsppf"; + rev = "a0469c645dcbe4033b857da27d35491f39e2f776"; + sha256 = "1i0j11lbqdych2914chb9rlmr902q52v400y3ifzi38g5md9zv3w"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -11136,12 +11136,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-11-05"; + version = "2021-11-16"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "166f499cb1e7c0f445d0ffd8d280329f3942b93b"; - sha256 = "10p7nfjv76q5lf367a56dn4k2f70xdz28r3w0c28laym49jfm5wd"; + rev = "e17fb2fc92c7c1bee6a429db0d3b432c811d0c8a"; + sha256 = "0l95wj6ghfip2l7bsdv8frhnd92wdni6a8fi1i356x1ls2fm6vvr"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; From f54808ee5925a90c575dae67459ce0c790ce5b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 17 Nov 2021 04:57:25 +0100 Subject: [PATCH 23/32] zoneminder: 1.36.8 -> 1.36.10 --- pkgs/servers/zoneminder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 3aed72eb8b8d..b0828de006f7 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -78,13 +78,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.36.8"; + version = "1.36.10"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - sha256 = "sha256-UUpq4CCZq+EwVNGsLCQuVWdY3yoGw977AaMk1iJ6a5U="; + sha256 = "sha256-MmBnbVDitKOctPe2dNe1sMNNs/qEYGVq3UMJxAkLlCc="; fetchSubmodules = true; }; From 3fa96c615f600b979f0f65387746e8fcd661b09f Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Wed, 17 Nov 2021 00:06:52 +0000 Subject: [PATCH 24/32] python3Packages.pyscard: fix tests on darwin --- pkgs/development/python-modules/pyscard/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index caa5e4e24405..9efc461cec2b 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: +{ lib, stdenv, fetchpatch, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: let # Package does not support configuring the pcsc library. @@ -14,6 +14,15 @@ buildPythonPackage rec { sha256 = "05de0579c42b4eb433903aa2fb327d4821ebac262434b6584da18ed72053fd9e"; }; + patches = [ + # present in master - remove after 2.0.2 + (fetchpatch { + name = "darwin-typo-test-fix.patch"; + url = "https://github.com/LudovicRousseau/pyscard/commit/ce842fcc76fd61b8b6948d0b07306d82ad1ec12a.patch"; + sha256 = "0wsaj87wp9d2vnfzwncfxp2w95m0zhr7zpkmg5jccn06z52ihis3"; + }) + ]; + postPatch = if withApplePCSC then '' substituteInPlace smartcard/scard/winscarddll.c \ --replace "/System/Library/Frameworks/PCSC.framework/PCSC" \ From 0fda4083ea86e93e9d37464b6f1a4d3e1099eafd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Nov 2021 21:20:01 +0100 Subject: [PATCH 25/32] python3Packages.motionblinds: init at 0.5.8.2 --- .../python-modules/motionblinds/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/motionblinds/default.nix diff --git a/pkgs/development/python-modules/motionblinds/default.nix b/pkgs/development/python-modules/motionblinds/default.nix new file mode 100644 index 000000000000..a8fb0ae58dd4 --- /dev/null +++ b/pkgs/development/python-modules/motionblinds/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pycryptodomex +, pythonOlder +}: + +buildPythonPackage rec { + pname = "motionblinds"; + version = "0.5.8.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "starkillerOG"; + repo = "motion-blinds"; + rev = version; + sha256 = "6aSwUuH5IpfcuVGXWVmb0DHglsUtGh/ATOe6iih6fXk="; + }; + + propagatedBuildInputs = [ + pycryptodomex + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ + "motionblinds" + ]; + + meta = with lib; { + description = "Python library for interfacing with Motion Blinds"; + homepage = "https://github.com/starkillerOG/motion-blinds"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e7b7e9017fac..6d65322eda5b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4866,6 +4866,8 @@ in { mortgage = callPackage ../development/python-modules/mortgage { }; + motionblinds = callPackage ../development/python-modules/motionblinds { }; + motioneye-client = callPackage ../development/python-modules/motioneye-client { }; moto = callPackage ../development/python-modules/moto { }; From 38afc80cee857402a0953459b5ebf2e72282b6f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Nov 2021 21:21:27 +0100 Subject: [PATCH 26/32] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 37b078adefa1..20bbdaadbf0e 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -533,7 +533,7 @@ "mold_indicator" = ps: with ps; [ ]; "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; - "motion_blinds" = ps: with ps; [ aiohttp-cors ifaddr ]; # missing inputs: motionblinds + "motion_blinds" = ps: with ps; [ aiohttp-cors ifaddr motionblinds ]; "motioneye" = ps: with ps; [ aiohttp-cors motioneye-client ]; "mpchc" = ps: with ps; [ ]; "mpd" = ps: with ps; [ mpd2 ]; From 1706b2ec489847abe5f1f93ca831c82e522c5f6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Nov 2021 21:23:13 +0100 Subject: [PATCH 27/32] home-assistant: enable motion_blinds tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 59d2ee364b23..688afc5baa0a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -520,6 +520,7 @@ in with py.pkgs; buildPythonApplication rec { "modbus" "mold_indicator" "moon" + "motion_blinds" "motioneye" "mqtt" "mqtt_eventstream" From e0661862ff2098bd018e6eb6d7b3662a5dc02d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 13 Nov 2021 22:47:00 +0100 Subject: [PATCH 28/32] icinga2: 2.13.1 -> 2.13.2 --- pkgs/servers/monitoring/icinga2/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 7079ae4ff8db..0b039bf21a79 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, flex, bison, systemd +{ stdenv, lib, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd , boost, openssl, patchelf, mariadb-connector-c, postgresql, zlib # Databases , withMysql ? true, withPostgresql ? false @@ -9,19 +9,24 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.13.1"; + version = "2.13.2"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-cGVUNO3p00bkPd4tPbipevuixHz8ptk6W8y1rl3dge8="; + sha256 = "sha256:1ijvav2ymgq1i8jycrqbp2y4r54y0dkwjnwxc20bmcixxh877zdn"; }; patches = [ ./etc-icinga2.patch # Makes /etc/icinga2 relative to / instead of the store path ./no-systemd-service.patch # Prevent systemd service from being written to /usr ./no-var-directories.patch # Prevent /var directories from being created + # Fix the non-unity build + (fetchpatch { + url = "https://github.com/Icinga/icinga2/commit/2ad0a4b8c3852ad937fec9fc85780230257c821e.patch"; + sha256 = "sha256:06qn7x73zbccmd8ycj46a29x2rr6qjwg0rr831wc2gc6q2k9d2g0"; + }) ]; cmakeFlags = let From 6bb5bcd6f50b84a8632a0efa9c2fd6cdc4271e4b Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Wed, 17 Nov 2021 21:51:08 +0100 Subject: [PATCH 29/32] mpd: disable pipewire for all but linux --- pkgs/servers/mpd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 7c2f2ca98989..8f1a407bf56d 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -98,7 +98,7 @@ let # using libmad to decode mp3 files on darwin is causing a segfault -- there # is probably a solution, but I'm disabling it for now platformMask = lib.optionals stdenv.isDarwin [ "mad" "pulse" "jack" "nfs" "smbclient" ] - ++ lib.optionals (!stdenv.isLinux) [ "alsa" "io_uring" "systemd" "syslog" ]; + ++ lib.optionals (!stdenv.isLinux) [ "alsa" "pipewire" "io_uring" "systemd" "syslog" ]; knownFeatures = builtins.attrNames featureDependencies ++ builtins.attrNames nativeFeatureDependencies; platformFeatures = lib.subtractLists platformMask knownFeatures; From 47f638403e3d12fef9a8c259cce4f2b5f5ff2402 Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Wed, 17 Nov 2021 16:08:38 -0300 Subject: [PATCH 30/32] nixos/xmrig: add kernel module msr --- nixos/modules/services/misc/xmrig.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/xmrig.nix b/nixos/modules/services/misc/xmrig.nix index 4f0af8ca9f4e..cf01bb119e89 100644 --- a/nixos/modules/services/misc/xmrig.nix +++ b/nixos/modules/services/misc/xmrig.nix @@ -51,6 +51,8 @@ with lib; }; config = mkIf cfg.enable { + boot.kernelModules = [ "msr" ]; + systemd.services.xmrig = { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; @@ -58,7 +60,11 @@ with lib; serviceConfig = { ExecStartPre = "${cfg.package}/bin/xmrig --config=${configFile} --dry-run"; ExecStart = "${cfg.package}/bin/xmrig --config=${configFile}"; - DynamicUser = true; + # https://xmrig.com/docs/miner/randomx-optimization-guide/msr + # If you use recent XMRig with root privileges (Linux) or admin + # privileges (Windows) the miner configure all MSR registers + # automatically. + DynamicUser = lib.mkDefault false; }; }; }; From c6aad1b6d37754fa8fe1378b6d13918e6ee4e3b1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 17 Nov 2021 23:00:23 +0100 Subject: [PATCH 31/32] heisenbridge: relax mautrix constraint, enable tests And migrate to buildPythonApplication, as heisenbridge is not a library. --- pkgs/servers/heisenbridge/default.nix | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix index c03b0ba8846d..f9f2c1ce7bf7 100644 --- a/pkgs/servers/heisenbridge/default.nix +++ b/pkgs/servers/heisenbridge/default.nix @@ -1,16 +1,23 @@ -{ lib, fetchurl, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: -python3Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "heisenbridge"; version = "1.6.0"; - # Use the release tarball because it has the version set correctly using the - # version.txt file. - src = fetchurl { - url = "https://github.com/hifi/heisenbridge/releases/download/v${version}/heisenbridge-${version}.tar.gz"; - sha256 = "sha256-NhHMReY48lg1FhJlCRjRiSpy+9bDLtIV+j+zX8GZcL4="; + src = fetchFromGitHub { + owner = "hifi"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Q7xqKjAUBHh87VAgsgDOCPDINDh0yUdr3UoUlLqJr5k="; }; + postPatch = '' + echo "${version}" > heisenbridge/version.txt + + substituteInPlace setup.cfg \ + --replace "mautrix >=0.10.5, <0.11" "mautrix >=0.10.5, <0.12" + ''; + propagatedBuildInputs = with python3Packages; [ aiohttp irc @@ -19,6 +26,10 @@ python3Packages.buildPythonPackage rec { pyyaml ]; + checkInputs = with python3Packages; [ + pytestCheckHook + ]; + meta = with lib; { description = "A bouncer-style Matrix-IRC bridge."; homepage = "https://github.com/hifi/heisenbridge"; From d5321ca4ad2d56070c52c98c7b8da82d55eba0fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Nov 2021 22:26:27 +0100 Subject: [PATCH 32/32] python3Packages.trytond: 6.0.8 -> 6.2.0 --- pkgs/development/python-modules/trytond/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index a9f1a58b1298..4ad2f9f959c5 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -12,6 +12,7 @@ , werkzeug , wrapt , passlib +, pillow , bcrypt , pydot , python-Levenshtein @@ -23,12 +24,14 @@ buildPythonApplication rec { pname = "trytond"; - version = "6.0.8"; - disabled = pythonOlder "3.5"; + version = "6.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "686d498f9648875f48edc9fc2e97cd465ed4ea9270c4984b6f2db20a2eac4942"; + sha256 = "sha256-U73dzLTUJnOw24/ELQzjnxJ0PvjV+zE/PNuQHXbEukw="; }; # Tells the tests which database to use @@ -37,6 +40,7 @@ buildPythonApplication rec { buildInputs = [ mock ]; + propagatedBuildInputs = [ lxml relatorio @@ -46,6 +50,7 @@ buildPythonApplication rec { python-sql werkzeug wrapt + pillow passlib # extra dependencies