Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2022-11-03 06:01:55 +00:00 committed by GitHub
commit d7a3a8aad6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 151 additions and 107 deletions

View file

@ -9422,6 +9422,12 @@
githubId = 11706080; githubId = 11706080;
name = "Moritz Clasmeier"; name = "Moritz Clasmeier";
}; };
mtoohey = {
name = "Matthew Toohey";
email = "contact@mtoohey.com";
github = "mtoohey31";
githubId = 36740602;
};
MtP = { MtP = {
email = "marko.nixos@poikonen.de"; email = "marko.nixos@poikonen.de";
github = "MtP76"; github = "MtP76";

View file

@ -9,11 +9,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vis"; pname = "vis";
version = "0.7"; version = "0.8";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
sha256 = "1g05ncsnk57kcqm9wsv6sz8b24kyzj8r5rfpa1wfwj8qkjzx3vji"; sha256 = "sha256-XvWj6fZxzXeRA5oCAqIIwlfjrJcHnDrjeiPExEQKSkY=";
repo = "vis"; repo = "vis";
owner = "martanne"; owner = "martanne";
}; };

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "logseq"; pname = "logseq";
version = "0.8.9"; version = "0.8.10";
src = fetchurl { src = fetchurl {
url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; 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"; name = "${pname}-${version}.AppImage";
}; };

View file

