Merge remote-tracking branch 'origin/gcc-6' into staging

2017-08-14 11:38:00 +02:00
parent 62dac1bdd9 505e94256e
commit 9eb901b70d
18 changed files with 317 additions and 95 deletions
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, unzip, cmake, python}:
+{ stdenv, fetchFromGitHub, unzip, cmake, python }:

 stdenv.mkDerivation {
  name = "flann-1.9.1";