fix: flake show and flake check

remove flake-utils
This commit is contained in:
Ryan Mulligan 2021-05-09 15:29:34 -07:00
parent dd29ebafac
commit 1ed5f6d3a9
2 changed files with 25 additions and 29 deletions

View file

@ -1,20 +1,5 @@
{ {
"nodes": { "nodes": {
"flake-utils": {
"locked": {
"lastModified": 1618868421,
"narHash": "sha256-vyoJhLV6cJ8/tWz+l9HZLIkb9Rd9esE7p+0RL6zDR6Y=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "eed214942bcfb3a8cc09eb3b28ca7d7221e44a94",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1618628710, "lastModified": 1618628710,
@ -30,7 +15,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
} }

View file

@ -1,18 +1,30 @@
{ {
description = "Secret management with age"; description = "Secret management with age";
inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs }:
outputs = { self, nixpkgs, flake-utils }:
let let
exports = { agenix = system: nixpkgs.legacyPackages.${system}.callPackage ./pkgs/agenix.nix {};
in {
nixosModules.age = import ./modules/age.nix; nixosModules.age = import ./modules/age.nix;
overlay = import ./overlay.nix; overlay = import ./overlay.nix;
packages."aarch64-linux".agenix = agenix "aarch64-linux";
defaultPackage."aarch64-linux" = self.packages."aarch64-linux".agenix;
packages."i686-linux".agenix = agenix "i686-linux";
defaultPackage."i686-linux" = self.packages."i686-linux".agenix;
packages."x86_64-darwin".agenix = agenix "x86_64-darwin";
defaultPackage."x86_64-darwin" = self.packages."x86_64-darwin".agenix;
packages."x86_64-linux".agenix = agenix "x86_64-linux";
defaultPackage."x86_64-linux" = self.packages."x86_64-linux".agenix;
checks."x86_64-linux".integration = import ./test/integration.nix {
inherit nixpkgs; pkgs = nixpkgs.legacyPackages."x86_64-linux"; system = "x86_64-linux";
}; };
outputs = flake-utils.lib.eachDefaultSystem (system: {
packages = nixpkgs.legacyPackages.${system}.callPackage ./default.nix { }; };
defaultPackage = self.packages.${system}.agenix;
});
in
exports // outputs;
} }