Merge pull request 'Pin terraform version in flake' (#4) from fix/pin-terraform into main
Reviewed-on: pub-solar/infra#4 Reviewed-by: teutat3s <teutates@mailbox.org>
This commit is contained in:
commit
47d0644065
17
flake.lock
17
flake.lock
|
@ -54,11 +54,28 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-2205": {
|
||||
"locked": {
|
||||
"lastModified": 1672580127,
|
||||
"narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0874168639713f547c05947c76124f78441ea46c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-22.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"devshell": "devshell",
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-2205": "nixpkgs-2205",
|
||||
"tritonshell-module": "tritonshell-module"
|
||||
}
|
||||
},
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgs-2205.url = "github:nixos/nixpkgs/nixos-22.05";
|
||||
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
|
||||
|
@ -16,7 +17,7 @@
|
|||
tritonshell-module.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs = { self, flake-utils, devshell, tritonshell-module, nixpkgs }:
|
||||
outputs = { self, flake-utils, devshell, tritonshell-module, nixpkgs, nixpkgs-2205 }:
|
||||
flake-utils.lib.simpleFlake {
|
||||
inherit self nixpkgs;
|
||||
name = "infra-project";
|
||||
|
@ -39,6 +40,7 @@
|
|||
devshell.packages = with pkgs; [
|
||||
# used by triton-ansible-inventory
|
||||
nodejs
|
||||
nixpkgs-2205.legacyPackages.${pkgs.system}.terraform
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue