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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-07-11 08:59:54 +02:00
parent bb9f138f00 c87c474b17
commit ae8eee9c3f
601 changed files with 11303 additions and 6590 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/colorls/Gemfile.lock
+1 -1
View File
@@ -2,7 +2,7 @@ GEM
remote: https://rubygems.org/
specs:
clocale (0.0.4)
colorls (1.3.3)
colorls (1.4.2)
clocale (~> 0)
filesize (~> 0)
manpages (~> 0)
pkgs/tools/system/colorls/gemset.nix
+2 -2
View File
@@ -15,10 +15,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "07rvm3g65slnqzal718qwfmgsjnkysx00jn8dnv96317yx0mxfx6";
sha256 = "0sw377wklld5zn1la0smxc2bg4rph2xf9d0h3zmxhmds06lb92db";
type = "gem";
};
version = "1.3.3";
version = "1.4.2";
};
filesize = {
groups = ["default"];
pkgs/tools/system/facter/default.nix
+5 -5
View File
@@ -11,15 +11,15 @@ stdenv.mkDerivation rec {
owner = "puppetlabs";
};
CXXFLAGS = "-fpermissive -Wno-error=catch-value";
NIX_LDFLAGS = "-lblkid";
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-fpermissive -Wno-error=catch-value";
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lblkid";
cmakeFlags = [
"-DFACTER_RUBY=${ruby}/lib/libruby.so"
"-DFACTER_RUBY=${ruby}/lib/libruby${stdenv.hostPlatform.extensions.sharedLibrary}"
"-DRUBY_LIB_INSTALL=${placeholder "out"}/lib/ruby"
];
NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-copy";
NIX_CFLAGS_COMPILE = "-Wno-error";
nativeBuildInputs = [ cmake ];
buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ];
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
description = "A system inventory tool";
license = licenses.asl20;
maintainers = [ maintainers.womfoo ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}
pkgs/tools/system/monit/default.nix
+2 -2
View File
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
name = "monit-5.26.0";
name = "monit-5.27.0";
src = fetchurl {
url = "${meta.homepage}dist/${name}.tar.gz";
sha256 = "1hpk0agxi7g9vmfqvrwr5wk7pr52wdlv3vs0j3l2p6mgldl4bz47";
sha256 = "197w59wkg6izlj6p7xbx0n6ksvm6pym9pzh24nakl6agcbpxxh6q";
};
nativeBuildInputs = [ bison flex ];
pkgs/tools/system/psensor/default.nix
+2 -2
View File
@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "psensor";
version = "1.2.0";
version = "1.2.1";
src = fetchurl {
url = "https://wpitchoune.net/psensor/files/psensor-${version}.tar.gz";
sha256 = "1smbidbby4rh14jnh9kn7y64qf486aqnmyxcgacjvkz27cqqnw4r";
sha256 = "1ark901va79gfq5p8h8dqypjgm3f8crmj37520q3slwz2rfphkq8";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
pkgs/tools/system/rsyslog/default.nix
+2 -2
View File
@@ -14,11 +14,11 @@ let
in
stdenv.mkDerivation rec {
pname = "rsyslog";
version = "8.2004.0";
version = "8.2006.0";
src = fetchurl {
url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";
sha256 = "1n97kx6cyyzd4zh6q01fyqi2wq1ah68h95kdc109m1zhfnvxghsz";
sha256 = "15wfhw2nmpiyjpp82jxqgcjy7wgbc2fswk5g6rbdqbvghrj9wn6r";
};
#patches = [ ./fix-gnutls-detection.patch ];
pkgs/tools/system/s-tui/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
python3Packages.buildPythonPackage rec {
pname = "s-tui";
version = "1.0.0";
version = "1.0.1";
src = python3Packages.fetchPypi {
inherit pname version;
sha256 = "0r5yhlsi5xiy7ii1w4kqkaxz9069v5bbfwi3x3xnxhk51yjfgr8n";
sha256 = "1gqrb2xxii43j7kszy7kvv4f6hr8ac4p0m9q8i1xs5fhsqcx186i";
};
propagatedBuildInputs = with python3Packages; [
pkgs/tools/system/stress-ng/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "stress-ng";
version = "0.11.10";
version = "0.11.14";
src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
sha256 = "0x46shnwllv5knpbxj1vj2aqmxgnfhz582crlacwsinc22n1j18i";
sha256 = "0sqka2ns9xqma9wa67in4vrd15q0rz62gblmzniq5i4xppykc55j";
};
postPatch = ''
pkgs/tools/system/syslog-ng/default.nix
+2 -2
View File
@@ -7,11 +7,11 @@
stdenv.mkDerivation rec {
pname = "syslog-ng";
version = "3.27.1";
version = "3.28.1";
src = fetchurl {
url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "1cv1kn4jpqyhlhx8w5v557jyc4b2ly2dgkv1hbb8vzgpjwy66k65";
sha256 = "1s56q8k69sdrqsh3y9lr4di01fqw7xb49wr0dz75jmz084yg8kmg";
};
nativeBuildInputs = [ pkgconfig which ];
pkgs/tools/system/thermald/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "thermald";
version = "2.1";
version = "2.2";
src = fetchFromGitHub {
owner = "intel";
repo = "thermal_daemon";
rev = "v${version}";
sha256 = "1k8svy03k57ld6p5d29i0ccrd1gics6kbyx1bkfmw9fh1bbljyf7";
sha256 = "1nrhv3bypyc48h9smj5cpq63rawm6vqyg3cwkhpz69rgjnf1283m";
};
nativeBuildInputs = [ pkgconfig ];
pkgs/tools/system/zenith/default.nix
+3 -3
View File
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "zenith";
version = "0.9.0";
version = "0.10.0";
src = fetchFromGitHub {
owner = "bvaisvil";
repo = pname;
rev = version;
sha256 = "1yfbr8zmcy7zp9s9cqv7qypj2vvhpq09r0398gr7ckjk6v70hhfg";
sha256 = "04nd5gq49y1k9xxrc9ll155k9j42ivscjzx405qyyxv7dpgyw131";
};
cargoSha256 = "1l4cjcpfghis983y31s54fzjppdnh3wa4anwi7bdsbyvqz3n3ywj";
cargoSha256 = "0ggpr2skl3d47y771npmbbqb9vga4y4iyry3qn0xj2hg9d7msf4l";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ];