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

Commits on Dec 25, 2016

  1. pythonPackages.txaio: 2.5.1 -> 2.5.2

    @FRidh
    FRidh committed Dec 25, 2016

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6538CB9266B06F31
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    63b0c9d View commit details

  2. pythonPackages.xlwt: fix patch hash

    @FRidh
    FRidh committed Dec 25, 2016

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: 6538CB9266B06F31
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8916131 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 pkgs/development/python-modules/xlwt/default.nix
  2. +2 −2 pkgs/top-level/python-packages.nix
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/xlwt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ buildPythonPackage rec {
patches = [
(fetchpatch {
url = "https://github.com/python-excel/xlwt/commit/86564ef26341020316cd8a27c704ef1dc5a6129b.patch";
sha256 = "01abxfkmckcxpi6n5wi8ia58fmkzqrxjfjq1mjljygylm8nb3m8i";
sha256 = "0ifavfld3rrqjb0iyriy4c0drw31gszvlg3nmnn9dmfsh91vxhs6";
})
];

4 changes: 2 additions & 2 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -31379,7 +31379,7 @@ EOF
txaio = buildPythonPackage rec {
name = "${pname}-${version}";
pname = "txaio";
version = "2.5.1";
version = "2.5.2";

meta = {
description = "Utilities to support code that runs unmodified on Twisted and asyncio.";
@@ -31398,7 +31398,7 @@ EOF

src = pkgs.fetchurl {
url = "mirror://pypi/t/${pname}/${name}.tar.gz";
sha256 = "1pni1m66mlmbybmaf3py4h7cpkmkssqb5l3rigkxvql2f53pcl32";
sha256 = "321d441b336447b72dbe81a4d73470414454baf0543ec701fcfecbf4dcbda0fe";
};
};