JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-12-12 12:01:21 +00:00 committed by GitHub
commit 4e4a3fae8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 80 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/network-filesystems/glusterfs.nix
View File

@ -187,7 +187,7 @@ in
wantedBy = [ "multi-user.target" ];
after = [ "syslog.target" "network.target" ];
after = [ "network.target" ];
preStart = ''
install -m 0755 -d /var/log/glusterfs

6
nixos/tests/kubernetes/default.nix
View File

@ -10,6 +10,8 @@ in
{
dns-single-node = dns.singlenode.test;
dns-multi-node = dns.multinode.test;
rbac-single-node = rbac.singlenode.test;
rbac-multi-node = rbac.multinode.test;
# timed out: https://hydra.nixos.org/build/160710933
#rbac-single-node = rbac.singlenode.test;
# timed out: https://hydra.nixos.org/build/160711286
#rbac-multi-node = rbac.multinode.test;
}

41
pkgs/applications/virtualization/colima/default.nix Normal file
View File

@ -0,0 +1,41 @@
{ lib
, buildGoModule
, fetchFromGitHub
, installShellFiles
, lima
, makeWrapper
}:
buildGoModule rec {
pname = "colima";
version = "0.2.2";
src = fetchFromGitHub {
owner = "abiosoft";
repo = pname;
rev = "v${version}";
sha256 = "sha256-vWNkYsT2XF+oMOQ3pb1+/a207js8B+EmVanRQrYE/2A=";
};
nativeBuildInputs = [ installShellFiles makeWrapper ];
vendorSha256 = "sha256-F1ym88JrJWzsBg89Y1ufH4oefIRBwTGOw72BrjtpvBw=";
postInstall = ''
wrapProgram $out/bin/colima \
--prefix PATH : ${lib.makeBinPath [ lima ]}
installShellCompletion --cmd colima \
--bash <($out/bin/colima completion bash) \
--fish <($out/bin/colima completion fish) \
--zsh <($out/bin/colima completion zsh)
'';
meta = with lib; {
description = "Container runtimes on MacOS with minimal setup";
homepage = "https://github.com/abiosoft/colima";
license = licenses.mit;
platforms = platforms.darwin;
maintainers = with maintainers; [ aaschmid ];
};
}

4
pkgs/desktops/cinnamon/xviewer/default.nix
View File

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "xviewer";
version = "3.2.1";
version = "3.2.2";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-9SUpJ76s3gf1852xnJh3Sz6SeuKhcGHtv+woiXztCS4=";
sha256 = "sha256-FFRms4yh7TQ/O3ee7igeIslimSWLhue3BE1xCrJ3NQ4=";
};
nativeBuildInputs = [

4
pkgs/development/libraries/armadillo/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "armadillo";
version = "10.6.2";
version = "10.7.4";
src = fetchurl {
url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
sha256 = "sha256-KoA9b4921AfbnBXtw4lJZSOMjliflMyQeoNz7pRXKKg=";
sha256 = "sha256-LBsyxbJZsF40vC3N4cq1ic/LtYF5xyqTxdquoeOVBlI=";
};
nativeBuildInputs = [ cmake ];

4
pkgs/development/python-modules/casbin/default.nix
View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "casbin";
version = "1.13.0";
version = "1.15.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = pname;
repo = "pycasbin";
rev = "v${version}";
sha256 = "1qraxp0nij5412pvz9lvysb38px551arl29q06pd0z6rg1d8gdkx";
sha256 = "05jg8qm0ix02qvcjqcfalp15j22hzlf9wfdnhrll57bnwgk4kkf8";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/deezer-python/default.nix
View File

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "deezer-python";
version = "4.2.0";
version = "4.2.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "browniebroke";
repo = pname;
rev = "v${version}";
sha256 = "0wljf3ri8jcg4df6m61k8s5nm9rncwa8c46pfv901bc737kyslpl";
sha256 = "0gl0l7x9zqfkz3l4jfz8rb956lqj3vx1aghric36izwzl6wyj6h5";
};
nativeBuildInputs = [

6
pkgs/development/tools/rust/cargo-cache/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-cache";
version = "0.6.3";
version = "0.7.0";
src = fetchFromGitHub {
owner = "matthiaskrgr";
repo = pname;
rev = version;
sha256 = "sha256-y6rvdY9511XScxLWPrH9aUFgSmRYmGqKE56MPBTH9OM=";
sha256 = "sha256-MPU+hmYfmWftVEkdT/sZx9ESgCPTb7m4lEnYf5bOSYU=";
};
cargoSha256 = "sha256-H6MBAXrKu4hZwx3lGHN6YMuYzeb21Zq0tVlF/lsQmLI=";
cargoSha256 = "sha256-6Ffgg5/B1IFnTlSjzhAsnhxz8jBcgk01RIkwgLqlsvc=";
buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];

