From bd6068d2635fda327dc3948f4eed0ce963e60a89 Mon Sep 17 00:00:00 2001 From: Toast Date: Fri, 30 May 2025 12:44:04 +0200 Subject: [PATCH] Nix: set package version to git rev --- flake.nix | 6 ++++-- package.nix | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 6de1c94..4676780 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs.nixpkgs.url = "nixpkgs/nixos-unstable"; - outputs = { nixpkgs, ... }: + outputs = { nixpkgs, self, ... }: let pkgs = nixpkgs.legacyPackages.x86_64-linux; lib = nixpkgs.lib; @@ -27,7 +27,9 @@ }; packages.x86_64-linux = rec { default = leek; - leek = pkgs.callPackage ./package.nix { }; + leek = pkgs.callPackage ./package.nix { + gitRev = self.sourceInfo.shortRev or self.sourceInfo.dirtyShortRev; + }; }; }; } diff --git a/package.nix b/package.nix index 95fca94..fa4b5e3 100644 --- a/package.nix +++ b/package.nix @@ -1,10 +1,10 @@ -{ - kdePackages, - python3Packages, - qt6 +{ kdePackages +, python3Packages +, qt6 +, gitRev ? "dirty" }: python3Packages.buildPythonApplication rec { pname = "leek"; - version = "0.0.1"; + version = gitRev; pyproject = true; src = ./.; @@ -13,7 +13,7 @@ python3Packages.setuptools ]; - + dependencies = with python3Packages; [ pyside6 tomlkit @@ -25,7 +25,7 @@ propagatedBuildInputs = [ kdePackages.kirigami - ]; + ]; makeWrapperArgs = [ "\${qtWrapperArgs[@]}"