From 6c51d36c90bdcd8f6c7617481ee3c044dba55fdb Mon Sep 17 00:00:00 2001
From: jhonas <wernery@greenbaum.cloud>
Date: Tue, 25 Jan 2022 18:34:13 +0100
Subject: [PATCH] Update flake, add terraform and ansible

---
 flake.lock | 16 ++++++++--------
 flake.nix  | 12 +++++++-----
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/flake.lock b/flake.lock
index 146fe4a..5a0a314 100644
--- a/flake.lock
+++ b/flake.lock
@@ -62,18 +62,18 @@
         "type": "github"
       }
     },
-    "nixpkgsFork": {
+    "nixpkgsUnstable": {
       "locked": {
-        "lastModified": 1642955368,
-        "narHash": "sha256-NFvtPxA/9AwGEV2Byd37se6jq1Ru5+CF/gCpojtKybI=",
-        "owner": "teutat3s",
+        "lastModified": 1643000262,
+        "narHash": "sha256-8hrbufiCcZgicU8UvHaRkruYuzM8z3lJvQkSh9ezMEg=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e90841acfd8bf4ac7656964bd1a174f327334393",
+        "rev": "cc68710784ffe0ee035ee7b726656c44566cac94",
         "type": "github"
       },
       "original": {
-        "owner": "teutat3s",
-        "ref": "feature/triton-completion",
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -84,7 +84,7 @@
         "flake-utils": "flake-utils",
         "nixpkgs": "nixpkgs",
         "nixpkgs20-09": "nixpkgs20-09",
-        "nixpkgsFork": "nixpkgsFork"
+        "nixpkgsUnstable": "nixpkgsUnstable"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 904a365..29e169a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,10 +4,10 @@
   inputs.devshell.url = "github:numtide/devshell";
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.nixpkgs.url = "github:nixos/nixpkgs/release-21.11";
-  inputs.nixpkgsFork.url = "github:teutat3s/nixpkgs/feature/triton-completion";
+  inputs.nixpkgsUnstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
   inputs.nixpkgs20-09.url = "github:nixos/nixpkgs/release-20.09";
 
-  outputs = { self, flake-utils, devshell, nixpkgs, nixpkgsFork, nixpkgs20-09 }:
+  outputs = { self, flake-utils, devshell, nixpkgs, nixpkgsUnstable, nixpkgs20-09 }:
     flake-utils.lib.eachDefaultSystem (system: {
       packages.triton-utils =
         let
@@ -36,7 +36,7 @@
 
             overlays = [ devshell.overlay ];
           };
-          pkgsFork = import nixpkgsFork {
+          pkgsUnstable = import nixpkgsUnstable {
             inherit system;
 
             overlays = [ devshell.overlay ];
@@ -79,13 +79,13 @@
               help = "Per project developer environments";
             }
             {
-              package = pkgsFork.nodePackages.triton;
+              package = pkgsUnstable.nodePackages.triton;
               category = "triton & manta tools";
               name = "triton";
               help = "Triton DC CLI (https://docs.joyent.com/public-cloud/api/triton-cli)";
             }
             {
-              package = pkgsFork.nodePackages.manta;
+              package = pkgsUnstable.nodePackages.manta;
               category = "triton & manta tools";
               name = "manta";
               help = "Manta CLI (https://apidocs.joyent.com/manta/index.html#cli)";
@@ -99,6 +99,8 @@
             # used in ./utils/triton-docker.env.sh
             pkgs.nodePackages.json
             self.packages.${system}.triton-utils
+            pkgsUnstable.terraform
+            pkgs.python39Packages.ansible
           ];
 
           env = [