diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-08-04 13:02:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-04 13:02:06 +0000 |
| commit | b79dbfe4826ead3bc4d5fb2c9bd336d71ef7133f (patch) | |
| tree | 39886e46cd3df3e8b4dfebc7dd8dd89374dd7799 /pkgs/development | |
| parent | 20f1388c3fb7c1c56367fd96fd21cfd316f465b7 (diff) | |
| parent | 834a24e0ff8c18b773879b79c1c5e30f518a79b0 (diff) | |
| download | nixlib-b79dbfe4826ead3bc4d5fb2c9bd336d71ef7133f.tar nixlib-b79dbfe4826ead3bc4d5fb2c9bd336d71ef7133f.tar.gz nixlib-b79dbfe4826ead3bc4d5fb2c9bd336d71ef7133f.tar.bz2 nixlib-b79dbfe4826ead3bc4d5fb2c9bd336d71ef7133f.tar.lz nixlib-b79dbfe4826ead3bc4d5fb2c9bd336d71ef7133f.tar.xz nixlib-b79dbfe4826ead3bc4d5fb2c9bd336d71ef7133f.tar.zst nixlib-b79dbfe4826ead3bc4d5fb2c9bd336d71ef7133f.zip | |
Merge pull request #43281 from timokau/sage-8.3
sage: 8.2 -> 8.3
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/science/math/lcalc/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/python-modules/ipython/5.nix | 11 |
2 files changed, 23 insertions, 0 deletions
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 6bbd43b0c848..e55244b2a59f 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -57,6 +57,18 @@ stdenv.mkDerivation rec { # based on gentoos makefile patch -- fix paths, adhere to flags ./makefile.patch + + # (fetchpatch { + # name = "default-double.patch"; + # url = "https://github.com/dimpase/lcalc/pull/1/commits/0500c67b6aa1f492715591669f6647c8f7a3ea59.patch"; + # sha256 = "0dqwmxpm9wb53qbypsyfkgsvk2f8nf67sydphd4dkc2vw4yz6vla"; + # }) + + (fetchpatch { + name = "c++11.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/lcalc-c++11.patch?h=packages/lcalc&id=3607b97df5a8c231191115b0cb5c62426b339e71"; + sha256 = "1ccrl61lv2vvx8ggldq54m5d0n1iy6mym7qz0i8nj6yj0dshnpk3"; + }) ]; installFlags = [ diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index f2066fee2a4a..36f581c98afb 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, fetchpatch # Build dependencies , glibcLocales # Test dependencies @@ -36,6 +37,16 @@ buildPythonPackage rec { substituteInPlace setup.py --replace "'gnureadline'" " " ''; + patches = [ + # improve cython support, needed by sage, accepted upstream + # https://github.com/ipython/ipython/pull/11139 + (fetchpatch { + name = "signature-use-inspect.patch"; + url = "https://github.com/ipython/ipython/commit/8d399b98d3ed5c765835594100c4d36fb2f739dc.patch"; + sha256 = "1r7v9clwwbskmj4y160vcj6g0vzqbvnj4y1bm2n4bskafapm42g0"; + }) + ]; + buildInputs = [ glibcLocales ]; checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock; |