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

Merge remote-tracking branch 'origin/master' into staging.

Browse Source 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
This commit is contained in:
Peter Simons
2014-08-04 16:51:47 +02:00
parent 9253a95f6b b35770818d
commit 2d326e5032
1261 changed files with 4697 additions and 3318 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/backup/btar/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Tar-compatible block-based archiver";
license = "GPLv3+";
license = stdenv.lib.licenses.gpl3Plus;
homepage = http://viric.name/cgi-bin/btar;
platforms = with stdenv.lib.platforms; all;
maintainers = with stdenv.lib.maintainers; [viric];
pkgs/tools/backup/chunksync/default.nix
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
meta = {
description = "Space-efficient incremental backups of large files or block devices";
homepage = "http://chunksync.florz.de/";
license = "GPLv2";
license = stdenv.lib.licenses.gpl2;
platforms = with stdenv.lib.platforms; linux;
};
}
pkgs/tools/backup/duplicity/default.nix
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
meta = {
description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
homepage = "http://www.nongnu.org/duplicity";
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric simons];
platforms = with stdenv.lib.platforms; linux;
};
pkgs/tools/backup/httrack/default.nix
+1 -1
View File
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://www.httrack.com";
description = "Easy-to-use offline browser utility";
license = "GPL";
license = stdenv.lib.licenses.gpl3;
};
}
pkgs/tools/backup/rdiff-backup/default.nix
+1 -1
View File
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
meta = {
description = "backup system trying to combine best a mirror and an incremental backup system";
homepage = http://rdiff-backup.nongnu.org/;
license = "GPL-2";
license = stdenv.lib.licenses.gpl2;
maintainers = with stdenv.lib.maintainers; [ the-kenny ];
};
}
pkgs/tools/backup/rsnapshot/default.nix
+1 -1
View File
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
meta = {
description = "A filesystem snapshot utility for making backups of local and remote systems";
homepage = http://rsnapshot.org/;
license = "GPLv2+";
license = stdenv.lib.licenses.gpl2Plus;
};
}