76058 Commits

Author SHA1 Message Date
Ben Darwin
8565efc4da remove manual derivation for popup-mode 2015-12-30 10:36:15 -05:00
Arseniy Seroka
640d861d13 Merge pull request #12020 from ehmry/windowlab
WindowLab: initial pkg at 1.40
2015-12-30 18:07:20 +03:00
Eelco Dolstra
146c727924 waitForUnit: Fail if the unit reaches inactive state with no pending jobs
This prevents waitForUnit for looping for many minutes before giving
up.
2015-12-30 15:17:52 +01:00
Eelco Dolstra
e78bad5262 etc: Use a friendlier name than "etc-file" 2015-12-30 15:17:30 +01:00
Eelco Dolstra
1ba2015450 install-grub: Make more robust against GC'ed system profile entries
Previously this barfed with:

  updating GRUB 2 menu...
  fileparse(): need a valid pathname at /nix/store/zldbbngl0f8g5iv4rslygxwp0dbg1624-install-grub.pl line 391.
  warning: error(s) occured while switching to the new configuration
2015-12-30 15:07:18 +01:00
Bjørn Forsman
a5b68eb4f6 xorg: add meta.platforms
Add it to the generator script (generate-expr-from-tarballs.pl) and then
add the updated generated file (pkgs/servers/x11/xorg/default.nix) after
performing the steps outlined in the generator script.

NOTE: People seem to have updated .../default.nix manually (even though
it has a "THIS IS A GENERATED FILE.  DO NOT EDIT!" header), so I had to
skip some changes to not downgrade several packages.
2015-12-30 12:50:54 +01:00
Vladimír Čunát
468f698f60 rsync: security update 3.1.1 -> 3.1.2
This should fix CVE-2014-9512.
https://download.samba.org/pub/rsync/src/rsync-3.1.2-NEWS
2015-12-30 12:06:00 +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
Emery
952563d620 WindowLab: initial pkg at 1.40
http://nickgravgaard.com/windowlab/
2015-12-30 11:10:30 +01:00
Vladimír Čunát
fff938f72a liferea: maintenance update 1.10.16 -> 1.10.17
Also refactor meta.
2015-12-30 10:59:02 +01:00
Dan Peebles
cd7612b841 amazon-image: enable configure-from-userdata and the corresponding VM test 2015-12-30 04:59:52 +00: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
Sander van der Burg
ebe4d609ea supertux: bump to version 0.4.0 2015-12-29 23:40:43 +00: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
Reno Reckling
a1e0894cb4 ding: init at 1.8 (close #11989)
vcunat improved meta.
2015-12-29 21:03:19 +01:00
Domen Kožar
bea60e1409 Merge pull request #12026 from rycee/migrate/stdenv
Migrate packages in games to stdenv from builderDefsPackage
2015-12-29 21:00:22 +01:00
Robert Helgesson
a04916cdc4 sauerbraten: use stdenv
This replaces use of builderDefsPackage (#4210).
2015-12-29 20:31:01 +01:00
Robert Helgesson
aca3851b88 tbe: r2048 -> 0.9.2.1
Also replace use of builderDefsPackage (#4210).
2015-12-29 20:31:01 +01:00
Robert Helgesson
b9f1140e4d atanks: use stdenv
This replaces use of builderDefsPackage (#4210).
2015-12-29 20:31:01 +01:00
Robert Helgesson
73184f5f59 stardust: use stdenv
This replaces use of builderDefsPackage (#4210).
2015-12-29 20:31:01 +01:00
Robert Helgesson
281b584e4a liquidwar: use stdenv
This replaces use of builderDefsPackage (#4210).
2015-12-29 20:31:01 +01:00
Thomas Tuegel
c919bb82af Merge branch 'emacs-packages' 2015-12-29 13:25:11 -06:00
Thomas Tuegel
c266de63ee melpa-stable-packages: use recipeFile 2015-12-29 13:24:42 -06:00
Thomas Tuegel
1d8e3db9ff melpa-packages: use recipeFile 2015-12-29 13:24:28 -06:00
Thomas Tuegel
7466e0f264 melpaBuild: accept recipeFile in lieu of fileSpecs 2015-12-29 13:23:49 -06:00
Robin Gloster
4bf7afc78e wpa_supplicant module: remove preStart hack
If the config file is managed imperatively we shouldn't touch it.
2015-12-29 18:49:39 +00:00
Robin Gloster
56a53ff458 wpa_supplicant module: add networks option 2015-12-29 18:49:39 +00:00
Robin Gloster
9dceabc95d wpa_supplicant module: refactor 2015-12-29 18:49:39 +00:00
Robin Gloster
57210ce1c1 wpa_supplicant module: remove obsolete option
networking.WLANInterface has been obsolete for years
2015-12-29 18:49:38 +00:00
Domen Kožar
6da327b433 Chromium updates 2015-12-29 19:32:38 +01:00
Eelco Dolstra
63bf2a551e nixUnstable: 1.11pre4334_7431932 -> 1.11pre4345_b8258a4 2015-12-29 17:54:58 +01:00
Arseniy Seroka
9544823b6e Merge pull request #12014 from ehmry/ratox
ratox: fix src hash mismatch
2015-12-29 19:32:10 +03:00
Eelco Dolstra
7906169ce1 Add some preferLocalBuild 2015-12-29 17:21:49 +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
Vladimír Čunát
6a51a615b4 goPackages.inflect: add version suffix
Instead of approach in #12002, I chose the commit-date style
to preserve linearity if it (ever) gets updates.
The package seems to do no releases.
2015-12-29 17:07:26 +01:00
Vladimír Čunát
b91dcad4bc fetchFromBitBucket: auto-remove an impure file
Also fix the hash in goPackages.inflect, the only user of the fetcher ATM.
Closes #12002 (different `inflect` fix), fixes #12012.
Using fetchzip-derived functions is likely more efficient than fetchhg,
and it's lighter on dependencies (hash is the same as with fetchhg in this case).
2015-12-29 16:54:50 +01:00
Eelco Dolstra
74aac17878 Force rebuild of some corrupted files 2015-12-29 16:39:26 +01:00
Jakob Gillich
36a4600422 remove fetchFromGitorious (close #12024)
The site has retired and it's not used by anything.
2015-12-29 16:33:15 +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
Peter Simons
5ab5e1d25e Merge pull request #11959 from exi/use-official-taglib-extras
use official taglib-extras source
2015-12-29 16:28:35 +01:00
Eelco Dolstra
f6df6d8d46 linux: 3.18.24 -> 3.18.25 2015-12-29 15:56:20 +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
Bjørn Forsman
4f3d769d6f conky: add meta.platforms 2015-12-29 13:16:01 +01:00