JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
207,404 Commits 2 Branches 0 Tags 13 GiB
65f6f092c9
Commit Graph

346 Commits

Author SHA1 Message Date
Elis Hirwing
ddb2b97c3c
php72: 7.2.0 -> 7.2.1 2018-01-06 10:46:52 +01:00
Elis Hirwing
ab86148a22
php71: 7.1.11 -> 7.1.13 2018-01-06 10:34:04 +01:00
Elis Hirwing
b5e422583e
php70: 7.0.25 -> 7.0.27 2018-01-06 08:32:12 +01:00
Elis Hirwing
eaf661e15f
php56: 5.6.32 -> 5.6.33 2018-01-06 08:21:57 +01:00
Frederik Rietdijk
804285f589 Merge remote-tracking branch 'upstream/staging' into HEAD 2018-01-02 19:10:45 +01:00
Elis Hirwing
4ef2695284
php: Init at 7.2.0 2018-01-01 18:28:28 +01:00
Robin Gloster
48464d620d php: clean up mysql/mariadb handling 2017-12-29 02:18:35 +01:00
Robin Gloster
ee1c85aee9 mariadb: lib -> connector-c 2017-12-29 02:18:35 +01:00
Orivej Desh
b62ad4f22b
Merge pull request #31526 from srhb/fix-php-external-pcre 
php: Fix php pcre by using external lib
 2017-11-13 20:15:37 +00:00
Sarah Brofeldt
7e17685d09 php: Disallow bundled pcre 2017-11-12 13:19:17 +01:00
Sarah Brofeldt
201444f02d php: Move test comment to the top 2017-11-12 13:07:22 +01:00
Sarah Brofeldt
58d07e2d6b php: Add nixos test to ensure php-pcre works in httpd 2017-11-12 08:05:27 +01:00
Sarah Brofeldt
c7891595c9 php: Fix php pcre by using external lib 2017-11-11 17:02:07 +01:00
John Boehr
1cff740488
Apply changes recommended by @Mic92 2017-11-09 00:14:27 -08:00
John Boehr
24c6407883
Merge branch 'master' of https://github.com/NixOS/nixpkgs into php-mysqlnd-m 2017-11-07 14:01:39 -08:00
Christian Kjær
233a0b3f36
php: specify CXXFLAGS for macOS 
Fixes #31059
 2017-11-07 22:20:17 +01:00
John Boehr
41cd4f2459
php: add config.php.mysqlnd option 2017-11-06 14:23:27 -08:00
John Boehr
57f6b87229
php: fix ldap paths when header exists on host system 
Fixes #20491
 2017-11-03 16:58:01 -07:00
Franz Pletz
f41f5a8f77
php71: 7.1.9 -> 7.1.11 2017-10-30 17:56:59 +01:00
Franz Pletz
3975f267ab
php70: 7.0.24 -> 7.0.25 2017-10-30 17:56:59 +01:00
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 72b4009367257c2447aac89d5f34f2421bbc88dc)
 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