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

Commits on Sep 14, 2017

  1. 3to2: rename py3to2 to work with callPackage

    Samuel Leathers committed Sep 14, 2017

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: C34BF9DCC9DF8210
    Learn about vigilant mode
    Copy the full SHA
    fad96f6 View commit details

  2. arelle: add py3to2 as a buildInput

    Samuel Leathers committed Sep 14, 2017

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: C34BF9DCC9DF8210
    Learn about vigilant mode
    Copy the full SHA
    6ac283b View commit details

Commits on Sep 15, 2017

  1. Merge pull request #29388 from disassembler/arelle 

    arelle: add py3to2 as a buildInput
    @FRidh
    FRidh authored Sep 15, 2017
    Copy the full SHA
    47e1751 View commit details
Showing with 5 additions and 2 deletions.
  1. +2 −1 pkgs/development/python-modules/arelle/default.nix
  2. +3 −1 pkgs/top-level/python-packages.nix
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/arelle/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ gui ? true,
buildPythonPackage, fetchFromGitHub, lib,
sphinx_1_2, lxml, isodate, numpy, pytest,
tkinter ? null,
tkinter ? null, py3to2,
... }:

let
@@ -26,6 +26,7 @@ buildPythonPackage {
buildInputs = [
sphinx_1_2
pytest
py3to2
];
propagatedBuildInputs = [
lxml
4 changes: 3 additions & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -99,7 +99,9 @@ in {

acoustics = callPackage ../development/python-modules/acoustics { };

"3to2" = callPackage ../development/python-modules/3to2 { };
py3to2 = callPackage ../development/python-modules/3to2 { };
# Left for backwards compatibility
"3to2" = self.py3to2;

aenum = callPackage ../development/python-modules/aenum { };