Commit graph

17993 commits

Author SHA1 Message Date
Vladimír Čunát
b01ae3cee0 gtk2: maintenance update 2.24.28 -> 2.24.29 2015-12-30 11:58:06 +01:00
Vladimír Čunát
00aec448ab gdk-pixbuf: maintenance update 2.32.1 -> 2.32.3 2015-12-30 11:57:33 +01:00
Vladimír Čunát
343e7af697 pango: maintenance update 1.18.0 -> 1.18.1 2015-12-30 11:48:30 +01:00
Vladimír Čunát
cfbe24992f at-spi2-*: maintenance updates on 2.18.* 2015-12-30 11:46:24 +01:00
Vladimír Čunát
f9232183d0 harfbuzz: update 1.0.6 -> 1.1.2 2015-12-30 11:37:20 +01: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
Vladimír Čunát
12a0e09563 Merge #11674: libressl-2.3 patches for various pkgs 2015-12-23 23:16:27 +01:00
Robin Gloster
99b1b464b4 qt55.qtbase: add patch to build with libressl 2.3 2015-12-23 22:10:01 +00:00
Robin Gloster
562ba76975 qca2: add patch to build with libressl 2.3 2015-12-23 22:08:33 +00:00
Robin Gloster
4b5cb62488 qt4: add patch to build with libressl 2.3 2015-12-23 22:08:33 +00:00
Vladimír Čunát
11c702c582 Merge master into staging 2015-12-23 18:57:35 +01:00
Thomas Tuegel
cd7cfcc9a2 arpack: include OpenBLAS path in pkgconfig file 2015-12-22 14:22:19 -06:00
Bojan Nikolic
842613fb10 aspell: improve the doc string, fixes #11814
It is better to specify data-dir in the environmental variable since
then both the language description files and the dictionaries will be
found. Since dict-dir defaults to data-dir only the latter needs to be
set. See for example https://github.com/NixOS/nixpkgs/issues/1000
2015-12-22 01:56:27 +01:00
obadz
29c676e73d pdfmod: init at 0.9.1 (close #11417)
vcunat did some cosmetic changes, such as joining lines
because we seem to rarely use one-identifier-per-line style,
or fixing hyena description to conform to our rules.
2015-12-21 15:19:36 +01:00
Vladimír Čunát
a6b34b3bfd mesa: maintenance updates 11.0.5 -> 11.0.8 2015-12-21 14:28:49 +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
1d331481fc quazip: Qt 5 infrastructure update 2015-12-20 07:56:54 -06:00
Thomas Tuegel
660736def8 polkit-qt: normalize package name to upstream 2015-12-20 07:56:51 -06:00
Thomas Tuegel
e782026719 poppler: normalize package name to upstream 2015-12-20 07:56:51 -06:00
Thomas Tuegel
ad9ece4f92 qwt: Qt 5 infrastructure update 2015-12-20 07:56:41 -06:00
Thomas Tuegel
9a91200e9e phonon: Qt 5 infrastructure update 2015-12-20 07:56:41 -06:00
Thomas Tuegel
d7dff0057c signon: Qt 5 infrastructure update 2015-12-20 07:56:40 -06:00
Thomas Tuegel
36ea03660e qca-qt5: Qt 5 infrastructure update 2015-12-20 07:56:40 -06:00
Thomas Tuegel
b8b14eda69 phonon-backend-gstreamer: Qt 5 infrastructure update 2015-12-20 07:56:39 -06:00
Thomas Tuegel
26cf5db23f mlt: Qt 5 infrastructure update 2015-12-20 07:56:39 -06:00
Thomas Tuegel
f250a6e64e qt5: build env and full per version 2015-12-20 07:56:38 -06:00
Thomas Tuegel
fef302e3e4 accounts-qt: Qt infrastructure update 2015-12-20 07:56:35 -06:00
Thomas Tuegel
2a8b6959cc libdbusmenu-qt: Qt 5 infrastructure update 2015-12-20 07:56:35 -06:00
Thomas Tuegel
664a64ef13 grantlee: Qt 5 infrastructure update 2015-12-20 07:56:35 -06:00
Arseniy Seroka
66b294dd48 Merge pull request #11811 from knedlsepp/grib-api
grib-api: init at 1.14.4
2015-12-20 15:08:03 +03:00
Josef Kemetmüller
5b553893c1 grib-api: init at 1.14.4 2015-12-20 11:52:58 +01:00
Thomas Tuegel
1402c20bfd qt54: backport Qt infrastructure changes from Qt 5.5 2015-12-19 16:20:27 -06:00
Thomas Tuegel
36dda92317 qt55.qtbase: don't interpolate needlessly 2015-12-19 12:26:54 -06:00
Thomas Tuegel
09e9e3e359 fixup! qt55.qtbase: don't include optional dependencies unconditionally 2015-12-19 12:26:45 -06:00
Thomas Tuegel
98e2fbe630 qt55.qtbase: remove non-existent paths from LD_LIBRARY_PATH 2015-12-19 12:18:48 -06:00
Thomas Tuegel
0a54898a20 qt55.qtbase: don't include optional dependencies unconditionally 2015-12-19 12:18:06 -06:00
Thomas Tuegel
9f62af0885 qt55.qtbase: fallback libGL path
If libGL is not found on the system library path, fall back to the
default Mesa driver.
2015-12-19 12:15:33 -06:00
Thomas Tuegel
081b1f1707 qt55.qtbase: set compose search path
This was previously set using substituteInPlace, but this leads to
duplicate search paths.
2015-12-19 12:02:57 -06:00
Thomas Tuegel
14f27e5eb7 qt55.qtbase: move sed scripts to postPatch 2015-12-19 11:59:05 -06:00
Thomas Tuegel
8b890cac07 qt55.qtbase: manage patches with quilt 2015-12-19 11:56:50 -06:00
Vladimír Čunát
1932d101e2 telepathy-qt: minor update, fix by patch, unify
- The patch fixes building against gst-1.6.
- Having to change three files with almost same contents would drive me mad,
  so I unified them into a single expression. /cc @ttuegel
- libxslt seemed unneeded, and it uses libxml2 anyway.
2015-12-18 11:06:46 +01:00
Vladimír Čunát
be6c625410 telepathy-farstream: minor update 0.6.1 -> 0.6.2
Also cleanup unneeded dependencies, in particular gst-0.10.
2015-12-18 10:31:57 +01:00
lethalman
12b64621fd Merge pull request #11796 from nckx/fix-gdata
gnome3_*.libgdata: add `nss` dependency
2015-12-18 10:15:51 +01:00
Tobias Geerinckx-Rice
341d23324d libpsl: 2015-12-03 -> 2015-12-17 2015-12-17 23:51:43 +01:00
Tobias Geerinckx-Rice
996a0a9abf liboauth: add nss3 path to liboauth.la
Fixes the following libgdata build error:
```
  CCLD     gdata/libgdata.la
/nix/store/5kdjp8200hazaydx0dmwn5qghqkyi3py-binutils-2.23.1/bin/ld: cannot find -lssl3
/nix/store/5kdjp8200hazaydx0dmwn5qghqkyi3py-binutils-2.23.1/bin/ld: cannot find -lsmime3
/nix/store/5kdjp8200hazaydx0dmwn5qghqkyi3py-binutils-2.23.1/bin/ld: cannot find -lnss3
/nix/store/5kdjp8200hazaydx0dmwn5qghqkyi3py-binutils-2.23.1/bin/ld: cannot find -lnssutil3
collect2: error: ld returned 1 exit status
```
2015-12-17 22:43:34 +01:00
Rickard Nilsson
c634e5cd24 Merge pull request #11730 from spwhitt/mopidy
Mopidy Improvements
2015-12-17 20:42:13 +01:00
Vladimír Čunát
82a21ccaf7 libffi: refactor meta 2015-12-17 14:45:46 +01:00
Vladimír Čunát
5a129a8121 libffi: doCheck optionally and do so for glib-tested
This is kind-of reverting fcf99efcd.
2015-12-17 14:45:46 +01:00
Peter Simons
6538905eb4 Merge pull request #11677 from jagajaga/gettext_patch_staging
gettext: fix absolute path
2015-12-17 14:27:18 +01:00
Thomas Tuegel
9b26afff6e Merge pull request #11781 from ttuegel/kiconthemes
kde5.kiconthemes: default icon theme is breeze
2015-12-17 06:15:37 -06:00