mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 15:11:35 +00:00
Code Issues Wiki Activity
148014 commits 249 branches 124 tags 7.1 GiB
Commit graph

156 commits

Author SHA1 Message Date
Alyssa Ross 011c6411f3
bundler: 1.16.2 -> 1.16.3 2018-08-03 15:59:38 +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
Jörg Thalheim 218298b30f
Merge branch 'master' into unused5 2018-07-21 15:41:22 +01:00
volth cd6e2c9642 undo: try for zero rebuild on ofborg 2018-07-21 02:48:05 +00:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth dda95bae35 [bot] treewide: remove unused 'args@' in lambdas 2018-07-20 19:54:05 +00:00
volth 87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
worldofpeace 45be130608 solargraph: 0.22.0 -> 0.23.3 2018-07-09 05:12:57 -04:00
Alyssa Ross 925fe68e87
bundler: 1.16.1 -> 1.16.2 2018-07-02 11:19:11 +00: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
worldofpeace 7468501411 solargraph: 0.21.1 -> 0.22.0 (#41743) 2018-06-09 12:52:40 +01:00
Tuomas Tynkkynen 2760b24462 Merge remote-tracking branch 'upstream/master' into staging 2018-05-26 19:01:18 +03:00
worldofpeace 59c09a52f2 solargraph: init at 0.21.1 (#41089) 2018-05-26 16:30:17 +01:00
Jan Malakhovski ad35019501 Merge branch 'master' into staging 
Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master
 2018-05-26 00:20:17 +00:00
WilliButz dc433b476e
oxidized: init at 0.21.0 2018-05-24 04:40:45 +02:00
Matthew Justin Bauer eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Benjamin Smith c56c0ac945 bundler: 1.14.6 -> 1.16.1 2018-04-27 10:54:55 +01: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
Raitis Veinbahs a6a2e75804 ruby-modules: Import gemset if it's a path OR a string. (#38959) 
This fixes the bug introduced by 8686b98612 which broke bundlerEnv
exprs when gemdir was a string (thus making gemset a string by
`gemset = gemdir + "/gemset.nix"`) which made it being treated as a
set.
 2018-04-15 11:53:15 +01:00
Joe Hermaszewski 69017e46ae ruby bundlerApp: Allow passing gemConfig through to bundlerEnv 2018-04-09 18:51:34 +08:00
volth 7ec0471242 treewide: s/xlibs/xorg/g (#36889) 2018-03-13 10:16:03 +00:00
Jörg Thalheim 97fff8d806 Revert "bundler: 1.14.6 -> 1.16.1" 
This reverts commit 0aa95d73bd.

revert because of gitlab
 2018-03-12 18:50:20 +00:00
Jörg Thalheim c3ccaedee0
Merge pull request #36409 from Mic92/bundler 
bundler: 1.14.6 -> 1.16.1
 2018-03-12 18:02:07 +00:00
Robin Gloster 83ee88e70f
rugged: fix build 2018-03-10 12:59:53 +01:00
Jörg Thalheim 0aa95d73bd bundler: 1.14.6 -> 1.16.1 2018-03-07 08:26:56 +00:00
Aneesh Agrawal fced35fa44 buildRubyGem: Make testing easier 
Don't default `doCheck` to false,
and use the default set of phases
so the phases list does not need to be overriden
in order to add checkPhase or installCheckPhase.
 2018-03-03 23:31:00 -08: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 0750c5aee4 ruby-modules: Add new url source type 
This just defers to `fetchurl` for fetching.

Additionally, update the `nix-bundle-install.rb` script to handle gems
installed from a path, i.e. those with a `url` source.
Some parts of that script have been disabled in the `path` case
that likely shouldn't be, but cause errors and aren't necessary to get
`vagrant` to work.
 2018-01-04 07:54:30 -08: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
Aneesh Agrawal 8686b98612 ruby-modules: Allow overriding gemset 
This allows patching the gemset output by bundix from a default.nix
file, making it easier to perform updates since the bundix update no
longer has to be manually updated.
 2018-01-04 02:28:33 -05:00
Aneesh Agrawal aa9fc7ee25 bundler-env: Remove unused args 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
Michael Fellinger d36a83a784 bundlerEnv: support unicode executables (#31145) 2017-11-03 11:31:16 +00: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