Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
...
This reverts commit 41af38f372f0fec244ca
2019-09-21 20:05:09 +02:00
Vladimír Čunát
b6c6e1f9e8
Merge branch 'master' into staging-next
2019-09-15 13:18:54 +02:00
Lily Ballard
a5d5133e9c
jazzy: 0.10.0 -> 0.11.0 ( #68766 )
...
* gem-config: fix sassc on darwin
By default the sassc gem compiles with LTO, but LTO is currently broken
on darwin.
* jazzy: 0.10.0 -> 0.11.0
2019-09-14 10:17:05 +00:00
Michael Fellinger
13866ed4cf
gem-config: fix zookeeper for gcc-8 ( #68642 )
2019-09-13 14:01:13 +00:00
zimbatm
cef857e8b7
bundlerApp: avoid unecessary rebuilds when gemdir changes
...
Because the gemdir was referenced on the derivation, it would cause the
whole gemdir to get added to the store, which would in turn force the
derivation to be rebuilt whenever unrelated folder files would change.
2019-09-13 11:40:40 +00:00
Jan Tojnar
a441eaa7b1
Merge branch 'staging-next' into staging
2019-09-12 22:49:43 +02:00
Jan Tojnar
8ab501545d
sup: remove ( #68416 )
...
sup: remove
2019-09-10 19:43:18 +02:00
Michael Fellinger
da7886c940
sup: remove
2019-09-10 15:49:31 +02:00
Michael Fellinger
35f849ab44
gem-config: fix gpgme
2019-09-10 15:49:00 +02:00
Izorkin
329a88efa7
treewide: replace mysql.connector-c to libmysqlclient
2019-09-09 15:55:34 +03:00
volth
7b8fb5c06c
treewide: remove redundant quotes
2019-09-08 23:38:31 +00:00
Frederik Rietdijk
5f4734b1dd
Merge remote-tracking branch 'upstream/gcc-8' into staging-next
...
Earlier the gcc8 branch was merged instead of the gcc-8 branch (note the dash)...
2019-09-08 20:44:26 +02:00
Jan Tojnar
cdf426488b
Merge branch 'master' into staging-next
...
Fixed trivial conflicts caused by removing rec.
2019-09-06 03:20:09 +02:00
Michael Fellinger
683a7f0f34
bundix: 2.4.2 -> 2.5.0
2019-09-04 10:31:39 +00:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next
2019-09-04 11:00:56 +02:00
Franz Pletz
de85797565
Merge remote-tracking branch 'origin/master' into gcc-8
2019-09-03 22:15:07 +02:00
Michael Fellinger
1f49035aca
ruby.withPackages: init
...
Co-authored-by: Alyssa Ross <hi@alyssa.is>
2019-09-03 19:44:49 +00:00
volth
08f68313a4
treewide: remove redundant rec
2019-08-28 11:07:32 +00:00
Frederik Rietdijk
5061fe0c2c
Merge staging-next into staging
2019-08-28 08:26:42 +02:00
volth
35d68ef143
treewide: remove redundant quotes
2019-08-26 21:40:19 +00:00
Robin Gloster
55022869eb
rubygems.grpc: fix build with gcc8
2019-08-26 21:31:26 +02:00
worldofpeace
741163efdb
Merge pull request #65370 from Ma27/package-3llo
...
_3llo: init at 0.3.0
2019-08-25 15:42:13 -04:00
Robin Gloster
616b8343c4
Merge remote-tracking branch 'upstream/master' into gcc-8
2019-08-25 18:55:46 +02:00
Maximilian Bosch
ebc4a417d0
ruby/bundlerApp: ignore gemset in env attribute set
...
The `gemset` field can be an attribute set as well in `buildRubyGem`,
however attribute sets can't be coerced to strings for the environment
set.
The impact should be relatively small as the environment variables are
only used by the `runCommand` script for `bunlderApp` which doesn't
refer to `gemset` at all.
2019-08-19 13:46:52 +02:00
angristan
c4397b4318
solargraph: 0.35.1 -> 0.35.2
2019-08-08 13:16:05 +02:00
Frederik Rietdijk
6f723b9bad
Merge master into staging-next
2019-08-02 09:18:37 +02:00
angristan
27e3932097
solargraph: add angristan as maintainer
2019-08-01 20:11:31 +02:00
angristan
13758a68b0
solargraph: 0.34.2 -> 0.35.1
2019-08-01 13:40:01 +02:00
Nick Novitski
ec3f7e3e54
bundlerApp: meta.platforms defaults to platforms of ruby dependency ( #65697 )
2019-08-01 08:44:30 +00:00
worldofpeace
b1bc0645ea
gdk-pixbuf: rename from gdk_pixbuf
2019-07-22 18:50:57 -04:00
Nick Novitski
7136e0d0a6
bundlerUpdateScript: init and use ( #64822 )
2019-07-22 12:02:47 +00:00
zimbatm
a0f534865e
Merge pull request #64298 from michaelpj/imp/mathematical-epub3
...
asciidoctor: include the asciidoctor-epub3 gem
2019-07-04 20:34:06 +00:00
Michael Peyton Jones
5f0c43dea4
asciidoctor: move mathematical gem config to default gemset config
...
This has two benefits:
- Anyone else using the `mathematical` gem will benefit from the config.
- The gem config overrides the default one, so we were losing the fixes
for other gems.
I had to change how the update script works. Now it looks at the `gems`
passthru from `bundlerApp`.
2019-07-04 13:16:03 +01:00
Stanislas
a53358e8a9
solargraph: 0.32.1 -> 0.34.2 ( #64246 )
2019-07-03 20:38:42 +00:00
Franz Pletz
62c60f471c
gem-config: fix grpc build with gcc8
2019-06-17 07:06:08 +02:00
volth
f3282c8d1e
treewide: remove unused variables ( #63177 )
...
* treewide: remove unused variables
* making ofborg happy
2019-06-16 19:59:05 +00:00
Lily Ballard
39eb49c9f0
bundlerApp: Set up passthru properly
...
The manual documents both bundlerEnv and bundlerApp as providing `env`
and `wrappedRuby` attributes on the resulting derivations. However only
bundlerEnv actually had these attributes. Update bundlerApp to provide
the same passthru that bundlerEnv does.
2019-06-10 14:13:04 -07:00
Erik Arvstedt
1e0694f7c9
gem-config: add zlib
2019-05-08 17:46:03 +02:00
Erik Arvstedt
e3461b89fd
gem-config: fix formatting
2019-05-08 17:40:53 +02:00
Alyssa Ross
36d78305d3
Merge pull request #60502 from manveru/bundler-app-postbuild
...
bundlerApp: don't execute postBuild twice
2019-05-04 13:12:30 +00:00
Michael Fellinger
0552899ebd
gem-config: rugged needs which
2019-05-03 18:52:36 +02:00
Michael Fellinger
9a0596ee97
mikutter: 3.5.13 -> 3.8.7 ( #60808 )
2019-05-03 12:48:13 +02:00
Milan Pässler
bd81420cf5
gem-config: add idn-ruby, rpam2, cld3
2019-05-02 02:41:32 +02:00
Michael Fellinger
98e0f54b85
sup: use bundlerApp, cleanup ( #60515 )
2019-04-30 20:13:17 +02:00
Michael Fellinger
5e1e055817
bundlerApp: don't execute postBuild twice
2019-04-30 17:16:31 +02:00
angristan
11282ea623
solargraph: 0.29.1 -> 0.32.1
2019-04-29 23:56:52 +02:00
Alyssa Ross
27a22f0910
bundix: 2.4.1 -> 2.4.2
2019-04-17 17:28:11 +01:00
Alyssa Ross
69ec9bdf0d
Merge pull request #59252 from lilyball/cocoapods-beta
...
cocoapods-beta: init at 1.7.0.beta.3
2019-04-17 08:50:15 +00:00
Lily Ballard
8e9796cae2
Make gemdir optional for bundlerApp
...
Like `bundlerEnv`, the `gemdir` parameter to `bundlerApp` can be omitted
if all 3 of `gemfile`, `lockfile`, and `gemset` are provided.
2019-04-10 13:26:31 -07:00
Bas van Dijk
ad41c1f1c0
fluentd: 1.2.3 -> 1.4.2
2019-04-10 12:46:06 +02:00
Ryan Mulligan
488ecd6636
Merge pull request #58940 from erictapen/ruby-gem-src-fix
...
ruby-modules/gem: fix path to git checkout
2019-04-07 14:53:37 -07:00
Michael Fellinger
af44cf8bc5
gem-config: add opus-ruby ( #59084 )
2019-04-07 15:09:15 +02:00
Justin Humm
eb9293e4d8
ruby-modules/gem: fix path to git checkout
...
In case of the gem type 'git', nix-bundle-install.rb was called with
wrong path to the git checkout.
${src} does contain the sources, but not the newly generated .git dir,
which is created in the buildPhase of pkgs/development/ruby-modules/gem/default.nix
In some rare cases, this .git dir is needed at installPhase.
2019-04-03 16:59:53 +02:00
Judson Lester
704d02053b
(ruby-modules/gem): (refactor) ( #53525 )
...
* Changing leaveDotGit to git chacha on build
* Removing debugging cruft
* Simpler git handling
* Can't clobber index after `add`
* Update pkgs/development/ruby-modules/gem/default.nix
Useful comments
Co-Authored-By: nyarly <nyarly@users.noreply.github.com>
* Update pkgs/development/ruby-modules/gem/default.nix
Comments are useful
Co-Authored-By: nyarly <nyarly@users.noreply.github.com>
2019-03-29 14:36:04 +01:00
Lev Livnev
c08b7460da
gem-config: add native taglib dependency to taglib-ruby gem
2019-02-25 12:20:52 +00:00
Michael Fellinger
fa5459a2ce
defaultGemConfig.ovirt-engine-sdk: init
2019-02-06 23:51:56 +01:00
Sergei Maximov
58f6729e56
Use "${vips}" instead of "${vips.out}"
2019-01-31 18:42:05 +03:00
Sergei Maximov
5aaf8c0e15
gem-config: add ruby-vips
2019-01-31 10:21:55 +03:00
Alyssa Ross
eaf0b5e595
defaultGemConfig.tzinfo: fix for >=2.0 ( #54881 )
2019-01-29 20:30:56 +00:00
Alyssa Ross
b162eb92d3
defaultGemConfig.rbczmq: init
...
Fixes https://github.com/manveru/bundix/issues/42 .
2019-01-26 21:13:57 +00:00
Marica Odagaki
0b0958314a
gem-config: add semian
...
Note: on macOS, it works without this config. Testing on Ubuntu/Debian with the parent sha will produce an error about extconf.rb failing to find openssl/sha.h.
2019-01-25 20:18:33 -08:00
Sergei Maximov
05c8d5c88f
gem-config: add digest-sha3
...
`digest-sha3` is a C-extension gem which fails to build on Nix because
it uses non-literals as format strings which is forbidden by the default
Nix hardening settings. There is a pull request to fix that ([1]), but
the gem seems to be abandoned.
This PR disables the "format" hardening for `digest-sha3`.
[1]: https://github.com/phusion/digest-sha3-ruby/pull/8
2019-01-18 13:48:48 +03:00
Sergei Maximov
a3bff35450
gem-config: support rbnacl v6.0.0
...
With the v6.0.0 release of the `rbnacl` gem, it does not longer depends
on `rbnacl-libsodium` gem (which is now deprecated ([1])) to package the
`libsodium` library and should use the one provided by the distribution;
it raises an error if `rbnacl-libsodium` is detected ([2]).
Unfortunately, default gem config patches `rbnacl` unconditionally ([3]),
which means that newer versions of `rbnacl` fail at startup.
[1]: https://github.com/crypto-rb/rbnacl-libsodium/issues/29
[2]: c176fc0bd8/lib/rbnacl.rb (L4-L8)9fd099a6ae/pkgs/development/ruby-modules/gem-config/default.nix (L300-L306)
2019-01-18 11:04:54 +03:00
Jörg Thalheim
6bcfd5cfb3
Merge pull request #52569 from alyssais/qyliss-ruby
...
Make myself a Ruby maintainer
2018-12-20 18:42:31 +01:00
Alyssa Ross
dafdadda3a
Merge pull request #52440 from alyssais/bundler
...
bundler: 1.17.1 -> 1.17.2
2018-12-20 14:34:02 +00:00
Alyssa Ross
843b40ff6b
bundix: add qyliss (me) to maintainers
2018-12-20 14:31:13 +00:00
Jörg Thalheim
da093022a4
Merge pull request #52413 from mat8913/vagrant-libvirt
...
vagrant: build and install vagrant-libvirt plugin
2018-12-19 12:18:44 +01:00
WilliButz
9b2e8ddebe
oxidized: 0.21.0 -> 0.25.0, drop obsolete patch ( #52492 )
...
This removes the patch for support of Dell X-series because
oxidized now includes a model for these switches.
2018-12-19 00:24:51 +01:00
Alyssa Ross
8e98e48a43
bundler: 1.17.1 -> 1.17.2
2018-12-17 14:28:40 +00:00
Matthew Harm Bekkema
97200e970c
gem-config: add ruby-libvirt
...
Based on 1d9798c8591bbbed6e6b9ca5c1811ff507b88b9a and
90a804c50af327077e7a219a425e8536bb097e39
2018-12-17 10:22:34 +11:00
Alyssa Ross
26053cae74
bundlerEnv: always include default gems
...
"default" isn't really a group, it's more the absence of one. With
Bundler, this means that a gem should be installed unconditionally,
regardless of which groups are specified. It doesn't really make sense
to allow these gems to be omitted from a bundlerEnv.
2018-12-11 21:26:09 +00:00
Alyssa Ross
83a2d993d4
bundlerEnv: include all groups by default
...
This wasn't really an issue until the latest minor release of Bundix
(2.4), because prior to then Bundix didn't emit group attributes, and so
this functionality of bundlerEnv wasn't really used. However, it is now
apparent that a better default for bundlerEnv would be to include all
gem groups by default, not just the default group. This matches the
behavior of Bundler, and makes more sense, because the default group
alone isn't necessarily useful for anything -- consider a Rails app with
production, development, and test groups. It has the additional benefit
of being backwards compatible with how this would have worked before the
Bundix update.
2018-12-11 21:26:08 +00:00
Alyssa Ross
67b1265fb3
bundlerEnv: ensure dependencies always included
...
Suppose I have a Gemfile like this:
source "https://rubygems.org "
gem "actioncable"
gem "websocket-driver", group: :test
The gemset.nix generated by Bundix 2.4.1 will set ActionCable's groups
to [ "default" ], and websocket-driver's to [ "test" ]. This means that
the generated bundlerEnv wouldn't include websocket-driver unless the
test group was included, even though it's required by the default group.
This is arguably a bug in Bundix (websocket-driver's groups should
probably be [ "default" "test" ] or just [ "default" ]), but there's no
reason bundlerEnv should omit dependencies even given such an input --
it won't necessarily come from Bundix, and it would be good for
bundlerEnv to do the right thing.
To fix this, filterGemset is now a recursive function, that adds
dependencies of gems in the group to the filtered gemset until it
stabilises on the gems that match the required groups, and all of their
recursive dependencies.
2018-12-11 21:26:07 +00:00
Frederik Rietdijk
e0950ae9ad
Merge master into staging-next
2018-12-08 12:40:13 +01:00
zimbatm
4a8d0927e1
bundix: 2.4.0 -> 2.4.1 ( #51660 )
...
fixes #51656
2018-12-07 17:49:33 +01:00
Frederik Rietdijk
a510aa2672
Merge master into staging-next
2018-12-03 12:18:43 +01:00
Jan Tojnar
a51a99c690
gobject-introspection: rename package
...
camelCase package name was a huge inconsistency in GNOME package set.
2018-12-02 12:42:29 +01:00
worldofpeace
8776ceafc3
solargraph: 0.28.2 -> 0.29.1
2018-12-02 02:48:01 -05:00
midchildan
6fa5ea6e6b
gem-config: Add missing dependencies for gio and gtk2
2018-11-30 21:35:25 +01:00
Frederik Rietdijk
9db2421d1f
Merge master into staging-next
2018-11-29 08:12:56 +01:00
Nick Novitski
f2c07cd63e
xcpretty: init at 0.3.0 ( #48494 )
2018-11-28 12:21:37 +01:00
zimbatm
798a2a6c97
bundix: 2.3.1 -> 2.4.0 ( #51146 )
2018-11-27 23:36:30 +01:00
Vladimír Čunát
a5de78b7d7
Merge branch 'master' into staging-next
2018-11-26 10:28:00 +01:00
Judson Lester
2d5bd339da
Bugfix: gemsets didn't handle paths correctly ( #51002 )
2018-11-25 13:38:38 +01:00
Frederik Rietdijk
0d0d7dcd06
Merge staging-next into staging
2018-11-18 10:41:34 +01:00
Alyssa Ross
b4bdaa0f18
bundler: 1.16.4 -> 1.17.1
2018-11-15 17:41:20 +00:00
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
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
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
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 13c9cbacdd21998d597be253ae7d3a086c636eb72f23a83920032c50d45bb0280f598e
2017-09-27 21:58:44 +02:00
