Commit graph

4718 commits

Author SHA1 Message Date
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
Kovacsics Robert 612ec25256
guile: setup hook, use compiled files
Often packages install the compiled files to
`$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/ccache` (e.g. see
guile-opengl). This path is not explicitly given in the info page, but
is used in a couple of places, and is also part of `%load-compiled-path`
variable in guile (for `"${guile}/lib/guile/2.2/ccache`).

Similarly, the site-ccache is also part of `%load-compiled-path` in
guile.
2020-11-28 11:16:25 +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
Bernardo Meurer 7edf1ced82 pypy: enable aarch64-linux platform 2020-11-18 09:55:33 +01:00
Oleksii Filonenko 512c3c0a05 maintainers: rename filalex77 -> Br1ght0ne 2020-11-17 13:09:31 +02:00
Alex Good aaa7af13dc Merge branch 'master' into wrapprogram-for-phpdbg 2020-11-16 16:38:21 +00:00
Alex Good 68761cb016 wrapProgram for phpdbg in pkgs.php* 2020-11-16 16:27:38 +00:00
Nathan van Doorn c1407066c4 metamath: 0.182 -> 0.193 2020-11-16 11:41:34 +00:00
Frederik Rietdijk 986c2d36da Merge master into staging-next 2020-11-16 09:01:53 +01:00
StigP c57e985c06
Merge pull request #103607 from r-ryantm/auto-update/zef
zef: 0.8.5 -> 0.9.1
2020-11-15 22:22:04 +00:00
zowoq 051812b8cf Revert "ruby: fix build on darwin"
This reverts commit d73cc1e586.
2020-11-14 07:11:29 +10:00
Frederik Rietdijk 9fc4a4db5a Merge staging-next into staging 2020-11-13 20:59:08 +01:00
Frederik Rietdijk 463f738cc6 Merge master into staging-next 2020-11-13 20:58:35 +01:00
Doron Behar 2e7d97a50d
Merge pull request #103584 from danieldk/ruby-check-disallowed-references
ruby: check disallowed references with jitSupport disabled
2020-11-13 09:34:31 +02:00
Maximilian Bosch e7053a87ad
evcxr: 0.5.3 -> 0.6.0
Since version `0.6.0` the `rust-src` component (or declaring
`RUST_SRC_PATH`) is needed. Just like in `rust-analyzer`, this is solved by
setting `RUST_SRC_PATH` to `rustPlatform.rustLibSrc` for tests and
wrapped executables.

ChangeLog: https://github.com/google/evcxr/blob/v0.6.0/RELEASE_NOTES.md#version-060
2020-11-12 19:41:32 +01:00
Frederik Rietdijk 3fceafce1e buildPython*: remove pythonRecompileBytecodeHook as dependency
This hook was added to get reproducible bytecode. Because it was causing
issues it was disabled, but still kept as a dependency. Now the main
issue with bytecode reproducibility has been resolved by updating pip to
20.2.4, we remove this hook as a dependency.

If a package with Python code is not yet reproducible, one could add
this hook to `nativeBuildInputs`.
2020-11-12 19:32:30 +01:00
Daniël de Kok b235552837 ruby: check disallowed references with jitSupport disabled
This makes it easier to detect regressions.
2020-11-12 15:12:59 +01:00
R. RyanTM d817bf140b zef: 0.8.5 -> 0.9.1 2020-11-12 13:07:55 +00:00
Jonathan Ringer 5a5122418a python310: 3.10.0a1 -> 3.10.0a2 2020-11-11 23:13:44 -08:00
Frederik Rietdijk 4076ffe580 Merge staging-next into staging 2020-11-11 16:00:34 +01:00
Gabriel Gonzalez 87d5e6fc1a Change idiom for overriding Dhall package version
Before this change, a Dhall package like the Prelude would be
encoded as a record with one field per supported version.  Then
downstream packages would specify which package to override
by selecting a different record field.

The problem with that approach is that it did not provide an
easy way to override a package to a version other than the default
ones supplied by Nixpkgs.  Normally you would use the `.override`
method for this purpose, but the `override` method added by
`buildDhall{Directory,GitHub}Package` is clobbered by the
`override` method added by `callPackage` in
`./pkgs/top-level/dhall-packages.nix`.

The solution is to add a separate `.overridePackage` method which is
essentially the exact same as `.override`, except that it is no
longer clobbered by `callPackage`.  This `.overridePackage` method
allows one to override the arguments supplied to
`buildDhall{Directory,GitHub}Package`, making it easier to specify
package versions outside of the ones supported by Nixpkgs..

This also includes a change to only build one (preferred) version of each
package (instead of multiple supported versions per package), in order to
minimize the maintenance burden for the Dhall package set.
2020-11-11 11:16:04 +01:00
Gabor Greif 078dc38e35 wasmtime: 0.20.0 -> 0.21.0 2020-11-11 00:59:48 +01:00
Doron Behar 9db44f61a7 rubyMinimal: remove
Due to being unused, and seemingly unusable, added appropriate release
notes.
2020-11-09 16:17:41 +02:00
Doron Behar f59f04352a ruby: Rename removeReferencesToCC flag to !jitSupport
If JIT support is built in to ruby, there's no choice other then to
leave this cc reference as is. removeReferencesToCC didn't do it's job
completely since some time ago. That's why it was practically redundant
- `lib/ruby/${version}/<platform>/rbconfig.rb` still referenced cc.
Removing this reference from
`lib/ruby/${version}/<platform>/rbconfig.rb` as well might lead to
breakage in some Gems that require this feature.

