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: d47eae33b0c0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 82dcbdfb9fe9
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 2, 2021

  1. pythonPackages.xml2rfc: Fix dependencies

    @SuperSandro2000
    SuperSandro2000 committed Jan 2, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    SuperSandro2000 Sandro
    GPG key ID: 3AF5A43A3EECC2E5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f3d0b31 View commit details

  2. Merge pull request #108210 from SuperSandro2000/xml2rfc 

    pythonPackages.xml2rfc: Fix dependencies
    @SuperSandro2000
    SuperSandro2000 authored Jan 2, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    82dcbdf View commit details
Showing with 7 additions and 4 deletions.
  1. +7 −4 pkgs/development/python-modules/xml2rfc/default.nix
11 changes: 7 additions & 4 deletions pkgs/development/python-modules/xml2rfc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{ lib, fetchPypi, buildPythonPackage, intervaltree, pyflakes, requests, lxml, google-i18n-address
, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2
, stdenv
{ stdenv, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address
, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, ConfigArgParse, appdirs
}:

buildPythonPackage rec {
pname = "xml2rfc";
version = "3.5.0";
disabled = pythonAtLeast "3.9";

src = fetchPypi {
inherit pname version;
@@ -27,6 +27,8 @@ buildPythonPackage rec {
pypdf2
dict2xml
weasyprint
ConfigArgParse
appdirs
];

preCheck = ''
@@ -35,8 +37,9 @@ buildPythonPackage rec {

# lxml tries to fetch from the internet
doCheck = false;
pythonImportsCheck = [ "xml2rfc" ];

meta = with lib; {
meta = with stdenv.lib; {
description = "Tool generating IETF RFCs and drafts from XML sources";
homepage = "https://tools.ietf.org/tools/xml2rfc/trac/";
# Well, parts might be considered unfree, if being strict; see: