Update Nix package definitions to include webcomix and enhance overlays. Refactor download.nix to utilize buildPythonApplication and streamline dependencies, ensuring proper integration of new packages.
This commit is contained in:
parent
d1f011ba1f
commit
cd60c3ad69
13
flake.nix
13
flake.nix
@ -11,6 +11,7 @@
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
config.allowUnfree = true;
|
||||
overlays = [ inputs.self.overlays.default ];
|
||||
};
|
||||
generatePackages =
|
||||
args:
|
||||
@ -29,15 +30,11 @@
|
||||
in
|
||||
{
|
||||
overlays.default = _final: prev: {
|
||||
scrapy = prev.scrapy.overrideAttrs (_old: rec {
|
||||
version = "2.11.2";
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "scrapy";
|
||||
repo = "scrapy";
|
||||
tag = version;
|
||||
hash = "sha256-EaO1kQ3VSTwEW+r0kSKycOxHNTPwwCVjch1ZBrTU0qQ=";
|
||||
python3Packages = prev.python3Packages.override {
|
||||
overrides = pyself: pysuper: {
|
||||
webcomix = prev.python3Packages.callPackage ./pkgs_pr/webcomix.nix { };
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
packages.x86_64-linux =
|
||||
let
|
||||
|
||||
@ -1,14 +1,19 @@
|
||||
{
|
||||
python3Packages,
|
||||
buildPythonApplication,
|
||||
setuptools,
|
||||
pyyaml,
|
||||
types-pyyaml,
|
||||
yt-dlp,
|
||||
gallery-dl,
|
||||
ffmpeg,
|
||||
webcomix,
|
||||
...
|
||||
}:
|
||||
let
|
||||
pname = "download";
|
||||
version = "2.6";
|
||||
in
|
||||
python3Packages.buildPythonApplication {
|
||||
buildPythonApplication {
|
||||
inherit pname version;
|
||||
|
||||
src = builtins.path {
|
||||
@ -18,18 +23,14 @@ python3Packages.buildPythonApplication {
|
||||
|
||||
pyproject = true;
|
||||
|
||||
build-system = [ python3Packages.setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
ffmpeg
|
||||
gallery-dl
|
||||
# (callPackage ../pkgs_pr/webcomix.nix { })
|
||||
]
|
||||
++ builtins.attrValues {
|
||||
inherit (python3Packages)
|
||||
pyyaml
|
||||
types-pyyaml
|
||||
yt-dlp
|
||||
;
|
||||
};
|
||||
webcomix
|
||||
];
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user