3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

54554 commits

Author SHA1 Message Date
Eelco Dolstra f82ab5981c Fix ANSI escape in warning messages
Seems to have been broken by accident in 7d1ddae58e.
2014-12-15 12:08:31 +01:00
Jaka Hudoklin ec2a51519d nixos/gitlab: enable tests in release 2014-12-15 00:39:04 +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
Domen Kožar fa4e45f20c add chromium test to the tested job 2014-12-14 13:46:48 +01:00
Domen Kožar fde7e1286e fix quake3 test 2014-12-14 13:34:04 +01:00
Sebastián Bernardo Galkin a8510482d9 Fix networkmanager resumeCommands
Small typo prevented the post resume script to restart network manager

(cherry picked from commit aba0d8a73d)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-14 13:09:59 +01:00
Domen Kožar ad4e371acf typo 2014-12-14 11:28:58 +01:00
Domen Kožar 0e37a9fa41 http://nixos.org -> https://nixos.org 2014-12-14 11:26:21 +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 97ec11c43b nixos/gitlab: imporove tests 2014-12-14 09:49:50 +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
Jaka Hudoklin e048d38d4e nixos/kubernetes: fix test, make more deterministic by having more ram 2014-12-14 02:44:10 +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
aszlig 2460b40331
nixos/virtualbox: Fix setuid wrappers.
We only need to have setuid-root wrappers for VBox{Headless,SDL} and
VirtualBox, otherwise VBoxManage will run as root and NOT drop
privileges!

Fixes #5283.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit 0d71ec8a6e)
2014-12-13 07:52:59 +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
Domen Kožar 6c406b9425 Merge pull request #5310 from offlinehacker/kubernetes_fleet_rename
[14.12] nixos: move kubernetes & fleet to services/cluster
2014-12-12 15:37:16 +01:00
Jaka Hudoklin d88567ed08 nixos: move kubernetes & fleet to services/cluster 2014-12-12 14:39:51 +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
Domen Kožar a9590e474d Merge pull request #5280 from vcunat/p/hibernation
nixos: check resumeDevice is absolute path and document
2014-12-12 11:11:15 +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
ambrop7@gmail.com c19ca69ac8 virtualbox: Unbreak the nixos module.
(cherry picked from commit 65393ca8d3)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 10:47:35 +01:00
ambrop7@gmail.com 268f3f4cc7 virtualbox: Allow disabling the network interface.
The current nixos module for VirtualBox unconditionally configures a vboxnet0
network interface at boot. This may be undesired, especially when the user wants
to manage network interfaces in a centralized manner.

(cherry picked from commit 9fa2c35ec8)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 10:46:46 +01:00
aszlig 4504b12bc1 nixos-install: Pass CA cert bundle to chroot.
Since we're using HTTPS for the binary cache (introduced in faf0797) by
default, the binary cache should also be available during installation.

The file that is defined in SSL_CERT_FILE outside of the chroot is
copied over to /tmp/ca-cert.crt inside the chroot, so we have an
absolute path we can reference during nixos-install. However, this might
end up with the file not being cleaned up properly from outside of the
store, but neither would be /tmp/root so the cleanup issue needs to be
solved in another place (or commit to be more exact).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
(cherry picked from commit cf7f15c92c)
Signed-off-by: Domen Kožar <domen@dev.si>
2014-12-12 10:46:11 +01:00
Bjørn Forsman d410622cdf nixos/gnome: enable MTP support in gvfs
To support browsing files on Android phones in Nautilus (and other GVFS
based file browsers).

(cherry picked from commit f3a46c3858)
2014-12-12 07:58:37 +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