Skip to content

Commit 484504c

Browse files
committed
chore: update nix packaging
1 parent d63bab2 commit 484504c

File tree

5 files changed

+8443
-2700
lines changed

5 files changed

+8443
-2700
lines changed

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
inputs = {
3-
nixpkgs.url = github:NixOS/nixpkgs/nixpkgs-unstable;
4-
flake-utils.url = github:numtide/flake-utils;
3+
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
4+
flake-utils.url = "github:numtide/flake-utils";
55
};
66

77
outputs = { self, nixpkgs, flake-utils }:
@@ -12,7 +12,7 @@
1212
};
1313
sanic-cors = import ./sanic-cors.nix {
1414
inherit (pkgs) lib;
15-
inherit (pkgs.python311Packages) setuptools packaging sanic buildPythonPackage fetchPypi;
15+
inherit (pkgs.python313Packages) setuptools packaging sanic buildPythonPackage fetchPypi;
1616
};
1717
webstudio = import ./webstudio.nix {
1818
inherit pkgs;
@@ -37,7 +37,6 @@
3737
};
3838
dependencies = ps: with ps; [
3939
setuptools
40-
wheel
4140
sanic
4241
sanic-cors
4342
pygame
@@ -58,16 +57,19 @@
5857
in
5958
{
6059
packages = rec {
61-
default = pkgs.python311Packages.buildPythonApplication {
60+
default = pkgs.python313Packages.buildPythonApplication {
6261
pname = "bapsicle";
6362
inherit version;
6463
doCheck = false;
65-
propagatedBuildInputs = dependencies pkgs.python311Packages;
64+
build-system = with pkgs.python313Packages; [
65+
poetry-core
66+
];
67+
dependencies = dependencies pkgs.python313Packages;
68+
pyproject = true;
6669
src = ./.;
6770
patches = [
6871
./patches/0-setup.py-fixes.patch
69-
(pkgs.substituteAll {
70-
src = ./patches/1-presenter-build-path.patch;
72+
(pkgs.replaceVars ./patches/1-presenter-build-path.patch {
7173
baps_presenter = "${webstudio}";
7274
ui_static = "${ui-static}";
7375
ui_templates = "${ui-templates}";
@@ -85,6 +87,7 @@
8587
nodejs_20
8688
yarn
8789
ffmpeg_6-full
90+
poetry
8891
];
8992
};
9093
});

0 commit comments

Comments
 (0)