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

Commits on Sep 10, 2019

  1. pythonPackages.fire: 0.1.3 -> 0.2.1

    @leenaars
    leenaars committed Sep 10, 2019
    Copy the full SHA
    6468d46 View commit details

  2. Merge pull request #67571 from leenaars/fire 

    pythonPackages.fire: 0.1.3 -> 0.2.1
    @lsix
    lsix authored Sep 10, 2019

    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
    9c171d2 View commit details
Showing with 4 additions and 12 deletions.
  1. +4 −12 pkgs/development/python-modules/fire/default.nix
16 changes: 4 additions & 12 deletions pkgs/development/python-modules/fire/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,25 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, fetchpatch, six, hypothesis, mock
, python-Levenshtein, pytest }:
, python-Levenshtein, pytest, termcolor, isPy27, enum34 }:

buildPythonPackage rec {
pname = "fire";
version = "0.1.3";
version = "0.2.1";

src = fetchFromGitHub {
owner = "google";
repo = "python-fire";
rev = "v${version}";
sha256 = "0kdcmzr3sgzjsw5fmvdylgrn8akqjbs433jbgqzp498njl9cc6qx";
sha256 = "1r6cmihafd7mb6j3mvgk251my6ckb0sqqj1l2ny2azklv175b38a";
};

propagatedBuildInputs = [ six ];
propagatedBuildInputs = [ six termcolor ] ++ stdenv.lib.optional isPy27 enum34;

checkInputs = [ hypothesis mock python-Levenshtein pytest ];

checkPhase = ''
py.test
'';

patches = [
# Add Python 3.7 support. Remove with the next release
(fetchpatch {
url = "https://github.com/google/python-fire/commit/668007ae41391f5964870b4597e41493a936a11e.patch";
sha256 = "0rf7yzv9qx66zfmdggfz478z37fi4rwx4hlh3dk1065sx5rfksi0";
})
];

meta = with stdenv.lib; {
description = "A library for automatically generating command line interfaces";
longDescription = ''