fix: revert to build packages manually in flake check (#418)

* fix: revert to build packages manually in flake check so buildbot can build them * fix: pin down wake platforms * fix: update flake.lock with fixes to mkdocs plugins platforms * fix: improve mkdocs.nix
nix-community · Nov 29, 2023 · de7eaae · de7eaae
1 parent 45b8a8d
commit de7eaae
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 60 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -18,6 +18,7 @@
       inputs.lib-extras.follows = "lib-extras";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
       inputs.treefmt-nix.follows = "treefmt-nix";
+      inputs.devour-flake.follows = "devour-flake";
     };
 
     foundry-nix = {
@@ -91,6 +92,7 @@
         pkgs,
         pkgsUnstable,
         system,
+        self',
         ...
       }: {
         # pkgs
@@ -169,25 +171,26 @@
         };
 
         # checks
-        checks = let
-          devour-flake = pkgs.callPackage inputs.devour-flake {};
-        in
+        checks =
           {
-            nix-build-all = pkgs.writeShellApplication {
-              name = "nix-build-all";
-              runtimeInputs = [
-                pkgs.nix
-                devour-flake
-              ];
-              text = ''
-                # Make sure that flake.lock is sync
-                nix flake lock --no-update-lock-file
-
-                # Do a full nix build (all outputs)
-                devour-flake . "$@"
-              '';
-            };
+            # TODO: Restore this check whenever buildbot supports more specific checks
+            # nix-build-all = pkgs.writeShellApplication {
+            #   name = "nix-build-all";
+            #   runtimeInputs = [
+            #     pkgs.nix
+            #     devour-flake
+            #   ];
+            #   text = ''
+            #     # Make sure that flake.lock is sync
+            #     nix flake lock --no-update-lock-file
+            #
+            #     # Do a full nix build (all outputs)
+            #     devour-flake . "$@"
+            #   '';
+            # };
           }
+          # merge in the package derivations to force a build of all packages during a `nix flake check`
+          // (with lib; mapAttrs' (n: nameValuePair "package-${n}") (filterAttrs (n: _: ! builtins.elem n ["docs"]) self'.packages))
           # mix in tests
           // config.testing.checks;
       };

diff --git a/mkdocs.nix b/mkdocs.nix
@@ -6,31 +6,29 @@
     ...
   }: let
     inherit (pkgs) stdenv runCommand;
-
-    mkdocs-custom =
-      runCommand "mkdocs-custom" {
-        buildInputs = [
-          pkgs.python311
-          pkgs.python311Packages.mkdocs
-          pkgs.python311Packages.mkdocs-material
-          inputs.mynixpkgs.packages.${system}.mkdocs-plugins
-        ];
-
-        meta.mainProgram = "mkdocs";
-      } ''
-        mkdir -p $out/bin
-
-        cat <<MKDOCS > $out/bin/mkdocs
-        #!${pkgs.runtimeShell}
-        set -euo pipefail
-        export PYTHONPATH=$PYTHONPATH
-        exec ${pkgs.python311Packages.mkdocs}/bin/mkdocs "\$@"
-        MKDOCS
-
-        chmod +x $out/bin/mkdocs
-      '';
   in {
     packages.docs = let
+      mkdocs-custom =
+        pkgs.runCommand "mkdocs-custom" {
+          buildInputs = [
+            pkgs.python311
+            pkgs.python311Packages.mkdocs
+            pkgs.python311Packages.mkdocs-material
+            inputs.mynixpkgs.packages.${system}.mkdocs-plugins
+          ];
+          meta.mainProgram = "mkdocs";
+        } ''
+          mkdir -p $out/bin
+
+          cat <<MKDOCS > $out/bin/mkdocs
+          #!${pkgs.runtimeShell}
+          set -euo pipefail
+          export PYTHONPATH=$PYTHONPATH
+          exec ${pkgs.python311Packages.mkdocs}/bin/mkdocs "\$@"
+          MKDOCS
+
+          chmod +x $out/bin/mkdocs
+        '';
       docsPath = "./docs/nixos/modules";
       nixosMarkdownDocs = runCommand "nixos-options" {} ''
         mkdir $out

diff --git a/packages/clients/consensus/lodestar/default.nix b/packages/clients/consensus/lodestar/default.nix
@@ -0,0 +1,25 @@
+{
+stdenv,
+fetchFromGitHub,
+fetchYarnDeps,
+nodePackages,
+}: let
+  name = "lodestar";
+  version = "1.12.0";
+
+  src = fetchFromGitHub {
+    owner = "ChainSafe";
+    repo = "lodestar";
+    ref = "refs/tags/v${version}";
+    hash = "";
+  };
+
+  yarnDeps = stdenv.mkDerivation {
+    yarnLock = "${src}/yarn.lock";
+    hash = "";
+
+  };
+in yarnDeps
+# in stdenv.mkDerivation {
+  # inherit name version src;
+# }
diff --git a/packages/default.nix b/packages/default.nix
@@ -20,6 +20,7 @@
       prysm = callPackage ./clients/consensus/prysm {inherit bls blst;};
       teku = callPackage ./clients/consensus/teku {};
       nimbus = callPackageUnstable ./clients/consensus/nimbus {};
+      lodestar = callPackage ./clients/consensus/lodestar {};
 
       # Execution Clients
       erigon = callPackage ./clients/execution/erigon {};

diff --git a/packages/solidity/frameworks/wake/default.nix b/packages/solidity/frameworks/wake/default.nix
@@ -66,6 +66,10 @@ poetry2nix.mkPoetryApplication {
     changelog = "https://github.com/Ackee-Blockchain/wake/releases/tag/v${version}";
     mainProgram = "woke";
     license = licenses.mit;
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
     maintainers = with maintainers; [aldoborrero];
   };
 }