v1.7.0 (#86)

config.go

@@ -14,7 +14,7 @@ import (
 )
 
 // BuildVersion returns the build version of leng, this should be incremented every new release
-var BuildVersion = "1.6.0"
+var BuildVersion string = "dev"
 
 // ConfigVersion returns the version of leng, this should be incremented every time the config changes so leng presents a warning
 var ConfigVersion = "1.6.0"

doc/src/Nix.md

@@ -18,7 +18,7 @@ Please refer to [Configuration](./Configuration.md) for the options you can use
 {
   inputs = {
     # pinned version for safety
-    leng.url = "github:cottand/leng/v1.6.0"; 
+    leng.url = "github:cottand/leng/v1.7.0"; 
     leng.nixpkgs.follows = "nixpkgs";
   };
 
@@ -52,7 +52,7 @@ Add the following inside your configuration.nix:
 {pkgs, lib, ... }: {
   imports = [
     # import leng module
-    (builtins.getFlake "github:cottand/leng/v1.6.0").nixosModules.default 
+    (builtins.getFlake "github:cottand/leng/v1.7.0").nixosModules.default 
   ];
     
   # now you can use services.leng!

flake.nix

@@ -7,19 +7,21 @@
 
   outputs = { self, nixpkgs, flake-utils, ... }:
     (flake-utils.lib.eachDefaultSystem (system:
-      let pkgs = import nixpkgs { inherit system; }; in {
-
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+        version = "1.7.0";
+      in
+      {
         # Build & packaging
         ## use with `nix build`
         packages = rec {
           leng = pkgs.buildGoModule {
-            inherit system;
+            inherit system version;
             vendorHash = null;
             pname = "leng";
-            version = "1.6.0";
             src = nixpkgs.lib.sources.cleanSource ./.;
-            ldflags = [ "-s -w" ];
-            CGO_ENABLED = "0";
+            ldflags = [ "-s -w" "-X main.BuildVersion=${version}" ];
+            env.CGO_ENABLED = "0";
             # upx does not support darwin
             postInstall = if pkgs.lib.strings.hasSuffix "darwin" system then "" else ''
               cd $out/bin

nixos-tests/doh-upstream.nix

@@ -19,7 +19,7 @@ in
       services.leng.enable = true;
       services.leng.configuration = {
         blocking.sourcesStore = "/tmp";
-        customdnsrecords = [];
+        customdnsrecords = [ ];
         upstream.DoH = "";
         DnsOverHttpServer.enabled = true;
       };

nixos-tests/metrics-api.nix

@@ -20,11 +20,11 @@ in
       services.leng.configuration = {
         metrics.enabled = true;
         api = "0.0.0.0:${toString httpPort}";
-        blocking.sourcesStore="/tmp";
+        blocking.sourcesStore = "/tmp";
       };
     };
 
-    client = {};
+    client = { };
   };
 
   testScript =
@@ -39,4 +39,4 @@ in
       )
     '';
 
-}).config.result
+}).config.result