From fd4c49370804e1e54d8be0cba3a9b78fe54df4b4 Mon Sep 17 00:00:00 2001 From: Zahary Karadjov Date: Wed, 3 Jan 2024 18:21:56 +0200 Subject: [PATCH] Add mkdocs to the Nix shell --- installer/nix/flake.lock | 32 +++++++++++++++++++++++++------- installer/nix/flake.nix | 4 ++-- installer/nix/shell.nix | 12 ++++++++++-- 3 files changed, 37 insertions(+), 11 deletions(-) diff --git a/installer/nix/flake.lock b/installer/nix/flake.lock index 788369f5c..262f0732f 100644 --- a/installer/nix/flake.lock +++ b/installer/nix/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -17,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "lastModified": 1703992652, + "narHash": "sha256-C0o8AUyu8xYgJ36kOxJfXIroy9if/G6aJbNOpA5W0+M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "rev": "32f63574c85fbc80e4ba1fbb932cde9619bad25e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-21.11", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } @@ -36,6 +39,21 @@ "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" } + }, + "systems": { + "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", diff --git a/installer/nix/flake.nix b/installer/nix/flake.nix index d9f8a6c07..d64520876 100644 --- a/installer/nix/flake.nix +++ b/installer/nix/flake.nix @@ -2,7 +2,7 @@ description = "nimbus-eth2"; inputs = { - nixpkgs.url = github:NixOS/nixpkgs/nixos-21.11; + nixpkgs.url = github:NixOS/nixpkgs/nixos-23.11; flake-utils.url = github:numtide/flake-utils; }; @@ -12,4 +12,4 @@ name = "nimbus-eth2"; shell = ./shell.nix; }; -} \ No newline at end of file +} diff --git a/installer/nix/shell.nix b/installer/nix/shell.nix index c1a21983b..abfd095d5 100644 --- a/installer/nix/shell.nix +++ b/installer/nix/shell.nix @@ -1,4 +1,13 @@ { pkgs ? import {}}: +let + mkdocs-packages = ps: with ps; [ + mkdocs + mkdocs-material + mkdocs-material-extensions + pymdown-extensions + ]; + mkdocs-python = pkgs.python3.withPackages mkdocs-packages; +in with pkgs; mkShell { @@ -14,8 +23,7 @@ mkShell { killall # for killing processes manually curl # for working with the node APIs - python3 - mdbook + mkdocs-python ] ++ lib.optionals (!stdenv.isDarwin) [ lsb-release ];