diff --git a/flake.nix b/flake.nix index e57c7fe19c6ec9be2fd1e8e21b31d5490b3d6bfb..00463941550852ec1a58b4826fb65d7cf3d3636f 100644 --- a/flake.nix +++ b/flake.nix @@ -27,39 +27,21 @@ packages = forAllSystems (system: let - pkgs = nixpkgsFor.${system}; - - versionsTool = import versionTool { inherit pkgs; }; - + pkgs = nixpkgsFor.${system}; + + versionToolPackage = versionTool.defaultPackage.${system}; # Das Paket aus der versionTool Flake bauen + versionAndBuild = pkgs.runCommand "get-version-and-build" { outputFiles = [ "version" "build" ]; } '' - ls -lah ${versionTool} - ${versionTool}/bin/version print --git > $out/version - ${versionTool}/bin/version build > $out/build + ls -lah ${versionToolPackage} + ${versionToolPackage}/bin/version print --git > $out/version + ${versionToolPackage}/bin/version build > $out/build ''; version = builtins.readFile "${versionAndBuild}/version"; build = builtins.readFile "${versionAndBuild}/build"; - - # versionToolPackage = versionTool.defaultPackage.${system}; - -# versionAndBuild = pkgs.runCommand "get-version-and-build" { -# outputFiles = [ "version" "build" ]; -# } '' -# ${versionToolPackage}/bin/version print --git > $out/version -# ${versionToolPackage}/bin/version build > $out/build -# ''; - - #version = builtins.trace (builtins.readFile "${versionToolPackage}/version") "Reading version"; - -# version = builtins.trace (builtins.readFile "${versionToolPackage}/version") "Reading version"; -# build = builtins.trace (builtins.readFile "${versionToolPackage}/build") "Reading build"; -# - - - - in + in { docman = pkgs.buildGoModule {