Merge branch 'origin/master' into stdenv-updates.

Conflicts: pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
parent 2bc29e4e6d 60103a4bd9
commit 45e8de9a7d
232 changed files with 1551 additions and 681 deletions
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:

 stdenv.mkDerivation rec {
-  name = "gsl-1.15";
+  name = "gsl-1.16";

  src = fetchurl {
    url = "mirror://gnu/gsl/${name}.tar.gz";
-    sha256 = "18qf6jzz1r3mzb5qynywv4xx3z9g61hgkbpkdrhbgqh2g7jhgfc5";
+    sha256 = "0lrgipi0z6559jqh82yx8n4xgnxkhzj46v96dl77hahdp58jzg3k";
  };

  # ToDo: there might be more impurities than FMA support check