3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

426 commits

Author SHA1 Message Date
Franz Pletz ecdf4f1c51
php56: 5.6.31 -> 5.6.32 2017-10-30 17:56:59 +01:00
Orivej Desh fda26c8476 Merge branch 'master' into staging
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
2017-10-02 00:22:12 +00:00
Franz Pletz 09b6f1e605
php71: 7.1.8 -> 7.1.9 2017-09-28 14:52:37 +02:00
Franz Pletz d27ebcbae3
php70: 7.0.22 -> 7.0.24 2017-09-28 14:52:37 +02:00
Robin Gloster 6b05651c20
Revert "postgresql: Add dev output"
Firstly this creates a cycle in 9.6 .out <-> .dev after fixing the PGXS
path.

Secondly this breaks extension handling and the pg_config as it
resolves a lot of paths relatively resulting in the following bogus
output:

BINDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/bin
DOCDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/doc
HTMLDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/doc
INCLUDEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include
PKGINCLUDEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include
INCLUDEDIR-SERVER = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/include/server
LIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
PKGLIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
LOCALEDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/locale
MANDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share/man
SHAREDIR = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/share
SYSCONFDIR = /etc/postgresql
PGXS = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/lib/pgxs/src/makefiles/pgxs.mk
CONFIGURE = '--prefix=/nix/store/irqqq4g173g9xrk1mh12kxv0s1d8dbyh-postgresql-9.5.9' '--with-openssl' '--with-libxml' '--sysconfdir=/etc' '--libdir=/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib' '--with-ossp-uuid' 'CC=gcc'
CC = gcc
CPPFLAGS = -D_GNU_SOURCE -I/nix/store/z6r0j2b4bcdfw3pck2x6ay0vvx0qzb92-libxml2-2.9.5-dev/include/libxml2
CFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -O2
CFLAGS_SL = -fPIC
LDFLAGS = -L../../../src/common -L/nix/store/ighspl5sa3qi1zy7nkih0c9p73xjfqa6-libxml2-2.9.5/lib -Wl,--as-needed -Wl,-rpath,'/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib',--enable-new-dtags
LDFLAGS_EX =
LDFLAGS_SL =
LIBS = -lpgcommon -lpgport -lxml2 -lssl -lcrypto -lz -lreadline -lrt -lcrypt -ldl -lm
VERSION = PostgreSQL 9.5.9

This can probably only be properly fixed by rewriting pg_config in large
parts as it does not in any way respect splitting the postgres tree and
assumes it can simply resolve paths relative to its location. This does
not even handle symlinks:

$ result-dev/bin/pg_config
BINDIR = /home/robin/dev/nixpkgs-upstream/result-dev/bin
DOCDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/doc
HTMLDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/doc
INCLUDEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/include
PKGINCLUDEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/include
INCLUDEDIR-SERVER = /home/robin/dev/nixpkgs-upstream/result-dev/include/server
LIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
PKGLIBDIR = /nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib
LOCALEDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/locale
MANDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share/man
SHAREDIR = /home/robin/dev/nixpkgs-upstream/result-dev/share
SYSCONFDIR = /etc/postgresql
PGXS = /nix/store/csiq6zkn2c994kkdjln461jvgbka4yb1-postgresql-9.5.9-dev/lib/pgxs/src/makefiles/pgxs.mk
CONFIGURE = '--prefix=/nix/store/irqqq4g173g9xrk1mh12kxv0s1d8dbyh-postgresql-9.5.9' '--with-openssl' '--with-libxml' '--sysconfdir=/etc' '--libdir=/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib' '--with-ossp-uuid' 'CC=gcc'
CC = gcc
CPPFLAGS = -D_GNU_SOURCE -I/nix/store/z6r0j2b4bcdfw3pck2x6ay0vvx0qzb92-libxml2-2.9.5-dev/include/libxml2
CFLAGS = -Wall -Wmissing-prototypes -Wpointer-arith -Wdeclaration-after-statement -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -O2
CFLAGS_SL = -fPIC
LDFLAGS = -L../../../src/common -L/nix/store/ighspl5sa3qi1zy7nkih0c9p73xjfqa6-libxml2-2.9.5/lib -Wl,--as-needed -Wl,-rpath,'/nix/store/85s9m7hpfzsl93wcb5gr6ii2km9mpx3z-postgresql-9.5.9-lib/lib',--enable-new-dtags
LDFLAGS_EX =
LDFLAGS_SL =
LIBS = -lpgcommon -lpgport -lxml2 -lssl -lcrypto -lz -lreadline -lrt -lcrypt -ldl -lm
VERSION = PostgreSQL 9.5.9

cc @edolstra

Revert "bacula: fix after postgresql output splitting"

This reverts commit 13c9cbacdd.

Revert "postgresql: fix pgxs dir in pg_config"

This reverts commit 21998d597b.

Revert "rubyGems.pg: fix postgresql path"

This reverts commit e253ae7d3a.

