Toast/Leek
1
0
Fork 0
Code Issues 5 Pull requests 2 Projects 3 Releases 3 Activity

Revert "Nix: set package version to git rev"

Browse source 
This reverts commit bd6068d263.
This commit is contained in:
Toast 2025-05-31 01:33:19 +02:00
parent ef634f7ae7
commit ff6ce97df2
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.nix
View file

@ -3,7 +3,7 @@
inputs.nixpkgs.url = "nixpkgs/nixos-unstable"; inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
outputs = { nixpkgs, self, ... }: outputs = { nixpkgs, ... }:
let let
pkgs = nixpkgs.legacyPackages.x86_64-linux; pkgs = nixpkgs.legacyPackages.x86_64-linux;
lib = nixpkgs.lib; lib = nixpkgs.lib;
@ -28,9 +28,7 @@
}; };
packages.x86_64-linux = rec { packages.x86_64-linux = rec {
default = leek; default = leek;
leek = pkgs.callPackage ./package.nix { leek = pkgs.callPackage ./package.nix { };
gitRev = self.sourceInfo.shortRev or self.sourceInfo.dirtyShortRev;
};
}; };
}; };
} }

14
package.nix
View file

@ -1,10 +1,10 @@
{ kdePackages {
, python3Packages kdePackages,
, qt6 python3Packages,
, gitRev ? "dirty" qt6
}: python3Packages.buildPythonApplication rec { }: python3Packages.buildPythonApplication rec {
pname = "leek"; pname = "leek";
version = gitRev; version = "0.0.1";
pyproject = true; pyproject = true;
src = ./.; src = ./.;
@ -14,7 +14,7 @@
setuptools-scm setuptools-scm
]; ];
dependencies = with python3Packages; [ dependencies = with python3Packages; [
pyside6 pyside6
tomlkit tomlkit
@ -26,7 +26,7 @@
propagatedBuildInputs = [ propagatedBuildInputs = [
kdePackages.kirigami kdePackages.kirigami
]; ];
makeWrapperArgs = [ makeWrapperArgs = [
"\${qtWrapperArgs[@]}" "\${qtWrapperArgs[@]}"