jolheiser/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] 2020-12-12 18:15:37 +00:00 committed by GitHub
commit 553a9c6605
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/installer/cd-dvd/sd-image.nix
View File

@ -223,7 +223,7 @@ in
# Figure out device names for the boot device and root filesystem.
rootPart=$(${pkgs.util-linux}/bin/findmnt -n -o SOURCE /)
bootDevice=$(lsblk -npo PKNAME $rootPart)
partNum=$(lsblk -npo MAJ:MIN $rootPart | awk -F: '{print $2}')
partNum=$(lsblk -npo MAJ:MIN $rootPart | ${pkgs.gawk}/bin/awk -F: '{print $2}')
# Resize the root partition and the filesystem to fit the disk
echo ",+," | sfdisk -N$partNum --no-reread $bootDevice

1
nixos/modules/services/networking/tinc.nix
View File

@ -168,6 +168,7 @@ in
Type = "simple";
Restart = "always";
RestartSec = "3";
ExecReload = mkIf (versionAtLeast (getVersion data.package) "1.1pre") "${data.package}/bin/tinc -n ${network} reload";
ExecStart = "${data.package}/bin/tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}";
};
preStart = ''

4
pkgs/applications/blockchains/monero/default.nix
View File

@ -17,13 +17,13 @@ assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
stdenv.mkDerivation rec {
pname = "monero";
version = "0.17.1.5";
version = "0.17.1.6";
src = fetchFromGitHub {
owner = "monero-project";
repo = "monero";
rev = "v${version}";
sha256 = "0yy9n2qng02j314h8fh5n0mcy6vpdks0yk4d8ifn8hj03f3g2c8b";
sha256 = "0b6zyr3mzqvcxf48i2g45gr649x6nhppik5598jsvg0z7i2hxb9q";
fetchSubmodules = true;
};

6
pkgs/applications/networking/cluster/helm/default.nix
View File

@ -2,15 +2,15 @@
buildGoModule rec {
pname = "helm";
version = "3.4.1";
version = "3.4.2";
src = fetchFromGitHub {
owner = "helm";
repo = "helm";
rev = "v${version}";
sha256 = "13w0s11319qg9mmmxc24mlj0hrp0r529p3ny4gfzsl0vn3qzd6i2";
sha256 = "17bb0f2w0qn6zq5isskckwqlscqig2d6pra3f7mfwilnckg1lj9s";
};
vendorSha256 = "0x3dcvnrl7cs8faaiq9ybfgg0lkac5ppf61i724cja270nmpmazl";
vendorSha256 = "0ycp0i26rf3c96i4nqcbh7rb6i6lk62hljcsgsjyggq3pj3gpb4x";
doCheck = false;

1
pkgs/development/libraries/intel-gmmlib/default.nix
View File

@ -20,6 +20,5 @@ stdenv.mkDerivation rec {
license = licenses.mit;
description = "Intel Graphics Memory Management Library";
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ danieldk ];
};
}

2
pkgs/tools/misc/html-proofer/Gemfile.lock
View File

@ -6,7 +6,7 @@ GEM
ethon (0.12.0)
ffi (>= 1.3.0)
ffi (1.13.1)
html-proofer (3.17.4)
html-proofer (3.18.0)
addressable (~> 2.3)
mercenary (~> 0.3)
nokogumbo (~> 2.0)

4
pkgs/tools/misc/html-proofer/gemset.nix
View File

@ -37,10 +37,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wjwr7c19dr7rai44ypqghbakgav91h9swg88cddn7rxf7a6vl3b";
sha256 = "1icjr9hg8gk1dsy9gnhffkamh4d8yfkmqa4kfzdpbnvr50qvfmwz";
type = "gem";
};
version = "3.17.4";
version = "3.18.0";
};
mercenary = {
groups = ["default"];

2
pkgs/tools/networking/tinc/pre.nix
View File

@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
homepage="http://www.tinc-vpn.org/";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ fpletz lassulus ];
maintainers = with maintainers; [ fpletz lassulus mic92 ];
};
}