nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 08:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-02-12 09:55:31 +01:00
parent 1a6c3cb06b c6218f9e99
commit 424697d512
48 changed files with 383 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/credstash/default.nix
View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "credstash";
version = "1.16.1";
version = "1.16.2";
src = fetchPypi {
inherit pname version;
sha256 = "019wviz3hx0pkh3mgqr3prg55njyhzvhjqcpndgrfmkykjkcj435";
sha256 = "1l3g76dm9csmx0z8s7zd75wfzw9dcyvrq0a81gfzwxk0c0w8c79r";
};
# The install phase puts an executable and a copy of the library it imports in

7
pkgs/development/python-modules/pysaml2/default.nix
View File

@@ -2,6 +2,7 @@
, buildPythonPackage
, isPy3k
, fetchFromGitHub
, fetchpatch
, substituteAll
, xmlsec
, cryptography, defusedxml, future, pyopenssl, dateutil, pytz, requests, six
@@ -27,6 +28,12 @@ buildPythonPackage rec {
src = ./hardcode-xmlsec1-path.patch;
inherit xmlsec;
})
# remove on next release
(fetchpatch {
name = "fix-test-dates.patch";
url = "https://github.com/IdentityPython/pysaml2/commit/1d97d2d26f63e42611558fdd0e439bb8a7496a27.patch";
sha256 = "0r6d6hkk6z9yw7aqnsnylii516ysmdsc8dghwmgnwvw6cm7l388p";
})
];
propagatedBuildInputs = [ cryptography defusedxml future pyopenssl dateutil pytz requests six ];