Commit Graph

487 Commits

Author SHA1 Message Date
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Mario Rodas
d73cc1e586 ruby: fix build on darwin
cc-tools 949.0.1 added a warning on linking which ruby misinterprets as
an error with LDFLAGS.
2020-10-22 04:20:00 +00:00
Jonathan del Strother
f0431e22c1 rubygems: 3.1.2 -> 3.1.3 2020-10-20 21:10:43 +02:00
Mario Rodas
6bfc199531 ruby: add marsam to maintainers 2020-10-06 09:45:39 +02:00
Mario Rodas
17e3f3258f ruby_2_7: 2.7.1 -> 2.7.2
https://www.ruby-lang.org/en/news/2020/10/02/ruby-2-7-2-released/
2020-10-06 09:45:39 +02:00
Mario Rodas
35d7c8ac6f ruby: update RVM patchsets 2020-10-06 09:45:39 +02:00
Izorkin
4b93708b31 ruby: fix soname tag 2020-05-08 09:36:01 +03:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Mario Rodas
3ab49aac64 ruby: remove ruby_2_4 patchset 2020-04-01 12:22:14 +00:00
Mario Rodas
a7f1e9f1ef ruby_2_7: 2.7.0 -> 2.7.1
Changelog: https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-7-1-released/
2020-04-01 12:22:14 +00:00
Mario Rodas
b312ecf34e ruby_2_6: 2.6.5 -> 2.6.6
Changelog: https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-6-6-released/
2020-04-01 12:22:14 +00:00
Mario Rodas
99b09d6b8f ruby_2_5: 2.5.7 -> 2.5.8
Changelog: https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-5-8-released/
2020-04-01 12:22:14 +00:00
Mario Rodas
dd24a2f2a0 ruby: update RVM patchsets 2020-04-01 12:22:14 +00: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
163618988f
ruby: remove references to CC by default
This makes RbConfig["CC"] return an invalid path, but I hope nothing
is depending on that anyway...
2020-01-09 15:54:59 +00:00
Robin Gloster
9126911ba5
ruby: installFlags is a list 2019-12-31 00:50:40 +01:00
Alyssa Ross
a08e5665fa rubygems: fix for Ruby with no openssl
This fixes the rubyMinimal package.
2019-12-30 16:11:23 +01:00
Mario Rodas
76200c4284 ruby_2_7: init at 2.7.0
Release notes: https://www.ruby-lang.org/en/news/2019/12/25/ruby-2-7-0-released/
2019-12-25 14:24:03 +00:00
Mario Rodas
298010982b ruby: rubygems 3.0.6 -> 3.1.2
Changelog: https://blog.rubygems.org/2019/12/20/3.1.2-released.html
2019-12-25 14:24:03 +00:00
Profpatsch
7d4c1ae7f1 rubyMinimal: ruby with all options disabled by default
Similar to `gitMinimal` or `pythonMinimal`, this is useful for scripts
which don’t use anything but the standard library and want a small
footprint.
2019-12-25 13:59:42 +01:00
Profpatsch
80c07f8aaf ruby: add removeReferenceToCC package option
Reduces the runtime closure by ~200MB if enabled.
2019-12-25 13:59:42 +01:00
Izorkin
7d0fcb8acc ruby: build with soname tag 2019-11-24 12:55:23 +03:00
Mario Rodas
5ed9d8b8aa ruby_2_4: 2.4.7 -> 2.4.9
Changelog:
- https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-4-8-released/
- https://www.ruby-lang.org/en/news/2019/10/02/ruby-2-4-9-released/
2019-10-02 10:38:32 +00:00
Mario Rodas
5e76e7b430 ruby_2_5: 2.5.6 -> 2.5.7
Changelog: https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-5-7-released/
2019-10-02 10:38:32 +00:00
Mario Rodas
4ee22f3a9c ruby_2_5: 2.6.4 -> 2.6.5
Changelog: https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-6-5-released/
2019-10-02 10:38:32 +00:00
Mario Rodas
befd5c954b ruby: remove ruby_2_3 patchset
d3983caf45 removed ruby_2_3 from nixpkgs
2019-10-02 10:38:32 +00:00
Alyssa Ross
ca96b55d3a ruby_2_6: patch use-after-free
See https://bugs.ruby-lang.org/issues/16136.

