Commit Graph

78901 Commits

Author SHA1 Message Date
talyz
1345e5b763
php: Add withExtensions as a simpler alternative to buildEnv 2020-04-05 16:45:47 +02:00
talyz
4ff523f691
php: Simplify php-packages import, rename exts -> extensions 2020-04-05 16:45:41 +02:00
Elis Hirwing
1b69056e46
php: passthru .dev output as well 2020-04-05 16:45:23 +02:00
Elis Hirwing
a2099156ec
php: split php.packages to php.packages and php.extensions
So now we have only packages for human interaction in php.packages and
only extensions in php.extensions. With this php.packages.exts have
been merged into the same attribute set as all the other extensions to
make it flat and nice.

The nextcloud module have been updated to reflect this change as well
as the documentation.
2020-04-05 16:45:17 +02:00
Elis Hirwing
0dc95728ba
nixos/php: Move the pcre tests to the php test attribute 2020-04-05 16:44:59 +02:00
talyz
716fd0e2f5
php.buildEnv: Put the extraConfig snippet after extensions
Make sure all the extensions are loaded first, then read the custom
config where possible.
2020-04-05 16:44:31 +02:00
Elis Hirwing
82cd2fbbf4
php: Wrap the programs and provide an environment variable instead of a flag 2020-04-05 16:44:25 +02:00
talyz
90dcab948c
php.packages: Use derivations for internalDeps in mkExtension
Make mkExtension put headers in the dev output and use them, instead of
a different part of the current source tree, when referring to another
extension by using internalDeps.

This means external extensions can be built against the internal ones.
2020-04-05 16:44:01 +02:00
talyz
b1106a1851
phpPackages: Move phpPackages to php.packages
This means php packages can now refer to other php packages by looking
them up in the php.packages attribute and gets rid of the internal
recursive set previously defined in php-packages.nix. This also means
that in applications where previously both the php package and the
corresponding version of the phpPackages package set had to be
specified, the php package will now suffice.

This also adds the phpWithExtensions parameter to the
php-packages.nix, which can be used by extensions that need a fully
featured PHP executable.
2020-04-05 16:43:50 +02:00
talyz
8924a7de3d
php: Make buildEnv recursive + take extension deps into account
A slight rewrite of buildEnv which:

1. Makes buildEnv recursively add itself to its output, so that it can
   be accessed from any php derivation.

2. Orders the extension text strings according to their internalDeps
   attribute - dependencies have to be put before dependants in the
   php.ini or they will fail to load due to missing symbols.
2020-04-03 10:11:15 +02:00
talyz
282337799b
php: Build an even slimmer base
This moves yet more extensions from the base build to
phpPackages.ext. Some of the extensions are a bit quirky and need
patching for this to work, most notably mysqlnd and opcache.

Two new parameters are introduced for mkExtension - internalDeps and
postPhpize. internalDeps is used to specify which other internal
extensions the current extension depends on, in order to provide them
at build time. postPhpize is for when patches and quirks need to be
applied after running phpize.

Patch notes:

- For opcache, older versions of PHP have a bug where header files are
  included in the wrong order.

- For mysqlnd, the config.h is never included, so we include it in the
  main header file, mysqlnd.h. Also, the configure script doesn't add
  the necessary library link flags, so we add them to the variable
  configure should have added them to.
