Commit Graph
37780 Commits
Author SHA1 Message Date
Vladimír Čunát ab65fe023d perl: synchronize changes done to 5.20 and 5.22
Some multiple-output changes were previously only in 5.22,
but since master is still using 5.20, let's stick with that version
on closure-size as well.
https://github.com/NixOS/nixpkgs/commit/741bf840dad05cd1728481045466811ae8ae8281#commitcomment-14784970
2015-12-31 10:18:13 +01:00
Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Michael Raskin d27dd12571 Merge pull request #12043 from rycee/migrate/stdenv
Migrate some more packages from builderDefsPackage to stdenv
2015-12-30 21:26:00 +01:00
Robert Helgesson 2367594575 hawknl: fix download URL
The upstream URL is broken, use an alternative download URL. Checksum is
the same as old download.
2015-12-30 21:15:15 +01:00
Robert Helgesson 9f5b058041 regina: use stdenv
This replaces use of `builderDefsPackage`.
2015-12-30 21:15:15 +01:00
Robert Helgesson ffd09ecc60 unicap: use stdenv
This replaces use of `builderDefsPackage`. Also fix build.
2015-12-30 21:15:15 +01:00
Robert Helgesson 6ca0480de6 cgui: use stdenv
This replaces use of `builderDefsPackage`.
2015-12-30 21:15:15 +01:00
Robert Helgesson 7ce3f6f976 openscenegraph: use stdenv
This replaces use of `builderDefsPackage`. Also minor cleanups.
2015-12-30 21:15:15 +01:00
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
Arseniy Seroka 51c9093ce7 Merge pull request #12025 from VShell/icestorm
yosys, arachne-pnr, icestorm: init
2015-12-30 20:44:05 +03:00
Michael Raskin f7ab821916 Julia: update libuv version 2015-12-30 18:17:43 +01:00
Louis Taylor 358885fd87 qmltermwidget: fix homepage url 2015-12-30 16:52:46 +00:00
Shell Turner c485543c7c yosys: init at 2015.12.29 2015-12-30 16:52:41 +00:00
Shell Turner f11ec866ad arachne-pnr: init at 2015.12.29 2015-12-30 16:52:41 +00:00
Shell Turner c1ec39d47b icestorm: init at 2015.12.29 2015-12-30 16:52:41 +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
Dan Peebles 878544e4f6 perl-5.2{0,2}: remove unnecessary patch for darwin
The patch no longer applies on 5.20 and is breaking everything. I tried
building both 5.20 and 5.22 and both seemed to work fine without the
patch.
2015-12-29 21:01:19 -05:00
Peter Simons 3a8112f7da r-modules: prefer gsl 1.x since 2.x is unsupported by r-gsl-1.9.x 2015-12-29 21:22:59 +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
Peter Simons c5f28c305a Merge pull request #11566 from Bevaz/ccache-links
ccache: create symlinks to gcc lib & include in ccache-links directory
2015-12-29 16:29:16 +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 de545f8b29 Merge pull request #11984 from mayflower/update-strace
strace: 4.10 -> 4.11
2015-12-28 17:20:30 +01: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 9ca37a8a4b haskell-text: doCheck=false override is now generated by hackage2nix
This is necessary to break an finite recursion in the test suite dependencies.
2015-12-28 13:19:28 +01:00
Peter Simons 3af72cf6a3 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20151217-3-gd4ae18a using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/236677809b56730af48b37057a05f1bb01cc076c
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/62b6b580fb6fa4d2ef029febe46dcc6c738ea926
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/d3e5ae70f97caffd4362b1511f3a2edfdc8a493d
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/ef03f60b53b318a4e78e3854942c1c224d9601c1
2015-12-28 13:19:11 +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
Robin Gloster 0cfa4fdbd4 strace: 4.10 -> 4.11 2015-12-27 20:25:29 +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
Arseniy Seroka 801d4298dc Merge pull request #11938 from NeQuissimus/kotlinb4hf
kotlin: 1.0.0-beta-4583 -> 1.0.0-beta-4584
2015-12-25 17:27:06 +03:00