Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-06-10 09:27:04 +00:00
parent 2a5e64b69c 656c48f141
commit 8031cba2ab
1116 changed files with 79612 additions and 24052 deletions
@@ -8,7 +8,7 @@ let
    name = "${baseName}-${version}";
    url = "https://github.com/qsantos/qrcode";
    rev = "2843cbada3b768f60ee1ae13c65160083558cc03";
-    sha256 = "0x321xhzxk6ldvpr2090w14khj9n2gfay9db5vvvli16affpcrvb";
+    sha256 = "1qli0b62yngqj66v6vdqqgcysy3q3fr5vwpf7yf0d9a0dg862x8a";
  };
  buildInputs = [
  ];