@ -19,16 +19,16 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "argo"; pname = "argo";
version = "3.4.2"; version = "3.4.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "argoproj"; owner = "argoproj";
repo = "argo"; repo = "argo";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ST5XVgij1h+4EWLlwdFmIYZ0RPSH5IoTw0YdP0a+Sa4="; sha256 = "sha256-eVd3tH77Z3AlNpMEx+xnOQTELXFeGTLIslE++++Sdkw=";
}; };
vendorSha256 = "sha256-h6Ioy1wBOAOCGcqcLlPyqX5pyx22BIiHKx4ct0HmnyA="; vendorSha256 = "sha256-n8NAxfNZ/q2gdA5N7dTNgvdB549aiRxFPJO4UsfIn2U=";
doCheck = false; doCheck = false;

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "argocd"; pname = "argocd";
version = "2.4.15"; version = "2.5.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "argoproj"; owner = "argoproj";
repo = "argo-cd"; repo = "argo-cd";
rev = "v${version}"; 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 # Set target as ./cmd per cli-local
# https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227
@ -26,7 +26,7 @@ buildGoModule rec {
"-X ${package_url}.gitCommit=${src.rev}" "-X ${package_url}.gitCommit=${src.rev}"
"-X ${package_url}.gitTag=${src.rev}" "-X ${package_url}.gitTag=${src.rev}"
"-X ${package_url}.gitTreeState=clean" "-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 # NOTE: Update kubectlVersion when upgrading this package with
# https://github.com/argoproj/argo-cd/blob/v${version}/go.mod#L95 # https://github.com/argoproj/argo-cd/blob/v${version}/go.mod#L95
# Per https://github.com/argoproj/argo-cd/blob/master/Makefile#L18 # Per https://github.com/argoproj/argo-cd/blob/master/Makefile#L18

View file

@ -147,14 +147,13 @@
"version": "1.0.0" "version": "1.0.0"
}, },
"baiducloud": { "baiducloud": {
"deleteVendor": true, "hash": "sha256-NKeCPoyeWGWyWScCqCsm4s0U9zCojJ6+OOr+nDdIFqM=",
"hash": "sha256-mM4wikawrXdePX2ZemsjyoHrf0LQ0gwoUspcbvBUSeA=",
"owner": "baidubce", "owner": "baidubce",
"provider-source-address": "registry.terraform.io/baidubce/baiducloud", "provider-source-address": "registry.terraform.io/baidubce/baiducloud",
"repo": "terraform-provider-baiducloud", "repo": "terraform-provider-baiducloud",
"rev": "v1.16.3", "rev": "v1.17.0",
"vendorHash": "sha256-UxVRz0Nhz6jqXPlAAJZ+GJFu30JJ4hYvVi5OlXInE0g=", "vendorHash": null,
"version": "1.16.3" "version": "1.17.0"
}, },
"bigip": { "bigip": {
"hash": "sha256-uSe+J4AlW8Dt96BVF1ZI/yrgWUbZsl64b/D+k5ysHC0=", "hash": "sha256-uSe+J4AlW8Dt96BVF1ZI/yrgWUbZsl64b/D+k5ysHC0=",
@ -350,13 +349,13 @@
"version": "0.14.1" "version": "0.14.1"
}, },
"docker": { "docker": {
"hash": "sha256-hUKe9VjaNbiPhbxyFKly5PlKWngU2pl6ygwRJSokxr8=", "hash": "sha256-/vz4rjENlVl9gqtxfqCV+k2SgsHZBcmA9Mz10Y2ay/E=",
"owner": "kreuzwerker", "owner": "kreuzwerker",
"provider-source-address": "registry.terraform.io/kreuzwerker/docker", "provider-source-address": "registry.terraform.io/kreuzwerker/docker",
"repo": "terraform-provider-docker", "repo": "terraform-provider-docker",
"rev": "v2.22.0", "rev": "v2.23.0",
"vendorHash": "sha256-9dsmWkIYrN+GDd/r7kKYUyj+77hKuVilfpVUMpQMseo=", "vendorHash": "sha256-0JRJAwc4LbPXi6GJdrIGwuIaCzaP5MtIMuijYoOEjYA=",
"version": "2.22.0" "version": "2.23.0"
}, },
"elasticsearch": { "elasticsearch": {
"hash": "sha256-+cktPArBOysc4V+uR3KWsVlxtxSIbuVMCmPSU21xF/U=", "hash": "sha256-+cktPArBOysc4V+uR3KWsVlxtxSIbuVMCmPSU21xF/U=",
@ -451,24 +450,24 @@
"version": "3.18.0" "version": "3.18.0"
}, },
"google": { "google": {
"hash": "sha256-LyPvK1IPCCfYcRfh9nPyPBZh1cU3sSkUb6tYKUko2C4=", "hash": "sha256-MvLzXucKSqyTO9bjbXtBzh3XsOizw0waMGDFhrYtoWM=",
"owner": "hashicorp", "owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google", "provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true, "proxyVendor": true,
"repo": "terraform-provider-google", "repo": "terraform-provider-google",
"rev": "v4.42.0", "rev": "v4.42.1",
"vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=", "vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=",
"version": "4.42.0" "version": "4.42.1"
}, },
"google-beta": { "google-beta": {
"hash": "sha256-Yi5nFjnYXFztqQURX3LIdmFNam7Ebhp0jTTXyTcX28Q=", "hash": "sha256-dtj1LWIXvjInGtbXy5FBdNmQzp+PRKXpnYzsSL/fIaE=",
"owner": "hashicorp", "owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta", "provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true, "proxyVendor": true,
"repo": "terraform-provider-google-beta", "repo": "terraform-provider-google-beta",
"rev": "v4.42.0", "rev": "v4.42.1",
"vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=", "vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=",
"version": "4.42.0" "version": "4.42.1"
}, },
"googleworkspace": { "googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@ -580,13 +579,13 @@
"version": "0.1.2" "version": "0.1.2"
}, },
"ibm": { "ibm": {
"hash": "sha256-OcOmcTZe2J0cz9glVi/oLp55QrhsOpT0sj0PS32vnow=", "hash": "sha256-zxPl76D5ddw+7WowQf4LY9MYTGfX3CMEBQofXKwbowQ=",
"owner": "IBM-Cloud", "owner": "IBM-Cloud",
"provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
"repo": "terraform-provider-ibm", "repo": "terraform-provider-ibm",
"rev": "v1.46.0", "rev": "v1.47.0",
"vendorHash": "sha256-Zhk2Q7tnL3P/uLo/61o/XiiMKBdmb2749S/Ax1ZrxAo=", "vendorHash": "sha256-Ggiu+nGTABxK+HiBvY2l/l3+Gqg4GoczZJf69v3Ylfk=",
"version": "1.46.0" "version": "1.47.0"
}, },
"icinga2": { "icinga2": {
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
@ -843,13 +842,13 @@
"version": "1.7.1" "version": "1.7.1"
}, },
"oci": { "oci": {
"hash": "sha256-PSkD2HXGmSimJYQPZKuVCGvEa0sSNc4XMRRrM5O+/QE=", "hash": "sha256-7822cLdHruCOYu0UGX5KV0f4+W2lQSb2b5SaLDM8cts=",
"owner": "oracle", "owner": "oracle",
"provider-source-address": "registry.terraform.io/oracle/oci", "provider-source-address": "registry.terraform.io/oracle/oci",
"repo": "terraform-provider-oci", "repo": "terraform-provider-oci",
"rev": "v4.96.0", "rev": "v4.98.0",
"vendorHash": null, "vendorHash": null,
"version": "4.96.0" "version": "4.98.0"
}, },
"okta": { "okta": {
"hash": "sha256-COGXHUjXYGB2QDY0iBG+MvNcxGy87vpGIerQU2XXEmw=", "hash": "sha256-COGXHUjXYGB2QDY0iBG+MvNcxGy87vpGIerQU2XXEmw=",
@ -888,13 +887,13 @@
"version": "1.49.0" "version": "1.49.0"
}, },
"opentelekomcloud": { "opentelekomcloud": {
"hash": "sha256-oqagD7YK/HyAoeI5WBrHuAmWiLoz/1441zne8vqN3A8=", "hash": "sha256-L28nrY2/UBi/W/mmK5ZPQub2Jf9vMethQo6JsSkepwU=",
"owner": "opentelekomcloud", "owner": "opentelekomcloud",
"provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud",
"repo": "terraform-provider-opentelekomcloud", "repo": "terraform-provider-opentelekomcloud",
"rev": "v1.31.6", "rev": "v1.31.7",
"vendorHash": "sha256-AuxvQffKOHPqda8nMJPxWVMui9+d8IhmbPsZK/9A1yI=", "vendorHash": "sha256-wEtpZzrQoL0yJLsviwHI019KI04O+FAkXMsaJFztL/8=",
"version": "1.31.6" "version": "1.31.7"
}, },
"opsgenie": { "opsgenie": {
"hash": "sha256-DhECesGkBaQuk43pF4xk6zln+FzgL+1A1rSm0sqg7XQ=", "hash": "sha256-DhECesGkBaQuk43pF4xk6zln+FzgL+1A1rSm0sqg7XQ=",
@ -1086,13 +1085,13 @@
"version": "0.7.1" "version": "0.7.1"
}, },
"spotinst": { "spotinst": {
"hash": "sha256-mcj16B7VM5mc5UUXSLdcGApPac6xPU86H0lgpeR1FMs=", "hash": "sha256-9i8mHWn9+ey0tHPXOjZyNixcrdgAl2Y8sJq/q4WlZzo=",
"owner": "spotinst", "owner": "spotinst",
"provider-source-address": "registry.terraform.io/spotinst/spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst",
"repo": "terraform-provider-spotinst", "repo": "terraform-provider-spotinst",
"rev": "v1.86.0", "rev": "v1.87.0",
"vendorHash": "sha256-INJLhHiMs/bk3Y8/shtQaW10bUnuhCXdTa8wCNZf0+U=", "vendorHash": "sha256-INJLhHiMs/bk3Y8/shtQaW10bUnuhCXdTa8wCNZf0+U=",
"version": "1.86.0" "version": "1.87.0"
}, },
"stackpath": { "stackpath": {
"hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=",
@ -1131,13 +1130,13 @@
"version": "0.13.5" "version": "0.13.5"
}, },
"tencentcloud": { "tencentcloud": {
"hash": "sha256-0nPMT5jZxqKbCLQmjBywCBh1T2P2Q1NdghXH12BXaE4=", "hash": "sha256-lWePRU8kmOjOq9giCMdU5Aeb74WR/s6wIzShjzDBFjc=",
"owner": "tencentcloudstack", "owner": "tencentcloudstack",
"provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
"repo": "terraform-provider-tencentcloud", "repo": "terraform-provider-tencentcloud",
"rev": "v1.78.6", "rev": "v1.78.7",
"vendorHash": null, "vendorHash": null,
"version": "1.78.6" "version": "1.78.7"
}, },
"tfe": { "tfe": {
"hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=", "hash": "sha256-MDlRwB2iVi/Rv7/UtukI6mIDImz8Gnpm5Qv5R6EDpiU=",
@ -1158,13 +1157,13 @@
"version": "1.0.0" "version": "1.0.0"
}, },
"time": { "time": {
"hash": "sha256-tDYrKU/kggrv/p8QZ0LbHjQSOaNrQ0qy9ekY7DAXqEA=", "hash": "sha256-FehWmIkL0o2pleafN/mlBa46cdFqCFUS+coOwFPdb9M=",
"owner": "hashicorp", "owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/time", "provider-source-address": "registry.terraform.io/hashicorp/time",
"repo": "terraform-provider-time", "repo": "terraform-provider-time",
"rev": "v0.9.0", "rev": "v0.9.1",
"vendorHash": "sha256-I4CnaSyn32S7FM56dYWZhzGUKByP2DXD0t/eBOL2ALs=", "vendorHash": "sha256-MLh/we8KNrDBy2BAMZ6B/gBe0p3xJ7l/imNzTHciJjs=",
"version": "0.9.0" "version": "0.9.1"
}, },
"tls": { "tls": {
"hash": "sha256-DBOkfvT0+mlgaWiBHggZUKvHL8jLZjQjRi0xFZKgcoM=", "hash": "sha256-DBOkfvT0+mlgaWiBHggZUKvHL8jLZjQjRi0xFZKgcoM=",

View file

@ -4,16 +4,16 @@ let
common = { stname, target, postInstall ? "" }: common = { stname, target, postInstall ? "" }:
buildGoModule rec { buildGoModule rec {
pname = stname; pname = stname;
version = "1.22.0"; version = "1.22.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "syncthing"; owner = "syncthing";
repo = "syncthing"; repo = "syncthing";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-jAXxgSm0eEdFylukYGhIGtA0KniMiln1BIfuGZoboSM="; hash = "sha256-XndTMPO1lN6bsjeHbvrZ+i4VwaKoUOcWOfbVQ2E7/eo=";
}; };
vendorSha256 = "sha256-yabX1A4Q/0ZQFMCrvO5oCI5y0o/dqQy3IplxZ6SsHuw="; vendorSha256 = "sha256-ZxA05K5zKmQIm2R525DNXpGXqwM33j3PCuPN5d2qcj8=";
doCheck = false; doCheck = false;

View file

@ -11,22 +11,23 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "karlender"; pname = "karlender";
version = "0.6.2"; version = "0.7.1";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "loers"; owner = "floers";
repo = "karlender"; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-YF46C+Vz7eGl4lqOQXqiQqaa6ieo1p8l6QCh4oNSJEg="; hash = "sha256-dgxhXxtwQvaWMLCh8ac67L+R6jnJQdFzoyWKyrboPTk=";
}; };
cargoSha256 = "sha256-Kx5K2tp5PAQWac8LVrmOsk8Qf9m34SJ1vyfv7Ef2Wr0="; cargoHash = "sha256-DsayK3wk2BVG2tqijWWQqUv5uPb/lcZXmwy8pbmd430=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
wrapGAppsHook4 wrapGAppsHook4
glib glib
]; ];
buildInputs = [ buildInputs = [
gtk4 gtk4
libadwaita libadwaita
@ -52,7 +53,7 @@ rustPlatform.buildRustPackage rec {
meta = with lib; { meta = with lib; {
description = "Mobile-friendly GTK calendar application"; description = "Mobile-friendly GTK calendar application";
homepage = "https://gitlab.com/loers/karlender"; homepage = "https://gitlab.com/floers/karlender";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = with maintainers; [ chuangzhu ]; maintainers = with maintainers; [ chuangzhu ];
platforms = platforms.linux; platforms = platforms.linux;

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "lefthook"; pname = "lefthook";
version = "1.1.3"; version = "1.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "evilmartians"; owner = "evilmartians";
repo = "lefthook"; repo = "lefthook";
sha256 = "sha256-TV7ogO7mfRMpLekRAedJsdRJUBbPyxPO9MCoGg6uCno="; sha256 = "sha256-e3kNr9FMcqznKLFXA8gNTBjaMyXhrWzIxMmX7r6aaWA=";
}; };
vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ="; vendorSha256 = "sha256-NTZz0EDIjGdh8dD9jxbNVdWb7NFJsdtnMp7H6Ni0EbQ=";

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "nixpacks"; pname = "nixpacks";
version = "0.11.5"; version = "0.11.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "railwayapp"; owner = "railwayapp";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-QLF49k8f8YYwPl26pyz9/bbO4IO0KqSlgTFNjbvPf7k="; sha256 = "sha256-9b1j3hY4ChlLIXmNsIjt6SjqHOYSqdY98amV36WPU74=";
}; };
cargoSha256 = "sha256-u0L3NJ4ku5ETBx6PKgVStrcSCX4I7E6GNtW+iv3yy2g="; cargoSha256 = "sha256-s34mYMaHElBTD7I6QZtGsVTZUbVkcSmavvLs2k4mJDw=";
# skip test due FHS dependency # skip test due FHS dependency
doCheck = false; doCheck = false;

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "monocraft"; pname = "monocraft";
version = "1.2"; version = "1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "IdreesInc"; owner = "IdreesInc";
repo = "Monocraft"; repo = "Monocraft";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-frg7LcMv6zWPWxkr6RIl01fC68THELbb45mJVqefXC0="; sha256 = "sha256-YF0uPCc+dajJtG6mh/JpoSr6GirAhif5L5sp6hFmKLE=";
}; };
dontConfigure = true; dontConfigure = true;

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libpg_query"; pname = "libpg_query";
version = "13-2.1.2"; version = "13-2.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pganalyze"; owner = "pganalyze";
repo = "libpg_query"; repo = "libpg_query";
rev = version; rev = version;
sha256 = "sha256-Y0oIcpZ0CPbFvyTC6YrSjcs14jk/K5pIyJjTo5vV5sQ="; sha256 = "sha256-gEkcv/j8ySUYmM9lx1hRF/SmuQMYVHwZAIYOaCQWAFs=";
}; };
nativeBuildInputs = [ which ]; nativeBuildInputs = [ which ];

