bastion: Re-enable nixops, still needed
Eelco Dolstra committed
Sep 8, 2022 at 15:09 UTC
2f6f18aa4568be17199e2159190394bdee02d84e
3 files changed
+8
-40
bastion/configuration.nix
+7
-2
@@ -1,4 +1,4 @@
1
-flakes @ { self, nixpkgs, nix, nixops, nixos-channel-scripts }:
1
+flakes @ { self, nixpkgs, nix, nixos-channel-scripts }:
2
3
{ modulesPath, config, lib, pkgs, ... }:
4
let
@@ -33,6 +33,11 @@ in
33
nixos-channel-scripts.overlays.default
34
];
35
36
+ # Needed for nixops.
37
+ nixpkgs.config.permittedInsecurePackages = [
38
+ "python2.7-pyjwt-1.7.1"
39
+ ];
40
+
41
users.extraUsers.tarball-mirror.openssh.authorizedKeys.keys = [ sshKeys.eelco ];
42
43
users.extraUsers.deploy = {
@@ -47,7 +52,7 @@ in
52
53
environment.systemPackages = [
54
pkgs.awscli
50
- #pkgs.nixops
55
+ pkgs.nixops
56
pkgs.terraform-full
57
pkgs.tmux
58
];
bastion/flake.lock
-36
@@ -37,26 +37,6 @@
37
"type": "indirect"
38
}
39
},
40
- "nixops": {
41
- "inputs": {
42
- "nixpkgs": [
43
- "nixpkgs"
44
- ],
45
- "utils": "utils"
46
- },
47
- "locked": {
48
- "lastModified": 1657388807,
49
- "narHash": "sha256-MtTM5KUHIDqnY254chIOp00EmsbYsXR3mXrnbbY4wg0=",
50
- "owner": "NixOS",
51
- "repo": "nixops",
52
- "rev": "dcafae5258773dc0fbdd31b425f1ad3fb59173fe",
53
- "type": "github"
54
- },
55
- "original": {
56
- "id": "nixops",
57
- "type": "indirect"
58
- }
59
- },
40
"nixos-channel-scripts": {
41
"inputs": {
42
"nix": [
@@ -114,25 +94,9 @@
94
"root": {
95
"inputs": {
96
"nix": "nix",
117
- "nixops": "nixops",
97
"nixos-channel-scripts": "nixos-channel-scripts",
98
"nixpkgs": "nixpkgs"
99
}
121
- },
122
- "utils": {
123
- "locked": {
124
- "lastModified": 1634851050,
125
- "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=",
126
- "owner": "numtide",
127
- "repo": "flake-utils",
128
- "rev": "c91f3de5adaf1de973b797ef7485e441a65b8935",
129
- "type": "github"
130
- },
131
- "original": {
132
- "owner": "numtide",
133
- "repo": "flake-utils",
134
- "type": "github"
135
- }
100
}
101
},
102
"root": "root",
bastion/flake.nix
+1
-2
@@ -3,10 +3,9 @@
3
inputs.nixos-channel-scripts.url = "github:NixOS/nixos-channel-scripts";
4
inputs.nixos-channel-scripts.inputs.nix.follows = "nix";
5
inputs.nixos-channel-scripts.inputs.nixpkgs.follows = "nixpkgs";
6
- inputs.nixops.inputs.nixpkgs.follows = "nixpkgs";
6
inputs.nix.inputs.nixpkgs.follows = "nixpkgs";
7
9
- outputs = flakes @ { self, nixpkgs, nix, nixops, nixos-channel-scripts }: {
8
+ outputs = flakes @ { self, nixpkgs, nix, nixos-channel-scripts }: {
9
nixosConfigurations.bastion = nixpkgs.lib.nixosSystem {
10
system = "x86_64-linux";
11
modules = [ (import ./configuration.nix flakes) ];