diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-07-14 18:12:49 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-07-14 18:15:30 +0200 |
commit | 0f01215203e3886d1a57ced4cd49b54475c66f85 (patch) | |
tree | 3cca5bbb2d7f79724f211d476d6a3e14d0ddf92d /pkgs/development/python-modules/credstash | |
parent | 4bd4e3ef5c13c97ad829d18d8fe99dd753b33da5 (diff) | |
parent | 6d0578934fb076050b3dcc1b924a90b275f3b27c (diff) | |
download | nixpkgs-0f01215203e3886d1a57ced4cd49b54475c66f85.tar nixpkgs-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.gz nixpkgs-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.bz2 nixpkgs-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.lz nixpkgs-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.xz nixpkgs-0f01215203e3886d1a57ced4cd49b54475c66f85.tar.zst nixpkgs-0f01215203e3886d1a57ced4cd49b54475c66f85.zip |
Merge branch 'master' into staging-next
Hydra: ?compare=1468896
Diffstat (limited to 'pkgs/development/python-modules/credstash')
-rw-r--r-- | pkgs/development/python-modules/credstash/default.nix | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 8be1780aa99..e19850be8ce 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -1,19 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils, nose }: buildPythonPackage rec { pname = "credstash"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "718b337f7a6fa001e014386071f05c59900525d0507009126d2fe8d75fe0761d"; + sha256 = "814560f99ae2409e2c6d906d878f9dadada5d1d0a950aafb6b2c0d535291bdfb"; }; - patches = fetchpatch { - url = https://github.com/fugue/credstash/pull/178.patch; - sha256 = "15ih4h5v63g7qfmqdl4zca147wkcrx8vnsh4ns33001dipcfb5sc"; - excludes = [ ".travis.yml" ]; - }; + nativeBuildInputs = [ nose ]; propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ]; |