1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 12:11:28 +00:00
Commit graph

70021 commits

Author SHA1 Message Date
Bjørn Forsman 67723df930 nixos/jenkins: rework environment handling
Jenkins gets (by default) an additional environment of

  { NIX_REMOTE = "daemon"; }

This has the following problems:

  1. NIX_REMOTE disappears when users specify additional environment
     variables, because defaults have low merge priority.
  2. nix cannot be used without additional NIX_PATH envvar, which is
     currently missing.
  3. If you try to use HTTPS, you'll see that jenkins lacks
     SSL_CERT_FILE envvar, causing it to fail.

This commit adds config.environment.sessionVariables and NIX_REMOTE to
the set of variables that are always there for jenkins, making nix and
HTTPS work out of the box.

services.jenkins.environment is now empty by default.
2015-10-04 20:04:00 +02:00
Bjørn Forsman f91c5bcc7a jquery-ui: 1.11.1 -> 1.11.4 2015-10-04 17:57:42 +02:00
Matthias Beyer bff59c5f00 jquery: 1.11.2 -> 1.11.3
[Bjørn: add 2nd hash (for the "uncompressed" download)]
2015-10-04 17:47:37 +02:00
Edward Tjörnhammar d02869496b makemkv: 1.9.5 -> 1.9.7 2015-10-04 17:02:51 +02:00
Domen Kožar 161bf6c8cd Merge pull request #10220 from enolan/update-flash
flashplayer: 11.2.202.508 -> 11.2.202.521 security
2015-10-04 15:23:55 +02:00
Arseniy Seroka e822dfd8f6 Revert "steam: added libcxxabi workaround"
This reverts commit 2b761358a8.
2015-10-04 15:43:46 +03:00
Bjørn Forsman 5f17aeb403 nixos/docker: default storageDriver to "devicemapper"
Commit 9bfe92ecee ("docker: Minor improvements, fix failing test") added
the services.docker.storageDriver option, made it mandatory but didn't
give it a default value. This results in an ugly traceback when users
enable docker, if they don't pay enough attention to also set the
storageDriver option. (An attempt was made to add an assertion, but it
didn't work, possibly because of how "mkMerge" works.)

The arguments against a default value were that the optimal value
depends on the filesystem on the host. This is, AFAICT, only in part
true. (It seems some backends are filesystem agnostic.) Also, docker
itself uses a default storage driver, "devicemapper", when no
--storage-driver=x options are given. Hence, we use the same value as
default.

Add a FIXME comment that 'devicemapper' breaks NixOS VM tests (for yet
unknown reasons), so we still run those with the 'overlay' driver.

Closes #10100 and #10217.
2015-10-04 14:34:38 +02:00
Bjørn Forsman 424e6e501a nixos/modules: simplify pkgs.zfs handling
Thanks, @lethalman.
2015-10-04 14:31:16 +02:00
Cillian de Róiste 1d3a4b17dd yoshimi: update from 1.3.5.2 to 1.3.6 2015-10-04 14:27:36 +02:00
Casey Ransom 791b600aac nixos/docker: Include ZFS commands in PATH for ZFS storagedriver
When using the ZFS storagedriver in docker, it shells out for the ZFS
commands. The path configuration for the systemd task does not include
ZFS, so if the driver is set to ZFS, add ZFS utilities to the PATH.

This will resolve https://github.com/NixOS/nixpkgs/issues/10127

[Bjørn: prefix commit message with "nixos/docker:", remove extra space
before ';']
2015-10-04 14:13:56 +02:00
vbgl ded3dfbce6 Merge pull request #10224 from gebner/viewnior-1.5
viewnior: 1.4 -> 1.5
2015-10-04 12:23:28 +02:00
Gabriel Ebner ff308d06e9 viewnior: 1.4 -> 1.5 2015-10-04 11:56:32 +02:00
Thomas Strobel d286ac5887 networking module: restructure wlanInterfaces
Restructure internals of networking.wlanInterfaces option to generate
proper '.device' systemd targets for the WLAN interfaces.
2015-10-04 11:00:05 +02:00
Domen Kožar f99fbfd1dd README: 14.12 -> 15.09 2015-10-04 09:23:44 +02:00
William A. Kennington III cac0d87d98 kernel: 4.1.9 -> 4.1.10 2015-10-03 22:25:48 -07:00
William A. Kennington III 62fa68e00c kernel: 3.18.21 -> 3.18.22 2015-10-03 22:25:40 -07:00
William A. Kennington III 23ff27b2c4 kernel: 3.10.89 -> 3.10.90 2015-10-03 22:25:33 -07:00
William A. Kennington III 759c86c817 chromiumBeta: 46.0.2490.42 -> 46.0.2490.52 2015-10-03 22:22:21 -07:00
William A. Kennington III 2f88045360 mumble: Combine into a generic derivation
Also add a git version since 1.3.0 supports qt5 as well as a host of new
features.
2015-10-03 22:22:21 -07:00
Echo Nolan 89931277de flashplayer: add myself to maintainers 2015-10-03 20:54:38 -07:00
Echo Nolan 78dd7f8543 flashplayer: 11.2.202.508 -> 11.2.202.521 security
Several CVEs, listed here:
https://helpx.adobe.com/security/products/flash-player/apsb15-23.html

Tested by installing firefox-wrapper with nix-env and running twitch.tv
and a flash game.
2015-10-03 20:54:23 -07:00
Vincent Laporte 2702f01ee9 ocaml-twt: 0.93.2 -> 0.94.0 2015-10-04 01:17:33 +02:00
Nikolay Amiantov 85eb69ec5c Merge pull request #10205 from bjornfor/build-fhs-chrootenv-with-os-release
build-fhs-chrootenv: add /etc/os-release from host
2015-10-03 22:38:42 +03:00
Shea Levy fc719c2437 Fix kernel config names for BRCMFMAC_* 2015-10-03 15:35:06 -04:00
Shea Levy e7f0b0297d Linux: Enable PCIe and USB support for brcmfmac 2015-10-03 15:22:52 -04:00
Shea Levy edefa43d49 Linux 4.2: Bump 2015-10-03 15:22:03 -04:00
Tobias Geerinckx-Rice ef472a60d8 perlPackages.PerlTidy 20130922 -> 20150815 2015-10-03 16:58:33 +02:00
Tobias Geerinckx-Rice bcd0c2d265 perlPackages.PerlOSType 1.007 -> 1.009 2015-10-03 16:58:33 +02:00
Tobias Geerinckx-Rice 88c0002cdd perlPackages.PodEscapes 1.06 -> 1.07 2015-10-03 16:58:32 +02:00
Tobias Geerinckx-Rice 15ccfaa0b8 perlPackages.SubExporterUtil 0.984 -> 0.987 2015-10-03 16:58:32 +02:00
Tobias Geerinckx-Rice 2db0c844bc perlPackages.StringUtil 1.21 -> 1.24 2015-10-03 16:58:32 +02:00
Tobias Geerinckx-Rice 6cfe70d83d perlPackages.Starman 0.4010 -> 0.4014 2015-10-03 16:58:31 +02:00
Tobias Geerinckx-Rice 18bf3e3e48 perlPackages.TermCap 1.16 -> 1.17 2015-10-03 16:58:31 +02:00
Aycan iRiCAN 4e9f5328a5 snort: move dynamic path defs to wrapper script. 2015-10-03 17:22:40 +03:00
Arseniy Seroka c20aae96e4 Merge pull request #10209 from gebner/qutebrowser-0.4.1
qutebrowser: 0.4.0 -> 0.4.1
2015-10-03 16:37:37 +03:00
Gabriel Ebner 31779e6347 qutebrowser: 0.4.0 -> 0.4.1 2015-10-03 15:30:32 +02:00
Bjørn Forsman 05668fbe92 build-fhs-chrootenv: add /etc/os-release from host
This allows software inside the chroot to identify the host OS via the
standard /etc/os-release file.
2015-10-03 14:58:41 +02:00
Peter Simons 51db26ee03 Merge pull request #10200 from matthiasbeyer/fix-davfs2
davfs2: Fix broken build
2015-10-03 14:34:04 +02:00
Nikolay Amiantov 9d430e6446 haskell-llvm-general: fix build 2015-10-03 14:15:51 +03:00
Matthias Beyer 413d9f4177 davfs2: Set dependency of neon to neon v0.29.6 2015-10-03 13:01:31 +02:00
Matthias Beyer 3e5dbb7b78 neon: Re-add version 0.29.6 2015-10-03 13:01:31 +02:00
Vladimír Čunát e0ebb928e1 claws-mail: use a better-maintainable URL
/cc maintainer @khumba.
2015-10-03 12:43:39 +02:00
Arseniy Seroka e4f0e0e50a Merge pull request #10191 from khumba/claws-mail-3.12.0
claws-mail: 3.11.1 -> 3.12.0, remove priority workaround
2015-10-03 13:07:56 +03:00
Vladimír Čunát f7d5210677 mysql55: remove lib/*.a, as probably noone needs it
/cc #172.
2015-10-03 11:24:17 +02:00
vbgl d9893554cf Merge pull request #10196 from FRidh/ipython
pythonPackages ipython: add readline support, fixes #10190
2015-10-03 09:11:03 +02:00
Frederik Rietdijk a3b5ae8ad4 pythonPackages ipython: add readline support, fixes #10190 2015-10-03 08:37:00 +02:00
Bryan Gardiner a0de3cd969
claws-mail: 3.11.1 -> 3.12.0, remove priority workaround 2015-10-02 18:43:21 -07:00
Domen Kožar 3a658f4c41 Merge pull request #10083 from greyson/pythonofx
Python OFX libraries and utilities
2015-10-03 01:56:52 +02:00
Peter Simons fac03e7441 git-annex: update override to disable the assistant in Stackage 2015-10-02 22:18:45 +02:00
Peter Simons 728f666829 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-8-g2bcda7a using the following inputs:

  - Nixpkgs: 8af2f6e9c4
  - Hackage: db7872f264
  - LTS Haskell: 831a37566b
  - Stackage Nightly: e5598095e1
2015-10-02 22:18:45 +02:00