Update inputs

This commit is contained in:
Peder Bergebakken Sundt 2024-05-10 18:58:58 +02:00
parent 25c0f3d6da
commit df0a64f7c9
4 changed files with 1255 additions and 813 deletions

View File

@ -1,12 +1,50 @@
{ {
"nodes": { "nodes": {
"fix-python": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1713887124,
"narHash": "sha256-hGTSm0p9xXUYDgsAAr/ORZICo6T6u33vLfX3tILikaQ=",
"owner": "GuillaumeDesforges",
"repo": "fix-python",
"rev": "f7f4b33e22414071fc1f9cbf68072c413c3a7fdf",
"type": "github"
},
"original": {
"owner": "GuillaumeDesforges",
"repo": "fix-python",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github"
},
"original": {
"id": "flake-utils",
"type": "indirect"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1696019113, "lastModified": 1715266358,
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,8 +56,24 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"fix-python": "fix-python",
"nixpkgs": "nixpkgs" "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", "root": "root",

View File

@ -3,9 +3,14 @@
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
inputs.fix-python.url = "github:GuillaumeDesforges/fix-python";
inputs.fix-python.inputs.nixpkgs.follows = "nixpkgs";
#inputs.fix-python.inputs.flake-utils.follows = "flake-utils";
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs,
fix-python,
... ...
} @ inputs: } @ inputs:
let let
@ -24,10 +29,10 @@
packages = forAllSystems ({ system, pkgs, ...}: rec { packages = forAllSystems ({ system, pkgs, ...}: rec {
sanic-ext = with pkgs.python3.pkgs; buildPythonPackage rec { sanic-ext = with pkgs.python3.pkgs; buildPythonPackage rec {
pname = "sanic-ext"; pname = "sanic-ext";
version = "23.6.0"; version = "23.12.0";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-gd0Ta2t7ef2otP7CRE2YIjlFVXecKYqJFVxnKHoYSQI="; hash = "sha256-QvxB5/r6WPO3kPaF892KjeKBRgtBadDpH04RuHR/hFw=";
}; };
propagatedBuildInputs = [ pyyaml ]; propagatedBuildInputs = [ pyyaml ];
doCheck = false; doCheck = false;
@ -66,6 +71,32 @@
default.program = "${self.packages.${system}.grzegorz-run}/bin/grzegorz-run"; default.program = "${self.packages.${system}.grzegorz-run}/bin/grzegorz-run";
}); });
devShells = forAllSystems ({ system, pkgs, ...}: rec {
default = pkgs.mkShellNoCC {
packages = with pkgs; [
poetry
python3
# mpv # myust be in sync with system glibc
fix-python.packages.${system}.default
];
shellHook = let
inherit (pkgs) lib;
libs = [
pkgs.stdenv.cc.cc.lib # dlopen libstdc++
#pkgs.glibc
#pkgs.zlib
];
addPath = var: paths: subdir: ''
export ${var}=${lib.makeSearchPath subdir libs}"''${${var}:+:$${var}}"
'';
in ''
export NIX_PATH=nixpkgs=${nixpkgs}"''${NIX_PATH:+:$NIX_PATH}"
${addPath "CPATH" libs "include"}
${addPath "LD_LIBRARY_PATH" libs "lib"}
'';
};
});
nixosModules.grzegorz-kiosk = { config, pkgs, ... }: let nixosModules.grzegorz-kiosk = { config, pkgs, ... }: let
inherit (pkgs) lib; inherit (pkgs) lib;
cfg = config.services.grzegorz; cfg = config.services.grzegorz;

1967
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -6,11 +6,11 @@ authors = ["Peder Bergebakken Sundt <pbsds@hotmail.com>"]
license = "MIT" license = "MIT"
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = ">=3.7,<4.0" python = ">=3.8,<4.0"
mpv = ">=0.1" # TODO: do we use this? mpv = ">=0.1" # TODO: do we use this?
yt-dlp = ">=2023.9.24" yt-dlp = ">=2023.9.24"
sanic = ">=21.12.2" sanic = ">=23.12.0,<24"
sanic-ext = ">=23.6.0" sanic-ext = ">=23.12.0,<24"
#sanic-openapi = ">=21.6.1" #sanic-openapi = ">=21.6.1"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]