Unverified Commit cdd4bc0b authored by Brian McGillion's avatar Brian McGillion
Browse files

mdbook: move to pkgs/by-name 

Move most of the remaining mdbook packages to pkgs/by-name
directory.

Also cleanup the dependencies based on the comments here https://github.com/NixOS/nixpkgs/pull/357851#issuecomment-2495457678



Signed-off-by: default avatarBrian McGillion <bmg.avoin@gmail.com>
parent 2ff53fe6

pkgs/tools/text/mdbook-admonish/default.nix→pkgs/by-name/md/mdbook-admonish/package.nix

+4 −8
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  rustPlatform,

  CoreServices,

}:



rustPlatform.buildRustPackage rec {
@@ -13,20 +11,18 @@ rustPlatform.buildRustPackage rec { 
  src = fetchFromGitHub {

    owner = "tommilligan";

    repo = pname;

    rev = "v${version}";

    tag = "v${version}";

    hash = "sha256-GNQIOjgHCt3XPCzF0RjV9YStI8psLdHhTPuTkdgx8vA=";

  };



  useFetchCargoVendor = true;

  cargoHash = "sha256-GbXLlWHbLL7HbyuX223S/o1/+LwbK8FjL7lnEgVVn00=";



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];



  meta = with lib; {

  meta = {

    description = "Preprocessor for mdbook to add Material Design admonishments";

    mainProgram = "mdbook-admonish";

    license = licenses.mit;

    maintainers = with maintainers; [

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [

      jmgilman

      Frostman

      matthiasbeyer

pkgs/tools/text/mdbook-epub/default.nix→pkgs/by-name/md/mdbook-epub/package.nix

+7 −20
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  rustPlatform,

  fetchFromGitHub,

  pkg-config,

  bzip2,

  CoreServices,

}:



let

rustPlatform.buildRustPackage rec {

  pname = "mdbook-epub";

  version = "0.4.37";

in

rustPlatform.buildRustPackage {

  inherit pname version;



  src = fetchFromGitHub {

    owner = "michael-f-bryan";

    repo = pname;

    rev = version;

    tag = version;

    hash = "sha256-ddWClkeGabvqteVUtuwy4pWZGnarrKrIbuPEe62m6es=";

  };



  useFetchCargoVendor = true;

  cargoHash = "sha256-3R81PJCOFc22QDHH2BqGB9jjvEcMc1axoySSJLJD3wI=";



  nativeBuildInputs = [

    pkg-config

  ];

  nativeBuildInputs = [ pkg-config ];



  buildInputs =

    [

      bzip2

    ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      CoreServices

    ];

  buildInputs = [ bzip2 ];



  meta = with lib; {

  meta = {

    description = "mdbook backend for generating an e-book in the EPUB format";

    mainProgram = "mdbook-epub";

    homepage = "https://michael-f-bryan.github.io/mdbook-epub";

    license = licenses.mpl20;

    maintainers = with maintainers; [

    license = lib.licenses.mpl20;

    maintainers = with lib.maintainers; [

      yuu

      matthiasbeyer

    ];

pkgs/tools/text/mdbook-footnote/default.nix→pkgs/by-name/md/mdbook-footnote/package.nix

+4 −8
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  rustPlatform,

  CoreServices,

}:

rustPlatform.buildRustPackage rec {

  pname = "mdbook-footnote";
@@ -12,21 +10,19 @@ rustPlatform.buildRustPackage rec { 
  src = fetchFromGitHub {

    owner = "daviddrysdale";

    repo = "mdbook-footnote";

    rev = "v${version}";

    tag = "v${version}";

    hash = "sha256-WUMgm1hwsU9BeheLfb8Di0AfvVQ6j92kXxH2SyG3ses=";

  };



  useFetchCargoVendor = true;

  cargoHash = "sha256-3tuejWMZlEAOgnBKEqZP2a72a8QP1yamfE/g2BJDEbg=";



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];



  meta = with lib; {

  meta = {

    description = "Preprocessor for mdbook to support the inclusion of automatically numbered footnotes";

    mainProgram = "mdbook-footnote";

    homepage = "https://github.com/daviddrysdale/mdbook-footnote";

    license = licenses.asl20;

    maintainers = with maintainers; [

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [

      brianmcgillion

      matthiasbeyer

    ];

pkgs/tools/text/mdbook-graphviz/default.nix→pkgs/by-name/md/mdbook-graphviz/package.nix

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

  lib,

  stdenv,

  fetchFromGitHub,

  rustPlatform,

  CoreServices,

  graphviz,

}:
@@ -23,17 +21,15 @@ rustPlatform.buildRustPackage rec { 
  useFetchCargoVendor = true;

  cargoHash = "sha256-A1pFifxshWynwA88iLTMOm21NKCH8fHl5nFiV4wEG8A=";



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];



  nativeCheckInputs = [ graphviz ];



  meta = with lib; {

  meta = {

    description = "Preprocessor for mdbook, rendering Graphviz graphs to HTML at build time";

    mainProgram = "mdbook-graphviz";

    homepage = "https://github.com/dylanowen/mdbook-graphviz";

    changelog = "https://github.com/dylanowen/mdbook-graphviz/releases/tag/v${version}";

    license = [ licenses.mpl20 ];

    maintainers = with maintainers; [

    license = lib.licenses.mpl20;

    maintainers = with lib.maintainers; [

      lovesegfault

      matthiasbeyer

    ];

pkgs/tools/text/mdbook-katex/default.nix→pkgs/by-name/md/mdbook-katex/package.nix

+3 −7
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
  lib,

  rustPlatform,

  fetchCrate,

  stdenv,

  CoreServices,

}:



rustPlatform.buildRustPackage rec {
@@ -18,14 +16,12 @@ rustPlatform.buildRustPackage rec { 
  useFetchCargoVendor = true;

  cargoHash = "sha256-EoWsjuvvWeAI3OnVRJQT2hwoYq4BNqqvitH9LT0XGnA=";



  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];



  meta = with lib; {

  meta = {

    description = "Preprocessor for mdbook, rendering LaTeX equations to HTML at build time";

    mainProgram = "mdbook-katex";

    homepage = "https://github.com/lzanini/${pname}";

    license = [ licenses.mit ];

    maintainers = with maintainers; [

    license = lib.licenses.mit;

    maintainers = with lib.maintainers; [

      lovesegfault

      matthiasbeyer

    ];