From 7f4d4160ecb07087d9f1ee98df8c131d3835e3fc Mon Sep 17 00:00:00 2001 From: Joakim Holm Date: Sat, 27 Dec 2025 14:12:18 +0100 Subject: [PATCH] Add nix flake --- flake.lock | 61 +++++++++++++++++++++++++++++++++++++++ flake.nix | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ shell.nix | 62 ---------------------------------------- 3 files changed, 144 insertions(+), 62 deletions(-) create mode 100644 flake.lock create mode 100644 flake.nix delete mode 100644 shell.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..f896442 --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "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": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "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", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..ef8cf6c --- /dev/null +++ b/flake.nix @@ -0,0 +1,83 @@ +{ + description = "Forgotten Robot"; + + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + }; + python3Packages = pkgs.python3Packages; + + blackboxprotobuf = python3Packages.buildPythonPackage rec { + pname = "blackboxprotobuf"; + version = "1.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-IztxTmwkzp0cILhxRioiCvkXfk/sAcG3l6xauGoeHOo="; + }; + + propagatedBuildInputs = with python3Packages; [ + protobuf + ]; + + pyproject = true; + build-system = [ python3Packages.setuptools ]; + + patchPhase = '' + sed 's/protobuf==3.10.0/protobuf/' requirements.txt > requirements.txt + ''; + + doCheck = false; + }; + ebooklib = python3Packages.buildPythonPackage rec { + pname = "EbookLib"; + version = "0.18"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-OFYmQ6e8lNm/VumTC0kn5Ok7XR0JF/aXpkVNtaHBpTM="; + }; + propagatedBuildInputs = with python3Packages; [ + six + lxml + ]; + pyproject = true; + build-system = [ python3Packages.setuptools ]; + }; + in + { + devShells.default = pkgs.mkShell { + buildInputs = [ + (pkgs.python3.withPackages(ps: with ps; [ + appdirs + beautifulsoup4 + blackboxprotobuf + ebooklib + httpx + importlib-resources + lxml + pycryptodome + rich + tomli + + # Test + pytest + mypy + types-requests + types-setuptools + + # Build + build + setuptools + twine + ])) + ]; + }; + }); +} diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 83e4454..0000000 --- a/shell.nix +++ /dev/null @@ -1,62 +0,0 @@ -with import {}; - -let - blackboxprotobuf = python3Packages.buildPythonPackage rec { - pname = "blackboxprotobuf"; - version = "1.0.1"; - - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "sha256-IztxTmwkzp0cILhxRioiCvkXfk/sAcG3l6xauGoeHOo="; - }; - - propagatedBuildInputs = with python3Packages; [ - protobuf - ]; - - patchPhase = '' - sed 's/protobuf==3.10.0/protobuf/' requirements.txt > requirements.txt - ''; - - doCheck = false; - }; - ebooklib = python3Packages.buildPythonPackage rec { - pname = "EbookLib"; - version = "0.18"; - src = python3Packages.fetchPypi { - inherit pname version; - sha256 = "sha256-OFYmQ6e8lNm/VumTC0kn5Ok7XR0JF/aXpkVNtaHBpTM="; - }; - propagatedBuildInputs = with python3Packages; [ - six - lxml - ]; - }; -in -mkShell { - buildInputs = [ - (python3.withPackages(ps: with ps; [ - appdirs - beautifulsoup4 - blackboxprotobuf - ebooklib - httpx - importlib-resources - lxml - pycryptodome - rich - tomli - - # Test - pytest - mypy - types-requests - types-setuptools - - # Build - build - setuptools - twine - ])) - ]; -}