From 49dc7e2d61fab7f7b99939e7acdf3a27528b1165 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 18 Mar 2016 15:48:22 +0100 Subject: manual: fix meta.description in ruby example expression Noted by @namore on github --- doc/languages-frameworks/ruby.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index d81422b610ee3..6a0388d24c7c5 100644 --- a/doc/languages-frameworks/ruby.xml +++ b/doc/languages-frameworks/ruby.xml @@ -30,7 +30,7 @@ bundlerEnv { meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, -and scalable."; +and scalable"; homepage = http://sensuapp.org/; license = with licenses; mit; maintainers = with maintainers; [ theuni ]; -- cgit 1.4.1 From b405e82edb4cb00a191839ad8208748189767f9d Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 19 Mar 2016 11:47:55 +0100 Subject: ruby docs: improve the example - missing cd command - invoke bundler through nix-shell, so it doesn't need to be on $PATH Note: running bundix through nix-shell won't work ATM, as the shell sets SSL_CERT_FILE=/no-cert-file.crt which prevents fetching throug https. - use version from gemset to simplify updating - don't break line in meta.description --- doc/languages-frameworks/ruby.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index 6a0388d24c7c5..15c0802ad6946 100644 --- a/doc/languages-frameworks/ruby.xml +++ b/doc/languages-frameworks/ruby.xml @@ -12,25 +12,26 @@ Gemfile source 'https://rubygems.org' gem 'sensu' -$ bundler package --path /tmp/vendor/bundle +$ nix-shell -p bundler --command "bundler package --path /tmp/vendor/bundle" $ $(nix-build '' -A bundix)/bin/bundix $ cat > default.nix { lib, bundlerEnv, ruby }: -bundlerEnv { - name = "sensu-0.17.1"; +bundlerEnv rec { + name = "sensu-${version}"; + version = (import gemset).sensu.version; inherit ruby; gemfile = ./Gemfile; lockfile = ./Gemfile.lock; gemset = ./gemset.nix; meta = with lib; { - description = "A monitoring framework that aims to be simple, malleable, -and scalable"; + description = "A monitoring framework that aims to be simple, malleable, and scalable"; homepage = http://sensuapp.org/; license = with licenses; mit; maintainers = with maintainers; [ theuni ]; -- cgit 1.4.1 From c86a8fc19f870c9b817df4afb82631c354b86a40 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 26 Mar 2016 10:25:42 +0100 Subject: doc: remove comments that are no longer relevant --- doc/languages-frameworks/index.xml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'doc') diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index e63ff3ab14072..7922f2a5f5aea 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -25,20 +25,5 @@ such as Perl or Haskell. These are described in this chapter. - - - + -- cgit 1.4.1 From e3da83297fdfcac1af29805aa55e437bc1d45d3a Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sat, 26 Mar 2016 10:26:29 +0100 Subject: texlive: document in nixpkgs manual Fixes #13240. It's not really better than source-code comments it replaced, but it's in a better accessible place. --- doc/languages-frameworks/index.xml | 1 + doc/languages-frameworks/texlive.xml | 59 ++++++++++++++++++++++ pkgs/tools/typesetting/tex/texlive-new/default.nix | 28 ++-------- 3 files changed, 63 insertions(+), 25 deletions(-) create mode 100644 doc/languages-frameworks/texlive.xml (limited to 'doc') diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 7922f2a5f5aea..ab62afa40d618 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -23,6 +23,7 @@ such as Perl or Haskell. These are described in this chapter. + diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml new file mode 100644 index 0000000000000..0e3c1dd13d72f --- /dev/null +++ b/doc/languages-frameworks/texlive.xml @@ -0,0 +1,59 @@ +
+ +TeX Live + +Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute texlive. +
User's guide + + + For basic usage just pull texlive.combined.scheme-basic for an environment with basic LaTeX support. + + It typically won't work to use separately installed packages together. + Instead, you can build a custom set of packages like this: + +texlive.combine { + inherit (texlive) scheme-small collection-langkorean algorithms cm-super; +} + + There are all the schemes, collections and a few thousand packages, as defined upstream (perhaps with tiny differences). + + + By default you only get executables and files needed during runtime, and a little documentation for the core packages. To change that, you need to add pkgFilter function to combine. + +texlive.combine { + # inherit (texlive) whatever-you-want; + pkgFilter = pkg: + pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "cm-super"; + # elem tlType [ "run" "bin" "doc" "source" ] + # there are also other attributes: version, name +} + + + + You can list packages e.g. by nix-repl. + +$ nix-repl +nix-repl> texlive.collection-<TAB> + + + +
+ +
Known problems + + + Some tools are still missing, e.g. luajittex; + + some apps aren't packaged/tested yet (asymptote, biber, etc.); + + feature/bug: when a package is rejected by pkgFilter, its dependencies are still propagated; + + in case of any bugs or feature requests, file a github issue or better a pull request and /cc @vcunat. + +
+ + +
+ diff --git a/pkgs/tools/typesetting/tex/texlive-new/default.nix b/pkgs/tools/typesetting/tex/texlive-new/default.nix index 5fe52ba07baf5..fbf4adde2ae72 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/default.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/default.nix @@ -1,29 +1,7 @@ -/* (new) TeX Live user docs - - Basic usage: just pull texlive.combined.scheme-basic - for an environment with basic LaTeX support. - There are all the schemes as defined upstream (with tiny differences, perhaps). - - You can compose your own collection like this: - texlive.combine { - inherit (texlive) scheme-small collection-langkorean algorithms cm-super; - } - - By default you only get executables and files needed during runtime, - and a little documentation for the core packages. - To change that, you need to add `pkgFilter` function to `combine`. - texlive.combine { - # inherit (texlive) whatever-you-want; - pkgFilter = pkg: - pkg.tlType == "run" || pkg.tlType == "bin" || pkg.pname == "cm-super"; - # elem tlType [ "run" "bin" "doc" "source" ] - # there are also other attributes: version, name - } - - Known bugs: - * some tools are still missing, e.g. luajittex - * some apps aren't packaged/tested yet (xdvi, asymptote, biber, etc.) - * feature/bug: when a package is rejected by pkgFilter, - its dependencies are still propagated - * in case of any bugs or feature requests, file a github issue and /cc @vcunat +/* TeX Live user docs + - source: ../../../../../doc/languages-frameworks/texlive.xml + - current html: http://nixos.org/nixpkgs/manual/#sec-language-texlive */ - { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min , makeWrapper, perl, python, ruby -- cgit 1.4.1