Revert "kea: fix path to pg_config"

This reverts commit 086c636eb7.

Revert "php: fix build wrt. new postgres.dev build output"

This reverts commit 2f23a83920.

Revert "gdal: fix path to pg_config"

This reverts commit 032c50d45b.

Revert "postgresql: Add dev output"

This reverts commit b0280f598e.
2017-09-27 21:58:44 +02:00
Stefan Siegl 2f23a83920
php: fix build wrt. new postgres.dev build output
Refs commit b0280f598e
2017-09-26 10:14:27 +02:00
John Ericson 531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Robin Gloster bd1a78aa34
php: 7.1.7 -> 7.1.8 2017-08-12 18:27:08 +02:00
Robin Gloster 4ce80c5ed5
php70: 7.0.21 -> 7.0.22 2017-08-12 18:27:08 +02:00
Franz Pletz 456c76169d
php71: 7.1.5 -> 7.1.7
Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See:
  * https://secure.php.net/ChangeLog-7.php#7.1.6
  * https://secure.php.net/ChangeLog-7.php#7.1.7
2017-07-10 00:22:15 +02:00
Franz Pletz f15f580cca
php70: 7.0.19 -> 7.0.21 for multiple CVEs
Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See:
  * https://secure.php.net/ChangeLog-7.php#7.0.20
  * https://secure.php.net/ChangeLog-7.php#7.0.21
2017-07-10 00:22:14 +02:00
Franz Pletz 586f780828
php56: 5.6.30 -> 5.6.31 for multiple CVEs
Fixes:
  * CVE-2017-9224
  * CVE-2017-9226
  * CVE-2017-9227
  * CVE-2017-9228
  * CVE-2017-9229

