Merge remote-tracking branch 'origin/master' into staging.
Conflicts: pkgs/desktops/e18/enlightenment.nix
This commit is contained in:
Peter Simons
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
execution statistics.
|
||||
'';
|
||||
|
||||
license = "GPLv3+";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
homepage = http://www.gnu.org/software/acct/;
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
{ stdenv, fetchurl, pythonPackages, python }:
|
||||
|
||||
pythonPackages.buildPythonPackage rec {
|
||||
version = "1.6.1";
|
||||
version = "1.6.10";
|
||||
name = "ansible-${version}";
|
||||
namePrefix = "";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/ansible/ansible/archive/v${version}.tar.gz";
|
||||
sha256 = "1iz1q2h0zll4qsxk0pndc59knasw663kv53sm21q57qz7lf30q9z";
|
||||
sha256 = "0j133353skzb6ydrqqgfkzbkkj1zaibl1x8sgl0arnfma8qky1g1";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
||||
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
|
||||
|
||||
meta = {
|
||||
description = ''The classical Unix `at' job scheduling command'';
|
||||
license = "GPLv2+";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
homepage = http://packages.qa.debian.org/at;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "collectd-5.4.1";
|
||||
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://collectd.org/files/${name}.tar.bz2";
|
||||
sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm";
|
||||
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = http://www.gnu.org/software/ddrescue/ddrescue.html;
|
||||
|
||||
license = "GPLv3+";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = with stdenv.lib.maintainers; [ iElectric ];
|
||||
|
||||
@@ -27,4 +27,3 @@ stdenv.mkDerivation rec {
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = http://fakeroot.alioth.debian.org/;
|
||||
description = "Give a fake root environment through LD_PRELOAD";
|
||||
license = "GPLv2+";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description="A command scheduler with extended capabilities over cron and anacron";
|
||||
homepage = http://fcron.free.fr;
|
||||
license = "GPLv2";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
cfdisk. It uses GNU Parted.
|
||||
'';
|
||||
|
||||
license = "GPLv3+";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
homepage = http://www.gnu.org/software/fdisk/;
|
||||
|
||||
|
||||
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = "http://git.kernel.dk/?p=fio.git;a=summary";
|
||||
description = "Flexible IO Tester - an IO benchmark tool";
|
||||
license = "GPLv2";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = http://www.gnu.org/software/freeipmi/;
|
||||
|
||||
license = "GPLv3+";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
maintainers = with stdenv.lib.maintainers; [ raskin ];
|
||||
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
|
||||
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "A set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks";
|
||||
|
||||
license = "GPLv2";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
|
||||
homepage = http://www.rodsbooks.com/gdisk/;
|
||||
|
||||
@@ -32,4 +32,3 @@ stdenv.mkDerivation rec {
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
description = "A diff-capable 'du' browser";
|
||||
homepage = http://gt5.sourceforge.net/;
|
||||
license = "GPLv2+";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
homepage = http://idle3-tools.sourceforge.net/;
|
||||
description = "Tool to get/set the infamous idle3 timer in WD HDDs";
|
||||
license = "GPLv3";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
maintainers = with stdenv.lib.maintainers; [viric];
|
||||
platforms = with stdenv.lib.platforms; linux;
|
||||
};
|
||||
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
|
||||
Logcheck was part of the Abacus Project of security tools, but this version has been rewritten.
|
||||
'';
|
||||
homepage = http://logcheck.org;
|
||||
license = "GPLv2";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
|
||||
maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
|
||||
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
|
||||
meta = {
|
||||
homepage = https://fedorahosted.org/releases/l/o/logrotate/;
|
||||
description = "Rotates and compresses system logs";
|
||||
license = "GPLv2+";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
maintainers = [ stdenv.lib.maintainers.viric ];
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
|
||||
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = http://www.gnu.org/software/mcron/;
|
||||
|
||||
license = "GPLv3+";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
homepage = "http://www.rsyslog.com/";
|
||||
description = "Enhanced syslog implementation";
|
||||
license = "GPLv3";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
platforms = stdenv.lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
homepage = http://safecopy.sourceforge.net;
|
||||
|
||||
license = "GPLv2+";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
|
||||
|
||||
@@ -40,6 +40,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
meta = {
|
||||
homepage = http://viric.name/cgi-bin/storebrowse;
|
||||
license = "AGPLv3+";
|
||||
license = stdenv.lib.licenses.agpl3Plus;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -19,6 +19,6 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
homepage = "http://www.balabit.com/network-security/syslog-ng/";
|
||||
description = "Next-generation syslogd with advanced networking and filtering capabilities";
|
||||
license = "GPLv2";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
|
||||
meta = {
|
||||
homepage = "http://mama.indstate.edu/users/ice/tree/";
|
||||
description = "command to produce a depth indented directory listing";
|
||||
license = "GPLv2";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
|
||||
longDescription = ''
|
||||
Tree is a recursive directory listing command that produces a
|
||||
|
||||
Reference in New Issue
Block a user