4
pkgs/games/xsnow/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "xsnow";
version = "3.3.2";
version = "3.3.6";
src = fetchurl {
url = "https://ratrabbit.nl/downloads/xsnow/xsnow-${version}.tar.gz";
sha256 = "sha256-S9pyoDehOUr6Q/PjqH3/tkiyYpn6kHkYnuOQ3FhL44I=";
sha256 = "sha256-rTJO1btS1VBHatj9Yr2R6vZBUPQtCB1Aa6AD6IzwuLg=";
};
nativeBuildInputs = [ pkg-config ];

12
pkgs/tools/filesystems/glusterfs/default.nix
View File

@ -1,8 +1,8 @@
{lib, stdenv, fetchFromGitHub, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
{lib, stdenv, fetchFromGitHub, fuse, bison, flex, openssl, python3, ncurses, readline,
autoconf, automake, libtool, pkg-config, zlib, libaio, libxml2, acl, sqlite,
liburcu, liburing, attr, makeWrapper, coreutils, gnused, gnugrep, which,
openssh, gawk, findutils, util-linux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
rsync, glibc, rpcsvc-proto, libtirpc
rsync, glibc, rpcsvc-proto, libtirpc, gperftools
}:
let
# NOTE: On each glusterfs release, it should be checked if gluster added
@ -14,9 +14,9 @@ let
# can help with finding new Python scripts.
buildInputs = [
fuse bison flex_2_5_35 openssl ncurses readline
fuse bison flex openssl ncurses readline
autoconf automake libtool pkg-config zlib libaio libxml2
acl sqlite liburcu attr makeWrapper util-linux libtirpc
acl sqlite liburcu attr makeWrapper util-linux libtirpc gperftools
liburing
(python3.withPackages (pkgs: [
pkgs.flask
@ -55,13 +55,13 @@ let
];
in stdenv.mkDerivation rec {
pname = "glusterfs";
version = "9.4";
version = "10.0";
src = fetchFromGitHub {
owner = "gluster";
repo = pname;
rev = "v${version}";
sha256 = "0ybs0dm7jskmfnmbg5fj8wi2aapbrwn4gbrx8ix6d8dzcl3pv78k";
sha256 = "sha256-n6HdXs5kLbEI8Gaw2KBtO3i8hhadb+MsshUve/DOYg0=";
};
inherit buildInputs propagatedBuildInputs;

4
pkgs/tools/networking/zap/default.nix
View File

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "zap";
version = "2.11.0";
version = "2.11.1";
src = fetchurl {
url = "https://github.com/zaproxy/zaproxy/releases/download/v${version}/ZAP_${version}_Linux.tar.gz";
sha256 = "sha256-wr64T3+ps5r2V72z4NDbqWQlJX6kjg6LIu7szY1VaB4=";
sha256 = "0b1qqrjm4m76djy0az9hnz3rqpz1qkql4faqmi7gkx33b1p6d0sz";
};
buildInputs = [ jre ];

17
pkgs/tools/security/dnsrecon/default.nix
View File

@ -5,19 +5,20 @@
python3.pkgs.buildPythonApplication rec {
pname = "dnsrecon";
version = "0.10.1";
version = "1.0.0";
format = "other";
src = fetchFromGitHub {
owner = "darkoperator";
repo = pname;
rev = version;
sha256 = "1ysf8wx287psfk89r0i2vgnrjvxdj44s6nhf6sva59jbwvr9lghy";
sha256 = "sha256-VRO5ugr/+iZh+hh3tVs/JNAr7GXao/HK43O3FlkbcSM=";
};
format = "other";
pythonPath = with python3.pkgs; [
dnspython netaddr lxml
propagatedBuildInputs = with python3.pkgs; [
dnspython
netaddr
lxml
];
postPatch = ''
@ -36,11 +37,11 @@ python3.pkgs.buildPythonApplication rec {
runHook postInstall
'';
meta = with lib; {
description = "DNS Enumeration Script";
description = "DNS Enumeration script";
homepage = "https://github.com/darkoperator/dnsrecon";
license = licenses.gpl2Only;
platforms = platforms.all;
maintainers = with maintainers; [ c0bw3b fab ];
};
}

4
pkgs/tools/system/gdu/default.nix
View File

@ -7,13 +7,13 @@
buildGoModule rec {
pname = "gdu";
version = "5.12.0";
version = "5.12.1";
src = fetchFromGitHub {
owner = "dundee";
repo = pname;
rev = "v${version}";
sha256 = "sha256-GcipzV6TgJLXY5RgzFssaInBFIFORKr6wcZB6fD16OY=";
sha256 = "sha256-pXHMNyebUkHEZvUWtDkyp5Fqk07GA5sd+254fls8PjU=";
};
vendorSha256 = "0ls0pw1m6hy203cdkmp9847h2fmvc4hjkv5x2v6r7516cqbs25ac";

2
pkgs/top-level/all-packages.nix
View File

@ -32520,6 +32520,8 @@ with pkgs;
idsk = callPackage ../tools/filesystems/idsk { };
colima = callPackage ../applications/virtualization/colima {};
lima = callPackage ../applications/virtualization/lima {};
logtop = callPackage ../tools/misc/logtop { };