Frederik Rietdijk
1d3bff25db
Merge staging-next into staging
2018-11-11 14:28:08 +01:00
Jörg Thalheim
2f97911566
Merge pull request #49817 from alyssais/rack_cve
...
rack: 1.6.* -> 1.6.11, 2.0.* -> 2.0.6 (CVE-2018-16470, CVE-2018-16471)
2018-11-09 19:30:43 +00:00
Jörg Thalheim
d45590b839
metasploit-framework: fix build
...
> /nix/store/r2vsi140pys7jnzyk0qz1fj9aji6sq40-ruby2.5.3-rb-readline-0.5.5/lib/ruby/gems/2.5.0/gems/rb-readline-0.5.5/lib/rbreadline.rb:1097:in `<module:RbReadline>': HOME environment variable (or HOMEDRIVE and HOMEPATH) must be set and point to a directory (RuntimeError)
2018-11-09 18:03:18 +00:00
Marwan Aljubeh
8bfe8c45a7
gem-config: add iconv ( #49910 )
2018-11-08 17:46:29 +01:00
Patrick Hilhorst
b0e9fc131c
treewide: Fix packages using name where they should use pname
2018-11-06 00:06:17 +01:00
Alyssa Ross
c0ad5bc839
gem-config: capybara-webkit: qt48 -> qt59
...
> WARNING: The next major version of capybara-webkit will require at
> least version 5.0 of Qt. You're using version 4.8.7.
I went to 5.9 instead of 5.11 because 5.11 doesn't currently build on
Darwin, whereas 5.9 can build on both Darwin and Linux, and is still
well within the >=5.0 requirement.
2018-10-23 16:14:21 +01:00
Maximilian Güntner
5b1e005bb6
gem-config: set libmagic for magic
2018-10-23 17:11:17 +02:00
Alyssa Ross
da3529718d
gem-config: add sassc ( #48212 )
2018-10-11 21:04:29 +02:00
Orivej Desh
65663f883c
msgpack: rename from libmsgpack
...
The project does not use the name "libmsgpack". It variously uses "msgpack" and
"msgpack-c", and "msgpackc" for the name of the library.
2018-08-18 23:19:54 +00:00
Jörg Thalheim
8c044897dc
Merge pull request #44098 from alyssais/capybara-webkit
...
gem-config: fix capybara-webkit on Darwin
2018-08-16 15:31:37 +02:00
Alyssa Ross
3116e6e6b9
gem-config: add curses ( #45068 )
2018-08-15 14:32:50 +01:00
Alyssa Ross
1f47fe8442
gem-config: add libxml2-ruby ( #44099 )
2018-07-26 18:51:17 +01:00
Alyssa Ross
cfbe0ef315
gem-config: add zookeeper ( #44100 )
2018-07-26 18:50:42 +01:00
Alyssa Ross
14e5e8a15a
gem-config: fix capybara-webkit on Darwin
2018-07-25 17:28:24 +01:00
Judson Lester
b97b0300f6
Adding config for the tiny_tds gem ( #42406 )
2018-06-27 11:56:18 +01:00
Michael Fellinger
8ba598fe56
gem-config: add fog-dnsimple, redis-rack, ffi-rzmq-core, mini_magick ( #42055 )
2018-06-15 12:27:31 +01:00
WilliButz
dc433b476e
oxidized: init at 0.21.0
2018-05-24 04:40:45 +02:00
Robin Gloster
7673593c85
gem-config.grpc: disable format hardening
2018-04-26 00:15:24 +02:00
makefu
848a5aded6
gem-config: include do_sqlite3
2018-04-21 12:36:06 +01:00
volth
7ec0471242
treewide: s/xlibs/xorg/g ( #36889 )
2018-03-13 10:16:03 +00:00
Robin Gloster
83ee88e70f
rugged: fix build
2018-03-10 12:59:53 +01:00
Robin Gloster
a0cb8cfd81
rubygems.grpc: fix with gcc7
2018-03-01 11:48:22 +01:00
Michael Fellinger
1313542b6b
Support darwin
2018-02-20 11:29:07 +01:00
Michael Fellinger
895b1cb1b0
gem-config: add ethon
...
The Ethon gem uses libcurl.so at runtime via FFI, so we need to specify the correct location.
2018-02-19 22:56:17 +01:00
Aneesh Agrawal
36f1bcbeb8
ruby treewide: don't merge source into top-level
...
Keep the `source` attrset distinct to prevent its entries from merging
with the top level attrs.
Since each type of source has a different set of entries for `source`,
this is the easiest way to keep them together.
This will pave the way for a new `url` type of source.
This is a mass-rebuild of many ruby packages,
notably those using `git` type sources.
2018-01-04 02:28:33 -05:00
Vladimír Čunát
6bbec17d44
Merge #32626 : atk: clean up
2017-12-29 10:01:00 +01:00
Robin Gloster
ee1c85aee9
mariadb: lib -> connector-c
2017-12-29 02:18:35 +01:00
Jan Tojnar
21b09d7961
ruby-modules gio2: re-add gobjectIntrospection dependency
...
Previously, it was accidentaly propagated by atk.
2017-12-22 23:31:54 +01:00
midchildan
87202cf4dc
mikutter: 3.5.7 -> 3.5.13
2017-11-01 15:43:32 +09:00
John Ericson
f037625f87
Merge remote-tracking branch 'upstream/staging' into deps-reorg
2017-09-28 12:32:57 -04: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
Robin Gloster
e253ae7d3a
rubyGems.pg: fix postgresql path
2017-09-27 17:26:03 +02: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
Nick Novitski
5ddfcc774c
gemconfig: add curb
2017-09-20 23:53:25 -07:00
John Ericson
5aec3f96a2
treewide: Use *Platform.extensions
2017-09-13 11:16:10 -04:00
Franz Pletz
2f48144d0e
gitlab: 9.4.5 -> 9.5.2
2017-09-03 15:50:52 +02:00
Robin Gloster
0156db2da5
Merge remote-tracking branch 'upstream/master' into HEAD
2017-09-02 23:29:04 +02:00
Lancelot SIX
e34ce9d1c5
gnupg: 2.1.22 -> 2.1.23
...
This release in a RC for gnupg-2.2. The main difference as far as
nixpkgs is concerned is that the binary `gpg2` is now called `gpg` and
`gpgv2` is called `gpgv`.
This update fixed all explicit use of `gpg2` and `gpgv2` across nixpkgs,
but there might be some packaged software that internally use `gpg2`
not handeled by this commit.
See http://lists.gnu.org/archive/html/info-gnu/2017-08/msg00001.html
for full release information
2017-08-11 19:24:06 +02:00
roblabla
8975d153a0
gitlab: 9.3.4 -> 9.4.3
2017-08-06 16:30:49 +02:00
roblabla
0c7c421baa
gitlab: 8.17.6 -> 9.3.4
2017-07-06 13:29:49 +02:00
midchildan
2c393164c8
mikutter: init at 3.5.7
...
fixes #25852
2017-05-21 12:13:34 +01:00
Jörg Thalheim
f410236ed8
Merge branch 'master' into feature/fix_rainbox_gem_deps
2017-05-20 17:26:24 +01:00
Jörg Thalheim
ae9e73125f
gem-config: add rb-readline
2017-05-14 22:29:51 +01:00
Jörg Thalheim
c441ae6feb
gem-config: add pcaprub
2017-05-14 22:29:46 +01:00
Pooyan Khosravi
bc780285c0
ruby-modules gem-config: add rainbow
...
Rainbow needs rake (a make analogue) as build dep. This builds an specific
version of rake for building rainbow.
Since rake is private to rainbow there shouldn't be any problems until rainbow
devs decide they need another rake version which is unlikely.
2017-05-12 17:23:18 -04:00
Michael Raskin
4540123a0c
Merge pull request #23471 from veprbl/jekyll
...
jekyll: 3.0.1 -> 3.4.1
2017-04-30 20:41:20 +02:00
Maximilian Güntner
d84029f296
ruby-modules: check tzinfo version
...
tzinfo 0.3.xx does not contain the file
lib/tzinfo/zoneinfo_data_source.rb
it is only included in the 1.x branch.
closes #24080
closes #24682
2017-04-11 10:44:54 +02:00
Jörg Thalheim
b10fb4624b
xapian-ruby: link against correct xapian
2017-03-06 20:24:07 +01:00
Dmitry Kalinkin
212340bc6b
jekyll: set proper permissions on new site
...
Fixes #22858
2017-03-03 23:05:37 -05:00