3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

3182 commits

Author SHA1 Message Date
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
Charles Strahan 9e34985430 w3m: use Arch patches
Fix the built-in help (perl.patch)
  https://bugs.archlinux.org/task/45608

Properly link w3mimgdisplay to x11
  https://bbs.archlinux.org/viewtopic.php?id=196093

Fix rendering bug in w3mimgdisplay (w3m_rgba.patch)
  https://github.com/hut/ranger/issues/86

Don't ignore input tags with invalid types (form_unkown.patch)
  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615843

Fix a segfault when using https (https.patch)
  https://bugzilla.redhat.com/show_bug.cgi?id=707994
2015-12-25 15:26:14 -05:00
Robin Gloster f8ee267576 w3m: do not always link to RAND_egd for openssl
This fixes the build for libressl >= 2.3 as RAND_egd has been removed as
it is insecure.
2015-12-23 22:10:01 +00:00
Franz Pletz cbada77b0b clawsMail: 3.13.0 -> 3.13.1 (CVE-2015-8614)
Fixes a remotely triggerable buffer overflow.
http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=3557
Close #11910.
2015-12-23 18:48:38 +01:00
Thomas Tuegel 077a3102cc dropbox: 3.12.5 -> 3.12.6 2015-12-23 08:36:50 -06:00
Bob van der Linden 760ec896ae lsyncd: 2.1.5 -> 2.1.6 2015-12-20 21:56:28 +01:00
Thomas Tuegel 5ff1c58606 Merge pull request #11839 from ttuegel/qt-5.4
Qt infrastructure update
2015-12-20 08:11:52 -06:00
Thomas Tuegel 54bcdcc0a7 teamspeak_client: Qt 5 infrastructure update 2015-12-20 07:56:54 -06:00
Thomas Tuegel 143d6123dc qutebrowser: Qt 5 infrastructure update 2015-12-20 07:56:54 -06:00
Thomas Tuegel 1cd5505a9f telegram-qml: Qt 5 infrastructure update 2015-12-20 07:56:53 -06:00
Thomas Tuegel 126188be5c cutegram: Qt 5 infrastructure updates 2015-12-20 07:56:52 -06:00
Thomas Tuegel fc13f37f2c firestr: Qt 5 infrastructure update 2015-12-20 07:56:50 -06:00
Thomas Tuegel de5898a495 qtox: Qt 5 infrastructure update 2015-12-20 07:56:49 -06:00
Thomas Tuegel 249e5f732a linssid: Qt 5 infrastructure update 2015-12-20 07:56:49 -06:00
taku0 e24211df8f firefox-bin: 43.0 -> 43.0.1 2015-12-20 22:26:25 +09:00
Herwig Hochleitner d3d39376a2 dropbox: 3.12.4 -> 3.12.5 2015-12-19 17:45:59 +01:00
Pascal Wittmann 76eae695c7 Merge pull request #11319 from taku0/thunderbird-bin-38.4.0
thunderbird-bin: 38.3.0 -> 38.4.0
2015-12-18 08:50:59 +01:00
Nikolay Amiantov 8c1770769f flashplayer: fix 32-bit version 2015-12-17 15:09:24 +03:00
Arseniy Seroka 326801e0ac Merge pull request #11758 from taku0/firefox-bin-43.0
firefox-bin: 42.0 -> 43.0
2015-12-17 13:05:57 +03:00
Thomas Tuegel 8cf6b39833 Merge pull request #11769 from Profpatsch/cutegram
cutegram: fix version in name
2015-12-16 17:41:30 -06:00
Profpatsch 5f709b8974 cutegram: fix version in name 2015-12-17 00:05:48 +01:00
Eelco Dolstra 7651680615 firefox: 42.0 -> 43.0 2015-12-16 17:24:58 +01:00
Eelco Dolstra d8d04c8cf3 firefox-esr: 38.4.0 -> 38.5.0 2015-12-16 16:03:39 +01:00
Eelco Dolstra 98151e0691 ratox: Fix broken URL
However, the URL still gives a hash mismatch. @ehmry
2015-12-16 12:07:08 +01:00
Arseniy Seroka 2542e92ca0 Merge pull request #11684 from Profpatsch/cutegram
Cutegram
2015-12-16 10:47:48 +03:00
Profpatsch 9c5cd49903 cutegram: init at 2.7.0-stable 2015-12-16 02:08:49 +01:00
taku0 df02ed5696 firefox-bin: 42.0 -> 43.0 2015-12-16 09:55:39 +09:00
Arseniy Seroka c7b320656f Merge pull request #11714 from ericsagnes/jumanji
jumanji: fixed source
2015-12-14 22:46:41 +03:00
Eric Sagnes a77569fd97 jumanji: fixed source 2015-12-15 02:46:04 +09:00
Eelco Dolstra 1ae8f0f0f7 Merge pull request #11675 from abbradar/flashplayer-archive
flashplayer: cleanup, use archive as a source
2015-12-14 13:56:20 +01:00
Aristid Breitkreuz f217579ca6 Merge pull request #11680 from mayflower/fix/claws-mail-fancy
claws-mail: Fix fancy plugin
2015-12-13 22:52:23 +01:00
Aristid Breitkreuz 42952942bc Merge pull request #11649 from mayflower/claws-enable-pgp
[RFC] claws-mail: enable PGP plugin by default
2015-12-13 22:51:03 +01:00
Franz Pletz cabd3effda claws-mail: Remove extra GIO_EXTRA_MODULES wrapping 2015-12-13 17:09:15 +01:00
Franz Pletz 65d8af5af2 claws-mail: Fix fancy plugin, fixes #10421
This fixes the fancy plugin displaying HTML mails as text as suggested
by @wedens.
2015-12-13 17:02:36 +01:00
Ambroz Bizjak 03cf5e6627 chromium: Updates.
- dev: 48.0.2564.22 -> 49.0.2587.3
- beta: 48.0.2564.23 -> 48.0.2564.41
- stable: 47.0.2526.73 -> 47.0.2526.80
2015-12-13 17:00:13 +01:00
Nikolay Amiantov 26e738206c flashplayer: cleanup, use archive as a source
Most work done by ericsagnes
2015-12-13 16:28:52 +03:00
goibhniu 322b6bd60c Merge pull request #11656 from enolan/master
Remove Echo Nolan from maintainers
2015-12-13 11:13:31 +01:00
Echo Nolan f01c56f109 Remove Echo Nolan from maintainers
I'm not using Nix anymore.
2015-12-12 22:59:11 -08:00
Thomas Tuegel 7cdedaaf72 dropbox: use fields from upstream's desktop item 2015-12-12 17:26:41 -06:00
Robin Gloster 2251af754e claws-mail: enable PGP plugin by default 2015-12-12 12:49:49 +00:00
Profpatsch 7b407414a4 telegram: create explicit folder
Will be used for other tools coming soon™.
2015-12-12 13:27:03 +01:00
Michael Raskin 0a64071932 flashplayer: 11.2.202.540 -> 11.2.202.554 2015-12-08 23:28:53 +01:00
Domen Kožar 4b0fcf8ea1 Merge pull request #11553 from FRidh/pil
WIP: remove PIL as dependency
2015-12-08 22:15:05 +01:00
Frederik Rietdijk 9455476f47 tribler: use pillow instead of pil
Program opens. Didn't test any further.
2015-12-08 16:30:25 +01:00
Herwig Hochleitner a7aaedebcc dropbox-cli: 2015.02.12 -> 2015.10.28, fixes #11538 2015-12-08 02:13:11 +01:00
Herwig Hochleitner 0c30a14b9d dropbox: 3.10.11 -> 3.12.4 2015-12-08 02:12:47 +01:00
Ambroz Bizjak b9093f1c64 chromium: Updates, fixes #11492
Built and run Beta and Stable locally. Dev is surrently superseded by Stable so
it doesn't matter much.

- Dev: 47.0.2508.0 -> 48.0.2564.22
- Beta: 46.0.2490.64 -> 48.0.2564.23
- Stable: 45.0.2454.101 -> 47.0.2526.73

Changed the SSL dependencies to the supported configuration on Linux (according
to Torne @Freenode/#chromium-support).

- NSS is a dependency since it is used to access the ceritiface store.
- Dropped system OpenSSL support, the bundled BoringSSL is used.

This probably fixes issue #10555. Note that without this adjustment the build
fails even.

Dropped uneeded old patches.
2015-12-07 14:52:15 +01:00
Arseniy Seroka f6754747bd Merge pull request #11513 from oxij/fix-w3m-on-darwin
w3m: turn off mouseSupport on Darwin
2015-12-07 03:03:08 +03:00
Jan Malakhovski 53f93b0b7e w3m: turn off mouseSupport on Darwin
Fixes an issue reported at https://github.com/NixOS/nixpkgs/pull/11222/files#r46774825
2015-12-06 20:44:29 +00:00
Emery Hemingway 2b6dcdfcd0 Rename 'emery' maintainer handle to 'ehmry', fixes #11493
Communication happens on Github so names should be consistent.
2015-12-05 23:06:20 +01:00