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

2019-11-24 18:33:54 +00:00
parent f02d65c980 1206faa6d5
commit 4f1261134e
115 changed files with 1449 additions and 1528 deletions
@@ -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