1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-02 18:42:15 +00:00
Commit graph

4669 commits

Author SHA1 Message Date
Frederik Rietdijk 9a63b3d3d6
Merge pull request #104781 from NixOS/staging-next
Staging next
2020-11-30 18:27:29 +01:00
Ben Siraphob d3287cdd0a octave: 5.2.0 -> 6.1.0 2020-11-30 18:27:11 +07:00
adisbladis 49b8738a5f
python: Propagate packageOverrides to pythonForBuild
When overriding versions of build tools injected via hooks
`packageOverrides` was not taken into account and 2 incompatible
versions of the same package (`wheel` in this case) ended up in the
closure, causing the builds to fail.
2020-11-30 11:12:59 +01:00
Frederik Rietdijk 0d8491cb2b Merge master into staging-next 2020-11-29 13:51:10 +01:00
John Ericson 2622548c13
Merge pull request #105155 from FRidh/splice
Python: rename internal parameters related to splicing and fix splicing
2020-11-28 12:02:20 -05:00
Frederik Rietdijk 455774e546 Python: add todo note regarding pythonForBuild 2020-11-28 17:36:23 +01:00
Frederik Rietdijk 5804c8a7f5 Python splicing: splice package sets, not Python derivation
In the original commit the various builds of Python were added to
`otherSplices`, instead of the intended Python package sets.
2020-11-28 17:36:23 +01:00
Frederik Rietdijk 6cf25f9dbd Python: rename parameters and arguments passed to passthru
As part of the splicing the build/host/target combinations of the interpreter
need to be passed around internally. The chosen names were not very clear,
implying they were package sets whereas actually there were derivations.
2020-11-28 17:36:23 +01:00
Frederik Rietdijk 8220b0449c python.tests: use self.callPackage instead of super.callPackage
super was incorrectly possible until https://github.com/NixOS/nixpkgs/pull/104201
got merged.
2020-11-28 16:57:07 +01:00
Frederik Rietdijk cce2fd547b Python: use pythonPackagesBuildHost instead of pythonForBuild
Follow-up to #104201, related to #105113.
2020-11-28 16:36:03 +01:00
Frederik Rietdijk 9e062723b2 Merge master into staging-next 2020-11-28 08:53:47 +01:00
Mario Rodas 9a93ca8510
Merge pull request #105109 from jtacoma/patch-dart-darwin
dart: support x86_64-darwin platform
2020-11-27 23:16:35 -05:00
Frederik Rietdijk b2a3891e12 Merge master into staging-next 2020-11-27 15:09:19 +01:00
Jakub Kądziołka 9c01258465
racket: Update source hashes
Upstream has replaced the tarballs in place to fix racket/racket#3499.
2020-11-27 14:20:41 +01:00
Elis Hirwing 1d2835c5f7
Merge pull request #105040 from helsinki-systems/upd/php
php: 7.3.24 -> 7.3.25, 7.4.12 -> 7.4.13
2020-11-27 08:40:20 +01:00
Jonathan Ringer 0a4575a1da python/hooks/pythonNamespaces: fix __pycache__ being empty, or not existing 2020-11-26 13:51:05 -08:00
ajs124 1eb55d4c55 php74: 7.4.12 -> 7.4.13
https://www.php.net/ChangeLog-7.php#7.4.13
2020-11-26 20:14:48 +01:00
Pavol Rusnak 73ec4085c9
Merge pull request #104208 from freezeboy/unbreak-unicon-lang
unicon-lang: unbreak adding libnsl
2020-11-26 17:44:32 +01:00
ajs124 eec6063cc4 php73: 7.3.24 -> 7.3.25
https://www.php.net/ChangeLog-7.php#7.3.25
2020-11-26 15:31:25 +01:00
Joshua Tacoma 42e09c2134 dart: support x86_64-darwin platform 2020-11-26 02:49:08 -05:00
Sandro c4c006f028
Merge pull request #97081 from deviant/update-icon-lang
icon-lang: 9.5.1 -> 9.5.20i
2020-11-26 08:35:14 +01:00
Frederik Rietdijk 0a12b8a5e9 Revert "Revert "Revert "cpython: fix finding headers when cross-compiling extension modules"""
This still does not function without issues. E.g., bootstrapped-pip fails with Python 3.6 and 3.7
as well as 3.8 on 32-bit.

Because this is a stdenv-rebuild it needs to be tested significantly better

