spoolman: 0.22.1 -> 0.23.1 (#502321)

This commit is contained in:
Marcin Serwin
2026-04-20 14:49:15 +00:00
committed by GitHub
3 changed files with 30 additions and 6 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub }:
let
version = "0.22.1";
version = "0.23.1";
in
{
inherit version;
@@ -9,7 +9,7 @@ in
owner = "Donkie";
repo = "Spoolman";
rev = "v${version}";
hash = "sha256-EVGpwcjEh4u8Vtgu2LypqMqArYLZe7oh1qYhGZpgjh0=";
hash = "sha256-Oa/cNmpc0hWRf0EQI5aXIE/p9//Sos5Nj3QFEjKgj5o=";
};
meta = {
+1 -1
View File
@@ -10,7 +10,7 @@ buildNpmPackage {
src = "${common.src}/client";
npmDepsHash = "sha256-E4DvEOSHfwwM0C+vTRMDQbCNv2IDyFOFwfqszrI+uOA=";
npmDepsHash = "sha256-8ojD7xMxRE9+b4O7vJdwKwrg8aYukYc3l+LF5enKFgA=";
VITE_APIURL = "/api/v1";
+27 -3
View File
@@ -10,6 +10,13 @@ let
common = callPackage ./common.nix { };
frontend = callPackage ./frontend.nix { };
python = python312;
hishel_0_1 = python.pkgs.hishel.overrideAttrs (old: rec {
version = "0.1.5";
src = old.src.override {
tag = version;
hash = "sha256-OyQR/ruowNk5z4ITRHcIJn1kc0xLZiofmxajf6hNR9k=";
};
});
in
python.pkgs.buildPythonPackage rec {
@@ -21,22 +28,39 @@ python.pkgs.buildPythonPackage rec {
nativeBuildInputs = [
makeWrapper
python.pkgs.pdm-backend
python.pkgs.setuptools
python.pkgs.pythonRelaxDepsHook
];
pythonRelaxDeps = [ "setuptools" ];
pythonRelaxDeps = [
"setuptools"
"websockets"
];
postPatch = ''
substituteInPlace pyproject.toml --replace-fail psycopg2-binary psycopg2
# upstream removed [build-system] in 0.23.x, causing setuptools
# to fail on the flat layout with multiple top-level directories
cat >> pyproject.toml <<EOF
[build-system]
requires = ["setuptools"]
build-backend = "setuptools.build_meta"
[tool.setuptools.packages.find]
include = ["spoolman*"]
EOF
'';
propagatedBuildInputs = with python.pkgs; [
uvloop
alembic
aiomysql
anysqlite
asyncpg
fastapi
hishel
hishel_0_1
httptools
httpx
aiosqlite