2020-04-03 10:11:13 +02:00
Elis Hirwing
96a5e0c928
php: init phpXYbase packages and make the default php extended by default
Also, add opcache to default extensions since it significantly
increases PHP's performance and is by default enabled on Debian based
distributions. Not having it enabled by default results in a puzzling
performance loss for anyone attempting to migrate from Debian/Ubuntu
to NixOS who is unaware of this. Therefore, enable it by default. /talyz
2020-03-31 22:06:45 +02:00
Elis Hirwing
9404daf91c
php: Make a slimmer php as default 2020-03-29 11:06:58 +02:00
Daiderd Jordan
f4da410f0c
Merge pull request #83532 from LnL7/darwin-neovim
Revert "luaPackages.luv: 1.30.0-0 -> 1.34.1-1"
2020-03-29 10:39:19 +02:00
Vladimír Čunát
6d28c1893d
Merge #83013: exiv2: patch CVE-2019-20421 2020-03-29 09:40:53 +02:00
Vladimír Čunát
0ebeec9183
exiv2: name the patch as usual
That allows automatic detection of CVEs being fixed (e.g. by vulnix)
2020-03-29 09:39:31 +02:00
Vladimír Čunát
804477b875
Merge #75430: erlangR22: 22.1.7 -> 22.3 2020-03-29 08:41:36 +02:00
Benjamin Hipple
ef2995988a
Merge pull request #83343 from vbgl/coq-coqhammer-1.1.1
coqPackages.coqhammer: 1.1 → 1.1.1
2020-03-28 23:20:37 -04:00
Benjamin Hipple
eb2f8d2a8b
Merge pull request #83414 from dasj19/qbittorrent-update
libtorrent-raster: 1.1.11 -> 1.2.5; qbittorrent: 4.2.1 -> 4.2.2
2020-03-28 23:02:56 -04:00
Benjamin Hipple
f5a65df77c
Merge pull request #83546 from r-ryantm/auto-update/python2.7-mayavi
python27Packages.mayavi: 4.7.0 -> 4.7.1
2020-03-28 22:10:20 -04:00
Benjamin Hipple
aa79e45fad
Merge pull request #83512 from vbgl/coq-paramcoq-1.1.2
coqPackages.paramcoq: 1.1.1 → 1.1.2
2020-03-28 22:06:05 -04:00
Maximilian Bosch
604b4ddcb2
Merge pull request #83635 from jtojnar/hydra-fix-eval
hydra-unstable: Fix eval with allowAliases = false
2020-03-29 03:00:30 +02:00
Maximilian Bosch
fd99cb9edd
Merge pull request #82900 from notbandali/master
maintainers: update entry for notbandali (previously aminb)
2020-03-29 00:54:54 +01:00
Jan Tojnar
dc88e94ff1
hydra-unstable: Fix eval with allowAliases = false
* Catalyst::Plugin::Unicode::Encoding has been merged into Catalyst::Runtime
* Test::More is apparently part of Perl core modules since 5.6.2
2020-03-29 00:50:16 +01:00
R. RyanTM
a15897c0cd python27Packages.qdarkstyle: 2.8 -> 2.8.1 2020-03-28 16:23:32 -07:00
R. RyanTM
d5b7f97098 python27Packages.globus-sdk: 1.8.0 -> 1.9.0 2020-03-28 16:23:09 -07:00
Graham Christensen
4d226bad77
Merge pull request #83600 from Ma27/hydra-two-stage-deploy
hydra: 2020-02-06 -> 2020-03-{24,27}
2020-03-28 19:18:10 -04:00
R. RyanTM
de4b549f65 xml2rfc: 2.37.3 -> 2.41.0 2020-03-28 16:11:02 -07:00
Maximilian Bosch
bd5324c4fc
hydra: 2020-02-06 -> 2020-03-{24,27}
Upgrades Hydra to the latest master/flake branch. To perform this
upgrade, it's needed to do a non-trivial db-migration which provides a
massive performance-improvement[1].

The basic ideas behind multi-step upgrades of services between NixOS versions
have been gathered already[2]. For further context it's recommended to
read this first.

Basically, the following steps are needed:

* Upgrade to a non-breaking version of Hydra with the db-changes
  (columns are still nullable here). If `system.stateVersion` is set to
  something older than 20.03, the package will be selected
  automatically, otherwise `pkgs.hydra-migration` needs to be used.

* Run `hydra-backfill-ids` on the server.

* Deploy either `pkgs.hydra-unstable` (for Hydra master) or
  `pkgs.hydra-flakes` (for flakes-support) to activate the optimization.

The steps are also documented in the release-notes and in the module
using `warnings`.

`pkgs.hydra` has been removed as latest Hydra doesn't compile with
`pkgs.nixStable` and to ensure a graceful migration using the newly
introduced packages.

