Merge branch 'master' into staging

2015-04-10 07:45:38 -05:00
parent 9863db756f 37f7e152d5
commit 88918e10e9
156 changed files with 2541 additions and 1824 deletions
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, valgrind }:
+{ stdenv, fetchFromGitHub, valgrind }:

+let version = "128"; in
 stdenv.mkDerivation rec {
-  version = "128";
  name = "lz4-${version}";

-  src = fetchurl {
-    url = "https://github.com/Cyan4973/lz4/archive/r${version}.tar.gz";
-    sha256 = "1lf7a0gqm2q7p1qs28lmajmls3pwfk2p0w3hljjlmshbkndaj26b";
+  src = fetchFromGitHub {
+    sha256 = "00jrnic2jddj81av8jjipf4rdkx6x6cdf8zpsz3mp5kbmqzd0h9a";
+    rev = "r${version}";
+    repo = "lz4";
+    owner = "Cyan4973";
  };

  # valgrind is required only by `make test`