Commit Graph

222755 Commits

Author SHA1 Message Date
talyz
2535cdfe91
php: Unify the usage of the php package in php-packages.nix
Instead of using two different php packages in php-packages.nix, one
wrapper and one unwrapped, simply use the wrapper and use its
"unwrapped" attribute when necessary. Also, get rid of the packages
and extensions attributes from the base package, since they're no
longer needed.
2020-04-29 13:59:29 +02:00
talyz
5cad1b4aff
php: Get rid of the phpXXbase attributes, update docs
Since the introduction of php.unwrapped there's no real need for the
phpXXbase attributes, so let's remove them to lessen potential
confusion and clutter. Also update the docs to make it clear how to
get hold of an unwrapped PHP if needed.
2020-04-29 13:45:48 +02:00
talyz
3bfd4e864f
php: Add passthru.tests 2020-04-29 13:45:07 +02:00
talyz
ef990961bc
php.buildEnv: Provide the unwrapped php package in php.unwrapped
This is useful if you need to access the dev output of the unwrapped
derivation.
2020-04-29 13:44:20 +02:00
talyz
c3d5d92f4a
php.buildEnv: Add phpIni attribute for easy access to the php.ini 2020-04-29 12:12:59 +02:00
talyz
d61040716e
php.buildEnv: Automatically include extension dependencies
Some extensions depend on other extensions. Previously, these had to
be added manually to the list of included extensions, or we got a
cryptic error message pointing to strings-with-deps.nix, which wasn't
very helpful. This makes sure all required extensions are included in
the set from which textClosureList chooses its snippets.
2020-04-26 16:43:29 +02:00
talyz
72636bc2f6
php: Get rid of all config.php parameters
Since all options controlled by the config.php parameters can now be
overridden directly, there's no reason to keep them around.
2020-04-26 16:43:23 +02:00
talyz
2ba7926959
php.buildEnv: Provide a list of currently enabled extensions
Rework withExtensions / buildEnv to handle currently enabled
extensions better and make them compatible with override. They now
accept a function with the named arguments enabled and all, where
enabled is a list of currently enabled extensions and all is the set
of all extensions. This gives us several nice properties:

 - You always get the right version of the list of currently enabled
   extensions

 - Invocations chain

 - It works well with overridden PHP packages - you always get the
   correct versions of extensions

As a contrived example of what's possible, you can add ImageMagick,
then override the version and disable fpm, then disable cgi, and
lastly remove the zip extension like this:

{ pkgs ? (import <nixpkgs>) {} }:
with pkgs;

let
  phpWithImagick = php74.withExtensions ({ all, enabled }: enabled ++ [ all.imagick ]);

  phpWithImagickWithoutFpm743 = phpWithImagick.override {
    version = "7.4.3";
    sha256 = "wVF7pJV4+y3MZMc6Ptx21PxQfEp6xjmYFYTMfTtMbRQ=";
    fpmSupport = false;
  };

  phpWithImagickWithoutFpmZip743 = phpWithImagickWithoutFpm743.withExtensions (
    { enabled, all }:
      lib.filter (e: e != all.zip) enabled);

  phpWithImagickWithoutFpmZipCgi743 = phpWithImagickWithoutFpmZip743.override {
    cgiSupport = false;
  };
in
  phpWithImagickWithoutFpmZipCgi743
2020-04-26 16:43:05 +02:00
talyz
abedfadd73
php.buildEnv: Respect override
Make buildEnv take earlier overridden values into account by
forwarding all arguments (a merge of generic's arguments, all previous
arguments and the current arguments) to the next invocation of
buildEnv.
2020-04-24 18:48:29 +02:00
talyz
dde5f5f899
php: Make all arguments to a PHP build overridable
Make all arguments to a PHP build overridable; i.e, both configuration
flags, such as valgrindSupport, and packages, such as valgrind:

php.override { valgrindSupport = false; valgrind = valgrind-light; }

This applies to packages built by generic and buildEnv/withExtensions;
i.e, it works with both phpXX and phpXXBase packages.

The following changes were also made to facilitate this:

 - generic and generic' are merged into one function

 - generic now takes all required arguments for a complete build and
   is meant to be called by callPackage

 - The main function called from all-packages.nix no longer takes all
   required arguments for a complete build - all arguments passed to it
   are however forwarded to the individual builds, thus default
   arguments can still be overridden from all-packages.nix
2020-04-24 18:41:53 +02:00
talyz
a463261415
php.buildEnv: Make the exported php package overridable
This implements the override pattern for builds done with buildEnv, so
that we can, for example, write

php.override { fpmSupport = false; }

