JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
274,161 Commits 2 Branches 0 Tags 12 GiB
d39fafe409
Commit Graph

326 Commits

Author SHA1 Message Date
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
69dcb1a2c0 bundlerApp: take buildInputs (#45435) 
It would be reasonable to have a Ruby program that depends on some other
program being in the PATH. In this case, the obvious thing to do would
be something like this:

    bundlerApp {
      # ...
      buildInputs = [ makeWrapper ];
      postBuild = ''
        wrapProgram "$out/bin/foo" \
          --prefix PATH : ${lib.makeBinPath [ dep ]}
      '';
    }

However, this doesn't work, because even though it just forwards most of
its arguments to `runCommand`, `bundlerApp` won't take a `buildInputs`
parameter. It doesn't even specify its own `buildInputs`, which means
that the `scripts` parameter to `bundlerApp` (which depends on
`makeWrapper`) is completely broken, and, as far as I can tell, has been
since its inception. I've added a `makeWrapper` build input if the
scripts parameter is present to fix this.

I've added a `buildInputs` option to `bundlerApp`. It's also passed
through to bundled-common because `postBuild` scripts are run there as
well. This actually means that in this example we'd end up going through
two layers of wrappers (one from `bundlerApp` and one from
bundled-common), but that has always been the case and isn't likely to
break anything. That oddity does suggest that it might be prudent to
not forward `postBuild` to bundled-common (or to at least use a
different option) though...

FWIW, as far as I can tell no package in nixpkgs uses either the
`scripts` or `postBuild` options to `bundlerApp`.
 2018-10-29 22:39:51 +01:00
Michael Fellinger
34e1fa4a50 buildRubyGem: Provide manpages for Ruby gems (#49334) 2018-10-29 01:48:05 +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
7026831c7a
bundler: 1.16.3 -> 1.16.6 2018-10-17 16:20:03 +01:00
Alyssa Ross
da3529718d gem-config: add sassc (#48212) 2018-10-11 21:04:29 +02:00
worldofpeace
f368e55ba1 solargraph: 0.28.1 -> 0.28.2 (#47944) 2018-10-06 15:34:37 +02:00
worldofpeace
843d056bc5 solargraph: 0.27.1 -> 0.28.1 (#47242) 2018-09-23 22:31:54 +02:00
worldofpeace
4d3c3e258b solargraph: 0.25.1 -> 0.27.1 2018-09-16 04:56:35 -04:00
John Ericson
2c2f1e37d4 reewide: Purge all uses stdenv.system and top-level system 
It is deprecated and will be removed after 18.09.
 2018-08-30 17:20:32 -04:00
worldofpeace
cf54311d6f solargraph: 0.23.6 -> 0.25.1 2018-08-26 22:47:32 -04: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
worldofpeace
62d0b676dd solargraph: 0.23.3 -> 0.23.6 (#44480) 2018-08-05 16:23:31 +02:00
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
Alyssa Ross
14e5e8a15a
gem-config: fix capybara-webkit on Darwin 2018-07-25 17:28:24 +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
Robin Gloster
891a1662aa
bundler: 1.15.3 -> 1.14.6 
bundler 1.15 breaks gitlab
 2017-09-02 23:24:16 +02:00
Peter Hoeg
30c85e85ae bundler: 1.15.3 -> 1.15.4 2017-08-30 21:05:45 +08: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
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809) 
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
 2017-08-01 22:03:30 +02:00
Peter Hoeg
e9a70ccfe9 bundler: 1.15.1 -> 1.15.3 2017-07-30 16:57:59 +08:00
Robin Gloster
0154d1b03f
fix evaluation 
cc @nyarly
 2017-07-30 00:03:24 +02:00
Charles Strahan
2b57cb9169 Merge pull request #25980 from nyarly/bundlerenv_usecases 
BundlerEnv, now with groups and paths
 2017-07-28 23:22:21 -04:00
Alastair Pharo
68935892ab bundix: use same ruby as bundler 2017-07-19 16:13:09 +10:00
roblabla
0c7c421baa gitlab: 8.17.6 -> 9.3.4 2017-07-06 13:29:49 +02:00
Michael Fellinger
42b1fdaec5 bundix: 2.2.0 -> 2.3.1 2017-07-06 11:47:07 +02:00
Judson
0641253ae6
Small changes in response to review. 2017-07-02 17:18:58 -07:00
Judson
e149f02344
Using pname and fetching versions 2017-06-27 22:33:18 -07:00
Judson
70e7e543c5
A few cleanups and renames. One feature remains... 2017-06-27 10:56:36 -07:00
Robert
107d53f40c bundix: 2.2.0 -> 2.2.1 (#26894) 
This fixes `fetchurl-force.nix` not being installed, which breaks
bundix for some gems.

E.g.

```
$ nix-build --argstr url https://rubygems.org/gems/nio4r-2.1.0.gem /nix/store/y6959dxal86l3alc0ryf7752prbbkzxg-bundix-2.2.0/lib/ruby/gems/2.3.0/gems/bundix-2.2.0/lib/bundix/fetchurl-force.nix
error: getting status of ‘/nix/store/y6959dxal86l3alc0ryf7752prbbkzxg-bundix-2.2.0/lib/ruby/gems/2.3.0/gems/bundix-2.2.0/lib/bundix/fetchurl-force.nix’: No such file or directory
```
 2017-06-27 10:24:16 +01:00
Judson
603e84caef
Fixing an overload of "pname" 2017-06-25 17:40:22 -07:00
Peter Hoeg
b8297ff08a bundler: 1.15.0 -> 1.15.1 2017-06-21 15:29:05 +08:00
Judson
fc302bc07f
Not quite done - something fishy about the name attr 2017-06-10 17:38:49 -07:00
Judson
dd86c6d25a
Adding Corundum as demo of rubyTool 2017-06-10 17:11:37 -07:00
Judson
53481f8f0b
Docs and extras on tool/ 2017-06-10 16:58:32 -07:00
Jörg Thalheim
95f733e0aa
bundix: 2.1.0 -> 2.2.0 2017-06-09 22:37:36 +01:00
Judson
964d9b7a06
Made gemdir handling into a common function 2017-06-09 09:04:33 -07:00
Judson
0bde4071fc
Merge branch 'bundlerenv_usecases' of github.com:nyarly/nixpkgs into bundlerenv_usecases 2017-05-31 09:53:03 -07:00
Judson
c4fc70f53c
Starting to add tool builder. Extracting bundler file computation. 2017-05-31 09:44:46 -07:00
Peter Hoeg
0cbcb95e14 bundler: 1.14.6 -> 1.15.0 2017-05-31 23:26:10 +08:00
zimbatm
2b7cfdd6e9 fix missing variable in bundler-env 2017-05-29 13:27:41 +01:00
Judson
e4bb4d4788
Cleaning out obsolete files 2017-05-27 15:22:06 -07:00
Judson
998d011e42
Restructuring files 2017-05-27 15:19:34 -07: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
Judson
ae84d19e65
Final testing 2017-05-15 09:36:30 -07: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
Judson
c39508b254
Fixed platform test. 2017-05-12 09:47:00 -07:00
Judson
56d214b0ea
Fixed platform filtering. 2017-05-12 09:44:39 -07:00
Judson
07f781bd8d
Current round of tests pass, but filter function is failing to include when platform match in use. 2017-05-10 10:00:21 -07:00
Judson
0145ec999c
Current round of tests pass, but filter function is failing to include when groups match in use. 2017-05-09 09:39:20 -07:00
Judson
66fed6d28f
Basically working. Checking against actual use cases. 2017-05-03 20:27:42 -07:00
Judson
2b414e1c15
Test harnesses 2017-05-01 09:07:42 -07:00
Judson
b2065a2790
Merge remote-tracking branch 'nixos/master' into bundlerenv_usecases 2017-04-30 12:27:52 -07: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
Judson
89fda10d31
Starting decomposition of bundlerEnv 2017-04-24 18:45:00 -07:00
Nick Novitski
37b0be688d bundix: 2.0.8 -> 2.1.0 (#25129) 2017-04-23 13:13:50 +01: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
Judson
ed77e113c5
Merge remote-tracking branch 'nixos/master' 2017-04-09 15:36:03 -07:00
Judson
7f6e8a1cd5
Adding "allBins" flag on bundlerEnv 
The bin stubs need to be built where there's access to /nix/store - so
it can't happen in a nix-shell run. Ergo, a shell.nix needs to be able
to signal to the build that all bins need to be built.
 2017-03-26 17:32:30 -07:00
Andrzej Trzaska
376d960034 bundler: 1.14.4 -> 1.14.6 (#23930) 2017-03-15 20:34:35 +00: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
Dmitry Kalinkin
0832addf67
jekyll: fix 'jekyll new' 
Original error:

$ nix-shell -p jekyll --command "jekyll new test"
Running bundle install in /private/tmp/test...
  Bundler: There was an error while trying to write to
  Bundler:
`/nix/store/l67429rhvrmr7c4c1msb7s8zjq4fx7ad-gemfile-and-lockfile/.bundle/config`.
  Bundler: It is likely that you need to grant write permissions for
that path.
 2017-03-03 21:47:58 -05:00
Judson
0481a33d21
Simplifying interface on gemset.nix slightly. 
`usesGemspec` no longer required to trigger the "copy everything into
gemfile-and-lock" behavior. If the mainGem is referred to by path,
that's sufficient.
 2017-02-20 21:03:44 -08:00
Judson
3c9941114f
Need to handle "null" mainGems 
Not every gem package uses pname, nor should it.
 2017-02-19 10:51:35 -08:00
Judson
2b9c7b4268
Merge remote-tracking branch 'nixos/master' 2017-02-19 10:22:55 -08:00
Judson
c765f680e3
Updates to bundlerEnv 2017-02-19 10:18:54 -08:00
Peter Hoeg
facb2c0483 bundler: 1.14.3 -> 1.14.4 2017-02-17 22:48:39 +08:00
Peter Hoeg
d1b8b0dd52 bundler: 1.13.7 -> 1.14.3 (#22260) 2017-01-29 22:42:17 +00:00
Ryan Mulligan
605ec66342 bundler: 1.13.6 -> 1.13.7 2017-01-09 10:13:38 -08:00
Maximilian Güntner
4f57a25e62 gem-config: add lxc as a dependency for ruby-lxc 
Signed-off-by: Maximilian Güntner <code@klandest.in>
 2016-12-18 20:10:34 +01:00
Maximilian Güntner
dec91d3b19 gem-config: add postgresql buildInput for sequel_pg (#20981) 
Signed-off-by: Maximilian Güntner <code@klandest.in>
 2016-12-16 11:36:05 +01:00
Graham Christensen
5cc4f50442 Merge pull request #20113 from johbo/ruby-scrypt-darwin 
Adjust ruby gem defaults for scrypt on darwin
 2016-11-27 21:58:17 -05:00
Michael Fellinger
0755d4becb gem-config: add uuid4r (#20603) 2016-11-21 12:41:05 +00:00
Ryan Mulligan
936db422f9 add defaultConfig for mysql ruby gem 
The mysql gem needs the same libraries as the mysql2 gem.
 2016-11-03 17:19:25 -07:00
Johannes Bornhold
4f01beb531 Adjust ruby gem defaults for scrypt on darwin 
Without the adjustment I was not able to build scrypt. It was failing
because of missing symbols due to the parameter '-arch i386' being
appended to the clang calls.
 2016-11-03 01:29:03 +01:00
Venkateswara Rao Mandela
219b9d5086 ruby-zoom: init at 4.1.0 
From the website,

https://gitlab.com/mjwhitta/zoom

Zoom adds some convenience to ag/ack/grep by allowing you to quickly
open your search results in your editor of choice.

Also available as a ruby gem.

https://rubygems.org/gems/ruby-zoom

In addition to including the ruby-zoom tool, we also added a global
override for the ruby-terminfo gem to handle the ncurses build time
dependency.
 2016-10-26 17:26:26 +05:30
Peter Hoeg
cd11efb651 bundler: 1.13.1 -> 1.13.6 2016-10-24 23:17:23 +08:00
zimbatm
2a194746a5 bundlerEnv: refactor 
Add `pname` attribute: if passed, the derivation name defaults to the
gem name + version and only expose the gem's bin.

Add `gemdir` attribute: gives a default lookup path for the Gemfile,
Gemfile.lock and gemset.nix.

Set the `meta.platforms' to `ruby.meta.platforms' by default.
 2016-10-08 22:38:56 +01:00
zimbatm
b8bcbec5fd ruby: fixes rubygems user installs 
* Manage patches in git
* Fixes the hook invocation to be more safe. Thanks @Mic92
* Install gems as user by default
* Install gem binaries with the /usr/bin/env shebang
* Fixes a bug where the passthru.libPath and passthru.gemPath would
  point to the wrong directory
* Overhaul ruby version heuristics
 2016-10-02 22:07:22 +01:00
zimbatm
659803f8c5 Merge pull request #18920 from peterhoeg/bundler 
bundler: 1.12.5 -> 1.13.1
 2016-09-24 13:41:16 +01:00
Michael Fellinger
c0bb2549b4 gem-config: add snappy 2016-09-21 14:29:12 +02:00
Peter Hoeg
73e4f644d0 bundler: 1.12.5 -> 1.13.1 2016-09-20 15:55:19 +08:00
zimbatm
62df82efcf buildRubyGem: fixes gemspec UTF-8 loading issue 
If a gemspec has UTF-8 characters in it, ruby will fail loading it with

    invalid multibyte char (US-ASCII)

This change forces the encoding to be correct, we assume everyone now
uses UTF-8.
 2016-09-06 14:42:58 +01:00
Joachim F
01811fe2cd Merge pull request #16276 from manveru/gemconfig-rbnacl 
gemconfig: rbnacl needs libsodium
 2016-09-05 01:11:57 +02:00
Graham Christensen
add3d4d45b Revert "bundix: 2.2.0" 2016-09-02 16:00:45 -04:00
zimbatm
f1035132f3 Merge pull request #18099 from zimbatm/nokogiri-fixup 
Nokogiri fixup
 2016-09-01 10:43:22 +01:00
Michael Fellinger
f75e2c8583 bundix: 2.2.0 2016-08-31 11:52:06 +02:00
zimbatm
a7cf555e2a buildRubyGem: handle build-time ruby dependencies 
For some reason `gem install` unsets the GEM_PATH environment variable
internally unless the install dir is provided. This in turn means that
if it invokes extconf.rb and extconf.rb depends on a gem available on
the GEM_PATH (like pkg-config for nokogiri) then it's not available in
that context.

Proof: d8293c4729/lib/rubygems/commands/install_command.rb (L151)
Blame: 9ea600c9c2

This is a hack that sets the :install_dir to where we would install
anyways (the GEM_HOME is the default installation destination).
 2016-08-29 22:17:59 +01:00
zimbatm
6ae57b1b63 bundler: fix usage on nested call 
The combination of bundler 1.12.5 and rubygems 1.6.2 doesn't play well
at all when trying to run gems such as foreman where bundler is used to
run bundler.

Just upgrading to the latest bundler rc doesn't fix it and changing rubygems causes a massive rebuild.

Issues:

- https://github.com/bundler/bundler/issues/4402
- https://github.com/bundler/bundler/issues/4576
- https://github.com/bundler/bundler/issues/4602
- https://github.com/docker-library/ruby/issues/73

This PR patches bundler to work around the issue as highlighted here and
unbreaks everything for me:

https://github.com/bundler/bundler/issues/4602#issuecomment-233619696
 2016-08-29 17:03:12 +01:00
zimbatm
a1460473cb buildRubyGem: don't set the GEM_HOME 
bundler for example needs to have the GEM_HOME being passed trough to
function properly.

For gems that are loading content dynamically, or can use plugins, use
buildRubyGem.

For executables that are wrapped in their own sealed thing use
bundlerEnv.
 2016-08-23 09:30:49 +01:00
zimbatm
838781ce8a buildRubyGem: fix buildFlags default attribute 
lib.escapeShellArgs doesn't work well when a null value is provided.

[] is also the correct value since it's really just an empty list of
arguments that we have.
 2016-07-21 11:46:16 +01:00
zimbatm
b0f8416c5c Merge pull request #16180 from zimbatm/shell-escaping 
Escape all shell arguments uniformly
 2016-06-19 23:27:52 +01:00
Aristid Breitkreuz
def3ad3eeb Merge pull request #16170 from zimbatm/bundler-1.12.5 
bundler: 1.11.2 -> 1.12.5
 2016-06-18 17:02:05 +02:00
Michael Fellinger
c3df347f7b gemconfig: rbnacl needs libsodium 2016-06-16 19:33:12 +02:00
Michael Fellinger
e86e407ce9 gemconfig: typhoeus needs curl 2016-06-16 11:43:21 +02:00
zimbatm
28fa4a2f03 Escape all shell arguments uniformly 2016-06-12 18:11:37 +01:00
zimbatm
3086250ceb bundler: 1.11.2 -> 1.12.5 2016-06-12 13:35:15 +01:00
Graham Christensen
bb5faafbca gemconfig: rmagick requires which as of 2.15.4 2016-06-06 16:00:10 -05:00
Tuomas Tynkkynen
7fb29bfa73 treewide: Make explicit that 'dev' output of zlib is used 2016-05-19 10:04:38 +02:00
Lane Seppala
8e97c64ffc chefdk: fix build of hitimes on OS X 2016-05-04 16:41:44 -06:00
Eelco Dolstra
21a2f2ba3b nix: Add a "dev" output 
This gets rid of boehm-dev in the closure (as well as Nix's own
headers).
 2016-04-18 21:13:18 +02:00
Michael Fellinger
7d974e7eef
gem-config: fix bundler 2016-04-18 11:12:19 +02:00
Charles Strahan
99fd109a85 Merge pull request #14786 from manveru/gemset-groups 
bundlerEnv: filter gemset groups
 2016-04-18 02:02:57 -04:00
Michael Fellinger
090da825fe
bundlerEnv: filter gemset groups 2016-04-17 23:07:31 +02:00
Michael Fellinger
caadfd53e3
capybara-webkit: qt5Full -> qt48 2016-04-17 22:35:04 +02:00
zimbatm
12e919bb34 Merge pull request #14653 from manveru/bundler-env-frozen 
bundler-env: Gemfile.lock is frozen
 2016-04-14 10:20:04 +01:00
Michael Fellinger
fe87240e68 bundler-env: Gemfile.lock is frozen 2016-04-13 11:25:41 +02: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
Michael Fellinger
4873838f75 capybara-webkit: gem needs qt5Full 2016-03-21 12:01:37 +01:00
zimbatm
5a64bc44ea move all ruby modules to development/ruby-modules 2016-03-19 22:06:26 +00:00
zimbatm
3547ffa89f ruby: remove unused patches 2016-03-19 22:04:12 +00:00
zimbatm
eccad06e23 remove unsed ruby-sqlite3 package 2016-03-19 22:04:12 +00:00
Shea Levy
aed1cd3c17 Add patch to fix GET Bucket requests to fake-s3 
See https://github.com/jubos/fake-s3/pull/37

Signed-off-by: Shea Levy <shea@shealevy.com>
 2013-09-04 16:42:20 -04:00
Evgeny Egorochkin
ddd1f7b52b Get rid of old rake derivation that doesn't build 2013-09-02 23:51:03 +03:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Evgeny Egorochkin
93129530a9 Rake: Fix build. Patch by Ilya Cassina. 
svn path=/nixpkgs/trunk/; revision=24480
 2010-10-26 01:15:42 +00:00
Pjotr Prins
ad3d886489 Two Ruby modules 
svn path=/nixpkgs/trunk/; revision=12954
 2008-10-05 09:00:56 +00:00