John Boehr
4f3649be76
Merge branch 'master' of https://github.com/NixOS/nixpkgs into php-mysqlnd-m
2017-11-09 00:10:07 -08:00
aszlig
845aae9c10
clisp: Add patch to remove reference to cfree
...
Fixes the build failure after the upgrade to glibc 2.26 in
9bb67d5c1e
.
From the cfree(3) manpage:
This function should never be used. Use free(3) instead. Starting with
version 2.26, it has been removed from glibc.
From the glibc 2.26 release notes[1]:
* The obsolete function cfree has been removed. Applications should use
free instead.
[1]: https://sourceware.org/ml/libc-alpha/2017-08/msg00010.html
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @7c6f434c, @tohl
2017-11-08 15:52:25 +01:00
Orivej Desh
06408bd713
Merge pull request #31380 from djgoku/bump-erlang-to-20.1
...
erlang: 20.0 -> 20.1
2017-11-08 10:15:34 +00:00
Jonathan C. Otsuka
442e238234
erlang: 20.0 -> 20.1
2017-11-07 23:36:13 -06: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
Jan Tojnar
4d5a009b11
spidermonkey_52: init at 52.2.1gnome1
2017-11-05 17:02:29 +01:00
Michael Raskin
af7be86125
Merge pull request #31264 from kini/acl2-update
...
acl2: 6.5 -> 7.4; sbcl: remove 1.2.0 and 1.3.12
2017-11-04 23:17:30 +00:00
Graham Christensen
59c995ce06
Merge pull request #31259 from mimadrid/update/elixir-1.5.2
...
elixir: 1.5.1 -> 1.5.2
2017-11-04 16:58:40 -04:00
Keshav Kini
0094ca20cc
acl2: 6.5 -> 7.4, refactor
...
The `make regression` line was failing because the expression was
downloading a core-system-only, no-libraries source tarball. I
switched to using fetchFromGitHub, which downloads the full source
code -- the core system as well as the "community books",
i.e. libraries -- but the libraries unfortunately do not build yet
because they have more dependencies than the core system, and they
also run into some impurity problems during the build process.
This commit changes the ACL2 package so that at least the user will
obtain the latest version of the core system, even though they won't
get the community books. In a later commit I hope to fix this; it
will require either changes to ACL2 itself, or a patch to be applied
to ACL2 in nixpkgs.
ACL2 7.4 has no trouble building on the current version of SBCL in
nixpkgs, so I let it do so instead of using the ancient SBCL version
1.2.0 from 2014.
I also added myself as a maintainer to this package, since I'm an
active contributor to the ACL2 project and am interested in seeing it
working on Nix.
2017-11-04 13:48:22 -07:00
mimadrid
a6e12e5cf5
elixir: 1.5.1 -> 1.5.2
2017-11-04 20:30:27 +01:00
mimadrid
303ad53e7e
jruby: 9.1.12.0 -> 9.1.13.0
2017-11-04 15:36:17 +01:00
Orivej Desh
3ea077e638
Merge pull request #30942 from andrestylianos/joker
...
joker: init at 0.8.6
2017-11-04 07:09:56 +00:00
Orivej Desh
a167ea6875
joker: do not install private generators
2017-11-04 07:03:06 +00:00
André Stylianos Ramos
49e0be1d4d
joker: init at 0.8.6
2017-11-04 06:36:16 +01:00
John Boehr
57f6b87229
php: fix ldap paths when header exists on host system
...
Fixes #20491
2017-11-03 16:58:01 -07:00
Orivej Desh
78ed9da5e4
mkPythonDerivation: let name default to ${pname}-${version}
2017-11-03 04:15:36 +00:00
Orivej Desh
e1cd08e1c7
Merge pull request #31090 from flokli/cve-2016-4000
...
jython: 2.7.0 -> 2.7.1
2017-11-01 17:58:18 +00:00
Florian Klink
e0b906c5cb
jython: 2.7.0 -> 2.7.1
...
addresses CVE-2016-4000
2017-11-01 15:01:57 +01:00
Vladimír Čunát
447802a683
Merge branch 'master' into staging
2017-10-31 23:47:34 +01:00
geistesk
1b918d1ad2
racket: 6.10.1 -> 6.11
2017-10-31 02:09:33 +01:00
Vladimír Čunát
9319019c17
Merge #30965 : perl: security 5.24.2 -> 5.24.3
2017-10-30 22:30:47 +01:00
Vladimír Čunát
687943763c
Merge branch 'master' into staging
2017-10-30 22:30:14 +01: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
Tim Steinbach
d266a456ab
perl: 5.24.2 -> 5.24.3
2017-10-30 08:54:14 -04:00
Frederik Rietdijk
6d41ae55dd
Merge remote-tracking branch 'upstream/master' into HEAD
2017-10-30 07:51:09 +01:00
Evan Wallace
a3b1f77533
lua5_3: 5.3.0 -> 5.3.4
...
Updated to latest upstream version
2017-10-29 12:54:26 +00:00
Jon Banafato
f906d6d18e
python36: 3.6.2 -> 3.6.3
2017-10-22 18:24:56 +02:00
Daiderd Jordan
60a7a4db83
erlang: fix ssl on darwin
2017-10-14 12:36:15 +02:00
Jörg Thalheim
7a566fc06d
Merge pull request #30202 from pbogdan/update-ruby
...
ruby_2_2: 2.2.7 -> 2.2.8
2017-10-07 21:12:35 +01:00
Piotr Bogdan
547fba5140
ruby_2_2: 2.2.7 -> 2.2.8
...
For multiple CVE's:
- CVE-2017-0898
- CVE-2017-10784
- CVE-2017-14033
- CVE-2017-14064
See https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-2-8-released/
2017-10-07 20:10:32 +01:00
Orivej Desh
66d4941afe
Merge branch 'master' into staging
...
* master: (48 commits)
Mathematica: 11.0.1 -> 11.2.0
kbfs: 20170922.f76290 -> 20171004.40555d
packer: 1.0.3 -> 1.1.0
libxdg-basedir: 1.0.2 -> 1.2.0
fscrypt: 0.2.1 -> 0.2.2
devtodo: init at 0.1.20
keybase: 1.0.30 -> 1.0.33
elixir: Fix locale problem on NixOS
keybase-gui: 1.0.25 -> 1.0.33
terraform: 0.10.2 -> 0.10.7 (#30055 )
emby: 3.2.32.0 -> 3.2.33.0
sbcl: 1.3.21 -> 1.4.0
ardour: 5.11 -> 5.12
axoloti: fix evaluation
axoloti: init at 1.0.12-1
melpa-packages: Add new lean packages
fastlane: init at 2.60.1
nixos/traefik: guard example path
go-ethereum: 1.7.0 -> 1.7.1
xzgv: 0.9.1 -> 0.9.2
...
2017-10-05 07:41:39 +00:00
Gleb Peregud
558db539f5
elixir: Fix locale problem on NixOS
...
It looks like Erlang/OTP requires access to LOCALE_ARCHIVE for locales to correctly work. Elixir depends on this here:
7a556b8f26/lib/elixir/src/elixir.erl (L76)
Fixes #30047
2017-10-04 23:23:57 +02: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
Rickard Nilsson
85049c5aad
ruby: 2.3.4 -> 2.3.5
...
Fixes CVE-2017-14033, CVE-2017-0898
2017-09-30 22:43:20 +02:00
Tuomas Tynkkynen
fd97fa71dd
darwin: Disable some more packages that have never built
...
streamripper: https://hydra.nixos.org/build/61726659
racket: https://hydra.nixos.org/build/61750850
radare: https://hydra.nixos.org/build/61756146
stockfish: https://hydra.nixos.org/build/61726172
2017-09-30 22:32:27 +03:00
John Ericson
f037625f87
Merge remote-tracking branch 'upstream/staging' into deps-reorg
2017-09-28 12:32:57 -04: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
Tim Steinbach
da8fb81dfa
Merge pull request #29805 from yegortimoshenko/clojure/correct-license
...
clojure: correct license (three-clause BSD -> EPLv1.0)
2017-09-26 09:10:39 -04:00
Yegor Timoshenko
2f3af251be
clojure: correct license (three-clause BSD -> EPLv1.0)
...
This is retroactive. See: https://clojure.org/community/license
2017-09-26 12:38:26 +00:00
Stefan Siegl
2f23a83920
php: fix build wrt. new postgres.dev build output
...
Refs commit b0280f598e
2017-09-26 10:14:27 +02:00
Nikolay Amiantov
74c3cdd893
python.buildEnv: add extraOutputsToInstall attribute
2017-09-25 22:40:09 +03:00
John Ericson
ed14223f8c
treewide: Manual fix more pkg-config build-inputs
2017-09-21 15:49:54 -04:00
John Ericson
f8a18cd4cf
misc pkgs: Manual fixup pkgconfig nativeBuildInputs after sed
...
Importantly, this included regenerating pkgs/servers/x11/xorg, to
clobber the old sed.
2017-09-21 15:49:54 -04: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