and get a PHP package with the default extensions enabled, but PHP
compiled without fpm support.
2020-04-24 13:05:37 +02:00
Aaron Andersen
c89243a03e
Merge pull request #85614 from stigtsp/package/perl-mojolicious-plugin-textexceptions-init
perlPackages.MojoliciousPluginTextExceptions: init at 0.01
2020-04-24 06:57:42 -04:00
adisbladis
5afaf77e58
emacsPackages.mandoku-tls: Fix build 2020-04-24 11:35:37 +01:00
adisbladis
b77f95191f
emacsPackages.mandoku: Fix build 2020-04-24 11:35:37 +01:00
adisbladis
12085f3ef9
emacsPackages.kapacitor: Fix build 2020-04-24 11:35:37 +01:00
adisbladis
d8a6536f25
emacsPackages.kubernetes-evil: Fix build 2020-04-24 11:35:37 +01:00
Rok Garbas
69bac39af7
khal: fix test (#85811) 2020-04-24 12:33:30 +02:00
Jörg Thalheim
320edf21f5
Merge pull request #85864 from xrelkd/update/powerline-go 2020-04-24 11:25:02 +01:00
adisbladis
9072afb680
emacsPackages.magit-gerrit: Fix build 2020-04-24 11:22:16 +01:00
adisbladis
63da0e5eee
emacsPackages.magit-vcsh: Fix build 2020-04-24 11:22:16 +01:00
adisbladis
dd33024c37
emacsPackages.magit-topgit: Fix build 2020-04-24 11:22:15 +01:00
adisbladis
a22e37b51b
emacsPackages.magit-tbdiff: Fix build 2020-04-24 11:22:15 +01:00
adisbladis
f10c79e19e
emacsPackages.magit-reviewboard: Add git input
The build is still failing for unrelated reasons.
2020-04-24 11:22:15 +01:00
adisbladis
8827608af7
emacsPackages.magit-reviewboard: Fix build 2020-04-24 11:22:15 +01:00
adisbladis
69cd2d51a4
emacsPackages.magit-rbr: Fix build 2020-04-24 11:22:14 +01:00
adisbladis
df1fd7d2a4
emacsPackages.magit-patch-changelog: Fix build 2020-04-24 11:22:14 +01:00
adisbladis
43818efd94
emacsPackages.magit-p4: Fix build 2020-04-24 11:22:14 +01:00
adisbladis
e581d92db8
emacsPackages.magit-org-todos: Fix build 2020-04-24 11:22:14 +01:00
adisbladis
bd30b6e479
emacsPackages.magit-lfs: Fix build 2020-04-24 11:22:14 +01:00
adisbladis
d12a589b54
emacsPackages.magit-imerge: Fix build 2020-04-24 11:22:13 +01:00
adisbladis
0c370e4946
emacsPackages.magit-gh-pulls: Fix build 2020-04-24 11:22:13 +01:00
adisbladis
eb7aa2fce3
emacsPackages.magit-find-file: Fix build 2020-04-24 11:22:13 +01:00
adisbladis
368f9ee7d1
emacsPackages.magit-diff-flycheck: Fix build 2020-04-24 11:22:13 +01:00
adisbladis
fa31ab9699
emacsPackages.magit-circleci: Fix build 2020-04-24 11:22:12 +01:00
Frederik Rietdijk
2058aeba20 python3Packages.panel: 0.7.0 -> 0.8.3
A newer version is available but requires bokeh >= 2.
See https://github.com/NixOS/nixpkgs/pull/85758 for WIP bokeh PR.
2020-04-24 12:09:58 +02:00
Florian Klink
0d99474a9b
Merge pull request #85556 from B4dM4n/virtualbox-616
virtualbox: 6.1.4 -> 6.1.6
2020-04-24 11:54:29 +02:00
adisbladis
67a61fbd34
nixos/podman: Add rootless containers to test 2020-04-24 10:50:17 +01:00
obadz
ea9b5c5faa
Merge pull request #76998 from jflanglois/fix-psd-overlay-helper
profile-sync-daemon: fix psd-overlay-helper paths
2020-04-24 10:48:04 +01:00
adisbladis
755d20a0ae
Merge pull request #85901 from zowoq/slirp
libslirp: 4.2.0 -> 4.3.0, slirp4netns: 1.0.0 -> 1.0.1
2020-04-24 11:37:00 +02:00
Frederik Rietdijk
955170761f python3Packages.holoviews: 1.12.7 -> 1.13.2 2020-04-24 11:35:08 +02:00
Frederik Rietdijk
2030507f2d python3Packages.param: 1.9.2 -> 1.9.3 2020-04-24 11:35:08 +02:00
Frederik Rietdijk
d9078294cf python3Packages.pyviz_comms: 0.7.2 -> 0.7.4 2020-04-24 11:35:08 +02:00
adisbladis
5a3b818368
Merge pull request #85894 from zowoq/podman-crio
podman team: add cri-o packages/module
2020-04-24 11:34:07 +02:00
xrelkd
de6ebdff2f powerline-go: 1.15.0 -> 1.17.0 2020-04-24 17:29:43 +08:00
adisbladis
e5be8d2d06
Merge pull request #85914 from zowoq/libpod
nixos/containers: move libpod to nixos/podman
2020-04-24 11:29:13 +02:00
Michael Raskin
09079c4e76
Merge pull request #85912 from chkno/allegro
allegro4: 4.4.2 -> 4.4.3.1 (fixes atanks & racer)
2020-04-24 08:54:46 +00:00
Michael Raskin
f3e8a97387
Merge pull request #85907 from savannidgerinel/zenstates
ZenStates: init at 0.1.0
2020-04-24 08:53:17 +00:00
Vladyslav M
9078bee65a
Merge pull request #85906 from xrelkd/update/cargo-expand 2020-04-24 10:38:21 +03:00
Jan Tojnar
79743fef7b
Merge pull request #85889 from emilazy/twitter-color-emoji-12.1.5
twitter-color-emoji: 12.1.2 -> 12.1.5
2020-04-24 08:59:20 +02:00
zowoq
0944d77fc0 nixos/containers: move libpod to nixos/podman 2020-04-24 15:34:05 +10:00