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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát
2018-11-26 10:28:00 +01:00
parent e41154d1ab 4fef4fbb4b
commit a5de78b7d7
198 changed files with 2486 additions and 1200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/system/dfc/default.nix
View File

@@ -1,21 +1,21 @@
{stdenv, fetchurl, cmake, gettext}:
stdenv.mkDerivation rec {
name = "dfc-3.0.5";
name = "dfc-${version}";
version = "3.1.1";
src = fetchurl {
url = "https://projects.gw-computing.net/attachments/download/467/${name}.tar.gz";
sha256 = "0yl5dl1nydinji71zz37c7myg3vg9jzxq89rcjqlfcy5dcfpm51w";
url = "https://projects.gw-computing.net/attachments/download/615/${name}.tar.gz";
sha256 = "0m1fd7l85ckb7bq4c5c3g257bkjglm8gq7x42pkmpp87fkknc94n";
};
buildInputs = [ cmake gettext ];
nativeBuildInputs = [ cmake gettext ];
meta = {
homepage = https://projects.gw-computing.net/projects/dfc;
description = "Displays file system space usage using graphs and colors";
license="free";
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [qknight];
platforms = with stdenv.lib.platforms; all;
platforms = stdenv.lib.platforms.all;
};
}

2
pkgs/tools/system/hardlink/default.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Consolidate duplicate files via hardlinks";
homepage = https://pagure.io/hardlink;
repositories.git = http://src.fedoraproject.org/cgit/rpms/hardlink.git;
repositories.git = https://src.fedoraproject.org/cgit/rpms/hardlink.git;
license = licenses.gpl2Plus;
platforms = platforms.unix;
};

2
pkgs/tools/system/ipmiutil/default.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ raskin ];
platforms = platforms.linux;
license = licenses.bsd3;
downloadPage = "http://sourceforge.net/projects/ipmiutil/files/ipmiutil/";
downloadPage = "https://sourceforge.net/projects/ipmiutil/files/ipmiutil/";
inherit version;
};
}

2
pkgs/tools/system/ipmiutil/default.upstream
View File

@@ -1,4 +1,4 @@
url http://sourceforge.net/projects/ipmiutil/files/
url https://sourceforge.net/projects/ipmiutil/files/
SF_version_tarball
SF_redirect
minimize_overwrite

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

@@ -7,7 +7,7 @@ let
dbrev = "4548";
drivedbBranch = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}_DRIVEDB";
driverdb = fetchurl {
url = "http://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw";
url = "https://sourceforge.net/p/smartmontools/code/${dbrev}/tree/branches/${drivedbBranch}/smartmontools/drivedb.h?format=raw";
sha256 = "0nwk4ir0c40b01frqm7a0lvljh5k9yhslc3j4485zjsx3v5w269f";
name = "smartmontools-drivedb.h";
};
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Tools for monitoring the health of hard drives";
homepage = http://smartmontools.sourceforge.net/;
homepage = https://www.smartmontools.org/;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ peti ];
platforms = with platforms; linux ++ darwin;