diff --git a/flake.nix b/flake.nix index 84abd169a..2f5417816 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,8 @@ let inherit (nixpkgs) lib; + version = "1.2.0"; # x-release-please-version + nixDir = ./packaging/nix; # Add separateDebugInfo to a derivation @@ -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; diff --git a/packaging/nix/python.nix b/packaging/nix/python.nix index d91af6ef0..fdd41f54d 100644 --- a/packaging/nix/python.nix +++ b/packaging/nix/python.nix @@ -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; [