From 5a8bcc213c5a5d3885d76e1cadf02562a2ff53d8 Mon Sep 17 00:00:00 2001 From: "D. Moonfire" Date: Sun, 5 Nov 2023 11:30:12 -0600 Subject: [PATCH] fix: getting the build to work --- flake.nix | 91 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/flake.nix b/flake.nix index 6960887..dd987cb 100644 --- a/flake.nix +++ b/flake.nix @@ -3,57 +3,62 @@ inputs = { nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz"; - flake-utils.url = - "https://flakehub.com/f/numtide/flake-utils/0.1.85.tar.gz"; + flake-utils.url = "https://flakehub.com/f/numtide/flake-utils/0.1.85.tar.gz"; }; - outputs = { self, nixpkgs, flake-utils, ... }: - let pythonVersion = "python39"; - in flake-utils.lib.eachDefaultSystem (system: - let - pkgs = nixpkgs.legacyPackages.${system}; - lib = pkgs.lib; - python3Packages = pkgs.python3Packages; - fetchPypi = pkgs.fetchPypi; + outputs = { + self, + nixpkgs, + flake-utils, + ... + }: let + pythonVersion = "python39"; + in + flake-utils.lib.eachDefaultSystem (system: let + pkgs = nixpkgs.legacyPackages.${system}; + lib = pkgs.lib; + python3Packages = pkgs.python3Packages; + fetchPypi = pkgs.fetchPypi; - src = pkgs.fetchFromGitHub { - owner = "webcomics"; - repo = "dosage"; - rev = "9163317abadcef0a562afaaf422828b56d006e20"; - hash = "sha256-t5HxvXCFPNG5K1uDtfIxDo6JV921ywY1Eznj7GoSh44="; - }; - in rec { - defaultPackage = python3Packages.buildPythonApplication rec { - pname = "dosage"; - version = "3.1.dev104+g9e05fae304"; - format = "pyproject"; + pkgSrc = pkgs.fetchFromGitHub { + owner = "webcomics"; + repo = "dosage"; + rev = "9163317abadcef0a562afaaf422828b56d006e20"; + hash = "sha256-t5HxvXCFPNG5K1uDtfIxDo6JV921ywY1Eznj7GoSh44="; + }; + in rec { + defaultPackage = python3Packages.buildPythonApplication rec { + pname = "dosage"; + version = "3.1.dev104+g9e05fae304"; + format = "pyproject"; - nativeCheckInputs = with python3Packages; [ - pytestCheckHook - pytest-xdist - responses - ]; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-xdist + responses + ]; - requirements = "${src}/setup/requirements.txt"; + src = pkgSrc; + requirements = "${src}/setup/requirements.txt"; - nativeBuildInputs = with python3Packages; [ setuptools-scm ]; + nativeBuildInputs = with python3Packages; [setuptools-scm]; - propagatedBuildInputs = with python3Packages; [ - colorama - imagesize - lxml - platformdirs - requests - ]; + propagatedBuildInputs = with python3Packages; [ + colorama + imagesize + lxml + platformdirs + requests + ]; - meta = { - description = "A comic strip downloader and archiver"; - homepage = "https://dosage.rocks/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ dmoonfire ]; - }; + meta = { + description = "A comic strip downloader and archiver"; + homepage = "https://dosage.rocks/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [dmoonfire]; }; + }; - formatter = pkgs.alejandra; - }); + formatter = pkgs.alejandra; + }); }