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

Commits on Mar 30, 2018

  1. linode-api: 4.1.2b0 -> 4.1.6b0

    Needed because the underlying HTTP endpoint has also changed.
    GlennS authored and adisbladis committed Mar 30, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    shlevy Shea Levy
    Copy the full SHA
    2cf5f3c View commit details
  2. Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    Copy the full SHA
    0fc0f28 View commit details
  3. Copy the full SHA
    78206eb View commit details
Showing with 12 additions and 8 deletions.
  1. +12 −8 pkgs/development/python-modules/linode-api/default.nix
20 changes: 12 additions & 8 deletions pkgs/development/python-modules/linode-api/default.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{ stdenv,
buildPythonPackage,
fetchPypi,
fetchFromGitHub,
isPy3k,
pythonOlder,
lib,
requests,
future,
enum34 }:
enum34,
mock }:

buildPythonPackage rec {
pname = "linode-api";
version = "4.1.2b0"; # NOTE: this is a beta, and the API may change in future versions.
name = "${pname}-${version}";
version = "4.1.8b1"; # NOTE: this is a beta, and the API may change in future versions.

disabled = (pythonOlder "2.7");

@@ -22,11 +22,15 @@ buildPythonPackage rec {
sed -i -e '/"enum34",/d' setup.py
'');

doCheck = false; # This library does not have any tests at this point.
doCheck = true;
checkInputs = [ mock ];

src = fetchPypi {
inherit pname version;
sha256 = "19yzyb4sbxib8yxmrqm6d8i0fm8cims56q7kiq2ana26nbcm0gr4";
# Sources from Pypi exclude test fixtures
src = fetchFromGitHub {
rev = "v${version}";
owner = "linode";
repo = "python-linode-api";
sha256 = "0qfqn92fr876dncwbkf2vhm90hnf7lwpg80hzwyzyzwz1hcngvjg";
};

meta = {