diff --git a/flake.lock b/flake.lock index 67f87df..f35dbf6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,5 @@ { "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1752480373, @@ -36,24 +18,8 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 476da66..9f05ba6 100644 --- a/flake.nix +++ b/flake.nix @@ -1,20 +1,18 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - flake-utils.url = "github:numtide/flake-utils"; }; - outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem (system: - let - pkgs = import nixpkgs { system = system; }; - pyprojecttoml = nixpkgs.lib.importTOML ./pyproject.toml; + outputs = { self, nixpkgs }: + let + pyprojecttoml = nixpkgs.lib.importTOML ./pyproject.toml; - supermarktconnector = pkgs.python3Packages.buildPythonPackage { + supermarktconnector = { python3Packages, fetchFromGitHub }: + python3Packages.buildPythonPackage { pname = "supermarktconnector"; version = "0.8.1-2"; format = "setuptools"; - src = pkgs.fetchFromGitHub { + src = fetchFromGitHub { owner = "bartmachielsen"; repo = "SupermarktConnector"; rev = "393c8698a34393f233a0bef45022954bfabe4247"; @@ -22,15 +20,15 @@ }; }; - in rec { - - packages.default = pkgs.python3Packages.buildPythonApplication { + in { + packages = builtins.mapAttrs (system: pkgs: rec { + default = pkgs.python3Packages.buildPythonApplication { pname = pyprojecttoml.project.name; version = pyprojecttoml.project.version; pyproject = true; src = self; dependencies = with pkgs.python3Packages; [ pyquery pytest requests ] - ++ [ supermarktconnector ]; + ++ [ (pkgs.callPackage supermarktconnector {}) ]; nativeBuildInputs = with pkgs.python3Packages; [ setuptools ]; nativeCheckInputs = with pkgs.python3Packages; [ pytest ] ++ [ pkgs.ruff ]; @@ -43,13 +41,12 @@ ''; }; - packages.editable = pkgs.python3Packages.mkPythonEditablePackage { - inherit (packages.default) pname version dependencies; + editable = pkgs.python3Packages.mkPythonEditablePackage { + inherit (default) pname version dependencies; scripts = pyprojecttoml.project.scripts; root = "$PWD/src"; - passthru = { inherit (packages.default) nativeCheckInputs; }; + passthru = { inherit (default) nativeCheckInputs; }; }; - - } - ); + }) nixpkgs.legacyPackages; + }; }