1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Commit graph

381 commits

Author SHA1 Message Date
Nikolay Amiantov 9b980baa9d bundlerEnv.wrapper: rename to wrappedRuby 2016-01-24 15:59:31 +03:00
Rok Garbas dd9bad4aa4 rubygems: 2.4.1 -> 2.4.8, fixes #8492 2016-01-20 03:36:36 +01:00
Nikolay Amiantov 75358ad0e7 bundlerEnv: add wrapper 2016-01-10 07:26:37 +03:00
Charles Strahan b6c06e216b ruby: new bundler infrastructure
This improves our Bundler integration (i.e. `bundlerEnv`).

Before describing the implementation differences, I'd like to point a
breaking change: buildRubyGem now expects `gemName` and `version` as
arguments, rather than a `name` attribute in the form of
"<gem-name>-<version>".

Now for the differences in implementation.

The previous implementation installed all gems at once in a single
derivation. This was made possible by using a set of monkey-patches to
prevent Bundler from downloading gems impurely, and to help Bundler
find and activate all required gems prior to installation. This had
several downsides:

* The patches were really hard to understand, and required subtle
  interaction with the rest of the build environment.
* A single install failure would cause the entire derivation to fail.

The new implementation takes a different approach: we install gems into
separate derivations, and then present Bundler with a symlink forest
thereof. This has a couple benefits over the existing approach:

* Fewer patches are required, with less interplay with the rest of the
  build environment.
* Changes to one gem no longer cause a rebuild of the entire dependency
  graph.
* Builds take 20% less time (using gitlab as a reference).

It's unfortunate that we still have to muck with Bundler's internals,
though it's unavoidable with the way that Bundler is currently designed.
There are a number improvements that could be made in Bundler that would
simplify our packaging story:

* Bundler requires all installed gems reside within the same prefix
  (GEM_HOME), unlike RubyGems which allows for multiple prefixes to
  be specified through GEM_PATH. It would be ideal if Bundler allowed
  for packages to be installed and sourced from multiple prefixes.
* Bundler installs git sources very differently from how RubyGems
  installs gem packages, and, unlike RubyGems, it doesn't provide a
  public interface (CLI or programmatic) to guide the installation of a
  single gem. We are presented with the options of either
  reimplementing a considerable portion Bundler, or patch and use parts
  of its internals; I choose the latter. Ideally, there would be a way
  to install gems from git sources in a manner similar to how we drive
  `gem` to install gem packages.
* When a bundled program is executed (via `bundle exec` or a
  binstub that does `require 'bundler/setup'`), the setup process reads
  the Gemfile.lock, activates the dependencies, re-serializes the lock
  file it read earlier, and then attempts to overwrite the Gemfile.lock
  if the contents aren't bit-identical. I think the reasoning is that
  by merely running an application with a newer version of Bundler, you'll
  automatically keep the Gemfile.lock up-to-date with any changes in the
  format. Unfortunately, that doesn't play well with any form of
  packaging, because bundler will immediately cause the application to
  abort when it attempts to write to the read-only Gemfile.lock in the
  store. We work around this by normalizing the Gemfile.lock with the
  version of Bundler that we'll use at runtime before we copy it into
  the store. This feels fragile, but it's the best we can do without
  changes upstream, or resorting to more delicate hacks.

With all of the challenges in using Bundler, one might wonder why we
can't just cut Bundler out of the picture and use RubyGems. After all,
Nix provides most of the isolation that Bundler is used for anyway.

The problem, however, is that almost every Rails application calls
`Bundler::require` at startup (by way of the default project templates).
Because bundler will then, by default, `require` each gem listed in the
Gemfile, Rails applications are almost always written such that none of
the source files explicitly require their dependencies. That leaves us
with two options: support and use Bundler, or maintain massive patches
for every Rails application that we package.

Closes #8612
2015-12-29 09:30:21 -05:00
Robin Gloster d30904ea89 ruby: fix build with libressl2.3 2015-12-23 22:08:33 +00:00
Vladimír Čunát fdf3aa9923 buildRubyGem: use a saner default version to fix #11805
Previously the gems defaulted to "ruby" as the name and
"${ruby-version}-${gem-name}-${gem-version}" as the version,
which was just insane.

https://github.com/NixOS/nixpkgs/issues/9771#issuecomment-141041414
Noone is reacting so it's high time to take at least some action.
/cc @cstrahan.
2015-12-23 09:02:13 +01:00
aszlig 6945557dba
ruby: Fix SHA256 hashes of several versions.
According to @zimbatm, he got the SHA256 hashes via nix-prefetch-git.