View file

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "scramp"; pname = "scramp";
version = "1.4.3"; version = "1.4.4";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "tlocke"; owner = "tlocke";
repo = "scramp"; repo = "scramp";
rev = version; rev = version;
hash = "sha256-BKZam2zLS/SK6rqiUkoeFpQ0bO4pU8CKVNhOM1fv10Y="; hash = "sha256-WOyv1fLSXG7p+WKs2QSwlsh8FSK/lxp6I1hPY0VIkKo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -375,7 +375,7 @@ let
# FIXME: this checksum is currently wrong, since the tensorflow dependency fetch is broken on darwin # FIXME: this checksum is currently wrong, since the tensorflow dependency fetch is broken on darwin
"sha256-j2k9Q+k41nq5nP1VjjkkNjXRov1uAda4RCMDMAthjr0=" "sha256-j2k9Q+k41nq5nP1VjjkkNjXRov1uAda4RCMDMAthjr0="
else else
"sha256-zH3xNFEU2JR0Ww8bpD4mCiorGtao0WVPP4vklVMgS4A="; "sha256-3nAjP6WH6xhvVyA6ZGZ6ZpsTTUCQohNIiQhVn1eWpr8=";
}; };
buildAttrs = { buildAttrs = {

View file

@ -81,7 +81,7 @@ buildBazelPackage rec {
rm -rf $bazelOut/external/com_google_protobuf rm -rf $bazelOut/external/com_google_protobuf
''; '';
sha256 = "sha256-R+Hc9ldYcKgAXETKr2+Hk7IrjJ93WkrjyJ1SQRoM9V4="; sha256 = "sha256-AiSUwoa0JKChSSPSi1EWTpUKQggmOsjLB6fRMCAgUyE=";
}; };
buildAttrs = { buildAttrs = {

View file

@ -26,12 +26,12 @@
}: }:
let let
version = "5.2.0"; version = "5.3.2";
sourceRoot = "."; sourceRoot = ".";
src = fetchurl { src = fetchurl {
url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
sha256 = "sha256-ggqU27FAce1tjCZs8MCA7LJlpe6mUwdXlInEZiwtWCo="; hash = "sha256-OICtkZWS0ePkDFBvE7Ms0KLibxKdh8troXDxgB19e4I=";
}; };
# Update with `eval $(nix-build -A bazel_5.updater)`, # Update with `eval $(nix-build -A bazel_5.updater)`,

View file

@ -2,11 +2,11 @@
buildGraalvmNativeImage rec { buildGraalvmNativeImage rec {
pname = "clj-kondo"; pname = "clj-kondo";
version = "2022.10.14"; version = "2022.11.02";
src = fetchurl { src = fetchurl {
url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";
sha256 = "sha256-pLISiyrkHFii69KNlJc/csA4mpNACDWjfu05BL4bRVg="; sha256 = "sha256-FLnij5ff7+tP+SoBnB2zVEpuWRG2MYp9avTrh2q6g4k=";
}; };
extraNativeImageBuildArgs = [ extraNativeImageBuildArgs = [

View file

@ -18,13 +18,13 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "faas-cli"; pname = "faas-cli";
version = "0.14.11"; version = "0.15.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "openfaas"; owner = "openfaas";
repo = "faas-cli"; repo = "faas-cli";
rev = version; rev = version;
sha256 = "sha256-QecoAdsl4Nf4tCOsvHeZdSjBqQG+vXejRe8Q39jNNVI="; sha256 = "sha256-kHpZeon85hU1cn2UmLNvC43z2nbWGFt6fWJDljwZANI=";
}; };
vendorSha256 = null; vendorSha256 = null;

View file

@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl, jre_headless, makeWrapper }: { lib, stdenv, fetchurl, jre_headless, makeWrapper }:
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
pname = "flyway"; pname = "flyway";
version = "9.6.0"; version = "9.7.0";
src = fetchurl { src = fetchurl {
url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
sha256 = "sha256-mf9u4FzKMBXoQ7PLUYZaYpVTuWNdSfplmzu+dKvABl8="; sha256 = "sha256-HXLwC5T+hPbUTf4grKjCnhIMpqsFAz5yK6kH4XicLG8=";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
dontBuild = true; dontBuild = true;

View file

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-deps"; pname = "cargo-deps";
version = "1.4.1"; version = "1.5.0";
src = fetchCrate { src = fetchCrate {
inherit pname version; inherit pname version;
sha256 = "sha256-WzvWkn2o39InESSzF5oLVP1I876b+r749hjZgh2DxOk="; sha256 = "sha256-0zK1qwu+awZGd9hgH2WRrzJMzwpI830Lh//P0wVp6Js=";
}; };
cargoSha256 = "15pf4x2aw8sl65g63cz4yv9y78yc2wi25h9khpqx6i7gyd7dxbsc"; cargoSha256 = "sha256-ZPQIt+TL1OKX3Ch4A17eAELjaSTo2uk+X6YWFAXvWJA=";
meta = with lib; { meta = with lib; {
description = "Cargo subcommand for building dependency graphs of Rust projects"; description = "Cargo subcommand for building dependency graphs of Rust projects";

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-nextest"; pname = "cargo-nextest";
version = "0.9.40"; version = "0.9.42";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nextest-rs"; owner = "nextest-rs";
repo = "nextest"; repo = "nextest";
rev = "cargo-nextest-${version}"; rev = "cargo-nextest-${version}";
sha256 = "sha256-w6YTnd+v4kvv7e/Zdo4oa1AGfW86Lmjyk4jMeFs/wUE="; sha256 = "sha256-tNfJJfNjaeMszO5dGBvJfq7Hb0Sxc6DbRhYvpIjpCU0=";
}; };
cargoSha256 = "sha256-UhxC3Bv8wohO83k+ndhK9yOK2nQpeVYbc1CW5wpb2B4="; cargoSha256 = "sha256-wEm1ooNZGDeMwJNGGL1bPMeBqL9VjxXlKVgmshNUUoo=";
buildInputs = lib.optionals stdenv.isDarwin [ Security ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ];

View file

@ -0,0 +1,31 @@
{ buildGoModule, fetchFromGitHub, lib, lm_sensors }:
buildGoModule rec {
pname = "fan2go";
version = "0.8.0";
src = fetchFromGitHub {
owner = "markusressel";
repo = pname;
rev = version;
sha256 = "3pnJaLD+FEQWAAwIiTkcs9VgqO0JwRaK7JLdIygeChY=";
};
vendorSha256 = "9EeiYPNTUEFHxTdvVb2JLU6Qi0oazH+n9MB8Dg+RLJ4=";
postConfigure = ''
substituteInPlace vendor/github.com/md14454/gosensors/gosensors.go \
--replace '"/etc/sensors3.conf"' '"${lm_sensors}/etc/sensors3.conf"'
'';
CGO_CFLAGS = "-I ${lm_sensors}/include";
CGO_LDFLAGS = "-L ${lm_sensors}/lib";
meta = with lib; {
description = "A simple daemon providing dynamic fan speed control based on temperature sensors";
homepage = "https://github.com/markusressel/fan2go";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ mtoohey ];
platforms = platforms.linux;
};
}

View file

@ -15,13 +15,13 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "minio"; pname = "minio";
version = "2022-10-29T06-21-33Z"; version = "2022-10-24T18-35-07Z";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "minio"; owner = "minio";
repo = "minio"; repo = "minio";
rev = "RELEASE.${version}"; rev = "RELEASE.${version}";
sha256 = "sha256-fQikYzaFFBYwtwKUOehxhK1+8M6Mlg4bBojkviheOco="; sha256 = "sha256-sABNzhyfBNU5pWyE/VWHUzuSyKsx0glj01ectJPakV8=";
}; };
vendorSha256 = "sha256-wB3UiuptT6D0CIUlHC1d5k0rjIxNeh5yAWOmYpyLGmA="; vendorSha256 = "sha256-wB3UiuptT6D0CIUlHC1d5k0rjIxNeh5yAWOmYpyLGmA=";

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "chezmoi"; pname = "chezmoi";
version = "2.25.0"; version = "2.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "twpayne"; owner = "twpayne";
repo = "chezmoi"; repo = "chezmoi";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-a7Qf0mKo1aWABftgIDgh94mJf49d7KAtBkemRNRash0="; sha256 = "sha256-2NtYaKZiUPp33wZuH4pA0uSPdu8xxQASPlsSqjRDTRc=";
}; };
vendorSha256 = "sha256-jqK115vnEYlER3sAFVFlMFGjpMnAIMlFM+4oN8Ujad4="; vendorSha256 = "sha256-iDzVe8wnvJlrY8F+LyzLkX+BlvkgUPOEDQqkUPNDuUg=";
doCheck = false; doCheck = false;

