home

commit b3b5576ed877232c02cffe12cccf648ffb2eea6c
parent 8a3e7dd9da88385d48c906b34460b6a07dd18ce1
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Mon, 17 Oct 2022 15:09:18 +0200

Packages: migration to chapeau-rouge done

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

Diffstat:
M
flake.lock
 | 
24
++++++++++++++++++++++++
M
flake.nix
 | 
8
+++++++-
M
shells/osp.nix
 | 
6
+++---
M
shells/tekton.nix
 | 
2
+-
M
users/vincent/containers/openshift.nix
 | 
8
++++----

5 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -16,6 +16,29 @@
         "type": "github"
       }
     },
+    "chapeau-rouge": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1666011989,
+        "narHash": "sha256-SZo0gfGInaYm3DTWT10a0k+gPUA3fBGLvvzHy06Gks4=",
+        "owner": "vdemeester",
+        "repo": "chapeau-rouge",
+        "rev": "3f58e651b69277518f1d6b46408f0abad2b796ee",
+        "type": "github"
+      },
+      "original": {
+        "owner": "vdemeester",
+        "repo": "chapeau-rouge",
+        "type": "github"
+      }
+    },
     "devshell": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -508,6 +531,7 @@
     },
     "root": {
       "inputs": {
+        "chapeau-rouge": "chapeau-rouge",
         "devshell": "devshell",
         "emacs-overlay": "emacs-overlay",
         "envfs": "envfs",
diff --git a/flake.nix b/flake.nix
@@ -41,7 +41,13 @@
     nix-hardware = { type = "github"; owner = "NixOS"; "repo" = "nixos-hardware"; };
 
     # Red Hat
-    chapeau-rouge = { type = "github"; owner = "vdemeester"; repo = "chapeau-rouge"; };
+    chapeau-rouge = {
+      type = "github";
+      owner = "vdemeester";
+      repo = "chapeau-rouge";
+      inputs.flake-utils.follows = "flake-utils";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Channels
     # FIXME: is it needed or should I just alias nixos-unstable instead
diff --git a/shells/osp.nix b/shells/osp.nix
@@ -13,11 +13,11 @@ pkgs.mkShell {
     gron
     jq
     kustomize
-    my.oc
-    my.operator-sdk
+    oc
+    operator-sdk
     my.operator-tool
     my.tkn
-    my.opm
+    opm
     python39Packages.pyaml
     skopeo
     yq-go
diff --git a/shells/tekton.nix b/shells/tekton.nix
@@ -7,7 +7,7 @@ pkgs.mkShell {
   buildInputs = with pkgs; [
     go
     ko
-    my.oc
+    oc
     my.tkn
     my.operator-tool
     google-cloud-sdk
diff --git a/users/vincent/containers/openshift.nix b/users/vincent/containers/openshift.nix
@@ -4,10 +4,10 @@
   home.file.".local/share/applications/chos4.desktop".source = ./chos4.desktop;
   home.packages = with pkgs; [
     #my.crc
-    my.oc
-    my.openshift-install
-    my.operator-sdk
-    my.opm
+    oc
+    openshift-install
+    operator-sdk
+    opm
     my.operator-tool
   ];
 }