However, fetchFromGitHub doesn't use Git to fetch the sources but uses
fetchzip under the hood, so we get plain source directories in the Nix
store, which in turn are hashed.

Tested by:

nix-build --no-out-link -E 'map (x:
    (builtins.getAttr x (import ./.  {})).src
) [ "ruby_1_9_3" "ruby_2_0_0" "ruby_2_1_0" "ruby_2_1_1" "ruby_2_1_2"
    "ruby_2_1_3" "ruby_2_1_6" "ruby_2_1_7" "ruby_2_2_0" "ruby_2_2_2"
    "ruby_2_2_3"
]'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-12-08 02:56:29 +01:00
zimbatm f399ab50d8 ruby: update railsexpress patchsets, fixes #11347 2015-12-07 15:37:55 +01:00
zimbatm 7c338ffb77 ruby_2_2: 2.2.2 -> 2.2.3 2015-12-07 15:37:33 +01:00
zimbatm d9f0568ccb ruby_2_1: 2.1.6 -> 2.1.7 2015-12-07 15:37:33 +01:00
zimbatm 9ebc399432 ruby_2_0: 2.0.0p645 -> 2.0.0p647 2015-12-07 15:37:33 +01:00
Arseniy Seroka 0c05f14d53 Merge pull request #10535 from roblabla/feature-updateGitlab8.0.5
gitlab: 7.4.2 -> 8.0.5
2015-12-04 16:30:09 +03:00
roblabla b7a4231aa2 gitlab: 7.4.2 -> 8.0.5 2015-12-04 01:14:24 +01:00
zimbatm ad2a4ab24c ruby: remove insecure 1.8.7, fixes #11194
1.8.x is unsupported and is probably insecure.

This also simplifies things a little bit
2015-11-25 12:10:03 +01:00
William A. Kennington III 6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
Vladimír Čunát 4917a4f8b3 Merge master into staging 2015-10-23 01:57:14 +02:00
Allan Espinosa c20e79abb9 ruby: adjust the libPath 2015-10-17 22:28:22 +09:00
Eelco Dolstra 741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Jude Taylor 83a5cfb260 add darwin.libobjc to some ruby gems that need it 2015-10-01 13:30:30 -07:00
Jude Taylor 10054a676a update bundler-head SHA256 2015-10-01 08:58:28 -07:00
Jude Taylor 5379504451 Merge pull request #9834 from NixOS/rubies
Merge Ruby versions into one file
2015-10-01 08:58:28 -07:00
William A. Kennington III 0a7176c5a1 Revert "bundlerEnv: Use released versions of bundler"
This reverts commit 7bc8b1561e.

This breaks some ruby gems and needs to be reworked again.
2015-09-20 22:05:29 -07:00
William A. Kennington III 7bc8b1561e bundlerEnv: Use released versions of bundler
We were using HEAD for unreleased features. These features are now in
release builds so we should go back to using those. This also means we
won't have to deal with hash mismatches for all ruby packages.
2015-09-20 18:56:56 -07:00
William A. Kennington III 773b4deb7c Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
Mathnerd314 eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Pascal Wittmann f2e03fb4dc bundler: 1.10.5 -> 1.10.6 2015-09-13 21:25:58 +02:00
Vladimír Čunát 8f33b8cc93 mass rewrite of find parameters to cross-platform style
Fixes #9044, close #9667. Thanks to @taku0 for suggesting this solution.
Now we have no modes starting with `/` or `+`.

Rewrite the `-perm` parameters of find:
 - completely safe: rewrite `/0100` and `+100` to `-0100`,
 - slightly semantics-changing: rewrite `+111` to `-0100`.
