Commit Graph

49821 Commits

Author SHA1 Message Date
Elis Hirwing
3b6539896b
Merge pull request #83896 from etu/slim-down-default-php-v3
PHP: Make the default package more sane [v3]
2020-04-05 20:00:03 +02:00
Elis Hirwing
8d2e5d5cd6
php.extensions.pthreads: Reintroduce pthreads for php72 and php73 2020-04-05 16:46:24 +02:00
Elis Hirwing
102aac631b
php.extensions.pinba: Reintroduce pinba for php72, php73 and php74 2020-04-05 16:46:11 +02:00
talyz
b5c59cebc6
php: Document withExtensions + general improvements 2020-04-05 16:46:05 +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
talyz
fe4d173cb2
php.packages: Fix and clean up external extensions
Fix extensions that were broken by the extension refactoring and
remove pthreads and pinba, which had asserts which broke evaluation,
were in need of refactoring and of dubious value.
2020-04-05 16:44:37 +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
14bfb844d6
php: Make mkExtension pass on additional args to mkDerivation 2020-04-05 16:43:43 +02:00
Benjamin Hipple
c7af5ac9c9
Merge pull request #84281 from misuzu/kmon-init
kmon: init at 1.0.0
2020-04-05 09:56:31 -04:00
Euan Kemp
e370711ad0 k3s: init at 1.17.3+k3s1
This packages k3s as a single self-contained binary (as upstream k3s
does), but without having to download any impure already-built binaries.

The upstream packaging scripts are used. Due to k3s's rather complicated
packaging arrangement, this ends up being a rather long derivation.
2020-04-05 15:34:18 +02:00
Vincent Laporte
d6a8d0ca5b coq_8_11: 8.11.0 → 8.11.1 2020-04-05 15:32:32 +02:00
Frederik Rietdijk
e50c67ad7e
Merge pull request #83618 from NixOS/staging-next
Staging next
2020-04-05 13:13:21 +02:00
misuzu
220ce926b3 kmon: init at 1.0.0 2020-04-05 13:28:48 +03:00
Eelco Dolstra
7121160d5b
Merge pull request #84214 from edolstra/update-nix
Update nixUnstable + nixFlakes, remove nix1
2020-04-05 10:20:02 +02:00
Frederik Rietdijk
866c5aa090 Merge master into staging-next 2020-04-05 08:33:39 +02:00
Anderson Torres
f0959a7b0c
Merge pull request #84284 from AndersonTorres/update-babashka
babashka: 0.0.71 -> 0.0.78
2020-04-04 22:26:40 -03:00
AndersonTorres
78cd46512c babashka: 0.0.71 -> 0.0.78 2020-04-04 18:34:09 -03:00
Mario Rodas
48ec5da6ac
zenith: enable on darwin 2020-04-04 16:20:00 -05:00
Eelco Dolstra
5d583db5a2 Remove Nix 1.x 2020-04-04 21:57:15 +02:00
Timo Kaufmann
02b1f2a2de
Merge pull request #83224 from shnarazk/cadical-pr
cadical: init at 1.2.1
2020-04-04 15:44:04 +00:00
Narazaki, Shuji
c5a12e33d2 cadical: init at 1.2.1 2020-04-05 00:22:36 +09:00
Maximilian Bosch
384a164a25
Merge pull request #83753 from cole-h/rofi-emoji
rofi-emoji: init at 2.1.2
2020-04-04 16:39:15 +02:00
Maximilian Bosch
5b6d9b2bb6
Merge pull request #84234 from catern/csv
csv2latex: init at 0.22
2020-04-04 14:37:26 +02:00
Timo Kaufmann
696274fae7
Merge pull request #83183 from bbigras/zenith
zenith: init at 0.8.0
2020-04-04 11:41:02 +00:00
Vincent Laporte
4dd89ce0a0 OCaml: default to version 4.09 2020-04-04 13:26:33 +02:00
Marek Mahut
b6dbef4759
Merge pull request #81196 from prusnak/certbot
certbot: 1.0.0 -> 1.3.0
2020-04-04 08:18:20 +02:00
Peter Hoeg
919430d9f2
Merge pull request #84212 from prusnak/scummvm-games
scummvm: add broken-sword-25 and dreamweb games
2020-04-04 13:13:28 +08:00
Spencer Baugh
797d90e259 csv2latex: init at 0.22 2020-04-04 00:09:28 -04:00
Pavol Rusnak
2133c106a1
scummvm: add broken-sword-25 and dreamweb games 2020-04-03 23:11:31 +02:00
Chuck
dec9ac364a darcs: Fix build (Use old GHC)
This is fixed at upstream's head; this change can be reverted after
darcs cuts a new release (current release is 2.14.2).
2020-04-03 22:00:30 +02:00
Frederik Rietdijk
92124ed660 Merge master into staging-next 2020-04-03 21:54:40 +02:00
Wael Nasreddine
9e55da14fe
prow: 2019-08-14 -> 2020-04-01 (#84055) 2020-04-03 10:09:11 -07:00
Maximilian Bosch
470b916556
Merge pull request #84186 from matthiasbeyer/update-pulseeffects
pulseeffects: 4.7.1 -> 4.7.2
2020-04-03 16:31:33 +02:00
Mario Rodas
3573d7801c
Merge pull request #84172 from filalex77/kondo-0.3
kondo: init at 0.3
2020-04-03 09:13:16 -05:00
Matthias Beyer
fb818c536a pulseeffects: 4.7.1 -> 4.7.2
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2020-04-03 13:52:59 +02:00
Matthias Beyer
4458697264 boost17x: boost171 -> boost172
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2020-04-03 13:52:40 +02:00
Matthias Beyer
c028978211 boost: init at 1.72.0
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
2020-04-03 13:52:06 +02:00
gnxlxnxx
8e6a74e957 swaylock-effects: init at v1.6-0 2020-04-03 13:02:28 +02:00
Oleksii Filonenko
72fb30d5cc kondo: init at 0.3 2020-04-03 11:55:56 +03:00
tomberek
939976a929
parallel-full: init SQL and CSV support (#77619)
Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
2020-04-03 09:49:28 +01: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
6c810c235d
phpPackages.exts: Run tests by default
The tests for many of the extensions run just fine, for some a small
portion fail. This runs the tests by default and disables the tests
extensions with any failing tests.
2020-04-03 10:11:14 +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
da8ca2be2f
phpPackages.exts.gmp: Enable on darwin 2020-04-03 10:11:12 +02:00
Elis Hirwing
a5f77d6ea2
php-unit: Drop the declaration of the php-unit attributes since they aren't used 2020-04-03 10:11:11 +02:00
Elis Hirwing
be7bf5a18d
php-embed: Drop the declaration of the php-embed attributes 2020-04-03 10:11:07 +02:00
Michele Guerini Rocco
0bb17a4b19
Merge pull request #81223 from aaronjanse/init-papermc
papermc: init at 1.15.2r121
2020-04-03 09:15:36 +02:00
Aaron Janse
631fe89c59 papermc: init at 1.15.2r121 2020-04-02 21:33:04 -07:00
Florian Klink
44c20fb83e
Merge pull request #84087 from Izorkin/mariadb-tokudb
mariadb: update build configuration.
2020-04-02 23:44:03 +02:00