Merge master into staging-next

This brings thousands of rebuilds. Hydra nixpkgs: ?compare=1597944
2020-07-04 09:15:27 +02:00
parent deb78151a9 9f93642b79
commit e1206a2129
160 changed files with 4236 additions and 2376 deletions
@@ -4,11 +4,11 @@

 stdenv.mkDerivation rec {
  pname = "bmake";
-  version = "20200606";
+  version = "20200629";

  src = fetchurl {
    url    = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz";
-    sha256 = "00kh1g8z6808ylbfcn9afpb0xmb99k302dfdsmyx1rsn65xs58v7";
+    sha256 = "1cxmsz48ap6gpwx5qkkvvfsiqxc7zpn8gzmhvc1jsfha68195ms5";
  };

  nativeBuildInputs = [ getopt ];