home

commit 1e017015911b66601bedb4e376a5d0417f6c1502
parent 28683536ad708f49b6355ce847e571f02e85fbf9
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Tue, 27 Apr 2021 13:07:35 +0200

nix/packages: tkn 0.18

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

Diffstat:
M
flake.nix
 | 
25
+++++++++++++------------
M
nix/packages/default.nix
 | 
7
++++---
M
nix/packages/tkn/default.nix
 | 
6
+++++-

3 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -150,11 +150,11 @@
         });
 
       /* Creates a NixOS configuration from a `name` and an attribute set.
-         The attribute set is composed of:
-         - pkgs: the package set to use. To be taken from the inputs (inputs.nixos, …)
-         - system: the architecture of the system. Default is x86_64-linux.
-         - config: the configuration path that will be imported
-         - users: the list of user configuration to import
+        The attribute set is composed of:
+        - pkgs: the package set to use. To be taken from the inputs (inputs.nixos, …)
+        - system: the architecture of the system. Default is x86_64-linux.
+        - config: the configuration path that will be imported
+        - users: the list of user configuration to import
       */
       mkNixOsConfiguration = name: { pkgs
                                    , system ? "x86_64-linux"
@@ -208,15 +208,15 @@
         });
 
       /*
-      mkHomeManagerConfiguration creates a home-manager configuration from a `name` (a user) and an attribute set.
-      The attribute set is composed of:
-      - config: the configuration path that will be imported, by default `./users/{name}/home.nix
+        mkHomeManagerConfiguration creates a home-manager configuration from a `name` (a user) and an attribute set.
+        The attribute set is composed of:
+        - config: the configuration path that will be imported, by default `./users/{name}/home.nix
 
-      It loads home-manager specific modules and config and set a minimum set of configuration file
-      to integrate with flakes a bit better.
+        It loads home-manager specific modules and config and set a minimum set of configuration file
+        to integrate with flakes a bit better.
 
-      It can be used in a configuration as following:
-      `home-manager.users.vincent = inputs.self.internal.homeManagerConfigurations."vincent";`.
+        It can be used in a configuration as following:
+        `home-manager.users.vincent = inputs.self.internal.homeManagerConfigurations."vincent";`.
       */
       mkHomeManagerConfiguration = name: { config ? ./users + "/${name}/home.nix" }:
         nameValuePair name ({ ... }: {
@@ -380,6 +380,7 @@
               tkn_0_15
               tkn_0_16
               tkn_0_17
+              tkn_0_18
               tkn
               ;
 
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
@@ -13,9 +13,9 @@ let
         sha256 = "1i50ksf96fxa3ymdb1irpc82vi67861sr4xlcmh9f64qw9imm3ks";
       };
       /*
-      %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
-           --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \
-           --with-xwidgets --with-modules
+        %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
+        --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \
+        --with-xwidgets --with-modules
       */
       configureFlags = old.configureFlags ++ [
         "--with-xft"
@@ -111,6 +111,7 @@ rec {
     tkn_0_15
     tkn_0_16
     tkn_0_17
+    tkn_0_18
     tkn
     ;
   tkn_oci = pkgs.callPackage ./tkn-oci { };
diff --git a/nix/packages/tkn/default.nix b/nix/packages/tkn/default.nix
@@ -46,7 +46,11 @@ rec {
       };
     };
 
-  tkn = tkn_0_17;
+  tkn = tkn_0_18;
+  tkn_0_18 = makeOverridable tknGen {
+    version = "0.18.0";
+    sha256 = "1a8a82zy23lc00jnd3cklvrz6si9j84rg2rbq0cm35qladynk75x";
+  };
   tkn_0_17 = makeOverridable tknGen {
     version = "0.17.2";
     sha256 = "0wqy8y19l6kay3v2danj10gw58j6l9b3616zn9w5pjbmbcwbslgd";