home

commit 4d91ad22a346f46519ff51723919af0a065f2e7c
parent f299434ccdc1c2773862671866d66322aa79f7b6
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Thu,  9 Jun 2022 14:26:14 +0200

nix/packages: add more tkn-local versions

and fix flake

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
flake.nix
 | 
3
+++
M
nix/overlays/default.nix
 | 
13
+++++++++++++
M
nix/packages/default.nix
 | 
1
+
M
nix/packages/tkn/tkn-local.nix
 | 
14
+++++++++-----

4 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -231,6 +231,9 @@
               tkn-pac_0_8
               tkn-pac_0_7
               tkn-pac_0_6
+              tkn-local
+              tkn-local_0_4
+              tkn-local_0_3
               ;
           };
 
diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix
@@ -10,5 +10,18 @@ final: prev: {
     tkn_0_23
     tkn
     ;
+  inherit (pkgs.callPackage ../packages/tkn/tkn-pac.nix { })
+    tkn-pac_0_5
+    tkn-pac_0_6
+    tkn-pac_0_7
+    tkn-pac_0_8
+    tkn-pac
+    ;
+  inherit (pkgs.callPackage ../packages/tkn/tkn-local.nix { })
+    tkn-local_0_4
+    tkn-local_0_3
+    tkn-local_0_2
+    tkn-local
+    ;
 
 }
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
@@ -120,6 +120,7 @@ rec {
     tkn-pac
     ;
   inherit (pkgs.callPackage ./tkn/tkn-local.nix { })
+    tkn-local_0_4
     tkn-local_0_3
     tkn-local_0_2
     tkn-local
diff --git a/nix/packages/tkn/tkn-local.nix b/nix/packages/tkn/tkn-local.nix
@@ -1,9 +1,9 @@
-{ stdenv, lib, buildGoModule, fetchFromGitHub }:
+{ stdenv, lib, buildGo117Module, fetchFromGitHub }:
 
 with lib;
 rec {
   tknLocalGen = { version, sha256 }:
-    buildGoModule rec {
+    buildGo117Module rec {
       pname = "tkn-local";
       name = "${pname}-${version}";
 
@@ -42,10 +42,14 @@ rec {
         maintainers = with maintainers; [ vdemeester ];
       };
     };
-  tkn-local = tkn-local_0_3;
+  tkn-local = tkn-local_0_4;
+  tkn-local_0_4 = makeOverridable tknLocalGen {
+    version = "0.4.0";
+    sha256 = "sha256-9tWbSKqD03ngwgj7lgcnHhct03q5VJ0LeX2n81SUNS4=";
+  };
   tkn-local_0_3 = makeOverridable tknLocalGen {
-    version = "0.3.0";
-    sha256 = "sha256-HVz01bOxKgwscwkit3XhpHfSXpMaA7+6CpkgOeQRQY8==";
+    version = "0.3.1";
+    sha256 = "sha256-U9C3dzmM99OswxGTsBsfRwefrS8wsfGUCCY5sta46wU=";
   };
   tkn-local_0_2 = makeOverridable tknLocalGen {
     version = "0.2.0";