Merge master into staging-next

2019-05-28 08:32:03 +02:00
parent 8809ebe42a 2a56ea3593
commit 36a6746f21
153 changed files with 3462 additions and 1013 deletions
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "colm-${version}";
-  version = "0.13.0.6";
+  version = "0.13.0.7";

  src = fetchurl {
    url = "https://www.colm.net/files/colm/${name}.tar.gz";
-    sha256 = "0jd3qmqdm8yszy0yysbp3syk7pcbxvwzv9mibdwz7v9bv1nrai26";
+    sha256 = "0f76iri173l2wja2v7qrwmf958cqwh5g9x4bhj2z8wknmlla6gz4";
  };

  nativeBuildInputs = [ makeWrapper asciidoc ];