denis/flake
1
0
Fork 0
mirror of https://github.com/denismhz/flake.git synced 2025-11-09 16:16:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from arcnmx/update-2023-03-04

Browse source 
flake update
This commit is contained in:
Max 2023-03-13 19:56:05 +00:00 committed by GitHub
parent 7da23cb242 193981b84d
commit 59bba5c414
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 55 additions and 307 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
flake.lock
View file

@ -7,11 +7,11 @@
]
},
"locked": {
"lastModified": 1675933616,
"narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=",
"lastModified": 1677714448,
"narHash": "sha256-Hq8qLs8xFu28aDjytfxjdC96bZ6pds21Yy09mSC156I=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "47478a4a003e745402acf63be7f9a092d51b83d7",
"rev": "dc531e3a9ce757041e1afaff8ee932725ca60002",
"type": "github"
},
"original": {
@ -208,11 +208,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1675763311,
"narHash": "sha256-bz0Q2H3mxsF1CUfk26Sl9Uzi8/HFjGFD/moZHz1HebU=",
"lastModified": 1677932085,
"narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fab09085df1b60d6a0870c8a89ce26d5a4a708c2",
"rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89",
"type": "github"
},
"original": {

65
modules/aipython3/overlays.nix
View file

@ -1,16 +1,39 @@
pkgs: {
fixPackages = final: prev: {
pytorch-lightning = prev.pytorch-lightning.overrideAttrs (old: {
fixPackages = final: prev: let
relaxProtobuf = pkg: pkg.overrideAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ final.pythonRelaxDepsHook ];
pythonRelaxDeps = [ "protobuf" ];
});
wandb = prev.wandb.overrideAttrs (old: {
in {
pytorch-lightning = relaxProtobuf prev.pytorch-lightning;
wandb = relaxProtobuf prev.wandb;
markdown-it-py = prev.markdown-it-py.overrideAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ final.pythonRelaxDepsHook ];
pythonRelaxDeps = [ "protobuf" ];
pythonRelaxDeps = [ "linkify-it-py" ];
passthru = old.passthru // {
optional-dependencies = with final; {
linkify = [ linkify-it-py ];
plugins = [ mdit-py-plugins ];
};
};
});
scikit-image = final.scikitimage;
#overriding because of https://github.com/NixOS/nixpkgs/issues/196653
opencv4 = prev.opencv4.override { openblas = pkgs.blas; };
filterpy = prev.filterpy.overrideAttrs (old: {
doInstallCheck = false;
});
shap = prev.shap.overrideAttrs (old: {
doInstallCheck = false;
propagatedBuildInputs = old.propagatedBuildInputs ++ [ final.packaging ];
pythonImportsCheck = [ "shap" ];
meta = old.meta // {
broken = false;
};
});
streamlit = let
streamlit = final.callPackage (pkgs.path + "/pkgs/applications/science/machine-learning/streamlit") {
protobuf3 = final.protobuf;
};
in final.toPythonModule (relaxProtobuf streamlit);
};
extraDeps = final: prev: let
@ -21,44 +44,42 @@ pkgs: {
callPackage = final.callPackage;
rmCallPackage = path: args: rm (callPackage path args);
in {
scikit-image = final.scikitimage;
opencv-python-headless = final.opencv-python;
opencv-python = final.opencv4;
safetensors = callPackage ../../packages/safetensors { };
compel = callPackage ../../packages/compel { };
apispec-webframeworks = callPackage ../../packages/apispec-webframeworks { };
pydeprecate = callPackage ../../packages/pydeprecate { };
taming-transformers-rom1504 =
callPackage ../../packages/taming-transformers-rom1504 { };
albumentations = rmCallPackage ../../packages/albumentations { opencv-python-headless = final.opencv4; };
qudida = rmCallPackage ../../packages/qudida { opencv-python-headless = final.opencv4; };
gfpgan = rmCallPackage ../../packages/gfpgan { opencv-python = final.opencv4; };
basicsr = rmCallPackage ../../packages/basicsr { opencv-python = final.opencv4; };
facexlib = rmCallPackage ../../packages/facexlib { opencv-python = final.opencv4; };
realesrgan = rmCallPackage ../../packages/realesrgan { opencv-python = final.opencv4; };
codeformer = callPackage ../../packages/codeformer { opencv-python = final.opencv4; };
clipseg = rmCallPackage ../../packages/clipseg { opencv-python = final.opencv4; };
filterpy = callPackage ../../packages/filterpy { };
albumentations = rmCallPackage ../../packages/albumentations { };
qudida = rmCallPackage ../../packages/qudida { };
gfpgan = rmCallPackage ../../packages/gfpgan { };
basicsr = rmCallPackage ../../packages/basicsr { };
facexlib = rmCallPackage ../../packages/facexlib { };
realesrgan = rmCallPackage ../../packages/realesrgan { };
codeformer = callPackage ../../packages/codeformer { };
clipseg = rmCallPackage ../../packages/clipseg { };
kornia = callPackage ../../packages/kornia { };
lpips = callPackage ../../packages/lpips { };
ffmpy = callPackage ../../packages/ffmpy { };
shap = callPackage ../../packages/shap { };
picklescan = callPackage ../../packages/picklescan { };
diffusers = callPackage ../../packages/diffusers { };
pypatchmatch = callPackage ../../packages/pypatchmatch { };
fonts = callPackage ../../packages/fonts { };
font-roboto = callPackage ../../packages/font-roboto { };
analytics-python = callPackage ../../packages/analytics-python { };
markdown-it-py = callPackage ../../packages/markdown-it-py { };
gradio = callPackage ../../packages/gradio { };
hatch-requirements-txt = callPackage ../../packages/hatch-requirements-txt { };
timm = callPackage ../../packages/timm { };
blip = callPackage ../../packages/blip { };
fairscale = callPackage ../../packages/fairscale { };
torch-fidelity = callPackage ../../packages/torch-fidelity { };
resize-right = callPackage ../../packages/resize-right { };
torchdiffeq = callPackage ../../packages/torchdiffeq { };
k-diffusion = callPackage ../../packages/k-diffusion { clean-fid = final.clean-fid; };
k-diffusion = callPackage ../../packages/k-diffusion { };
accelerate = callPackage ../../packages/accelerate { };
clip-anytorch = callPackage ../../packages/clip-anytorch { };
jsonmerge = callPackage ../../packages/jsonmerge { };
clean-fid = callPackage ../../packages/clean-fid { };
getpass-asterisk = callPackage ../../packages/getpass-asterisk { };
};

1
packages/apispec-webframeworks/default.nix
View file

@ -13,6 +13,7 @@ python3Packages.buildPythonPackage rec {
propagatedBuildInputs = with python3Packages; [
apispec
packaging
pyyaml
];
nativeCheckInputs = with python3Packages; [

4
packages/diffusers/default.nix
View file

@ -34,14 +34,14 @@
buildPythonPackage rec {
pname = "diffusers";
version = "0.13.1";
version = "0.14.0";
disabled = isPy27;
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-KbZ6HvNNn1sFw+qwpJZpfaskllLSmNp0JVuKpPxPjkw=";
sha256 = "sha256-sqQqEtq1OMtFo7DGVQMFO6RG5fLfSDbeOFtSON+DCkY=";
};
propagatedBuildInputs = [

40
packages/filterpy/default.nix
View file

@ -1,40 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, numpy
, scipy
, matplotlib
, pytest
, isPy3k
}:
buildPythonPackage rec {
version = "1.4.5";
pname = "filterpy";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "4f2a4d39e4ea601b9ab42b2db08b5918a9538c168cff1c6895ae26646f3d73b1";
};
checkInputs = [ pytest ];
propagatedBuildInputs = [ numpy scipy matplotlib ];
# single test fails (even on master branch of repository)
# project does not use CI
checkPhase = ''
pytest --ignore=filterpy/common/tests/test_discretization.py
'';
doCheck = false;
dontUsePythonImportsCheck = true;
meta = with lib; {
homepage = "https://github.com/rlabbe/filterpy";
description = "Kalman filtering and optimal estimation library";
license = licenses.mit;
maintainers = [ maintainers.costrouc ];
};
}

37
packages/hatch-requirements-txt/default.nix
View file

@ -1,37 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, hatchling
, packaging
}:
buildPythonPackage rec {
pname = "hatch-requirements-txt";
version = "0.2.0";
disabled = pythonOlder "3.6.1";
format = "pyproject";
# We use the Pypi release, as it provides prebuild webui assets,
# and its releases are also more frequent than github tags
src = fetchPypi {
pname = "hatch_requirements_txt";
inherit version;
sha256 = "sha256-I8z34vvPK7Mg9+Xg2nMgNcgeh5QFB0LV2j0iwzA1QGc=";
};
nativeBuildInputs = [
];
propagatedBuildInputs = [
hatchling
packaging
];
# TODO FIXME
doCheck = false;
meta = with lib; {
homepage = "https://github.com/repo-helper/hatch-requirements-txt";
description = "Hatchling plugin to read project dependencies from requirements.txt";
};
}

34
packages/jsonmerge/default.nix
View file

@ -1,34 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, jsonschema
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "jsonmerge";
version = "1.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "a86bfc44f32f6a28b749743df8960a4ce1930666b3b73882513825f845cb9558";
};
propagatedBuildInputs = [ jsonschema ];
checkInputs = [ pytestCheckHook ];
disabledTests = [
# Fails with "Unresolvable JSON pointer"
"test_local_reference_in_meta"
"test_reference_in_meta"
];
meta = with lib; {
description = "Merge a series of JSON documents";
homepage = "https://github.com/avian2/jsonmerge";
changelog = "https://github.com/avian2/jsonmerge/blob/jsonmerge-${version}/ChangeLog";
license = licenses.mit;
maintainers = with maintainers; [ emily ];
};
}

