Skip to content

pythonPackages.serverlessrepo: fix pyyaml override #62051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ma27 merged 2 commits into from
May 25, 2019
Merged

pythonPackages.serverlessrepo: fix pyyaml override #62051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8de2c9e
pythonPackage.serverlessrepo: fix pyyaml override
dhl May 25, 2019
93a90e1
aws-sam-cli: Fix pyyaml override
dhl May 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions pkgs/development/python-modules/serverlessrepo/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,13 @@
{ lib
, python
, buildPythonPackage
, fetchPypi
, pytest
, boto3
, six
, pyyaml
, mock
}:

let
py = python.override {
packageOverrides = self: super: {
pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec {
version = "3.12";
src = oldAttrs.src.override {
inherit version;
sha256 = "592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab";
};
});
};
};

in

with py.pkgs;

buildPythonPackage rec {
pname = "serverlessrepo";
version = "0.1.8";
Expand All @@ -40,6 +29,10 @@ buildPythonPackage rec {
pytest tests/unit
'';

postPatch = ''
substituteInPlace setup.py --replace "pyyaml~=3.12" "pyyaml~=5.1"
'';

meta = with lib; {
homepage = https://github.com/awslabs/aws-serverlessrepo-python;
description = "Helpers for working with the AWS Serverless Application Repository";
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/tools/aws-sam-cli/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ buildPythonApplication rec {
postPatch = ''
substituteInPlace requirements/base.txt --replace "requests==2.20.1" "requests==2.21.0"
substituteInPlace requirements/base.txt --replace "six~=1.11.0" "six~=1.12.0"
substituteInPlace requirements/base.txt --replace "PyYAML~=3.12" "PyYAML~=5.1"
'';

meta = with lib; {
Expand Down