From 79f339e98978ba72b640f231c5d032fbfab756fe Mon Sep 17 00:00:00 2001
From: Volker Schukai <volker.schukai@schukai.com>
Date: Sat, 5 Aug 2023 23:07:49 +0200
Subject: [PATCH] chore: Update Nixpkgs and refactor build process
- Update Nixpkgs/NixOS version
- Update `lastModifiedDate` for older versions of flakes
- Add `versionAndBuild` calculation for fetching version and build
- Remove commented out code for fetching version and build
- Update `versionToolPackage` assignment
- Remove `version` and `build` assignments after `versionAndBuild` calculation
- Update `version` and `build` assignments within `versionAndBuild` calculation
- Add output files `"version"` and `"build"` to `versionAndBuild` calculation
- Update `versionTool.defaultPackage.${system}` assignment in `buildInputs`
- Update `vendorSha256` value
- Update `ldflags` value in `docman` build phase
- Add `homepage` field to `meta` attribute for `docman`
- Update `maintainers` field in `meta` attribute for `docman`
- Update `buildInputs` field in `default` devShell
---
flake.nix | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/flake.nix b/flake.nix
index 680c90e..1298aa3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -45,14 +45,20 @@
# Build the versionTool for the current system.
versionToolPackage = versionTool.defaultPackage.${system};
- versionAndBuild = pkgs.runCommand "get-version-and-build" {} ''
- ${versionToolPackage}/bin/version print --git > $out.version
- ${versionToolPackage}/bin/version build > $out.build
- '';
-
- version = builtins.readFile "${versionAndBuild}.version";
- build = builtins.readFile "${versionAndBuild}.build";
-
+# versionAndBuild = pkgs.runCommand "get-version-and-build" {} ''
+# ${versionToolPackage}/bin/version print --git > $out.version
+# ${versionToolPackage}/bin/version build > $out.build
+# '';
+#
+# version = builtins.readFile "${versionAndBuild}.version";
+# build = builtins.readFile "${versionAndBuild}.build";
+
+ versionAndBuild = pkgs.runCommand "get-version-and-build" {
+ outputFiles = [ "version" "build" ];
+ } ''
+ ${versionToolPackage}/bin/version print --git > $out/version
+ ${versionToolPackage}/bin/version build > $out/build
+ '';
in
--
GitLab