Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
let
inherit (nixpkgs) lib;

version = "1.2.0"; # x-release-please-version

nixDir = ./packaging/nix;

# Add separateDebugInfo to a derivation
Expand Down Expand Up @@ -66,15 +68,18 @@
packagesWith = pkgs: rec {
default = villas-node;

villas-node-python = pkgs.callPackage (nixDir + "/python.nix") { src = ./.; };
villas-node-python = pkgs.callPackage (nixDir + "/python.nix") {
src = ./.;
inherit version;
};

villas-node-minimal = pkgs.callPackage (nixDir + "/villas.nix") {
src = ./.;
version = "minimal";
version = "${version}-minimal";
};

villas-node = villas-node-minimal.override {
version = "full";
version = "${version}-full";
withAllExtras = true;
withAllFormats = true;
withAllHooks = true;
Expand Down
4 changes: 3 additions & 1 deletion packaging/nix/python.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
src,
pkgs,
python3Packages,
version,
}:
python3Packages.buildPythonPackage {
name = "villas-node";
pname = "villas-node";
inherit version;
src = "${src}/python";
format = "pyproject";
propagatedBuildInputs = with python3Packages; [
Expand Down
Loading