Merge staging-next into staging

2020-06-05 19:42:16 +02:00
parent 462aa777df 43f71029cc
commit 1c68570ab2
101 changed files with 2204 additions and 1267 deletions
@@ -137,6 +137,7 @@ stdenv.mkDerivation (args // {
      # give a friendlier error msg.
      if ! [ -e $srcLockfile ]; then
        echo "ERROR: Missing Cargo.lock from src. Expected to find it at: $srcLockfile"
+        echo "Hint: You can use the cargoPatches attribute to add a Cargo.lock manually to the build."
        exit 1
      fi