teutat3s/tritonshell
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update flake, add terraform and ansible

Browse source
This commit is contained in:
jhonas 2022-01-25 18:34:13 +01:00
parent 04c9e5e772
commit 6c51d36c90
Signed by: teutat3s
GPG key ID: 924889A86D0B0FEB
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
flake.lock
View file

@ -62,18 +62,18 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgsFork": { "nixpkgsUnstable": {
"locked": { "locked": {
"lastModified": 1642955368, "lastModified": 1643000262,
"narHash": "sha256-NFvtPxA/9AwGEV2Byd37se6jq1Ru5+CF/gCpojtKybI=", "narHash": "sha256-8hrbufiCcZgicU8UvHaRkruYuzM8z3lJvQkSh9ezMEg=",
"owner": "teutat3s", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e90841acfd8bf4ac7656964bd1a174f327334393", "rev": "cc68710784ffe0ee035ee7b726656c44566cac94",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "teutat3s", "owner": "nixos",
"ref": "feature/triton-completion", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -84,7 +84,7 @@
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs20-09": "nixpkgs20-09", "nixpkgs20-09": "nixpkgs20-09",
"nixpkgsFork": "nixpkgsFork" "nixpkgsUnstable": "nixpkgsUnstable"
} }
} }
}, },

12
flake.nix
View file

@ -4,10 +4,10 @@
inputs.devshell.url = "github:numtide/devshell"; inputs.devshell.url = "github:numtide/devshell";
inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.nixpkgs.url = "github:nixos/nixpkgs/release-21.11"; 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"; 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: { flake-utils.lib.eachDefaultSystem (system: {
packages.triton-utils = packages.triton-utils =
let let
@ -36,7 +36,7 @@
overlays = [ devshell.overlay ]; overlays = [ devshell.overlay ];
}; };
pkgsFork = import nixpkgsFork { pkgsUnstable = import nixpkgsUnstable {
inherit system; inherit system;
overlays = [ devshell.overlay ]; overlays = [ devshell.overlay ];
@ -79,13 +79,13 @@
help = "Per project developer environments"; help = "Per project developer environments";
} }
{ {
package = pkgsFork.nodePackages.triton; package = pkgsUnstable.nodePackages.triton;
category = "triton & manta tools"; category = "triton & manta tools";
name = "triton"; name = "triton";
help = "Triton DC CLI (https://docs.joyent.com/public-cloud/api/triton-cli)"; 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"; category = "triton & manta tools";
name = "manta"; name = "manta";
help = "Manta CLI (https://apidocs.joyent.com/manta/index.html#cli)"; help = "Manta CLI (https://apidocs.joyent.com/manta/index.html#cli)";
@ -99,6 +99,8 @@
# used in ./utils/triton-docker.env.sh # used in ./utils/triton-docker.env.sh
pkgs.nodePackages.json pkgs.nodePackages.json
self.packages.${system}.triton-utils self.packages.${system}.triton-utils
pkgsUnstable.terraform
pkgs.python39Packages.ansible
]; ];
env = [ env = [