From 8aea00213ca824c045223f1242ab5cd62d05a4e6 Mon Sep 17 00:00:00 2001 From: Sebastian Ullrich Date: Sat, 18 Jun 2022 13:21:02 +0200 Subject: [PATCH] chore: clean up doc/flake.nix --- doc/flake.lock | 8 ++++---- doc/flake.nix | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/flake.lock b/doc/flake.lock index adad3e3d4f..8854980679 100644 --- a/doc/flake.lock +++ b/doc/flake.lock @@ -1,6 +1,6 @@ { "nodes": { - "alectryon-src": { + "alectryon": { "flake": false, "locked": { "lastModified": 1654613606, @@ -82,7 +82,7 @@ "type": "github" } }, - "leanInk-src": { + "leanInk": { "flake": false, "locked": { "lastModified": 1649941279, @@ -198,13 +198,13 @@ }, "root": { "inputs": { - "alectryon-src": "alectryon-src", + "alectryon": "alectryon", "flake-utils": [ "lean", "flake-utils" ], "lean": "lean", - "leanInk-src": "leanInk-src", + "leanInk": "leanInk", "mdBook": "mdBook" } } diff --git a/doc/flake.nix b/doc/flake.nix index 6e68e051cc..bde1c91374 100644 --- a/doc/flake.nix +++ b/doc/flake.nix @@ -7,24 +7,24 @@ url = github:leanprover/mdBook; flake = false; }; - inputs.alectryon-src = { + inputs.alectryon = { url = github:Kha/alectryon/typeid; flake = false; }; - inputs.leanInk-src = { + inputs.leanInk = { url = github:leanprover/LeanInk; flake = false; }; - outputs = { self, lean, flake-utils, mdBook, alectryon-src, leanInk-src }: flake-utils.lib.eachDefaultSystem (system: - with lean.packages.${system}; with nixpkgs; + outputs = inputs@{ self, ... }: inputs.flake-utils.lib.eachDefaultSystem (system: + with inputs.lean.packages.${system}; with nixpkgs; let doc-src = lib.sourceByRegex ../. ["doc.*" "tests(/lean(/beginEndAsMacro.lean)?)?"]; in { packages = rec { lean-mdbook = mdbook.overrideAttrs (drv: rec { name = "lean-${mdbook.name}"; - src = mdBook; + src = inputs.mdBook; cargoDeps = drv.cargoDeps.overrideAttrs (_: { inherit src; outputHash = "sha256-5cAV8tOU3R1cPubseetURDQOzKyoo4485wD5IgeJUhQ="; @@ -61,13 +61,13 @@ }; leanInk = (buildLeanPackage { name = "LeanInk"; - src = leanInk-src; + src = inputs.leanInk; executableName = "leanInk"; linkFlags = ["-rdynamic"]; }).executable; alectryon = python3Packages.buildPythonApplication { name = "alectryon"; - src = alectryon-src; + src = inputs.alectryon; propagatedBuildInputs = [ leanInk lean-all ] ++ # https://github.com/cpitclaudel/alectryon/blob/master/setup.cfg