18960 Commits

Author SHA1 Message Date
Robert Helgesson
abf836b066 ois: use stdenv
This replaces use of `builderDefsPackage`.
2015-12-30 21:15:15 +01:00
Robert Helgesson
9a47354a96 allegro5unstable: use stdenv
This replaces use of `builderDefsPackage`. Also change to download
tarball from GNA as it is the new upstream home. Minor other fixes.
2015-12-30 21:15:15 +01:00
Robert Helgesson
f37279aebc allegro5: use stdenv
This replaces use of `builderDefsPackage`. Also change to download
tarball from GNA as it is the new upstream home. Minor other fixes.
2015-12-30 21:15:15 +01:00
Robert Helgesson
bbd253b569 allegro: use stdenv
This replaces use of `builderDefsPackage`. Also change to download
tarball from GNA as it is the new upstream home. Minor other fixes.
2015-12-30 21:15:15 +01:00
Robert Helgesson
ac8e5edada box2d: use stdenv
This replaces use of `builderDefsPackage`. Also change to download
tarball from GitHub as it is the new upstream home.
2015-12-30 21:15:15 +01:00
Louis Taylor
358885fd87 qmltermwidget: fix homepage url 2015-12-30 16:52:46 +00:00
Vladimír Čunát
8c90a4421a exiv2: update 0.24 -> 0.25 2015-12-30 16:46:31 +01:00
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
8627b26874 libpng-1.2: security update 1.2.54 -> 1.2.55
It should finally fix #11030 and CVE-2015-8126 for 1.2.
2015-12-30 11:40:44 +01:00
Vladimír Čunát
f9232183d0 harfbuzz: update 1.0.6 -> 1.1.2 2015-12-30 11:37:20 +01:00
Vladimír Čunát
08dd527cc7 Merge branch 'staging'
http://hydra.nixos.org/eval/1234895
The mass errors on Hydra seem transient; I verified ghc on i686-linux.
Only darwin jobs are queued ATM. There's a libpng security update
included in this merge, so I don't want to wait too long.
2015-12-29 17:14:35 +01:00
Reno Reckling
f1aa829a43 use official taglib-extras source 2015-12-29 15:36:47 +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
Yann Hodique
bc6e050f21 mesa: add download url (close #11942)
vcunat refactored a bit (too long line, etc.) and reordered the URLs.
2015-12-29 14:23:41 +01:00
Domen Kožar
af751a7845 qt55.openbr: fix source 2015-12-28 23:14:34 +01:00
Robin Gloster
8eede9e41e gnome-boxes, libguestfs: fix builds due to libvirt
Adds link time dependencies which are now used in libvirt and unbreaks
these packages
2015-12-28 21:44:12 +00:00
Robin Gloster
0bd5a83403 libosinfo: 0.2.11 -> 0.2.12
Unbreaks gnome-boxes 3.18
2015-12-28 21:44:12 +00:00
Robin Gloster
8260022a1b libvirt-glib: 0.2.0 -> 0.2.3
This also fixes the build with the xen-supporting libvirt and removes
obsolete workarounds.
2015-12-28 21:43:25 +00:00
Robin Gloster
4e225b61d2 libvirt: add xen support 2015-12-28 21:43:25 +00:00
Robin Gloster
876a182b66 libvirt: fix including libpcap 2015-12-28 21:43:25 +00:00
Thomas Tuegel
36a08ce5a0 arpack: 3.2.0 -> 3.3.0 2015-12-28 11:44:03 -06:00
Peter Simons
a1a16c5a92 Merge pull request #11990 from mayflower/update-libressl
libressl_2_2: 2.2.4 -> 2.2.5
2015-12-28 17:20:10 +01:00
Peter Simons
71e0a6ae4f Merge pull request #11947 from exi/taglib_extas-fix
taglib-extras: make taglib-extras work with taglib > 1.9
2015-12-27 23:26:46 +01:00
Robin Gloster
bb223bc3ad libressl_2_2: 2.2.4 -> 2.2.5 2015-12-27 22:12:52 +00:00
Reno Reckling
e94139f8c8 Add comments identifying workarounds 2015-12-26 18:42:03 +01:00
Robin Gloster
59ed410d6d fix ftp.mozilla.org URLs
The old URLs time out.
2015-12-26 02:33:50 +00:00
Reno Reckling
5303351c72 make taglib-extras work with taglib > 1.9 2015-12-25 13:56:26 +01:00
Dan Peebles
6878b2b21d libvirt: make it build on darwin
Not sure if it works, but it no longer fails miserably at build time
2015-12-24 23:34:47 -05:00
Dan Peebles
8c42b26fa2 libvirt: switch who makes assertions about whose version
Previously, the native libvirt package was making an assertion that
the dependent Python package had a compatible version. This commit
switches that so that the Python package makes the assertion, since
it makes more sense to me to have a child package making an
assertion about its parent than vice versa.
2015-12-24 19:59:44 +00:00
Christian Albrecht
dad3cd7928 jzmq: fix missing shasum in fetchgit src 2015-12-24 13:20:24 +01: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
Nathan Zadoks
77affc495f despotify: fix missing hash (close #11913) 2015-12-23 23:09:26 +01: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