Merge master into staging-next

2019-11-25 21:51:57 +01:00
parent 2a2d3de78c 646b279c55
commit 06a054e6eb
252 changed files with 3160 additions and 2290 deletions
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "clojure";
-  version = "1.10.1.469";
+  version = "1.10.1.489";

  src = fetchurl {
    url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "0hpb6rixmgllss69vl9zlpb41svm4mx4xmfbq1q7y12jsxckzgpq";
+    sha256 = "12ks7adh5cx99l5vydppkqknk5nvv9vsj2k0afcwwxd897m794kz";
  };

  buildInputs = [ makeWrapper ];
@@ -161,7 +161,7 @@ builtins.removeAttrs attrs ["disabled" "checkInputs" "externalDeps"] // {

  # enabled only for src.rock
  setSourceRoot= let
-    name_only=(builtins.parseDrvName name).name;
+    name_only= lib.getName name;
  in
    lib.optionalString (knownRockspec == null) ''
    # format is rockspec_basename/source_basename