diff --git a/devenv.nix b/devenv.nix index cb1c712be2f7913fddea6c62b3f6e58d2ef46a12..3c8f47ce816ba2aea4fd6ccebd99763fb1acc8c5 100644 --- a/devenv.nix +++ b/devenv.nix @@ -176,6 +176,9 @@ fi git --no-pager log --decorate=short --pretty=oneline gitVersion=$(version print --git) +echo '{ "version": "''${gitVersion}" }' > version.json +git add version.json +git commit -m "Update version to ''${gitVersion}" for file in $(exa "''${project_root}"dist/*); do diff --git a/flake.lock b/flake.lock index d1784cad877a3e70b0fc14ee3d5920dbc767804c..687ebff00643975bd75a8439c24bc1f18060ff86 100644 --- a/flake.lock +++ b/flake.lock @@ -15,39 +15,9 @@ "type": "indirect" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1689431009, - "narHash": "sha256-hPgQCRWP5q/Xc4qOIP3c2krR9nQua78+t9EDiuey5nc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "af8279f65fe71ce5a448408034a8c06e2b4b2c66", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, "root": { "inputs": { - "nixpkgs": "nixpkgs", - "versionTool": "versionTool" - } - }, - "versionTool": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "narHash": "sha256-jzixQKFFW4oxO0S4GYqbkFCXzhBd6com6Z9+MtVKakU=", - "type": "tarball", - "url": "https://gitlab.schukai.com/oss/utilities/version/-/archive/0.5.0/version-0.5.0.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://gitlab.schukai.com/oss/utilities/version/-/archive/0.5.0/version-0.5.0.tar.gz" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 71330a3eaca7121f7c3f7e4b9d25b73b5ce6ee5d..7b7e36b90249625fad2123e1b1cb7ecf5369ea5a 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ nixpkgs.url = "nixpkgs/nixos-23.05"; }; - outputs = { self, nixpkgs, versionTool, ... }: + outputs = { self, nixpkgs, ... }: let lastModifiedDate = self.lastModifiedDate or self.lastModified or "19700101"; @@ -27,11 +27,13 @@ name = "docman"; version = "${self.ref}"; + + src = ././source; vendorSha256 = "sha256-81IBG8H1jsYKD+tmFeCpAWFdz6cuQDt9r+FV56xboBU="; ldflags = [ - "-X 'gitlab.schukai.com/oss/utilities/documentation-manager/release.version=${self.ref}' -X 'gitlab.schukai.com/oss/utilities/documentation-manager/release.build=${self.rev}'" + "-X 'gitlab.schukai.com/oss/utilities/documentation-manager/release.version=${self.ref}' -X 'gitlab.schukai.com/oss/utilities/documentation-manager/release.build=${self.lastModified}'" ];