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

2016-05-02 22:58:02 +00:00
parent 0fdde5efd0 94520a25ad
commit c92bca56f8
867 changed files with 75282 additions and 27025 deletions
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt4}:
+{ stdenv, fetchurl, qt4 }:

 stdenv.mkDerivation {
  name = "qtscriptgenerator-0.1.0";