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

Commits on May 22, 2018

  1. Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    Copy the full SHA
    05db1a1 View commit details
Showing with 17 additions and 9 deletions.
  1. +16 −0 pkgs/development/python-modules/timeout-decorator/default.nix
  2. +1 −9 pkgs/top-level/python-packages.nix
16 changes: 16 additions & 0 deletions pkgs/development/python-modules/timeout-decorator/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{ stdenv, buildPythonPackage, fetchPypi }:
buildPythonPackage rec {
pname = "timeout-decorator";
version = "0.4.0";

src = fetchPypi {
inherit pname version;
sha256 = "1bckwbi5078z3x9lyf8vl9dhx10nymwwnp46c98wm5m02x5j37g4";
};

meta = with stdenv.lib; {
description = "Timeout decorator";
license = licenses.mit;
homepage = https://github.com/pnpnpn/timeout-decorator;
};
}
10 changes: 1 addition & 9 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -13034,15 +13034,7 @@ in {
};
};

timeout-decorator = buildPythonPackage rec {
name = "timeout-decorator-${version}";
version = "0.3.2";

src = pkgs.fetchurl {
url = "http://pypi.python.org/packages/source/t/timeout-decorator/${name}.tar.gz";
sha256 = "1x9l8bwdk72if2d5h5mi4lcaidbsmyh0iz114cfyyj1rzz5rxqaf";
};
};
timeout-decorator = callPackage ../development/python-modules/timeout-decorator { };

pid = buildPythonPackage rec {
name = "pid-${version}";