From d12bd1b71db7235d77cd41e8c6c9b210b78925ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Misty=20De=20M=C3=A9o?= Date: Fri, 31 Mar 2023 09:58:53 -0700 Subject: [PATCH] Pill 17: fix asciidoc-full name Attempting to build this as specified in the current docs fails with the error: nix-repl> :b pkgs.asciidocFull error: 'asciidocFull' has been renamed to/replaced by 'asciidoc-full' --- pills/17-nixpkgs-overriding-packages.xml | 4 ++-- pills/17/build-asciidoc-graphviz-override.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pills/17-nixpkgs-overriding-packages.xml b/pills/17-nixpkgs-overriding-packages.xml index ce43350..d885543 100644 --- a/pills/17-nixpkgs-overriding-packages.xml +++ b/pills/17-nixpkgs-overriding-packages.xml @@ -97,11 +97,11 @@ - Now we can build e.g. asciidocFull and it will automatically use the overridden graphviz: + Now we can build e.g. asciidoc-full and it will automatically use the overridden graphviz: - Note how we pass the config with packageOverrides when importing nixpkgs. Then pkgs.asciidocFull is a derivation that has graphviz input (pkgs.asciidoc is the lighter version and doesn't use graphviz at all). + Note how we pass the config with packageOverrides when importing nixpkgs. Then pkgs.asciidoc-full is a derivation that has graphviz input (pkgs.asciidoc is the lighter version and doesn't use graphviz at all). Since there's no version of asciidoc with graphviz without X support in the binary cache, Nix will recompile the needed stuff for you. diff --git a/pills/17/build-asciidoc-graphviz-override.txt b/pills/17/build-asciidoc-graphviz-override.txt index 1076352..c1c883d 100644 --- a/pills/17/build-asciidoc-graphviz-override.txt +++ b/pills/17/build-asciidoc-graphviz-override.txt @@ -1,2 +1,2 @@ nix-repl> pkgs = import { config = import ./config.nix; } -nix-repl> :b pkgs.asciidocFull +nix-repl> :b pkgs.asciidoc-full