3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

27544 commits

Author SHA1 Message Date
Vladimír Čunát 5bdb1c9cd1 libdrm: update 2.4.65 -> 2.4.66 2016-01-04 11:47:40 +01:00
Vladimír Čunát 7d8ee80dab avahi: don't install broken symlinks
/cc maintainer @lovek323 and @wkennington who added these links 4118e632e8.
2016-01-01 10:01:36 +01: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 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
Robin Gloster d30904ea89 ruby: fix build with libressl2.3 2015-12-23 22:08:33 +00:00
Arseniy Seroka 93d3f6f52b Merge pull request #11905 from aborsu/jenkins-update
jenkins ci: 1.638 -> 1.643
2015-12-23 23:10:46 +03:00
Vladimír Čunát 11c702c582 Merge master into staging 2015-12-23 18:57:35 +01:00
Augustin Borsu 170f91a249 jenkins ci: 1.638 -> 1.643 2015-12-23 15:47:11 +01:00
Tim Steinbach d509f8a30a gradle: 2.9 -> 2.10 2015-12-23 08:44:49 -05:00
Vladimír Čunát bf9c16d4ac texinfo6: remove meta.branch and refactor meta
It was wrong ("5.2") and seemed unused in nixpkgs.
2015-12-23 09:19:38 +01: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
Tim Steinbach eb8e309d2b kotlin: 1.0.0-beta-3595 -> 1.0.0-beta-4583, fixes #11883 2015-12-23 01:50:06 +01:00
Thomas Tuegel cd7cfcc9a2 arpack: include OpenBLAS path in pkgconfig file 2015-12-22 14:22:19 -06:00
Franz Pletz eb7a441179 haskellPackages.xmonad: Update xmonad-nix.patch 2015-12-22 19:09:24 +01:00
Arseniy Seroka 87d2532f82 Merge pull request #11879 from aneeshusa/update-vagrant-to-1.8.0
vagrant: 1.7.4 -> 1.8.0
2015-12-22 17:51:35 +03:00
Peter Simons 7c6940b823 haskell-time: remove obsolete overrides 2015-12-22 13:17:20 +01:00
Peter Simons f1b0383c92 haskell-binary: update overrides for version 0.8.x 2015-12-22 13:17:20 +01:00
Peter Simons 5290ba9611 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-2-g519e0a9 using the following inputs:

  - Nixpkgs: 2ed14d2303
  - Hackage: 53c15ee9e3
  - LTS Haskell: b668f53a86
  - Stackage Nightly: ec9500b675
2015-12-22 13:17:20 +01:00
Aneesh Agrawal 53a5a44190 vagrant: 1.7.4 -> 1.8.0 2015-12-22 05:55:48 -05:00
Tim Steinbach 895875bdac maven: 3.3.3 -> 3.3.9, fixes #11867 2015-12-22 02:11:00 +01: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
Arseniy Seroka 0cd13e6b7b Merge pull request #11853 from NeQuissimus/gradle29
gradle: 2.8 -> 2.9
2015-12-21 19:42:21 +03:00
Tim Steinbach 9121277144 gradle: 2.8 -> 2.9 2015-12-21 11:37:21 -05: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
John Wiegley e582c41482 coqPackages.mathcomp,ssreflect: 1.5 -> 1.6
See the INSTALL file in the mathcomp package for instructions on
upgrading projects from 1.5 to 1.6.  The 1.6 version works with both Coq
8.4 and 8.5.
2015-12-20 11:12:23 -08: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 538ce57feb qtcreator: Qt 5 infrastructure update 2015-12-20 07:56:53 -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 05dbd07cd1 pyqt5: 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