Merge master into staging-next

2021-04-03 18:18:51 +00:00
parent bc845e51f0 b5e8919e56
commit 3bf92ca4db
90 changed files with 1869 additions and 3429 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, nix-update-source, lib, python
+{ stdenv, fetchFromGitHub, nix-update-source, lib, python3
 , which, runtimeShell, pychecker ? null }:
 stdenv.mkDerivation rec {
  version = "0.7.0";
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
    sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv";
  };
  pname = "gup";
-  buildInputs = lib.remove null [ python which pychecker ];
+  nativeBuildInputs = [ python3 which pychecker ];
+  buildInputs = [ python3 ];
+  strictDeps = true;
  SKIP_PYCHECKER = pychecker == null;
  buildPhase = "make python";
  installPhase = ''