chore: update deps and flake file

This commit is contained in:
fusion44 2024-12-16 15:20:46 +01:00
parent d3902e1c2b
commit 149bd30b15
No known key found for this signature in database
6 changed files with 3360 additions and 1940 deletions

View file

@ -6,15 +6,18 @@
flake-utils.url = "github:numtide/flake-utils";
};
outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs { inherit system; };
in
{
outputs = {
self,
nixpkgs,
flake-utils,
}:
flake-utils.lib.eachDefaultSystem (
system: let
pkgs = import nixpkgs {inherit system;};
in {
devShell = pkgs.mkShell {
buildInputs = with pkgs; [
(python3.withPackages (ps: [ ps.grpcio ps.grpcio-tools ]))
(python3.withPackages (ps: [ps.grpcio ps.grpcio-tools]))
curl
jq
];

40
flake.lock generated
View file

@ -5,11 +5,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@ -23,11 +23,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
@ -44,11 +44,11 @@
]
},
"locked": {
"lastModified": 1698974481,
"narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=",
"lastModified": 1729742964,
"narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "4bb5e752616262457bc7ca5882192a564c0472d2",
"rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
"type": "github"
},
"original": {
@ -59,11 +59,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1708296515,
"narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=",
"lastModified": 1734119587,
"narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b98a4e1746acceb92c509bc496ef3d0e5ad8d4aa",
"rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
"type": "github"
},
"original": {
@ -84,15 +84,15 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1708461316,
"narHash": "sha256-ps4iUzLemN4Tc8W7yO68sqrVkvXW8JHwXgbRX7VT1UM=",
"owner": "fusion44",
"lastModified": 1731205797,
"narHash": "sha256-F7N1mxH1VrkVNHR3JGNMRvp9+98KYO4b832KS8Gl2xI=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "d7c22c0cddfea96e068d16da7a8265460da87408",
"rev": "f554d27c1544d9c56e5f1f8e2b8aff399803674e",
"type": "github"
},
"original": {
"owner": "fusion44",
"owner": "nix-community",
"repo": "poetry2nix",
"type": "github"
}
@ -156,11 +156,11 @@
]
},
"locked": {
"lastModified": 1699786194,
"narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
"lastModified": 1730120726,
"narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
"rev": "9ef337e492a5555d8e17a51c911ff1f02635be15",
"type": "github"
},
"original": {

View file

@ -1,35 +1,63 @@
{
description = "Application packaged using poetry2nix";
description = "A management backend for the RaspiBlitz project written in Python / FastAPI";
inputs = {
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
poetry2nix = {
url = "github:fusion44/poetry2nix";
url = "github:nix-community/poetry2nix";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self, nixpkgs, flake-utils, poetry2nix }:
flake-utils.lib.eachDefaultSystem (system:
let
# see https://github.com/nix-community/poetry2nix/tree/master#api for more functions and examples.
pkgs = nixpkgs.legacyPackages.${system};
inherit (poetry2nix.lib.mkPoetry2Nix { inherit pkgs; }) mkPoetryApplication;
in
{
packages = {
myapp = mkPoetryApplication { projectDir = self; };
default = self.packages.${system}.myapp;
};
outputs = {
self,
nixpkgs,
flake-utils,
poetry2nix,
}: let
name = "blitz-api";
devShells.default = pkgs.mkShell {
inputsFrom = [ self.packages.${system}.myapp ];
packages = with pkgs; [
poetry
pyright
sshpass
];
systems = flake-utils.lib.eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages.${system};
inherit (poetry2nix.lib.mkPoetry2Nix {inherit pkgs;}) mkPoetryApplication overrides mkPoetryEnv;
poetryDev = mkPoetryEnv {
projectDir = ./.;
preferWheels = true;
overrides = overrides.withDefaults (final: prev: {
ruff = prev.ruff.override {
preferWheel = true;
};
});
};
in {
packages = {
default = self.packages.${system}.${name};
${name} = mkPoetryApplication {
projectDir = ./.;
meta.mainProgram = name;
};
});
poetryDev = mkPoetryEnv {
projectDir = ./.;
preferWheels = true;
};
};
devShells.default = pkgs.mkShell {
nativeBuildInputs = with pkgs; [
poetry
poetryDev
pyright
alejandra
];
};
});
overlays.overlays = {
default = final: prev: {
${name} = self.packages.${prev.stdenv.hostPlatform.system}.${name};
};
};
in
systems // overlays;
}

2930
poetry.lock generated

File diff suppressed because it is too large Load diff

View file

@ -10,19 +10,19 @@ packages = [
[tool.poetry.dependencies]
python = "^3.11"
fastapi = "^0.109.2"
fastapi = {extras = ["standard"], version = "^0.115.6"}
fastapi-plugins = "^0.13.0"
anyio = "^4.3.0"
redis = "^5.0.1"
aioredis = "^2.0.1"
pydantic = "^2.6.1"
uvicorn = "^0.27.1"
uvicorn = {extras = ["standard"], version = "^0.34.0"}
pyjwt = "^2.8.0"
python-decouple = "^3.8"
psutil = "^5.9.8"
requests = "^2.31.0"
pyzmq = "^25.1.2"
aiohttp = "^3.9.4"
aiohttp = "^3.11.10"
grpcio = "^1.60.1"
grpcio-tools = "^1.60.1"
googleapis-common-protos = "^1.62.0"
@ -36,8 +36,8 @@ pytest = "^8.0.1"
pytest-asyncio = "^0.23.5"
coverage = "^7.4.2"
isort = "^5.13.2"
ruff = "^0.1.15"
ruff-lsp = "^0.0.52"
ruff = "^0.8.3"
ruff-lsp = "^0.0.59"
debugpy = "^1.8.1"
click = "^8.1.7"

File diff suppressed because it is too large Load diff