diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2019-05-03 16:01:49 +0200 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2019-05-03 16:01:49 +0200 |
| commit | 56b560942c7b567b1e3d6c48cce0e5891f4e72e6 (patch) | |
| tree | abce48e2633a2692972c16e46188ed852cd543c5 /pkgs/development/interpreters | |
| parent | 3567b1390fde8681a0f0b4581f2babbe863ede9a (diff) | |
| parent | b1bd1854d0a7c19311d5f898f5e4780fe48b3fd5 (diff) | |
| download | nixlib-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar nixlib-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.gz nixlib-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.bz2 nixlib-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.lz nixlib-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.xz nixlib-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.zst nixlib-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/hy/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/interpreters/wasmtime/default.nix | 2 |
2 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index 02ce07bdf471..12631cee38ae 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, fetchpatch, pythonPackages }: pythonPackages.buildPythonApplication rec { name = "hy-${version}"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { url = "mirror://pypi/h/hy/${name}.tar.gz"; - sha256 = "01vzaib1imr00j5d7f7xk44v800h06s3yv9inhlqm6f3b25ywpl1"; + sha256 = "00lq38ppikrpyw38fn5iy9iwrsamsv22507cp146dsjbzkwjpzrd"; }; + patches = [ + (fetchpatch { + name = "bytecode-error-handling.patch"; + url = "https://github.com/hylang/hy/commit/57326785b97b7b0a89f6258fe3d04dccdc06cfc0.patch"; + sha256 = "1lxxs7mxbh0kaaa25b1pbqs9d8asyjnlf2n86qg8hzsv32jfcq92"; + excludes = [ "AUTHORS" "NEWS.rst" ]; + }) + ]; + propagatedBuildInputs = with pythonPackages; [ appdirs astor clint + fastentrypoints funcparserlib rply ]; diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 882de562114a..33d00afd9e70 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoSha256 = "17k8n5xar4pvvi4prhm6c51vlim9xqwkkhysbnss299mm3fyh36h"; + cargoSha256 = "0xy8vazb4nc4q1098ws92j1yfwp9w7q30z0yk2gindkn898603bc"; cargoPatches = [ ./cargo-lock.patch ]; |