Commit graph

121315 commits

Author SHA1 Message Date
John Ericson e755a8a27d treewide: Use targetPrefix instead of prefix for platform name prefixes
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
2017-11-27 03:15:50 -05:00
Orivej Desh fbbda41e05 Restore more accurate history of the master branch
The first child is the proper master.
The second child is the proper staging.
The third child is FRidh work.
The forth child is the previous master at origin.
2017-11-25 11:37:17 +00:00
Jörg Thalheim 5233333265
Merge pull request #32022 from bachp/gitlab-runner-10.2.0
gitlab-runner: 10.1.0 -> 10.2.0
2017-11-25 11:12:43 +00:00
Orivej Desh 88cf8e92d8 Restore first-parent history of the master branch
after 0cd857bffd has reversed master and staging
2017-11-25 10:59:28 +00:00
Frederik Rietdijk 0cd857bffd Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-25 11:38:13 +01:00
Frederik Rietdijk 88eea6947f
Merge pull request #31781 from robertodr/hdf5-fortran-2003
Update HDF5 and add option to compile Fortran2003 interface
2017-11-25 10:37:42 +00:00
Orivej Desh 6d9ad27103
Merge pull request #31995 from jtojnar/xserver-libinput
Use libinput for all input devices when enabled
2017-11-25 10:33:39 +00:00
Jan Tojnar c177b838df nixos/xserver: let X choose the xkb rules
With libinput used for keyboard, base rules produce incorrect keyboard
layouts. We are removing the option as recommended in the XKB configuration
guide [1] to let X server choose the ruleset. It looks like it chooses
evdev rules which seem to work for some reason

[1]: https://www.x.org/releases/X11R7.6/doc/xorg-docs/input/XKB-Config.html#id2521360
2017-11-25 10:27:31 +00:00
Kjetil Orbekk bd3e49a80e nixos/munin: fix broken plugin wrappers
The munin-node service used wrapProgram to inject environment variables.
This doesn't work because munin plugins depend on argv[0], which is
overwritten when the executable is a script with a shebang line (example
below).

This commit removes the wrappers and instead passes the required
environment variables to munin-node.

Eliminating the wrappers resulted in some broken plugins, e.g., meminfo
and hddtemp_smartctl. That was fixed with the per-plugin configuration.

Example:

  The plugin if_eth0 is a symlink to /.../plugins/if_, which uses $0
  to determine that it should monitor traffic on the eth0 interface.

  if_ is a wrapped program, and runs `exec -a "$0" .if_-wrapped`

  .if_-wrapped has a "#!/nix/.../bash" line, which results in bash
  changing $0, and as a result the plugin thinks my interface
  is called "-wrapped".
