use 'pname' and 'version' instead of name
This commit is contained in:
parent
a1f4a672c7
commit
b7be58294d
1 changed files with 6 additions and 3 deletions
|
@ -66,7 +66,8 @@ class OverlaysGenerator(ExpressionGenerator):
|
||||||
def _gen_overrideAttrs(self, name, ver, nix_name, build_inputs_str, prop_build_inputs_str):
|
def _gen_overrideAttrs(self, name, ver, nix_name, build_inputs_str, prop_build_inputs_str):
|
||||||
out = f"""
|
out = f"""
|
||||||
{nix_name} = python-super.{nix_name}.overridePythonAttrs ( oldAttrs: {{
|
{nix_name} = python-super.{nix_name}.overridePythonAttrs ( oldAttrs: {{
|
||||||
name = "{name}-{ver}";
|
pname = "{name}";
|
||||||
|
version = "{ver}";
|
||||||
src = fetchPypi "{name}" "{ver}";"""
|
src = fetchPypi "{name}" "{ver}";"""
|
||||||
if build_inputs_str:
|
if build_inputs_str:
|
||||||
out += f"""
|
out += f"""
|
||||||
|
@ -85,7 +86,8 @@ class OverlaysGenerator(ExpressionGenerator):
|
||||||
def _gen_builPythonPackage(self, name, ver, build_inputs_str, prop_build_inputs_str):
|
def _gen_builPythonPackage(self, name, ver, build_inputs_str, prop_build_inputs_str):
|
||||||
out = f"""
|
out = f"""
|
||||||
{self._get_ref_name(name, ver)} = python-self.buildPythonPackage {{
|
{self._get_ref_name(name, ver)} = python-self.buildPythonPackage {{
|
||||||
name = "{name}-{ver}";
|
pname = "{name}";
|
||||||
|
version = "{ver}";
|
||||||
src = fetchPypi "{name}" "{ver}";"""
|
src = fetchPypi "{name}" "{ver}";"""
|
||||||
if build_inputs_str.strip():
|
if build_inputs_str.strip():
|
||||||
out += f"""
|
out += f"""
|
||||||
|
@ -105,7 +107,8 @@ class OverlaysGenerator(ExpressionGenerator):
|
||||||
manylinux = "manylinux1 ++ " if 'manylinux' in fname else ''
|
manylinux = "manylinux1 ++ " if 'manylinux' in fname else ''
|
||||||
out = f"""
|
out = f"""
|
||||||
{self._get_ref_name(name, ver)} = python-self.buildPythonPackage {{
|
{self._get_ref_name(name, ver)} = python-self.buildPythonPackage {{
|
||||||
name = "{name}-{ver}";
|
pname = "{name}";
|
||||||
|
version = "{ver}";
|
||||||
src = fetchPypiWheel "{name}" "{ver}" "{fname}";
|
src = fetchPypiWheel "{name}" "{ver}" "{fname}";
|
||||||
format = "wheel";
|
format = "wheel";
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
Loading…
Reference in a new issue