I cross-verified the `find` manual pages for Linux, Darwin, FreeBSD.
2015-09-06 10:26:30 +02:00
William A. Kennington III c6f689f951 Merge branch 'master.upstream' into staging.upstream 2015-09-04 12:05:11 -07:00
Nikolay Amiantov c31a677482 Revert "bundler-HEAD: fix checksum"
This reverts commit 9cea5bcf2c.
See 9cea5bcf2c (commitcomment-13058505)
2015-09-04 01:14:50 +03:00
William A. Kennington III 86ebd3ee25 Merge branch 'master.upstream' into staging.upstream 2015-09-03 11:15:58 -07:00
Nikolay Amiantov 9cea5bcf2c bundler-HEAD: fix checksum
Related to #8567
2015-09-03 12:22:12 +03:00
Edward Tjörnhammar 28a18999fa ruby: use fetchFromSavannah to enable better availability for proxied users. 2015-08-28 07:45:49 +02:00
Jude Taylor 4e8279b43b darwin purity: ruby-2.1.6 2015-08-25 17:14:02 -07:00
Jude Taylor 65dd349574 update mysteriously varying git hashes 2015-08-21 12:00:35 -07:00
Vladimír Čunát 862900e42e mass-replace deprecated usage of find -perm (Fixes #9044)
sed 's|-perm +0|-perm /0|g'
It's a mass-rebuild due to usage in stdenv's default setup hooks.
2015-07-30 10:30:17 +02:00
Jude Taylor 78e6b78bc6 fix source hashes for cabal2nix and bundler 2015-07-28 12:24:14 -07:00
William A. Kennington III 333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Jude Taylor 7393c6c69d modernize rubies 2015-07-10 10:28:27 -07:00
William A. Kennington III dae5b35463 ruby: Fixup libv8 versions 2015-07-08 15:10:50 -07:00
William A. Kennington III f92c174cce ruby: Correct version string 2015-07-08 14:24:42 -07:00
William A. Kennington III 7cda24c01e Merge branch 'master.upstream' into staging.upstream 2015-07-08 14:11:16 -07:00
Charles Strahan 357324df26 ruby: add 2.2.2, bump patch levels
* Adds Ruby 2.2.2
* 1.9.3-p547 -> 1.9.3-p551
* 2.0.0-p481 -> 2.0.0-p645
2015-07-07 17:45:33 -04:00
Charles Strahan 4ea88cc526 ruby: fix version 2.2.0 2015-07-07 17:43:49 -04:00
William A. Kennington III ae28ff8b91 Merge branch 'master.upstream' into staging.upstream 2015-07-06 17:15:11 -07:00
William A. Kennington III 8f17099d6a bundler: 1.9.2 -> 1.10.5 2015-07-06 16:42:16 -07:00
William A. Kennington III 0f21f3e00b bundler-head: Correct hash 2015-07-06 16:42:16 -07:00
William A. Kennington III d5cd6eebcd ruby: Add 2.1.6 2015-07-06 16:42:16 -07:00
William A. Kennington III 84ef883ac2 rvm-patchsets: Update 2015-07-06 16:42:16 -07:00
Jude Taylor e130e9d3a3 fix bundler hash 2015-06-26 09:54:49 -07:00
Jude Taylor 80c62d1325 darwin purity: ruby-1.9.3 2015-06-25 16:36:04 -07:00
Arseniy Seroka daf4ec39a5 fix: add missing versions 2015-06-04 23:34:14 +03:00
Tobias Geerinckx-Rice 158e1cfdd0 Don't use "with licenses;" for single licences
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Tobias Geerinckx-Rice b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Pascal Wittmann 6c2fc83a85 bundler: bin/bundler expects ruby in PATH 2015-05-27 17:11:33 +02:00
Pascal Wittmann 150ae25546 bundler: do not add a ruby name prefix
Otherwise bundler replaces ruby:

% nix-env -iA nixpkgs.ruby
installing ‘ruby-1.9.3-p547’
% nix-env -iA nixpkgs.bundler
replacing old ‘ruby-1.9.3-p547’
installing ‘ruby-1.9.3-p547-bundler-1.9.2’
2015-05-27 14:48:44 +02:00
Spencer Whitt a634c11075 ruby_1_8_7: Fix on Darwin 2015-05-15 11:58:19 -04:00
Dan Peebles 5454be28aa I suppose this is the 'better' way to fix bundler for now. Ugh 2015-05-07 01:14:14 -04:00
Dan Peebles 35ddd2543a Revert "Fix bundler HEAD"
This reverts commit 00c4c52277.
2015-05-07 01:10:46 -04:00
Dan Peebles 00c4c52277 Fix bundler HEAD 2015-05-07 00:11:00 -04:00
Charles Strahan 09602f7f39 ruby: fix gems that use mysql 2015-04-27 22:00:52 -04:00
Charles Strahan 7fc3b002e6 bundlerEnv: better error handling
properly handle the case where a gemspec is missing
2015-04-15 19:24:30 -04:00
Charles Strahan be3d3dd298 bundlerEnv: fix charlock_holmes config 2015-04-15 19:24:04 -04:00
Charles Strahan bb7c9f71e1 bundix: 1.0.2 -> 1.0.3 2015-04-15 19:07:09 -04:00
Nikolay Amiantov 250a39dc79 bundler: update 2015-04-05 16:04:54 +03:00
William A. Kennington III 43d114c74b bundler-head: Fix hash 2015-04-03 23:18:23 -07:00
William A. Kennington III a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Eelco Dolstra 0e2257966f Disable packages that depend on <nixpkgs>
Nothing in Nixpkgs should use <nixpkgs>, because it can cause Nixpkgs
evaluation to depend in part on a different version of Nixpkgs,
leading to unpredictable results (including evaluation errors).
2015-03-27 16:17:48 +01:00
Jaka Hudoklin 17b9405685 bundlerEnv: add support for additional build inputs 2015-03-18 14:15:50 +01:00
Charles Strahan b4d4b88988 Merge pull request #6147 from abbradar/bundlerenv-env
bundler-env: add .env
2015-03-02 18:28:02 -05:00
Charles Strahan f87a7fd241 bundix: update 2015-02-27 14:28:34 -05:00
Nikolay Amiantov aa878ffe94 bundler: fix hash 2015-02-18 19:06:30 +03:00
Dan Peebles a68484a0ac Minor fix for broken ruby evaluation and libiconv 2015-02-17 21:39:29 -05:00
Eric Seidel e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Nikolay Amiantov 35f1d4459b bundix: fix checksum 2015-02-04 19:44:19 +03:00
Nikolay Amiantov 0deb3fce70 bundler-env: add .env 2015-02-04 19:42:40 +03:00
Charles Strahan 6eaa419920 gitlab: fix evaluation 2015-01-25 16:28:18 -05:00
Charles Strahan 989a894fc8 ruby: patch path in tzdata gem 2015-01-25 16:22:30 -05:00
Charles Strahan c1814073ac bundlerEnv: use full path to ruby in wrappers 2015-01-24 17:35:11 -05:00
Charles Strahan ad026dab98 ruby: don't reference baseruby 2015-01-23 21:22:34 -05:00
Charles Strahan 00f93c494b ruby: fixup 2.2's passthru 2015-01-22 01:00:00 -05:00
Charles Strahan 98bfaf52f7 ruby: use commit to identify libv8 patch 2015-01-22 00:47:08 -05:00
Charles Strahan 8d49e87dec Merge pull request #4677 from cstrahan/pleasant-ruby
Pleasant ruby
2015-01-21 23:27:38 -05:00
Charles Strahan 034488ec80 ruby: fixup mpdcron 2015-01-21 22:38:29 -05:00
Charles Strahan 8085f088cb ruby: exorcise the last few remaining rubyPackages 2015-01-21 22:23:37 -05:00
Charles Strahan 65c7c61841 ruby: use patch for libv8 2015-01-21 20:37:05 -05:00
Charles Strahan 317d78d145 consule: use new bundlerEnv 2015-01-21 20:33:19 -05:00
Charles Strahan f52c32fcfc ruby: rewrite sup package 2015-01-21 18:23:35 -05:00
Charles Strahan 115c299ea0 ruby: enable curses support by default 2015-01-21 15:22:21 -05:00
Charles Strahan 5f1622e95f ruby: allow for passing build arguments 2015-01-20 23:33:57 -05:00
Charles Strahan 7d8b2f0d60 ruby: make buildInputs work 2015-01-20 22:20:28 -05:00
Charles Strahan dfc225d143 Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts:
	pkgs/applications/version-management/git-and-tools/default.nix
	pkgs/applications/version-management/git-and-tools/hub/default.nix
	pkgs/tools/audio/mpdcron/default.nix
2015-01-20 20:21:03 -05:00
Charles Strahan bd53746646 ruby: patching gems works 2015-01-20 19:09:02 -05:00
Charles Strahan 221509b0a6 ruby: refactoring, and package bundix 2015-01-20 01:07:55 -05:00
Charles Strahan bf16d03075 ruby: support for proper bundler installs 2015-01-19 20:02:47 -05:00
Charles Strahan 673fccf505 ruby: new bundler approach 2015-01-18 18:47:28 -05:00
Charles Strahan 9ad38ec322 ruby: allow for overriding the src 2015-01-15 20:58:05 -05:00
Charles Strahan 1a1e6cfc04 ruby: various fixes 2015-01-14 21:19:53 -05:00
Charles Strahan aaa2e9705a ruby: cache gem files 2015-01-14 04:20:50 -05:00
Charles Strahan 32bae8d09a bundler: update HEAD version 2015-01-14 01:13:51 -05:00
Maurizio De Santis 5bcd29466e ruby: add 2.2.0 package 2015-01-10 19:25:37 +01:00