mirror of
https://github.com/ryantm/agenix.git
synced 2024-11-22 09:40:47 +03:00
Merge pull request #42 from ryantm/flake
fix: stop using flake-utils to fix flake show and flake check
This commit is contained in:
commit
c27b6334a2
2 changed files with 30 additions and 35 deletions
27
flake.lock
27
flake.lock
|
@ -1,28 +1,12 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"flake-utils": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1600209923,
|
|
||||||
"narHash": "sha256-zoOWauTliFEjI++esk6Jzk7QO5EKpddWXQm9yQK24iM=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "3cd06d3c1df6879c9e41cb2c33113df10566c760",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1599148892,
|
"lastModified": 1618628710,
|
||||||
"narHash": "sha256-V76c6DlI0ZZffvbBpxGlpVSpXxZ14QpFHwAvEEujIsY=",
|
"narHash": "sha256-9xIoU+BrCpjs5nfWcd/GlU7XCVdnNKJPffoNTxgGfhs=",
|
||||||
"owner": "NixOS",
|
"path": "/nix/store/z1rf17q0fxj935cmplzys4gg6nxj1as0-source",
|
||||||
"repo": "nixpkgs",
|
"rev": "7919518f0235106d050c77837df5e338fb94de5d",
|
||||||
"rev": "7ff50a7f7b9a701228f870813fe58f01950f870b",
|
"type": "path"
|
||||||
"type": "github"
|
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"id": "nixpkgs",
|
||||||
|
@ -31,7 +15,6 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
38
flake.nix
38
flake.nix
|
@ -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 }:
|
||||||
|
let
|
||||||
|
agenix = system: nixpkgs.legacyPackages.${system}.callPackage ./pkgs/agenix.nix {};
|
||||||
|
in {
|
||||||
|
|
||||||
|
nixosModules.age = import ./modules/age.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 = { self, nixpkgs, flake-utils }:
|
|
||||||
let
|
|
||||||
exports = {
|
|
||||||
nixosModules.age = import ./modules/age.nix;
|
|
||||||
overlay = import ./overlay.nix;
|
|
||||||
};
|
|
||||||
outputs = flake-utils.lib.eachDefaultSystem (system: {
|
|
||||||
packages = nixpkgs.legacyPackages.${system}.callPackage ./default.nix { };
|
|
||||||
defaultPackage = self.packages.${system}.agenix;
|
|
||||||
});
|
|
||||||
in
|
|
||||||
exports // outputs;
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue