mynix/agenix
1
0
Fork 0
mirror of https://github.com/ryantm/agenix.git synced 2024-11-22 09:40:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add package for aarch64-darwin

Browse source 
flake.lock previously included a "indirect" reference to nixpkgs.

I am not sure what this means but I added `inputs.nixpkgs` and updated nixpkgs because this old version of nixpkgs didn't have any support for aarch64-darwin at all.

Now on a aarch64-darwin I can type `nix build` and get a working version of agenix.
This commit is contained in:
Felix Scheinost 2021-12-04 15:49:07 +01:00
parent c53ac31e44
commit 42a250cafa
3 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
flake.lock
View file

@ -2,15 +2,18 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1618628710, "lastModified": 1638587357,
"narHash": "sha256-9xIoU+BrCpjs5nfWcd/GlU7XCVdnNKJPffoNTxgGfhs=", "narHash": "sha256-2ySMW3QARG8BsRPmwe7clTbdCuaObromOKewykP+UJc=",
"path": "/nix/store/z1rf17q0fxj935cmplzys4gg6nxj1as0-source", "owner": "nixos",
"rev": "7919518f0235106d050c77837df5e338fb94de5d", "repo": "nixpkgs",
"type": "path" "rev": "e34c5379866833f41e2a36f309912fa675d687c7",
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"type": "indirect" "ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"root": { "root": {

7
flake.nix
View file

@ -1,6 +1,10 @@
{ {
description = "Secret management with age"; description = "Secret management with age";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-21.11";
};
outputs = { self, nixpkgs }: outputs = { self, nixpkgs }:
let let
agenix = system: nixpkgs.legacyPackages.${system}.callPackage ./pkgs/agenix.nix {}; agenix = system: nixpkgs.legacyPackages.${system}.callPackage ./pkgs/agenix.nix {};
@ -19,6 +23,9 @@
packages."x86_64-darwin".agenix = agenix "x86_64-darwin"; packages."x86_64-darwin".agenix = agenix "x86_64-darwin";
defaultPackage."x86_64-darwin" = self.packages."x86_64-darwin".agenix; defaultPackage."x86_64-darwin" = self.packages."x86_64-darwin".agenix;
packages."aarch64-darwin".agenix = agenix "aarch64-darwin";
defaultPackage."aarch64-darwin" = self.packages."aarch64-darwin".agenix;
packages."x86_64-linux".agenix = agenix "x86_64-linux"; packages."x86_64-linux".agenix = agenix "x86_64-linux";
defaultPackage."x86_64-linux" = self.packages."x86_64-linux".agenix; defaultPackage."x86_64-linux" = self.packages."x86_64-linux".agenix;
checks."x86_64-linux".integration = import ./test/integration.nix { checks."x86_64-linux".integration = import ./test/integration.nix {

6
test/integration.nix
View file

@ -42,9 +42,9 @@ import "${nixpkgs}/nixos/tests/make-test-python.nix" ({ pkgs, ...}: {
system1.wait_until_succeeds("pgrep -f 'agetty.*tty1'") system1.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
system1.sleep(2) system1.sleep(2)
system1.send_key("alt-f2") system1.send_key("alt-f2")
system1.wait_until_succeeds(f"[ $(fgconsole) = 2 ]") system1.wait_until_succeeds("[ $(fgconsole) = 2 ]")
system1.wait_for_unit(f"getty@tty2.service") system1.wait_for_unit("getty@tty2.service")
system1.wait_until_succeeds(f"pgrep -f 'agetty.*tty2'") system1.wait_until_succeeds("pgrep -f 'agetty.*tty2'")
system1.wait_until_tty_matches(2, "login: ") system1.wait_until_tty_matches(2, "login: ")
system1.send_chars("${user}\n") system1.send_chars("${user}\n")
system1.wait_until_tty_matches(2, "login: ${user}") system1.wait_until_tty_matches(2, "login: ${user}")