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

Merge branch 'origin/master' into stdenv-updates.

Browse Source 
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
This commit is contained in:
Peter Simons
2013-10-18 18:57:24 +02:00
parent ea6f711e8e 06d6c3ed5d
commit 6be8ad3392
1177 changed files with 57151 additions and 6093 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/filesystems/archivemount/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ pkgconfig fuse libarchive ];
meta = {
description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives.";
description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives";
license = "GPL2";
platforms = stdenv.lib.platforms.linux;
pkgs/tools/filesystems/nixpart/default.nix
+1
View File
@@ -24,5 +24,6 @@ in buildPythonPackage rec {
description = "NixOS storage manager/partitioner";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.aszlig ];
platforms = stdenv.lib.platforms.linux;
};
}