refactor packages
This commit is contained in:
parent
791cbb408a
commit
f1db311bc5
3 changed files with 31 additions and 23 deletions
29
dev/packages.nix
Normal file
29
dev/packages.nix
Normal file
|
@ -0,0 +1,29 @@
|
|||
{
|
||||
final,
|
||||
prev,
|
||||
inputs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
hydra = (prev.hydra.override { nix = final.nixVersions.nix_2_24; }).overrideAttrs (o: {
|
||||
version = inputs.hydra.shortRev;
|
||||
src = inputs.hydra;
|
||||
buildInputs = o.buildInputs ++ [ final.perlPackages.DBIxClassHelpers ];
|
||||
});
|
||||
sotp = final.buildGoModule rec {
|
||||
pname = "sotp";
|
||||
version = "e7f7c804b1641169ce850d8352fb07294881609e";
|
||||
src = final.fetchFromGitHub {
|
||||
owner = "getsops";
|
||||
repo = "sotp";
|
||||
rev = version;
|
||||
hash = "sha256-Cu8cZCmM19G5zeMIiiaCwVJee8wrBZP3Ltk1jWKb2vs=";
|
||||
};
|
||||
vendorHash = "sha256-vQruuohwi53By8UZLrPbRtUrmNbmPt+Sku9hI5J3Dlc=";
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
doCheck = false;
|
||||
};
|
||||
}
|
|
@ -17,22 +17,7 @@
|
|||
with pkgs;
|
||||
mkShellNoCC {
|
||||
packages = [
|
||||
(buildGoModule rec {
|
||||
pname = "sotp";
|
||||
version = "e7f7c804b1641169ce850d8352fb07294881609e";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "getsops";
|
||||
repo = "sotp";
|
||||
rev = version;
|
||||
hash = "sha256-Cu8cZCmM19G5zeMIiiaCwVJee8wrBZP3Ltk1jWKb2vs=";
|
||||
};
|
||||
vendorHash = "sha256-vQruuohwi53By8UZLrPbRtUrmNbmPt+Sku9hI5J3Dlc=";
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
];
|
||||
doCheck = false;
|
||||
})
|
||||
sotp
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
@ -66,13 +66,7 @@
|
|||
nixpkgs = {
|
||||
config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "terraform" ];
|
||||
overlays = [
|
||||
(final: prev: {
|
||||
hydra = (prev.hydra.override { nix = final.nixVersions.nix_2_24; }).overrideAttrs (o: {
|
||||
version = inputs.hydra.shortRev;
|
||||
src = inputs.hydra;
|
||||
buildInputs = o.buildInputs ++ [ final.perlPackages.DBIxClassHelpers ];
|
||||
});
|
||||
})
|
||||
(final: prev: (import ./dev/packages.nix { inherit final prev inputs; }))
|
||||
];
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue