Merge master into staging-next

2021-01-25 18:52:08 +00:00
parent 351b28d469 9ce1caa63c
commit a127deeb88
2813 changed files with 3233 additions and 2989 deletions
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , git
 , go
-, lib, stdenv
+, lib
 }:

 buildBazelPackage rec {
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:

 buildGoPackage rec {
  pname = "bazel-buildtools";
@@ -1,4 +1,4 @@
-{ lib, stdenv, git, fetchFromGitHub, rustPlatform }:
+{ lib, git, fetchFromGitHub, rustPlatform }:

 rustPlatform.buildRustPackage rec {
  pname = "fac-build";
@@ -1,6 +1,6 @@
 { lib
 , python3
-, stdenv
+
 , writeTextDir
 , substituteAll
 , fetchpatch
@@ -1,4 +1,4 @@
-{ lib, stdenv, pythonPackages }:
+{ lib, pythonPackages }:

 with lib;
 with pythonPackages;
@@ -1,6 +1,6 @@
 { version, sha256 }:

-{ stdenv, fetchurl, python3Packages, lib }:
+{ fetchurl, python3Packages, lib }:

 python3Packages.buildPythonApplication rec {
  pname = "scons";
@@ -1,4 +1,4 @@
-{ lib, stdenv
+{ lib
 , fetchFromGitHub
 , crystal_0_34
 , crystal_0_35