Commit graph

272 commits

Author SHA1 Message Date
adisbladis
dcfc821c6c
treewide: Stop using Qt 5.9 2019-11-18 20:10:43 +00:00
Frederik Rietdijk
c4e30cf98c Merge staging-next into staging 2019-11-05 14:18:08 +01:00
John Ericson
acd2d19484
Merge pull request #72347 from NixOS/bash-no-undef-vars
treewide: `set -u` everywhere
2019-11-04 19:52:33 -05:00
Alyssa Ross
547b5b7a73 ruby.withPackages: preserve setup hooks (#72743)
This fixes

    nix-shell -p 'ruby.withPackages (const [])' ruby.devdoc

which otherwise wouldn't find documentation, unlike

    nix-shell -p ruby ruby.devdoc

which would, because ruby has setup hooks to accomodate for this, that
were being masked by the withPackages wrapper.
2019-11-03 22:09:44 +00:00
John Ericson
2811b032d6 treewide: Make still dont* Variables are optional in most cases
Go beyond the obvious setup hooks now, with a bit of sed, with a skipped case:

 - cc-wrapper's `dontlink`, because it already is handled.

Also, in nix files escaping was manually added.

EMP
2019-11-01 14:44:44 -04:00
WilliButz
01e0ef28df
rubyPackages: remove global v8 pinning
Removes global pinning of v8 to 3.16.14 and also removes the
unreferenced package 'therubyracer'.
2019-11-01 13:53:35 +01:00
Americo
58311d9fc9
solargraph: 0.35.2 -> 0.37.2 2019-10-27 17:16:29 -07:00
talyz
96a1dbac97
bundler: 1.17.2 -> 1.17.3
Extracted from https://github.com/NixOS/nixpkgs/pull/70216.
2019-10-02 12:35:10 +00:00
Vladimír Čunát
22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát
f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
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