From cfa23c7bbb9628e16f2526bbf6632eea2d7f7171 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 12 Jan 2022 02:27:35 -0300 Subject: [PATCH 1/2] reorder all-packages.nix A little bit. --- pkgs/top-level/all-packages.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6acdb733894a..5d36aacab6da 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14664,6 +14664,17 @@ with pkgs; eweb = callPackage ../development/tools/literate-programming/eweb { }; + funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; + + Literate = callPackage ../development/tools/literate-programming/Literate { }; + + # NOTE: Override and set useIcon = false to use Awk instead of Icon. + noweb = callPackage ../development/tools/literate-programming/noweb { }; + + nuweb = callPackage ../development/tools/literate-programming/nuweb { + tex = texlive.combined.scheme-medium; + }; + eztrace = callPackage ../development/tools/profiling/EZTrace { }; faas-cli = callPackage ../development/tools/faas-cli { }; @@ -14712,8 +14723,6 @@ with pkgs; fundoc = callPackage ../development/tools/fundoc { }; - funnelweb = callPackage ../development/tools/literate-programming/funnelweb { }; - gede = libsForQt5.callPackage ../development/tools/misc/gede { }; gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { }; @@ -14985,8 +14994,6 @@ with pkgs; laminar = callPackage ../development/tools/continuous-integration/laminar { }; - Literate = callPackage ../development/tools/literate-programming/Literate {}; - lcov = callPackage ../development/tools/analysis/lcov { }; leiningen = callPackage ../development/tools/build-managers/leiningen { }; @@ -15119,11 +15126,6 @@ with pkgs; gconf = gnome2.GConf; }; - # NOTE: Override and set useIcon = false to use Awk instead of Icon. - noweb = callPackage ../development/tools/literate-programming/noweb { }; - - nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-medium; }; - nrfutil = callPackage ../development/tools/misc/nrfutil { }; obelisk = callPackage ../development/tools/ocaml/obelisk { }; From b44d1e37c130076cca0d5649202cda764419e052 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 12 Jan 2022 02:29:01 -0300 Subject: [PATCH 2/2] md-tangle: init at 1.3.1 --- .../md-tangle/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/literate-programming/md-tangle/default.nix diff --git a/pkgs/development/tools/literate-programming/md-tangle/default.nix b/pkgs/development/tools/literate-programming/md-tangle/default.nix new file mode 100644 index 000000000000..fd895c96c047 --- /dev/null +++ b/pkgs/development/tools/literate-programming/md-tangle/default.nix @@ -0,0 +1,28 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonPackage rec { + pname = "md-tangle"; + version = "1.3.1"; + + # By some strange reason, fetchPypi fails miserably + src = fetchFromGitHub { + owner = "joakimmj"; + repo = pname; + rev = "v${version}"; + hash = "sha256-cUME2AHK/Fva+1TSTE6hNu0SE/V1FOwcSxWF0+iZhS4="; + }; + + # Pure Python application, uses only standard modules and comes without + # testing suite + doCheck = false; + + meta = with lib;{ + homepage = "https://github.com/joakimmj/md-tangle/"; + description = "Generates (\"tangles\") source code from Markdown documents"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d36aacab6da..52cf0aaf4931 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14668,6 +14668,8 @@ with pkgs; Literate = callPackage ../development/tools/literate-programming/Literate { }; + md-tangle = callPackage ../development/tools/literate-programming/md-tangle { }; + # NOTE: Override and set useIcon = false to use Awk instead of Icon. noweb = callPackage ../development/tools/literate-programming/noweb { };