Commit Graph

513 Commits

Author SHA1 Message Date
Martin Weinelt
cd7a519012
Merge branch 'master' into staging-next 2021-04-16 01:32:09 +02:00
ajs124
692e6c9cf5 Revert "Merge pull request #117702 from edude03/patch-4"
This reverts commit bc5c0c559f, reversing
changes made to 44dac5f5c6.
2021-04-15 20:39:02 +02:00
github-actions[bot]
dfd4f14303
Merge master into staging-next 2021-04-15 18:13:27 +00:00
Ryan Mulligan
bc5c0c559f
Merge pull request #117702 from edude03/patch-4
gems: Added mime info path for mimemagic
2021-04-15 11:01:57 -07:00
Vladimír Čunát
d2eb7a7887
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
Masanori Ogino
1e0f9d1f24
kramdown-rfc2629: 1.3.37 -> 1.4.1 and move to rubyPackages (#117283) 2021-04-13 15:01:56 +02:00
Luke Granger-Brown
08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
Sandro
5ab8127b91
Merge pull request #115582 from jdelStrother/bundler-override
bundlerEnv: Allow overriding bundler
2021-04-12 20:11:18 +02:00
Dmitry Kalinkin
219590673c
Merge branch 'staging-next' into staging
Conflicts:
	pkgs/development/python-modules/panel/default.nix
	pkgs/os-specific/linux/kernel/generic.nix
	pkgs/servers/home-assistant/default.nix
2021-04-08 22:42:26 -04:00
github-actions[bot]
85b57e4446
Merge master into staging-next 2021-04-08 18:14:17 +00:00
Jan Tojnar
625ce6c7f6 Merge branch 'staging-next' into staging
In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
2021-04-08 17:14:31 +02:00
github-actions[bot]
8d1d992273
Merge master into staging-next 2021-04-08 00:17:24 +00:00
talyz
9b30cda2f6 gitlab: 13.9.4 -> 13.10.2 2021-04-07 23:23:24 +02:00
Mario Rodas
e36ce4359f bundix: add marsam to maintainers 2021-04-07 04:20:00 +00:00
Jan Tojnar
70babe5bcf Merge branch 'staging-next' into staging 2021-04-06 16:25:41 +02:00
Jan Tojnar
c04a14edd6 Merge branch 'master' into staging-next 2021-04-06 16:01:14 +02:00
Thomas Bereknyei
a10183d3ec ruby: reproducible
Generated Makefile's were nested deeper than the existing rm would be
able to remove.
2021-04-05 23:14:12 -04:00
Sandro Jäckel
dcb501f993
kerberos: deprecate alias 2021-04-04 03:18:56 +02:00
github-actions[bot]
74200a7126
Merge master into staging-next 2021-04-03 00:14:57 +00:00
Sandro
11910695f6
Merge pull request #118296 from purcell/ruby-pg_query-2.0.2
defaultGemConfig.pg_query: 2.0.1 -> 2.0.2
2021-04-03 02:14:47 +02:00
github-actions[bot]
b3a0328b7f
Merge master into staging-next 2021-04-02 18:14:54 +00:00
Sandro
96f62260a9
Merge pull request #118131 from alyssais/ruby
ruby: remove myself as maintainer/CODEOWNER
2021-04-02 18:51:18 +02:00
github-actions[bot]
60739e07d2
Merge master into staging-next 2021-04-02 12:06:12 +00:00
Maximilian Bosch
6ddf9649ae
Merge pull request #118219 from SuperSandro2000/bundix
bundix: 2.5.0 -> 2.5.1
2021-04-02 11:54:55 +02:00
Steve Purcell
dde94e3d83 defaultGemConfig.pg_query: 2.0.1 -> 2.0.2
pg_query 2.0.2 apparently has working ARM support.

This change also re-locks sqlint to use the newer version, and
generalises the platform spec to avoid being unnecessarily
restrictive.

As before, other packages which refer to pg_query are unaffected,
because they pin an older version of pg_query which is handled
separately in the gem-config expressions.

Follow-up to #116785
2021-04-02 21:02:54 +13:00
github-actions[bot]
b719e2423f
Merge staging-next into staging 2021-04-02 06:05:30 +00:00
Steve Purcell
b092bdccfa sqlint: 0.1.10 -> 0.2.0
- Updates libpg_query to 2.0.0 in gem config, used by pg_query gem 2.0.1
- Continue to support older gem with older libpg_query, for gitlab
- Remove redundant gem config override in sqlint expression
- Add myself as a maintainer
2021-04-02 00:28:17 -04:00
Sandro Jäckel
eaba4b04af
bundix: 2.5.0 -> 2.5.1 2021-04-01 11:15:35 +02:00
James Kay
b81f7f91fa gem-config.mathematical: add lasem to rpath
Co-authored-by: Dylan Baker <dylan@pnwbakers.com>
2021-03-31 14:06:45 -07:00
Alyssa Ross
53f49682ee
ruby: remove myself as maintainer/CODEOWNER
It's been at least a year since I kept up to date with Ruby, and I
don't think I really have anything left to offer Nixpkgs in terms of
Ruby expertise.
2021-03-31 09:27:35 +00:00
Michael Francis
ae4fac9f4b
Use minimal git for fetching gems 2021-03-26 17:04:37 -04:00
Michael Francis
cba7c22f61
Update pkgs/development/ruby-modules/gem-config/default.nix
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-03-27 04:51:32 +08:00
Michael Francis
0c79724680
remove whitespace 2021-03-26 10:58:35 -04:00
Michael Francis
445aa4663f
Added mime info path for mimemagic 2021-03-26 10:56:07 -04:00
Jonathan del Strother
878bae1142
bundlerEnv: Allow overriding bundler
Prior to this it doesn't seem to be possible to customize the version of
bundler used in a bundlerEnv app. This change allows something like the
following:

```nix
let bundler = pkgs.buildRubyGem rec {
  gemName="bundler";
  name="bundler-2.2.11";
  version="2.2.11";
  source.sha256="1izx6wsjdm6mnbxazgz1z5qbhwrrisbq0np2nmx4ij6lrqjy18jf";
};
in pkgs.bundlerEnv.override { inherit bundler; } {
  name="test";
  gemdir=./.;
}
```

to use bundler 2.2.11 rather than the 2.1.5 default.
2021-03-10 10:44:14 +00:00
Mario Rodas
7121ef61da buildRubyGem: update CFLAGS for ruby 3.0 on Clang 2021-02-22 04:20:00 +00:00
Milan
bd4b22a87a
gitlab: 13.7.4 -> 13.8.4 (#112836) 2021-02-17 22:55:14 +01:00
Wael Nasreddine
2df97e4b0a
Merge pull request #111662 from nicknovitski/remove-ruby-2.5
Remove Ruby 2.5
2021-02-15 10:21:46 -08:00
Justin Humm
8d27886e08
defaultGemConfig.openssl: build with openssl 2021-02-12 15:36:38 +00:00
Nick Novitski
eda1eab733 ruby_2_5: remove 2021-02-03 12:10:32 -08:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
David Costa
bcc809ac85 bundlerEnv: ignore bundler configuration file
Change will make packaged ruby application ignore the user-wide bundle
configuration.

Fix #85989
2021-01-24 16:57:00 +01:00
zowoq
59b83c43e0 treewide: add final newline 2021-01-22 07:18:04 +10:00
zowoq
0ebfeaeca1 bundix: add final newline patch 2021-01-22 07:18:04 +10:00
github-actions[bot]
b7f20dcd02
Merge master into staging-next 2021-01-18 01:16:03 +00:00
Pavol Rusnak
cf2a67fef3
pkgs/development: stdenv.lib -> lib
this takes care of the following folders in pkgs/development:
* arduino
* chez-modules
* go-packages
* guile-modules
* idris-modules
* perl-modules
* r-modules
* ruby-modules
2021-01-17 19:11:59 +01:00
Jan Tojnar
2b9372b2ca
Merge branch 'master' into staging-next 2021-01-11 13:36:42 +01:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Shestakov, Aleksandr
671dd83a29 ruby-modules gem-config: add exif 2021-01-11 10:11:36 +03:00
Mario Rodas
7217c05c66
Merge pull request #108831 from marsam/update-solargraph
solargraph: 0.39.17 -> 0.40.1
2021-01-09 18:26:25 -05:00
Mario Rodas
2544a6754a solargraph: 0.39.17 -> 0.40.1 2021-01-09 06:32:51 +00:00
Mario Rodas
abe3a1867d defaultGemConfig: fix zlib flags in nokogiri 2021-01-09 06:32:51 +00:00
Sandro
9075da145a
Merge pull request #108641 from Mic92/ruby-packages 2021-01-07 12:23:26 +01:00
Jörg Thalheim
37f355f3e5 rubyPackages: remove problematic packages
Those packages block regenerating the lock file.
Bundler loops forever
2021-01-07 10:04:22 +00:00
Ben Siraphob
b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
Jörg Thalheim
355d593ac0
Merge pull request #89433 from fzakaria/rbenv
rbenv: init at 1.1.2
2020-12-03 07:19:03 +00:00
Farid Zakaria
4af8bc084a
buildRubyGem: fix to support bundler cmds (#104977)
The way in which Nixpks builds Ruby gems means that certain operations
by bundler *will not work*, namely `bundle install --redownload`.

According to the source the _cache/_ directory should have been kept,
however it seems through revisions to the file it has been purged.

Here was the comment from the original commit that introduced
buildRubyGem:
```
  # Note:
  #   We really do need to keep the $out/${ruby.gemPath}/cache.
  #   This is very important in order for many parts of RubyGems/Bundler to not blow up.
  #   See https://github.com/bundler/bundler/issues/3327
```

Why is the _cache_ directory needed?

Bundler and RubyGems uses the cache as a source of truth.
When bundler executes `bundler install --redownload`, any gems it
discovers in the _GEM_PATH_ it assums must have their _.gem_ file
present in the cache (unaware it was installed from Nix).

Rather than downloading the gem from RubyGems the bundler code forcibly
re-installs the gem from the cache directory instead and **fails** if it
does not exist.

I've opened https://github.com/rubygems/rubygems/issues/4088 to see if
this failure should be soft and not so explicit; or fallback to fetching
the gem from scratch.

Without this change the following is the error:
```bash
> [nix-shell:~/code/nix/playground/jruby-bundler-rake]$ bundle install --force
[DEPRECATED] The `--force` option has been renamed to `--redownload`
WARNING: An illegal reflective access operation has occurred
WARNING: Illegal reflective access by org.jruby.ext.openssl.SecurityHelper (file:/nix/store/fis6nzrpw9pmcivr84qh5byfgm07qn10-jruby-9.2.13.0/lib/ruby/stdlib/jopenssl.jar) to field java.security.MessageDigest.provider
WARNING: Please consider reporting this to the maintainers of org.jruby.ext.openssl.SecurityHelper
WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
WARNING: All illegal access operations will be denied in a future release
Fetching gem metadata from https://rubygems.org/.
Using bundler 2.1.4
Installing hello-world 1.2.0
Bundler::GemNotFound: Could not find hello-world-1.2.0.gem for installation
An error occurred while installing hello-world (1.2.0), and Bundler
cannot continue.
Make sure that `gem install hello-world -v '1.2.0' --source
'https://rubygems.org/'` succeeds before bundling.
```

Wth the fix the following no woccurs:
```bash
[nix-shell:~/code/nix/playground/jruby-bundler-rake]$ bundle install --redownload
WARNING: An illegal reflective access operation has occurred
WARNING: Illegal reflective access by org.jruby.ext.openssl.SecurityHelper (file:/nix/store/69wjlj4yirp48rv1q03zxgd4xvf0150d-jruby-9.2.13.0/lib/ruby/stdlib/jopenssl.jar) to field java.security.MessageDigest.provider
WARNING: Please consider reporting this to the maintainers of org.jruby.ext.openssl.SecurityHelper
WARNING: Use --illegal-access=warn to enable warnings of further illegal reflective access operations
WARNING: All illegal access operations will be denied in a future release
Fetching gem metadata from https://rubygems.org/.
Using bundler 2.1.4
Installing hello-world 1.2.0
Bundle complete! 1 Gemfile dependency, 2 gems now installed.
Use `bundle info [gemname]` to see where a bundled gem is installed.
```

```
[nix-shell:~/code/nix/playground/jruby-bundler-rake]$ ls -l /nix/store/cwl9n5073hqgpfhnw4wic13nrrgg9dn8-gem-env/lib/jruby/gems/2.5.0/cache/
total 8
lrwxrwxrwx 1 fmzakari primarygroup 102 Dec 31  1969 bundler-2.1.4.gem -> /nix/store/ifc8a0gsfkrhkv953rd4rz8bcspahi8y-bundler-2.1.4/lib/jruby/gems/2.5.0/cache/bundler-2.1.4.gem
lrwxrwxrwx 1 fmzakari primarygroup 110 Dec 31  1969 hello-world-1.2.0.gem -> /nix/store/xi9ln6n1mz2is5ppykjxqhhkpjq9zm6i-hello-world-1.2.0/lib/jruby/gems/2.5.0/cache/hello-world-1.2.0.gem
```

I have a minimal project that demonstrates this issue at https://github.com/fzakaria/jruby-bundler-nix-failure
2020-11-30 12:15:12 +01:00
Farid Zakaria
5d1f37f65d rbenv: init at 1.1.2
Add new derivation for rbenv -- a ruby environment manager.

Apply suggestions from code review

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2020-11-29 21:11:28 -08:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Milan Pässler
2429d5a307 gitlab: 13.5.1 -> 13.6.0
Changed ruby version to 2.7.x to match upstream.
Added a gem config for gitlab-pg_query as it tries to download a source
tarball during the build process.
Also removed a patch for gitaly that has become obsolete by upstream fix
[here](de04077c25).
2020-11-21 01:38:35 +01:00
zimbatm
c3357d2cd9
buildRubyGem: remove Makefiles
The generated Makefile is not reproducible. The HDRS section is inode
dependent. "sitearchdir" and "sitelibdir" contains a timestamp and
random postfix. See https://r13y.com/diff/8350ec80865096f84705f3e000d97f151760e768bf626e52c84570413c5e1093-f9dea788fe62d683e90e12e166f29b778c39c699a5be39f9262e5cffb77d3e45.html

Instead of trying to make it reproducible, remove it entirely. It was
only useful for generating the .so file and it no longer needed.

See also https://bugs.ruby-lang.org/issues/15304

Fixes the rubyPackages.nokogiry reproducibility for example.
2020-10-27 14:20:09 +01:00
Mario Rodas
08236e4148 solargraph: 0.39.8 -> 0.39.17 2020-10-09 04:20:00 +00:00
Lassulus
b4ad4325ac
Merge pull request #90258 from Shopify/epk/bump-solargraph
solargraph: 0.38.6 -> 0.39.8
2020-08-22 10:08:36 +02:00
Joe Hermaszewski
f6e07b3c5d defaultGemConfig.mathematical: fix cross compilation 2020-07-10 07:48:12 +02:00
Aditya Sharma
19c5353b73
solargraph: 0.38.6 -> 0.39.8 2020-06-13 16:51:26 -04:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Michael Fellinger
b285fa07d5
set GEM_HOME via Gem.paths 2020-04-06 15:31:18 +02:00
Michael Fellinger
f92600b406
update versions in Gemfile.lock 2020-04-06 15:02:13 +02:00
Michael Fellinger
a2e73b062a
bundler: 1.17.3 -> 2.1.4 2020-04-03 23:52:14 +02:00
Douglas Soares de Andrade
dc4a0da5ff solargraph: 0.38.0 -> 0.38.6 2020-03-27 13:12:16 -07:00
zimbatm
89a09456c7
Revert "defaultGemConfig: remove asciidoctor-diagram JARs" (#81737)
This reverts commit 1ac11cc1c1.

asciidoctor-diagram starts Java processes, so the JARs are necessary
on all platforms.

See https://github.com/NixOS/nixpkgs/pull/77149#issuecomment-594576339.
2020-03-04 18:04:36 +00:00
Jan Tojnar
9d0fac46fd
Merge pull request #81664 from jtojnar/vips-cleanup
vips: general clean-ups
2020-03-04 08:26:18 +01:00
Jan Tojnar
3aa9d99a0a
vips: split into multiple outputs 2020-03-04 01:32:41 +01:00
talyz
affcf9ba1e bundlerEnv: Add option to copy gem files instead of symlinking
The way ruby loads gems and keeps track of their paths seems to not
always work very well when the gems are accessed through
symlinks. Ruby will then complain that the same files are loaded
multiple times; it relies on the file's full path to determine whether
the file is loaded or not.

This adds an option to simply copy all gem files into the environment
instead, which gets rid of this issue, but may instead result in major
file duplication.
2020-03-03 21:19:01 +01:00
Michael Fellinger
84fa1d2fb3
rubyWithPackages.libv8: fix compilation 2020-02-18 22:29:38 +01:00
zimbatm
bcdc90a3a7 ruby_2_4: remove
According to https://endoflife.software/programming-languages/server-side-scripting/ruby
ruby 2.4 will go end-of-life in march, where the new release of nixpkgs
will be cut. We won't be able to support it for security updates.

Remove all references to ruby_2_4 and add ruby_2_7 instead where
missing.

Mark packages that depend on ruby 2.4 as broken:
* chefdk
* sonic-pi
2020-02-10 13:23:35 -05:00
Alyssa Ross
1ac11cc1c1
defaultGemConfig: remove asciidoctor-diagram JARs
(Except on JRuby, where these are presumably important.)
2020-01-09 15:55:02 +00:00
Alyssa Ross
fbe4716bd5
defaultGemConfig: reduce mathematical closure size
ext/ isn't needed once the extensions have been built, contains
references to a bunch of huge dependencies, and contains megabytes of
tests.
2020-01-09 15:55:00 +00:00
Alyssa Ross
ec8293fbfe
buildRubyGem: remove more bloat files 2020-01-09 15:54:57 +00:00
Alyssa Ross
11970ee1d6
buildRubyGem: strip by default
I'm not sure why this was disabled, but it looks like a pretty
harmless way to bring down closure size and remove references to
compilers and stuff.
2020-01-09 15:54:56 +00:00
Frederik Rietdijk
f08e3e38d4 Merge master into staging-next 2020-01-02 21:41:13 +01:00
zimbatm
a9341dbb33
ruby_2_7.withPackages: test 2020-01-01 00:25:35 +00:00
Frederik Rietdijk
6d059becd3 Merge gcc-9 into staging (#68029) 2019-12-30 16:38:38 +01:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Alyssa Ross
106d0920d9
bundlerEnv: fix for Ruby 2.7
Setting a Bundler version with GEM_PATH doesn't seem to work in Ruby
2.7, so we need to use the LOAD_PATH instead.  Without this,
bundlerEnv environments will always use the version of Bundler that
comes with Ruby, which won't necessarily work because it isn't the
version that was used to generate the bundle.

For example, building ronn with Ruby 2.7 without this change results
in a broken executable, but it works (when built with all packaged
Ruby versions) after this change.
2019-12-26 15:49:04 +00:00
Franz Pletz
77b6c3cd06
Merge remote-tracking branch 'origin/master' into gcc-9 2019-12-26 14:17:36 +01:00
Burke Libbey
62e680cdcf ruby-modules: parse build_flags correctly:
In building a gem whose native extension is a Rakefile, the previous
version of this code will call essentially `rake ""`, when it means to
call `rake`.

This change converts `""` into `[]` rather than `[""]`.
2019-12-17 00:58:32 +00:00
buckley310
c4aaab4053 defaultGemConfig: change 'infocmp' reference from 'ncurses.dev' to 'ncurses' (#75309) 2019-12-10 00:07:19 +00:00
Frederik Rietdijk
d14baf7747 Merge master into staging-next 2019-11-30 08:57:28 +01:00
Americo
114a83c2ef solargraph: 0.37.2 -> 0.38.0 (#74362) 2019-11-28 15:03:27 +00:00
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
Franz Pletz
abec42e8eb
rubyPackages.grpc: fix build with gcc9 2019-11-05 09:26:09 +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
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)
[3]: 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 1d9798c859 and
90a804c50a
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