diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000000000000000000000000000000000000..d1784cad877a3e70b0fc14ee3d5920dbc767804c --- /dev/null +++ b/flake.lock @@ -0,0 +1,56 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1691155011, + "narHash": "sha256-O15tC0ysw+fcacEbOzrDrkVNIR+SgtArSGvpgsEqpvA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9652a97d9738d3e65cf33c0bc24429e495a7868f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.05", + "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" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index 3d44d7c91a332e22ee070df8aa117161b220fde7..3444370884804bf944dca9fc1ee2e13e86446b78 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,13 @@ description = "docman is a document management tool"; # Nixpkgs / NixOS version to use. - inputs.nixpkgs.url = "nixpkgs/nixos-23.05"; + + inputs = { + nixpkgs.url = "nixpkgs/nixos-23.05"; + versionTool.url = "https://gitlab.schukai.com/oss/utilities/version/-/archive/0.5.0/version-0.5.0.tar.gz"; + }; - outputs = { self, nixpkgs }: + outputs = { self, nixpkgs, versionTool, ... }: let # to work with older version of flakes @@ -21,11 +25,13 @@ # Nixpkgs instantiated for supported system types. nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; }); - versionTool = nixpkgs.lib.fetchzip { - url = "https://gitlab.schukai.com/oss/utilities/version/-/archive/0.5.0/version-0.5.0.tar.gz"; - # You'll need to provide the correct hash here. - # sha256 = "0000000000000000000000000000000000000000000000000000"; - }; + pkgs = import nixpkgs { system = "x86_64-linux"; }; + +# versionTool = pkgs.fetchzip { +# url = "https://gitlab.schukai.com/oss/utilities/version/-/archive/0.5.0/version-0.5.0.tar.gz"; +# # You'll need to provide the correct hash here. +# sha256 = "sha256-jzixQKFFW4oxO0S4GYqbkFCXzhBd6com6Z9+MtVKakU="; +# }; in { @@ -35,7 +41,7 @@ let pkgs = nixpkgsFor.${system}; buildDate = builtins.date "%Y%m%d" (builtins.fromJSON lastModifiedDate); - version = builtins.readFile "${versionTool}/version print --git"; + #version = builtins.readFile "${versionTool}/version print --git"; in { docman = pkgs.buildGoModule { @@ -59,9 +65,11 @@ # "-X release.version=$version -X release.build=$(due --iso-8601 | tr -d "-" )" ldflags = [ - "-X release.version=${version}" + "-X release.version=${versionTool}" "-X release.build=${buildDate}" ]; + + buildInputs = [ versionTool.defaultPackage ]; meta = with nixpkgs.legacyPackages.${system}.lib; {