nixpkgs-fmt: format all the nix code

This commit is contained in:
zimbatm 2019-12-11 13:31:22 +01:00
parent 4c024740b2
commit 310282154c
No known key found for this signature in database
GPG key ID: 71BAF6D40C1D63D7
8 changed files with 635 additions and 495 deletions

View file

@ -1,9 +1,7 @@
{
pkgs ? import <nixpkgs> { },
lib ? pkgs.lib,
poetry ? null,
{ pkgs ? import <nixpkgs> {}
, lib ? pkgs.lib
, poetry ? null
}:
let
importTOML = path: builtins.fromTOML (builtins.readFile path);
@ -24,39 +22,47 @@ let
# file: filename including extension
# hash: SRI hash
# kind: Language implementation and version tag https://www.python.org/dev/peps/pep-0427/#file-name-convention
fetchFromPypi = lib.makeOverridable ({ pname, file, hash, kind }:
pkgs.fetchurl {
url = "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}";
inherit hash;
});
fetchFromPypi = lib.makeOverridable (
{ pname, file, hash, kind }:
pkgs.fetchurl {
url = "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}";
inherit hash;
}
);
getAttrPath = attrPath: set: (
builtins.foldl'
(acc: v: if builtins.typeOf acc == "set" && builtins.hasAttr v acc then acc."${v}" else null)
set (lib.splitString "." attrPath)
(acc: v: if builtins.typeOf acc == "set" && builtins.hasAttr v acc then acc."${v}" else null)
set (lib.splitString "." attrPath)
);
satisfiesSemver = (import ./semver.nix {inherit lib;}).satisfies;
satisfiesSemver = (import ./semver.nix { inherit lib; }).satisfies;
# Check Python version is compatible with package
isCompatible = pythonVersion: pythonVersions: let
operators = {
"||" = cond1: cond2: cond1 || cond2;
"," = cond1: cond2: cond1 && cond2; # , means &&
"," = cond1: cond2: cond1 && cond2; # , means &&
};
tokens = builtins.filter (x: x != "") (builtins.split "(,|\\|\\|)" pythonVersions);
in (builtins.foldl' (acc: v: let
isOperator = builtins.typeOf v == "list";
operator = if isOperator then (builtins.elemAt v 0) else acc.operator;
in if isOperator then (acc // {inherit operator;}) else {
inherit operator;
state = operators."${operator}" acc.state (satisfiesSemver pythonVersion v);
})
{
operator = ",";
state = true;
}
tokens).state;
in
(
builtins.foldl' (
acc: v: let
isOperator = builtins.typeOf v == "list";
operator = if isOperator then (builtins.elemAt v 0) else acc.operator;
in
if isOperator then (acc // { inherit operator; }) else {
inherit operator;
state = operators."${operator}" acc.state (satisfiesSemver pythonVersion v);
}
)
{
operator = ",";
state = true;
}
tokens
).state;
extensions = pkgs.lib.importJSON ./extensions.json;
getExtension = filename: builtins.elemAt
@ -75,139 +81,158 @@ let
stdenv = pkgs.stdenv;
};
mkPoetryPackage = {
src,
pyproject ? src + "/pyproject.toml",
poetrylock ? src + "/poetry.lock",
overrides ? defaultPoetryOverrides,
meta ? {},
python ? pkgs.python3,
...
}@attrs: let
pyProject = importTOML pyproject;
poetryLock = importTOML poetrylock;
mkPoetryPackage =
{ src
, pyproject ? src + "/pyproject.toml"
, poetrylock ? src + "/poetry.lock"
, overrides ? defaultPoetryOverrides
, meta ? {}
, python ? pkgs.python3
, ...
}@attrs: let
pyProject = importTOML pyproject;
poetryLock = importTOML poetrylock;
files = getAttrDefault "files" (getAttrDefault "metadata" poetryLock {}) {};
files = getAttrDefault "files" (getAttrDefault "metadata" poetryLock {}) {};
specialAttrs = [ "pyproject" "poetrylock" "overrides" ];
passedAttrs = builtins.removeAttrs attrs specialAttrs;
specialAttrs = [ "pyproject" "poetrylock" "overrides" ];
passedAttrs = builtins.removeAttrs attrs specialAttrs;
evalPep508 = mkEvalPep508 python;
evalPep508 = mkEvalPep508 python;
poetryPkg = poetry.override { inherit python; };
poetryPkg = poetry.override { inherit python; };
# Create an overriden version of pythonPackages
#
# We need to avoid mixing multiple versions of pythonPackages in the same
# closure as python can only ever have one version of a dependency
py = let
packageOverrides = self: super: let
getDep = depName: if builtins.hasAttr depName self then self."${depName}" else null;
# Create an overriden version of pythonPackages
#
# We need to avoid mixing multiple versions of pythonPackages in the same
# closure as python can only ever have one version of a dependency
py = let
packageOverrides = self: super: let
getDep = depName: if builtins.hasAttr depName self then self."${depName}" else null;
mkPoetryDep = pkgMeta: let
pkgFiles = let
all = getAttrDefault pkgMeta.name files [];
in builtins.filter (f: fileSupported f.file) all;
mkPoetryDep = pkgMeta: let
pkgFiles = let
all = getAttrDefault pkgMeta.name files [];
in
builtins.filter (f: fileSupported f.file) all;
files_sdist = builtins.filter isSdist pkgFiles;
files_bdist = builtins.filter isBdist pkgFiles;
files_supported = files_sdist ++ files_bdist;
# Only files matching this version
filterFile = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." ] [ "\\." ] pkgMeta.version + ".*$") fname != null;
files_filtered = builtins.filter (f: filterFile f.file) files_supported;
# Grab the first dist, we dont care about which one
file = assert builtins.length files_filtered >= 1; builtins.elemAt files_filtered 0;
files_sdist = builtins.filter isSdist pkgFiles;
files_bdist = builtins.filter isBdist pkgFiles;
files_supported = files_sdist ++ files_bdist;
# Only files matching this version
filterFile = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." ] [ "\\." ] pkgMeta.version + ".*$") fname != null;
files_filtered = builtins.filter (f: filterFile f.file) files_supported;
# Grab the first dist, we dont care about which one
file = assert builtins.length files_filtered >= 1; builtins.elemAt files_filtered 0;
format =
if isBdist file
then "wheel"
else "setuptools";
format =
if isBdist file
then "wheel"
else "setuptools";
in self.buildPythonPackage {
pname = pkgMeta.name;
version = pkgMeta.version;
in
self.buildPythonPackage {
pname = pkgMeta.name;
version = pkgMeta.version;
doCheck = false; # We never get development deps
doCheck = false; # We never get development deps
inherit format;
inherit format;
propagatedBuildInputs = let
depAttrs = getAttrDefault "dependencies" pkgMeta {};
# Some dependencies like django gets the attribute name django
# but dependencies try to access Django
dependencies = builtins.map (d: lib.toLower d) (builtins.attrNames depAttrs);
in builtins.map getDep dependencies;
propagatedBuildInputs = let
depAttrs = getAttrDefault "dependencies" pkgMeta {};
# Some dependencies like django gets the attribute name django
# but dependencies try to access Django
dependencies = builtins.map (d: lib.toLower d) (builtins.attrNames depAttrs);
in
builtins.map getDep dependencies;
meta = {
broken = ! isCompatible python.version pkgMeta.python-versions;
license = [];
meta = {
broken = ! isCompatible python.version pkgMeta.python-versions;
license = [];
};
src = fetchFromPypi {
pname = pkgMeta.name;
inherit (file) file hash;
# We need to retrieve kind from the interpreter and the filename of the package
# Interpreters should declare what wheel types they're compatible with (python type + ABI)
# Here we can then choose a file based on that info.
kind = if format == "wheel" then "py2.py3" else "source";
};
};
# Filter packages by their PEP508 markers
pkgsWithFilter = builtins.map (
pkgMeta: let
f = if builtins.hasAttr "marker" pkgMeta then (!evalPep508 pkgMeta.marker) else false;
in
pkgMeta // { p2nixFiltered = f; }
) poetryLock.package;
lockPkgs = builtins.map (
pkgMeta: {
name = pkgMeta.name;
value = let
drv = mkPoetryDep pkgMeta;
override = getAttrDefault pkgMeta.name overrides (_: _: drv: drv);
in
if drv != null then (override self super drv) else null;
}
) (builtins.filter (pkgMeta: !pkgMeta.p2nixFiltered) pkgsWithFilter);
# Null out any filtered packages, we don't want python.pkgs from nixpkgs
nulledPkgs = (
builtins.listToAttrs
(
builtins.map (x: { name = x.name; value = null; })
(builtins.filter (pkgMeta: pkgMeta.p2nixFiltered) pkgsWithFilter)
)
);
in
nulledPkgs // builtins.listToAttrs lockPkgs;
in
python.override { inherit packageOverrides; self = py; };
pythonPackages = py.pkgs;
getDeps = depAttr: let
deps = getAttrDefault depAttr pyProject.tool.poetry {};
depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps);
in
builtins.map (dep: pythonPackages."${dep}") depAttrs;
getInputs = attr: getAttrDefault attr attrs [];
mkInput = attr: extraInputs: getInputs attr ++ extraInputs;
hasPoetryBuildSystem = getAttrPath "build-system.build-backend" pyProject == "poetry.masonry.api";
in
pythonPackages.buildPythonApplication (
passedAttrs // {
pname = pyProject.tool.poetry.name;
version = pyProject.tool.poetry.version;
format = "pyproject";
buildInputs = mkInput "buildInputs" (lib.optional hasPoetryBuildSystem poetryPkg);
propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ pythonPackages.setuptools ]);
checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies");
passthru = {
inherit pythonPackages;
};
src = fetchFromPypi {
pname = pkgMeta.name;
inherit (file) file hash;
# We need to retrieve kind from the interpreter and the filename of the package
# Interpreters should declare what wheel types they're compatible with (python type + ABI)
# Here we can then choose a file based on that info.
kind = if format == "wheel" then "py2.py3" else "source";
meta = meta // {
inherit (pyProject.tool.poetry) description;
licenses = [ pyProject.tool.poetry.license ];
};
};
# Filter packages by their PEP508 markers
pkgsWithFilter = builtins.map (pkgMeta: let
f = if builtins.hasAttr "marker" pkgMeta then (!evalPep508 pkgMeta.marker) else false;
in pkgMeta // { p2nixFiltered = f; }) poetryLock.package;
}
);
lockPkgs = builtins.map (pkgMeta: {
name = pkgMeta.name;
value = let
drv = mkPoetryDep pkgMeta;
override = getAttrDefault pkgMeta.name overrides (_: _: drv: drv);
in if drv != null then (override self super drv) else null;
}) (builtins.filter (pkgMeta: !pkgMeta.p2nixFiltered) pkgsWithFilter);
# Null out any filtered packages, we don't want python.pkgs from nixpkgs
nulledPkgs = (
builtins.listToAttrs
(builtins.map (x: { name = x.name; value = null; })
(builtins.filter (pkgMeta: pkgMeta.p2nixFiltered) pkgsWithFilter)));
in nulledPkgs // builtins.listToAttrs lockPkgs;
in python.override { inherit packageOverrides; self = py; };
pythonPackages = py.pkgs;
getDeps = depAttr: let
deps = getAttrDefault depAttr pyProject.tool.poetry {};
depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps);
in builtins.map (dep: pythonPackages."${dep}") depAttrs;
getInputs = attr: getAttrDefault attr attrs [];
mkInput = attr: extraInputs: getInputs attr ++ extraInputs;
hasPoetryBuildSystem = getAttrPath "build-system.build-backend" pyProject == "poetry.masonry.api";
in pythonPackages.buildPythonApplication (passedAttrs // {
pname = pyProject.tool.poetry.name;
version = pyProject.tool.poetry.version;
format = "pyproject";
buildInputs = mkInput "buildInputs" (lib.optional hasPoetryBuildSystem poetryPkg);
propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ pythonPackages.setuptools ]);
checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies");
passthru = {
inherit pythonPackages;
};
meta = meta // {
inherit (pyProject.tool.poetry) description;
licenses = [ pyProject.tool.poetry.license ];
};
});
in {
in
{
inherit mkPoetryPackage defaultPoetryOverrides;
}

View file

@ -8,21 +8,25 @@
systems = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ];
forAllSystems = f: nixpkgs.lib.genAttrs systems (system: f system);
# Memoize nixpkgs for different platforms for efficiency.
nixpkgsFor = forAllSystems (system:
import nixpkgs {
inherit system;
overlays = [ self.overlay ];
}
nixpkgsFor = forAllSystems (
system:
import nixpkgs {
inherit system;
overlays = [ self.overlay ];
}
);
in {
in
{
overlay = import ./overlay.nix;
overlay = import ./overlay.nix;
# TODO: I feel like `packages` is the wrong place for the poetry2nix attr
packages = forAllSystems (system: {
inherit (nixpkgsFor.${system}) poetry poetry2nix;
});
# TODO: I feel like `packages` is the wrong place for the poetry2nix attr
packages = forAllSystems (
system: {
inherit (nixpkgsFor.${system}) poetry poetry2nix;
}
);
};
};
}

