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

Commits on Mar 7, 2019

  1. pythonPackages.lzstring: init at 1.0.4

    @obadz
    obadz committed Mar 7, 2019
    Copy the full SHA
    7d7727e View commit details

  2. pythonPackages.flickrapi: init at 2.4.0

    @obadz
    obadz committed Mar 7, 2019
    Copy the full SHA
    275e6a0 View commit details
Showing with 62 additions and 0 deletions.
  1. +35 −0 pkgs/development/python-modules/flickrapi/default.nix
  2. +24 −0 pkgs/development/python-modules/lzstring/default.nix
  3. +3 −0 pkgs/top-level/python-packages.nix
35 changes: 35 additions & 0 deletions pkgs/development/python-modules/flickrapi/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
, requests_toolbelt
, requests_oauthlib
, pytest
, pytestrunner
, pytestcov
, responses
}:

buildPythonPackage rec {
pname = "flickrapi";
version = "2.4.0";

src = fetchPypi {
inherit pname version;
sha256 = "03g2z21k6nhxgwysjrgnxj9m1yg25mnnkr10gpyfhfkd9w77pcpz";
};

propagatedBuildInputs = [ requests requests_toolbelt requests_oauthlib ];

checkInputs = [ pytest pytestrunner pytestcov responses ];
doCheck = false; # Otherwise:
# ========================= no tests ran in 0.01 seconds =========================
# builder for '/nix/store/c8a58v6aa18zci08q2l53s12ywn8jqhq-python3.6-flickrapi-2.4.0.drv' failed with exit code 5

meta = {
description = "A Python interface to the Flickr API";
homepage = https://stuvel.eu/flickrapi;
license = lib.licenses.psfl;
maintainers = with lib.maintainers; [ obadz ];
};
}
24 changes: 24 additions & 0 deletions pkgs/development/python-modules/lzstring/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
, future
}:

buildPythonPackage rec {
pname = "lzstring";
version = "1.0.4";

src = fetchPypi {
inherit pname version;
sha256 = "18ly9pppy2yspxzw7k1b23wk77k7m44rz2g0271bqgqrk3jn3yhs";
};

propagatedBuildInputs = [ future ];

meta = {
description = "lz-string for python";
homepage = https://github.com/gkovacs/lz-string-python;
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ obadz ];
};
}
3 changes: 3 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -5394,6 +5394,9 @@ in {

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

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

flickrapi = callPackage ../development/python-modules/flickrapi { };
});

in fix' (extends overrides packages)