Merge branch 'master' into staging

2015-03-29 14:25:48 -07:00
parent aeb0b610db eb22e54243
commit fa2e5b25ba
105 changed files with 993 additions and 956 deletions
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:

 stdenv.mkDerivation rec {
  name = "lbzip2-2.5";