This patch is on Ruby trunk, but hasn't been backported (yet?).
2019-09-07 14:32:56 +00:00
Alyssa Ross
d3983caf45 ruby_2_3: remove
This has been EOL since December. We shouldn't still be facilitating
its use.

Fixes https://github.com/NixOS/nixpkgs/pull/67977.
2019-09-07 13:09:17 +00:00
Vladimír Čunát
4aad2947f8
Merge branch 'master' into staging-next 2019-09-04 11:00:56 +02:00
Michael Fellinger
1f49035aca ruby.withPackages: init
Co-authored-by: Alyssa Ross <hi@alyssa.is>
2019-09-03 19:44:49 +00:00
Mario Rodas
3a601cac5b ruby: update RVM patchsets 2019-09-03 15:33:51 +00:00
Mario Rodas
bd51778554 ruby_2_6: 2.6.3 -> 2.6.4 2019-09-03 15:33:51 +00:00
Mario Rodas
8cb7bb03fd ruby_2_5: 2.5.5 -> 2.5.6 2019-09-03 15:33:51 +00:00
Mario Rodas
06205d8154 ruby_2_4: 2.4.5 -> 2.4.7 2019-09-03 15:33:51 +00:00
Milan Pässler
48ca6ed3f4
ruby: rubygems 3.0.3 -> 3.0.6 2019-08-31 11:48:04 +00:00
Alyssa Ross
01c4c15ef5 ruby: replace bundled RubyGems with our RubyGems
This should prevent problems caused by trying to install our own
RubyGems over the top of the one that comes with Ruby.
2019-08-31 11:33:03 +00:00
Alyssa Ross
5b0851028f ruby: --disable-rubygems for baseruby
This works just fine, and means we don't run into an issue with RubyGems
trying to install into a different Ruby's prefix when cross-compiling.
See https://github.com/NixOS/nixpkgs/pull/51842#issuecomment-478392799.
2019-08-31 11:33:03 +00:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Alyssa Ross
b34608d4ea
ruby: enable docSupport by default
Now that RI docs are installed to a seperate output, we don't need to worry
about bloating the main output, so it's reasonable for this to be enabled by
default.
2019-05-07 17:08:23 +00:00
Alyssa Ross
6ffb5079b2
ruby: install ri docs to devdoc output
This allows getting access to Ruby documentation through ri by doing

    nix-shell -p ruby ruby.devdoc

or by installing the ruby.devdoc package.

A setup hook will add a shim to LOAD_PATH to point ri to the devdoc
output instead of out.
2019-05-07 17:08:08 +00:00
Alyssa Ross
9b39be3376
ruby: disable docSupport for baseruby
Even if building a Ruby with documentation, there's no reason for its
baseruby to waste time building its own documentation as well.
2019-05-06 17:44:56 +00:00
Alyssa Ross
0ffedefb15
ruby: rubygems 2.7.7 -> 3.0.3
I think it makes more sense to keep the patches in-tree than on
zimbatm's RubyGems fork.
2019-04-29 12:37:22 +00:00
Alyssa Ross
bb4fef1499
ruby: use stdenv derivation for patching RubyGems
Rather than rolling our own. This means that we can use all of the
extra functionality stdenv gives us, like being able to provide a list
of patches rather than just one.
2019-04-29 12:37:19 +00:00
Alyssa Ross
9289a39a69 ruby_2_6: 2.6.2 -> 2.6.3 (#59783) 2019-04-18 12:09:48 +02:00
Mario Rodas
342773c78c
ruby_2_6: 2.6.1 -> 2.6.2 2019-03-16 12:41:28 -05:00