Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2018-12-03 12:18:43 +01:00
388 changed files with 3023 additions and 1285 deletions
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
homepage = http://www.gnu.org/software/acct/;
homepage = https://www.gnu.org/software/acct/;
maintainers = with maintainers; [ pSub ];
platforms = platforms.linux;
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
second and successive copies.
'';
homepage = http://www.gnu.org/software/ddrescue/ddrescue.html;
homepage = https://www.gnu.org/software/ddrescue/ddrescue.html;
license = licenses.gpl3Plus;
+2 -2
View File
@@ -1,7 +1,7 @@
{ fetchurl, stdenv, parted, libuuid, gettext, guile }:
stdenv.mkDerivation rec {
name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see http://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html
name = "gnufdisk-2.0.0a"; # .0a1 seems broken, see https://lists.gnu.org/archive/html/bug-fdisk/2012-09/msg00000.html
src = fetchurl {
url = "mirror://gnu/fdisk/${name}.tar.gz";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl3Plus;
homepage = http://www.gnu.org/software/fdisk/;
homepage = https://www.gnu.org/software/fdisk/;
platforms = stdenv.lib.platforms.linux;
};
+2 -2
View File
@@ -30,8 +30,8 @@ stdenv.mkDerivation rec {
info.
'';
homepage = http://www.gnu.org/software/freeipmi/;
downloadPage = "http://www.gnu.org/software/freeipmi/download.html";
homepage = https://www.gnu.org/software/freeipmi/;
downloadPage = "https://www.gnu.org/software/freeipmi/download.html";
license = stdenv.lib.licenses.gpl3Plus;
+1 -1
View File
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
when jobs should be run. Mcron was written by Dale Mellor.
'';
homepage = http://www.gnu.org/software/mcron/;
homepage = https://www.gnu.org/software/mcron/;
license = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.unix;
+2 -2
View File
@@ -3,11 +3,11 @@
pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}";
pname = "s-tui";
version = "0.8.2";
version = "0.8.3";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "18bn0bpnrljx11gj95m2x5hlsnb8jkivlm6b1xx035ldgj1svgzh";
sha256 = "00lsh2v4i8rwfyjyxx5lijd6rnk9smcfffhzg5sv94ijpcnh216m";
};
propagatedBuildInputs = with pythonPackages; [
+1 -1
View File
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
meta = with stdenv.lib; {
homepage = http://ftp.gnu.org/gnu/which/;
homepage = https://www.gnu.org/software/which/;
platforms = platforms.all;
license = licenses.gpl3;
};