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

Merge branch 'master' into closure-size

Browse Source
This commit is contained in:
Luca Bruno
2015-11-29 16:50:26 +01:00
parent 07a0204282 a9056371a0
commit 920b1d3591
241 changed files with 13028 additions and 1473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/data/documentation/man-pages/default.nix
View File

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1lqdzw6n3rqhd097lk5w16jcjhwfqs5zvi42hsbk3p92smswpaj8";
};
makeFlags = "MANDIR=$(out)/share/man";
makeFlags = [ "MANDIR=$(out)/share/man" ];
meta = with stdenv.lib; {
inherit version;

4
pkgs/data/fonts/font-awesome-ttf/default.nix
View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
name = "font-awesome-4.4.0";
name = "font-awesome-4.5.0";
src = fetchurl {
url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip";
sha256 = "1k7ff71pcp2qrnqj4yzrjg96m7yma9r58wdk68sqb93q2kq9fp3i";
sha256 = "1lvxs4isrk80cczq6nrxksvqxs04k13i23i6c2l5vmfs2ndjsdm2";
};
buildCommand = ''