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: 0cd86e1e9d1d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c2649439d52b
Choose a head ref
  • 6 commits
  • 2 files changed
  • 2 contributors

Commits on Aug 3, 2018

  1. pythonPackages.actdiag: run tests

    Robert Schütz committed Aug 3, 2018
    Copy the full SHA
    95134fb View commit details

  2. actdiag: use python3 and toPythonApplication

    Robert Schütz committed Aug 3, 2018
    Copy the full SHA
    54ae6ea View commit details

  3. blockdiag: use python3Packages and toPythonApplication

    Robert Schütz committed Aug 3, 2018
    Copy the full SHA
    8769f25 View commit details

  4. seqdiag: use python3Packages and toPythonApplication

    Robert Schütz committed Aug 3, 2018
    Copy the full SHA
    7d4d49b View commit details

  5. nwdiag: use python3Packages and toPythonApplication

    Robert Schütz committed Aug 3, 2018
    Copy the full SHA
    5acb3f5 View commit details

  6. Merge pull request #44408 from dotlambda/actdiag-application 

    *diag: use python3 and toPythonApplication
    @dotlambda
    dotlambda authored Aug 3, 2018

    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
    c264943 View commit details
Showing with 13 additions and 9 deletions.
  1. +9 −5 pkgs/development/python-modules/actdiag/default.nix
  2. +4 −4 pkgs/top-level/all-packages.nix
14 changes: 9 additions & 5 deletions pkgs/development/python-modules/actdiag/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, buildPythonPackage, fetchPypi
, pep8, nose, unittest2, docutils, blockdiag }:
{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
, pep8, nose, unittest2, docutils, blockdiag, reportlab }:

buildPythonPackage rec {
pname = "actdiag";
@@ -10,13 +10,17 @@ buildPythonPackage rec {
sha256 = "983071777d9941093aaef3be1f67c198a8ac8d2bba264cdd1f337ca415ab46af";
};

patches = fetchpatch {
name = "drop_test_pep8.py.patch";
url = https://bitbucket.org/blockdiag/actdiag/commits/c1f2ed5947a1e93291f5860e4e30cee098bd635d/raw;
sha256 = "1zxzwb0fvwlc8xgs45fx65341sjhb3h6l2p6rdj6i127vg1hsxb4";
};

buildInputs = [ pep8 nose unittest2 docutils ];

propagatedBuildInputs = [ blockdiag ];

# One test fails:
# UnicodeEncodeError: 'ascii' codec can't encode character u'\u3042' in position 0: ordinal not in range(128)
doCheck = false;
checkInputs = [ reportlab ];

meta = with stdenv.lib; {
description = "Generate activity-diagram image from spec-text file (similar to Graphviz)";
8 changes: 4 additions & 4 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -429,7 +429,7 @@ with pkgs;

acpica-tools = callPackage ../tools/system/acpica-tools { };

actdiag = pythonPackages.actdiag;
actdiag = with python3.pkgs; toPythonApplication actdiag;

actkbd = callPackage ../tools/system/actkbd { };

@@ -905,7 +905,7 @@ with pkgs;

blobfuse = callPackage ../tools/filesystems/blobfuse { };

blockdiag = pythonPackages.blockdiag;
blockdiag = with python3Packages; toPythonApplication blockdiag;

blsd = callPackage ../tools/misc/blsd {
libgit2 = libgit2_0_27;
@@ -4244,7 +4244,7 @@ with pkgs;

nssmdns = callPackage ../tools/networking/nss-mdns { };

nwdiag = pythonPackages.nwdiag;
nwdiag = with python3Packages; toPythonApplication nwdiag;

nylon = callPackage ../tools/networking/nylon { };

@@ -5076,7 +5076,7 @@ with pkgs;

setserial = callPackage ../tools/system/setserial { };

seqdiag = pythonPackages.seqdiag;
seqdiag = with python3Packages; toPythonApplication seqdiag;

screenfetch = callPackage ../tools/misc/screenfetch { };