Skip to content

Commit

Permalink
Merge staging-next into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Nov 3, 2022
2 parents 89bfc5f + a48d89a commit d7a3a8a
Show file tree
Hide file tree
Showing 30 changed files with 151 additions and 107 deletions.
6 changes: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9422,6 +9422,12 @@
githubId = 11706080;
name = "Moritz Clasmeier";
};
mtoohey = {
name = "Matthew Toohey";
email = "[email protected]";
github = "mtoohey31";
githubId = 36740602;
};
MtP = {
email = "[email protected]";
github = "MtP76";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/editors/vis/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ let
in
stdenv.mkDerivation rec {
pname = "vis";
version = "0.7";
version = "0.8";

src = fetchFromGitHub {
rev = "v${version}";
sha256 = "1g05ncsnk57kcqm9wsv6sz8b24kyzj8r5rfpa1wfwj8qkjzx3vji";
sha256 = "sha256-XvWj6fZxzXeRA5oCAqIIwlfjrJcHnDrjeiPExEQKSkY=";
repo = "vis";
owner = "martanne";
};
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/misc/logseq/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "logseq";
version = "0.8.9";
version = "0.8.10";

src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage";
sha256 = "sha256-s9xG2SLkuaz8wRK47ywSw9JjsJlRjaMNeRmQY0ZnrK8=";
sha256 = "sha256-n6uRMkV/+U2M0/FjQJx0LIDGgeIX6TY58j2sweSmlbc=";
name = "${pname}-${version}.AppImage";
};

Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/networking/cluster/argo/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ let
in
buildGoModule rec {
pname = "argo";
version = "3.4.2";
version = "3.4.3";

src = fetchFromGitHub {
owner = "argoproj";
repo = "argo";
rev = "v${version}";
sha256 = "sha256-ST5XVgij1h+4EWLlwdFmIYZ0RPSH5IoTw0YdP0a+Sa4=";
sha256 = "sha256-eVd3tH77Z3AlNpMEx+xnOQTELXFeGTLIslE++++Sdkw=";
};

vendorSha256 = "sha256-h6Ioy1wBOAOCGcqcLlPyqX5pyx22BIiHKx4ct0HmnyA=";
vendorSha256 = "sha256-n8NAxfNZ/q2gdA5N7dTNgvdB549aiRxFPJO4UsfIn2U=";

doCheck = false;

Expand Down
8 changes: 4 additions & 4 deletions pkgs/applications/networking/cluster/argocd/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

buildGoModule rec {
pname = "argocd";
version = "2.4.15";
version = "2.5.1";

src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
sha256 = "sha256-2D9JYQshq9riZsZxFpV10b8bnkg82Jnh4Cx/TSryZ4I=";
sha256 = "sha256-UwMJnmvwcN/OuIbFJJEE7A5WFjzfvpe5ljMmbSLQsnA=";
};

vendorSha256 = "sha256-n6elT6ETOtbZsFqfwMo9d2qqamS8jdrROjFjStNkalc=";
vendorSha256 = "sha256-LmIvNenKV6ie2FZBj/jN70pKe1m8kFg/IQ8z5q8tO8A=";

# Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
Expand All @@ -26,7 +26,7 @@ buildGoModule rec {
"-X ${package_url}.gitCommit=${src.rev}"
"-X ${package_url}.gitTag=${src.rev}"
"-X ${package_url}.gitTreeState=clean"
"-X ${package_url}.kubectlVersion=v0.23.1"
"-X ${package_url}.kubectlVersion=v0.24.2"
# NOTE: Update kubectlVersion when upgrading this package with
# https://github.com/argoproj/argo-cd/blob/v${version}/go.mod#L95
# Per https://github.com/argoproj/argo-cd/blob/master/Makefile#L18
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,13 @@
"version": "1.0.0"
},
"baiducloud": {
"deleteVendor": true,
"hash": "sha256-mM4wikawrXdePX2ZemsjyoHrf0LQ0gwoUspcbvBUSeA=",
"hash": "sha256-NKeCPoyeWGWyWScCqCsm4s0U9zCojJ6+OOr+nDdIFqM=",
"owner": "baidubce",
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
"repo": "terraform-provider-baiducloud",
"rev": "v1.16.3",
"vendorHash": "sha256-UxVRz0Nhz6jqXPlAAJZ+GJFu30JJ4hYvVi5OlXInE0g=",
"version": "1.16.3"
"rev": "v1.17.0",
"vendorHash": null,
"version": "1.17.0"
},
"bigip": {
"hash": "sha256-uSe+J4AlW8Dt96BVF1ZI/yrgWUbZsl64b/D+k5ysHC0=",
Expand Down Expand Up @@ -350,13 +349,13 @@
"version": "0.14.1"
},
"docker": {
"hash": "sha256-hUKe9VjaNbiPhbxyFKly5PlKWngU2pl6ygwRJSokxr8=",
"hash": "sha256-/vz4rjENlVl9gqtxfqCV+k2SgsHZBcmA9Mz10Y2ay/E=",
"owner": "kreuzwerker",
"provider-source-address": "registry.terraform.io/kreuzwerker/docker",
"repo": "terraform-provider-docker",
"rev": "v2.22.0",
"vendorHash": "sha256-9dsmWkIYrN+GDd/r7kKYUyj+77hKuVilfpVUMpQMseo=",
"version": "2.22.0"
"rev": "v2.23.0",
"vendorHash": "sha256-0JRJAwc4LbPXi6GJdrIGwuIaCzaP5MtIMuijYoOEjYA=",
"version": "2.23.0"
},
"elasticsearch": {
"hash": "sha256-+cktPArBOysc4V+uR3KWsVlxtxSIbuVMCmPSU21xF/U=",
Expand Down Expand Up @@ -451,24 +450,24 @@
"version": "3.18.0"
},
"google": {
"hash": "sha256-LyPvK1IPCCfYcRfh9nPyPBZh1cU3sSkUb6tYKUko2C4=",
"hash": "sha256-MvLzXucKSqyTO9bjbXtBzh3XsOizw0waMGDFhrYtoWM=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.42.0",
"rev": "v4.42.1",
"vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=",
"version": "4.42.0"
"version": "4.42.1"
},
"google-beta": {
"hash": "sha256-Yi5nFjnYXFztqQURX3LIdmFNam7Ebhp0jTTXyTcX28Q=",
"hash": "sha256-dtj1LWIXvjInGtbXy5FBdNmQzp+PRKXpnYzsSL/fIaE=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.42.0",
"rev": "v4.42.1",
"vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=",
"version": "4.42.0"
"version": "4.42.1"
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
Expand Down Expand Up @@ -580,13 +579,13 @@
"version": "0.1.2"
},
"ibm": {
"hash": "sha256-OcOmcTZe2J0cz9glVi/oLp55QrhsOpT0sj0PS32vnow=",
"hash": "sha256-zxPl76D5ddw+7WowQf4LY9MYTGfX3CMEBQofXKwbowQ=",
"owner": "IBM-Cloud",
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
"repo": "terraform-provider-ibm",
"rev": "v1.46.0",
"vendorHash": "sha256-Zhk2Q7tnL3P/uLo/61o/XiiMKBdmb2749S/Ax1ZrxAo=",
"version": "1.46.0"
"rev": "v1.47.0",
"vendorHash": "sha256-Ggiu+nGTABxK+HiBvY2l/l3+Gqg4GoczZJf69v3Ylfk=",
"version": "1.47.0"
},
"icinga2": {
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
Expand Down Expand Up @@ -843,13 +842,13 @@
"version": "1.7.1"
},
"oci": {
"hash": "sha256-PSkD2HXGmSimJYQPZKuVCGvEa0sSNc4XMRRrM5O+/QE=",
"hash": "sha256-7822cLdHruCOYu0UGX5KV0f4+W2lQSb2b5SaLDM8cts=",
"owner": "oracle",
"provider-source-address": "registry.terraform.io/oracle/oci",
"repo": "terraform-provider-oci",
"rev": "v4.96.0",
"rev": "v4.98.0",
"vendorHash": null,
"version": "4.96.0"
"version": "4.98.0"
},
"okta": {
"hash": "sha256-COGXHUjXYGB2QDY0iBG+MvNcxGy87vpGIerQU2XXEmw=",
Expand Down Expand Up @@ -888,13 +887,13 @@
"version": "1.49.0"
},
"opentelekomcloud": {
"hash": "sha256-oqagD7YK/HyAoeI5WBrHuAmWiLoz/1441zne8vqN3A8=",
"hash": "sha256-L28nrY2/UBi/W/mmK5ZPQub2Jf9vMethQo6JsSkepwU=",
"owner": "opentelekomcloud",
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud",
"rev": "v1.31.6",
"vendorHash": "sha256-AuxvQffKOHPqda8nMJPxWVMui9+d8IhmbPsZK/9A1yI=",
"version": "1.31.6"
"rev": "v1.31.7",
"vendorHash": "sha256-wEtpZzrQoL0yJLsviwHI019KI04O+FAkXMsaJFztL/8=",
"version": "1.31.7"
},
"opsgenie": {
"hash": "sha256-DhECesGkBaQuk43pF4xk6zln+FzgL+1A1rSm0sqg7XQ=",
Expand Down Expand Up @@ -1086,13 +1085,13 @@
"version": "0.7.1"
},
"spotinst": {
"hash": "sha256-mcj16B7VM5mc5UUXSLdcGApPac6xPU86H0lgpeR1FMs=",
"hash": "sha256-9i8mHWn9+ey0tHPXOjZyNixcrdgAl2Y8sJq/q4WlZzo=",
"owner": "spotinst",
"provider-source-address": "registry.terraform.io/spotinst/spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.86.0",
"rev": "v1.87.0",
"vendorHash": "sha256-INJLhHiMs/bk3Y8/shtQaW10bUnuhCXdTa8wCNZf0+U=",
"version": "1.86.0"
"version": "1.87.0"
},
"stackpath": {
"hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=",
Expand Down Expand Up @@ -1131,13 +1130,13 @@
"version": "0.13.5"
},
"tencentcloud": {
"hash": "sha256-0nPMT5jZxqKbCLQmjBywCBh1T2P2Q1NdghXH12BXaE4=",
"hash": "sha256-lWePRU8kmOjOq9giCMdU5Aeb74WR/s6wIzShjzDBFjc=",
"owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud",
"rev": "v1.78.6",
"rev": "v1.78.7",
"vendorHash": null,
"version": "1.78.6"
"version": "1.78.7"
},
"tfe": {
"hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=",
Expand All @@ -1158,13 +1157,13 @@
"version": "1.0.0"
},
"time": {
"hash": "sha256-tDYrKU/kggrv/p8QZ0LbHjQSOaNrQ0qy9ekY7DAXqEA=",
"hash": "sha256-FehWmIkL0o2pleafN/mlBa46cdFqCFUS+coOwFPdb9M=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/time",
"repo": "terraform-provider-time",
"rev": "v0.9.0",
"vendorHash": "sha256-I4CnaSyn32S7FM56dYWZhzGUKByP2DXD0t/eBOL2ALs=",
"version": "0.9.0"
"rev": "v0.9.1",
"vendorHash": "sha256-MLh/we8KNrDBy2BAMZ6B/gBe0p3xJ7l/imNzTHciJjs=",
"version": "0.9.1"
},
"tls": {
"hash": "sha256-DBOkfvT0+mlgaWiBHggZUKvHL8jLZjQjRi0xFZKgcoM=",
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/networking/syncthing/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ let
common = { stname, target, postInstall ? "" }:
buildGoModule rec {
pname = stname;
version = "1.22.0";
version = "1.22.1";

src = fetchFromGitHub {
owner = "syncthing";
repo = "syncthing";
rev = "v${version}";
hash = "sha256-jAXxgSm0eEdFylukYGhIGtA0KniMiln1BIfuGZoboSM=";
hash = "sha256-XndTMPO1lN6bsjeHbvrZ+i4VwaKoUOcWOfbVQ2E7/eo=";
};

vendorSha256 = "sha256-yabX1A4Q/0ZQFMCrvO5oCI5y0o/dqQy3IplxZ6SsHuw=";
vendorSha256 = "sha256-ZxA05K5zKmQIm2R525DNXpGXqwM33j3PCuPN5d2qcj8=";

doCheck = false;

Expand Down
13 changes: 7 additions & 6 deletions pkgs/applications/office/karlender/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,23 @@

rustPlatform.buildRustPackage rec {
pname = "karlender";
version = "0.6.2";
version = "0.7.1";

src = fetchFromGitLab {
owner = "loers";
repo = "karlender";
owner = "floers";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YF46C+Vz7eGl4lqOQXqiQqaa6ieo1p8l6QCh4oNSJEg=";
hash = "sha256-dgxhXxtwQvaWMLCh8ac67L+R6jnJQdFzoyWKyrboPTk=";
};

cargoSha256 = "sha256-Kx5K2tp5PAQWac8LVrmOsk8Qf9m34SJ1vyfv7Ef2Wr0=";
cargoHash = "sha256-DsayK3wk2BVG2tqijWWQqUv5uPb/lcZXmwy8pbmd430=";

nativeBuildInputs = [
pkg-config
wrapGAppsHook4
glib
];

buildInputs = [
gtk4
libadwaita
Expand All @@ -52,7 +53,7 @@ rustPlatform.buildRustPackage rec {

meta = with lib; {
description = "Mobile-friendly GTK calendar application";
homepage = "https://gitlab.com/loers/karlender";
homepage = "https://gitlab.com/floers/karlender";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ chuangzhu ];
platforms = platforms.linux;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

buildGoModule rec {
pname = "lefthook";
version = "1.1.3";
version = "1.1.4";

src = fetchFromGitHub {
rev = "v${version}";
owner = "evilmartians";
repo = "lefthook";
sha256 = "sha256-TV7ogO7mfRMpLekRAedJsdRJUBbPyxPO9MCoGg6uCno=";
sha256 = "sha256-e3kNr9FMcqznKLFXA8gNTBjaMyXhrWzIxMmX7r6aaWA=";
};

vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ=";
Expand Down
6 changes: 3 additions & 3 deletions pkgs/applications/virtualization/nixpacks/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "nixpacks";
version = "0.11.5";
version = "0.11.6";

src = fetchFromGitHub {
owner = "railwayapp";
repo = pname;
rev = "v${version}";
sha256 = "sha256-QLF49k8f8YYwPl26pyz9/bbO4IO0KqSlgTFNjbvPf7k=";
sha256 = "sha256-9b1j3hY4ChlLIXmNsIjt6SjqHOYSqdY98amV36WPU74=";
};

cargoSha256 = "sha256-u0L3NJ4ku5ETBx6PKgVStrcSCX4I7E6GNtW+iv3yy2g=";
cargoSha256 = "sha256-s34mYMaHElBTD7I6QZtGsVTZUbVkcSmavvLs2k4mJDw=";

# skip test due FHS dependency
doCheck = false;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/data/fonts/monocraft/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "monocraft";
version = "1.2";
version = "1.4";

src = fetchFromGitHub {
owner = "IdreesInc";
repo = "Monocraft";
rev = "v${version}";
sha256 = "sha256-frg7LcMv6zWPWxkr6RIl01fC68THELbb45mJVqefXC0=";
sha256 = "sha256-YF0uPCc+dajJtG6mh/JpoSr6GirAhif5L5sp6hFmKLE=";
};

dontConfigure = true;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/libpg_query/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "libpg_query";
version = "13-2.1.2";
version = "13-2.2.0";

src = fetchFromGitHub {
owner = "pganalyze";
repo = "libpg_query";
rev = version;
sha256 = "sha256-Y0oIcpZ0CPbFvyTC6YrSjcs14jk/K5pIyJjTo5vV5sQ=";
sha256 = "sha256-gEkcv/j8ySUYmM9lx1hRF/SmuQMYVHwZAIYOaCQWAFs=";
};

nativeBuildInputs = [ which ];
Expand Down
Loading

0 comments on commit d7a3a8a

Please sign in to comment.