Commit Graph

501 Commits

Author SHA1 Message Date
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
Mario Rodas
cadc359a0a
ruby_2_5: 2.5.3 -> 2.5.5 2019-03-16 12:40:51 -05:00
Mario Rodas
69d80d7d21
ruby: update RVM patchsets 2019-03-16 12:36:22 -05:00
Mario Rodas
de0373bbe2 ruby_2_6: add missing rvm patchset (#56461) 2019-03-04 12:00:11 +00:00
Alyssa Ross
b89c3b952a
ruby_2_6: 2.6.0 -> 2.6.1 2019-01-30 13:47:28 +00:00
Frederik Rietdijk
10afccf145 Merge staging-next into staging 2018-12-27 18:11:34 +01:00
Mario Rodas
7d141ec326
ruby_2_6: init at 2.6.0 2018-12-26 09:32:24 -05:00
Jörg Thalheim
10ba78757f ruby: fix cross-build (#51842)
Enable autoreconfHook by default: The build tried to execute autoconf, which was
in the wrong build input. Regenerating autotools configure files is always a good
idea since it delivers fixes.
Also move groff to the native since it is only used at build-time
2018-12-11 09:01:58 +01:00
Samuel Dionne-Riel
87407bc7e8 ruby: 2.5.2 -> 2.5.3
https://www.ruby-lang.org/en/news/2018/10/18/ruby-2-5-3-released/

This release is just for fixing the packaging issue. This release doesn’t
contain any additional bug fixes from 2.5.2.
2018-10-18 21:28:57 -04:00
Mario Rodas
ce0bec2baa ruby_2_5: 2.5.1 -> 2.5.2 2018-10-17 20:12:47 -05:00
Mario Rodas
ee9d62241c ruby_2_3: 2.3.7 -> 2.3.8 2018-10-17 20:12:47 -05:00
Mario Rodas
21b8427b0c ruby_2_4: 2.4.4 -> 2.4.5 2018-10-17 20:12:42 -05:00
Michael Fellinger
baefa983d3 ruby: default to version 2.5 2018-08-28 14:38:48 +02:00
Susan Potter
8ac25594e4 rubygems: use official HTTPS src location 2018-08-19 17:23:51 -04:00
Susan Potter
dda639bf86 rubygems: 2.7.6 -> 2.7.7 2018-08-19 17:23:51 -04:00
Frederik Rietdijk
099c13da1b Merge staging-next into master (#44009)
* substitute(): --subst-var was silently coercing to "" if the variable does not exist.

* libffi: simplify using `checkInputs`

* pythonPackges.hypothesis, pythonPackages.pytest: simpify dependency cycle fix

* utillinux: 2.32 -> 2.32.1

https://lkml.org/lkml/2018/7/16/532

* busybox: 1.29.0 -> 1.29.1

* bind: 9.12.1-P2 -> 9.12.2

https://ftp.isc.org/isc/bind9/9.12.2/RELEASE-NOTES-bind-9.12.2.html

* curl: 7.60.0 -> 7.61.0

* gvfs: make tests run, but disable

* ilmbase: disable tests on i686. Spooky!

* mdds: fix tests

* git: disable checks as tests are run in installcheck

* ruby: disable tests

* libcommuni: disable checks as tests are run in installcheck

* librdf: make tests run, but disable

* neon, neon_0_29: make tests run, but disable

* pciutils: 3.6.0 -> 3.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pciutils/versions.

* mesa: more include fixes

mostly from void-linux (thanks!)

* npth: 1.5 -> 1.6

minor bump

* boost167: Add lockfree next_prior patch

* stdenv: cleanup darwin bootstrapping

Also gets rid of the full python and some of it's dependencies in the
stdenv build closure.

* Revert "pciutils: use standardized equivalent for canonicalize_file_name"

This reverts commit f8db20fb3a.
Patching should no longer be needed with 3.6.1.

* binutils-wrapper: Try to avoid adding unnecessary -L flags

(cherry picked from commit f3758258b8895508475caf83e92bfb236a27ceb9)
Signed-off-by: Domen Kožar <domen@dev.si>

* libffi: don't check on darwin

libffi usages in stdenv broken darwin. We need to disable doCheck for that case.

* "rm $out/share/icons/hicolor/icon-theme.cache" -> hicolor-icon-theme setup-hook

* python.pkgs.pytest: setupHook to prevent creation of .pytest-cache folder, fixes #40273

When `py.test` was run with a folder as argument, it would not only
search for tests in that folder, but also create a .pytest-cache folder.
Not only is this state we don't want, but it was also causing
collisions.

* parity-ui: fix after merge

* python.pkgs.pytest-flake8: disable test, fix build

* Revert "meson: 0.46.1 -> 0.47.0"

With meson 0.47.0 (or 0.47.1, or git)
things are very wrong re:rpath handling
resulting in at best missing libs but
even corrupt binaries :(.

When we run patchelf it masks the problem
by removing obviously busted paths.
Which is probably why this wasn't noticed immediately.

Unfortunately the binary already
has a long series of paths scribbled
in a space intended for a much smaller string;
in my testing it was something like
lengths were 67 with 300+ written to it.

I think we've reported the relevant issues upstream,
but unfortunately it appears our patches
are what introduces the overwrite/corruption
(by no longer being correct in what they assume)

This doesn't look so bad to fix but it's
not something I can spend more time on
at the moment.

--

Interestingly the overwritten string data
(because it is scribbled past the bounds)
remains in the binary and is why we're suddenly
seeing unexpected references in various builds
-- notably this is is the reason we're
seeing the "extra-utils" breakage
that entirely crippled NixOS on master
(and probably on staging before?).

Fixes #43650.

This reverts commit 305ac4dade.

(cherry picked from commit 273d68eff8f7b6cd4ebed3718e5078a0f43cb55d)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-24 15:04:48 +01:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Daiderd Jordan
814938a7ce
ruby: fix darwin dependencies 2018-05-04 19:56:38 +02:00
Michael Fellinger
f99ded298f Ruby: 2.3.6 -> 2.3.7, 2.4.3 -> 2.4.4, 2.5.0 -> 2.5.1 2018-05-03 16:02:32 +02:00
Michael Fellinger
2682ba63bc update rubygems version (#35224) 2018-02-20 16:16:16 +00:00
Frederik Rietdijk
672bb6b4ab Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-14 21:30:08 +01:00
zimbatm
e8194c2c5b
ruby: remove unsupported versions (#34927)
* remove EOL ruby versions for security and maintenance reasons.
* only expose ruby_MAJOR_MINOR to the top-level. we don't provide
guarantees for the TINY version.
* mark all related packages as broken
* switch the default ruby version from 2.3.x to 2.4.x
2018-02-14 09:53:54 +00:00
Will Dietz
bd11ffd267 ruby: don't reference groff if not being used (not used by default)
Fixes cross build by removing false dependency.

If this is needed again, be careful about *which* "groff" is needed.
(which in terms of build vs host)
2018-02-13 14:11:17 -06:00
Ben Gamari
41026550e2 ruby: Enable cross-compilation 2018-02-13 09:44:29 -06:00
Michael Fellinger
e90412debb Ruby: 2.2.8 -> 2.2.9, 2.3.5 -> 2.3.6, 2.4.2 -> 2.4.3 2018-01-12 13:15:50 +01:00
Frederik Rietdijk
804285f589 Merge remote-tracking branch 'upstream/staging' into HEAD 2018-01-02 19:10:45 +01:00
Mario Rodas
59be35113d ruby_2_5: init at 2.5.0 (#33293) 2018-01-02 09:50:37 +00:00
John Ericson
046f091e0d treewide: Don't use envHook anymore
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
2017-12-30 22:04:22 -05:00
Jörg Thalheim
7a566fc06d Merge pull request #30202 from pbogdan/update-ruby
ruby_2_2: 2.2.7 -> 2.2.8
2017-10-07 21:12:35 +01:00
Piotr Bogdan
547fba5140 ruby_2_2: 2.2.7 -> 2.2.8
For multiple CVE's:

- CVE-2017-0898
- CVE-2017-10784
- CVE-2017-14033
- CVE-2017-14064

See https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-2-8-released/
2017-10-07 20:10:32 +01:00
Orivej Desh
fda26c8476 Merge branch 'master' into staging
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
2017-10-02 00:22:12 +00:00
Rickard Nilsson
85049c5aad ruby: 2.3.4 -> 2.3.5
Fixes CVE-2017-14033, CVE-2017-0898
2017-09-30 22:43:20 +02:00
John Ericson
9f2e05662b treewide: Manually fix miscategorized autoreconfHook buildInputs
These are the ones with odd indentation my script will mess up on.
2017-09-21 15:49:53 -04:00
Michael Fellinger
2edb7e9b2d ruby: 2.4.1 -> 2.4.2 (#29417) 2017-09-15 13:06:51 +01:00
Frederik Rietdijk
febd5e323d Merge remote-tracking branch 'upstream/master' into HEAD 2017-09-08 20:48:14 +02:00
Peter Hoeg
9f51b3c105 rubygems: 2.6.10 -> 2.6.13
Fixes a number of CVEs:

- a DNS request hijacking vulnerability. (CVE-2017-0902)
- an ANSI escape sequence vulnerability. (CVE-2017-0899)
- a DoS vulnerability in the query command. (CVE-2017-0900)
- a vulnerability in the gem installer that allowed a malicious gem to overwrite arbitrary files. (CVE-2017-0901)
2017-09-08 12:07:55 +08:00
Peter Hoeg
01a6878bb1 ruby: boy scout cleanups 2017-09-08 12:07:39 +08:00
Robin Gloster
fc8fc63b67
ruby_2_0_0: fix eval due to nested list 2017-09-02 13:08:09 +02:00
Volth
b935b21ffd fix regressions where "${repo}-${rev}-scr" pattern was hardcoded 2017-07-04 20:22:13 +00:00
Tim Steinbach
3535a6bf3c
ruby: 2.0.0-p647 -> 2.0.0-p648 2017-04-03 15:40:26 -04:00
Tim Steinbach
ec2c469230
ruby: 2.2.5 -> 2.2.7 2017-04-03 15:33:26 -04:00
Tim Steinbach
482566939e
ruby: 2.3.3 -> 2.3.4 2017-04-03 15:28:38 -04:00
Tim Steinbach
bc45ee50c4
ruby: 2.4.0 -> 2.4.1 2017-04-03 15:23:18 -04:00
Andrzej Trzaska
162845d5b1 Use gem 2.6.10 (#23902) 2017-03-15 14:55:45 +00:00
Rahul Gopinath
19180957f5 ruby_1_9: remove package
Remove ruby 1.9 since it is EOLed upstream
2017-01-30 11:18:44 +00:00
Rahul Gopinath
51dc13b148 ruby: cleanup unneeded files 2017-01-30 11:18:01 +00:00
Michael Fellinger
df5f88070e ruby: 2.4.0 (#21419) 2016-12-27 17:55:10 +00:00
Svend Sorensen
e942ed29b3 rubygems: 2.6.6 -> 2.6.8 (#21028) 2016-12-10 17:30:39 +00:00
Michael Fellinger
bff2b98290
ruby: 3.2.1 -> 2.3.3 2016-11-27 22:11:49 -05:00
Dan Peebles
d0bb7f0c53 ruby: remove unnecessary runtime dependency on groff 2016-10-31 22:16:26 +00: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
Rahul Gopinath
3b9b8726bd ruby: 2.1.7 -> 2.1.10 2016-09-06 21:14:00 -07:00
Rahul Gopinath
7163bab78f ruby: 2.2.3 -> 2.2.5 2016-09-06 21:13:59 -07:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
zimbatm
f1035132f3 Merge pull request #18099 from zimbatm/nokogiri-fixup
Nokogiri fixup
2016-09-01 10:43:22 +01:00
Tuomas Tynkkynen
43a5d30e00 ruby: Fix evaluation error
In the tarball job:

````
checking find-tarballs.nix
error: while evaluating anonymous function at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:6:1, called from undefined position:
while evaluating ‘operator’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:27:16, called from undefined position:
while evaluating ‘immediateDependenciesOf’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:39:29, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:27:44:
while evaluating anonymous function at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/attrsets.nix:224:10, called from undefined position:
while evaluating anonymous function at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:40:37, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/attrsets.nix:224:16:
while evaluating ‘derivationsIn’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:42:19, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:40:40:
while evaluating ‘optional’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/lists.nix:175:20, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:44:33:
while evaluating ‘canEval’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:48:13, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/maintainers/scripts/find-tarballs.nix:44:43:
while evaluating the attribute ‘pkgs’ of the derivation ‘ruby-dev-2.3.1-p0’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/pkgs/build-support/trivial-builders.nix:10:14:
while evaluating ‘override’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/customisation.nix:60:22, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/pkgs/development/interpreters/ruby/dev.nix:10:13:
while evaluating ‘makeOverridable’ at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/customisation.nix:54:24, called from /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/customisation.nix:60:31:
anonymous function at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix:1:1 called with unexpected argument ‘ruby’, at /tmp/nix-build-nixpkgs-tarball-16.09pre1234.abcdef.drv-0/nixpkgs/lib/customisation.nix:56:12
````
2016-08-31 21:13:12 +03:00
zimbatm
b046ebbb7c rubygems: 2.6.2 -> 2.6.6 2016-08-29 19:52:40 +01:00
Tuomas Tynkkynen
ba6d94e6a5 ruby: dev -> devEnv
Otherwise conflicts with the convention of `dev` output.
2016-08-29 14:49:52 +03:00
Franz Pletz
c22c137c6c ruby_2_0: disable format hardening 2016-08-02 18:01:21 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Brad Ediger
6e353bb17f ruby: update 2.3 series to 2.3.1 2016-05-02 15:49:05 -05:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00: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
06e4186f4e Merge pull request #14061 from zimbatm/bundler-env-fix
bundlerEnv: fix wrapping of programs
2016-03-19 22:03:12 +00:00
zimbatm
53c9edef34 bundlerEnv: fix wrapping of programs
Setting the GEM_PATH after ruby is started is not reliable enough. In
some cases rubygems would have already loaded and ignore these settings.

Fixes #14048
2016-03-19 20:25:34 +00:00
Charles Strahan
2802785675 Merge pull request #13975 from aespinosa/proper-script-gempaths
buildRubyGem: use Gem.use_paths to load gems
2016-03-19 16:15:50 -04:00
zimbatm
9c4b45fafe Merge pull request #13601 from zimbatm/ruby-dev
ruby.dev
2016-03-18 19:05:45 +00:00
Michael Fellinger
bb59ba117d bundix: 2.0.6 -> 2.0.8 2016-03-17 18:12:38 +01:00
Allan Espinosa
52b61dce47 buildRubyGem: use Gem.use_paths to load gems
After ruby initializes, rubygems no longer reads the GEM_PATH. Before,
we have the following scenario:

    Gem.path # => ["a"]
    ENV['GEM_PATH'] = ["b"]
    Gem.path # => ["a"] # Still returns the same

Gem.use_paths is the documented way to create isolated environments as
documented in [1].

[1] http://www.rubydoc.info/github/rubygems/rubygems/Gem.use_paths
2016-03-16 17:28:02 -05:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
zimbatm
d9cf99225b rubygems: 2.4.8 -> 2.6.2 2016-03-14 23:46:01 +00:00
zimbatm
19820e9a96 ruby: add a new .dev output to ruby derivations
The idea is to bundle ruby, bundler and bundix together. I was
having issues where bundler was installed with ruby 2.3.0 and I wanted to use
ruby 2.0.0.

With this change all the developer has to do is install `ruby_2_0_0.dev`
either in his environment or in a nix-shell.
2016-03-14 22:25:48 +00:00
zimbatm
4637cfa51f bundler: 1.10.6 -> 1.11.2 2016-03-14 22:25:19 +00:00
zimbatm
86f1579266 ruby: install rubygems directly into the derivation
Having a separate rubygems package can lead to split-brain scenarios.

Since rubygems is designed to replace himself on a ruby installation,
let's do that.
2016-03-14 22:23:25 +00:00
Michael Fellinger
075b3b449d bundix: 2.0.5 -> 2.0.6
Fixes issue caused by changed nix-prefetch-git output.
2016-03-13 13:59:38 +01:00
Franz Pletz
e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
zimbatm
7c4c151a94 ruby: only keep the latest tiny per major.minor
Tiny versions are just for bug-fixes and should be upgraded. I think that the
list has grown a bit too much organically and should be trimmed.
2016-03-04 14:24:37 +00:00
Robin Gloster
fed49425c5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-03 16:11:55 +00:00
Robin Gloster
5936d6dbbb Revert "rubygems: 2.4.8 -> 2.5.2"
This reverts commit 7e8faf022f.

This breaks the rake call in gitlab see
https://github.com/NixOS/nixpkgs/pull/13468#issuecomment-191286066
2016-03-02 15:25:35 +00:00
Robin Gloster
d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
zimbatm
7e8faf022f rubygems: 2.4.8 -> 2.5.2
Closes #11950
2016-02-26 18:02:24 +00:00
zimbatm
cdbaee7d4b Merge pull request #12866 from nathan7/rubygem-drvname-fix
buildRubyGem: ensure gem versions don't get misparsed
2016-02-23 23:13:12 +00:00
zimbatm
49217b724f Merge pull request #12786 from phunehehe/unused-bundler-head
remove unused file bundler-head.nix
2016-02-23 22:39:55 +00:00
Robin Gloster
bb2639aafc Merge branch 'curl-7.15-fixup' of https://github.com/zimbatm/nixpkgs into hardened-stdenv 2016-02-22 01:14:22 +00:00
Charles Strahan
123a9104e4 Merge pull request #13109 from zimbatm/ruby-fixes
Ruby fixes
2016-02-20 20:29:25 -05:00