Frederik Rietdijk
503081fa5b
Merge staging into staging-next
2019-09-29 11:05:22 +02:00
Vladimír Čunát
217cf982c7
Merge branch 'master' into staging-next
2019-09-27 22:13:02 +02:00
Joachim F
ad773d31e2
Merge pull request #69345 from joachifm/feat/split-version
...
Replace uses of splitString for splitting version strings
2019-09-27 06:19:18 +00:00
Jon
28af6ac647
python3Packages.flit: fix tests and packaging ( #69546 )
...
* python3Packages.flit: fix tests
* python: fix flit setup hook
2019-09-26 21:09:03 +00:00
adisbladis
2b2c6e0bc4
pythonPackages.pipBuildHook: Add wheel dependency
...
And remove missing "options"
2019-09-26 17:17:16 +01:00
Joachim Fasting
bad07dfac5
tree-wide: replace uses of splitString "." with lib.versions
...
Quoting from the splitString docstring:
NOTE: this function is not performant and should never be used.
This replaces trivial uses of splitString for splitting version
strings with the (potentially builtin) splitVersion.
2019-09-26 17:42:49 +02:00
Jan Tojnar
f2b9f5baa5
Merge branch 'staging-next' into staging
2019-09-22 16:39:56 +02:00
Jan Tojnar
11c2b06dd2
Merge branch 'master' into staging-next
2019-09-22 16:39:12 +02:00
Sebastian Jordan
5505d2f036
python: Fix invalid pip call in setuptoolsShellHook
2019-09-22 09:55:13 +02:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'"
...
This reverts commit f8a8fc6c7c
.
2019-09-22 09:38:09 +02:00
Vladyslav M
8d49679f55
janet: 1.2.0 -> 1.3.1
2019-09-22 08:47:11 +03:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
...
This reverts commit 41af38f372
, reversing
changes made to f0fec244ca
.
Let's delay this. We have some serious regressions.
2019-09-21 20:05:09 +02:00
Jan Tojnar
62791c3743
Merge branch 'master' into staging-next
2019-09-18 21:15:35 +02:00
worldofpeace
0c9fab9398
Merge pull request #68941 from Ma27/bump-evcxr
...
evcxr: 0.4.4 -> 0.4.5
2019-09-17 12:59:00 -04:00
Mario Rodas
e8c29fa77c
update-python-libraries: use version key for latest release ( #68857 )
...
From warehouse API reference [1]:
GET /pypi/<project_name>/json
Returns metadata (info) about an individual project at the latest
version […]
[1] https://warehouse.pypa.io/api-reference/json/#project
2019-09-16 17:34:15 -05:00
Maximilian Bosch
af564fbd8a
evcxr: 0.4.4 -> 0.4.5
...
New release: https://github.com/google/evcxr/blob/v0.4.5/RELEASE_NOTES.md#version-045
Also added myself as maintainer and removed `zeromq` from the build
inputs as it's now vendored by upstream.
2019-09-16 22:46:26 +02:00
Vladimír Čunát
b6c6e1f9e8
Merge branch 'master' into staging-next
2019-09-15 13:18:54 +02:00
Robin Gloster
a345623f2b
spidermonkey_1_8_5: fix build with gcc8
...
closes #68765
closes #68763
2019-09-14 12:19:27 +02:00
Jan Tojnar
a441eaa7b1
Merge branch 'staging-next' into staging
2019-09-12 22:49:43 +02:00
Aaron Andersen
ef114315ca
love_0_8: fix broken build
2019-09-10 20:57:12 -04:00
Frederik Rietdijk
c99529a4b6
python.pkgs.wheelUnpackHook: propagate wheel
...
This was accidentally removed when buildPython* was rewritten as hooks.
2019-09-10 22:26:20 +02:00
Izorkin
329a88efa7
treewide: replace mysql.connector-c to libmysqlclient
2019-09-09 15:55:34 +03:00
Lily Ballard
d046ab888c
perl: Update detected platform version
...
Instead of hardcoding the version as 10.10, we should just detect it as
being MACOSX_DEPLOYMENT_TARGET.
2019-09-09 04:33:24 -04:00
volth
7b8fb5c06c
treewide: remove redundant quotes
2019-09-08 23:38:31 +00:00
Frederik Rietdijk
5f4734b1dd
Merge remote-tracking branch 'upstream/gcc-8' into staging-next
...
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
2019-09-08 20:44:26 +02:00
Frederik Rietdijk
e73f871285
Merge master into staging-next
2019-09-08 14:49:25 +02:00
Robin Gloster
5f58361017
Merge pull request #68261 from etu/php72-update
...
php72: 7.2.21 -> 7.2.22
2019-09-07 18:48:05 +02:00
Alyssa Ross
ca96b55d3a
ruby_2_6: patch use-after-free
...
See https://bugs.ruby-lang.org/issues/16136 .
This patch is on Ruby trunk, but hasn't been backported (yet?).
2019-09-07 14:32:56 +00:00
Alyssa Ross
d3983caf45
ruby_2_3: remove
...
This has been EOL since December. We shouldn't still be facilitating
its use.
Fixes https://github.com/NixOS/nixpkgs/pull/67977 .
2019-09-07 13:09:17 +00:00
Jan Tojnar
9fcdb3bd16
Merge branch 'master' into staging-next
2019-09-07 14:55:03 +02:00
Elis Hirwing
125d068e02
php72: 7.2.21 -> 7.2.22
...
Changelog: https://www.php.net/ChangeLog-7.php#7.2.22
2019-09-07 14:51:05 +02:00
Elis Hirwing
735e3d18fe
Merge pull request #68038 from dtzWill/update/php-7.3.9
...
php73: 7.3.8 -> 7.3.9 (security)
2019-09-07 14:45:49 +02:00
Frederik Rietdijk
9894a70299
Merge staging into staging-next
2019-09-06 22:47:40 +02:00
Frederik Rietdijk
66bc7fc1b3
Merge master into staging-next
2019-09-06 22:46:05 +02:00
Frederik Rietdijk
b75f9a5f6d
pythonInterpreters.pypy*prebuilt: use openssl 1.0
2019-09-06 21:45:10 +02:00
Frederik Rietdijk
f7e28bf5d8
Split buildPythonPackage into setup hooks
...
This commit splits the `buildPythonPackage` into multiple setup hooks.
Generally, Python packages are built from source to wheels using `setuptools`.
The wheels are then installed with `pip`. Tests were often called with
`python setup.py test` but this is less common nowadays. Most projects
now use a different entry point for running tests, typically `pytest`
or `nosetests`.
Since the wheel format was introduced more tools were built to generate these,
e.g. `flit`. Since PEP 517 is provisionally accepted, defining a build-system
independent format (`pyproject.toml`), `pip` can now use that format to
execute the correct build-system.
In the past I've added support for PEP 517 (`pyproject`) to the Python
builder, resulting in a now rather large builder. Furthermore, it was not possible
to reuse components elsewhere. Therefore, the builder is now split into multiple
setup hooks.
The `setuptoolsCheckHook` is included now by default but in time it should
be removed from `buildPythonPackage` to make it easier to use another hook
(curently one has to pass in `dontUseSetuptoolsCheck`).
2019-09-06 15:18:45 +02:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next
2019-09-04 11:00:56 +02:00
Mario Rodas
39d343929d
Merge pull request #68002 from marsam/update-supercollider
...
supercollider: 3.10.2 -> 3.10.3
2019-09-03 19:35:39 -05:00
Will Dietz
00039ef5af
php73: 7.3.8 -> 7.3.9 (security)
...
https://www.php.net/archive/2019.php#2019-08-29-1
https://www.php.net/ChangeLog-7.php#7.3.9
2019-09-03 18:33:37 -05:00
Franz Pletz
de85797565
Merge remote-tracking branch 'origin/master' into gcc-8
2019-09-03 22:15:07 +02:00
Michael Fellinger
1f49035aca
ruby.withPackages: init
...
Co-authored-by: Alyssa Ross <hi@alyssa.is>
2019-09-03 19:44:49 +00:00
Mario Rodas
3a601cac5b
ruby: update RVM patchsets
2019-09-03 15:33:51 +00:00
Mario Rodas
bd51778554
ruby_2_6: 2.6.3 -> 2.6.4
2019-09-03 15:33:51 +00:00
Mario Rodas
8cb7bb03fd
ruby_2_5: 2.5.5 -> 2.5.6
2019-09-03 15:33:51 +00:00
Mario Rodas
06205d8154
ruby_2_4: 2.4.5 -> 2.4.7
2019-09-03 15:33:51 +00:00
Mario Rodas
ae610711eb
supercollider: 3.10.2 -> 3.10.3
...
Changelog: https://github.com/supercollider/supercollider/releases/tag/Version-3.10.3
2019-09-03 04:20:00 -05:00
André Stylianos Ramos
ca8558af6c
joker: 0.12.4 -> 0.12.7
2019-09-03 04:50:02 -03:00
Vladimír Čunát
f21211ebfe
Merge branch 'master' into staging
2019-09-02 23:25:24 +02:00
Alexei Robyn
c62337d9c7
lua*Packages: Consolidate separate setup hooks together
...
- Lua packages now consistently use LUA_PATH/LUA_CPATH rather than a mix
of those and NIX_LUA_PATH/NIX_LUA_CPATH
- Lua libraries are now consistently only added to the search path
variables if:
1) The library actually has a corresponding directory to search
2) The library is not already present in the search path
This should help prevent the search paths from growing overly large
- Fixed bugs in some path helpers
- Changed the affected shell script indentation to 2 spaces; nixpkgs
shell scripts are inconsistently split between 2 and 4 space
indentation, but 2 matches better with the Nix expressions, so IMO it
makes more sense
2019-09-01 17:42:20 +02:00
Sam Doshi
d3188e90a0
supercollider: Use qt5's own mkDerivation
2019-08-31 23:27:43 -04:00
Matthew Bauer
98662eba0e
python: enable loadable sqlite extensions ( #67472 )
...
Our sqlite supports it, so might as well make use of it.
Fixes #66526
2019-08-31 07:59:00 -04:00
Milan Pässler
48ca6ed3f4
ruby: rubygems 3.0.3 -> 3.0.6
2019-08-31 11:48:04 +00:00
volth
7bb6b373ab
treewide: name -> pname ( #67513 )
2019-08-31 07:41:22 -04:00
Alyssa Ross
01c4c15ef5
ruby: replace bundled RubyGems with our RubyGems
...
This should prevent problems caused by trying to install our own
RubyGems over the top of the one that comes with Ruby.
2019-08-31 11:33:03 +00:00
Alyssa Ross
5b0851028f
ruby: --disable-rubygems for baseruby
...
This works just fine, and means we don't run into an issue with RubyGems
trying to install into a different Ruby's prefix when cross-compiling.
See https://github.com/NixOS/nixpkgs/pull/51842#issuecomment-478392799 .
2019-08-31 11:33:03 +00:00
Frederik Rietdijk
ad1d58c622
Merge staging-next into staging
2019-08-31 10:04:20 +02:00
Frederik Rietdijk
fc74ba8291
Merge master into staging-next
2019-08-31 09:50:38 +02:00
zimbatm
80a3988150
remove empty nix file
...
Nix repl hangs when evaluating empty files.
find -name "*.nix" -empty -delete
2019-08-31 00:00:29 +02:00
Maximilian Bosch
819696bb0c
evcxr: 0.4.3 -> 0.4.4
...
https://github.com/google/evcxr/releases/tag/v0.4.4
2019-08-29 01:51:25 +02:00
volth
08f68313a4
treewide: remove redundant rec
2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c
Merge staging-next into staging
2019-08-28 08:26:42 +02:00
Frederik Rietdijk
98640fd482
Merge master into staging-next
2019-08-27 16:36:47 +02:00
Marek Mahut
ee62ec62ec
python2: CVE-2018-20852
...
Fixes #67200
(cherry picked from commit 302cac35f5
)
2019-08-27 10:04:55 +02:00
volth
35d68ef143
treewide: remove redundant quotes
2019-08-26 21:40:19 +00:00
Matthew Bauer
48d0e9401e
cpython: skip macOS system frameworks
...
We don’t want cpython picking up /Library/Frameworks and
/System/Library/Frameworks which contains Tcl.framework. Instead it
should use the one provided by Nix. this would not be an issue if
sandboxing was enabled, but unfortunately that has its own issues.
Fixes #66647
2019-08-25 20:35:19 -04:00
Marek Mahut
302cac35f5
python2: CVE-2018-20852
...
Fixes #67200
2019-08-25 19:16:38 +02:00
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