b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
github-actions[bot] 2022-01-30 12:01:49 +00:00 committed by GitHub
parent 6715796ae4 4459580c0a
commit 34734b6cae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 70 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/misc/dasel/default.nix
View file

@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "091s3hyz9p892garanm9zmkbsn6hn3bnnrz7h3dqsyi58806d5yr";
};
vendorSha256 = "1psyx8nqzpx3p1ya9y3q9h0hhfx4iqmix089b2h6bp9lgqbj5zn8";
vendorSha256 = "1y0k03lg9dh3bpi10xzv03h7gq7h0hgggs304p78p3jkr8pmkqss";
ldflags = [
"-s" "-w" "-X github.com/tomwright/dasel/internal.Version=${version}"

4
pkgs/applications/networking/cluster/flink/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "flink";
version = "1.14.0";
version = "1.14.2";
src = fetchurl {
url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.11.tgz";
sha256 = "149b9ae774022acc0109dced893ca2d73430627a612be17ff12de8734464aff8";
sha256 = "1rm2x66179ybfyc8v3va3svjxrnkslqn3dc84qkglqjaiqciadnr";
};
nativeBuildInputs = [ makeWrapper ];

2
pkgs/applications/networking/cluster/k0sctl/default.nix
View file

@ -14,7 +14,7 @@ buildGoModule rec {
sha256 = "sha256-Fk1aYSa3LqzxiHtlzH5pcNtodOprjfnCFh4UMqCa6Rc=";
};
vendorSha256 = "sha256-N4cU9wzBRZn71mZHkNDXKgSXvlN2QFS6K4MtlR25DJc=";
vendorSha256 = "sha256-21C6wZ8lKQnbUg3aD0ZFVOgopblXyWk4WP/ubZVk3Yk=";
ldflags = [
"-s"

2
pkgs/applications/networking/cluster/k9s/default.nix
View file

@ -17,7 +17,7 @@ buildGoModule rec {
"-X github.com/derailed/k9s/cmd.commit=${src.rev}"
];
vendorSha256 = "sha256-jWZ1N1A8VECBQvkXyuzMUkI4u2NLr5/gSvJUfK5VgzM=";
vendorSha256 = "sha256-mMob7M9RQlqaVK0DgHpaAK9d1btzfQetnliUqFTvjJQ=";
preCheck = "export HOME=$(mktemp -d)";

6
pkgs/applications/networking/cluster/kuma/default.nix
View file

@ -1,6 +1,6 @@
{ lib
, fetchFromGitHub
, buildGoModule
, buildGo117Module
, coredns
, installShellFiles
, isFull ? false
@ -14,11 +14,11 @@
]
}:
buildGoModule rec {
buildGo117Module rec {
inherit pname ;
version = "1.4.0";
tags = lib.optionals enableGateway ["gateway"];
vendorSha256 = "1fc5psvbd9bpc6c3y2cpx5dx8cgr2fcp7nln3kwfgbryahq2y8wl";
vendorSha256 = "19rd450gmc51gmwa13991lbkva7r80d2camikkxmmgywyhrd06sf";
src = fetchFromGitHub {
owner = "kumahq";

6
pkgs/applications/networking/cluster/linkerd/edge.nix
View file

@ -2,7 +2,7 @@
(callPackage ./generic.nix { }) {
channel = "edge";
version = "21.10.3";
sha256 = "09k4c0dgn9vvgp6xb20x0vylk6bbd03srk3sra8vnpywwi591mcv";
vendorSha256 = "sha256-J/+YFXHC6UTyhln2ZDEq/EyqMEP9XcNC4GRuJjGEY3g=";
version = "22.1.4";
sha256 = "00r58k26qnxjsqjdcqz04p21c1vvw5ls485gad0pcny370wrp65n";
vendorSha256 = "sha256-5vYf9/BCSHJ0iydKhz+9yDg0rRXpLd+j8uD8kcKhByc=";
}

5
pkgs/applications/networking/cluster/linkerd/generic.nix
View file

@ -1,8 +1,9 @@
{ lib, fetchFromGitHub, buildGoModule, installShellFiles }:
{ lib, fetchFromGitHub, buildGo117Module, installShellFiles }:
{ channel, version, sha256, vendorSha256 }:
buildGoModule rec {
# Fix-Me: Unlock buildGoModule version when #154059 is merged.
buildGo117Module rec {
pname = "linkerd-${channel}";
inherit version vendorSha256;

2
pkgs/applications/networking/cluster/nerdctl/default.nix
View file

@ -19,7 +19,7 @@ buildGoModule rec {
sha256 = "sha256-ZnSDL1a4I3e7z2w5MdG6tFZH0PT4jCYX34f+mOmO0oA=";
};
vendorSha256 = "sha256-S0WRLln80pdGWCe6ub3bMZ6G2PbXwvCEGDDzez+nF9E=";
vendorSha256 = "sha256-Gk3KBHLux7d7olS16liPYO7yYL2wryWLX5bKgCLEhB8=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

6
pkgs/development/libraries/java/commons/fileupload/default.nix
View file

@ -1,17 +1,17 @@
{lib, stdenv, fetchurl}:
stdenv.mkDerivation rec {
version = "1.3.1";
version = "1.4";
pname = "commons-fileupload";
src = fetchurl {
url = "mirror://apache/commons/fileupload/binaries/${pname}-${version}-bin.tar.gz";
sha256 = "1jy7w2j2ay56mpq4ij3331cf9zgpkm832ydr63svb35j0ymnky72";
sha256 = "1avfv4gljp7flra767yzas54vfb6az9s1nhxfjv48jj2x0llxxkx";
};
installPhase = ''
tar xf ${src}
mkdir -p $out/share/java
cp lib/*.jar $out/share/java/
cp commons-fileupload-*-bin/*.jar $out/share/java/
'';
meta = {

4
pkgs/development/python-modules/aiounifi/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "aiounifi";
version = "30";
version = "31";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Kane610";
repo = pname;
rev = "v${version}";
sha256 = "036yx1g80rc32g9mqx4khn8iqhmwl4kfch35pjslnna9kw3kb9i8";
sha256 = "sha256-8Hm7sUkIW4rVLCL5+vHfhAvmc8+IKDXaSLtYJTf14XY=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/azure-mgmt-compute/default.nix
View file

@ -6,13 +6,13 @@
}:
buildPythonPackage rec {
version = "24.0.1";
version = "25.0.0";
pname = "azure-mgmt-compute";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "283195339ef6ba1181dbc866ebede8b06ffdfe09eb86c25a04e1c8059d654f6e";
sha256 = "sha256-Y0WNBtQ9v0yhTVFfTvfcudWHOjzGagGB+/b++3Ie5Kk=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pyexcel-io/default.nix
View file

@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "pyexcel-io";
version = "0.6.5";
version = "0.6.6";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "608d8e80da38070d3bb970d132bc47a55dcfd63b4dc03997d93646c5b2ad185b";
sha256 = "sha256-9ghL8a+l+/TGHPffRDcPpROCGvGIsC4+GbXvtm2Klp8=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pykeyatome/default.nix
View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "pykeyatome";
version = "1.3.1";
version = "1.4.1";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "jugla";
repo = "pyKeyAtome";
rev = "V${version}";
sha256 = "1lvwxcr2ay8h5sr4lmjgs7xgszl1q8ciaqdn6cmrlra27jssl5ax";
sha256 = "sha256-Gv418i2JLoovwagkZpv8PIJPW3I/0pRmXR/PJOJ2NBc=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/python-louvain/default.nix
View file

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "python-louvain";
version = "0.15";
version = "0.16";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-KoVu374plSpgpVOKhLt4zKGPaISoi5Ml6FoRyN1JF+s=";
sha256 = "sha256-t7ot9QAv0o0+54mklTK6rRH+ZI5PIRfPB5jnUgodpWs=";
};
propagatedBuildInputs = [ networkx numpy ];

4
pkgs/development/python-modules/youtube-search-python/default.nix
View file

@ -2,13 +2,13 @@
buildPythonPackage rec {
pname = "youtube-search-python";
version = "1.6.1";
version = "1.6.2";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "c7afe70e1ac8e871341d7fb15f5246aac35fd80fec10d7a96d46df2aad608bd0";
sha256 = "sha256-PeWi1eygUSgUXZ68bUJ44IoffNDme06JNR9ns6njqMU=";
};
propagatedBuildInputs = [ httpx ];

4
pkgs/development/tools/appthreat-depscan/default.nix
View file

@ -5,13 +5,13 @@
python3.pkgs.buildPythonApplication rec {
pname = "appthreat-depscan";
version = "2.1.0";
version = "2.1.2";
src = fetchFromGitHub {
owner = "AppThreat";
repo = "dep-scan";
rev = "v${version}";
hash = "sha256-HCOS8/jn7BOzDwSpenVGo6QpI/1ey6L1zBucTyqsSY4=";
hash = "sha256-hRmTx0qs/QnDLl4KhGbKw5Mucq4wQCaCIkeObrZlJSI=";
};
propagatedBuildInputs = with python3.pkgs; [

2
pkgs/development/tools/datree/default.nix
View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-zoFWiqrKdTh6XDrKx2mQe3NqK03so6MqIX0sSQHQa5U=";
};
vendorSha256 = "sha256-SlU1lJcKCDkoihU19c8iky3Bj5ZZD9E9W0QQX9fBT1c=";
vendorSha256 = "sha256-HaOgRbF3gMsl6PufdB5IZ2sLunvPo4GeObLb7DRSD0o=";
ldflags = [
"-s"

2
pkgs/development/tools/dyff/default.nix
View file

@ -11,7 +11,7 @@ buildGoModule rec {
sha256 = "sha256-0/pn+Ld7o4gBnddA+uMzBhrFnov1XoqpRGkTT/vNH3Y=";
};
vendorSha256 = "sha256-9FkRazgZlzwvimsbqWCYJLxwRRlHa0i/jPPuf+AGSOA=";
vendorSha256 = "sha256-ITg+qEdk4/mWytzBbybYEc2Tw4ibvGUOB/FMu475dSk=";
subPackages = [
"cmd/dyff"

2
pkgs/misc/logging/beats/7.x.nix
View file

@ -11,7 +11,7 @@ let beat = package: extraArgs: buildGoModule (rec {
sha256 = "sha256-9Jl5Xo1iKdOY9ZE5JXKSL4ee+NdsN3KCY2dDYuxlzPI=";
};
vendorSha256 = "sha256-tyxyM7RsTHTVVxc9gagPsSvFRaWGTmobKzyv9RODXBk=";
vendorSha256 = "sha256-fiqCccS2IAnTzfPfUqY0Wy9uRUuiYNtiVvpAFZJOPVI=";
subPackages = [ package ];

12
pkgs/servers/nextcloud/default.nix
View file

@ -46,18 +46,18 @@ in {
'';
nextcloud21 = generic {
version = "21.0.7";
sha256 = "sha256-WZMhWW613q5c6grR/dzVSCKJKru7XPtRoxgBhi8VE7c=";
version = "21.0.8";
sha256 = "00c37wp6fsnpm40bbhk6r6xycacfa5zk7arzc3i4xmhm89cyvm6z";
};
nextcloud22 = generic {
version = "22.2.3";
sha256 = "sha256-ZqKaakkHOMCr7bZ3y2jHyR+rqz5kGaPJnYtAaJnrlCo=";
version = "22.2.4";
sha256 = "0vnf2j1hz0d7lxby73r2mq2rjm72nq55xajzm8sipj6wlbys15zl";
};
nextcloud23 = generic {
version = "23.0.0";
sha256 = "sha256-w3WSq8O2XI/ShFkoGiT0FLh69S/IwuqXm+P5vnXQGiw=";
version = "23.0.1";
sha256 = "047pnkp49rf0a9gl03dwkkdgzmdsf88m79mzq04bwmgkb3a3qxay";
};
# tip: get she sha with:
# curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256'

4
pkgs/servers/web-apps/wiki-js/default.nix
View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "wiki-js";
version = "2.5.272";
version = "2.5.274";
src = fetchurl {
url = "https://github.com/Requarks/wiki/releases/download/${version}/${pname}.tar.gz";
sha256 = "sha256-30thDjmjc24tChgih0FZyIUU6/aKKl4MAD5yqn0yYa4=";
sha256 = "sha256-l3mvlC/DIJ2W3xLdwSV2gCRDdNGcg6OUW4e1IOihlyQ=";
};
sourceRoot = ".";

4
pkgs/tools/security/exploitdb/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "exploitdb";
version = "2022-01-26";
version = "2022-01-29";
src = fetchFromGitHub {
owner = "offensive-security";
repo = pname;
rev = version;
sha256 = "sha256-5WdAh4YFNLOF8h8f0pN6GHdoyASf/3fN345Mp9b1Cfg=";
sha256 = "sha256-yIZFlj8WtKU3STdPXsZ+s3hoq/zBvqA64D6GoyUFXvE=";
};
nativeBuildInputs = [ makeWrapper ];

2
pkgs/tools/security/naabu/default.nix
View file

@ -15,7 +15,7 @@ buildGoModule rec {
sha256 = "0kbpfb1ryfqy8a54ksm7zm8pqy8f4adh06jc1ccpdxks3k0rygid";
};
vendorSha256 = "0kkkx8p0r04gg3pp0qy835afaxnqxjggnr7q7l6azdvg8qvgxfms";
vendorSha256 = "17x60x68hd2jm84xw5mgsclv6phn6ajkp92kpcz013vlkcdaqrxs";
buildInputs = [
libpcap

32
pkgs/top-level/all-packages.nix
View file

@ -2165,7 +2165,9 @@ with pkgs;
packetbeat6
journalbeat6;
inherit (callPackages ../misc/logging/beats/7.x.nix { })
inherit (callPackages ../misc/logging/beats/7.x.nix {
buildGoModule = buildGo117Module;
})
filebeat7
heartbeat7
metricbeat7
@ -2722,7 +2724,9 @@ with pkgs;
dapr-cli = callPackage ../development/tools/dapr/cli {};
dasel = callPackage ../applications/misc/dasel { };
dasel = callPackage ../applications/misc/dasel {
buildGoModule = buildGo117Module;
};
dasher = callPackage ../applications/accessibility/dasher { };
@ -7212,7 +7216,9 @@ with pkgs;
mxt-app = callPackage ../misc/mxt-app { };
naabu = callPackage ../tools/security/naabu { };
naabu = callPackage ../tools/security/naabu {
buildGoModule = buildGo117Module;
};
nagstamon = callPackage ../tools/misc/nagstamon {
pythonPackages = python3Packages;
@ -7230,7 +7236,9 @@ with pkgs;
ncrack = callPackage ../tools/security/ncrack { };
nerdctl = callPackage ../applications/networking/cluster/nerdctl { };
nerdctl = callPackage ../applications/networking/cluster/nerdctl {
buildGoModule = buildGo117Module;
};
netdata = callPackage ../tools/system/netdata {
inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit;
@ -14619,7 +14627,9 @@ with pkgs;
cli11 = callPackage ../development/tools/misc/cli11 { };
datree = callPackage ../development/tools/datree { };
datree = callPackage ../development/tools/datree {
buildGoModule = buildGo117Module;
};
dcadec = callPackage ../development/tools/dcadec { };
@ -14994,7 +15004,9 @@ with pkgs;
jpexs = callPackage ../development/tools/jpexs { };
k0sctl = callPackage ../applications/networking/cluster/k0sctl { };
k0sctl = callPackage ../applications/networking/cluster/k0sctl {
buildGoModule = buildGo117Module;
};
k2tf = callPackage ../development/tools/misc/k2tf { };
@ -25109,7 +25121,9 @@ with pkgs;
inherit (gnome2) libgnomeui;
};
dyff = callPackage ../development/tools/dyff {};
dyff = callPackage ../development/tools/dyff {
buildGoModule = buildGo117Module;
};
dwl = callPackage ../applications/window-managers/dwl {
wlroots = wlroots_0_14;
@ -26797,7 +26811,9 @@ with pkgs;
kubelogin-oidc = callPackage ../applications/networking/cluster/kubelogin-oidc { };
k9s = callPackage ../applications/networking/cluster/k9s { };
k9s = callPackage ../applications/networking/cluster/k9s {
buildGoModule = buildGo117Module;
};
pgo-client = callPackage ../applications/networking/cluster/pgo-client { };