View file

@ -15,14 +15,14 @@ let
in in
with python.pkgs; buildPythonApplication rec { with python.pkgs; buildPythonApplication rec {
pname = "esphome"; pname = "esphome";
version = "2022.10.1"; version = "2022.10.2";
format = "setuptools"; format = "setuptools";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-nMm3doRbszT0VX7CCRTqK0HD/D3YKPNqDKGHCce16Zc="; hash = "sha256-f6t5Q9jK6ovcIFVw1hYyhtiy/iDaq7cmfn5ywAeEaT8=";
}; };
postPatch = '' postPatch = ''

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "nfpm"; pname = "nfpm";
version = "2.20.0"; version = "2.21.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "goreleaser"; owner = "goreleaser";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-yNSwJBN8ZgZHH62/Z8Tkg8e29Ee0mF4YwCFm+xXXsTU="; sha256 = "sha256-WjvgRveSoDgOvGHy3jnIq2InKi1NaPiuorufrsSsp5k=";
}; };
vendorSha256 = "sha256-gepSzWqmG2nxej/D748w19fpt2sUGLThj9J57hOnBnw="; vendorSha256 = "sha256-EbA4ljsSessyGJLw9BfJ4wulAcXQeLOXk4f6KVu9mIY=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ]; ldflags = [ "-s" "-w" "-X main.version=${version}" ];

