Commit Graph
79575 Commits
Author SHA1 Message Date
Jude Taylor ae8cc5449b revert rubies callPackages change 2015-09-26 06:27:25 -07:00
Bjørn Forsman 3f27be8e5d dbench: move loadfiles from $out/share/ to $out/share/loadfiles/
Seems cleaner.

Hm, there are also loadfiles in $out/share/doc/dbench/loadfiles/
(installed by the upstream build system), but there is no iscsi/
directory in there.
2015-09-26 15:26:17 +02:00
Jude Taylor e7c8dd748a Merge pull request #9834 from NixOS/rubies
Merge Ruby versions into one file
2015-09-26 06:25:01 -07:00
Jude Taylor 68e802c46b PR comments 2015-09-26 06:23:25 -07:00
Bjørn Forsman dc06278641 dbench: expression clean-up
Whitespace, ordering, add meta attributes.
2015-09-26 15:08:50 +02:00
Bjørn Forsman 8e7ce3de00 dbench: 20101121 -> 2013-01-01 (latest)
This fixes the build (the old version has wrong hash now).
2015-09-26 15:01:39 +02:00
Jude Taylor 1223210576 re-indent; make rubies overridable 2015-09-26 05:55:59 -07:00
Jude Taylor 99a66bc2f9 put all rubies in scope 2015-09-26 05:55:59 -07:00
Jude Taylor dcf933e258 move rubies into a single file 2015-09-26 05:55:59 -07:00
Luca Bruno 5aa066a942 Merge branch 'gnome-staging' into staging 2015-09-26 14:16:19 +02:00
Matthias Beyer fb99a1d410 multitail: 6.2.1 -> 6.4.2
This patch includes:

    * multitail: Move version to own variable
    * multitail: Add myself as package maintainer