2017-11-25 11:23:56 +01:00
Kjetil Orbekk a2dc37c7d1 munin-node: patch to configure plugin-conf.d
Add a new patch (adding_sconfdir_munin-node.patch) to be able to
configure the location of plugin-conf.d (otherwise it has to be
configured at build time).  This patch is very similar to the
existing 'adding_servicedir_munin-node.patch'.
2017-11-25 11:23:56 +01:00
Kjetil Orbekk c164d83536 munin-node: add patch to preserve environment variables 2017-11-25 11:23:56 +01:00
Kjetil Orbekk e36962a002 munin: 2.0.33 -> 2.0.34 2017-11-25 11:23:56 +01:00
Jörg Thalheim b0bf60a4e2
Merge pull request #32010 from pcarrier/pcarrier/minijail
minijail: init at android-8.0.0_r34
2017-11-25 10:09:09 +00:00
Jörg Thalheim 93a13f6b1e
Merge pull request #32021 from bachp/riot-web-0.13.1
riot-web: 0.12.6 -> 0.13.1
2017-11-25 10:06:16 +00:00
Jörg Thalheim 75f713c9ad
Merge pull request #32012 from chpatrick/cnijfilter_4_00
cnijfilter: init at 4.00
2017-11-25 09:50:51 +00:00
Jörg Thalheim fd10e3b4b1
Merge pull request #32018 from adisbladis/traefik-1_4_4
traefik: 1.3.8 -> 1.4.4
2017-11-25 09:48:39 +00:00
Pascal Bach a1c98a8f78 gitlab-runner: 10.1.0 -> 10.2.0 2017-11-25 10:46:45 +01:00
Pascal Bach f008d1c305 riot-web: 0.12.6 -> 0.13.1 2017-11-25 10:38:57 +01:00
Joerg Thalheim 88dfc0333a luaPackages.vicious: 2.2.0 -> 2.3.0
cc @makefu
2017-11-25 09:36:27 +00:00
Kier Davis cb9bf1c854 PySolFC: init at 2.0
PySolFC is a solitaire game written in Python, supporting thousands of
solitaire variants.
2017-11-25 09:43:42 +01:00
Frederik Rietdijk e2349070ac octaveFull: always use openblasCompat on darwin
Haven't tested this, but considering `octave` on darwin also uses
openblasCompat, we may want it here as well.
2017-11-25 09:31:37 +01:00
Frederik Rietdijk d087463b48 Merge remote-tracking branch 'upstream/master' into HEAD 2017-11-25 09:13:36 +01:00
Frederik Rietdijk c06bc73222 python3.pkgs.urwid: remove several tests 2017-11-25 09:03:32 +01:00
Frederik Rietdijk ddbe2dda4b python.pkgs.tqdm: remove performance tests 2017-11-25 08:49:32 +01:00
Frederik Rietdijk d34aeaf031 python.pkgs.jedi: unpin parso dependency 2017-11-25 08:46:51 +01:00
Orivej Desh 45a85eaceb go-sct: disable on Darwin
It does not support Darwin.
2017-11-25 07:35:44 +00:00
Orivej Desh 03209fc043 coyim: disable on Darwin
It has never been building on Darwin.
2017-11-25 07:28:08 +00:00
Orivej Desh 2f1a818d00 nixos/fwupd: disable by default
It causes building during evaluation when enabled, and it is hardly useful
without GNOME or the awareness of the system operator.
2017-11-25 06:49:38 +00:00
Vladimír Čunát 474c1ce799
nixos.tests.installer.swraid: increase drive size
The latest staging caused this test not to fit anymore.
I'm all for keeping closure sizes under control,
but I don't think *this* is a good place.
2017-11-25 07:46:28 +01:00
Vladimír Čunát 3bc7d00622
Merge #32017: thunderbird*: security 52.4.0 -> 52.5.0 2017-11-25 07:10:19 +01:00
Vladimír Čunát 88ccc386f5
nixpkgs.metrics: --show-trace into the log
If the log is empty, it's difficult to debug problems.  This case:
https://github.com/NixOS/nixpkgs/pull/30252/files#r153038794
2017-11-25 07:07:27 +01:00
Pierre Carrier cb05c04f4e minijail: init at android-8.0.0_r34 2017-11-25 00:27:00 -05:00
adisbladis b3197e030c
Merge pull request #32008 from mbode/terraform-0_11
terraform: 0.10.7 -> 0.10.8, 0.11.0
terraform: add 0.11 
terraform: upgrade providers
2017-11-25 12:01:26 +08:00
adisbladis dfa4fbb98b
traefik: 1.3.8 -> 1.4.4 2017-11-25 11:55:24 +08:00
Peter Hoeg fd680f162c influxdb: make it know what version it is 2017-11-25 10:45:49 +08:00
aszlig f62c87b45f
linuxPackages: Revert accidental bump to 4.14
Regression introduced by e5c24abf3b.

I've added this for my WIP tests and forgot to reset them out of the
mentioned commits.