But, if JIT support is not desired, it should be safe enough to
completely remove all cc references, both in
lib/ruby/${version}/<platform>/rbconfig.rb and in $out/lib/libruby.so .
Hence now `rubyMinimal` has JIT support disabled and it has no
references at all to stdenv.cc.
2020-11-09 16:17:39 +02:00
Frederik Rietdijk 20f001c01e Merge master into staging-next 2020-11-09 14:33:52 +01:00
R. RyanTM 4365578bdf groovy: 3.0.3 -> 3.0.6 2020-11-09 12:20:26 +00:00
Alyssa Ross 29038ac0f1
Merge pull request #102272 from bennyandresen/clojure_1.10.1.645-1.10.1.727
clojure: 1.10.1.645 -> 1.10.1.727
2020-11-09 11:58:49 +00:00
Sebastien Braun 6780f45bc1 elixir_1_11: 1.11.1 -> 1.11.2 2020-11-09 11:57:57 +00:00
Sebastien Braun c8e9728927 erlangR23: 23.1 -> 23.1.2 2020-11-09 11:50:30 +00:00
Samuel Gräfenstein 22b73d1282 pkgs/*: add final newline to .nix files 2020-11-09 11:39:28 +00:00
Mario Rodas c2715f436d
Merge pull request #98174 from thiagokokada/fix-dart2native
dart: Fix dart2native by patching all ELFs
2020-11-07 20:10:31 -05:00
Elis Hirwing 4d65677903
Merge pull request #102818 from etu/php-split-to-leafs
php: Refactor to have the different versions as separate files
2020-11-07 07:04:21 +01:00
Elis Hirwing b62b76b78b
php: Refactor to have the different versions as separate files
This should enable easier auto updates of the packages.
2020-11-06 13:48:27 +01:00
Frederik Rietdijk 99fb79ae84 Merge master into staging-next 2020-11-06 12:51:56 +01:00
Jan Tojnar 4b80de5c48
Merge pull request #102543 from lostnet/spidermonkey
spidermonkey: 78.1.0 -> 78.4.0
2020-11-06 11:53:19 +01:00
Frederik Rietdijk 61a04f735a python3.pkgs.pip: 20.1.1 -> 20.2.4
Reproducible builds of pyproject projects using pip is resolved.

Fixes https://github.com/pypa/pip/issues/7808
Fixes https://github.com/NixOS/nixpkgs/issues/81441

The more recent c409f69480 caused trouble
with pyproject troubles and had to be reverted anyway.
https://github.com/NixOS/nixpkgs/pull/102222#issuecomment-722380794

Revert "pythonPackages.pip: make reproducible (#102222)"

This reverts commit c409f69480.

Revert "python3Packages.pip: allow setting reproducible temporary directory via NIX_PIP_INSTALL_TMPDIR"

This reverts commit aedbade43e.
2020-11-05 15:07:21 +01:00
Elis Hirwing caa71a3ee4
Merge pull request #102715 from etu/php74-update
php74: 7.4.11 -> 7.4.12
2020-11-05 13:01:01 +01:00
Elis Hirwing e1548a2da9
Merge pull request #102716 from etu/php73-update
php73: 7.3.23 -> 7.3.24
2020-11-05 13:00:14 +01:00
Jan Tojnar a821be7531
Merge branch 'master' into staging-next 2020-11-05 09:42:47 +01:00
Benjamin Andresen 172cbb8eb7 babashka: 0.0.97 -> 0.2.3
with #99631 and #102693 merged, it's possible to bump the babashka
version again.

However recent versions of babashka depend on java11 features and I
spoke in Slack with the project lead and this java11 dependency will
exist going forward.
2020-11-05 07:11:54 +01:00
Griffin Smith 3341f6c1fc babashka,clj-kondo: Depend on graalvm-ce
Now that we have community builds of graalvm landed in #99631, both
clj-kondo and babashka can depend on those versions of graalvm rather
than the one that requires building from source - this can be built in
hydra, and generally is much easier to build and test.
2020-11-04 09:09:54 -08:00
Frederik Rietdijk 10c57af49c Merge staging-next into staging 2020-11-04 09:28:07 +01:00
Frederik Rietdijk 9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01:00
Mario Rodas 1bf0327ef6 racket: 7.8 -> 7.9
https://download.racket-lang.org/v7.9.html
2020-11-03 23:19:43 -08:00
Elis Hirwing c1a2cf890a
php74: 7.4.11 -> 7.4.12 2020-11-04 07:05:49 +01:00
Elis Hirwing fc48e6f932
php73: 7.3.23 -> 7.3.24 2020-11-04 07:05:21 +01:00
Elis Hirwing 18723740d9
Merge pull request #101840 from sikmir/php
php: fix on darwin
2020-11-04 06:59:32 +01:00
Frederik Rietdijk 6ddd6b4914 Revert "Merge pull request #93083 from risicle/ris-cpython-debug"
This increase the closure size by 30 MB.

https://github.com/NixOS/nixpkgs/pull/93083#issuecomment-718025366

This reverts commit 4b340cbbb4, reversing
changes made to 47e499f7a4.
2020-11-03 12:50:05 +01:00
Frederik Rietdijk 470f05cb5d Merge staging-next into staging 2020-11-03 12:06:41 +01:00
Frederik Rietdijk 237966224d Merge master into staging-next 2020-11-03 12:06:06 +01:00
Will Young 8edf9cf5d0 spidermonkey: 78.1.0 -> 78.4.0 2020-11-02 23:30:28 +01:00
Pavol Rusnak 2c931312ce treewide: simplify rev/repo arguments in src
+ use fetchFromGithub where possible
2020-11-01 23:02:24 -08:00
Frederik Rietdijk 83dde6c52c Merge staging-next into staging 2020-11-01 10:11:12 +01:00
Benjamin Andresen 43776fb11e clojure: 1.10.1.645 -> 1.10.1.727 2020-10-31 21:42:24 +01:00