Revive old nixops
Eelco Dolstra committed
Sep 8, 2022 at 15:31 UTC
1060d08f20ce9ff6a7d0c7258de74c09c0c94052
3 files changed
+83
-12
bastion/configuration.nix
+5
-6
@@ -1,4 +1,4 @@
1
-flakes @ { self, nixpkgs, nix, nixos-channel-scripts }:
1
+flakes @ { self, nixpkgs, nix, nixops, nixos-channel-scripts }:
2
3
{ modulesPath, config, lib, pkgs, ... }:
4
let
@@ -20,8 +20,8 @@ in
20
21
system.stateVersion = "18.03";
22
23
- system.configurationRevision = flakes.self.rev
24
- or (throw "Cannot deploy from an unclean source tree!");
23
+ #system.configurationRevision = flakes.self.rev
24
+ # or (throw "Cannot deploy from an unclean source tree!");
25
26
nix.registry.nixpkgs.flake = flakes.nixpkgs;
27
nix.nixPath = [ "nixpkgs=${flakes.nixpkgs}" ];
@@ -29,13 +29,12 @@ in
29
30
nixpkgs.overlays = [
31
nix.overlays.default
32
- #nixops.overlay
32
nixos-channel-scripts.overlays.default
33
];
34
35
# Needed for nixops.
36
nixpkgs.config.permittedInsecurePackages = [
38
- "python2.7-pyjwt-1.7.1"
37
+ "python2.7-urllib3-1.26.2"
38
];
39
40
users.extraUsers.tarball-mirror.openssh.authorizedKeys.keys = [ sshKeys.eelco ];
@@ -52,7 +51,7 @@ in
51
52
environment.systemPackages = [
53
pkgs.awscli
55
- pkgs.nixops
54
+ nixops.defaultPackage.x86_64-linux
55
pkgs.terraform-full
56
pkgs.tmux
57
];
bastion/flake.lock
+76
-5
@@ -37,6 +37,61 @@
37
"type": "indirect"
38
}
39
},
40
+ "nixops": {
41
+ "inputs": {
42
+ "nixops-aws": "nixops-aws",
43
+ "nixops-hetzner": "nixops-hetzner",
44
+ "nixpkgs": "nixpkgs"
45
+ },
46
+ "locked": {
47
+ "lastModified": 1662643698,
48
+ "narHash": "sha256-VhAhUUIuf98h6DGBtA3cYV133iO/gqkc0DTXXGLTW4s=",
49
+ "owner": "NixOS",
50
+ "repo": "nixops",
51
+ "rev": "065625ac5f7f0660cdd3e5471291b5f6556a284c",
52
+ "type": "github"
53
+ },
54
+ "original": {
55
+ "owner": "NixOS",
56
+ "ref": "flake-support",
57
+ "repo": "nixops",
58
+ "type": "github"
59
+ }
60
+ },
61
+ "nixops-aws": {
62
+ "flake": false,
63
+ "locked": {
64
+ "lastModified": 1586700941,
65
+ "narHash": "sha256-9yh7iHMJ8F8wA4nwTjm8rcmceFM/6URHK/Q/AuCkdzE=",
66
+ "owner": "NixOS",
67
+ "repo": "nixops-aws",
68
+ "rev": "af97c16f179cd0df94a6fc3ef470092122253f60",
69
+ "type": "github"
70
+ },
71
+ "original": {
72
+ "owner": "NixOS",
73
+ "ref": "flake",
74
+ "repo": "nixops-aws",
75
+ "type": "github"
76
+ }
77
+ },
78
+ "nixops-hetzner": {
79
+ "flake": false,
80
+ "locked": {
81
+ "lastModified": 1586701048,
82
+ "narHash": "sha256-q1QhsSp3N4nffnpUnGrF0Jg7VyLvi9JXiD82oxaM/Jg=",
83
+ "owner": "NixOS",
84
+ "repo": "nixops-hetzner",
85
+ "rev": "663b02618ece7a92a72da408a552528ee8dd354c",
86
+ "type": "github"
87
+ },
88
+ "original": {
89
+ "owner": "NixOS",
90
+ "ref": "zfs",
91
+ "repo": "nixops-hetzner",
92
+ "type": "github"
93
+ }
94
+ },
95
"nixos-channel-scripts": {
96
"inputs": {
97
"nix": [
@@ -62,16 +117,16 @@
117
},
118
"nixpkgs": {
119
"locked": {
65
- "lastModified": 1662099760,
66
- "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=",
120
+ "lastModified": 1620055814,
121
+ "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=",
122
"owner": "NixOS",
123
"repo": "nixpkgs",
69
- "rev": "67e45078141102f45eff1589a831aeaa3182b41e",
124
+ "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205",
125
"type": "github"
126
},
127
"original": {
128
"id": "nixpkgs",
74
- "ref": "nixos-22.05",
129
+ "ref": "nixos-20.03",
130
"type": "indirect"
131
}
132
},
@@ -91,11 +146,27 @@
146
"type": "github"
147
}
148
},
149
+ "nixpkgs_2": {
150
+ "locked": {
151
+ "lastModified": 1662099760,
152
+ "narHash": "sha256-MdZLCTJPeHi/9fg6R9fiunyDwP3XHJqDd51zWWz9px0=",
153
+ "owner": "NixOS",
154
+ "repo": "nixpkgs",
155
+ "rev": "67e45078141102f45eff1589a831aeaa3182b41e",
156
+ "type": "github"
157
+ },
158
+ "original": {
159
+ "id": "nixpkgs",
160
+ "ref": "nixos-22.05",
161
+ "type": "indirect"
162
+ }
163
+ },
164
"root": {
165
"inputs": {
166
"nix": "nix",
167
+ "nixops": "nixops",
168
"nixos-channel-scripts": "nixos-channel-scripts",
98
- "nixpkgs": "nixpkgs"
169
+ "nixpkgs": "nixpkgs_2"
170
}
171
}
172
},
bastion/flake.nix
+2
-1
@@ -1,11 +1,12 @@
1
{
2
inputs.nixpkgs.url = "nixpkgs/nixos-22.05";
3
+ inputs.nixops.url = "github:NixOS/nixops/flake-support";
4
inputs.nixos-channel-scripts.url = "github:NixOS/nixos-channel-scripts";
5
inputs.nixos-channel-scripts.inputs.nix.follows = "nix";
6
inputs.nixos-channel-scripts.inputs.nixpkgs.follows = "nixpkgs";
7
inputs.nix.inputs.nixpkgs.follows = "nixpkgs";
8
8
- outputs = flakes @ { self, nixpkgs, nix, nixos-channel-scripts }: {
9
+ outputs = flakes @ { self, nixpkgs, nix, nixops, nixos-channel-scripts }: {
10
nixosConfigurations.bastion = nixpkgs.lib.nixosSystem {
11
system = "x86_64-linux";
12
modules = [ (import ./configuration.nix flakes) ];