Unverified Commit 688a7c54 authored by Gergő Gutyina's avatar Gergő Gutyina Committed by GitHub
Browse files

various: move to pkgs/by-name (#483842)

parents 6a94faea 7df68118

pkgs/tools/typesetting/asciidoc/default.nix→pkgs/by-name/as/asciidoc/package.nix

+9 −7
Original line number Diff line number Diff line
@@ -9,12 +9,11 @@ 
  enableStandardFeatures ? false,

  sourceHighlight,

  highlight,

  pygments,

  graphviz,

  texliveMinimal,

  dblatexFull,

  libxslt,

  w3m,

  w3m-batch,

  lynx,

  imagemagick,

  lilypond,
@@ -45,11 +44,7 @@ 
  enableQrcodeFilter ? false,

  qrencode,

  enableMatplotlibFilter ? false,

  matplotlib,

  numpy,

  enableAafigureFilter ? false,

  aafigure,

  recursive-pth-loader,

  # backends

  enableDeckjsBackend ? false,

  enableOdfBackend ? false,
@@ -61,6 +56,13 @@ 
}:



let

  inherit (python3.pkgs)

    pygments

    matplotlib

    numpy

    aafigure

    recursive-pth-loader

    ;



  _enableDitaaFilter = (enableExtraPlugins && enableJava) || enableDitaaFilter;

  _enableMscgenFilter = enableExtraPlugins || enableMscgenFilter;
@@ -268,7 +270,7 @@ python3.pkgs.buildPythonApplication rec { 
            -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \

            -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \

            ${lib.optionalString enableJava ''-e "s|^FOP =.*|FOP = '${fop}/bin/fop'|"''} \

            -e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \

            -e "s|^W3M =.*|W3M = '${w3m-batch}/bin/w3m'|" \

            -e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \

            -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \

            -e "s|^EPUBCHECK =.*|EPUBCHECK = '${epubcheck}/bin/epubcheck'|" \

pkgs/tools/admin/cdist/default.nix→pkgs/by-name/cd/cdist/package.nix

+3 −6
Original line number Diff line number Diff line 
{

  lib,

  buildPythonApplication,

  python3Packages,

  fetchFromGitea,

  six,

  sphinxHook,

  sphinx-rtd-theme,

}:



buildPythonApplication rec {

python3Packages.buildPythonApplication rec {

  pname = "cdist";

  version = "7.0.0";

  format = "setuptools";
@@ -25,7 +22,7 @@ buildPythonApplication rec { 
    hash = "sha256-lIx0RtGQJdY2e00azI9yS6TV+5pCegpKOOD0dQmgMqA=";

  };



  nativeBuildInputs = [

  nativeBuildInputs = with python3Packages; [

    six

    sphinxHook

    sphinx-rtd-theme