public/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]
2021-01-31 00:46:33 +00:00
committed by GitHub
parent 048e0d3f87 45aaf5e0c8
commit 81337921f5
73 changed files with 424 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/ipset/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "ipset";
version = "7.9";
version = "7.10";
src = fetchurl {
url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2";
sha256 = "02mkp7vmsh609dcp02xi290sxmsgq2fsch3875dxkwfxkrl16p5p";
sha256 = "sha256-skkGukPi/jIr1BhjR2dh10mkvd9c5MImW6BLA7x+nPY=";
};
nativeBuildInputs = [ pkg-config ];
pkgs/os-specific/linux/speedometer/default.nix
+2 -2
View File
@@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec {
version = "2.8";
src = fetchurl {
url = "http://excess.org/speedometer/speedometer-${version}.tar.gz";
url = "https://excess.org/speedometer/speedometer-${version}.tar.gz";
sha256 = "060bikv3gwr203jbdmvawsfhc0yq0bg1m42dk8czx1nqvwvgv6fm";
};
@@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
meta = with lib; {
description = "Measure and display the rate of data across a network connection or data being stored in a file";
homepage = "http://excess.org/speedometer/";
homepage = "https://excess.org/speedometer/";
license = licenses.lgpl21Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ Baughn ];