See https://secure.php.net/ChangeLog-5.php#5.6.31.
2017-07-10 00:22:14 +02:00
Pascal Bach 624887a354 php: set extension dir to correct location
The extension dir was no longer correctly set to $out/lib/php/extensions
as PHP expects the EXTENSION_DIR as environment variable not config flag.
2017-06-01 23:17:13 +02:00
Franz Pletz 9bb358316f
php71: 7.1.2 -> 7.1.5 2017-05-25 02:44:16 +02:00
Robin Gloster d0ffb23442
php70: 7.0.16 -> 7.0.19
fixes build with openssl 1.1
2017-05-20 13:22:46 +02:00
Alastair Pharo b330329768 php: fix php-config header file paths
Split outputs mean that the "include" folder from PHP gets placed into a
"dev" derivation. However php-config is not aware of this, which means
that compiling extensions with phpize fails with an error about being
unable to find header files (see #24357, #24420).  This fixes that by:

1. passing the `--includedir` flag to `configure` so that `php-config`
   gives the correct paths.

2. moving the `phpize` and `php-config` scripts and man pages to the
   dev derivation, to prevent cylic references.

3. ensuring that the `configure` script arguments are stripped from
   all binaries, including `php-embed`, to prevent cyclic references.
2017-04-24 16:45:20 +10:00
Eelco Dolstra b751036a74
php: Add a dev output
This reduces the closure size from 438 to 174 MiB.
2017-03-20 17:31:37 +01:00
Eelco Dolstra 3ff08d6f13
php: Strip modules
This reduces the closure size from 566 to 438 MiB.
2017-03-20 17:31:31 +01:00
Franz Pletz 78abfe951b
php71: 7.1.1 -> 7.1.2 2017-02-18 14:50:16 +01:00
Franz Pletz 405e117d31
php70: 7.0.15 -> 7.0.16 2017-02-18 14:49:59 +01:00
Robin Gloster cb30150bd5
php: fix build in case mysql is not mariadb
fixes #20986
2017-01-25 18:11:38 +01:00
Michael Raskin e5acde0cf4 php71: 7.1.0 -> 7.1.1
@NixOS/security-notifications (for all three updates)

Relevant to #21967
2017-01-20 11:54:44 +01:00
Michael Raskin ff5ef7d052 php70: 7.0.14 -> 7.0.15 2017-01-20 11:54:34 +01:00
Michael Raskin 35fdfd88d4 php56: 5.6.29 -> 5.6.30 2017-01-20 11:54:03 +01:00
schneefux a7f25fe167 php: add embedded package 2017-01-19 22:47:10 +01:00
Franz Pletz 60dfc245c7
php70: 7.0.13 -> 7.0.14 2016-12-13 21:56:47 +01:00
Franz Pletz 2ec19900ab
php56: 5.6.28 -> 5.6.29 2016-12-13 21:56:10 +01:00
Franz Pletz 762d902b1d
php71: init at 7.1.0 2016-12-13 21:55:05 +01:00
Franz Pletz 7c65e225dd
php70: 7.0.12 -> 7.0.13 2016-11-17 21:17:56 +01:00
Franz Pletz e53b902559
php56: 5.6.27 -> 5.6.28 2016-11-17 21:17:56 +01:00
Periklis Tsirakidis 61ce404598 php: fix pr review comments 2016-10-19 09:35:06 +02:00
Periklis Tsirakidis b336be90cc php: fix darwin build 2016-10-19 09:32:06 +02:00
Franz Pletz 5456d8f007
php70: 7.0.11 -> 7.0.12
Fixes some security vulnerabilities:

    https://secure.php.net/ChangeLog-7.php#7.0.12
2016-10-18 14:18:04 +02:00
Franz Pletz 0f42ee7c88
php56: 5.6.26 -> 5.6.27
Fixes some security vulnerabilities:

    https://secure.php.net/ChangeLog-5.php#5.6.27
2016-10-18 14:17:01 +02:00
Jörg Thalheim 8a690b2a9f Merge pull request #17922 from bjornfor/php-config-file-scan-dir
php: change config-file-scan-dir from /etc to /etc/php.d
2016-10-09 21:45:48 +02:00
Peter Hoeg 5a6626f47c php fpm: add systemd support
PHP FPM will now notify systemd when it's done initializing and ready to
serve requests.

Additionally ```systemctl status phpfpm``` will now show statistics such
as:

```
Status: "Processes active: 0, idle: 8, Requests: 0, slow: 0, Traffic: 0req/sec"
```
2016-10-05 23:30:31 +08:00
Graham Christensen f01e56e576
php5: 5.6.25 -> 5.6.26 for CVEs (http://www.php.net/ChangeLog-5.php\#5.6.26) 2016-09-22 21:36:30 -04:00
Franz Pletz a32281639e
php70: 7.0.10 -> 7.0.11 (security)
See https://secure.php.net/ChangeLog-7.php#7.0.11.
2016-09-15 13:57:32 +02:00
Bjørn Forsman 41c8aa8d63 php: change config-file-scan-dir from /etc to /etc/php.d
By chance I noticed that php picked up my /etc/odbc.ini file (clearly
wrong!). This fixes it by adding a namespace for php.

WARNING: This is a breaking change for anyone that happen to rely on php
picking up .ini files from /etc.
2016-09-08 09:40:07 +02:00
Tuomas Tynkkynen 55fa3b52a3 php: Fix mysql reference
TODO: Fix the mysql expression so this isn't needed.
2016-08-29 14:49:53 +03:00
obadz 3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Robin Gloster 9ed7196eac
php70: 7.0.9 -> 7.0.10 2016-08-25 00:02:48 +00:00
Robin Gloster 765e1e30ba
php56: 5.6.24 -> 5.6.25 2016-08-25 00:00:48 +00:00
Robin Gloster 07b8f53612
php55: remove unmaintained version
Does not receive security updates from upstream
2016-08-25 00:00:48 +00:00
Robin Gloster b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Vladimír Čunát 950feb70b2 treewide: fixup various mysql ocurrences after re-split 2016-08-07 20:46:37 +02:00
Robin Gloster 63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Franz Pletz 63784b8021 php: 5.5.37 -> 5.5.38, 5.6.23 -> 5.6.24 (security)
https://secure.php.net/ChangeLog-5.php#5.5.38
https://secure.php.net/ChangeLog-5.php#5.6.24
2016-07-28 06:22:23 +02:00
Robin Gloster f222d98746 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-25 12:47:13 +00:00
Franz Pletz 77a9ab33a6 php: 7.0.8 -> 7.0.9 (security)
https://secure.php.net/ChangeLog-7.php#7.0.9
2016-07-21 14:12:29 +02:00
Robin Gloster 5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Franz Pletz 5c59a30191 php: fix hashes for 5.5 and 5.6 2016-06-27 00:47:39 +02:00
Franz Pletz 56bbc4cc61 php56: 5.6.22 -> 5.6.23 (security)
See https://secure.php.net/ChangeLog-5.php#5.6.23.
2016-06-27 00:14:00 +02:00
Franz Pletz d6680b73c3 php55: 5.5.36 -> 5.5.37 (security)
See https://secure.php.net/ChangeLog-5.php#5.5.37.
2016-06-27 00:13:40 +02:00
Franz Pletz 82d180145e php70: 7.0.7 -> 7.0.8 (security)
See https://secure.php.net/ChangeLog-7.php#7.0.8.
2016-06-27 00:12:00 +02:00
Eric Sagnes 1485b3a6c0 php: add meta.platforms 2016-06-22 17:45:52 +09:00
Marc Scholten d1219ba68f php: Fixed libiconv error 2016-06-13 18:25:58 +02:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Marc Scholten d4babc49dc php: Now builds on darwin 2016-06-09 14:49:55 +02:00
Eelco Dolstra 109096247a php56: update to 5.6.22
(cherry picked from commit 72b4009367)
2016-06-09 10:04:39 +00:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Vladimír Čunát e4832c7541 Merge branch 'staging'
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Franz Pletz 93c010ddad php: 5.5.35 -> 5.5.36, 7.0.6 -> 7.0.7 (security)
See:

  * https://secure.php.net/ChangeLog-5.php#5.5.36
  * https://secure.php.net/ChangeLog-7.php#7.0.7
2016-05-26 18:44:31 +02:00
Tuomas Tynkkynen 7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen e80e4ba2bb treewide: Make explicit that 'dev' output of sqlite is used 2016-05-19 10:04:34 +02:00
Tuomas Tynkkynen 8d473f107c treewide: Make explicit that 'dev' output of readline is used 2016-05-19 10:03:35 +02:00
Tuomas Tynkkynen 3672f3edcb treewide: Make explicit that 'dev' output of libxslt is used 2016-05-19 10:00:48 +02:00
Tuomas Tynkkynen 309b2644ac treewide: Make explicit that 'dev' output of libpng is used 2016-05-19 10:00:44 +02:00
Tuomas Tynkkynen be00816cab treewide: Make explicit that 'dev' output of libjpeg is used 2016-05-19 10:00:42 +02:00
Tuomas Tynkkynen 47c45e2041 treewide: Make explicit that 'dev' output of gmp is used 2016-05-19 10:00:36 +02:00
Tuomas Tynkkynen 288912c2c4 treewide: Make explicit that 'dev' output of freetype is used 2016-05-19 10:00:34 +02:00
Tuomas Tynkkynen e28e010b36 treewide: Make explicit that 'dev' output of curl is used 2016-05-19 10:00:29 +02:00
Tuomas Tynkkynen c22f86a853 treewide: Make explicit that 'dev' output of bzip2 is used 2016-05-19 10:00:28 +02:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Franz Pletz 4d750ae2c7 php: 7.0.5 -> 7.0.6 2016-05-13 17:27:59 +02:00
Joachim Fasting 23fd70b719 Merge pull request #15018 from ericsagnes/pkg-fix/php
php: add default php.ini
2016-05-05 19:16:04 +02:00
Franz Pletz c0f4361902 php: Fix openssl module build 2016-05-03 16:04:40 +02:00
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Robert Scott 11a716491b php: 5.5.34 -> 5.4.35 2016-04-30 22:32:34 +00:00
Robert Scott e9c16b7902 php: 5.6.20 -> 5.6.21 2016-04-30 20:48:12 +00:00
Eric Sagnes a8bc5b67f8 php: add default php.ini 2016-04-29 15:26:20 +09:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Vladimír Čunát 39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Robert Scott d61b739f07 php: 5.6.19 -> 5.6.20 2016-04-10 18:41:57 +00:00
Robert Scott 1773c53fcf php55: 5.5.33 -> 5.5.34 2016-04-10 14:45:35 +00:00
Vladimír Čunát 30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Robin Gloster df72d621f1 Revert "php: enable PIE hardening"
This reverts commit fb57bfbd4f.
2016-04-03 13:31:15 +00:00
Robin Gloster 696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-03 11:01:57 +00:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Franz Pletz fc1e886f1b php: 7.0.2 -> 7.0.5 (security)
https://secure.php.net/ChangeLog-7.php#7.0.5
2016-03-31 16:07:43 +02:00
Franz Pletz a56d90efda php: Disable bindnow hardening flag
Fixes dynamic linking against i.e. mysql.
2016-03-31 09:56:45 +02:00
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
Robert Scott 9f54f755a9 php: 5.5.32 -> 5.5.33 (security update) 2016-03-19 11:18:12 +00:00
Robert Scott e4817b7d99 php: 5.6.18 -> 5.6.19 (security update) 2016-03-19 11:15:48 +00:00
Vladimír Čunát c801cd1a04 php: fixup build when configured with httpd via nixos 2016-03-11 11:54:53 +01:00
Franz Pletz fb57bfbd4f php: enable PIE hardening 2016-03-06 00:15:18 +01:00
Vladimír Čunát d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Eelco Dolstra fc84ee22df php: Remove version 5.4 which is EOL 2016-02-11 11:27:34 +01:00
Eelco Dolstra 42634fe6cc php: 5.5.31 -> 5.5.32 2016-02-11 11:24:54 +01:00
Eelco Dolstra b061225c54 php: 5.6.17 -> 5.6.18 2016-02-11 11:24:48 +01:00
Vladimír Čunát 716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Arseniy Seroka 3443462ab1 Merge pull request #12233 from deeky666/php-7.0.2
php: 7.0.1 -> 7.0.2
2016-01-08 20:22:00 +03:00
Eelco Dolstra aa73be3609 Merge pull request #12232 from deeky666/php-5.5.31
php: 5.5.30 -> 5.5.31
2016-01-08 12:36:09 +01:00
Steve Müller 4341df2f70 php: 7.0.1 -> 7.0.2 2016-01-08 10:51:35 +01:00
Steve Müller 5250326474 php: 5.5.30 -> 5.5.31 2016-01-08 10:49:04 +01:00
Steve Müller 7c54bca127 php: 5.6.16 -> 5.6.17 2016-01-08 10:42:32 +01:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Steve Müller cf99e57c80 php: 7.0.0 -> 7.0.1 2015-12-18 09:41:51 +01:00
Luca Bruno 5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Steve Müller de327c7db7 fixes #11618: make php and phpPackages extension directory consistent 2015-12-11 01:24:05 +01:00
Robin Gloster f22b401cdc php70: 7.0.0RC6 -> 7.0.0 2015-12-02 12:54:04 +00:00
Luca Bruno 920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Robin Gloster ef4f3e6ff4 php56: 5.6.15 -> 5.6.16 2015-11-28 16:54:20 +00:00
Vladimír Čunát 333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Robin Gloster fdf8e4f2c8 php70: 7.0.0beta1 -> 7.0.0RC6 2015-11-01 12:13:16 +00:00
Robin Gloster 0ceec8420c php: 5.6.14 -> 5.6.15 2015-11-01 12:12:13 +00:00
Tuomas Tynkkynen 0fe3e37946 php: Apply brute force to locate openldap
Needed after the split to multiple outputs :(. But that's what you get
for not providing pkg-config files...
2015-10-28 10:23:01 +01:00
Eelco Dolstra bcc7673a44 php: Update to 5.5.30, 5.6.14 2015-10-07 11:32:15 +02:00
Vladimír Čunát 38313d5d87 libxml2,libxslt: split into multiple outputs
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
2015-10-05 13:44:16 +02:00
Tuomas Tynkkynen 77580d42ad php: Enable SSL via buildInputs
The old way doesn't seem to work with multiple outputs.
TODO: this seems to be a recurring pattern with openssl, maybe the
splitting isn't done correctly?
2015-10-03 16:42:46 +02:00
Eelco Dolstra 0ea1169dae php: Latest versions 2015-09-08 15:32:33 +02:00
Eelco Dolstra 64b3974d13 php: Use callPackages 2015-08-11 13:24:23 +02:00
Eelco Dolstra e7504ebf71 php: Update to 5.4.44, 5.5.28, 5.6.12 2015-08-11 13:24:23 +02:00
Eelco Dolstra cca7cdb631 php: Update to 5.4.43, 5.5.27, 5.6.11
CVE-2015-3152
2015-07-28 13:10:53 +02:00
Austin Seipp 22d5d78027 Merge pull request #8871 from mayflower/php7-beta1
php70: init at 7.0beta1
2015-07-19 16:57:42 -05:00
Robin Gloster 5e7850f088 php70: init at 7.0beta1
The first beta of php7 has been released. This enables developers to
test their code for breakage in preparation for the stable release and
allows us to make sure we don't have any bugs in the packaging prior to
the stable release.
2015-07-17 16:42:03 +00:00
Luca Bruno 22fce48371 php: fix broken build inputs (ZHF) 2015-07-01 12:31:01 +02:00
Eelco Dolstra e982ac1017 php: Update to 5.4.42, 5.6.10
CVE-2015-3414, CVE-2015-3415, CVE-2015-3416
2015-06-12 13:47:30 +02:00
Eelco Dolstra 9a159fc2bc php: Update to latest versions 2015-05-20 11:34:08 +02:00
Eelco Dolstra 182acabbae Don't use camelCase in file names 2015-04-29 16:09:30 +02:00
Eelco Dolstra 552ea209d0 php: Update to 5.4.40 2015-04-29 16:07:36 +02:00
Robin Gloster cb904510a6 consolidate php builds 2015-04-18 03:46:48 -07:00
William A. Kennington III a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Eelco Dolstra 33dfdbd0df php: Update to 5.4.39
CVE-2015-2787, CVE-2015-2348, CVE-2015-2305, CVE-2015-2331.
2015-04-01 16:22:12 +02:00
Robin Gloster 282530454a add myself as php and rustc maintainer 2015-03-11 11:24:55 +01:00
Robin Gloster 9d26ad274a rename weirdly called patch for php 2015-03-11 11:24:43 +01:00
Robin Gloster fff1cc805a add calendar functions to PHP by default 2015-03-11 11:07:22 +01:00
Eelco Dolstra 7f90cc40b4 php: Update to 5.4.38 2015-03-09 11:36:40 +01:00
Emil Rangden 36ceb01176 add php 5.6 2015-02-05 20:28:16 +01:00
Emil Rangden 90e8287ce6 add php 5.5 2015-02-05 20:28:16 +01:00
Emil Rangden 1b057e9f6f remove patch that was only used in 5.3 2015-02-05 20:28:16 +01:00
Edward O'Callaghan ed232ef5f8 php: update from 5.4.35 to 5.4.37
Potentially fixes CVE-2014-8142, CVE-2014-9427, CVE-2015-0231, CVE-2015-0232

Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
2015-01-30 01:54:20 +11:00
Longrin Wischnewski ef3a755c1f php: add optional ZTS support and new PECL module pthreads 2015-01-06 12:08:47 +00:00
Longrin Wischnewski 96f4758d09 php: make curl wrappers optional
cURL wrappers are experimental and break any application/library
that rely on $http_response_header
2014-12-18 09:04:26 +01:00
Eelco Dolstra 4d918cb6c7 php-5.3: Remove
PHP 5.3 is EOL (see http://php.net/supported-versions.php). NixOS
14.12 is a good opportunity to drop it.
2014-12-10 17:19:37 +01:00
Eelco Dolstra 55d59eefb3 php: Really update to 5.4.34
75738437a4 only updated the version string...
2014-12-10 17:09:47 +01:00
Pascal Wittmann 75738437a4 php: update from 5.4.34 to 5.4.35 (fixes CVE-2014-3710) 2014-11-19 08:47:41 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Rob Vermaas 6d79132553 php: update from 5.4.33 to 5.4.34, potentially fixes CVE-2014-3668, CVE-2014-3669, CVE-2014-3670 2014-11-04 10:16:14 +01:00
Aristid Breitkreuz a31d6a0b61 php_fpm53: update from 5.3.28 to 5.3.29, potentially fixes CVE-2014-0237, CVE-2014-0238, CVE-2014-4721, CVE-2014-5459 2014-10-07 21:05:57 +02:00
Aristid Breitkreuz 9fc7eed1dc php: update from 5.4.32 to 5.4.33 2014-10-07 20:57:33 +02:00
Rob Vermaas 960b664a13 php: update from 5.4.31 to 5.4.32, potentially fixes CVE-2014-3587, CVE-2014-3597, CVE-2014-5120 2014-09-11 13:30:46 +02:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Patrick Mahoney 5ec563707c php: Compile pdo_pgsql support 2014-08-11 22:02:24 -05:00
Eelco Dolstra 69b426a1eb php: Update to 5.4.31 2014-08-05 11:47:16 +02:00
Vladimír Čunát 5d2ff3b5c2 php-5.3: fix build with freetype-2.5 (by Gentoo patch) 2014-07-03 18:20:46 +02:00
Austin Seipp 593e938341 php: 5.4.29 -> 5.4.30
CVE-2014-3981, CVE-2014-0207, CVE-2014-3478, CVE-2014-3479,
CVE-2014-3480, CVE-2014-3487, CVE-2014-4049, CVE-2014-3515

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-27 00:24:45 -05:00
Vladimír Čunát dc215c2988 php{53,54}: fetch from generic URL
I see no reason to download from a pre-specified mirror.
It didn't even work for me.
2014-06-22 15:02:41 +02:00
Austin Seipp fc4adcd7af php: 5.4.27 -> 5.4.29
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-22 00:46:58 -05:00
Austin Seipp 6b345e088b php: Fix fallout from 1228caae9e
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-21 21:15:29 -05:00
John Wiegley 1228caae9e php-5.4: Do not build with mssql support on Darwin 2014-06-21 16:29:28 -07:00
System administrator 7b1b46b96b mssql support for php-5.4
small changes to freetds
see: http://www.php.net/manual/de/mssql.setup.php
2014-06-11 12:58:40 +02:00
Eelco Dolstra ba332accc2 php: Update to 5.4.27
CVE-2013-7345, CVE-2014-1943, CVE-2014-2270, CVE-2013-6712
2014-05-01 11:45:35 +02:00
Shea Levy e85b164df8 Add php 5.3 variant with fpm support 2014-04-25 08:19:45 -04:00
Shea Levy 6d5176a28b php54: enable fpm support 2014-03-04 07:48:27 -05:00
Eelco Dolstra a2b45034b3 php: Update to 5.4.23, 5.3.28
CVE-2013-4073, CVE-2013-6420
2013-12-16 14:50:40 +01:00
Eelco Dolstra 847544d895 php: Update to 5.4.21 2013-11-13 17:33:58 +01:00
Jason "Don" O'Conal f79ae71748 php54: add pcntl option 2013-10-27 23:57:44 +00:00
Eelco Dolstra bb67be7739 php: Update to 5.4.20 2013-10-17 13:21:14 +02:00
Eelco Dolstra 96365e9499 php: Update to 5.4.18
CVE-2013-4113, CVE-2013-4248.
2013-08-19 12:02:10 +02:00
Jason \"Don\" O'Conal b4105cfaff php53: fix build on darwin (close #748)
* add empty unix.h header
* build with kerberos
* ensure the binary has no extension
2013-07-28 09:41:58 +02:00
Eelco Dolstra 20b4f0347e php: Update to 5.3.27, 5.4.17
CVE-2013-2110
2013-07-16 22:54:05 +02:00
Rickard Nilsson eed2a02d86 php 5.4: Add mhash support 2013-07-10 12:27:47 +02:00
Rickard Nilsson abd423621a php 5.4: Add LDAP support 2013-07-10 08:49:53 +02:00
Jason \"Don\" O'Conal 1f9005a3f6 php53: add imap option 2013-07-04 13:12:13 +02:00
Domen Kožar f33ebf88b9 Merge pull request #650 from lovek323/php53
php53: fix on darwin
2013-06-29 03:53:26 -07:00
aszlig e0ea957d64
php53: Don't use bundled version of libgd.
This fixes a copy & paste error I made in 486e918, which resulted in PHP being
built with the bundled version of GD instead of the one we have in nixpkgs.

Thanks to @peti for noticing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:54 +02:00
Jason "Don" O'Conal a7746e3585 php53: restore nix gd version 2013-06-20 19:58:00 +10:00
Jason "Don" O'Conal 6ae1241934 php53: add optional pcntl flag 2013-06-20 17:42:09 +10:00
Jason "Don" O'Conal ed3a63b5d7 php53: fix on darwin
* add libssh2 to build inputs (configure fails without this)
* link with stdc++
* add icu/lib directory to DYLD_LIBRARY_PATH (and wrap binaries with this
  environment variable
* add libiconv to build inputs
* fix --with-iconv configure flag (was --with-iconv-dir which is not a valid
  flag)
2013-06-19 14:15:55 +10:00
aszlig 486e918215
php: Fix support for JPEG and PNG over GD.
Set an explicit path to the location of libjpeg for version 5.4 and an explicit
path to libjpeg _and_ libpng for version 5.3.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:35 +02:00
Eelco Dolstra 94dfd4bdf9 php: Get rid of unnecessary runtime dependencies like gettext 2013-06-04 14:57:37 +02:00
bbenoist 23fb448242 php-5.4: Reintroduce the ftpSupport build option
The ftpSupport build option I added on the 5.3 version of PHP was not
present in the version 5.4 because it was not yet merged when I wrote my
commit.
2013-06-01 01:16:36 +02:00
Eelco Dolstra 8b1bcb720a php: Update to 5.3.25, 5.4.15 2013-05-17 14:06:29 +02:00
Eelco Dolstra 7480746a12 php-5.4: Don't build gd as a dynamically-loaded extension
We didn't do this in PHP 5.3 either, so it causes regressions if
php.ini isn't set up to load the gd extension.
2013-05-06 14:03:26 +02:00
Michael Raskin f328c45b25 Merge pull request #440 from bbenoist/master
php: add FTP support by default
2013-04-22 22:31:57 -07:00
Eelco Dolstra 4539668937 php: Add 5.4
We'll keep 5.3 around for a while.
2013-04-22 19:17:35 +02:00
Eelco Dolstra 7745357f0e meta.license should be a (list of) string(s), not an attribute set
http://hydra.nixos.org/build/4744513
2013-04-14 20:10:58 +02:00
Eelco Dolstra 70b36815fc php: Update to 5.3.24
CVE-2013-1635, CVE-2013-1643, CVE-2013-1824.
2013-04-11 16:47:08 +02:00
Baptist BENOIST dba7f8b4fb php: add FTP support by default
...as this does not requires any third party library.
2013-04-02 12:38:42 +02:00
Alexander Foremny bd0903b90b Merge remote-tracking branch 'bbenoist/phpfix' into php
Conflicts:
	pkgs/development/interpreters/php/5.3.nix
2013-02-22 09:33:06 +01:00
Alexander Foremny fec1d4b2f7 Remove misconfigured mcrypt support 2013-02-22 09:24:48 +01:00
bbenoist 99934eb363 php: Add zip and optional bz2 support
Use the overload bz2 = true to enable bz2 support for php.
zip support is enabled by default as it doesn't require any library.
2013-02-12 21:23:24 +01:00
bbenoist 8fd5fcbda5 php: Add mcrypt optional support
Use an override with mcrypt = true to enable libmcrypt support in php.
The --disable-posix-threadsds mcrypt build option was required by php.
2013-02-12 19:52:37 +01:00
Baptist BENOIST b42ba898e1 php: Add xsl optional support
Use an override with xsl = true to enable xsl support in php.
2013-02-12 19:52:34 +01:00
Alexander Foremny 18180858af Enable mcrypt, intl and exif support in PHP 2013-01-26 16:08:43 +01:00
Rob Vermaas 86a5ad6d80 Add some PHP support for gettext and gd/freetype needed for zabbix 2.0 2012-12-01 21:19:19 +01:00
Eelco Dolstra 620e3a1516 php: Update to 5.3.18 2012-10-26 16:23:30 +02:00
Eelco Dolstra 873595ee6d php: Update to 5.3.17
Also remove unsupported PHP 5.2 (which doesn't build anymore).

http://hydra.nixos.org/build/3131326
2012-10-15 11:14:26 -04:00
Eelco Dolstra e6077fbc46 Remove getConfig helper function
An expression like ‘getConfig [ "cabal" "libraryProfiling" ] false’
can be written more concisely as ‘config.cabal.libraryProfiling or false’.
2012-09-19 13:56:56 -04:00
Eelco Dolstra 16d2d9acab php: Update to 5.3.15
Includes fixes for CVE-2012-2688 and CVE-2012-3365.
2012-07-23 13:46:50 -04:00
Eelco Dolstra 4184e580a9 php: Update to 5.3.14 2012-07-06 15:14:16 -04:00
Eelco Dolstra 4c868ec330 * PHP updated to 5.3.13.
svn path=/nixpkgs/trunk/; revision=34480
2012-06-12 17:39:59 +00:00
Lluís Batlle i Rossell 6b4810d310 Updating php 5.3 to 5.3.10
svn path=/nixpkgs/trunk/; revision=33170
2012-03-16 19:40:36 +00:00
Lluís Batlle i Rossell fbad200e88 Updating php 5.2
svn path=/nixpkgs/trunk/; revision=27844
2011-07-20 17:40:53 +00:00
Eelco Dolstra 5152d0148e * Drop the "_configurable" from the name of the PHP package, it's
ugly.

svn path=/nixpkgs/trunk/; revision=27830
2011-07-18 20:50:59 +00:00
Lluís Batlle i Rossell 590bf722b4 Adding readline to php, so now 'php -a' works nicely with readline.
svn path=/nixpkgs/trunk/; revision=27110
2011-05-03 08:25:45 +00:00
Lluís Batlle i Rossell 5bd133b65c Updating php 5.3 and adding php-xcache.
svn path=/nixpkgs/trunk/; revision=27056
2011-04-29 21:01:09 +00:00
Eelco Dolstra dc09f8766a * PHP 5.3.4.
svn path=/nixpkgs/trunk/; revision=25143
2010-12-15 12:53:24 +00:00
Lluís Batlle i Rossell 5387036c50 Adding php 5.2 (5.3 does not build on arm), although not the default in the attribute 'php'.
svn path=/nixpkgs/trunk/; revision=24872
2010-11-26 14:26:15 +00:00
Lluís Batlle i Rossell 448b75b87b Removing a fix made for gcc 4.3 in php expression. Now it builds with -O2 as usual, instead of -O1.
svn path=/nixpkgs/trunk/; revision=24570
2010-11-02 13:24:12 +00:00
Lluís Batlle i Rossell a608761679 Updating php from 5.2.13 to 5.3.3. I go from a tarball not available anymore at the URL
of the nix expression, to a new version that may have little incompatibilities with 5.2 syntax.
Let's see if there are complains from php users.

svn path=/nixpkgs/trunk/; revision=24552
2010-10-31 19:26:39 +00:00
Eelco Dolstra b1afe4e7ac * Finish renaming.
svn path=/nixpkgs/trunk/; revision=22801
2010-07-29 07:02:26 +00:00
Eelco Dolstra 5b2dcdd24d * Remove the old PHP.
svn path=/nixpkgs/trunk/; revision=22800
2010-07-29 07:00:00 +00:00
Eelco Dolstra 822d59d4f9 * Remove phpIniBuilder (obsolete).
svn path=/nixpkgs/trunk/; revision=20028
2010-02-15 20:29:50 +00:00
Marc Weber 900a1c22a4 moving xdebug into its own package. This means you have to specify an additional php.ini file to make php debugger work for command line php.
svn path=/nixpkgs/trunk/; revision=19266
2010-01-06 17:04:38 +00:00
Wouter den Breejen 78746b036b PHP can take mysql as a arugment
svn path=/nixpkgs/trunk/; revision=9558
2007-10-30 16:04:45 +00:00
Eelco Dolstra 7588231bca * Purity problem: try to prevent php from looking for expat.
svn path=/nixpkgs/trunk/; revision=9298
2007-09-11 12:55:09 +00:00
Eelco Dolstra 8f4d8573c0 * Fix a bunch of URLs.
svn path=/nixpkgs/trunk/; revision=9292
2007-09-11 10:15:07 +00:00
Eelco Dolstra b83fc581e2 * PHP 5.2.0.
svn path=/nixpkgs/trunk/; revision=7349
2006-12-15 21:18:27 +00:00
Rob Vermaas d05cdd8064 added config flag for postrgres support
svn path=/nixpkgs/trunk/; revision=5668
2006-07-09 15:00:37 +00:00
Eelco Dolstra 9f1b5e24ad * Added the MySQL ODBC connector.
* Enable unixODBC support in PHP.
* Build MySQL with thread-safe client libraries.

svn path=/nixpkgs/trunk/; revision=5045
2006-03-15 15:59:20 +00:00
Eelco Dolstra 3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra b803253ddd * Added mod_python.
svn path=/nixpkgs/trunk/; revision=4549
2006-01-15 12:03:00 +00:00
Eelco Dolstra 82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Rob Vermaas 468e2c1e13 php 5.0.4
svn path=/nixpkgs/trunk/; revision=3806
2005-09-11 21:39:22 +00:00