To verify the approach, a simple vm-test has been added which verifies
the migration steps.

[1] https://github.com/NixOS/hydra/pull/711
[2] https://github.com/NixOS/nixpkgs/pull/82353#issuecomment-598269471
2020-03-28 23:33:25 +01:00
worldofpeace
68d45cb681
Merge pull request #83560 from bhipple/u/ntlm-auth
pythonPackages.ntlm-auth: 1.0.3 -> 1.4.0 to fix build
2020-03-28 17:39:48 -04:00
Doron Behar
88508a7243 cpp-utilities: 5.2.0 -> 5.3.0 2020-03-28 20:46:34 +03:00
Maximilian Bosch
5a7d2e18fe
cargo-make: 0.30.0 -> 0.30.1
https://github.com/sagiegurari/cargo-make/releases/tag/0.30.1
2020-03-28 17:11:24 +01:00
Benjamin Hipple
97f09ff09f pythonPackages.ntlm-auth: 1.0.3 -> 1.4.0 to fix build
On master and 20.03, this is failing to build on `python 3.8`.

https://hydra.nixos.org/build/115517329
https://hydra.nixos.org/build/114714922

CC @NixOS/nixos-release-managers
ZHF: #80379

Co-Authored-By: Niklas Hambüchen <mail@nh2.me>
2020-03-28 11:44:59 -04:00
Benjamin Hipple
c7ec025888
Merge pull request #83577 from jollheef/codeql-2.1.0
codeql: 2.0.4 -> 2.1.0
2020-03-28 11:24:14 -04:00
Elis Hirwing
d0abce68ba
Merge pull request #82303 from sjmackenzie/seabreeze
seabreeze: udev rules not installed
2020-03-28 14:32:33 +01:00
Michael Raskin
05f0934825
Merge pull request #82939 from jluttine/linphone-4.1.1
linphone: 3.12.0 -> unstable-2020-03-06
2020-03-28 12:27:16 +00:00
Robin Gloster
11b2136565
Merge pull request #83559 from r-ryantm/auto-update/python2.7-plumbum
python27Packages.plumbum: 1.6.8 -> 1.6.9
2020-03-28 11:52:15 +00:00
Jaakko Luttinen
70e538893c
mediastreamer-openh264: 1.2.1 -> unstable-2020-03-03 2020-03-28 12:49:50 +02:00
Jaakko Luttinen
1e51592037
liblinphone: init at unstable-2020-03-20 2020-03-28 12:49:49 +02:00
Jaakko Luttinen
d4988c7c31
mediastreamer: 2.16.1 -> unstable-2020-03-20 2020-03-28 11:25:30 +02:00
Jaakko Luttinen
7c5bff5428
bzrtp: 1.0.6 -> 4.3.1 2020-03-28 11:25:30 +02:00
Jaakko Luttinen
187ae7c30e
belcard: 1.0.2 -> 4.3.1 2020-03-28 11:25:30 +02:00
Jaakko Luttinen
dcf2f1186a
lime: init at 4.3.1 2020-03-28 11:25:30 +02:00
Jaakko Luttinen
810dac320a
belle-sip: 1.6.3 -> unstable-2020-02-18 2020-03-28 11:25:29 +02:00
Jaakko Luttinen
1e9f771055
ortp: 1.0.2 -> unstable-2020-03-17 2020-03-28 11:25:29 +02:00
Jaakko Luttinen
8a236c60a9
belr: 0.1.3 -> unstable-2020-03-09 2020-03-28 11:25:29 +02:00
Jaakko Luttinen
9bd261213b
bctoolbox: 0.6.0 -> 4.3.1 2020-03-28 11:25:29 +02:00
Jaakko Luttinen
3125cc6707
soci: init at 4.0.0 2020-03-28 11:25:28 +02:00
Mikhail Klementev
679fc685c8
codeql: 2.0.4 -> 2.1.0 2020-03-28 09:05:48 +00:00
Cole Mickens
4366b198d7 pythonPackages.bravia-tv: init at 1.0.1 2020-03-28 08:08:36 +00:00