diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-21 18:51:36 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-21 18:51:36 +0000 |
commit | 27c8ef972cbfc022b01c9f8bc6ac53c39e630eb6 (patch) | |
tree | 134697472f57a9202e82422986da6b15312a95d1 | |
parent | 53029f20705a598cd3426b2b11ac50ffed37e075 (diff) | |
parent | 7694c8cb5a21d5fb7046840cac3ac01d8eb147d5 (diff) |
Merge staging-next into staging
66 files changed, 582 insertions, 236 deletions
diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/applications/audio/mellowplayer/default.nix index cddf1afd654a..5bdcb81fb633 100644 --- a/pkgs/applications/audio/mellowplayer/default.nix +++ b/pkgs/applications/audio/mellowplayer/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "MellowPlayer"; - version = "3.6.7"; + version = "3.6.8"; src = fetchFromGitLab { owner = "ColinDuquesnoy"; repo = "MellowPlayer"; rev = version; - sha256 = "1p0z8hkbxaxrqjmknjwxb0mpf3xdssik3m5cwrsv1881k1x2x5qs"; + sha256 = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 69fdb9e2e114..95b96bcff1b3 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ pythonPackages.buildPythonPackage { pname = "hydrus"; - version = "420"; + version = "426"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; - rev = "067c4862a0ed8dd9264b464c69975b520139809f"; - sha256 = "12x0rv2yxsczdaxvpb5ggf4jwzjd1vd7ml0r61s4342zwvjrhji9"; + rev = "1acdc258e5bb2ae22f5eafaf3dac8d9265dba5e2"; + sha256 = "1snihd433hx36s6d5hsnq4qg0xs6ag4822lwm5fqak64n22ad2qb"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 103a6ec3b6bc..bd9ad301d349 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -32,6 +32,7 @@ , itstool , libgdata , libchamplain +, libsecret , gsettings-desktop-schemas , python3 }: @@ -40,11 +41,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.31.2"; + version = "0.31.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ywzr6vgcz8yy60v0jp55na9lgqi4dbh2vakfphkcml1gpah0r2l"; + sha256 = "1wkahbnnfxmi1jc5zmm3h761nrnkdks8lk0rj38bfkwg90h6zqwd"; }; nativeBuildInputs = [ @@ -86,6 +87,7 @@ stdenv.mkDerivation rec { gnome3.adwaita-icon-theme libgdata libchamplain + libsecret ]; postPatch = '' diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index c1616c739c97..8dd18de5d895 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -3,6 +3,7 @@ , howard-hinnant-date, cmake , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? true, libpulseaudio +, sndioSupport ? true, sndio , nlSupport ? true, libnl , udevSupport ? true, udev , swaySupport ? true, sway @@ -11,13 +12,13 @@ }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "038vnma7y7z81caywp45yr364bc1aq8d01j5vycyiyfv33nm76fy"; + sha256 = "1kzrgqaclfk6gcwhknxn28xl74gm5swipgn8kk8avacb4nsw1l9q"; }; nativeBuildInputs = [ @@ -35,6 +36,7 @@ [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio + ++ optional sndioSupport sndio ++ optional nlSupport libnl ++ optional udevSupport udev ++ optional swaySupport sway @@ -45,6 +47,7 @@ { dbusmenu-gtk = traySupport; pulseaudio = pulseSupport; + sndio = sndioSupport; libnl = nlSupport; libudev = udevSupport; mpd = mpdSupport; diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index a286915e8786..e4d3f5484e23 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -88,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.18.78"; + version = "1.19.86"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "3M5W3BWGHtP+kfZZsH1nVzyGAsub4gjXyBwO8kR/Qvs="; + sha256 = "fnkxfhuYTDKPrXSNlG0SlgDls4jnV146wrhxg1crR9c="; }; dontConfigure = true; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 2f0b53f248d6..c82b297f9d69 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.1.4"; + version = "2021.1.5"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-k10Cex2dEFF2l3qq/pK1UcfMBE4jScLD/oieQ/di0gY="; + sha256 = "sha256-nknRQdlYVfqCi9SMVTak615Yn/9N99+zHITDKL5nZ00="; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index e4b9e8c2f1b6..69c08fed2df3 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "2.12.4"; + version = "2.12.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "04r3y71l9849wlhpzzcg2wcqnqdp5nnnhy4s205rp9xswa3mw0k3"; + sha256 = "sha256-uHec8/eGu2W3ZqXfnC/u+AOGY0nZL/GD/pZmz8aKgg0="; }; - vendorSha256 = "0m24wi91638zyrp7mpri4862dbx1p0glscjd0hdy0xb56vcr3i09"; + vendorSha256 = "sha256-CcSR2TZldeAbBE0yTR+4oa8mDCIx33pu9h8NE1LkRFQ="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 9aa0b6614b26..94c3025c22f9 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "1.8.1"; + version = "1.8.2"; commit = "ef5010c3a0b5e027fd642732d03c5b0391b1e574"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "1lz395nfvjzri3fnk0d9hiwlf7w01afbx4cpn2crdd3rlab105s4"; + sha256 = "sha256-qppJYpTuCA1+5dY8kbtUy2Rd+fG7u+BMxsY7IqFUOf8="; }; - vendorSha256 = "1rd2wnsh95r1r5zb6xfav8gf7kkp68vzp295cv1iy3b71ak52ag1"; + vendorSha256 = "sha256-6DOay+aeXz7EQKe5SzQSmg/5KyUI0g6wzPgx/+F2RW4="; doCheck = false; diff --git a/pkgs/applications/networking/cluster/containerpilot/default.nix b/pkgs/applications/networking/cluster/containerpilot/default.nix new file mode 100644 index 000000000000..dc6e5f3402fa --- /dev/null +++ b/pkgs/applications/networking/cluster/containerpilot/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + version = "3.9.0pre"; + pname = "containerpilot"; + + src = fetchFromGitHub { + owner = "joyent"; + repo = pname; + rev = "d999b632b0c96d9e27f092dc9f81a9d82dfe0106"; + sha256 = "0wsc8canr1c9wzr1lv40yixj9l10c66i6d14yrljsyagl2z02v4n"; + }; + + goPackagePath = "github.com/joyent/${pname}"; + goDeps = ./deps.nix; + + meta = with lib; { + homepage = "https://www.joyent.com/containerpilot"; + description = "An application centric micro-orchestrator."; + platforms = platforms.unix; + license = licenses.mpl20; + maintainers = with maintainers; [ cpcloud ]; + }; +} diff --git a/pkgs/applications/networking/cluster/containerpilot/deps.nix b/pkgs/applications/networking/cluster/containerpilot/deps.nix new file mode 100644 index 000000000000..9df154389cbc --- /dev/null +++ b/pkgs/applications/networking/cluster/containerpilot/deps.nix @@ -0,0 +1,173 @@ +# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix) +[ + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9a"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/client9/reopen"; + fetch = { + type = "git"; + url = "https://github.com/client9/reopen"; + rev = "1a6ccbeaae3f"; + sha256 = "0iarv0sn9hb26sr75bwilz3m86kcfad4m5klmzixbd4yw1ipnffa"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/flynn/json5"; + fetch = { + type = "git"; + url = "https://github.com/flynn/json5"; + rev = "7620272ed633"; + sha256 = "1l3rqfis8b72mqwm88lx78d0mbdihyamj8cgg2pa5vfbq49cpydf"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "6a1fa9404c0a"; + sha256 = "0dsd6vlfdyarn3v822x9p2s94gfi5lhvqc2vm3bqmqjgcik3c51z"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/consul"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/consul"; + rev = "v1.0.1-rc1"; + sha256 = "10xqi86n2h39q3qlkxfhnrqwm1bgijs5n2kryaq9yalv5p3qxczg"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/go-cleanhttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-cleanhttp"; + rev = "3573b8b52aa7"; + sha256 = "1pbl6p7w5wp1c70x7fp94h4ynk2ajfa76rqin3d2hq1w2fcb7byr"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/go-rootcerts"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-rootcerts"; + rev = "6bb64b370b90"; + sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/hashicorp/serf"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/serf"; + rev = "91fd53b1d3e6"; + sha256 = "0p9mhv6w85cxxl95kvl3rk04yif6v5bhf5kxw8i1cphv5kddv7j9"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "b8bc1bf76747"; + sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "d2dd02622084"; + sha256 = "1idj9h0g9z3s21y2hivaf1dknxhpd7yy0kn6wk3311hlr7s543j5"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v0.8.0"; + sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "6f3806018612"; + sha256 = "1413ibprinxhni51p0755dp57r9wvbw7xgj9nmdaxmhzlqhc86j4"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "0866df4b85a1"; + sha256 = "0zw4rxs6zh9vgxz5wwhjnwa6mgac8jh7mb63viircgh08r889chp"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "e645f4e5aaa8"; + sha256 = "18hwygbawbqilz7h8fl25xpbciwalkslb4igqn4cr9d8sqp7d3np"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.0.0"; + sha256 = "0kyvaa4m8w5wijjvrh0amd9bl3sci1vj4y9v9a97sx3rf7xww52l"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "94b76065f2d2"; + sha256 = "0lxd3gmkvza3mah5m8nncdsgd1y6r25vaz4wzdmrs3i1ikzknn93"; + moduleDir = ""; + }; + } +] diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index 4271187cc604..1dadc0b7f087 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxcd"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "fluxcd"; repo = "flux2"; rev = "v${version}"; - sha256 = "sha256-A5sEv8d6T0tvhD5UzZ2h2cymtXSO2h68pnD8MGg+Dfo="; + sha256 = "08mdcnzvjfiw81vribayl58vsjb4sipsnn4x7zv4yk0vvw72i9k8"; }; - vendorSha256 = "sha256-eh5oUOLgZLIODL58WI1trXerHDWrIiclkrv/w0lvzL4="; + vendorSha256 = "1aijdx4mln78srz6b8nghkwsliia86x9xrfzs3sz7v4h36vhdjpa"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index a54a47b9c8f2..52d4ae07ce5e 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.15"; + version = "0.2.17"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "0r91cq39n89hfy8sbdy5vjzqfrsfd7cdhd41gwszpayq65qhbsyp"; + sha256 = "sha256-gNMLVh5ntVCxiIKLshRvYXi5dYLZ8qiZFwZxbNPVFTk="; }; - vendorSha256 = "1r5qg5cx48yw1l5nil28y4a82fc7g52jmy9pckaxygppmmn539pc"; + vendorSha256 = "sha256-f/1Vxuc87eQie/j1b14q/1lAAzRk+ZDkBaTmHtCy7go="; doCheck = false; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index b640d7c5f9a9..9febaeee93f4 100644 --- a/pkgs/applications/networking/inst |