Skip to content

Commit

Permalink
chore(deps): update nixsgx dependency
Browse files Browse the repository at this point in the history
Get rid of the snowfall lib, because it makes life harder
for this very small project.

Signed-off-by: Harald Hoyer <[email protected]>
  • Loading branch information
haraldh committed Jun 7, 2024
1 parent 752cdb6 commit 3c72d34
Show file tree
Hide file tree
Showing 5 changed files with 86 additions and 55 deletions.
75 changes: 53 additions & 22 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 27 additions & 20 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,38 @@
inputs = {
nixsgx-flake.url = "github:matter-labs/nixsgx";
nixpkgs.follows = "nixsgx-flake/nixpkgs";
snowfall-lib.follows = "nixsgx-flake/snowfall-lib";
flake-utils.url = "github:numtide/flake-utils?tag=v1.0.0";
};

outputs = inputs:
inputs.snowfall-lib.mkFlake {
inherit inputs;
src = ./.;

package-namespace = "vat";
outputs = { self, nixpkgs, flake-utils, nixsgx-flake }:
flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
let
pkgs = import nixpkgs {
inherit system; overlays = [
nixsgx-flake.overlays.default
overlays
];
config.allowUnfree = true;
};
vault-auth-tee = pkgs.callPackage ./packages/vault-auth-tee.nix { };
container-vault-auth-tee = pkgs.callPackage ./packages/container-vault-auth-tee.nix { };
overlays = final: prev: { vat = { inherit vault-auth-tee; }; };
in
{
formatter = pkgs.nixpkgs-fmt;

overlays = with inputs; [
nixsgx-flake.overlays.default
];
inherit overlays;

alias = {
packages = {
default = "vault-auth-tee";
inherit vault-auth-tee;
inherit container-vault-auth-tee;
default = vault-auth-tee;
};
shells = {
default = "vault-auth-tee";
};
};

outputs-builder = channels: {
formatter = channels.nixpkgs.nixpkgs-fmt;
};
};
devShells = {
default = pkgs.mkShell {
inputsFrom = [ vault-auth-tee ];
};
};
});
}
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ pkgs.buildGoModule {

name = "vault-auth-tee";
src = with lib.fileset; toSource {
root = ./../..;
root = ./..;
fileset = unions [
../../go.mod
../../go.sum
../../cmd
../../test-fixtures
(fileFilter (file: file.hasExt "go") ./../..)
../go.mod
../go.sum
../cmd
../test-fixtures
(fileFilter (file: file.hasExt "go") ./..)
];
};

Expand Down
7 changes: 0 additions & 7 deletions shells/vault-auth-tee/default.nix

This file was deleted.

0 comments on commit 3c72d34

Please sign in to comment.