Signed-off-by: aszlig <aszlig@nix.build>
2017-11-24 23:13:41 +01:00
aszlig e5c24abf3b
virtualbox: 5.2.0 -> 5.2.2
Upstream changes without issue IDs:

 * User interface: various improvements for high resolution screens
 * User interface: added functionality to duplicate optical and floppy
                   images
 * User interface: various improvements for the virtual media manager
 * VMM: fixed emulation so that Plan 9 guests can start once more (5.1.0
        regression)
 * Storage: fixed regression breaking iSCSI
 * Audio: added HDA support for more exotic guests (e.g. Haiku)
 * Serial: fixed hanging I/O when using named pipes on Windows (5.2.0
           regression)
 * Serial: fixed broken communication with certain devices on Linux
           hosts
 * USB/OHCI: improved behavior so that the controller state after a VM
             reset is closer to the initial state after VM start
 * EFI: fixed HFS+ driver which in rare cases failed to access most
        files on a volume
 * Shared clipboard: fixed hang with OS X host and Linux guest
 * Linux hosts: fixed kernel module compilation and start failures with
                Linux kernel 4.14
 * X11 hosts: better handle WM_CLASS setting
 * Linux guests: fixed kernel module compilation and other problems with
                 Linux kernel 4.14
 * Linux guests: fixed various 5.2.0 regressions
 * Bridged networking: fixed duplicate EtherType in VLAN/priority tags
                       on Linux (5.2.0 regression)

The full changelog including issue IDs can be found at:

https://www.virtualbox.org/wiki/Changelog

Aside from just bumping the version number I also had to strip 3 levels
of the paths included in the guest-additions patches, because the
version was hardcoded in there and the patches still apply as-is.

I've re-added the stripped path using patchFlags and the -d option of
the patch utility.

Tested this by running all of the tests in the "virtualbox" NixOS VM
test module, here is the URL to the finished evaluation on my Hydra:

https://headcounter.org/hydra/eval/380191

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @NeQuissimus, @orivej, @etu, @vcunat
Issue: https://github.com/NixOS/nixpkgs/issues/31640
Issue: https://github.com/NixOS/nixpkgs/pull/31037
2017-11-24 23:10:57 +01:00
Jörg Thalheim 8b237dbd2f
Merge pull request #31988 from Baughn/povray
povray: Add X11/SDL preview support
2017-11-24 20:07:12 +00:00
Patrick Chilton 8bfa14f5a7 cnijfilter: add 4.00 2017-11-24 21:02:40 +01:00
Graham Christensen 9400921c3a
Merge pull request #31981 from pbogdan/update-wordpress
wordpress: 4.8.3 -> 4.9
2017-11-24 14:43:41 -05:00
Frederik Rietdijk 44e98de414 python.pkgs: maintenance updates 2017-11-24 20:36:20 +01:00
Frederik Rietdijk 0f50d5ac19 python.pkgs.trollius: use optionals instead of optional, fixes eval for neovim
Eval of neovim was broken at
40851a4d26 (commitcomment-25817374).
2017-11-24 20:14:28 +01:00
Frederik Rietdijk 7a13e5a7df Merge remote-tracking branch 'upstream/python-unstable' into HEAD 2017-11-24 19:58:07 +01:00
Vladimír Čunát 7dfa97969a
Merge branch 'staging' (older one)
Hydra seems OK-ish, except that some aarch64 jobs need restarting
after qt4 timing out for the first time:
https://hydra.nixos.org/eval/1412641?compare=1412561
2017-11-24 18:36:54 +01:00
Peter Simons 1743953cc5 haskell-Cabal: bump 2.x branch to version 2.0.1.0 2017-11-24 18:34:32 +01:00
Peter Simons a2cd405a16 hackage-packages.nix: automatic Haskell package set update
This update was generated by hackage2nix v2.7 from Hackage revision
31b0f83319.
2017-11-24 18:34:28 +01:00
Robert Helgesson a4d2a5ea71
perlPackages: update a few packages
- Catalyst-Plugin-HTML-Widget: Add meta section and mark as broken

- Class-Load: 0.23 -> 0.24

- Class-Load-XS: 0.09 -> 0.10

- UNIVERSAL-require: 0.17 -> 0.18
2017-11-24 17:45:42 +01:00
Graham Christensen 3216947201
Merge pull request #31996 from kierdavis/ckb-next
ckb: update to ckb-next 0.2.8
2017-11-24 08:42:57 -05:00
Tim Steinbach 10b113f81b
vscode: 1.18.0 -> 1.18.1 2017-11-24 08:39:26 -05:00
Tim Steinbach 0a123ae574
gradle: 4.3 -> 4.3.1 2017-11-24 08:30:22 -05:00