Commit graph

413 commits

Author SHA1 Message Date
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