Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 222fafa02bb0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1fe44af28745
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Dec 17, 2020

  1. mdcat: fix build

    @marsam
    marsam committed Dec 17, 2020
    Copy the full SHA
    fd56a15 View commit details

  2. pythonPackages.ansi2html: disable on python 2

    @marsam
    marsam committed Dec 17, 2020
    Copy the full SHA
    819bfa3 View commit details

  3. Merge pull request #107107 from marsam/fix-mdcat-build 

    mdcat: fix build
    @marsam
    marsam authored Dec 17, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    LnL7 Daiderd Jordan
    GPG key ID: D02435D05B810C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1fe44af View commit details
Showing with 3 additions and 2 deletions.
  1. +2 −1 pkgs/development/python-modules/ansi2html/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/ansi2html/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,8 @@ buildPythonPackage rec {
pname = "ansi2html";
version = "1.6.0";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "0f124ea7efcf3f24f1f9398e527e688c9ae6eab26b0b84e1299ef7f94d92c596";
@@ -22,6 +24,5 @@ buildPythonPackage rec {
homepage = "https://github.com/ralphbean/ansi2html";
license = licenses.lgpl3Plus;
maintainers = with maintainers; [ davidtwco ];
platforms = platforms.all;
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -5268,7 +5268,7 @@ in

mdcat = callPackage ../tools/text/mdcat {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (pythonPackages) ansi2html;
inherit (python3Packages) ansi2html;
};

medfile = callPackage ../development/libraries/medfile { };