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

Merge branch 'staging' into v/modular

Browse Source 
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
This commit is contained in:
Vladimír Čunát
2014-08-31 12:23:18 +02:00
parent 4c3e6a4675 acba6b4da2
commit 8da52a642a
767 changed files with 19114 additions and 13711 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/filesystems/chunkfs/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "(Un)ChunkFS is a pair of FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa.";
description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa";
homepage = "http://chunkfs.florz.de/";
license = stdenv.lib.licenses.gpl2;
platforms = with stdenv.lib.platforms; linux;
pkgs/tools/filesystems/encfs/default.nix
+1 -1
View File
@@ -14,6 +14,6 @@ stdenv.mkDerivation {
meta = {
homepage = http://www.arg0.net/encfs;
description = "EncFS provides an encrypted filesystem in user-space via FUSE";
description = "Provides an encrypted filesystem in user-space via FUSE";
};
}
pkgs/tools/filesystems/mtools/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://www.gnu.org/software/mtools/;
description = "GNU mtools, utilities to access MS-DOS disks";
description = "Utilities to access MS-DOS disks";
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
maintainers = [ ];
};
pkgs/tools/filesystems/svnfs/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
NIX_LDFLAGS="-lsvn_client-1";
meta = {
description = "SvnFs is a filesystem written using FUSE for accessing Subversion repositories";
description = "FUSE filesystem for accessing Subversion repositories";
homepage = http://www.jmadden.eu/index.php/svnfs/;
license = stdenv.lib.licenses.gpl2;
maintainers = [stdenv.lib.maintainers.marcweber];
pkgs/tools/filesystems/wdfs/default.nix
+1 -1
View File
@@ -10,6 +10,6 @@ stdenv.mkDerivation rec
buildInputs = [fuse glib neon pkgconfig];
meta = {
homepage = "http://noedler.de/projekte/wdfs/";
description = "wdfs a user-space filesystem that allows to mount a webdav share";
description = "User-space filesystem that allows to mount a webdav share";
};
}
pkgs/tools/filesystems/yandex-disk/default.nix
+3
View File
@@ -1,4 +1,7 @@
{ stdenv, fetchurl, writeText, zlib, rpm, cpio, patchelf, which }:
assert stdenv.isLinux;
let
p = if stdenv.is64bit then {
arch = "x86_64";