diff options
| author | Nick Novitski <github@nicknovitski.com> | 2019-07-22 05:02:47 -0700 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2019-07-22 12:02:47 +0000 |
| commit | 7136e0d0a6f61734994c566e2cc72fd75733b873 (patch) | |
| tree | fcaeaea68f596a81fb885790ce87c3aac4bd52ba /pkgs/tools/typesetting | |
| parent | b24841dd2260516bfde0b9029619a0f9ef87e97c (diff) | |
| download | nixlib-7136e0d0a6f61734994c566e2cc72fd75733b873.tar nixlib-7136e0d0a6f61734994c566e2cc72fd75733b873.tar.gz nixlib-7136e0d0a6f61734994c566e2cc72fd75733b873.tar.bz2 nixlib-7136e0d0a6f61734994c566e2cc72fd75733b873.tar.lz nixlib-7136e0d0a6f61734994c566e2cc72fd75733b873.tar.xz nixlib-7136e0d0a6f61734994c566e2cc72fd75733b873.tar.zst nixlib-7136e0d0a6f61734994c566e2cc72fd75733b873.zip | |
bundlerUpdateScript: init and use (#64822)
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/asciidoctor/default.nix | 12 | ||||
| -rwxr-xr-x | pkgs/tools/typesetting/asciidoctor/update.sh | 6 |
2 files changed, 3 insertions, 15 deletions
diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index 2f1c7e461545..20bbe782d91d 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -1,8 +1,7 @@ { lib, bundlerApp, makeWrapper, # Optional dependencies, can be null epubcheck, kindlegen, - # For the update shell - mkShell, bundix + bundlerUpdateScript }: let @@ -26,21 +25,16 @@ let ''; passthru = { - inherit updateShell; + updateScript = bundlerUpdateScript "asciidoctor"; }; meta = with lib; { description = "A faster Asciidoc processor written in Ruby"; homepage = https://asciidoctor.org/; license = licenses.mit; - maintainers = with maintainers; [ gpyh ]; + maintainers = with maintainers; [ gpyh nicknovitski ]; platforms = platforms.unix; }; }; - - updateShell = mkShell { - inputsFrom = lib.attrValues app.gems; - buildInputs = [ bundix ]; - }; in app diff --git a/pkgs/tools/typesetting/asciidoctor/update.sh b/pkgs/tools/typesetting/asciidoctor/update.sh deleted file mode 100755 index 1f7e5541ceec..000000000000 --- a/pkgs/tools/typesetting/asciidoctor/update.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -nix-shell ../../../.. -A asciidoctor.updateShell --run ' - rm gemset.nix Gemfile.lock - bundix -m --bundle-pack-path $TMPDIR/asciidoctor-ruby-bundle - rm -r .bundle -' |