harald/vault-auth-tee
1
0
Fork 0
mirror of https://github.com/matter-labs/vault-auth-tee.git synced 2025-07-21 07:43:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(deps): update nixsgx dependency (#82)

Browse source 
Get rid of the snowfall lib, because it makes life harder for this very
small project.
This commit is contained in:
Harald Hoyer 2024-06-07 17:12:29 +02:00 • committed by GitHub
commit c8e69f2798
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 97 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

97
flake.lock generated
View file

@ -20,6 +20,43 @@
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils-plus": {
"inputs": {
"flake-utils": "flake-utils_2"
},
"locked": {
"lastModified": 1715533576,
"narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
"type": "github"
},
"original": {
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1694529238,
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
@ -34,36 +71,18 @@
"type": "github"
}
},
"flake-utils-plus": {
"inputs": {
"flake-utils": "flake-utils"
},
"locked": {
"lastModified": 1696331477,
"narHash": "sha256-YkbRa/1wQWdWkVJ01JvV+75KIdM37UErqKgTf0L54Fk=",
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"rev": "bfc53579db89de750b25b0c5e7af299e0c06d7d3",
"type": "github"
},
"original": {
"owner": "gytis-ivaskevicius",
"repo": "flake-utils-plus",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1710283656,
"narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=",
"lastModified": 1717281328,
"narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "51063ed4f2343a59fdeebb279bb81d87d453942b",
"rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
@ -74,11 +93,11 @@
"snowfall-lib": "snowfall-lib"
},
"locked": {
"lastModified": 1716280284,
"narHash": "sha256-rofvtPgaYEW01OnKsD3DJv2B2j9QovRTWbw8h5lGjkE=",
"lastModified": 1717758565,
"narHash": "sha256-yscuZ3ixjwTkqS6ew5cB3Uvy9e807szRlMoPSyQuRJM=",
"owner": "matter-labs",
"repo": "nixsgx",
"rev": "7151f63b1549b65633503f505df1e2a0b5ee844f",
"rev": "49a1ae79d92ccb6ed7cabfe5c5042b1399e3cd3e",
"type": "github"
},
"original": {
@ -89,15 +108,12 @@
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixsgx-flake",
"nixpkgs"
],
"nixsgx-flake": "nixsgx-flake",
"snowfall-lib": [
"nixsgx-flake",
"snowfall-lib"
]
"nixsgx-flake": "nixsgx-flake"
}
},
"snowfall-lib": {
@ -110,11 +126,11 @@
]
},
"locked": {
"lastModified": 1696432959,
"narHash": "sha256-oJQZv2MYyJaVyVJY5IeevzqpGvMGKu5pZcCCJvb+xjc=",
"lastModified": 1716675292,
"narHash": "sha256-7TFvVE4HR/b65/0AAhewYHEJzUXxIEJn82ow5bCkrDo=",
"owner": "snowfallorg",
"repo": "lib",
"rev": "92803a029b5314d4436a8d9311d8707b71d9f0b6",
"rev": "5d6e9f235735393c28e1145bec919610b172a20f",
"type": "github"
},
"original": {
@ -137,6 +153,21 @@
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
}
},
"root": "root",

47
flake.nix
View file

@ -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 = ./.;
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;
package-namespace = "vat";
inherit overlays;
overlays = with inputs; [
nixsgx-flake.overlays.default
];
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 ];
};
};
});
}

0
packages/container-vault-auth-tee/default.nix → packages/container-vault-auth-tee.nix
View file

12
packages/vault-auth-tee/default.nix → packages/vault-auth-tee.nix
View file

@ -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") ./..)
];
};

7
shells/vault-auth-tee/default.nix
View file

@ -1,7 +0,0 @@
{ lib
, pkgs
, ...
}:
pkgs.mkShell {
inputsFrom = [ pkgs.vat.vault-auth-tee ];
}