View file

@ -1,267 +1,334 @@
{
pkgs ? import <nixpkgs> { },
lib ? pkgs.lib,
stdenv ? pkgs.stdenv,
{ pkgs ? import <nixpkgs> {}
, lib ? pkgs.lib
, stdenv ? pkgs.stdenv
}:
let
addSetupTools = self: super: drv: drv.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [
self.setuptools_scm
];
});
addSetupTools = self: super: drv: drv.overrideAttrs (
old: {
buildInputs = old.buildInputs ++ [
self.setuptools_scm
];
}
);
getAttrDefault = attribute: set: default:
if builtins.hasAttr attribute set
then builtins.getAttr attribute set
else default;
in {
in
{
asciimatics = self: super: drv: drv.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [
self.setuptools_scm
];
});
asciimatics = self: super: drv: drv.overrideAttrs (
old: {
buildInputs = old.buildInputs ++ [
self.setuptools_scm
];
}
);
av = self: super: drv: drv.overrideAttrs(old: {
nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.pkgconfig
];
buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ];
});
av = self: super: drv: drv.overrideAttrs (
old: {
nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.pkgconfig
];
buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ];
}
);
bcrypt = self: super: drv: drv.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ pkgs.libffi ];
});
bcrypt = self: super: drv: drv.overrideAttrs (
old: {
buildInputs = old.buildInputs ++ [ pkgs.libffi ];
}
);
cffi = self: super: drv: drv.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ pkgs.libffi ];
});
cffi = self: super: drv: drv.overrideAttrs (
old: {
buildInputs = old.buildInputs ++ [ pkgs.libffi ];
}
);
cftime = self: super: drv: drv.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [
self.cython
];
});
cftime = self: super: drv: drv.overrideAttrs (
old: {
buildInputs = old.buildInputs ++ [
self.cython
];
}
);
configparser = addSetupTools;
cbor2 = addSetupTools;
cryptography = self: super: drv: drv.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ pkgs.openssl ];
});
cryptography = self: super: drv: drv.overrideAttrs (
old: {
buildInputs = old.buildInputs ++ [ pkgs.openssl ];
}
);
django = (self: super: drv: drv.overrideAttrs(old: {
propagatedNativeBuildInputs = (getAttrDefault "propagatedNativeBuildInputs" old [])
++ [ pkgs.gettext ];
}));
django = (
self: super: drv: drv.overrideAttrs (
old: {
propagatedNativeBuildInputs = (getAttrDefault "propagatedNativeBuildInputs" old [])
++ [ pkgs.gettext ];
}
)
);
django-bakery = self: super: drv: drv.overrideAttrs(old: {
configurePhase = ''
if ! test -e LICENSE; then
touch LICENSE
fi
'' + (getAttrDefault "configurePhase" old "");
});
django-bakery = self: super: drv: drv.overrideAttrs (
old: {
configurePhase = ''
if ! test -e LICENSE; then
touch LICENSE
fi
'' + (getAttrDefault "configurePhase" old "");
}
);
# Environment markers are not always included (depending on how a dep was defined)
enum34 = self: super: drv: if self.pythonAtLeast "3.4" then null else drv;
grandalf = self: super: drv: drv.overrideAttrs(old: {
postPatch = ''
substituteInPlace setup.py --replace "setup_requires=['pytest-runner',]," "setup_requires=[]," || true
'';
});
grandalf = self: super: drv: drv.overrideAttrs (
old: {
postPatch = ''
substituteInPlace setup.py --replace "setup_requires=['pytest-runner',]," "setup_requires=[]," || true
'';
}
);
horovod = self: super: drv: drv.overrideAttrs(old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ];
});
horovod = self: super: drv: drv.overrideAttrs (
old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ];
}
);
hypothesis = addSetupTools;
importlib-metadata = addSetupTools;
inflect = self: super: drv: drv.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [
self.setuptools_scm
];
});
inflect = self: super: drv: drv.overrideAttrs (
old: {
buildInputs = old.buildInputs ++ [
self.setuptools_scm
];
}
);
jsonschema = addSetupTools;
keyring = addSetupTools;
lap = self: super: drv: drv.overrideAttrs(old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [
self.numpy
];
});
llvmlite = self: super: drv: drv.overrideAttrs(old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ];
lap = self: super: drv: drv.overrideAttrs (
old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [
self.numpy
];
}
);
# Disable static linking
# https://github.com/numba/llvmlite/issues/93
postPatch = ''
substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" ""
llvmlite = self: super: drv: drv.overrideAttrs (
old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ];
substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope"
'';
# Disable static linking
# https://github.com/numba/llvmlite/issues/93
postPatch = ''
substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" ""
# Set directory containing llvm-config binary
preConfigure = ''
export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config
'';
substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope"
'';
__impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
# Set directory containing llvm-config binary
preConfigure = ''
export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config
'';
passthru.llvm = pkgs.llvm;
});
__impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ];
lockfile = self: super: drv: drv.overrideAttrs(old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ];
});
passthru.llvm = pkgs.llvm;
}
);
lxml = self: super: drv: drv.overrideAttrs(old: {
nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ];
buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ];
});
lockfile = self: super: drv: drv.overrideAttrs (
old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ];
}
);
markupsafe = self: super: drv: drv.overrideAttrs(old: {
src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe"] old.pname; };
});
lxml = self: super: drv: drv.overrideAttrs (
old: {
nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ];
buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ];
}
);
matplotlib = self: super: drv: drv.overrideAttrs(old: {
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
markupsafe = self: super: drv: drv.overrideAttrs (
old: {
src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; };
}
);
XDG_RUNTIME_DIR = "/tmp";
matplotlib = self: super: drv: drv.overrideAttrs (
old: {
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.pkgconfig
];
XDG_RUNTIME_DIR = "/tmp";
propagatedBuildInputs = old.propagatedBuildInputs ++ [
pkgs.libpng
pkgs.freetype
];
nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.pkgconfig
];
inherit (super.matplotlib) patches;
});
propagatedBuildInputs = old.propagatedBuildInputs ++ [
pkgs.libpng
pkgs.freetype
];
mccabe = self: super: drv: drv.overrideAttrs(old: {
postPatch = ''
substituteInPlace setup.py --replace "setup_requires=['pytest-runner']," "setup_requires=[]," || true
'';
});
inherit (super.matplotlib) patches;
}
);
netcdf4 = self: super: drv: drv.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [
self.cython
];
mccabe = self: super: drv: drv.overrideAttrs (
old: {
postPatch = ''
substituteInPlace setup.py --replace "setup_requires=['pytest-runner']," "setup_requires=[]," || true
'';
}
);
propagatedBuildInputs = old.propagatedBuildInputs ++ [
pkgs.zlib
pkgs.netcdf
pkgs.hdf5
pkgs.curl
pkgs.libjpeg
];
netcdf4 = self: super: drv: drv.overrideAttrs (
old: {
buildInputs = old.buildInputs ++ [
self.cython
];
# Variables used to configure the build process
USE_NCCONFIG="0";
HDF5_DIR = lib.getDev pkgs.hdf5;
NETCDF4_DIR = pkgs.netcdf;
CURL_DIR = pkgs.curl.dev;
JPEG_DIR = pkgs.libjpeg.dev;
});
propagatedBuildInputs = old.propagatedBuildInputs ++ [
pkgs.zlib
pkgs.netcdf
pkgs.hdf5
pkgs.curl
pkgs.libjpeg
];
numpy = self: super: drv: drv.overrideAttrs(old: let
blas = pkgs.openblasCompat;
blasImplementation = lib.nameFromURL blas.name "-";
cfg = pkgs.writeTextFile {
name = "site.cfg";
text = (lib.generators.toINI {} {
${blasImplementation} = {
include_dirs = "${blas}/include";
library_dirs = "${blas}/lib";
} // lib.optionalAttrs (blasImplementation == "mkl") {
mkl_libs = "mkl_rt";
lapack_libs = "";
# Variables used to configure the build process
USE_NCCONFIG = "0";
HDF5_DIR = lib.getDev pkgs.hdf5;
NETCDF4_DIR = pkgs.netcdf;
CURL_DIR = pkgs.curl.dev;
JPEG_DIR = pkgs.libjpeg.dev;
}
);
numpy = self: super: drv: drv.overrideAttrs (
old: let
blas = pkgs.openblasCompat;
blasImplementation = lib.nameFromURL blas.name "-";
cfg = pkgs.writeTextFile {
name = "site.cfg";
text = (
lib.generators.toINI {} {
${blasImplementation} = {
include_dirs = "${blas}/include";
library_dirs = "${blas}/lib";
} // lib.optionalAttrs (blasImplementation == "mkl") {
mkl_libs = "mkl_rt";
lapack_libs = "";
};
}
);
};
in
{
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ];
buildInputs = old.buildInputs ++ [ blas ];
enableParallelBuilding = true;
preBuild = ''
ln -s ${cfg} site.cfg
'';
passthru = {
blas = blas;
inherit blasImplementation cfg;
};
});
};
in {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ];
buildInputs = old.buildInputs ++ [ blas ];
enableParallelBuilding = true;
preBuild = ''
ln -s ${cfg} site.cfg
'';
passthru = {
blas = blas;
inherit blasImplementation cfg;
};
});
}
);
pillow = self: super: drv: drv.overrideAttrs(old: {
nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs;
buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs;
});
pillow = self: super: drv: drv.overrideAttrs (
old: {
nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs;
buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs;
}
);
pluggy = addSetupTools;
psycopg2 = self: super: drv: drv.overrideAttrs(old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ];
});
psycopg2 = self: super: drv: drv.overrideAttrs (
old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ];
}
);
psycopg2-binary = self: super: drv: drv.overrideAttrs(old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ];
});
psycopg2-binary = self: super: drv: drv.overrideAttrs (
old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ];
}
);
py = addSetupTools;
pyarrow = self: super: drv: drv.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [
self.cython
];
});
pyarrow = self: super: drv: drv.overrideAttrs (
old: {
buildInputs = old.buildInputs ++ [
self.cython
];
}
);
pycairo = self: super: drv: (drv.overridePythonAttrs(_: {
format = "other";
})).overrideAttrs(old: {
pycairo = self: super: drv: (
drv.overridePythonAttrs (
_: {
format = "other";
}
)
).overrideAttrs (
old: {
nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.meson
pkgs.ninja
pkgs.pkgconfig
];
nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.meson
pkgs.ninja
pkgs.pkgconfig
];
propagatedBuildInputs = old.propagatedBuildInputs ++ [
pkgs.cairo
pkgs.xlibsWrapper
];
propagatedBuildInputs = old.propagatedBuildInputs ++ [
pkgs.cairo
pkgs.xlibsWrapper
];
mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ];
});
mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ];
}
);
pycocotools = self: super: drv: drv.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [
self.cython
self.numpy
];
});
pycocotools = self: super: drv: drv.overrideAttrs (
old: {
buildInputs = old.buildInputs ++ [
self.cython
self.numpy
];
}
);
pygobject = self: super: drv: drv.overrideAttrs(old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ];
});
pygobject = self: super: drv: drv.overrideAttrs (
old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ];
}
);
pyopenssl = self: super: drv: drv.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ pkgs.openssl ];
});
pyopenssl = self: super: drv: drv.overrideAttrs (
old: {
buildInputs = old.buildInputs ++ [ pkgs.openssl ];
}
);
pytest = addSetupTools;
@ -269,50 +336,62 @@ in {
python-dateutil = addSetupTools;
python-prctl = self: super: drv: drv.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [
self.setuptools_scm
pkgs.libcap
];
});
python-prctl = self: super: drv: drv.overrideAttrs (
old: {
buildInputs = old.buildInputs ++ [
self.setuptools_scm
pkgs.libcap
];
}
);
scaleapi = self: super: drv: drv.overrideAttrs(old: {
postPatch = ''
substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true
'';
});
scaleapi = self: super: drv: drv.overrideAttrs (
old: {
postPatch = ''
substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true
'';
}
);
scipy = self: super: drv: drv.overrideAttrs(old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ];
setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
enableParallelBuilding = true;
buildInputs = old.buildInputs ++ [ self.numpy.blas ];
preConfigure = ''
sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
'';
preBuild = ''
ln -s ${self.numpy.cfg} site.cfg
'';
});
scipy = self: super: drv: drv.overrideAttrs (
old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ];
setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
enableParallelBuilding = true;
buildInputs = old.buildInputs ++ [ self.numpy.blas ];
preConfigure = ''
sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES
'';
preBuild = ''
ln -s ${self.numpy.cfg} site.cfg
'';
}
);
shapely = self: super: drv: drv.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ];
inherit (super.shapely) patches GEOS_LIBRARY_PATH;
});
shapely = self: super: drv: drv.overrideAttrs (
old: {
buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ];
inherit (super.shapely) patches GEOS_LIBRARY_PATH;
}
);
six = addSetupTools;
urwidtrees = self: super: drv: drv.overrideAttrs(old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [
self.urwid
];
});
urwidtrees = self: super: drv: drv.overrideAttrs (
old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [
self.urwid
];
}
);
# Break setuptools infinite recursion because of non-bootstrapped pip
wheel = self: super: drv: super.wheel.overridePythonAttrs(_: {
inherit (drv) pname name version src;
});
wheel = self: super: drv: super.wheel.overridePythonAttrs (
_: {
inherit (drv) pname name version src;
}
);
zipp = addSetupTools;
}

