Merge remote-tracking branch 'upstream/master' into staging

Conflicts: pkgs/top-level/all-packages.nix
2018-05-18 03:54:38 +03:00
parent 39696b6d56 50bbc56b0b
commit 003473613a
81 changed files with 1420 additions and 223 deletions
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:

 stdenv.mkDerivation rec {
-  name = "dash-0.5.10";
+  name = "dash-0.5.10.1";

  src = fetchurl {
    url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
-    sha256 = "1arimvc9zcghhb3nin9z3yr5706vxfri4a9r3j9j9d0n676f0w5d";
+    sha256 = "1bl4brz5vy07lrss54glp4vfca3q8d73hyc87sqdk99f76z95b6s";
  };

  hardeningDisable = [ "format" ];