public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117570 from FRidh/python2alias

Browse Source 
Python: be explicit on whether it is python2 or python3 that is used
This commit is contained in:
Frederik Rietdijk
2021-03-25 13:26:35 +01:00
committed by GitHub
parent c0e8818520 f0754b8ab8
commit 350f9bd822
70 changed files with 260 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/security/chipsec/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, pythonPackages, nasm, libelf
{ stdenv, lib, fetchFromGitHub, python2Packages, nasm, libelf
, kernel ? null, withDriver ? false }:
pythonPackages.buildPythonApplication rec {
python2Packages.buildPythonApplication rec {
pname = "chipsec";
version = "1.5.1";
pkgs/tools/security/cipherscan/default.nix
+4 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python, coreutils }:
{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python3, coreutils }:
stdenv.mkDerivation rec {
pname = "cipherscan";
@@ -12,7 +12,9 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python ];
buildInputs = [ python3 ];
strictDeps = true;
buildPhase = ''
substituteInPlace cipherscan --replace '$0' 'cipherscan'