View file

@ -14,23 +14,25 @@ let
posNew = acc.pos + 1;
isOpen = acc.openP == 0;
startPos = if isOpen then posNew else acc.startPos;
in acc // {
inherit startPos;
exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ];
pos = posNew;
openP = acc.openP + 1;
}
in
acc // {
inherit startPos;
exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ];
pos = posNew;
openP = acc.openP + 1;
}
) else if c == ")" then (
let
openP = acc.openP - 1;
exprs = findSubExpressions (substr acc.startPos acc.pos acc.expr);
in acc // {
inherit openP;
pos = acc.pos + 1;
exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs;
exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos;
}
) else acc // {pos = acc.pos + 1;}
in
acc // {
inherit openP;
pos = acc.pos + 1;
exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs;
exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos;
}
) else acc // { pos = acc.pos + 1; }
);
# Make a tree out of expression groups (parens)
@ -45,12 +47,15 @@ let
} (lib.stringToCharacters expr);
tailExpr = (substr acc.exprPos acc.pos expr);
tailExprs = if tailExpr != "" then [ tailExpr ] else [];
in acc.exprs ++ tailExprs;
in
acc.exprs ++ tailExprs;
parseExpressions = exprs: let
splitCond = (s: builtins.map
(x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x))
(builtins.split " (and|or) " (s + " ")));
splitCond = (
s: builtins.map
(x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x))
(builtins.split " (and|or) " (s + " "))
);
mapfn = expr: (
if (builtins.match "^ ?$" expr != null) then null # Filter empty
@ -66,32 +71,35 @@ let
parse = expr: builtins.filter (x: x != null) (builtins.map mapfn (splitCond expr));
in builtins.foldl' (acc: v: acc ++ (
if builtins.typeOf v == "string" then parse v else [(parseExpressions v)]
)) [] exprs;
in
builtins.foldl' (
acc: v: acc ++ (
if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ]
)
) [] exprs;
# Transform individual expressions to structured expressions
# This function also performs variable substitution, replacing environment markers with their explicit values
transformExpressions = exprs: let
variables = {
os_name = "posix"; # TODO: Check other platforms
os_name = "posix"; # TODO: Check other platforms
sys_platform = (
if stdenv.isLinux then "linux"
else if stdenv.isDarwin then "darwin"
else throw "Unsupported platform"
);
platform_machine = stdenv.platform.kernelArch;
platform_python_implementation = "CPython"; # Only CPython supported for now
platform_release = ""; # Field not reproducible
platform_python_implementation = "CPython"; # Only CPython supported for now
platform_release = ""; # Field not reproducible
platform_system = (
if stdenv.isLinux then "Linux"
else if stdenv.isDarwin then "Darwin"
else throw "Unsupported platform"
);
platform_version = ""; # Field not reproducible
platform_version = ""; # Field not reproducible
python_version = python.passthru.pythonVersion;
python_full_version = python.version;
implementation_name = "cpython"; # Only cpython supported for now
implementation_name = "cpython"; # Only cpython supported for now
implementation_version = python.version;
extra = "";
};
@ -103,23 +111,27 @@ let
substituteVar
];
in if builtins.typeOf exprs == "set" then (
if exprs.type == "expr" then (let
mVal = ''[a-zA-Z0-9\'"_\. ]+'';
mOp = "in|[!=<>]+";
e = stripStr exprs.value;
m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e);
in {
type = "expr";
value = {
op = builtins.elemAt m 1;
values = [
(processVar (builtins.elemAt m 0))
(processVar (builtins.elemAt m 2))
];
};
}) else exprs
) else builtins.map transformExpressions exprs;
in
if builtins.typeOf exprs == "set" then (
if exprs.type == "expr" then (
let
mVal = ''[a-zA-Z0-9\'"_\. ]+'';
mOp = "in|[!=<>]+";
e = stripStr exprs.value;
m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e);
in
{
type = "expr";
value = {
op = builtins.elemAt m 1;
values = [
(processVar (builtins.elemAt m 0))
(processVar (builtins.elemAt m 2))
];
};
}
) else exprs
) else builtins.map transformExpressions exprs;
# Recursively eval all expressions
evalExpressions = exprs: let
@ -142,17 +154,22 @@ let
"===" = null;
"in" = x: y: let
values = builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " (unmarshal y));
in builtins.elem (unmarshal x) values;
in
builtins.elem (unmarshal x) values;
};
in if builtins.typeOf exprs == "set" then (
if exprs.type == "expr" then (let
expr = exprs;
result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1);
in {
type = "value";
value = result;
}) else exprs
) else builtins.map evalExpressions exprs;
in
if builtins.typeOf exprs == "set" then (
if exprs.type == "expr" then (
let
expr = exprs;
result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1);
in
{
type = "value";
value = result;
}
) else exprs
) else builtins.map evalExpressions exprs;
# Now that we have performed an eval all that's left to do is to concat the graph into a single bool
reduceExpressions = exprs: let
@ -177,17 +194,22 @@ let
value = true;
cond = "and";
} v;
in acc // {
value = cond."${acc.cond}" acc.value ret.value;
}
in
acc // {
value = cond."${acc.cond}" acc.value ret.value;
}
) else throw "Unsupported type"
);
in (builtins.foldl' reduceExpressionsFun {
value = true;
cond = "and";
} exprs).value;
in
(
builtins.foldl' reduceExpressionsFun {
value = true;
cond = "and";
} exprs
).value;
in e: builtins.foldl' (acc: v: v acc) e [
in
e: builtins.foldl' (acc: v: v acc) e [
findSubExpressions
parseExpressions
transformExpressions

