diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-04-18 14:03:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-18 14:03:51 +0200 |
| commit | 256e34b89d8cdc67e19f0f960450919b0c6c3737 (patch) | |
| tree | c4a4ef2e2731f4ab2bf9e959a00bc8bc5743971e /pkgs/development/tools | |
| parent | 99930cadb46c5256a90dd50a050a3f40f1c35663 (diff) | |
| parent | a6a88bffd58ca40ac528dd4886110a20acae3967 (diff) | |
| download | nixlib-256e34b89d8cdc67e19f0f960450919b0c6c3737.tar nixlib-256e34b89d8cdc67e19f0f960450919b0c6c3737.tar.gz nixlib-256e34b89d8cdc67e19f0f960450919b0c6c3737.tar.bz2 nixlib-256e34b89d8cdc67e19f0f960450919b0c6c3737.tar.lz nixlib-256e34b89d8cdc67e19f0f960450919b0c6c3737.tar.xz nixlib-256e34b89d8cdc67e19f0f960450919b0c6c3737.tar.zst nixlib-256e34b89d8cdc67e19f0f960450919b0c6c3737.zip | |
Merge staging-next into master (#59733)
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/conan/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/tools/remarshal/default.nix | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 8ae56834702b..ed7babf49332 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -37,6 +37,13 @@ let newPython = python3.override { sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8"; }; }); + pyyaml = super.pyyaml.overridePythonAttrs (oldAttrs: rec { + version = "3.13"; + src = oldAttrs.src.override { + inherit version; + sha256 = "3ef3092145e9b70e3ddd2c7ad59bdd0252a94dfe3949721633e41344de00a6bf"; + }; + }); }; }; diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 6632d0626339..10bfd0c2f2d0 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -2,13 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "remarshal"; - version = "0.8.0"; + version = "0.9.1"; - src = fetchFromGitHub { - owner = "dbohdan"; - repo = "remarshal"; - rev = "v${version}"; - sha256 = "192r1mfd5yj6kg6fqmkjngdlgn25g5rkvm0p6xaflpvavnhvhnsj"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "564ffe9cbde85bd28a9c184b90c764abd2003abd6101a30802262198b5c7fc40"; }; propagatedBuildInputs = with python3Packages; [ |