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
John Ericson
9f2e05662b
treewide: Manually fix miscategorized autoreconfHook
buildInputs
...
These are the ones with odd indentation my script will mess up on.
2017-09-21 15:49:53 -04:00
Frederik Rietdijk
96d15eaddb
python27: support test/support
...
In the maintenance release bump in
90059701a8
a certain change to /test/ was
backported from Python 3:
- bpo-30207: To simplify backports from Python 3, the test.test_support
module was converted into a package and renamed to test.support. The
test.script_helper module was moved into the test.support package.
Names test.test_support and test.script_helper are left as aliases to
test.support and test.support.script_helper.
2017-09-17 11:09:26 +02:00
Frederik Rietdijk
90059701a8
python27: 2.7.13 -> 2.7.14
...
The enosys patch is not needed anymore since the patch is included in
this maintenance release.
2017-09-17 09:57:55 +02:00
Frederik Rietdijk
03fa6965ad
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-16 12:34:32 +02:00
Tuomas Tynkkynen
a0a8f0ac87
python2: Use system libffi on Aarch64
...
libffi needs a patch to actually work on aarch64 (or the cffi Python package
fails its testsuite). Of course the bundled version of libffi has the
same bug, so don't use the buggy version on aarch64.
Python3 already uses the system libffi on all platforms. I don't know
why Python2 doesn't.
2017-09-16 01:16:08 +03:00
Michael Fellinger
2edb7e9b2d
ruby: 2.4.1 -> 2.4.2 ( #29417 )
2017-09-15 13:06:51 +01:00
John Ericson
e5567bae2d
treewide: Do not limit hardenging because gcc 4.9 in bootstrap
...
Bootstrap tools has since been bumped
2017-09-14 10:27:13 -04:00
Frederik Rietdijk
77baf6e818
python35: check LD_LIBRARY_PATH
...
Backports support for LD_LIBRARY_PATH from 3.6
2017-09-14 10:17:58 +02:00
Frederik Rietdijk
03898f2f23
python34: check LD_LIBRARY_PATH
...
Backports support for LD_LIBRARY_PATH from 3.6
2017-09-14 10:17:36 +02:00
geistesk
af2ceaf63c
racket: 6.10 -> 6.10.1
2017-09-13 23:16:18 +02:00
Frederik Rietdijk
febd5e323d
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-08 20:48:14 +02:00
Jörg Thalheim
9897303cd6
Merge pull request #29102 from peterhoeg/f/gems
...
rubygems: 2.6.10 -> 2.6.13
2017-09-08 16:17:12 +01:00
Frederik Rietdijk
c3a0c3c9f1
Revert "python.pkgs.buildPythonPackage: use distutils-cfg to block downloads, fixes #25428 "
...
This reverts commit b73e3bfafd
.
See https://github.com/NixOS/nixpkgs/issues/29103
2017-09-08 08:55:05 +02:00
Peter Hoeg
9f51b3c105
rubygems: 2.6.10 -> 2.6.13
...
Fixes a number of CVEs:
- a DNS request hijacking vulnerability. (CVE-2017-0902)
- an ANSI escape sequence vulnerability. (CVE-2017-0899)
- a DoS vulnerability in the query command. (CVE-2017-0900)
- a vulnerability in the gem installer that allowed a malicious gem to overwrite arbitrary files. (CVE-2017-0901)
2017-09-08 12:07:55 +08:00
Peter Hoeg
01a6878bb1
ruby: boy scout cleanups
2017-09-08 12:07:39 +08:00
Frederik Rietdijk
b73e3bfafd
python.pkgs.buildPythonPackage: use distutils-cfg to block downloads, fixes #25428
...
While we tell pip not to fetch (with the `--no-index` option),
`setuptools` can do so itself. In the past we used a `distutils.cfg`
with `allow-hosts = None` to prevent setuptools from fetching itself.
This was removed when we started building wheels in
2562f94de4e4fd2ddc677187fa2e2848L69.
The `dist-utils.cfg` code was still there, and adding it to
`buildInputs` is sufficient.
Tested with python.pkgs.passlib by removing the `checkInputs` / `nose`.
2017-09-07 19:22:06 +02:00
Eelco Dolstra
ec8d41f08c
Revert "Merge pull request #28557 from obsidiansystems/binutils-wrapper"
...
This reverts commit 0a944b345e
, reversing
changes made to 61733ed6cc
.
I dislike these massive stdenv changes with unclear motivation,
especially when they involve gratuitous mass renames like NIX_CC ->
NIX_BINUTILS. The previous such rename (NIX_GCC -> NIX_CC) caused
months of pain, so let's not do that again.
2017-09-07 12:51:21 +02:00
John Ericson
0a944b345e
Merge pull request #28557 from obsidiansystems/binutils-wrapper
...
Binutils-wrapper: Init by refactoring out of cc-wrapper
2017-09-03 10:37:27 -04:00
Vladimír Čunát
37242d98de
Merge branch 'master' into staging
2017-09-03 10:51:11 +02:00
Vladimír Čunát
53998f5036
treewide: purge explicit usage of gcc6
...
It's now the default. /cc #19456
This makes a real build simplification, because in our current
bootstrapping+aliases, `gcc6` attribute is not the default compiler
but a derivation *built by* the default compiler.
nix-exec didn't build before this commit already
2017-09-03 09:57:20 +02:00
Robin Gloster
fc8fc63b67
ruby_2_0_0: fix eval due to nested list
2017-09-02 13:08:09 +02:00
John Ericson
3f30cffa55
misc pkgs: Use $NIX_BINUTILS for when needed
...
Certain files are now only there instead of $NIX_CC (some are in both)
2017-09-01 11:44:55 -04:00
Frederik Rietdijk
6d4bd78fad
Merge commit '2858c41' into HEAD
2017-08-30 21:07:07 +02:00
Frederik Rietdijk
b2686dce25
Merge pull request #27636 from bendlas/update-pypy
...
pypy: 5.6 -> 5.8
2017-08-30 13:57:24 +02:00
Vladimír Čunát
2858c41823
Merge branch 'master' into staging
...
There were some conflicts in python modules, commented at #28314 .
2017-08-29 10:51:54 +02:00
Maximilian Güntner
94351197cd
cpython: include test.support and test.regrtest
...
test.{support, regrtest} are the internal packages cpython
developers use to write tests.
Although they are not public and the API may change/break
some developers use these packages to write tests for their
(3rd party) software.
The derivations for cpython now only remove the actual tests
but leave the packages in place that are used to write them.
Discussion: https://github.com/NixOS/nixpkgs/pull/28540
2017-08-28 09:49:08 +02:00
Frederik Rietdijk
a7ddca6e3d
python 3.4, 3.5, 3.6: Don't use ldconfig and speed up uuid load, fixes #28349
...
These patches had already been merged for 3.5 and 3.6 but not yet for
3.4. However, they did contain a mistake as explained in #28349 .
2017-08-28 09:42:59 +02:00
Jörg Thalheim
5ae506e94a
racket: fix shared library build
2017-08-26 20:12:07 +01:00
geistesk
8dc06a2385
racket: 6.9 -> 6.10
2017-08-26 18:35:40 +02:00
Volth
ee51e73120
perl: 5.24.1 -> 5.24.2 and 5.22.3 -> 5.22.4
...
Scavenged by vcunat from #28353 .
2017-08-26 12:35:33 +02:00
Peter Simons
194a779df4
hugs: fix build by un-defining the erroneous default for $STRIP
2017-08-23 19:53:11 +02:00