3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

3782 commits

Author SHA1 Message Date
Robin Gloster 616b8343c4
Merge remote-tracking branch 'upstream/master' into gcc-8 2019-08-25 18:55:46 +02:00
Vladimír Čunát 985d1ac425
Merge branch 'master' into staging-next
There were several more conflicts from name -> pname+version;
all auto-solved by kdiff3, hopefully OK.

Hydra nixpkgs: ?compare=1538611
2019-08-25 14:57:11 +02:00
Maximilian Bosch 62b75df413
evcxr: 0.3.3 -> 0.4.3
The current version fails to build: https://hydra.nixos.org/build/99189245

Please note that the releases aren't tracked by Git, but the currently
used rev points to `0.4.3` at crates.io: https://crates.io/crates/evcxr/0.4.3
2019-08-25 09:36:06 +02:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Robin Gloster c7e75df21f
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-23 02:00:31 +02:00
Vika ba83c08610 php: disable mhash
Per https://www.php.net/manual/en/intro.mhash.php, mhash extension
is obsolete, so disabling it here. (Also it doesn't cross-compile)

**Warning**: This could be a breaking change for some packages that
are very old and rely on this extension, maintainer discretion is
advised.
2019-08-21 20:37:06 +03:00
Florian Klink 65b1948be2
Merge pull request #66762 from adisbladis/python-minimal
python3Minimal: Add top-level for a minimal Python 3 build
2019-08-21 15:04:52 +02:00
adisbladis 99e6ca2bdc python3Minimal: Add top-level for a minimal Python 3 build
This builds Python without optional dependencies.

We can't just use python3.override, as things like
python3Minimal.withPackages would pass the wrong python derivation into
these modules.
2019-08-21 14:52:49 +02:00
Robin Gloster f4fc845e5b
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-21 14:25:13 +02:00
Michael Raskin d38d6aba1f
Merge pull request #66883 from kisik21/lua-cross-compile-fix
lua: fix cross-compilation; fixes #66742
2019-08-20 08:13:33 +00:00
Marek Mahut 2aedbd056a
Merge pull request #66920 from r-ryantm/auto-update/janet
janet: 1.1.0 -> 1.2.0
2019-08-19 20:38:29 +02:00
Marek Mahut 047f8d612b
Merge pull request #66904 from r-ryantm/auto-update/groovy
groovy: 2.5.7 -> 2.5.8
2019-08-19 19:22:38 +02:00
Marek Mahut b1b3ea751a
Merge pull request #66913 from r-ryantm/auto-update/jruby
jruby: 9.2.7.0 -> 9.2.8.0
2019-08-19 19:19:48 +02:00
R. RyanTM 9c2088181a janet: 1.1.0 -> 1.2.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/janet/versions
2019-08-19 06:37:04 -07:00
R. RyanTM 632c4b870d jruby: 9.2.7.0 -> 9.2.8.0
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jruby/versions
2019-08-19 05:40:32 -07:00
R. RyanTM 6e718f1ab4 groovy: 2.5.7 -> 2.5.8
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/groovy/versions
2019-08-19 04:29:43 -07:00
Vika 68847aeef4 lua: fix cross-compilation; fixes #66742
The makefile isn't able to find the toolchain when cross-compiling. I
helped it a little bit by adding the parameters explicitly.
2019-08-19 12:04:26 +03:00
worldofpeace 62f8fd7513
Merge pull request #66418 from jlesquembre/clj
clojure: 1.10.1.466 -> 1.10.1.469
2019-08-18 22:58:26 -04:00
Florian Klink 100eae3b77 python: allow stripping tkinter 2019-08-19 00:11:17 +02:00
Florian Klink db087f226d python: allow stripping bytecode 2019-08-18 23:47:44 +02:00
Florian Klink 52fcbbff44 python: make rebuilding bytecode optional 2019-08-18 23:47:44 +02:00
Florian Klink 8335f3dd5c python: allow stripping config 2019-08-18 23:47:43 +02:00
Florian Klink d03283c029 python: allow stripping tests 2019-08-18 23:47:30 +02:00
Florian Klink 414cde4df4 python: allow stripping IDLE 2019-08-18 23:47:16 +02:00
Frederik Rietdijk f65aa21bb2 Merge master into staging-next 2019-08-18 12:53:44 +02:00
adisbladis 5c0d493df4
python: Enable building without openssl 2019-08-18 08:18:58 +01:00
Frederik Rietdijk 295888c622
Merge pull request #66381 from NixOS/staging-next
Staging next
2019-08-18 08:54:45 +02:00
Frederik Rietdijk 113dbfeb27
Merge pull request #66596 from emilazy/update-pypy-and-eda-tools
Update PyPy and FOSS EDA tools
2019-08-17 17:48:21 +02:00
volth c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Frederik Rietdijk fe9a3e3e63 Merge staging-next into staging 2019-08-17 09:39:23 +02:00
Frederik Rietdijk c68f58d95c Merge master into staging-next 2019-08-17 09:30:16 +02:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Lily Ballard 63259057a8 erlang: Fix build error on darwin
Stop hardcoding 10.10 as the platform when building. Instead we'll use
$MACOSX_DEPLOYMENT_TARGET so erlang doesn't have to be updated again the
next time that's changed.
2019-08-14 15:56:29 -07:00
Matthew Bauer 81bddd62ca
Merge pull request #62953 from asymmetric/wasmtime-update
wasmtime: 0.1.0 -> 20190521
2019-08-14 10:26:54 -04:00
Frederik Rietdijk 8d56f2472e Merge master into staging-next 2019-08-14 13:45:54 +02:00
Emily ec07b882b3 pypy{2,27,3,35 -> 36}: 7.0.0 -> 7.1.1 2019-08-13 16:49:27 -07:00
Emily 5638dd55e3 pythonInterpreters.pypy{27,35 -> 36}_prebuilt: 6.0.0 -> 7.1.1 2019-08-13 16:49:27 -07:00
Jörg Thalheim 108c57b141
Merge pull request #53734 from yurrriq/update/noweb
Update noweb (and icon-lang)
2019-08-13 13:37:08 +01:00
Vladimír Čunát 387e6952d3
Merge #65846: Update php packages 2019-08-10 14:42:37 +02:00
José Luis Lafuente 8c223b58cf
clojure: 1.10.1.466 -> 1.10.1.469 2019-08-10 07:20:54 +02:00
Aaron Andersen c4ac0a84ba
Merge pull request #66188 from volth/perl-531
perldevel: 5.30.0 -> 5.31.2
2019-08-09 16:24:24 -04:00
Frederik Rietdijk 9bd78cb048 Merge master into staging-next 2019-08-09 14:00:27 +02:00
Eric Bailey 31d1ce7e64 icon-lang: rework to support darwin and building without graphics 2019-08-07 14:09:15 -05:00
Ryan Mulligan e275a6c2f3
Merge pull request #64037 from r-ryantm/auto-update/gnu-apl
gnuapl: 1.7 -> 1.8
2019-08-06 21:53:34 -07:00
volth 62ba206c88 perldevel: 5.30.0 -> 5.31.2 2019-08-06 09:39:29 +00:00
ysander b74113e193 Add dependency and patch files (refs: #65786) 2019-08-04 18:02:47 +02:00
Izorkin cb9846c2dc php73: 7.3.7 -> 7.3.8 2019-08-03 16:40:08 +03:00
Izorkin 7819d3f621 php72: 7.2.20 -> 7.2.21 2019-08-03 16:23:41 +03:00
Sarah Brofeldt 6882ea8db5
Merge pull request #65736 from fgaz/duktape/2.4.0
duktape: 2.3.0 -> 2.4.0
2019-08-03 08:28:56 +02:00
Frederik Rietdijk 658c0f0ce9 python38: 3.8.0b2 -> 3.8.0b3 2019-08-03 08:14:25 +02:00
Justin Humm 4908aaf3c9 spidermonkey_38, spidermonkey_60: fix cross compilation
This is essentially the same as done in
65f2b0a2a3.

For spidermonkey_38 I set --enable-posix-nspr-emulation, as it would
otherwise complain about a wrong NSPR version and that trick seemed to
be successful in spidermonkey_60 anyway.
2019-08-03 07:51:46 +02:00
Robin Gloster 30969073f0
Merge remote-tracking branch 'upstream/master' into openssl-1.1 2019-08-02 03:01:30 +02:00
worldofpeace e77b7692e2
Merge pull request #63013 from andrestylianos/joker-0.12.4
joker: 0.12.2 -> 0.12.4
2019-08-01 13:58:19 -04:00
Francesco Gazzetta 4ae454d1eb duktape: 2.3.0 -> 2.4.0 2019-08-01 19:20:16 +02:00
André Stylianos Ramos 94545c30c5
joker: 0.12.2 -> 0.12.4 2019-08-01 05:33:18 -03:00
Michael Weiss 8760c695d4
swiften, pypy: Mark as broken
swiften is broken since 2018-10-18:
x86_64-linux:  https://hydra.nixos.org/build/97180305
aarch64-linux: https://hydra.nixos.org/build/97193043

pypy is broken since 2019-05-29:
x86_64-linux (pypy):  https://hydra.nixos.org/build/97214777
x86_64-linux (pypy3): https://hydra.nixos.org/build/97221287

The builds for swiften and reposurgeon (depends on pypy) regularly fail
during rebuilds for SCons updates (e.g. [0]).

[0]: https://github.com/NixOS/nixpkgs/pull/65392
2019-07-30 19:25:43 +02:00
Andreas Rammhold d80649d2a3
pypy: use openssl 1.0.2
While upstream claims support of OpenSSL 1.1 the test suite fails.
2019-07-29 21:25:13 +02:00
Frederik Rietdijk bd47c5721f Python: introduce NIX_PYTHONEXECUTABLE in order to set sys.executable
This is needed in case of `python.buildEnv` to make sure sys.executable
does not point to the unwrapped executable.
2019-07-27 11:52:49 +02:00
Frederik Rietdijk 34eebf6844 Merge master into staging-next 2019-07-25 11:52:18 +02:00
markuskowa a7e69435aa
Merge pull request #65176 from r-ryantm/auto-update/renpy
renpy: 7.3.0 -> 7.3.2
2019-07-24 12:57:53 +02:00
José Luis Lafuente 32c1c5cbe0 clojure: 1.10.1.462 -> 1.10.1.466 2019-07-24 08:25:49 +02:00
Frederik Rietdijk db6c38a075 Merge master into staging-next 2019-07-22 14:15:32 +02:00
Maximilian Bosch e15bc90acc
Merge pull request #60675 from protoben/evcxr-0.3.3
evcxr: init at 0.3.3
2019-07-21 02:37:29 +02:00
Maximilian Bosch 2de35cf8ee
evcxr: fix darwin build
It seems as the `Security` framework is missing during the linking in a
darwin build environment:

https://logs.nix.ci/?key=nixos/nixpkgs.60675&attempt_id=42d9c159-f1a2-4abc-ab14-9dea23d941b1
2019-07-21 02:13:17 +02:00
Maximilian Bosch c4323c200f
evcxr: fix hash and cc access
The `cargoSha256` hashes across the sourcetree had to be altered after
the last `cargo-vendor` bump. Also ensured that `cc` is available in
`$PATH` to avoid startup errors in the REPL.
2019-07-21 01:43:55 +02:00
R. RyanTM 2698c3d9bb renpy: 7.3.0 -> 7.3.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/renpy/versions
2019-07-20 08:16:09 -07:00
Frederik Rietdijk 0ce55a10d2 Merge master into staging-next 2019-07-19 16:33:38 +02:00
Andrew Chambers 37e1c1aeda janet: 1.0.0 -> 1.1.0 2019-07-19 15:12:03 +12:00
Daiderd Jordan 04b3ad82f8
Merge pull request #65038 from LnL7/erlang-wx
erlang: remove wx conditional
2019-07-19 00:04:04 +02:00
Daiderd Jordan 6fb8e5c453
Merge pull request #65025 from cw789/update_elixir
elixir_1_9: 1.9.0 -> 1.9.1
2019-07-19 00:03:43 +02:00
Daiderd Jordan 574cb4a8df
erlang: remove wx conditional
The wxmac build has been fixed and there's erlang_nox now.
2019-07-18 23:42:32 +02:00
cw 6b6a9ac500 elixir_1_9: 1.9.0 -> 1.9.1 2019-07-18 15:09:09 +02:00
Nikolay Amiantov da295a1206 python2: backport fix for pyc race condition, part 2
Turns out fixing this only in importlib is not sufficient and we
need to backport CPython part of the fix too.

This patch is based on https://hg.python.org/cpython/rev/c16063765d3a
but because the code around is different there are some changes (C-strings
instead of Python objects etc.)

With this patch Tensorflow builds successfully on many-core machine.
2019-07-17 10:22:11 +02:00
Frederik Rietdijk 0d832585b7 Merge staging-next into staging 2019-07-17 10:14:29 +02:00
Frederik Rietdijk a28a9ac156 Merge master into staging-next 2019-07-16 11:15:46 +02:00
Michael Raskin 9a1d795ce7
Merge pull request #64861 from r-ryantm/auto-update/picoLisp
picolisp: 18.12 -> 19.6
2019-07-16 05:40:40 +00:00
R. RyanTM 65a313538b picolisp: 18.12 -> 19.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/picolisp/versions
2019-07-15 21:43:03 -07:00
Mario Rodas 0d8d1cce1c
Merge pull request #64814 from r-ryantm/auto-update/guile
guile: 2.2.4 -> 2.2.6
2019-07-15 20:29:34 -05:00
R. RyanTM 950ebaf09e mujs: 1.0.5 -> 1.0.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mujs/versions
2019-07-15 16:19:32 -07:00
R. RyanTM 02466bea79 guile: 2.2.4 -> 2.2.6
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/guile/versions
2019-07-15 09:05:36 -07:00
Frederik Rietdijk 7da15d9b36 buildPythonPackage: add support for setupPyGlobalFlags (2) 2019-07-15 17:47:57 +02:00
Mario Rodas 7094a1af0c
python37: fix distutils C++ patch (PR #64758)
Update distutils patch to the upstream changes.
See: 6c0e0d141a
2019-07-15 09:37:43 +02:00
Frederik Rietdijk 271b57c219 Revert "buildPythonPackage: add support for setupPyDistFlags"
I merged this a bit too quick. We need to have a closer look at it.
See the points brought up in https://github.com/NixOS/nixpkgs/pull/64682.

This reverts commit 1e0ebdb8a4.
2019-07-13 13:25:32 +02:00
Kirill Boltaev 1e0ebdb8a4 buildPythonPackage: add support for setupPyDistFlags
Flags passed to the "python setup.py" command.
2019-07-13 09:47:00 +02:00
Frederik Rietdijk 4aee94629d Merge staging-next into staging 2019-07-13 09:46:03 +02:00
Frederik Rietdijk 54065ae20d Merge master into staging-next 2019-07-13 09:45:40 +02:00
Frederik Rietdijk ec7f569211 python.buildEnv: use NIX_PYTHONPATH 2019-07-13 09:37:33 +02:00
Frederik Rietdijk 46409b5c32 Python: add sitecustomize.py, listen to NIX_PYTHONPATH
This commit adds a Nix-specific module that recursively adds paths that
are on `NIX_PYTHONPATH` to `sys.path`. In order to process possible
`.pth` files `site.addsitedir` is used.

The paths listed in `PYTHONPATH` are added to `sys.path` afterwards, but
they will be added before the entries we add here and thus take
precedence.

The reason for adding support for this environment variable is that we
can set it in a wrapper without breaking support for `PYTHONPATH`.
2019-07-13 09:37:33 +02:00
Frederik Rietdijk 8074133844 pythonPackages.fetchPypi: support SRI hashes 2019-07-11 18:01:04 +02:00
Frederik Rietdijk 30f299027a pythonPackages.fetchPypi: separate url computation from fetchurl 2019-07-11 18:01:04 +02:00
Frederik Rietdijk f2a8117492 pythonPackages.fetchPypi: put expression in own file
Also fixes an evaluation bug.
2019-07-11 18:01:04 +02:00
Charlie Dyson 0426ae63f8 fix: #64340 building python wheels in non-standard store 2019-07-11 10:27:28 +02:00
Frederik Rietdijk 22cb7f25f2 Merge master into staging-next 2019-07-11 09:40:10 +02:00
Ryan Mulligan 508ae42a0f treewide: fix redirect URLs 2019-07-10 12:52:51 -07:00
Frederik Rietdijk 79a03641d5 Merge staging-next into staging 2019-07-09 15:46:26 +02:00
Frederik Rietdijk 74c24385cb Merge master into staging-next 2019-07-09 15:46:00 +02:00
Frederik Rietdijk 7cf5909fad Merge staging-next into staging 2019-07-09 15:44:08 +02:00
Frederik Rietdijk 421a87d94c python38: init at 3.8.0b2 2019-07-09 15:31:37 +02:00
worldofpeace 08a76cff03
Merge pull request #63942 from jlesquembre/clj
clojure: 1.10.0.442 -> 1.10.1.462
2019-07-09 09:29:18 -04:00
Frederik Rietdijk 46d91410af python37: 3.7.3 -> 3.7.4 2019-07-09 10:04:25 +02:00