Merge master into staging-next

2021-03-09 00:39:09 +00:00
parent 3521dc45ed 909cd83cb2
commit 3db2dee35f
65 changed files with 2594 additions and 1218 deletions
--- a/pkgs/build-support/fetchbitbucket/default.nix
+++ b/pkgs/build-support/fetchbitbucket/default.nix
@@ -6,5 +6,4 @@
  inherit name;
  url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz";
  meta.homepage = "https://bitbucket.org/${owner}/${repo}/";
-  extraPostFetch = ''rm -f "$out"/.hg_archival.txt''; # impure file; see #12002
 } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; }