View file

@ -6,7 +6,8 @@ let
# Replace a list entry at defined index with set value
ireplace = idx: value: list: let
inherit (builtins) genList length;
in genList (i: if i == idx then value else (elemAt list i)) (length list);
in
genList (i: if i == idx then value else (elemAt list i)) (length list);
operators = let
matchWildCard = s: match "([^\*])(\.[\*])" s;
@ -15,7 +16,8 @@ let
ver = builtins.splitVersion v;
minor = builtins.toString (lib.toInt (elemAt ver idx) + 1);
upper = builtins.concatStringsSep "." (ireplace idx minor ver);
in operators.">=" version v && operators."<" version upper;
in
operators.">=" version v && operators."<" version upper;
dropWildcardPrecision = f: version: constraint: let
m = matchWildCard constraint;
hasWildcard = m != null;
@ -23,21 +25,23 @@ let
v =
if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version)
else version;
in f v c;
in {
# Prefix operators
"==" = dropWildcardPrecision (mkComparison 0);
">" = dropWildcardPrecision (mkComparison 1);
"<" = dropWildcardPrecision (mkComparison (-1));
"!=" = v: c: ! operators."==" v c;
">=" = v: c: operators."==" v c || operators.">" v c;
"<=" = v: c: operators."==" v c || operators."<" v c;
# Semver specific operators
"~" = mkIdxComparison 1; #
"^" = mkIdxComparison 0;
# Infix operators
"-" = version: v: operators.">=" version v.vl && operators."<=" version v.vu;
};
in
f v c;
in
{
# Prefix operators
"==" = dropWildcardPrecision (mkComparison 0);
">" = dropWildcardPrecision (mkComparison 1);
"<" = dropWildcardPrecision (mkComparison (-1));
"!=" = v: c: ! operators."==" v c;
">=" = v: c: operators."==" v c || operators.">" v c;
"<=" = v: c: operators."==" v c || operators."<" v c;
# Semver specific operators
"~" = mkIdxComparison 1; #
"^" = mkIdxComparison 0;
# Infix operators
"-" = version: v: operators.">=" version v.vl && operators."<=" version v.vu;
};
re = {
operators = "([=><!~\^]+)";
@ -50,23 +54,27 @@ let
mPre = match "${re.operators} *${re.version}" constraintStr;
# There is also an infix operator to match ranges
mIn = match "${re.version} *(-) *${re.version}" constraintStr;
in (
if mPre != null then {
op = elemAt mPre 0;
v = elemAt mPre 1;
}
# Infix operators are range matches
else if mIn != null then {
op = elemAt mIn 1;
v = {
vl = (elemAt mIn 0);
vu = (elemAt mIn 2);
};
}
else throw "Constraint \"${constraintStr}\" could not be parsed");
in
(
if mPre != null then {
op = elemAt mPre 0;
v = elemAt mPre 1;
}
# Infix operators are range matches
else if mIn != null then {
op = elemAt mIn 1;
v = {
vl = (elemAt mIn 0);
vu = (elemAt mIn 2);
};
}
else throw "Constraint \"${constraintStr}\" could not be parsed"
);
satisfies = version: constraint: let
inherit (parseConstraint constraint) op v;
in if constraint == "*" then true else operators."${op}" version v;
in
if constraint == "*" then true else operators."${op}" version v;
in { inherit satisfies; }
in
{ inherit satisfies; }

View file

@ -3,8 +3,8 @@ let
poetry2nix = import ./. { inherit pkgs; inherit poetry; };
poetry = pkgs.callPackage ./pkgs/poetry { python = pkgs.python3; inherit poetry2nix; };
in
pkgs.mkShell {
buildInputs = [
poetry
];
}
pkgs.mkShell {
buildInputs = [
poetry
];
}

View file

@ -3,9 +3,9 @@ let
poetry = pkgs.callPackage ../pkgs/poetry { python = pkgs.python3; inherit poetry2nix; };
poetry2nix = import ./.. { inherit pkgs; inherit poetry; };
in
{
trivial = pkgs.callPackage ./override-support { inherit poetry2nix; };
override = pkgs.callPackage ./override-support { inherit poetry2nix; };
top-packages-1 = pkgs.callPackage ./common-pkgs-1 { inherit poetry2nix; };
top-packages-2 = pkgs.callPackage ./common-pkgs-2 { inherit poetry2nix; };
}
{
trivial = pkgs.callPackage ./override-support { inherit poetry2nix; };
override = pkgs.callPackage ./override-support { inherit poetry2nix; };
top-packages-1 = pkgs.callPackage ./common-pkgs-1 { inherit poetry2nix; };
top-packages-2 = pkgs.callPackage ./common-pkgs-2 { inherit poetry2nix; };
}

View file

@ -7,14 +7,16 @@ let
poetryLock = ./poetry.lock;
src = lib.cleanSource ./.;
overrides = poetry2nix.defaultPoetryOverrides // {
alembic = self: super: drv: drv.overrideAttrs(old: {
TESTING_FOOBAR = 42;
});
alembic = self: super: drv: drv.overrideAttrs (
old: {
TESTING_FOOBAR = 42;
}
);
};
};
in
runCommand "test" {} ''
x=${builtins.toString (pyApp.pythonPackages.alembic.TESTING_FOOBAR)}
[ "$x" = "42" ] || exit 1
mkdir $out
''
runCommand "test" {} ''
x=${builtins.toString (pyApp.pythonPackages.alembic.TESTING_FOOBAR)}
[ "$x" = "42" ] || exit 1
mkdir $out
''