70
packages/markdown-it-py/default.nix
View file

@ -1,70 +0,0 @@
{ lib
, attrs
, buildPythonPackage
, fetchFromGitHub
, linkify-it-py
, mdit-py-plugins
, mdurl
, psutil
, pytest-benchmark
, pytest-regressions
, pytestCheckHook
, pythonOlder
, typing-extensions
}:
buildPythonPackage rec {
pname = "markdown-it-py";
version = "2.1.0";
format = "flit";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "executablebooks";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-6UATJho3SuIbLktZtFcDrCTWIAh52E+n5adcgl49un0=";
};
postPatch = ''
# Allow linkify-it-py v2.
# This only affects projects that depend on 'markdown-it-py[linkify]'
# https://github.com/executablebooks/markdown-it-py/pull/218
substituteInPlace pyproject.toml \
--replace "linkify-it-py~=1.0" "linkify-it-py>=1,<3"
'';
propagatedBuildInputs = [
attrs
mdurl
] ++ lib.optional (pythonOlder "3.8") [
typing-extensions
];
passthru.optional-dependencies = {
linkify = [ linkify-it-py ];
plugins = [ mdit-py-plugins ];
};
checkInputs = [
linkify-it-py
psutil
pytest-benchmark
pytest-regressions
pytestCheckHook
];
pythonImportsCheck = [
"markdown_it"
];
meta = with lib; {
description = "Markdown parser in Python";
homepage = "https://markdown-it-py.readthedocs.io/";
changelog = "https://github.com/executablebooks/markdown-it-py/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ bhipple ];
};
}