2015-09-26 11:03:17 +02:00
aszlig 39a03b679a release-notes/15.09: Document changes for vboxsf.
Since 74209a4 we have initial support for the "vboxsf" (VirtualBox
shared folder) file system support. This will be cherry-picked to
release-15.09 so we need to notice people about the change.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-26 11:02:05 +02:00
aszlig 02c2500195 release-notes/15.09: Use <option/> for options.
There were quite a few configuration options which were tagged via
<literal/>, so in order to keep consistency with other docbook manuals
in the source tree, let's use <option/> here.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-26 11:01:37 +02:00
Vladimír Čunát 1f73d482d6 beets: fix tarball evaluation by asserting isLinux
/cc #10069.
2015-09-26 09:29:49 +02:00
Edward Tjörnhammar 4dda511ec3 Merge pull request #10060 from matthiasbeyer/update-bwm_ng
bwm_ng: 0.6 -> 0.6.1
2015-09-26 08:56:41 +02:00
Edward Tjörnhammar a3e2dd3233 Merge pull request #10058 from matthiasbeyer/update-joe
joe: 4.0 -> 4.1
2015-09-26 08:56:26 +02:00
Raymond Gauthier eebe362911 xfce.thunar-archive-plugin: init at 0.3.1 (close #10029)
A `thunar` plugin that adds archive manipulation features to
right click on file/directory menu. It can use either gnome or
kde archive managers. Detection of backend based on
`*.desktop` files mime types.

Should supercede non-functional pre-existing
`xfce.thunar_archive_plugin` (which for some
unknown reason is building the volume manager
plugin).

Also removed `xfce.thunar_archive_plugin` because
superceded.

Tests:

 -  When plugin package is installed, the supplementary
    menu entries appear in thunar.
 -  Succesfully extracted an archive using backend
    `file-roller` through thunar menu entry.

+ minor changes from vcunat, mainly meta.
2015-09-26 08:18:06 +02:00
Paul Colomiets 84c0098117 Unprivileged overlayfs mounts kernel patch from ubuntu
This allows to create overlayfs mounts by unprivileged containers (i.e.
in user and mount namespace). It's super-useful for containers.

The patch is trivial as I understand from the patch description it's
does not have security implications (on top of what user namespaces
already have). And it's enabled in ubuntu long time ago. Here is a proof:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1357025
2015-09-26 00:42:16 +03:00
William A. Kennington III 4f798100d8 Merge pull request #10061 from matthiasbeyer/update-libgit2
libgit2: 0.21.2 -> 0.23.2
2015-09-25 13:53:19 -07:00
William A. Kennington III 585e0031f5 Merge pull request #10055 from mayflower/racer-rustfmt
Fix/Update racer and rustfmt
2015-09-25 13:52:57 -07:00
Eric Seidel 86b1a18721 Merge pull request #9405 from zimbatm/darwin-listing
Restore the listing of Darwin packages.
2015-09-25 13:50:44 -07:00
Arseniy Seroka 01aa6a68ac Merge pull request #10037 from Beauhurst/hg_crecord
mercurial: add package for crecord extension as optional dependency, …
2015-09-25 23:30:08 +03:00
lethalman d56f2d009f Merge pull request #10065 from dezgeg/pr-fio
fio: Minor refactor
2015-09-25 22:16:49 +02:00
Tuomas Tynkkynen 2549373cb9 fio: Minor refactor
- Use postPatch for patching, so don't need to manually override
  configurePhase and installPhase.
- Add python to buildInputs, so fio2gnuplot gets patchShebangs'd.
- Add platforms, so it gets built by Hydra.
2015-09-25 22:16:43 +03:00
viric 46c18a47e1 Merge pull request #10063 from akaWolf/qtox
qTox: update & fix git revision.
2015-09-25 19:23:47 +02:00
Wout Mertens 55e8d8ea61 Merge pull request #9941 from utdemir/upgrade-nodejs-4-1
nodejs: 0.12.7 -> 4.1.0
2015-09-25 19:02:04 +02:00
Artjom Vejsel 1bfa084cdc qtox: 20150821 -> 20150925 2015-09-25 19:47:51 +03:00
Artjom Vejsel 0c95190fff qtox: fix git hash revision 2015-09-25 19:36:23 +03:00
Michael Peyton Jones ef8e002bf0 heatseeker: init at 1.3.0 2015-09-25 16:27:43 +01:00
Gabriel Ebner 98be4ed5e8 sbt: use sbt-launcher-package. 2015-09-25 16:54:35 +02:00
Matthias Beyer bea75f4c78 libgit2: 0.21.2 -> 0.23.2 2015-09-25 15:47:57 +02:00
Matthias Beyer 1adaab27e2 joe: Move version to own variable 2015-09-25 15:40:28 +02:00
Matthias Beyer 0a818afe22 joe: 4.0 -> 4.1 2015-09-25 15:37:16 +02:00
Matthias Beyer 8ca7e4c2d1 bwm_ng: Move version to own variable 2015-09-25 15:33:42 +02:00
Matthias Beyer bc2dc7de5e bwm_ng: 0.6 -> 0.6.1 2015-09-25 15:30:59 +02:00
lethalman 6b096582df Merge pull request #9945 from samuelrivas/gusb-enable-vala
gusb: refactor, enable vala
2015-09-25 15:20:39 +02:00
lethalman eb24e66e0d Merge pull request #9970 from rycee/bump/perl-File-LibMagic
perl-File-LibMagic: 1.13 -> 1.15
2015-09-25 15:18:46 +02:00
lethalman f5f3aff047 Merge pull request #9994 from robbinch/pkg-kiwix
kiwix: init at 0.9.
2015-09-25 15:17:31 +02:00
lethalman 3e4bbe048a Merge pull request #10038 from pmahoney/skarnet
Skarnet updates
2015-09-25 15:15:53 +02:00
lethalman 9ae95b2ea6 Merge pull request #10045 from cleverca22/master
tgt: init at 1.0.60
2015-09-25 15:15:25 +02:00
Domen Kožar d11f662caa Merge pull request #10004 from obadz/pithos
Pithos
2015-09-25 15:02:25 +02:00
obadz 9142c02cb9 pithos: 1.0.1 -> 1.1.1 2015-09-25 14:00:29 +01:00
Vladimír Čunát 48200a96e0 doc/release notes (15.09): mention texlive 2015-09-25 14:24:47 +02:00
Luca Bruno 7d1cb980bf libarchive: fix .la file for lzo2 2015-09-25 14:06:58 +02:00
Luca Bruno 702fde3a91 libarchive: fix .la file for lzo2 2015-09-25 14:06:23 +02:00
aszlig 592f0f7ead firefox: Drop crash_OTMC+GTK3.patch.
The patch only applies for Firefox versions between 37.0 and 40.1.

Because we're on version 41.0 the changes are already included upstream
and thus the patch doesn't apply and is even unnecessary.

As for version 38.3 for ESR, the patch doesn't apply as well if compiled
with enableGTK3. Of course, this is a bit unfortunate but I don't have
the time right now to properly rebase the patch on 38.3.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: devhell <"^"@regexmail.net>
2015-09-25 13:42:02 +02:00
aszlig baf1d1dcd7 nixos/tests/virtualbox: Don't parallelize VM boot.
I'm not quite sure why the official Hydra gets a kernel panic in one of
two VMs using the exact same kernels:

https://hydra.nixos.org/build/26339384

Because the kernel panic happens before stage 1, let's wait for the
first VM to boot up and after the bootup is done, start the second one
in hope that it won't trigger the panic.

Oddly enough, whenever I run the test on my own Hydra and on my local
machines, I don't get anything like that.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-09-25 12:12:07 +02:00
Thomas Strobel 59bc47c9ed nixos networking: add vswitch option
Add a configuration option for Open vSwitch that is
similar to the option for the Linux kernel ethernet
bridge.
2015-09-25 11:55:27 +02:00
Eelco Dolstra 2896861c7e pcre: Smaller patch for CVE-2015-3210, CVE-2015-5073 2015-09-25 11:53:19 +02:00
Vladimír Čunát 000a2108ba vorbis-tools: security patches and fix meta
Patches: CVE-2014-9638, CVE-2014-9639, CVE-2015-6749, and some non-security.
Also drop glibc from buildInputs.
2015-09-25 11:39:14 +02:00