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

Commits on Jan 7, 2020

  1. python37Packages.xdis: 4.2.1 -> 4.2.2

    @r-ryantm
    r-ryantm committed Jan 7, 2020
    Copy the full SHA
    8c40b18 View commit details

Commits on Jan 8, 2020

  1. python37Packages.xdis: unbreak

    @marsam
    marsam committed Jan 8, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3ecc232 View commit details

  2. python37Packages.uncompyle6: 3.6.1 -> 3.6.2

    @marsam
    marsam committed Jan 8, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7cd39f9 View commit details

  3. Merge pull request #77227 from r-ryantm/auto-update/python3.7-xdis 

    python37Packages.xdis: 4.2.1 -> 4.2.2
    @marsam
    marsam authored Jan 8, 2020

    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
    fa19a11 View commit details
Showing with 4 additions and 5 deletions.
  1. +2 −2 pkgs/development/python-modules/uncompyle6/default.nix
  2. +2 −3 pkgs/development/python-modules/xdis/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/uncompyle6/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@

buildPythonPackage rec {
pname = "uncompyle6";
version = "3.6.1";
version = "3.6.2";

src = fetchPypi {
inherit pname version;
sha256 = "f8c7ba2fd486d40d9a9fc1d6ab438588d7ce1be123aabf488736ff68a05f57f7";
sha256 = "aac071daef4b6cf95143ef08cd35d762a2bf2ea8249119a9371a91149c9996e7";
};

checkInputs = [ nose pytest hypothesis six ];
5 changes: 2 additions & 3 deletions pkgs/development/python-modules/xdis/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,14 +6,14 @@

buildPythonPackage rec {
pname = "xdis";
version = "4.2.1";
version = "4.2.2";
disabled = isPy27;

src = fetchFromGitHub {
owner = "rocky";
repo = "python-xdis";
rev = version;
sha256 = "19mnx746k9ls2f1321fl8nkps7x9by80f753f3c5wh1j91zivq6b";
sha256 = "0d286myx6z6cbih77h8z5p9vscxvww3gy59lmi1w6y2nq6c8sqzb";
};

checkInputs = [ pytest ];
@@ -27,6 +27,5 @@ buildPythonPackage rec {
description = "Python cross-version byte-code disassembler and marshal routines";
homepage = https://github.com/rocky/python-xdis/;
license = licenses.gpl2;
broken = true; # doesn't support latest python3 interpreters
};
}