View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "gobuster"; pname = "gobuster";
version = "3.2.0"; version = "3.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "OJ"; owner = "OJ";
repo = "gobuster"; repo = "gobuster";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-rTduDHGo5V40OlBnwncSzCNYGsHg0uXnuI8JSwOqCSY="; hash = "sha256-bh48TAhK0HwwNvE5Fr4KtCI+Nz1Wb9vaV916RzGG8/I=";
}; };
vendorHash = "sha256-OYQTVu3L2VxOMIYKMHmjiPCKU15RopLz0KL5+7Zb9WY="; vendorHash = "sha256-fuz9Sj/wKJWp7Q/g5LBb44a50QKGMCPHJ38TBhTCn00=";
meta = with lib; { meta = with lib; {
description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers";

View file

@ -11,10 +11,10 @@
}: }:
let let
sha256 = "1xwfbfh25kwbv8q24mcxdv0h4iya5r56cc8d6d1ihp92i1k7ggk9"; sha256 = "0lngwmb9j3nzwhkhq4r9sy82gwjry14lvjjgm8vfivbbakjdl7xp";
# specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`.
specVersion = "4.138.0"; specVersion = "4.139.0";
specSha256 = "0gcfnrgp18r49pvpi5s7x8vmz7jmps99pqhq3maad3xcrryjjrj4"; specSha256 = "1z050vm049gb8vynp34iz9jpxwbpmbf5vbs1jsirwqbfhr1skslz";
spec = fetchurl { spec = fetchurl {
url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml";
sha256 = specSha256; sha256 = specSha256;
@ -24,7 +24,7 @@ in
buildPythonApplication rec { buildPythonApplication rec {
pname = "linode-cli"; pname = "linode-cli";
version = "5.24.0"; version = "5.25.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linode"; owner = "linode";

View file

@ -13361,13 +13361,6 @@ with pkgs;
adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit stdenv lib; }; adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit stdenv lib; };
adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; }; adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; };
adoptopenjdk-hotspot-bin-17 = if stdenv.isLinux
then callPackage adoptopenjdk-bin-17-packages-linux.jdk-hotspot {}
else callPackage adoptopenjdk-bin-17-packages-darwin.jdk-hotspot {};
adoptopenjdk-jre-hotspot-bin-17 = if stdenv.isLinux
then callPackage adoptopenjdk-bin-17-packages-linux.jre-hotspot {}
else callPackage adoptopenjdk-bin-17-packages-darwin.jre-hotspot {};
adoptopenjdk-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-hotspot; adoptopenjdk-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-hotspot;
adoptopenjdk-jre-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jre-hotspot; adoptopenjdk-jre-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jre-hotspot;
adoptopenjdk-openj9-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-openj9; adoptopenjdk-openj9-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-openj9;
@ -24856,6 +24849,8 @@ with pkgs;
facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { }; facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { };
fan2go = callPackage ../os-specific/linux/fan2go { };
fatrace = callPackage ../os-specific/linux/fatrace { }; fatrace = callPackage ../os-specific/linux/fatrace { };
ffado = libsForQt5.callPackage ../os-specific/linux/ffado { ffado = libsForQt5.callPackage ../os-specific/linux/ffado {

View file

@ -232,6 +232,18 @@ let
}; };
} else throw "i686 Linux package set can only be used with the x86 family."; } else throw "i686 Linux package set can only be used with the x86 family.";
# x86_64-darwin packages for aarch64-darwin users to use with Rosetta for incompatible packages
pkgsx86_64Darwin = if stdenv.hostPlatform.isDarwin then nixpkgsFun {
overlays = [ (self': super': {
pkgsx86_64Darwin = super';
})] ++ overlays;
localSystem = {
parsed = stdenv.hostPlatform.parsed // {
cpu = lib.systems.parse.cpuTypes.x86_64;
};
};
} else throw "x86_64 Darwin package set can only be used on Darwin systems.";
# Extend the package set with zero or more overlays. This preserves # Extend the package set with zero or more overlays. This preserves
# preexisting overlays. Prefer to initialize with the right overlays # preexisting overlays. Prefer to initialize with the right overlays
# in one go when calling Nixpkgs, for performance and simplicity. # in one go when calling Nixpkgs, for performance and simplicity.