Skip to content

add all the buildkite shell dependencies to hydra #1032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 6, 2021
Merged

add all the buildkite shell dependencies to hydra #1032

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76710f6
add all the buildkite shell dependencies to hydra
manveru Jul 1, 2021
d2aeb1e
Merge branch 'develop' into hydra-buildkite-deps
Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 37 additions & 31 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@
description = "Mantis flake";

inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.nixpkgs.url = "github:nixos/nixpkgs?rev=a98302aa9b9628915878a6ea9776c40a0bb02950";
inputs.nixpkgs.url =
"github:nixos/nixpkgs?rev=a98302aa9b9628915878a6ea9776c40a0bb02950";
inputs.sbt-derivation.url = "github:zaninime/sbt-derivation";

outputs = { self, nixpkgs, flake-utils, sbt-derivation }: #, libsonic, libsonic-jnr }:
outputs = { self, nixpkgs, flake-utils, sbt-derivation
}: # , libsonic, libsonic-jnr }:
let
overlay = import ./nix/overlay.nix self.rev;
pkgsForSystem = system: (import nixpkgs) {
inherit system; overlays = [
#libsonic.overlay
#libsonic-jnr.overlay
sbt-derivation.overlay
overlay
];
};
pkgsForSystem = system:
(import nixpkgs) {
inherit system;
overlays = [
#libsonic.overlay
#libsonic-jnr.overlay
sbt-derivation.overlay
overlay
];
};

mkHydraUtils = mkPkgs:
let
Expand All @@ -24,32 +28,34 @@
# [attrset] -> attrset
recursiveMerge = libPkgs.lib.foldr libPkgs.lib.recursiveUpdate { };
mkHydraJobsForSystem = attrs: system:
recursiveMerge (map (n: { "${n}"."${system}" = (mkPkgs system)."${n}"; }) attrs);
in
{
recursiveMerge
(map (n: { "${n}"."${system}" = (mkPkgs system)."${n}"; }) attrs);
in {
collectHydraSets = jobSets: { hydraJobs = recursiveMerge jobSets; };
mkHydraSet = attrs: systems: recursiveMerge (map (mkHydraJobsForSystem attrs) systems);
mkHydraSet = attrs: systems:
recursiveMerge (map (mkHydraJobsForSystem attrs) systems);
};

hydraUtils = mkHydraUtils pkgsForSystem;
inherit (hydraUtils) collectHydraSets mkHydraSet;

in
flake-utils.lib.eachDefaultSystem
(system: rec {
pkgs = pkgsForSystem system;
legacyPackages = pkgs;
in flake-utils.lib.eachDefaultSystem (system: rec {
pkgs = pkgsForSystem system;
legacyPackages = pkgs;

defaultPackage = pkgs.mantis;
devShell = pkgs.mkShell {
nativeBuildInputs = with pkgs; [ solc sbt ];
};
apps.mantis = flake-utils.lib.mkApp { drv = pkgs.mantis; };
defaultApp = apps.mantis;
}) // (collectHydraSets [
(mkHydraSet [ "mantis" ] [ "x86_64-linux" ])
(mkHydraSet [ "mantis-entrypoint" ] [ "x86_64-linux" ])
(mkHydraSet [ "retesteth" ] [ "x86_64-linux" ])
(mkHydraSet [ "lllc" ] [ "x86_64-linux" ])
]);
defaultPackage = pkgs.mantis;
devShell = pkgs.mkShell { nativeBuildInputs = with pkgs; [ solc sbt ]; };
apps.mantis = flake-utils.lib.mkApp { drv = pkgs.mantis; };
defaultApp = apps.mantis;
}) // (collectHydraSets
(map (name: mkHydraSet [ name ] [ "x86_64-linux" ]) [
"jdk8"
"lllc"
"mantis"
"mantis-entrypoint"
"netcat-gnu"
"retesteth"
"sbt"
"solc"
]));
}