63
packages/shap/default.nix
View file

@ -1,63 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, writeText
, isPy27
, pytestCheckHook
, pytest-mpl
, numpy
, scipy
, scikit-learn
, pandas
, transformers
, opencv4
, lightgbm
, catboost
, pyspark
, sentencepiece
, tqdm
, slicer
, numba
, matplotlib
, nose
, lime
, cloudpickle
, ipython
, packaging
}:
buildPythonPackage rec {
pname = "shap";
version = "0.41.0";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "sha256-pJ6k1lqtvIRaaV+j1+oL38jJKLjiE7D+7fWGit5LPKU=";
};
propagatedBuildInputs = [
numpy
scipy
scikit-learn
pandas
tqdm
slicer
numba
cloudpickle
packaging
];
passthru.optional-dependencies = {
plots = [ matplotlib ipython ];
others = [ lime ];
};
# TODO FIXME
doCheck = false;
meta = with lib; {
description = "A unified approach to explain the output of any machine learning model";
homepage = "https://github.com/slundberg/shap";
};
}

26
packages/timm/default.nix
View file

@ -1,26 +0,0 @@
# WARNING: This file was automatically generated. You should avoid editing it.
# If you run pynixify again, the file will be either overwritten or
# deleted, and you will lose the changes you made to it.
{ buildPythonPackage, fetchPypi, huggingface-hub, lib, pyyaml, torch
, torchvision }:
buildPythonPackage rec {
pname = "timm";
version = "0.6.11";
src = fetchPypi {
inherit pname version;
sha256 = "199zgg574gijw52jn4fhfzaqlbwhq0z8kav4k34xifssnr18hmh9";
};
propagatedBuildInputs = [ torch torchvision pyyaml huggingface-hub ];
# TODO FIXME
doCheck = false;
meta = with lib; {
description = "(Unofficial) PyTorch Image Models";
homepage = "https://github.com/rwightman/pytorch-image-models";
};
}

10
projects/invokeai/package.nix
View file

@ -1,6 +1,4 @@
{ aipython3
# dependencies
, streamlit
# misc
, lib
, src
@ -21,6 +19,7 @@ aipython3.buildPythonPackage {
inherit src;
propagatedBuildInputs = with aipython3; [
numpy
dnspython
albumentations
opencv4
pudb
@ -32,10 +31,7 @@ aipython3.buildPythonPackage {
protobuf
omegaconf
test-tube
((streamlit.overrideAttrs (old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pythonRelaxDepsHook ];
pythonRelaxDeps = [ "protobuf" ];
})).override { protobuf3 = protobuf; })
streamlit
einops
taming-transformers-rom1504
torch-fidelity
@ -62,7 +58,7 @@ aipython3.buildPythonPackage {
];
nativeBuildInputs = [ aipython3.pythonRelaxDepsHook ];
pythonRemoveDeps = [ "clip" "pyreadline3" "flaskwebgui" "opencv-python" ];
pythonRelaxDeps = [ "protobuf" "flask" "flask-socketio" "pytorch-lightning" ];
pythonRelaxDeps = [ "dnspython" "protobuf" "flask" "flask-socketio" "pytorch-lightning" ];
makeWrapperArgs = [
'' --run '
if [ -d "/usr/lib/wsl/lib" ]