This reverts commit 6100bc29f7.
2020-11-25 10:34:23 +01:00
Guillaume Girol 6108c23eb4
Merge pull request #103964 from Taneb/metamath-193
metamath: 0.182 -> 0.193
2020-11-24 20:31:23 +00:00
StigP 13b0a81056
Merge pull request #104644 from stigtsp/package/rakudo-2020.11
rakudo: 2020.10 -> 2020.11
2020-11-24 11:02:00 +01:00
Frederik Rietdijk 587538d087 Merge staging-next into staging 2020-11-23 18:10:33 +01:00
Jonathan Ringer f5d9dd3050 python/hooks/pythonNamespaces: fix __pycache__ logic 2020-11-23 08:33:04 -08:00
freezeboy cfba07ba04 supercollider: 3.11.0 -> 3.11.2 2020-11-23 06:53:35 -08:00
Frederik Rietdijk 95d9ff16f3 python.tests: not when cross-compiling
Running the tests is not possible when cross-compiling.
2020-11-23 15:29:23 +01:00
Frederik Rietdijk 6100bc29f7 Revert "Revert "cpython: fix finding headers when cross-compiling extension modules""
Moving the sysconfig file caused spidermonkey_78 to fail to build. We now symlink it instead.

This reverts commit 6a23dde75b.
2020-11-23 15:29:23 +01:00
StigP b0fa828182
Merge pull request #104607 from stigtsp/package/perl-5.33.4
perldevel: 5.33.3 -> 5.33.4, perl-cross:  65e06e2 -> 6c11560
2020-11-23 13:43:43 +01:00
Stig Palmquist f8e6583e66
rakudo: 2020.10 -> 2020.11 2020-11-23 02:32:48 +01:00
Stig Palmquist e4977d4993
nqp: 2020.10 -> 2020.11 2020-11-23 02:32:29 +01:00
Stig Palmquist d9dafe3b62
moarvm: 2020.10 -> 2020.11 2020-11-23 02:32:11 +01:00
Stig Palmquist 408236cd6a
perldevel: 5.33.3 -> 5.33.4
dependencies:
perl-cross: 65e06e238ccb949e8399bdebc6d7fd798c34127b -> 6c115604fcbf01ceb3c6d7c13206a7590abf6c21
2020-11-23 01:59:43 +01:00
R. RyanTM 7620d4c67b zef: 0.9.1 -> 0.9.4 2020-11-22 16:23:39 +00:00
Frederik Rietdijk 7726f81b13 python.tests: use self.callPackage instead of super.callPackage
super was incorrectly possible until https://github.com/NixOS/nixpkgs/pull/104201
got merged.
2020-11-22 13:17:24 +01:00
Frederik Rietdijk 6a23dde75b Revert "cpython: fix finding headers when cross-compiling extension modules"
This breaks virtualenv https://github.com/NixOS/nixpkgs/issues/104483.
We should probably not move `_sysconfigdata` but just copy it for cross to
another place or output.

This reverts commit 11806b6ede.
2020-11-22 13:13:23 +01:00
Jonathan Ringer 8d210e2ea4 python3.pkgs.pipInstallHook: don't warn on script installation 2020-11-20 12:25:52 -08:00
Jan Tojnar 66ef389efa
Merge branch 'staging-next' into staging 2020-11-20 01:38:58 +01:00
Jan Tojnar f6105d21e3
Merge branch 'master' into staging-next 2020-11-20 01:38:32 +01:00
Frederik Rietdijk 27d3a18ac7 buildPython*: don't catch conflicts when cross-compiling
Hack until we fix PYTHONPATH.
2020-11-19 20:59:16 +01:00
Ben Wolsieffer 11806b6ede cpython: fix finding headers when cross-compiling extension modules 2020-11-19 20:42:58 +01:00
Tom McLaughlin c81c3c3daf
cling: init at 0.7.0 (#64319)
Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
2020-11-19 14:29:02 -05:00
Frederik Rietdijk ea7b8978ef Merge master into staging-next 2020-11-19 20:08:15 +01:00
John Ericson 93b430bc6b
Merge pull request #104201 from obsidiansystems/splice-python
python: Splice packages to better support cross
2020-11-19 14:07:03 -05:00
John Ericson b57c5d4456 python: Use makeScopeWithSplicing
Now non-`buildInputs` that are python packages should be resolved
correctly.
2020-11-19 11:58:07 -05:00
John Ericson 330d468002 python: Use packages from previous stage in setup-hooks
This makes sense as these are tools we want to run at build time.
2020-11-19 11:58:03 -05:00
José Luis Lafuente b364168989
clojure: Mimic upstream install script
Also installs exec.jar in the expected location
2020-11-19 11:12:00 +01:00
freezeboy b0d21af997 unicon-lang: unbreak adding libnsl 2020-11-18 22:05:23 +01:00
Frederik Rietdijk da12fc6838 Merge staging-next into staging 2020-11-18 15:36:56 +01:00