3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

46755 commits

Author SHA1 Message Date
aszlig 6c4d5f7e4d
virtualbox: Fix hardcoded /sbin/ifconfig path.
Just accidentally found this while debugging and it's needed for
fetching a few interface details, not sure however whether because of
this anything has been broken so far.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 14ef3446e1)
2014-12-18 22:43:33 +01:00
aszlig 90c6ae5e43
virtualbox: Explicitly excempt src during install.
Instead of coping it to $out and later deleting it, we now exclude the
src directory during copy. Also, we no longer cd into the release
directory during installPhase, which should make sure that we are
constantly in $sourceRoot.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 5a8c5d2768)
2014-12-18 22:43:16 +01:00
Sebastián Bernardo Galkin 9ec8d3e0ac xorg-server: enable DRI3 (close #5381)
TEST needed. I tested on my NixOS Thinkpad with Optimus nvidia and intel
cards.  Testing in other architectures is needed.

This patch also improves the regular expressions that scan the build
configuration files to enable the building of a binary utility in
xf86-video-intel: intel-virtual-output. This utility is useful for some
Optimus laptops

DRI3 was added to xorg-server propagatedBuildInputs so now it's inherited
by several projects that can use it.

(cherry picked from commit 06e6d7def2)
2014-12-18 19:03:05 +01:00
Rob Vermaas 597007f8b7 Fix sysstat build. 2014-12-18 14:47:00 +01:00
William A. Kennington III a287614ecb kernel: 3.14.26 -> 3.14.27
(cherry picked from commit 7e8c5b578a)
2014-12-18 14:07:02 +01:00
Eelco Dolstra 142e9a9d06 sudo: Update to 1.8.11p2
(cherry picked from commit 6866712a39)
2014-12-18 12:58:42 +01:00
Domen Kožar 0d4acad489 crashplan: fix CrashPlanDesktop binary 2014-12-18 10:12:37 +01:00
Domen Kožar 827a9bbd44 ulex: set platforms 2014-12-18 10:01:32 +01:00
宋文武 66087ead07 jenkins: update to 1.594
(cherry picked from commit f40a613577)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-18 09:59:23 +01:00
Domen Kožar b0a0fb60df dropbox: 2.0.0 -> 2.2.0, disable tests 2014-12-18 09:22:29 +01:00
William A. Kennington III 8f71e04e9f btrfs-progs: 3.17.2 -> 3.17.3
(cherry picked from commit 0cfd61bdea)
2014-12-18 00:40:38 +01:00
William A. Kennington III 990b5a1b3e xfsprogs: 3.2.1 -> 3.2.2
(cherry picked from commit 02f75f91f1)
2014-12-18 00:40:29 +01:00
Domen Kožar 692f5958e3 remove btrfsProgs-3_16, not needed anymore
(cherry picked from commit 9de5eb6ade)
2014-12-18 00:40:20 +01:00
William A. Kennington III ffb104750d kernel: Remove 3.16
(cherry picked from commit 4b73212241)
2014-12-18 00:38:52 +01:00
William A. Kennington III 30e74be80f kernel: 3.14.26 -> 3.14.27
(cherry picked from commit 4eaecca7b1)
2014-12-18 00:38:37 +01:00
Domen Kožar 44ed738567 skrooge: add boost dependency
(cherry picked from commit 179c7344cc)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-17 20:14:08 +01:00
vi dc23b0ee8f Added mirrors for MySQL.
(cherry picked from commit 0c49b2942e)
2014-12-17 11:13:30 -05:00
Rob Vermaas b2d5e79e6d icecast: update from 2.4.0 to 2.4.1, potentially fixes CVE-2014-9018
(cherry picked from commit f72c7e93ce)
2014-12-17 15:51:19 +01:00
Rob Vermaas 8e527b5ef8 nodejs: update from 0.10.32 to 0.10.33, potentially fixes CVE-2014-7192
(cherry picked from commit 81f6af4a54)
2014-12-17 15:51:14 +01:00
Rob Vermaas f41c34529f docker: update from 1.3.1 to 1.3.3, potentially fixes CVE-2014-6407, CVE-2014-6408
(cherry picked from commit 90c3dc79c5)
2014-12-17 15:51:10 +01:00
Vladimír Čunát 0dbc415e9d ffmpeg_2_3: use 2.2 instead of 2.3
2.3 branch is unmaintained and was critically vulnerable (I thank to monitor).

(cherry picked from commit 304484a753)
2014-12-16 21:34:06 +01:00
Eelco Dolstra 087e6895c9 cups: Build with SERVERROOT set to /etc/cups
(cherry picked from commit be0e73b938)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:48 +01:00
Eelco Dolstra ca042d2c18 cups: Get rid of obsolete banners
These use bannertops, which no longer exists. And they conflicted with
the working banners in cups-filters.

(cherry picked from commit ffdabf02b9)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:48 +01:00
Eelco Dolstra e6fe8a3fd0 cups-filters: Fix gstoraster
It was trying to find "gs" via execve, so use execvpe instead. It's
probably better to use gs's absolute path, but maybe not every
cups-filters user needs it.

(cherry picked from commit fb079432b0)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:48 +01:00
Eelco Dolstra 2928e8d8f2 cups-filters: Fix finding GS in several filters
(cherry picked from commit 6c00d9f7e4)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:47 +01:00
Eelco Dolstra c981a89bce cups-filters: Fix banners
It was looking in cups' prefix for the PDF templates. So for instance
printing a CUPS test page wouldn't work.

(cherry picked from commit 0aa452e179)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-16 21:04:47 +01:00
Vladimír Čunát 4a261914e6 xorg-server: security update to RC1 of 1.16.3
Close #5292. There are almost no other changes since 1.16.2
than fixing that CVE-2014-8092. See also:
http://www.x.org/wiki/Development/Security/Advisory-2014-12-09/

(cherry picked from commit 84d6debf46)
2014-12-16 19:29:06 +01:00
Domen Kožar 118fd6f526 pypy: disable whole ssl test suit instead of a single test 2014-12-16 17:11:34 +01:00
Bjørn Forsman 5a3b1a4d40 virt-viewer: fix missing schema error
Fixes this error, as seen when trying to open a guest VM when
virt-viewer is accessed over ssh with X forwarding:

  GLib-GIO-ERROR **: Settings schema 'org.gnome.system.proxy' is not installed

A similar issue was fixed for virt-manager in commit
fb8a2b3be7 ("virt-manager: fix missing
schema error")

(cherry picked from commit a2bb84a936)
2014-12-16 14:09:15 +01:00
Eelco Dolstra 9ad2b0988b Document screen incompatibility
(cherry picked from commit 997531d172)
2014-12-16 11:28:34 +01:00
Eelco Dolstra 0bbe723191 php-5.3: Remove
PHP 5.3 is EOL (see http://php.net/supported-versions.php). NixOS
14.12 is a good opportunity to drop it.

(cherry picked from commit 4d918cb6c7)
2014-12-16 11:28:22 +01:00
Eelco Dolstra aafb7aee1b virtualbox: Get tid of runtime dependency on linux.dev
(cherry picked from commit d9ce3ae57f)
2014-12-16 11:27:11 +01:00
Eelco Dolstra 237f9fc866 kdepimlibs: Get rid of a dependency on boost.dev
(cherry picked from commit 0e8373143e)
2014-12-16 11:27:11 +01:00
aszlig d3c277710e
virtualbox: Fix extension pack without hardening.
We divert to the $out/share/virtualbox directory only if we have
hardening enabled, so let's put the extension pack into
$out/libexec/virtualbox instead if we're compiling without hardening.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit eb561f0798)
2014-12-16 11:25:39 +01:00
Bjørn Forsman b43e2c752b virt-viewer: fix SPICE support
* Add missing dependency on 'spice_protocol'

* Fix new build error which came now that ./configure enables SPICE support:

  building virt-viewer
    CCLD     virt-viewer
  /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lgdbm
  /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lcap
  collect2: error: ld returned 1 exit status

  Fix by adding gddbm and libcap as inputs. Yes, libcap is needed
  _in addition_ to libcap_ng (I tested removing libcap_ng, it failed).

Without this change, virt-viewer cannot be used with guests machines
that uses SPICE.

(cherry picked from commit 477bc03568)
2014-12-16 10:51:39 +01:00
Bjørn Forsman 9e678dde06 avr8-burn-omat: update to version 2.1.2
* Update homepage / download url
* Set meta.platforms (= all)

(cherry picked from commit 39dc905310)
2014-12-15 22:32:48 +01:00
aszlig 6fe6960d19
virtualbox package: Disable hardening by default.
Yes, this is only on the package level, so it's possible to use
VirtualBox for example installed by nix-env -i, which of course doesn't
have access to the functionality provided by the various VirtualBox
kernel modules.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit a199eedfce)
2014-12-15 17:56:45 +01:00
Thomas Tuegel ccce6171e9 fontconfig-ultimate: do not replace terminus or proggy fonts 2014-12-15 09:18:02 -06:00
Eelco Dolstra 58bc726d76 strace: Update to 4.9
(cherry picked from commit 1a504e3fb7)
2014-12-15 14:50:15 +01:00
Domen Kožar 59fa67e5a0 pypy: disable cpickle test..
(cherry picked from commit 5819f29875)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-15 14:18:17 +01:00
Vladimír Čunát 8938e6a224 gcc-4.6: bump to 4.6.4
The dropped patch was applied upstream within the update.

(cherry picked from commit 9cdd231ad3)
2014-12-14 22:48:18 +01:00
Thomas Tuegel e32a0ad78c zotero: use firefox instead of xulrunner to fix i686 build 2014-12-14 13:50:12 -06:00
Shea Levy 44da04f80d nix-exec: use nix stable
(cherry picked from commit e82aed56f9)
2014-12-14 13:11:49 -05:00
Domen Kožar 24cba87e7f libsepol: fix download url 2014-12-14 19:05:26 +01:00
Domen Kožar 1f059cd5a9 python: 2.7.8 -> 2.7.9 2014-12-14 19:05:26 +01:00
Bjørn Forsman a05c5d6762 libreoffice: fix Exec= in .desktop files
Before we do substitutions, the Exec= line is (currently)
"Exec=libreofficedev4.3 --some-arg". Our substitution logic doesn't handle
that, resulting in broken "Exec=$out/bin/sofficedev4.3 --some-arg"
($out/bin/sofficedev4.3 doesn't exist).

Looking at libreoffice source, the .desktop files refer to a UNIXBASISROOTNAME
variable which come from instsetoo_native/util/openoffice.lst.in. Currently, it
can have one of two values, presumably depending on whether the build is
"normal" or "development":

  libreoffice${major}.${minor}

  libreofficedev${major}.${minor}

Handle both these cases, and also leave the old non-versioned substitution
around, just in case.

Fixes issue #3463.

(cherry picked from commit 64661f0597)
2014-12-14 18:10:54 +01:00
Vladimír Čunát 743157a95f gnat: make it build again (close #5307)
Problems are worked around by using older gcc wrapper for gnat bootstrap.
(from ca441636f1^)

I tried nicer solutions first, but I was unable to fix all problems for hours.

(cherry picked from commit 1a0a161920)
2014-12-14 17:12:41 +01:00
Vladimír Čunát 2d600bd184 broadcom_sta: fix build with kernel 3.18 (close #5315)
I couldn't find any source that looked reliable, but I guess it's better
than nothing: it's fairly simple patch that fixes the build.

(cherry picked from commit 274a9419c1)
2014-12-14 10:53:31 +01:00
Eelco Dolstra b1f8f90e52 nix-repl: Update
(cherry picked from commit bd0d1e836c)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 09:51:58 +01:00
Eelco Dolstra d6373f2ac4 nix: Update to 1.8
(cherry picked from commit e115bdecd8)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 09:51:54 +01:00
Eelco Dolstra cef8e2df7d Add nix-serve
(cherry picked from commit 188c038897)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 09:51:48 +01:00
Jaka Hudoklin 5e41ab79f7 gitlab: fix i686-linux build and module
It turns out that installing therubytracer, with dependency on old v8, even
when using source libv8 version is problematic.
(see
http://stackoverflow.com/questions/21666379/problems-installing-gitlab-on-odroid-v8-lib-not-available).

But wait, rails does not even need therubytracer, just any kind of javascript
server side execution framework like nodejs. Well just use that, as also
suggested from different internet sources (look link above), it works just
fine.
2014-12-14 09:49:50 +01:00
Mathijs Kwik a1b77e0f9a ghc-head: upgrade to 2014-12-10
(cherry picked from commit 04f73ed2e4)
2014-12-13 21:18:54 +01:00
Mathijs Kwik a266855d15 dvdauthor: fix building against glibc 2.20
and 2 other patches from redhat

(cherry picked from commit 9a7d425edd)
2014-12-13 21:18:41 +01:00
Mathijs Kwik 27df8a588f mkvtoolnix: fix to find boost lib
(cherry picked from commit 752554cdcb)
2014-12-13 21:18:34 +01:00
Domen Kožar 94c1406951 fix perl build failures 2014-12-13 16:32:09 +01:00
Domen Kožar 6425765553 lzma-conduit: broken on 32bit linux, see #5313
(cherry picked from commit 4709c950f0)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-13 15:28:35 +01:00
Domen Kožar b7894032b4 hhvm: use upstream patches to fix the build 2014-12-13 15:22:38 +01:00
Domen Kožar b1140ab80c Merge pull request #5314 from offlinehacker/teh-gitlab-release-14.12
[14.12] nixos: Add gitlab and gitlab-shell
2014-12-12 19:56:46 +01:00
Domen Kožar 896036d8e5 whitespace change to fix k2pdfopt build 2014-12-12 18:37:50 +01:00
Domen Kožar 23d01bb90c gltron: mark as broken 2014-12-12 18:36:15 +01:00
Jaka Hudoklin b82803983b nixos/gitlab: fixes
- fix timezone data not found
- fix module, add simple test
- allow to set port
2014-12-12 18:09:08 +01:00
Thomas Hunger 0c95c87758 nixos: Add gitlab and gitlab-shell
I had to make several adjustments to make it work with nixos:

* Replace relative config file lookups with ENV variable.
* Modify gitlab-shell to not clear then environment when running
  pre-receive.
* Modify gitlab-shell to write some environment variables into
  the .authorized_keys file to make sure gitlab-shell reads the
  correct config file.
* Log unicorn output to syslog.
  I tried various ways of adding a syslog package but the bundler would
  not pick them up. Please fix in a better way if possible.
* Gitlab-runner program wrapper.
  This is useful to run e.g. backups etc. with the correct
  environment set up.
2014-12-12 18:09:06 +01:00
Domen Kožar 9d0d9ae9f7 hhvm: 3.2.0 -> 3.3.0, fix build 2014-12-12 17:08:28 +01:00
Michael Raskin 5a104cdcd9 Fix fetchzip for actuall zip files
(cherry picked from commit 9ed097ab50)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 13:58:29 +01:00
Michael Raskin 3461855316 Improve eudev paths in the same way as they are set in the original package 2014-12-12 13:58:17 +01:00
Massimo Zaniboni a3ed55b99a redmine: use libc libciconv implementation on Linux.
(cherry picked from commit 32f9644943)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 10:48:11 +01:00
Vladimír Čunát a1c1589b52 Merge #5286: ati-driver: Update to 4.12
(cherry picked from commit 80e3018bc0)
2014-12-11 22:13:46 +01:00
Domen Kožar 9629a59a4c deluge: 1.3.10 -> 1.3.11 2014-12-11 15:40:35 +01:00
Domen Kožar c8d9073c0e pythonPackages.pyptlib: disable tests 2014-12-11 11:22:55 +01:00
Domen Kožar 6ce4ea5482 remove libvlc, unused package
cc @ttuegel

(cherry picked from commit aaf998f604)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-11 10:39:42 +01:00
Domen Kožar d58fd144ac folly: disable on 32bit (unsupported)
(cherry picked from commit 776d796221)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-11 10:39:34 +01:00
Domen Kožar 20fdf0fab1 classpath: fix build
(cherry picked from commit 3c9828fd77)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-11 10:39:26 +01:00
Domen Kožar 322607e6ce opentsdb: patch shebangs in correct directory 2014-12-11 09:17:23 +01:00
Michael Raskin 8b55030957 Update/Fix OVMF
(cherry picked from commit a199693cab)
2014-12-11 08:53:23 +03:00
Domen Kožar d92b7b7a67 fix builds for rest of kernel modules on 3.18
(cherry picked from commit 27281f660c)
2014-12-11 02:04:15 +01:00
Vladimír Čunát a4afaf15e8 kde: fix CVE-2014-8600 by upstream patches
https://www.kde.org/info/security/advisory-20141113-1.txt
I couldn't find kio-extras, so I hope we don't have it disguised somewhere.

(cherry picked from commit 15b9626a3d)
2014-12-10 21:53:54 +01:00
Vladimír Čunát 55d793f2fb libyaml: fix CVE-2014-9130 by upstream patch
(cherry picked from commit c8a53923fc)
2014-12-10 21:53:54 +01:00
Vladimír Čunát 3fb1e7ed7c cpio: fix CVE-2014-9112 by Fedora patch
(cherry picked from commit 225ddcda9a)
2014-12-10 21:53:54 +01:00
Domen Kožar 6efba89335 Revert "xulrunner: use gold linker"
This reverts commit fc31d6dbc7.

Error occurs randomly: http://hydra.nixos.org/eval/1165369
2014-12-10 21:14:27 +01:00
Domen Kožar 79387f419d python3Packages.dateutil_2_1: fix build 2014-12-10 21:10:40 +01:00
Peter Simons 1bfa102c9b vimus: disable Linux 32 bit builds
https://ghc.haskell.org/trac/ghc/ticket/9825
(cherry picked from commit 57c5b8f5e1)
2014-12-10 19:31:57 +01:00
Emery Hemingway 7a0036d129 glibc_multi: fix package name (close #5284)
"multi" should be between the "glibc" and the version

(cherry picked from commit be2060f1e7)
2014-12-10 18:33:54 +01:00
Eelco Dolstra 3a491aaacb php: Really update to 5.4.34
75738437a4 only updated the version string...

(cherry picked from commit 55d59eefb3)
2014-12-10 17:19:56 +01:00
Vladimír Čunát d7b053a44c apparmor: fix build by using older perl
This is work around #5270.
Also bogus path in wrapper got fixed.

CC: maintainers @phreedom, @thoughtpolice.
It would be better to test this as well by someone who actually uses it.

(cherry picked from commit 62e5e2a880)
2014-12-10 16:14:49 +01:00
Vladimír Čunát bdf161ed8d dolphin-emu-master: disable unsupported i686 platform
(cherry picked from commit e815624b67)
CC maintainer @MP2E.
2014-12-10 15:44:02 +01:00
Vladimír Čunát 9530bb2174 shotcut: mark as broken for now
(cherry picked from commit b65c8ffc37)
2014-12-10 15:36:26 +01:00
Mathijs Kwik fc31d6dbc7 xulrunner: use gold linker 2014-12-10 13:56:40 +01:00
Vladimír Čunát 9532b0b1f4 luminance-hdr: fix build by Debian patch
(cherry picked from commit 8ca78f0376)
2014-12-10 13:37:35 +01:00
Vladimír Čunát d5428a8ea9 qt5SDK: fix build by not building docs
Feel free to find a proper fix.

(cherry picked from commit d7a7b72353)
2014-12-10 13:21:45 +01:00
Vladimír Čunát f7ad0d2e19 root: fix build by upstream patch
Also refactor the expression a little.

(cherry picked from commit 7ce485ff0f)
2014-12-10 13:11:42 +01:00
Domen Kožar fbc784c22c flexget: fix runtime dependencies 2014-12-10 12:53:53 +01:00
Domen Kožar 671efd23de lttng-modules: fix build on kernel 3.18 2014-12-10 12:53:53 +01:00
Domen Kožar cab4205ad7 v4l2loopback: fix build in kernel 3.18 2014-12-10 12:53:53 +01:00
aszlig 6757f0c7fc
tomahawk: Fix resolver signature verification.
Requires the OpenSSL QCA plugin, otherwise QCA is unable to load the
Tomahawk public key.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-12-10 10:29:16 +01:00
Domen Kožar 5b8544337f tcpcrypt: 2011.07.22 -> 0.3rc1, fix nixos service 2014-12-10 10:23:28 +01:00
Domen Kožar d3df56dfa1 gmpc: fix build 2014-12-10 09:55:22 +01:00
Domen Kožar 3703e4d00a fix a bunch of perl modules 2014-12-10 01:37:37 +01:00
Bjørn Forsman f8047b48a1 lttng-modules: fix build on linux 3.14.x
By applying patch from upstream mailing list[1] (should be in the next
release).

[1]: http://lists.lttng.org/pipermail/lttng-dev/2014-December/023914.html

(cherry picked from commit 507e78fb94)
2014-12-09 19:35:43 +01:00
Bjørn Forsman 2f430a1ac4 buildbot-slave: align attrname with pkgname
Keep old attrname (buildbotSlave) around for backward compatibility.

(cherry picked from commit 1b396c7ae9)
2014-12-09 19:16:10 +01:00