Compare commits

...

2371 Commits

Author SHA1 Message Date
Mario Rodas
3e1be2206b ruby_2_5: 2.5.7 -> 2.5.8
Changelog: https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-5-8-released/
(cherry picked from commit 99b09d6b8f)
2020-04-01 13:18:30 +00:00
zowoq
1e47a6c30c ffmpeg_2_8: 2.8.14 -> 2.8.15
(cherry picked from commit c13f1a508d)
2020-01-04 12:37:33 +00:00
Mario Rodas
23c020191c ruby_2_5: 2.5.1 -> 2.5.7
Changelog: https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-5-7-released/
(cherry picked from commit 5e76e7b430)
2019-10-02 11:29:04 +00:00
Mario Rodas
ec5e2e71b5 ruby_2_4: 2.4.4 -> 2.4.9
Changelog:
- https://www.ruby-lang.org/en/news/2019/10/01/ruby-2-4-8-released/
- https://www.ruby-lang.org/en/news/2019/10/02/ruby-2-4-9-released/

(cherry picked from commit 5ed9d8b8aa)
2019-10-02 11:27:48 +00:00
Vitalii Zinchenko
4d48e8106f libelf: fix download url (#65576)
(cherry picked from commit 179ab19856)
2019-07-29 20:46:40 -04:00
aszlig
28a8459924 python/hetzner: 0.8.1 -> 0.8.2
Only includes a small fix for the login into the Robot Web interface,
which is used to eg. provide access to admin accounts (which in turn is
used by the NixOps Hetzner backend).

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit 56009d4a8d)
2019-05-27 19:24:01 +02:00
Matthew Bauer
c8c521f0c0 nixos-rebuild: get Nix from channel
If our old Nix can’t evaluate the Nixpkgs channel, try the fallback
from the new channel /first/. That way we can upgrade Nix to a newer
version and support breaking changes to Nix (like seen in the upgrade
o Nix 2.0).

This change should be backported to older NixOS versions!

(cherry picked from commit 475c8aa018)
2019-03-02 18:53:35 -05:00
Daniël de Kok
cb0e20d6db python/grpcio: fix darwin build
grpcio currently does not build on Darwin (10.13.6). Due to the
following issues:

* ar is invoked with incorrect flags (#33765).
* libtool cannot be found, with a libtool dependency, with libtool
  the option '-no_warning_for_no_symbols' is not recognized.
* the module build cannot find boringssl that is packaged with
  python-grpcio when pkgconfig is not installed (grpc/#10058).

(cherry picked from commit 4beb94d6d6)
2019-02-15 11:56:17 -05:00
Dmitry Kalinkin
fe792ef27a buildbot: fix CVE-2019-7313 2019-02-04 00:58:51 -05:00
Samuel Dionne-Riel
138f2cc707 Merge pull request #53892 from nh2/issue-53891-release-18.03-linux-build-cifs-posix
release-18.03: linux: Fix kernel build for Linux >= 4.14.90
2019-01-13 15:28:30 -05:00
Niklas Hambüchen
bfb33279b5 linux: Fix kernel build for Linux >= 4.14.90. Fixes #53891.
Similar to 98ac5710bd.
2019-01-13 20:44:08 +01:00
Tim Steinbach
9caa69fbae linux: 4.14.89 -> 4.14.90
(cherry picked from commit dea57f15e9)
2018-12-21 09:12:09 -05:00
Tim Steinbach
2cbf9ade60 linux: 4.9.146 -> 4.9.147
(cherry picked from commit a5f447e16a)
2018-12-21 09:12:08 -05:00
Tim Steinbach
357bd4ee67 linux: 4.4.168 -> 4.4.169
(cherry picked from commit 54ce2e016b)
2018-12-21 09:12:07 -05:00
Tim Steinbach
791c339022 linux: 4.4.167 -> 4.4.168
(cherry picked from commit e29ebd9e51d20f132c41fb8f641aaf6a5bbc5cd5)
2018-12-18 09:12:57 -05:00
Tim Steinbach
f35259606b linux: 4.14.88 -> 4.14.89
(cherry picked from commit 56fcbb2f7882445d77bd5ba60bd11f22f743c540)
2018-12-17 09:19:51 -05:00
Tim Steinbach
8ef7655400 linux: 4.9.145 -> 4.9.146
(cherry picked from commit 2e749ccd868d3cf38e61aa6e98a2641cf8dad432)
2018-12-17 09:19:50 -05:00
Tim Steinbach
d3698e03fb linux: 4.14.87 -> 4.14.88
(cherry picked from commit f335fa6d74)
2018-12-13 07:01:17 -05:00
Tim Steinbach
a495531eb7 linux: 4.9.144 -> 4.9.145
(cherry picked from commit 1f92bdcd94)
2018-12-13 07:01:16 -05:00
Tim Steinbach
4773e7740b linux: 4.4.166 -> 4.4.167
(cherry picked from commit adf8cdd67d)
2018-12-13 07:01:15 -05:00
Tim Steinbach
b551f89e25 linux: 4.14.86 -> 4.14.87
(cherry picked from commit 5fa8435719a1ad5b7ac8f57ce3c6e47cebafbdeb)
2018-12-08 10:26:23 -05:00
Tim Steinbach
a7d7fa1a0d linux: 4.9.143 -> 4.9.144
(cherry picked from commit 1567d09a49613f1bc21d6d5905fe339a26d82ed0)
2018-12-08 10:26:21 -05:00
Tim Steinbach
6b8e969b78 linux: 4.14.85 -> 4.14.86
(cherry picked from commit e945771e4c)
2018-12-05 17:36:27 -05:00
Tim Steinbach
03f9fa3521 linux: 4.9.142 -> 4.9.143
(cherry picked from commit 1f7266cbbb)
2018-12-05 17:36:25 -05:00
Tim Steinbach
77a8c4adc3 kernel: 4.14.84 -> 4.14.85
(cherry picked from commit c29204b85278648279a6ed78db0dc4e4a85d4cfe)
2018-12-01 11:22:12 -05:00
Tim Steinbach
2fbf68dc00 kernel: 4.9.141 -> 4.9.142
(cherry picked from commit 4440f74ae57fd83f875f2f340eeed95c015a1b45)
2018-12-01 11:22:09 -05:00
Tim Steinbach
c9a2a28a42 kernel: 4.4.165 -> 4.4.166
(cherry picked from commit 2a533a71e36a41bfdde0e4dd880604a7141a985e)
2018-12-01 11:22:07 -05:00
Tim Steinbach
b2693ebf7e linux: 4.14.83 -> 4.14.84
(cherry picked from commit 23ef674701)
2018-12-01 11:21:52 -05:00
Renaud
a18112a7e8 Merge pull request #51193 from veprbl/pr/libtiff_fix_url_18.03
[18.03] libtiff: fix download url
2018-11-29 09:24:20 +01:00
Dmitry Kalinkin
15790a7d55 libtiff: fix download url 2018-11-28 18:39:21 -05:00
Tim Steinbach
9c96d120aa linux: 4.9.140 -> 4.9.141
(cherry picked from commit 94906bfefed6cb7c1fe53fceb81038ddc8ee8ebc)
2018-11-27 16:20:18 -05:00
Tim Steinbach
91bf2415ff linux: 4.4.164 -> 4.4.165
(cherry picked from commit 2c3325ecf9af6f1d5a237190028d28a44ba210b3)
2018-11-27 16:20:17 -05:00
Tim Steinbach
72c48fef2f linux: 4.14.82 -> 4.14.83
(cherry picked from commit 86f9ac22e2)
2018-11-23 08:35:05 -05:00
Tim Steinbach
817c239d3b linux: 4.9.138 -> 4.9.140
(cherry picked from commit 5879586e01)
2018-11-23 08:35:04 -05:00
Tim Steinbach
e64482df77 linux: 4.14.81 -> 4.14.82 2018-11-21 09:54:40 -05:00
Tim Steinbach
55d1036d9a linux: 4.9.137 -> 4.9.138 2018-11-21 09:54:39 -05:00
Tim Steinbach
2e5daaf541 linux: 4.4.163 -> 4.4.164 2018-11-21 09:54:39 -05:00
taku0
947247408e firefox-bin: 63.0.1 -> 63.0.3
(cherry picked from commit fa138b55a6)
2018-11-19 20:50:22 +01:00
Andreas Rammhold
958d7ddf4d firefox: 63.0.1 -> 63.0.3
(cherry picked from commit 917309fa62)
2018-11-19 20:45:01 +01:00
taku0
263f7b78d6 thunderbird: 60.3.0 -> 60.3.1
(cherry picked from commit 1e8694d3d7)
2018-11-16 16:38:57 +01:00
taku0
10869fbf44 thunderbird-bin: 60.3.0 -> 60.3.1
(cherry picked from commit 52fc63e37b)
2018-11-16 16:38:17 +01:00
Vladimír Čunát
f6112b2e4a Merge #49677: thunderbird*: 60.2.1 -> 60.3.0
Critical security fixes.

(cherry picked from commit 5b94195d21)
2018-11-16 16:36:44 +01:00
Eelco Dolstra
06c14eefe9 thunderbird: Remove buildconfig
This reduces the closure size from 1689 MiB to 425 MiB.

(cherry picked from commit 2be42950c3)
2018-11-16 16:35:23 +01:00
Tim Steinbach
1d8470b164 linux: 4.14.80 -> 4.14.81
(cherry picked from commit 338d38e57b68e12a2f015e9eabe561accefcad4f)
2018-11-13 14:36:09 -05:00
Tim Steinbach
df1824013f linux: 4.9.136 -> 4.9.137
(cherry picked from commit 7395bd34f76e22abc4e4c79847fd978a713da932)
2018-11-13 14:36:08 -05:00
Tim Steinbach
54539972c4 linux: 4.14.79 -> 4.14.80
(cherry picked from commit e64068cdbfe0a5d6543da6986376763e3d588711)
2018-11-10 16:14:12 -05:00
Tim Steinbach
643f6eb5e9 linux: 4.9.135 -> 4.9.136
(cherry picked from commit 98b6ecace1eea344987f6f942e88e550825f4aca)
2018-11-10 16:14:09 -05:00
Tim Steinbach
af71ba5459 linux: 4.4.162 -> 4.4.163
(cherry picked from commit fb44ed79d22c88145132f49c0747def014528b68)
2018-11-10 16:13:09 -05:00
Tim Steinbach
21b7f59ae1 linux: 4.14.78 -> 4.14.79
(cherry picked from commit bd636c897724c4c26171a8486c153c37c2a38eac)
2018-11-04 11:45:26 -05:00
Linus Heckemann
0e614d0292 libssh: 0.7.5 -> 0.7.6
Fixes CVE-2018-10933:

libssh versions 0.6 and above have an authentication bypass
vulnerability in the server code. By presenting the server an
SSH2_MSG_USERAUTH_SUCCESS message in place of the
SSH2_MSG_USERAUTH_REQUEST message which the server would expect to
initiate authentication, the attacker could successfully authentciate
without any credentials.

Source:
https://www.libssh.org/2018/10/16/libssh-0-8-4-and-0-7-6-security-and-bugfix-release/
(cherry picked from commit eca462813d)
2018-11-02 03:31:47 +01:00
R. RyanTM
036164bd63 ntp: 4.2.8p11 -> 4.2.8p12 (#45180)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ntp/versions.

(cherry picked from commit 2524ad67da)
2018-11-02 03:31:28 +01:00
Markus Kowalewski
da9b96042e ntp: add license
(cherry picked from commit 6aba5e26b3)
2018-11-02 03:31:27 +01:00
Franz Pletz
47d6c44827 strongswan: patch CVE-2018-16151 & CVE-2018-16152
(cherry picked from commit f71cc5f744)
2018-11-02 03:19:27 +01:00
Franz Pletz
5ce0b90862 wireshark: 2.4.9 -> 2.4.10
Security release: https://www.wireshark.org/docs/relnotes/wireshark-2.4.10.html
2018-11-02 03:03:15 +01:00
Will Dietz
ffe50cdf22 teeworlds: 0.6.4 -> 0.6.5
This release adds support for building with cmake!
So switch to that eagerly instead of fighting with bam.

(if nothing else cmake is the devil we know...)

Also:

* fixup 'DATA_DIR' so programs can find resources
  (without need for wrappers)
* install readme+license as previously done ("docs")
* don't install tools since not built or installed by default
  * esp since doesn't appear to have non-adhoc method for installation
  * other distros don't seem to include

(cherry picked from commit 18258bae34)

Fixes CVE-2018-18541.
2018-11-02 02:50:10 +01:00
Franz Pletz
e87ace43d5 tomcat_connectors: 1.2.41-dev-1613051 -> 1.2.46
Fixes CVE-2018-11759, CVE-2018-1323, CVE-2016-6808.

(cherry picked from commit 9fe0e57d9d)
2018-11-01 22:39:01 +01:00
Franz Pletz
faaf1c2fcc icecast: 2.4.3 -> 2.4.4
Fixes CVE-2018-18820.

(cherry picked from commit 24d6c0dbde)
2018-11-01 21:50:41 +01:00
Jörg Thalheim
19fc6daa53 Merge pull request #45017 from chpatrick/meshlab-update
meshlab: 2016.02 -> 20180627-beta
2018-10-29 09:08:09 +01:00
Silvan Mosberger
6f07d27625 Merge pull request #49157 from 1000101/backport-release-18.03
[18.03] nixos/trezord: revised and updated udev rules
2018-10-28 00:58:30 +02:00
Andreas Rammhold
02fc3d3619 Merge pull request #49187 from andir/18.03/mosquitto
[18.03] mosquitto: 1.4.14 ->1.5.3
2018-10-28 00:23:33 +02:00
Franz Pletz
ee9df2b79b Merge pull request #49230 from ciil/jira-update-18.03
atlassian-jira: 7.12.0 -> 7.12.3 (18.03)
2018-10-27 11:13:55 +00:00
Simon Lackerbauer
eb7e010dbd atlassian-jira: 7.12.1 -> 7.12.3
(cherry picked from commit 50abe602b1)
2018-10-27 11:38:13 +02:00
Simon Lackerbauer
83fa2ccecc atlassian-jira: 7.12.0 -> 7.12.1
(cherry picked from commit a431f3e35d)
2018-10-27 11:38:13 +02:00
Ján Hrnko
4d6e4b9652 nixos/trezord: revised and updated udev rules
(cherry picked from commit a88e0ef9aa)
2018-10-26 16:22:25 +02:00
Peter Hoeg
c7d5cbc3be mosquitto: 1.4.15 -> 1.5.3
Use cmake on all platforms instead of only macos.

(cherry picked from commit a45fa35742)
2018-10-26 15:03:47 +02:00
Ryan Mulligan
559a4a31c7 mosquitto: 1.4.14 -> 1.4.15
Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.15 with grep in /nix/store/7nifpbj16dlhljb2jwbwxyv4wx1zwa1y-mosquitto-1.4.15
- found 1.4.15 in filename of file in /nix/store/7nifpbj16dlhljb2jwbwxyv4wx1zwa1y-mosquitto-1.4.15

(cherry picked from commit a28a2e3829)
2018-10-26 15:03:35 +02:00
Andreas Rammhold
b4e3a404e6 Merge pull request #49096 from andir/18.03/firefox
[18.03] firefox{,-bin}: 62.0.3 -> 63.0 & nss: 3.38-> 3.39
2018-10-26 00:53:39 +02:00
Michael Weiss
ede8a2f1ac Merge pull request #48757 from primeos/security-backports-for-18.03
[18.03] Security backport for fuse (CVE-2018-10906)
2018-10-25 23:35:26 +02:00
Michael Weiss
228acdca45 fuse: 2.9.7 -> 2.9.8 (security, CVE-2018-10906)
Upstream changelog:
- SECURITY UPDATE: In previous versions of libfuse it was possible to
  for unprivileged users to specify the allow_other option even when
  this was forbidden in /etc/fuse.conf. The vulnerability is present
  only on systems where SELinux is active (including in permissive
  mode).
- libfuse no longer segfaults when fuse_interrupted() is called outside
  the event loop.
- The fusermount binary has been hardened in several ways to reduce
  potential attack surface. Most importantly, mountpoints and mount
  options must now match a hard-coded whitelist. It is expected that
  this whitelist covers all regular use-cases.
- Fixed rename deadlock on FreeBSD.

(cherry picked from commit ec1082c58f)
2018-10-25 21:19:47 +02:00
Michael Weiss
0e58950619 fuse3: 3.2.4 -> 3.2.5 (security, CVE-2018-10906)
Upstream changelog:
- SECURITY UPDATE: In previous versions of libfuse it was possible to
  for unprivileged users to specify the allow_other option even when
  this was forbidden in /etc/fuse.conf. The vulnerability is present
  only on systems where SELinux is active (including in permissive
  mode).
- The fusermount binary has been hardened in several ways to reduce
  potential attack surface. Most importantly, mountpoints and mount
  options must now match a hard-coded whitelist. It is expected that
  this whitelist covers all regular use-cases.
- Added a test of seekdir to test_syscalls.
- Fixed readdir bug when non-zero offsets are given to filler and the
  filesystem client, after reading a whole directory, re-reads it from a
  non-zero offset e. g. by calling seekdir followed by readdir.

(cherry picked from commit 46cd782b43)
2018-10-25 21:19:47 +02:00
Michael Weiss
289390b8d4 fuse3: 3.2.3 -> 3.2.4
(cherry picked from commit fa6941f108)
2018-10-25 21:19:47 +02:00
Michael Weiss
ea1b61cf75 fuse3: 3.2.2 -> 3.2.3
(cherry picked from commit d3e3e131f5)
2018-10-25 21:19:47 +02:00
Michael Raskin
f486260f55 fuse3: install fuse.conf without execute bit
(cherry picked from commit 085eab7ef6)
2018-10-25 21:19:47 +02:00
Michael Weiss
c1781119df fuse3: 3.2.1 -> 3.2.2
Stop using bin/mount.fuse from fuse3 for fuse2 (mount.fuse from fuse3
isn't guaranteed to remain backwards compatible).

(cherry picked from commit c00b5bf6a2)
2018-10-25 21:19:47 +02:00
Andreas Rammhold
5dd4087273 firefox-esr-60: 60.2.2esr -> 60.3.0esr
(cherry picked from commit 3db6ca50ef0ce27b4f9765b783dcc32c0a613a2d)
2018-10-25 16:31:11 +02:00
Andreas Rammhold
caf1a09c8c firefox: 62.0.3 -> 63.0 2018-10-25 09:35:22 +02:00
Andreas Rammhold
dc2becf42f rust_1_29: backport for rust 1.29.1 from unstable
Based on commit aef6830d3e
2018-10-25 09:29:00 +02:00
Jan Tojnar
b221c255bc rust-cbindgen: init at 0.6.3 (backport from master)
version as of commit f41a35bf14
2018-10-25 09:29:00 +02:00
Andreas Rammhold
15bd77a6fd firefox-bin: 62.0.3 -> 63.0
(cherry picked from commit 5137c04770)
2018-10-24 18:33:29 +02:00
Tim Steinbach
d3be52c83b linux: 4.14.77 -> 4.14.78
(cherry picked from commit 719087fb8c)
2018-10-20 11:18:34 -04:00
Tim Steinbach
f03886a8db linux: 4.9.134 -> 4.9.135
(cherry picked from commit 560e61a3fd)
2018-10-20 11:18:33 -04:00
Tim Steinbach
9ee9e4e887 linux: 4.4.161 -> 4.4.162
(cherry picked from commit 218bf14c3e)
2018-10-20 11:18:31 -04:00
Tim Steinbach
43631e2b01 linux: 4.14.76 -> 4.14.77
(cherry picked from commit 7abe0e881e)
2018-10-18 08:28:21 -04:00
Tim Steinbach
afef91f92a linux: 4.9.133 -> 4.9.134
(cherry picked from commit ab8ff7c07c)
2018-10-18 08:28:20 -04:00
Michael Weiss
ed819d8d4f Merge pull request #48484 from primeos/signal-desktop-backport
[18.03] Backport Signal-Desktop

Reason: Signal-Desktop displayed the following message: "This version of
Signal Desktop has expired. Please upgrade to the latest version to
continue messaging." (see #48436).
2018-10-15 22:54:43 +02:00
tobiasBora
17f1e9b350 signal-desktop: enable notifications
(cherry picked from commit 820e1caf86)
2018-10-15 21:33:12 +02:00
Michael Weiss
1f8f5b1f43 signal-desktop: 1.16.1 -> 1.16.2
(cherry picked from commit a526719184)
2018-10-15 21:33:12 +02:00
Michael Weiss
acc9de027a signal-desktop: 1.16.0 -> 1.16.1
(cherry picked from commit 3410dcd90e)
2018-10-15 21:33:12 +02:00
Michael Weiss
ce97b869f2 signal-desktop: 1.15.5 -> 1.16.0
(cherry picked from commit 7c1b85cf6d)
2018-10-15 21:32:39 +02:00
Michael Weiss
600065efb3 signal-desktop: 1.15.4 -> 1.15.5
(cherry picked from commit 9f4e76be5f)
2018-10-15 21:32:39 +02:00
Michael Weiss
51fc1ed3cf signal-desktop: 1.15.3 -> 1.15.4
(cherry picked from commit b28f8b4c94)
2018-10-15 21:32:38 +02:00
Michael Weiss
0c19b381da signal-desktop: 1.15.0 -> 1.15.3
Skipped 1.15.1 due to upstream issues (see GitHub), 1.15.2 and 1.15.3
should be fine (at least there are fewer issues).

(cherry picked from commit c7e04336a7)
2018-10-15 21:32:38 +02:00
Michael Weiss
a1d4e9812e signal-desktop: Allow overriding the spell checker language (#44456)
Thought this could be useful for others as well. Unfortunately it will
also override the UI language.

Example usage:

  environment.systemPackages = with pkgs; [
    (signal-desktop.override {
      spellcheckerLanguage = "de_DE";
    })
  ];

(cherry picked from commit 9ef1406a99)
2018-10-15 21:32:37 +02:00
Michael Weiss
32eba88b9b signal-desktop: 1.14.4 -> 1.15.0
(cherry picked from commit 915e506f7c)
2018-10-15 21:32:37 +02:00
Michael Weiss
323491f77c signal-desktop: 1.14.3 -> 1.14.4
(cherry picked from commit c89bdf9704)
2018-10-15 21:32:36 +02:00
Michael Weiss
11600931df signal-desktop: 1.14.2 -> 1.14.3
(cherry picked from commit b68770c1a2)
2018-10-15 21:32:35 +02:00
Michael Weiss
6aa8bc7d62 signal-desktop: 1.14.1 -> 1.14.2
(cherry picked from commit 4fd9ca3a51)
2018-10-15 21:31:40 +02:00
Florian Jacob
8ccf5b63b5 gitea: 1.5.1 -> 1.5.2
(cherry picked from commit 0a5c7cf512)
2018-10-15 19:54:31 +02:00
Tim Steinbach
5d19e3e78f linux: 4.14.75 -> 4.14.76
(cherry picked from commit 43d8a40653)
2018-10-13 12:45:50 -04:00
Tim Steinbach
cb6fbe8a72 linux: 4.9.132 -> 4.9.133
(cherry picked from commit b4d4affe41)
2018-10-13 12:45:49 -04:00
Tim Steinbach
06e98e0517 linux: 4.4.160 -> 4.4.161
(cherry picked from commit 3ad8afbf3e)
2018-10-13 12:45:48 -04:00
Franz Pletz
e85e0c2caf wireguard: 0.0.20180904 -> 0.0.20181007
backport of 97d2779059
2018-10-13 15:59:20 +02:00
Ben Challenor
d457ecd3df jenkins: 2.138.1 -> 2.138.2
(cherry picked from commit 88e7d7b350)
2018-10-13 15:52:11 +02:00
Ben Challenor
af21727697 jenkins: 2.121.2 -> 2.138.1
(cherry picked from commit 16ce28ed72)
2018-10-13 15:52:11 +02:00
Chloe Kever
c314203406 jenkins: 2.107.3 -> 2.121.2 (#43936)
(cherry picked from commit 1bb4fd794c)
2018-10-13 15:52:10 +02:00
Thomas Bach
2424c81c66 jenkins: 2.89.4 -> 2.107.3 (#41618)
(cherry picked from commit 500f1a9438)
2018-10-13 15:52:09 +02:00
taku0
d592f291ed oraclejdk: deprecate oraclejdk 10
(cherry picked from commit 628fa1d50f)
2018-10-12 00:07:49 +02:00
Franz Pletz
4c229c3c21 Merge pull request #48238 from andir/18.03/apacheHttpd
[18.03] apacheHttpd: 2.4.33 -> 2.4.35
2018-10-11 21:57:29 +00:00
R. RyanTM
3359304b1a apacheHttpd: 2.4.33 -> 2.4.35
Picked from master since it fixes CVE-2018-11763 which allows a remote
DoS against a server with HTTP/2 enabled.

Reference: https://lists.apache.org/thread.html/d435b0267a76501b9e06c552b20c887171064cde38e46d678da4d3dd@%3Cannounce.httpd.apache.org%3E

On 18.03 this also addresses CVE-2018-1333 & CVE-2018-8011

(cherry picked from commit 524c2120f9)
2018-10-11 23:12:54 +02:00
Tim Steinbach
5a38f731d7 linux: 4.14.74 -> 4.14.75
(cherry picked from commit fab0c8824a)
2018-10-10 19:56:30 -04:00
Tim Steinbach
8e3baa505f linux: 4.9.131 -> 4.9.132
(cherry picked from commit 8f9743d2b7)
2018-10-10 19:56:20 -04:00
Tim Steinbach
65f1edab8f linux: 4.4.159 -> 4.4.160
(cherry picked from commit 33b68f8768)
2018-10-10 19:56:12 -04:00
Andreas Rammhold
be0ef32599 Merge pull request #48124 from andir/18.03/net_snmp
[18.03] net_snmp: fix CVE-2018-18065
2018-10-10 21:05:10 +02:00
Andreas Rammhold
b99b7801ac net_snmp: fix CVE-2018-18065
(cherry picked from commit 2f7c242953)
2018-10-09 23:08:23 +02:00
Joachim F
c56ede78a0 Merge pull request #48063 from Mic92/torbrowser-bundle-bin
tor-browser-bundle-bin: 7.5.6 -> 8.0.2 [18.03 backport]
2018-10-08 17:32:02 +00:00
Andreas Rammhold
0d9f8d4978 tor-browser-bundle-bin: 8.0.1 -> 8.0.2
Update to latest version due to security updates and 8.0.1 not being
available on the mirrors anymore.

Release notes: https://blog.torproject.org/new-release-tor-browser-802

(cherry picked from commit 248ed3575c)
2018-10-08 17:56:08 +01:00
Joachim Fasting
cff09f3a75 tor-browser-bundle-bin: 8.0 -> 8.0.1
(cherry picked from commit f2ba1a4284)
2018-10-08 17:56:07 +01:00
Joachim Fasting
3cb4c06db7 tor-browser-bundle-bin: parameterize icon theme
(cherry picked from commit 546e511edc)
2018-10-08 17:53:37 +01:00
Joachim Fasting
27b1d397a5 tor-browser-bundle-bin: add gsettings-schemas
See https://github.com/NixOS/nixpkgs/issues/46587

(cherry picked from commit 5710ee3bef)
2018-10-08 17:51:47 +01:00
Joachim Fasting
ce2ca321df tor-browser-bundle-bin: 7.5.6 -> 8.0
(cherry picked from commit ed5283fcf5)
2018-10-08 17:51:47 +01:00
Linus Heckemann
1f0f7b7ec7 debian vm tools: use snapshot.debian.org
snapshot.debian.org actually keeps track of all of the updates as they
come in rather than doing arbitrary (?) snapshots.

(cherry picked from commit 9cc18fa7f9)
2018-10-08 17:33:32 +01:00
pacien
859a4d3252 tinc: 1.0.34 -> 1.0.35, 1.1pre16 -> 1.1pre17
Critical security update (CVE-2018-16737, CVE-2018-16738, CVE-2018-16758)

(cherry picked from commit 15a190eb27)
2018-10-08 17:07:42 +02:00
Andreas Rammhold
be81cfd9f8 Merge pull request #47959 from andir/18.03/oraclejdk
[18.03] oraclejdk8psu: mark as insecure
2018-10-06 16:15:19 +02:00
Andreas Rammhold
3b23342ca4 oraclejdk8psu: mark as insecure
This is a sort port of 4d6f880 (#43811). The mentioned issues are not
being fixed in the release. The CPU release should be used instead.

Since someone might still need the PSU version it will just be marked as
insecure allowing the user to whitelist it, if required.
2018-10-06 11:28:29 +02:00
Andreas Rammhold
bfa517dc10 Merge pull request #43842 from srhb/jdk-backport
Backport of #43811 jdk updates (help needed)
2018-10-06 10:55:21 +02:00
Florian Klink
54a20762b6 ghostscript: 9.24 -> 9.25 (#47948)
Highlights in this release include:

This release fixes problems with argument handling, some unintended results of the security fixes to the SAFER file access restrictions (specifically accessing ICC profile files), and some additional security issues over the recent 9.24 release.

CVE-2018-16802
CVE-2018-17183

Note: The ps2epsi utility does not, and cannot call Ghostscript with the -dSAFER command line option. It should never be called with input from untrusted sources.

Security issues have been the primary focus of this release, including solving several (well publicised) real and potential exploits.
PLEASE NOTE: We strongly urge users to upgrade to this latest release to avoid these issues.

As well as Ghostscript itself, jbig2dec has had a significant amount of work improving its robustness in the face of out specification files.

IMPORTANT: We are in the process of forking LittleCMS. LCMS2 is not thread safe, and cannot be made thread safe without breaking the ABI. Our fork will be thread safe, and include performance enhancements (these changes have all be been offered and rejected upstream). We will maintain compatibility between Ghostscript and LCMS2 for a time, but not in perpetuity. Our fork will be available as its own package separately from Ghostscript (and MuPDF).

The usual round of bug fixes, compatibility changes, and incremental improvements.

(cherry picked from commit 5b77b0d2f1eda9a42fe188eafb499230741e7925)
(cherry picked from commit dbcbf7cce8)
2018-10-06 08:47:56 +02:00
Andreas Rammhold
a8e307e93c Merge pull request #47926 from edef1c/git-2.16.5
git: 2.16.4 -> 2.16.5 (CVE-2018-17456)
2018-10-05 21:54:26 +02:00
edef
d90b6ca301 git: 2.16.4 -> 2.16.5 (CVE-2018-17456) 2018-10-05 19:02:34 +00:00
Michael Weiss
862fb5215f Merge pull request #47881 from primeos/security-backports-for-18.03
[18.03] fscrypt: 0.2.3 -> 0.2.4 (security, CVE-2018-6558)
2018-10-04 21:29:27 +02:00
Michael Weiss
27018df730 fscrypt: Fix the build (requires Go 1.10) 2018-10-04 20:46:38 +02:00
Michael Weiss
2677593487 Merge pull request #47873 from primeos/security-backports-for-18.03
Minor security backports (Jekyll and Gollum) for 18.03.
2018-10-04 19:34:38 +02:00
Michael Weiss
02af3cd19a fscrypt: 0.2.3 -> 0.2.4 (security, CVE-2018-6558)
(cherry picked from commit 4f519e5dc8)
Reason: Security update: "The pam_fscrypt module in fscrypt before 0.2.4
may incorrectly restore primary and supplementary group IDs to the
values associated with the root user, which allows attackers to gain
privileges via a successful login through certain applications that use
Linux-PAM (aka pam)."
2018-10-04 19:24:21 +02:00
Andreas Rammhold
34f83837f6 Merge pull request #47761 from andir/18.03/thunderbird
[18.03] thunderbird: 52.9.0 -> 60, thunderbird-bin: 52.9.0 -> 60
2018-10-04 19:17:11 +02:00
Michael Weiss
fdfaf0c2b5 jekyll: 3.7.3 -> 3.7.4 (security)
Reason: Security update: "fix include bypass of EntryFilter#filter
symlink check".
2018-10-04 19:07:06 +02:00
Michael Weiss
c1a5f4c215 gollum: 4.1.3 -> 4.1.4 (security, CVE-2018-3740)
(cherry picked from commit 18b468ed81)
Reason: Security update: "Depend on new version of gollum-lib that
relies on a patched version of sanitize, which solves a vulnerability
(CVE-2018-3740). See https://github.com/gollum/gollum-lib/pull/296."
2018-10-04 19:06:46 +02:00
Michael Weiss
3bb61ba772 gollum: 4.1.2 -> 4.1.3
(cherry picked from commit 265c5fc485)
Reason: Security update: "Solves a vulnerability in the File view and
All Pages view that would allow XSS."
2018-10-04 19:06:42 +02:00
Tim Steinbach
c4eddcf240 linux: 4.14.73 -> 4.14.74
(cherry picked from commit 575c118a6469cd2148ed3092de90f0d8d3aaec53)
2018-10-03 23:48:35 -04:00
Tim Steinbach
186f5b3908 linux: 4.9.130 -> 4.9.131
(cherry picked from commit e6ff57b328e913ae656e038a819b12926eadd230)
2018-10-03 23:48:34 -04:00
taku0
1032ddaac9 thunderbird: 60.0 -> 60.2.1 2018-10-03 15:31:20 +02:00
Andreas Rammhold
ed8218fa09 thunderbird: 52.9.0 -> 60.0
This is a port of the current state of thunderbird from the master
branch. We did miss a bunch of security fixes when thunderbird 60 was
released. This is an attempt to take a shortcut by simply copying over
the expression from the master branch.

Security related fixes in this release are:

- CVE-2018-12359: Buffer overflow using computed size of canvas element
  A buffer overflow can occur when rendering canvas content while
  adjusting the height and width of the <canvas> element dynamically,
  causing data to be written outside of the currently computed
  boundaries.  This results in a potentially exploitable crash.

- CVE-2018-12360: Use-after-free when using focus()
  A use-after-free vulnerability can occur when deleting an input
  element during a mutation event handler triggered by focusing that
  element. This results in a potentially exploitable crash.

- CVE-2018-12361: Integer overflow in SwizzleData
  An integer overflow can occur in the SwizzleData code while
  calculating buffer sizes. The overflowed value is used for subsequent
  graphics computations when their inputs are not sanitized which
  results in a potentially exploitable crash.

- CVE-2018-12362: Integer overflow in SSSE3 scaler
  An integer overflow can occur during graphics operations done by the
  Supplemental Streaming SIMD Extensions 3 (SSSE3) scaler, resulting in
  a potentially exploitable crash.

- CVE-2018-5156: Media recorder segmentation fault when track type is changed during capture
  A vulnerability can occur when capturing a media stream when the media
  source type is changed as the capture is occuring. This can result in
  stream data being cast to the wrong type causing a potentially
  exploitable crash.

- CVE-2018-12363: Use-after-free when appending DOM nodes
  A use-after-free vulnerability can occur when script uses mutation
  events to move DOM nodes between documents, resulting in the old
  document that held the node being freed but the node still having a
  pointer referencing it. This results in a potentially exploitable
  crash.

- CVE-2018-12364: CSRF attacks through 307 redirects and NPAPI plugins
  NPAPI plugins, such as Adobe Flash, can send non-simple cross-origin
  requests, bypassing CORS by making a same-origin POST that does a 307
  redirect to the target site. This allows for a malicious site to
  engage in cross-site request forgery (CSRF) attacks.

- CVE-2018-12365: Compromised IPC child process can list local filenames
  A compromised IPC child process can escape the content sandbox and
  list the names of arbitrary files on the file system without user
  consent or interaction. This could result in exposure of private local
  files.

- CVE-2018-12371: Integer overflow in Skia library during edge builder allocation
  An integer overflow vulnerability in the Skia library when allocating
  memory for edge builders on some systems with at least 16 GB of RAM.
  This results in the use of uninitialized memory, resulting in a
  potentially exploitable crash.

- CVE-2018-12366: Invalid data handling during QCMS transformations
  An invalid grid size during QCMS (color profile) transformations can
  result in the out-of-bounds read interpreted as a float value. This
  could leak private data into the output.

- CVE-2018-12367: Timing attack mitigation of PerformanceNavigationTiming
  In the previous mitigations for Spectre, the resolution or precision
  of various methods was reduced to counteract the ability to measure
  precise time intervals. In that work, PerformanceNavigationTiming was
  not adjusted but it was found that it could be used as a precision
  timer.

- CVE-2018-5187: Memory safety bugs fixed in Firefox 61, Firefox ESR 60.1, and Thunderbird 60
  Mozilla developers and community members Christian Holler, Sebastian
  Hengst, Nils Ohlmeier, Jon Coppeard, Randell Jesup, Ted Campbell, Gary
  Kwong, and Jean-Yves Avenard reported memory safety bugs present in
  Firefox 60 and Firefox ESR 60. Some of these bugs showed evidence of
  memory corruption and we presume that with enough effort that some of
  these could be exploited to run arbitrary code.

- CVE-2018-5188: Memory safety bugs fixed in Firefox 61, Firefox ESR 60.1, Firefox ESR 52.9, and Thunderbird 60
  Mozilla developers and community members Alex Gaynor, Christoph Diehl,
  Christian Holler, Jason Kratzer, David Major, Jon Coppeard, Nicolas B.
  Pierron, Jason Kratzer, Marcia Knous, and Ronald Crane reported memory
  safety bugs present in Firefox 60, Firefox ESR 60, and Firefox ESR
  52.8. Some of these bugs showed evidence of memory corruption and we
  presume that with enough effort that some of these could be exploited
  to run arbitrary code.
2018-10-03 15:22:49 +02:00
taku0
5037fb14ec thunderbird-bin: 52.9.0 -> 60.2.1
(cherry picked from commit d4de3b2d34)
2018-10-03 15:16:59 +02:00
Andreas Rammhold
1d434c5c09 Merge pull request #47713 from andir/18.03/firefox
[18.03] firefox{-bin,}: 62.0.2 -> 62.0.3, firefox-esr-60: 60.2.1 -> 60.2.2
2018-10-03 11:23:37 +02:00
Andreas Rammhold
e974c9168d firefox-esr-60: 60.2.1 -> 60.2.2 [critical security fixes]
This update bumps the package to the latest stable version containing a
few security fixes:

- CVE-2018-12386: Type confusion in JavaScript
  A vulnerability in register allocation in JavaScript can lead to type
  confusion, allowing for an arbitrary read and write. This leads to
  remote code execution inside the sandboxed content process when
  triggered.

- CVE-2018-12387
  A vulnerability where the JavaScript JIT compiler inlines
  Array.prototype.push with multiple arguments that results in the stack
  pointer being off by 8 bytes after a bailout. This leaks a memory
  address to the calling function which can be used as part of an
  exploit inside the sandboxed content process.

Source: https://www.mozilla.org/en-US/security/advisories/mfsa2018-24/
(cherry picked from commit 246d2848ff)
2018-10-03 09:53:42 +02:00
Andreas Rammhold
a812396e55 firefox: 62.0.2 -> 62.0.3 [critical security fixes]
This update bumps the package to the latest stable version containing a
few security fixes:

- CVE-2018-12386: Type confusion in JavaScript
  A vulnerability in register allocation in JavaScript can lead to type
  confusion, allowing for an arbitrary read and write. This leads to
  remote code execution inside the sandboxed content process when
  triggered.

- CVE-2018-12387
  A vulnerability where the JavaScript JIT compiler inlines
  Array.prototype.push with multiple arguments that results in the stack
  pointer being off by 8 bytes after a bailout. This leaks a memory
  address to the calling function which can be used as part of an
  exploit inside the sandboxed content process.

Source: https://www.mozilla.org/en-US/security/advisories/mfsa2018-24/
(cherry picked from commit e7785f1148)
2018-10-03 09:53:34 +02:00
Andreas Rammhold
77188fdac5 firefox-bin: 62.0.2 -> 62.0.3 [critical security fixes]
This update bumps the package to the latest stable version containing a
few security fixes:

- CVE-2018-12386: Type confusion in JavaScript
  A vulnerability in register allocation in JavaScript can lead to type
  confusion, allowing for an arbitrary read and write. This leads to
  remote code execution inside the sandboxed content process when
  triggered.

- CVE-2018-12387
  A vulnerability where the JavaScript JIT compiler inlines
  Array.prototype.push with multiple arguments that results in the stack
  pointer being off by 8 bytes after a bailout. This leaks a memory
  address to the calling function which can be used as part of an
  exploit inside the sandboxed content process.

Source: https://www.mozilla.org/en-US/security/advisories/mfsa2018-24/
(cherry picked from commit 64d02660cb)
2018-10-03 09:53:20 +02:00
Matthew Bauer
b79abf0314 haskell: fix x509-system on mojave
darwin.security_tool is currently broken in Mojave. See issue #45042
for more info. Our security_tool stuff comes from 10.9 so I suspect
that it needs an update.

Here I am putting in a hack to get things working again. This uses the
system provided security binary at /usr/bin/security to avoid the
issue in Haskell’s x509-system package. Unfortunately, this will break
with the sandbox. I am also working on a proper fix, but this requires
updating lots of Apple stuff (and also copumpkin’s new CF). You can
follow the progress on this branch:

  https://github.com/matthewbauer/nixpkgs/tree/xcode-security

This commit should be backported to release-18.03 and release-18.09.

/cc @copumpkin @lnl7 @pikajude
2018-10-02 15:20:01 -05:00
Tim Steinbach
7b54dbafa8 linux: 4.14.72 -> 4.14.73
(cherry picked from commit 00e57782bc)
2018-09-29 17:55:22 -04:00
Tim Steinbach
b6b3b5367a linux: 4.9.129 -> 4.9.130
(cherry picked from commit 74f56e14d9)
2018-09-29 17:55:20 -04:00
Tim Steinbach
fcb391324f linux: 4.4.158 -> 4.4.159
(cherry picked from commit 7769fd6a80)
2018-09-29 17:55:19 -04:00
Tim Steinbach
e163794cde linux: 4.14.71 -> 4.14.72
(cherry picked from commit 61452c82ae)
2018-09-26 08:02:42 -04:00
Tim Steinbach
2fd6c005ae linux: 4.9.128 -> 4.9.129
(cherry picked from commit 8e4d980904)
2018-09-26 08:02:42 -04:00
Tim Steinbach
104931ab96 linux: 4.4.157 -> 4.4.158
(cherry picked from commit 656ca2296c)
2018-09-26 08:02:42 -04:00
Michael Raskin
96444e62d8 Merge pull request #47288 from 1000101/release-18.03
trezord: 2.0.12 -> 2.0.19 and nixos/trezord: revised and updated udev rules
2018-09-24 20:09:34 +00:00
Andreas Rammhold
10966f4147 Merge pull request #47276 from andir/18.03/firefox
[18.03] firefox, firefox-bin 62.0 -> 62.0.2, firefox-esr: 60.2.0esr -> 60.2.1esr [Moderate security fixes]
2018-09-24 20:46:31 +02:00
1000101
ec88e0c9b6 nixos/trezord: revised and updated udev rules 2018-09-24 19:45:46 +02:00
1000101
904f9fa146 trezord: 2.0.12 -> 2.0.19 2018-09-24 19:44:21 +02:00
1000101
493179d368 add myself 1000101 as maintainer 2018-09-24 19:42:53 +02:00
taku0
9227861bc3 firefox-esr: 60.2.0esr -> 60.2.1esr
(cherry picked from commit e5778a9991)
2018-09-24 17:46:33 +02:00
taku0
71a5983cec firefox: 62.0 -> 62.0.2
(cherry picked from commit da9823672f)
2018-09-24 17:46:26 +02:00
taku0
ccc4bf005c firefox-bin: 62.0 -> 62.0.2
(cherry picked from commit 5b79f81a39)
2018-09-24 17:45:47 +02:00
Jörg Thalheim
8e41b9fb41 Merge pull request #47227 from flokli/php-mysql-sock-18.03
php: set mysql socket path if mysql[i] or pdo_mysql support is enabled
2018-09-24 01:42:43 +01:00
Florian Klink
19765ecfb3 php: set mysql socket path if mysql[i] or pdo_mysql support is enabled
PHP tries to discover the mysql default socket path during configure
phase by probing the file system:
cf3b852109/ext/mysqli/config.m4 (L4)

This obviously fails to discover /run/mysqld/mysqld.sock, which is being
used (hardcoded) across all MySQL flavours.

This leads to PHP having no mysql socket path set for the mysql[i]
extensions, and `/tmp/mysql.sock` set for pdo_mysql,
meaning one currently has to manually configure and set it in php.ini.

Luckily, PHP supports setting that path via
`--with-mysql-sock=/run/mysqld/mysqld.sock` during configure phase,
so let's do this as soon as one of the three modules is enabled.

(cherry picked from commit baa04e4204)
2018-09-23 17:43:21 +02:00
Andrew Dunham
efd74a6575 libsndfile: Add patch for CVE-2018-13139 (#47160)
(cherry picked from commit fcde178ed5)
2018-09-23 11:31:19 +02:00
Nathan van Doorn
d16a7abceb haskellPackages.sbv: fix location of z3 executable
A lot of the functionality of the z3 library depends on it being able to
find the z3 executable on $PATH. Hard-coding it here means it will never
be unable to find it and z3 doesn't need to pollute $PATH.

(cherry picked from commit c8598daad4)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-09-20 18:31:51 -05:00
roconnor
6999bcc0a2 bitcoin: 0.16.2 -> 0.16.3 (#46891)
(cherry picked from commit fab901ddd3)

security: fixes CVE-2018-17144
2018-09-21 00:39:26 +02:00
Russell O'Connor
aca230412c bitcoin: 0.16.1 -> 0.16.2
(cherry picked from commit 75d567e8a5)
2018-09-21 00:39:02 +02:00
R. RyanTM
14c6b726c8 altcoins.bitcoin: 0.16.0 -> 0.16.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/bitcoin/versions.

These checks were done:

- built on NixOS
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoind passed the binary check.
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoin-cli passed the binary check.
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoin-tx passed the binary check.
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/test_bitcoin passed the binary check.
- /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bench_bitcoin passed the binary check.
- Warning: no invocation of /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/bitcoin-qt had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1/bin/test_bitcoin-qt had a zero exit code or showed the expected version
- 5 of 7 passed binary check by having a zero exit code.
- 0 of 7 passed binary check by having the new version present in output.
- found 0.16.1 with grep in /nix/store/5fjv944ikyak1s83624ay8i9h4gbs2c0-bitcoin-0.16.1
- directory tree listing: https://gist.github.com/a5e5d745910497ae913d4577342deba5
- du listing: https://gist.github.com/5f62bec50f6ab977a25c8ee0f118cb10

(cherry picked from commit 77f3ac7b76)
2018-09-21 00:38:50 +02:00
Peter Simons
4bb22be349 Merge pull request #46801 from vaibhavsagar/bump-all-cabal-hashes-18.03
all-cabal-hashes: update snapshot to Hackage at 2018-09-12T08:26:27Z
2018-09-20 16:51:29 +02:00
Tim Steinbach
923e3a631c linux: 4.14.70 -> 4.14.71
(cherry picked from commit 1c620c669655c1aa7a101a7fafba7327a60293c1)
2018-09-20 09:53:27 -04:00
Tim Steinbach
283693d81a linux: 4.9.127 -> 4.9.128
(cherry picked from commit 172e43335443b15ba25989759eb4085bed55542a)
2018-09-20 09:53:27 -04:00
Tim Steinbach
306917683c linux: 4.4.156 -> 4.4.157
(cherry picked from commit 9d678ecf88ee0691cd85d348a790802239faaa10)
2018-09-20 09:53:26 -04:00
aszlig
8edf566ee4 python/hetzner: 0.8.0 -> 0.8.1
This is only a minor bugfix release and updates the fallback CA root
certificates. For NixOS this is usually not required as the probe paths
will match there, but for non-NixOS users it might be helpful.

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit 48d1c50f7a)
Reason: This might be relevant for NixOps users on Mac OS X and the
        update won't break anything that wasn't broken before.
2018-09-19 14:29:07 +02:00
Jörg Thalheim
305f13d3d7 Merge pull request #46772 from srhb/backport-skype-bump
Backport 18.03: skypeforlinux: 8.24.0.2 -> 8.28.0.41
2018-09-18 08:49:36 +01:00
Peter Simons
65c394dfeb all-cabal-hashes: update snapshot to Hackage at 2018-09-12T08:26:27Z
(cherry picked from commit ee6ecb0eaf)
2018-09-17 16:08:54 -04:00
Emmanuel Rosa
5188928986 skypeforlinux: 8.24.0.2 -> 8.28.0.41
(cherry picked from commit 81d5061a19)
2018-09-17 09:47:51 +02:00
Silvan Mosberger
9214a3e7dd Merge pull request #46555 from danme/release-18.03
nvidia-x11: Fix vulkan VK_KHR_xcb_surface
2018-09-16 02:24:48 +02:00
xeji
01f5e79491 Merge pull request #46717 from etu/upgrade-1803-php
[18.03] php: 5.6.37 -> 5.6.38, 7.0.31 -> 7.0.32
2018-09-15 23:22:26 +02:00
Elis Hirwing
bcd2edae39 php70: 7.0.31 -> 7.0.32
Changelog: http://php.net/ChangeLog-7.php#7.0.32
2018-09-15 21:38:35 +02:00
Tim Steinbach
67782bcb08 linux: 4.14.69 -> 4.14.70
(cherry picked from commit 1a13067273)
2018-09-15 09:48:30 -04:00
Tim Steinbach
ce005f0b6e linux: 4.9.126 -> 4.9.127
(cherry picked from commit c1d7826a8a)
2018-09-15 09:48:29 -04:00
Tim Steinbach
963704f9e7 linux: 4.4.155 -> 4.4.156
(cherry picked from commit b9ca4ac95c)
2018-09-15 09:48:29 -04:00
Elis Hirwing
df98b898ed php56: 5.6.37 -> 5.6.38
Changelog: http://php.net/ChangeLog-5.php#5.6.38
2018-09-15 15:04:57 +02:00
Michael Raskin
0bb2960557 Merge pull request #46643 from taku0/flashplayer-31.0.0.108
flashplayer: 30.0.0.154 -> 31.0.0.108 [Important security fix]
(cherry picked from commit a9e50ec21a)
2018-09-14 14:34:18 +03:00
danme
bda072cafc nvidia-x11: Fix vulkan VK_KHR_xcb_surface
Fixes the issue: https://github.com/NixOS/nixpkgs/issues/39149

Problem was that the Nvidia driver did not find the libxcb-glx at runtime.
2018-09-12 02:31:50 +02:00
Mario Rodas
5f59ab7d4e nodejs-6_x: 6.14.3 -> 6.14.4
(cherry picked from commit bfdfb73ff1)
2018-09-11 21:45:28 +02:00
Andreas Rammhold
dab31f2a9e Merge pull request #46511 from andir/18.03/firefox-i686
[18.03] firefox: provide clang configure flags on i686
2018-09-11 13:02:28 +02:00
Andreas Rammhold
acf4a4eff3 firefox: provide clang configure flags on i686
With the upgrade to firefox 62 clang flags are now required on i686.
2018-09-11 10:12:06 +02:00
Vladimír Čunát
747500e0cf Merge #46417: firefox*: updates 2018-09-11 00:25:38 +02:00
Tim Steinbach
898a53d09f linux: 4.14.68 -> 4.14.69
(cherry picked from commit 276b2ab892)
2018-09-09 19:35:28 -04:00
Tim Steinbach
e82bee8b5e linux: 4.9.125 -> 4.9.126
(cherry picked from commit d40f4159ed)
2018-09-09 19:35:28 -04:00
Tim Steinbach
956f297c47 linux: 4.4.154 -> 4.4.155
(cherry picked from commit 13728ed2b5)
2018-09-09 19:35:27 -04:00
taku0
7a1ccf2643 firefox-esr: 60.1.0esr -> 60.2.0esr, mark 52.9.0esr insecure
(cherry picked from commit 0a3f07077b)
2018-09-09 12:31:52 +02:00
taku0
9b3fbade1d firefox: 61.0.2 -> 62.0
(cherry picked from commit 26cbfe1035)
2018-09-09 12:31:52 +02:00
taku0
fa7476120a firefox-bin: 61.0.2 -> 62.0
(cherry picked from commit 12723b105c)
2018-09-09 12:15:47 +02:00
Michael Raskin
36005e5edf Merge pull request #46389 from YorikSar/update-chromium-18.03
chromium: 68.0.3440.75 -> 69.0.3497.81 (18.03 backport)
2018-09-09 07:01:09 +00:00
Yuriy Taraday
ab193a6974 chromium: 68.0.3440.75 -> 69.0.3497.81 (18.03 backport)
Import latest gn from #46328, just from Chromium build, since it will
trigger huge rebuild otherwise.
2018-09-08 23:17:07 +04:00
Clemens Fruhwirth
65562f7045 Remove overrides for dead emacs packages. 2018-09-07 22:20:10 -05:00
Matthew Justin Bauer
692fea6cc3 melpa: Remove ess-R-object-popup 2018-09-07 22:19:05 -05:00
Bas van Dijk
3a6fa7a806 Merge pull request #46167 from vaibhavsagar/bump-all-cabal-hashes-18.03
all-cabal-hashes: update snapshot to Hackage at 2018-09-04T11:59:40Z
2018-09-06 23:16:36 +02:00
Vladimír Čunát
5f654f8e83 Merge #46202: lua5.1: fix broken source fetch 2018-09-06 23:09:08 +02:00
Benjamin Hipple
b8dfa96b9d lua5.1: fix broken source fetch (#40748)
The upstream src URL for the patch appears to no longer exist. Per discussion in
https://github.com/NixOS/nixpkgs/issues/39927, the upstream URL is not stable,
so this commit inlines the patch in the nixpkgs src tree.

(cherry picked from commit 17f50018c0)
2018-09-07 06:29:17 +10:00
Vaibhav Sagar
64c43dbbbc all-cabal-hashes: update snapshot to Hackage at 2018-09-04T11:59:40Z
(cherry picked from commit d376ceb6ff)
2018-09-06 12:30:48 -04:00
Michael Raskin
8ea6fdeac7 matrix-synapse: 0.33.3 -> 0.33.3.1
(cherry picked from commit 6ea0c3e271)
2018-09-06 16:57:16 +02:00
Michael Raskin
b97073116b matrix-synapse: 0.33.0 -> 0.33.3
(cherry picked from commit 37c0f1cafa)
2018-09-06 16:57:10 +02:00
Léo Gaspard
9fb9373fc4 matrix-synapse: 0.31.2 -> 0.33.0
(cherry picked from commit 182b7f63af)
2018-09-06 16:57:04 +02:00
Shea Levy
72deac4893 haskellPackages.shellFor: fix after recent getHaskellBuildInputs fix.
Fixes #45318

(cherry picked from commit b00b2363b3)
2018-09-05 14:06:00 -04:00
Jörg Thalheim
9b2e0e8b0c wireguard: 0.0.20180519 -> 0.0.20180904
backport of https://github.com/NixOS/nixpkgs/pull/46093
2018-09-05 16:26:01 +01:00
Tim Steinbach
068f437dda linux: 4.14.67 -> 4.14.68
(cherry picked from commit de9a2fd061)
2018-09-05 08:24:07 -04:00
Tim Steinbach
d5fe0f982b linux: 4.9.124 -> 4.9.125
(cherry picked from commit 92010b7a88)
2018-09-05 08:24:07 -04:00
Tim Steinbach
30f5469e09 linux: 4.4.153 -> 4.4.154
(cherry picked from commit f685edba08)
2018-09-05 08:24:06 -04:00
Vladimír Čunát
d19572fdc9 Merge #46047: ghostscript: 9.22 -> 9.24 (security)
(cherry picked from commit 281a629c2a)
2018-09-05 11:11:43 +02:00
Peter Hoeg
261d714222 microcodeIntel: 20180807 -> 20180807a
(cherry picked from commit 34e60f3ccb)
2018-09-04 08:47:27 +02:00
xeji
ba52ef191a Merge pull request #46018 from andir/18.03/microcode
backported because it contains security fixes
2018-09-04 00:57:35 +02:00
Peter Hoeg
d9832362c3 microcodeIntel: 20180312 -> 20180807
(cherry picked from commit ff246c464d)
2018-09-04 00:23:20 +02:00
Peter Hoeg
797657a0b6 uicode-tool: init at 2.3.1
(cherry picked from commit fda7df678d)
2018-09-04 00:23:01 +02:00
aanderse
f82b65bd3e kodi: fix nfs support (#46006)
libnfs is required to be in the LD_LIBRARY_PATH for kodi if you want nfs support 
see: https://www.reddit.com/r/NixOS/comments/9aiquo/how_to_enable_nfs_support_in_kodi/

(cherry picked from commit 435eccf15e)
2018-09-03 22:35:07 +02:00
Elis Hirwing
45f52f765c gitea: 1.5.0 -> 1.5.1 (#45968)
Backported because of security fixes.
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.5.1
(cherry picked from commit fcccb9e5ca)
2018-09-03 20:31:47 +02:00
Vladimír Čunát
78eb6e5a99 treewide: fix various links (homepage, src)
(cherry picked from commit 9b48a67731)
2018-09-03 16:56:25 +02:00
Vladimír Čunát
0ae342d961 aefs: fix meta.homepage
(cherry picked from commit 0d388e1bb6)
2018-09-03 16:31:07 +02:00
Vladimír Čunát
f737652f02 poppler: apply a security patch
As backported in Ubuntu.  On unstable the issue is solved by #45916.
I couldn't find their source repo working with current data,
even that salsa.debian.org, so I copied the patch from their tarball.
2018-09-03 08:53:23 +02:00
jraygauthier
8b92a4e600 bluez: 5.48 -> 5.50 (#45901)
Fixes Bluetooth device not working after suspend regression.
2018-09-02 16:06:16 +02:00
Jan Tojnar
8c172c4426 Merge pull request #45938 from alexeymuranov/update-geary-in-release-18.03
[18.03] gnome3.geary: 0.12.3 → 0.12.4 (cherry-picked from master)
2018-09-02 10:55:34 +01:00
Jan Tojnar
000c7800a1 gnome3.geary: 0.12.3 → 0.12.4
(cherry picked from commit 810111616b)
2018-09-02 10:32:01 +02:00
Peter Simons
a960b87ac2 esniper: fix mismatched 'src' attribute
(cherry picked from commit 4a64a7aef5)
2018-09-01 11:18:00 +02:00
Andreas Rammhold
8252400a0d openjdk10: 10.0.1 -> 10.0.2 (#45882)
this fixes a series of potential security issues:

CVE-2018-2940, CVE-2018-2941, CVE-2018-2952, CVE-2018-2964,
CVE-2018-2972 & CVE-2018-2973

(cherry picked from commit f9788aa118)
2018-08-31 22:47:43 +02:00
Arcadio Rubio García
a37638d467 nixos: stumpwm: switch from package marked as broken to working quicklisp package (#40501)
(cherry picked from commit efde5fefb3)
2018-08-30 21:03:26 +02:00
Vladimír Čunát
9527b016e7 wireshark: 2.4.7 -> 2.4.9 (security)
https://www.wireshark.org/docs/relnotes/wireshark-2.4.8.html
https://www.wireshark.org/docs/relnotes/wireshark-2.4.9.html

I briefly tested capturing some traffic via the GUI.
master uses 2.6.x already; /cc #45796.
2018-08-30 19:17:23 +02:00
Simon Lackerbauer
7c40ff5495 atlassian-jira: 7.11.2 -> 7.12.0
(cherry picked from commit b2f042dfd8edf67d3096ff3294ff9050890ecfdd)
(cherry picked from commit 1c461d7eb7d27396a3a20e38d048546bf3f11379)
2018-08-30 12:41:57 +02:00
Simon Lackerbauer
8bb39a38c7 atlassian-jira: 7.11.1 -> 7.11.2
(cherry picked from commit aa52aa68a33313e4e209872a0422622ae65116cc)
(cherry picked from commit aa40749f1ac8df397e052fe2ad9c082d8e781588)
2018-08-30 12:41:57 +02:00
Simon Lackerbauer
3530e921c5 atlassian-jira: 7.11.0 -> 7.11.1
(cherry picked from commit 093eb27a9e5793343f6506d063debb3d11794ac1)
(cherry picked from commit 7e6558ecb9de4b41f86f1f71b09ca3348a348849)
2018-08-30 12:41:57 +02:00
Simon Lackerbauer
0ec52b808b atlassian-jira: 7.9.2 -> 7.11.0
(cherry picked from commit 2799d11eb0)
2018-08-30 12:41:57 +02:00
Robin Gloster
8b4041dc41 atlassian-jira: 7.9.0 -> 7.9.2
(cherry picked from commit abf36cfaed)
2018-08-30 12:41:57 +02:00
Jean-Baptiste Giraudeau
89776b3490 atlassian-jira: 7.7.0 -> 7.9.0
(cherry picked from commit f46368be6a)
2018-08-30 12:41:57 +02:00
Vladimír Čunát
5e42ee936d xorg.libX11: 1.6.5 -> 1.6.6 (security)
CVE-2018-14598, CVE-2018-14599, CVE-2018-14600
https://lists.x.org/archives/xorg-announce/2018-August/002915.html

(cherry picked from commit cb44c3ff4c)
2018-08-30 10:25:58 +02:00
WilliButz
edd63e05d1 grafana: 5.1.4 -> 5.2.3
includes fix for CVE-2018-558213

(cherry picked from commit c847fbb54e)
2018-08-29 16:12:46 +02:00
Tim Steinbach
561866ab17 linux: 4.4.152 -> 4.4.153
(cherry picked from commit 5147ac77ed)
2018-08-28 19:30:14 -04:00
Jörg Thalheim
59171d4f7a Merge pull request #45711 from samueldr/auto/dbeaver/nixos-18.03/5.1.6
dbeaver: 5.1.5 -> 5.1.6 (18.03)
2018-08-28 17:14:16 +01:00
Samuel Dionne-Riel
3a06fa00a7 dbeaver: 5.1.5 -> 5.1.6
(cherry picked from commit 452ce3915d)
2018-08-28 11:48:01 -04:00
Graham Christensen
0e9b83fb89 nixpkgs docs: normalize 2018-08-27 20:04:03 -04:00
Graham Christensen
720dcd4e2b docs: include shell section 2018-08-27 20:04:03 -04:00
Daiderd Jordan
f316ac45e5 Merge branch 'staging-18.03' into release-18.03 2018-08-26 12:35:54 +02:00
Yarny0
59c3c4d686 plasma-nm: fix path to mobile broadband provider file (#44302)
When creating a new mobile broadband connection
with the plasma network manager connection editor,
it tries to find a file containing provider
information somewhere in /usr/share/... .
The build recipe contains a patch to fix the lookup path
such that it finds the file in the corresponding package,
probably added due to
https://github.com/NixOS/nixpkgs/issues/9389 .
The actual lookup path is injected into
the patch file with substituteAll.

With commit a31d98f312 ,
the variable name used in subsituteAll changed from
mobile_broadband_provider_info to mobile-broadband-provider-info
(underscores in package names turned into dashes).
Apparently, substituteAll can't handle dashes in variable names.
Consequently, the variable name was no longer resolved.
plasma-nm failed to create new mobile broadband connections;
the connection creator silently exited and logged the error
> plasma-nm: Error opening providers file "@mobile-broadband-provider-info@/share/mobile-broadband-provider-info/serviceproviders.xml"

This commit keeps the dashes in package names, but it
restores the underscores in the variable used by substituteAll,
thereby ensuring the variable gets resolved properly.

(cherry picked from commit bdf6f8528e)
2018-08-24 18:06:10 +02:00
Lancelot SIX
2383af82d4 pythonPakcages.django: 1.11.13 -> 1.11.15
(cherry picked from commit 7a72c4da1b)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
2018-08-24 17:37:07 +02:00
Tim Steinbach
cce9257725 linux: 4.17.18 -> 4.17.19
(cherry picked from commit 6566b639ccd54a8bf39acfd40404a88cbefdd001)
2018-08-24 09:55:29 -04:00
Tim Steinbach
8c45e7c42b linux: 4.14.66 -> 4.14.67
(cherry picked from commit b1c0748f12c7315fbae7251d44185f765e4f40af)
2018-08-24 09:55:20 -04:00
Tim Steinbach
767d7d1ef4 linux: 4.9.123 -> 4.9.124
(cherry picked from commit 6a7a93e70e8b0a6c544b05f9387d348f3fba28e1)
2018-08-24 09:55:13 -04:00
Tim Steinbach
4d01ab28b1 linux: 4.4.151 -> 4.4.152
(cherry picked from commit 4fde34948c471763146ec63f6ada08900db16ab5)
2018-08-24 09:55:00 -04:00
Vladimír Čunát
fde2012519 Merge #44931: firefox: disable VLC plugin
It wouldn't work anyway, even before 18.03 started.
2018-08-24 09:31:27 +02:00
Daiderd Jordan
f176956bcd Merge pull request #45437 from LnL7/macos-10.14-backport
darwin: macOS 10.14 compatibility
2018-08-24 00:14:26 +02:00
Daiderd Jordan
8b70b52d67 Libsystem: remove version symbols
These no longer exist on 10.14

Fixes #42719

(cherry picked from commit 54f901d346)
2018-08-24 00:03:06 +02:00
Daiderd Jordan
a58e00af93 stdenv-bootstrap-tools: update unpack to use $reexportedLibrariesFile
(cherry picked from commit 5024e4aa39)
2018-08-24 00:03:06 +02:00
Daiderd Jordan
c61bc6af09 Libsystem: remove libsystem_network.dylib from reexport list
Fixes #42719

(cherry picked from commit 52b8b68e82)
2018-08-24 00:03:02 +02:00
Andrew Childs
f094fd6379 jetbrains.ruby-mine: 2018.2 -> 2018.2.1
(cherry picked from commit 3513c5dc49)
2018-08-23 18:07:08 +01:00
Andrew Childs
e22e530a1d jetbrains.goland: 2018.2 -> 2018.2.1
(cherry picked from commit c08067b74d)
2018-08-23 18:07:08 +01:00
Andrew Childs
261a3b5f33 jetbrains.webstorm: 2018.2 -> 2018.2.1
(cherry picked from commit b1dc1f95b7)
2018-08-23 18:07:08 +01:00
Andrew Childs
6851dde7ab jetbrains.pycharm-professional: 2018.2 -> 2018.2.1
(cherry picked from commit 23831c50bf)
2018-08-23 18:07:08 +01:00
Andrew Childs
dbd39df279 jetbrains.pycharm-community: 2018.2 -> 2018.2.1
(cherry picked from commit d76c046b6f)
2018-08-23 18:07:08 +01:00
Andrew Childs
08dddf5f5d jetbrains.phpstorm: 2018.2 -> 2018.2.1
(cherry picked from commit db427ff1f5)
2018-08-23 18:07:08 +01:00
Andrew Childs
70287f028a jetbrains.idea-ultimate: 2018.2 -> 2018.2.1
(cherry picked from commit 6c8bec9e13)
2018-08-23 18:07:08 +01:00
Andrew Childs
5dae5f7dcd jetbrains.idea-community: 2018.2 -> 2018.2.1
(cherry picked from commit 9d942c7367)
2018-08-23 18:07:08 +01:00
Andrew Childs
ca863e3bf9 jetbrains.datagrip: 2018.2 -> 2018.2.1
(cherry picked from commit a57a0296d7)
2018-08-23 18:07:08 +01:00
Andrew Childs
6837c80d04 jetbrains.clion: 2018.2 -> 2018.2.1
(cherry picked from commit 52b9d0a3e8)
2018-08-23 18:07:07 +01:00
Tim Steinbach
27250f7290 hipchat: 4.30.5.1676 -> 4.30.5.1682
(cherry picked from commit addb57dc0a9d516117fb20ef545b6a00d32d3a1b)
2018-08-23 09:55:10 -04:00
Tim Steinbach
bce371f708 docker: 18.06.0 -> 18.06.1
(cherry picked from commit 3f9810d99122780ed66f66df737af495c774d762)
2018-08-22 16:09:10 -04:00
Tim Steinbach
38ed5064ee linux: 4.17.17 -> 4.17.18
(cherry picked from commit 26fb5f2d7b)
2018-08-22 07:56:57 -04:00
Tim Steinbach
75764e6a72 linux: 4.14.65 -> 4.14.66
(cherry picked from commit 368a050f73)
2018-08-22 07:56:49 -04:00
Tim Steinbach
952a20c1ef linux: 4.9.122 -> 4.9.123
(cherry picked from commit 0451339392)
2018-08-22 07:56:40 -04:00
Tim Steinbach
328acf6aa8 linux: 4.4.150 -> 4.4.151
(cherry picked from commit 40ec3ffc3e)
2018-08-22 07:56:32 -04:00
Daniel Peebles
292624fa20 Merge pull request #45363 from copumpkin/krb5-keyring-18.03
krb5: add linux keyring support
2018-08-21 07:44:13 -04:00
Markus Kowalewski
6d8fea6668 sshfs-fuse: add license
(cherry picked from commit 4622596d63)
2018-08-21 02:59:23 +02:00
Michael Weiss
3f272db5ee sshfs: 3.3.2 -> 3.4.0
(cherry picked from commit b0f9175d03)
2018-08-21 02:59:23 +02:00
Michael Weiss
5ffe516f96 sshfs: 3.3.1 -> 3.3.2
(cherry picked from commit 175705b6ce)
2018-08-21 02:59:23 +02:00
Dan Peebles
e57844239d krb5: add linux keyring support
This requires some minor hoop-hopping because it's involved in the
Linux bootstrap, but it's nothing too complicated.

Fixes #43289

(cherry picked from commit a5b5536e2a)
2018-08-20 03:38:15 +00:00
Daniël de Kok
f45cefe91a resilio-sync: 2.5.12 -> 2.6.0
Changelog: https://help.resilio.com/hc/en-us/articles/206216855-Sync-2-x-change-log
(cherry picked from commit 6eb4d6fbd2)
2018-08-19 14:06:25 +01:00
Jan Tojnar
8aeac6b54c Merge pull request #44652 from zgrannan/fix-skype-attachment-upload
skypeforlinux: Add GSettings schemas
2018-08-19 13:34:40 +02:00
Vladimír Čunát
4df3426f5a Merge #45298: libgit2: 0.26.0 -> 0.26.6 (security) 2018-08-19 09:20:40 +02:00
Edmund Wu
47b68dead3 linux: 4.9.121 -> 4.9.122
(cherry picked from commit 10777c361e)
2018-08-18 10:11:31 -04:00
Edmund Wu
cc5c656292 linux: 4.4.149 -> 4.4.150
(cherry picked from commit bd9a4006fe)
2018-08-18 10:11:30 -04:00
Edmund Wu
100173942f linux: 4.17.16 -> 4.17.17
(cherry picked from commit c954c98b7b)
2018-08-18 10:11:29 -04:00
Edmund Wu
9918d59cad linux: 4.14.64 -> 4.14.65
(cherry picked from commit 2c76bd16fd)
2018-08-18 10:11:28 -04:00
Wael M. Nasreddine
6ce5555bb3 linux: 4.17.15 -> 4.17.16
(cherry picked from commit 2366de6c0b)
2018-08-18 10:08:11 -04:00
Wael M. Nasreddine
01a10ec4bf linux: 4.14.63 -> 4.14.64
(cherry picked from commit bad288c550)
2018-08-18 10:08:10 -04:00
Wael M. Nasreddine
c629f4c362 linux: 4.9.120 -> 4.9.121
(cherry picked from commit 80448a4747)
2018-08-18 10:08:08 -04:00
Wael M. Nasreddine
bb4e3dca90 linux: 4.4.148 -> 4.4.149
(cherry picked from commit 928bc3f864)
2018-08-18 10:08:06 -04:00
Tuomas Tynkkynen
7fc7886203 nixos/qemu-vm: Always add a virtio RNG device to the quest
mke2fs has this annoying property that it uses getrandom() to get random
numbers (for whatever purposes) which blocks until the kernel's secure
RNG has sufficient entropy, which it usually doesn't in the early boot
(except if your CPU supports RDRAND) where we may need to create the
root disk.

So let's give the VM a virtio RNG to avoid the boot getting stuck at
mke2fs.

(cherry picked from commit dda74d9e50)
2018-08-18 15:47:33 +03:00
Elis Hirwing
bdd98ff3e2 php71: 7.1.20 -> 7.1.21 (#45297)
Changelog: https://secure.php.net/ChangeLog-7.php#7.1.21
2018-08-18 14:17:06 +02:00
Will Dietz
cfef8f5e12 libgit2: 0.26.0 -> 0.26.6 (security, fixes)
Don't know that there's a reason to keep the patch level
fixed at 0, optimistically bumping to latest (6).

(cherry picked from commit 8c78eee4a1)
2018-08-18 13:18:04 +02:00
Vladimír Čunát
a4e068ff9c Merge branch 'staging-18.03' into release-18.03
mariadb and postgresql security updates.
2018-08-17 16:19:31 +02:00
Wael M. Nasreddine
6699933118 flash: 30.0.0.134 -> 30.0.0.154 2018-08-17 13:53:39 +01:00
Vladimír Čunát
5d28c48055 tor: re-enable all test (except a broken one) 2018-08-17 14:49:56 +02:00
Vladimír Čunát
67f6e17682 Merge #40007: mariadb: Fix mariadb_config include path
(cherry picked from commit 89bed5b604)
2018-08-17 11:18:54 +02:00
Andreas Rammhold
8a804f70bc mariadb: 10.2.13 -> 10.2.17
Bump to latest stable version of the 10.2.x branch. Besides many bug fixes the
following security related issues have been fixed:
 - CVE-2018-3060
 - CVE-2018-3064
 - CVE-2018-3063
 - CVE-2018-3058
 - CVE-2018-3066
 (probably more from before 10.2.16)

Release notes: https://mariadb.com/kb/en/library/mariadb-10217-release-notes/

(cherry picked from commit 6c3d99c7645f7c7f8331c1c7ff7453bfaeb21cc2)
2018-08-17 11:17:24 +02:00
Vladimír Čunát
549d76c21f Merge #45147 into staging-18.03: postgresql security 2018-08-17 11:08:30 +02:00
Andreas Rammhold
4af590e135 Merge pull request #45208 from andir/18.03/gdm
[18.03] gnome3.gdm: fix CVE-2018-14424
2018-08-17 11:02:37 +02:00
Andreas Rammhold
082265fd53 gnome3.gdm: fix CVE-2018-14424
This backports the changes done in the 2.28 branch of gdm to address the
issue.
2018-08-17 09:30:40 +02:00
Vladimír Čunát
513c52147f knot-dns: 2.6.8 -> 2.6.9 (maintenance)
https://lists.nic.cz/pipermail/knot-dns-users/2018-August/001442.html
Nixpkgs master will be getting 2.7.1 instead.
2018-08-17 09:02:27 +02:00
Andreas Rammhold
b3432db56a Merge pull request #45136 from andir/18.03/qemu
[18.03] qemu: 2.11.1 -> 2.11.2
2018-08-17 08:55:49 +02:00
Vladimír Čunát
cd0cd946f3 Merge branch 'staging-18.03' into release-18.03
A few security fixes.
2018-08-17 08:16:03 +02:00
Vladimír Čunát
72a96e63ed tor: doCheck = false; for the moment 2018-08-17 08:15:31 +02:00
R. RyanTM
7d829c1f68 lighttpd: 1.4.49 -> 1.4.50
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/lighttpd/versions.

(cherry picked from commit 6e1d3cbe6b)

Fix trivial conflict from commit 57bccb3cb8
("treewide: http -> https sources (#42676)") on master branch.
2018-08-17 06:51:58 +02:00
Andreas Rammhold
cddb625468 postgresql93: 9.3.23 -> 9.3.24
Fixes CVE-2018-10915 & CVE-2018-10925

Release notes: https://www.postgresql.org/docs/current/static/release-9-3-24.html

(cherry picked from commit 5de601e0d2)
2018-08-16 21:56:24 +02:00
Andreas Rammhold
e2eda22927 postgresql94: 9.4.18 -> 9.4.19
Fixes CVE-2018-10915 & CVE-2018-10925

Release notes: https://www.postgresql.org/docs/current/static/release-9-4-19.html

(cherry picked from commit 2abb00e249)
2018-08-16 21:56:11 +02:00
Andreas Rammhold
050f59cd11 postgresql95: 9.5.13 -> 9.5.14
Fixes CVE-2018-10915 & CVE-2018-10925

Release notes: https://www.postgresql.org/docs/current/static/release-9-5-14.html

(cherry picked from commit 98d8db4c32)
2018-08-16 21:56:01 +02:00
Andreas Rammhold
6afac1b222 postgresql96: 9.6.9 -> 9.6.10
Fixes CVE-2018-10915 & CVE-2018-10925

Release notes: https://www.postgresql.org/docs/current/static/release-9-6-10.html

(cherry picked from commit 94c35894b0)
2018-08-16 21:55:49 +02:00
Andreas Rammhold
520b2cdf53 postgresql100: 10.4 -> 10.5
Fixes CVE-2018-10915 & CVE-2018-10925

Release notes: https://www.postgresql.org/docs/current/static/release-10-5.html

(cherry picked from commit 1c4fc1dbd9)
2018-08-16 21:55:21 +02:00
Andreas Rammhold
e2a633cbdb qemu: 2.11.1 -> 2.11.2
This is a bugfix release that also allows (more) Spectre migitations.
In particular for CVE-2018-3639 (Spectre v4).
CVE-2018-7550 is also addressed,
2018-08-16 20:59:13 +02:00
Andreas Rammhold
6589daeca2 Merge pull request #45094 from andir/18.03/libmspack
[18.03] libmspack: 0.6alpha -> 0.7.1alpha
2018-08-16 10:43:51 +02:00
Andreas Rammhold
204377c995 libmspack: 0.6alpha -> 0.7.1alpha
This adresses the following issues:

- CVE-2018-14697
- CVE-2018-14680
- CVE-2018-14681
- CVE-2018-14682

(cherry picked from commit 9e8308d206)
2018-08-16 09:55:42 +02:00
Sarah Brofeldt
c1ef96ebdb Merge pull request #45091 from andir/18.03/samba
samba: 4.7.6 -> 4.7.9
2018-08-16 09:52:09 +02:00
aszlig
da9efe97d9 nixos/systemd: Allow to override serviceConfig
This has been reported by @qknight in his Stack Overflow question:

https://stackoverflow.com/q/50678639

The correct way to override a single value would be to use something
like this:

systemd.services.nagios.serviceConfig.Restart = lib.mkForce "no";

However, this doesn't work because the check is applied for the attrsOf
type and thus the attribute values might still contain the attribute set
created by mkOverride.

The unitOption type however did already account for this, but at this
stage it's already too late.

So now the actual value is unpacked while checking the values of the
attribute set, which should allow us to override values in
serviceConfig.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @qknight
(cherry picked from commit 0e7c945e15)
Reason: Another user has hit this problem on Discourse[1] and I thought
        I had already backported it to 18.03, apparently I didn't. Given
        the time of the original commit I think this had enough testing
        already so it shouldn't break anything and rather make things
        less annoying.
[1]: https://discourse.nixos.org/t/is-there-a-universal-way-to-enable-a-service-auto-restart/592/3
2018-08-16 06:53:18 +02:00
Andreas Rammhold
4fb61258be samba: 4.7.6 -> 4.7.9
Version 4.7.9 is a security release. The versions 4.7.7 & 4.7.8 contain
numerous bug fixes.

This fixes a couple of security related issues:
 - https://www.samba.org/samba/security/CVE-2018-10858.html
 - https://www.samba.org/samba/security/CVE-2018-10918.html
 - https://www.samba.org/samba/security/CVE-2018-10919.html
 - https://www.samba.org/samba/security/CVE-2018-1139.html

Changelogs for the version upgrades can be found below.

 - https://www.samba.org/samba/history/samba-4.7.7.html
 - https://www.samba.org/samba/history/samba-4.7.8.html
 - https://www.samba.org/samba/history/samba-4.7.9.html

(cherry picked from commit 67ea2c0ffe)
2018-08-15 23:50:45 +02:00
Andreas Rammhold
bf3a543386 libxml2: fix CVE-2018-14567 & CVE-2018-14404 & CVE-2018-9251
backport of 06e7a48f45
2018-08-15 23:01:12 +02:00
Vladimír Čunát
1f1ca0653e Merge #45082 into staging-18.03: openssl 1.0.2p & 1.1.0i 2018-08-15 22:38:14 +02:00
Vladimír Čunát
3235e34a55 Merge branch 'release-18.03' into staging-18.03 2018-08-15 22:38:08 +02:00
Andreas Rammhold
70328c5338 openssl_1_1_0: 1.1.0h -> 1.1.0i
this addresses:
 - Client DoS due to large DH parameter (CVE-2018-0732)
 - Cache timing vulnerability in RSA Key Generation (CVE-2018-0737)

Changelog: https://www.openssl.org/news/changelog.html#x1
(cherry picked from commit 0a40875439)
2018-08-15 21:38:49 +02:00
Andreas Rammhold
0353772874 openssl_1_0_2: 1.0.2o -> 1.0.2p
this addresses:
 - Client DoS due to large DH parameter (CVE-2018-0732)
 - Cache timing vulnerability in RSA Key Generation (CVE-2018-0737)

Changelog: https://www.openssl.org/news/cl102.txt
(cherry picked from commit 98a7b92261)
2018-08-15 21:36:32 +02:00
Tim Steinbach
8b4ed614c9 linux: 4.17.14 -> 4.17.15
(cherry picked from commit 4031c5fe0d)
2018-08-15 12:55:15 -04:00
Tim Steinbach
74307b0e52 linux: 4.14.62 -> 4.14.63
(cherry picked from commit 737f1b4c40)
2018-08-15 12:55:07 -04:00
Tim Steinbach
7371e2cda2 linux: 4.9.119 -> 4.9.120
(cherry picked from commit c5f3a5b982)
2018-08-15 12:54:56 -04:00
Tim Steinbach
5b90cb5134 linux: 4.4.147 -> 4.4.148
(cherry picked from commit 067d5e6289)
2018-08-15 12:54:49 -04:00
Timo Kaufmann
5b8a24a40c Merge pull request #45069 from NixOS/revert-45041-fix/urbit-update
Revert "urbit: 0.4.5 -> 0.6.0"
2018-08-15 15:28:13 +02:00
Timo Kaufmann
2fecd10d46 Revert "urbit: 0.4.5 -> 0.6.0" 2018-08-15 15:27:52 +02:00
Timo Kaufmann
6aa0b6161c Merge pull request #45041 from bsima/fix/urbit-update
urbit: 0.4.5 -> 0.6.0
2018-08-15 13:17:50 +02:00
Ben Sima
5b567363af urbit: 0.4.5 -> 0.6.0 2018-08-14 14:15:12 -07:00
Shea Levy
66bd479f26 haskell.lib.getHaskellBuildInputs: Actually get the haskell build inputs.
5523ec8f3c accidentally dropped the attribute lookup.

(cherry picked from commit 7372d3bf31)
2018-08-14 17:05:43 -04:00
Jörg Thalheim
9cbc736354 Merge pull request #45019 from garbas/fix-firefox-bin-on-18.03
firefox-bin: fix for broken icons due to broken symlink
2018-08-14 14:00:50 +02:00
Rok Garbas
c508887ca3 firefox-bin: fix for broken icons due to broken symlink 2018-08-14 12:23:50 +02:00
Sarah Brofeldt
10b979ff21 Merge pull request #44959 from samueldr/auto/dbeaver/nixos-18.03/5.1.5
dbeaver: 5.1.4 -> 5.1.5 (18.03)
2018-08-13 09:15:42 +02:00
Samuel Dionne-Riel
9c6c8f2b54 dbeaver: 5.1.4 -> 5.1.5
(cherry picked from commit 4677b5e4d8)
2018-08-12 21:50:34 -04:00
Elis Hirwing
89ff9f94b6 gitea: 1.4.3 -> 1.5.0 (#44940)
Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.5.0
2018-08-13 00:36:35 +02:00
Peter Hoeg
febd4af26a vlc_npapi: drop it as firefox no longer support NPAPI
(cherry picked from commit 490e6fc9eb)
2018-08-12 12:50:04 +02:00
Zack Grannan
cd541bd929 Use glib instead of gtk3 2018-08-12 18:13:43 +08:00
Zack Grannan
59fc5abcaf remove makeWrapper 2018-08-12 18:08:48 +08:00
Vaibhav Sagar
4c24ce31d9 firefox: remove vlc_npapi
Fixes #44930
(cherry picked from commit 3107b4f018)
2018-08-12 12:01:17 +02:00
Zack Grannan
7bc72899cb Move gtk3 to buildInputs 2018-08-12 09:16:22 +08:00
Vladimír Čunát
bfeab2f461 Merge #44885: firefox*: 61.0.1 -> 61.0.2
(cherry picked from commit 838d63eced)
2018-08-11 19:54:33 +02:00
Vladimír Čunát
190ec72c71 Merge branch 'staging-18.03' into release-18.03 libtiff security patches 2018-08-11 19:44:23 +02:00
Yurii Izorkin
99907ae691 libtiff: update url to patch file (#44815)
(cherry picked from commit 527d3d566c)
Additionally fixes CVE-2018-8905 and CVE-2018-10963.
2018-08-11 19:44:22 +02:00
Vladimír Čunát
e2630a8a5c Merge branch 'release-18.03' into staging-18.03 2018-08-11 19:44:18 +02:00
Lancelot SIX
e42c07d78a qgis: 2.18.20 -> 2.18.22 (#44266)
(cherry picked from commit 51b8c7986a)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
2018-08-10 11:31:28 +02:00
Yurii Izorkin
03eebd770c libtiff: update url to patch file (#44815)
(cherry picked from commit 527d3d566c)
Additionally fixes CVE-2018-8905 and CVE-2018-10963.
2018-08-10 10:13:32 +02:00
Vladimír Čunát
2906af5d76 Merge branch 'release-18.03' into staging-18.03 2018-08-10 10:13:23 +02:00
Tim Steinbach
2c3f9c25b4 linux: 4.17.13 -> 4.17.14
(cherry picked from commit 29e68287e57288450510fa663a570cb7545dd0f0)
2018-08-09 14:50:21 -04:00
Tim Steinbach
89cb384b81 linux: 4.14.61 -> 4.14.62
(cherry picked from commit d84ee81afb37e7d7c11cd7679ffcc6c02d94fcf7)
2018-08-09 14:50:06 -04:00
Tim Steinbach
93d80f0642 linux: 4.9.118 -> 4.9.119
(cherry picked from commit ec9360d927dd093c55724993e3d27d739ec3ef65)
2018-08-09 14:49:53 -04:00
Tim Steinbach
c5cb76ace3 linux: 4.4.136 -> 4.4.147
(cherry picked from commit a65dbed6007ccff1db1ceb42a6fad046afe46c0e)
2018-08-09 14:49:45 -04:00
Zack Grannan
daf214dd5a Use wrapGAppsHook 2018-08-09 20:55:26 +08:00
Bjørn Forsman
0689d27173 cgit: 1.1 -> 1.2.1
Fixes CVE-2018-14912.

(cherry picked from commit 970d5ef198)

Trivial conflict from commit 57bccb3cb8
("treewide: http -> https sources (#42676)") on master branch.
2018-08-09 01:49:34 +02:00
R. RyanTM
26c469f0a1 lftp: 4.8.3 -> 4.8.4
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lftp/versions.

(cherry picked from commit 54b14db807)
2018-08-09 00:36:51 +02:00
Franz Pletz
3d615432e2 wpa_supplicant: add patch to fix CVE-2018-14526
Fixes #44724.

(cherry picked from commit a81b29ac0b)
2018-08-08 22:22:40 +02:00
Zack Grannan
7ff92cca4a skypeforlinux: add gsettings 2018-08-08 09:10:05 +08:00
Francesco Gazzetta
ad66494269 pybitmessage: 0.6.2 -> 0.6.3.2
(cherry picked from commit 28fe9047ef)
2018-08-07 23:59:22 +02:00
Tim Steinbach
c684b404e7 sbt: 1.2.0 -> 1.2.1
(cherry picked from commit 47e51aad09)
2018-08-07 08:36:28 -04:00
Tim Steinbach
3c130a5c13 linux: 4.17.12 -> 4.17.13
(cherry picked from commit 6b57315764)
2018-08-06 15:16:28 -04:00
Tim Steinbach
c86bbe3d4d linux: 4.14.60 -> 4.14.61
(cherry picked from commit ecfc3d9373)
2018-08-06 15:16:13 -04:00
Tim Steinbach
66c898ab4b linux: 4.9.117 -> 4.9.118
(cherry picked from commit 099671894d)
2018-08-06 15:15:57 -04:00
Tim Steinbach
ca6abd03bd linux: 4.4.145 -> 4.4.146
(cherry picked from commit 39335e6928)
2018-08-06 15:15:40 -04:00
adisbladis
6b244a4a94 Merge pull request #44525 from etu/1803-php-upgrades
php: 5.6.36 -> 5.6.37, 7.0.30 -> 7.0.31
2018-08-06 16:11:36 +08:00
Elis Hirwing
29aa7ea35c php56: 5.6.36 -> 5.6.37
Changelog: https://secure.php.net/ChangeLog-5.php#5.6.37
2018-08-05 23:45:43 +02:00
Elis Hirwing
c07ee1a482 php70: 7.0.30 -> 7.0.31
Changelog: https://secure.php.net/ChangeLog-7.php#7.0.31
2018-08-05 23:41:59 +02:00
Tim Steinbach
beb373895b sharutils: Patch CVE-2018-1000097
(cherry picked from commit 1571c1f6631daaeae7db43983500ba3412ab6080)
2018-08-05 14:42:27 -04:00
Christian Kauhaus
2d2c2df6bd exiv2: include recent Debian security patches (#44446)
This patchset contains patches against:

* CVE-2018-10998
* CVE-2018-11531
* CVE-2018-12264
* CVE-2018-12265

Also adding GPL2 license.

Re #43716 (add missing licenses)

Re #44458 (vulnerability roundup 46 - 18.03)

(cherry picked from commit 18e0d4f711f9ed3483c18efa498b1592c5f9c3f6)
2018-08-05 19:12:44 +02:00
xeji
831ac69cb7 Merge pull request #44449 from thefloweringash/backport-gdm-fix
gnome3.gdm: fix session chooser (backport to 18.03)
2018-08-05 16:34:17 +02:00
Daiderd Jordan
fc0ce75ae0 nix: don't use /tmp for the tests on darwin
Unlike on linux these are not namespaced per user so this will cause
build failures if /tmp/nix-test was not removed by a previous build if
the nixbld user id doesn't match by accident. Nix already creates a
unique tempdir for builds so we can use that instead.

Fixes #44172

(cherry picked from commit 77a9745d7a)
2018-08-05 11:15:54 +02:00
Jan Tojnar
c75ef82187 gnome3.gdm: fix session chooser
We are patching GDM to respect GDM_SESSIONS_DIR environment
variable, which we are setting in the GDM module. Previously, we
only took care of a single code path, the one that handled session
start-up; missing the one obtaining the list of sessions.

This commit patches the second code path, and also whitelists the
GDM_SESSIONS_DIR so that it can be passed to the greeter.

Fixes #34101
2018-08-04 19:39:15 +09:00
Vladimír Čunát
3af00107ea Merge #44448: ffmpeg{,-full}: 3.4.3 -> 3.4.4 (security) 2018-08-04 12:14:38 +02:00
Vladimír Čunát
3b6ec08719 Revert "nixos tests: temporarily disable nfs tests"
Fixes #43473.  The latest kernel bumps apparently solved it.
This reverts 99adfd0a, d6c6c7fce, b9dccd8fa.
2018-08-04 11:28:52 +02:00
Matthew Harm Bekkema
70c0b6ffe9 ffmpeg{,-full}: 3.4.3 -> 3.4.4 (bugfix)
Fixes #44256

(cherry picked from commit 4f505d7267)
2018-08-04 18:52:02 +10:00
WilliButz
979d823f53 nixos/prometheus-exporters: use nixos-fw chain
Use nixos-fw chain instead of INPUT so that the rules don't keep
stacking everytime the firewall is reloaded.
This also adds a comment to each rule about the associated exporter.

(cherry picked from commit 9216da8928)
2018-08-03 23:53:14 +02:00
Justin Humm
4dbf327d92 pius: introduce perl as buildInput (#44415)
Otherwise, pius-party-worksheet would be unusable.
2018-08-03 19:06:39 +02:00
Dan Peebles
8de1206d0c bazaar: actually fix patch
My previous attempt to be clever failed, and I'm now bringing over the
patch from master instead
2018-08-03 12:00:54 -04:00
Dan Peebles
dd8ba51abe bazaar: fix broken patch URL
Not only was the URL broken, but the previous hash was the hash of an
empty file!

See these for more info:

- https://github.com/NixOS/nixpkgs/issues/44260
- 19bc90f911 (commitcomment-29951554)
2018-08-03 11:14:03 -04:00
Daniel Peebles
740ca82e76 Merge pull request #44397 from ngortheone/pinentry
pinentry: fix patch file url
2018-08-03 10:56:48 -04:00
Ihor Antonov
4f769119fd pinentry: fix patch file url
Link to the patch file became unavailable, which brakes package build
This is a manual cherry-pick from master
2018-08-03 10:45:40 -04:00
Daniel Peebles
230f98aa79 Merge pull request #44399 from ngortheone/libcroco
libcroco: fix patch url
2018-08-03 09:33:00 -04:00
Ihor Antonov
ff65d47041 libcroco: fix patch url
Gnome infra moved to gitlab and patch url for libcroco became
unavailable which broke the package build.
This is a manual cherry-pick from master
2018-08-03 09:26:30 -04:00
Tim Steinbach
48a0f755cb linux: 4.17.11 -> 4.17.12
(cherry picked from commit 4ac2740895)
2018-08-03 08:21:49 -04:00
Tim Steinbach
e94e385c5a linux: 4.14.59 -> 4.14.60
(cherry picked from commit 52c4a7a909)
2018-08-03 08:21:40 -04:00
Tim Steinbach
5531a3e443 linux: 4.9.116 -> 4.9.117
(cherry picked from commit 2e4410ac38)
2018-08-03 08:21:31 -04:00
Vladimír Čunát
d0c868ec17 firefox-esr-unwrapped: bring back the alias
https://github.com/NixOS/nixpkgs/pull/40006#issuecomment-409967248
2018-08-02 21:14:22 +02:00
Frederik Rietdijk
2344dc7d33 Merge pull request #44359 from FRidh/pythonmajor
Python interpreter updates
2018-08-02 17:15:15 +02:00
Frederik Rietdijk
6c1efbcaff python35: 3.5.5 -> 3.5.6
(cherry picked from commit 3a61a94789)
2018-08-02 16:47:13 +02:00
Frederik Rietdijk
e48513c762 python34: 3.4.8 -> 3.4.9
(cherry picked from commit 3bd5580b04)
2018-08-02 16:47:05 +02:00
Vladimír Čunát
8135d46c41 knot-resolver: 2.4.0 -> 2.4.1 (security)
Fixes CVE-2018-10920 and some less important things.
https://lists.nic.cz/pipermail/knot-resolver-announce/2018/000002.html

(cherry picked from commit 1895354eed)
2018-08-02 16:22:16 +02:00
markuskowa
728c28f934 beegfs/module: Fix a typo in meta.conf generation (#40979) (#44326)
This typo places mgtmd.extraConf in meta.conf
leading to meta.extraConf being ignored.
2018-08-02 09:00:54 +02:00
Matthew Bauer
18401b99f3 Merge pull request #43020 from alexeymuranov/add-system-monitor-gnome-shell-extensions
[18.03] gnomeExtensions.system-monitor: init at v33 (cherry-picked from master)
2018-08-01 22:59:33 -04:00
Michael Weiss
bb5988dd1c nixos/switch-to-configuration: Never stop system.slice
Problem: Restarting (stopping) system.slice would not only stop X11 but
also most system units/services. We obviously don't want this happening
to users when they switch from 18.03 to 18.09 or nixos-unstable.

Reason: The following change in systemd:
d8e5a93382

The commit adds system.slice to the perpetual units, which means
removing the unit file and adding it to the source code. This is done so
that system.slice can't be stopped anymore but in our case it ironically
would cause this script to stop system.slice because the unit file was
removed (and an older systemd version is still running).

Related issue: https://github.com/NixOS/nixpkgs/issues/39791

(cherry picked from commit 7098b0fcdf)
Reason: Make sure that this problem wouldn't occur if we would update
the systemd version.
2018-08-02 01:12:02 +02:00
Jean-Philippe Braun
1596c81382 nixos/kubernetes: fix kubelet cgroup stats
https://github.com/kubernetes/kubernetes/issues/56850
(cherry picked from commit 76c7cc0f30)
2018-08-01 23:37:10 +01:00
Will Dietz
0e55dde2ea file: patch for CVE-2018-10360 (#43856)
from Gentoo, based on upstream commit.

(cherry picked from commit 6546d17cfff4fc2a0f867d15f0d431e604b25740)
It seems not clear if _this_ version was affected by the CVE,
but the patch seems safe enough, so apply it to be sure.
2018-08-01 09:02:19 +02:00
Jörg Thalheim
d1a47f3788 Merge pull request #44285 from samueldr/backports/pr-19738
[18.03] openmw: update hash missed in update to 0.43.0
2018-08-01 07:48:36 +01:00
Jörg Thalheim
71f4eeb291 Merge pull request #44293 from danieldk/gitea-fix
gitea: fix undefined variable 'gitea'.
2018-08-01 07:46:57 +01:00
Jörg Thalheim
183c956c01 Merge pull request #44287 from snaar/fix-lesspipe-dependency-backport
Fix lesspipe dependency backport to 18.03
2018-08-01 07:23:01 +01:00
Daniël de Kok
717e9e4123 gitea: fix undefined variable 'gitea'.
Commit 42c35dea37, which is a cherry-pick
of 28c20a4731 uses the variable 'gitea',
which is not defined in the 18.03 module.

Fix this by: gitea -> pkgs.gitea
2018-08-01 08:09:25 +02:00
snaar
ca0e0fd89c lesspipe: fix paths via patch and substitution
(cherry picked from commit 93207805b8)
2018-07-31 23:58:14 -04:00
snaar
ad8c405931 lesspipe: add dependency on ncurses; actually pull in deps and put them on path
(cherry picked from commit c6bc77d30e)
2018-07-31 23:58:14 -04:00
snaar
3c7c2ab6c3 lesspipe: add missing dependency on 'file'
(cherry picked from commit e0d5f644ac)
2018-07-31 23:58:13 -04:00
makefu
60fe648295 pythonPackages.python-forecastio: init at 1.4.0
(cherry picked from commit ecac42bd87)

This fixes broken eval of 18.03 introduced in PR #44270
2018-08-01 11:57:33 +08:00
Will Dietz
68d50dd3e4 openmw: update hash missed in update to 0.43.0
Fixes #39712

(cherry picked from commit a8f3b1ad75)
2018-07-31 23:38:28 -04:00
Eelco Dolstra
9647aca655 nixUnstable: 2.1pre6148_a4aac7f -> 2.1pre6338_45bcf541
(cherry picked from commit 7bc2778ebb)
2018-07-31 21:18:18 +02:00
Daniel Peebles
0d78855409 Merge pull request #44270 from ngortheone/release-18.03
pythonPackages.fluent-logger: init at 0.9.3 (#44236)
2018-07-31 14:51:13 -04:00
Ihor Antonov
3bd247820c pythonPackages.fluent-logger: init at 0.9.3 (#44236)
Backport to release-18.03
2018-07-31 14:46:24 -04:00
R. RyanTM
a1299c9951 rdkafka: 0.11.3 -> 0.11.4
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/rdkafka/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.11.4 with grep in /nix/store/p7dbh8kabl3bqr28icnkzp55s6636mpl-rdkafka-0.11.4
- directory tree listing: https://gist.github.com/ab8b067a5f31e07af4ed6b1dbdc1a8a4

(cherry picked from commit 9f447ca367)

rdkafka: 0.11.4 -> 0.11.5 (#43932)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/rdkafka/versions.

(cherry picked from commit a55bbee997)
2018-07-31 08:19:34 -04:00
Tim Steinbach
b74b1cdb2f sbt: 1.1.6 -> 1.2.0
(cherry picked from commit 07264c5c002303cfd1bd79d2e629fd7b850a1a28)
2018-07-30 14:39:03 -04:00
Elis Hirwing
044a807a45 php71: 7.1.19 -> 7.1.20 (#44211)
Changelog: https://secure.php.net/ChangeLog-7.php#7.1.20
(cherry picked from commit 7c585235ff)
2018-07-30 20:17:33 +02:00
Vladimír Čunát
7a9835bc3e Merge #44225: chromium: Increase build timout to two days
(cherry picked from commit 437b604354)
2018-07-30 19:54:28 +02:00
tim put
b1fc6a9522 darktable: add opencl support
(cherry picked from commit 36e15996c4)
2018-07-30 18:12:29 +02:00
R. RyanTM
b5d8350ee4 darktable: 2.4.3 -> 2.4.4
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/darktable/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/darktable had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/darktable-rs-identify had a zero exit code or showed the expected version
- /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/darktable-cltest passed the binary check.
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/darktable-cli had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/darktable-generate-cache had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/darktable-cmstest had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/darktable-chart had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/.darktable-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/.darktable-rs-identify-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/.darktable-cltest-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/.darktable-cli-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/.darktable-generate-cache-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/.darktable-cmstest-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/.darktable-chart-wrapped had a zero exit code or showed the expected version
- 1 of 14 passed binary check by having a zero exit code.
- 0 of 14 passed binary check by having the new version present in output.
- found 2.4.4 with grep in /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4
- directory tree listing: https://gist.github.com/5bf935d4e34e2708e7c6c17628c7ee7b
- du listing: https://gist.github.com/b5ad3482552e5573dfaea42499dc0fb2

(cherry picked from commit 46f0320009)
2018-07-30 18:12:21 +02:00
R. RyanTM
65feee805f darktable: 2.4.2 -> 2.4.3
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/darktable/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cltest help’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest -h’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest --help’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest help’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped -h’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped --help’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped help’ got 0 exit code
- found 2.4.3 with grep in /nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3
- directory tree listing: https://gist.github.com/70f09e7ec3ef4b1bba88d54f066cf9df

(cherry picked from commit 5a62cfe4d3)
2018-07-30 18:12:13 +02:00
Ryan Mulligan
b30148eeb8 darktable: 2.4.1 -> 2.4.2
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/darktable/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/36vw0ki4wqgvwj1f0xgb17qpdxpzijm7-darktable-2.4.2/bin/darktable-cltest help` got 0 exit code
- found 2.4.2 with grep in /nix/store/36vw0ki4wqgvwj1f0xgb17qpdxpzijm7-darktable-2.4.2
- directory tree listing: https://gist.github.com/2fb5b4b7836751e43911e4337febf1ab

(cherry picked from commit f590d17d32)
2018-07-30 18:12:04 +02:00
Jan Tojnar
f8109e9305 gthumb: 3.6.0 → 3.6.1
(cherry picked from commit 05f175e06a)
2018-07-30 18:04:13 +02:00
Domen Kožar
4c10f6fe2d haskell: move yaml overrides to configuration-nix
(cherry picked from commit 059c2312be)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-30 17:03:23 +01:00
Jörg Thalheim
6796f5db1c Merge pull request #44232 from samueldr/auto/dbeaver/nixos-18.03/5.1.4
dbeaver: 5.1.3 -> 5.1.4 (18.03)
2018-07-30 14:19:55 +01:00
Samuel Dionne-Riel
9dc99732ad dbeaver: 5.1.3 -> 5.1.4
(cherry picked from commit 81511557c8)
2018-07-30 08:38:06 -04:00
taku0
d413143725 flashplayer: fix hashes
(cherry picked from commit a19c7135ca)
2018-07-30 08:32:01 -04:00
goibhniu
bd01be461c Flash: Fix the sha256 for linux x86_64
(cherry picked from commit c23b4d36be)
2018-07-30 08:32:01 -04:00
volth
5aef6113f2 flash: 30.0.0.113 -> 30.0.0.134
(cherry picked from commit 2dee9d4a80)
2018-07-30 08:32:01 -04:00
Jiri Danek
a085004110 jetbrains.ruby-mine: 2018.1.4 -> 2018.2
(cherry picked from commit 35e6e9282c)
2018-07-29 22:45:40 +01:00
Jiri Danek
9116f94137 jetbrains.phpstorm: 2018.1.6 -> 2018.2
(cherry picked from commit 4172475f5f)
2018-07-29 22:45:36 +01:00
Jiri Danek
638f70f2f1 jetbrains.datagrip: 2018.1.5 -> 2018.2
(cherry picked from commit d3a94427f5)
2018-07-29 22:45:32 +01:00
Jiri Danek
5b231c2a9e jetbrains.clion: fix paths to patched binaries and fix gdb binary
(cherry picked from commit 435e663eae)
2018-07-29 22:45:28 +01:00
Jiri Danek
f9d6486aa5 jetbrains.goland: 2018.1.5 -> 2018.2
(cherry picked from commit 47eb7ecd76)
2018-07-29 22:45:23 +01:00
Averell Dalton
4c641a0b61 jetbrains.rider: 2018.1.2 -> 2018.1.3
(cherry picked from commit 7932d521bf)
2018-07-29 22:45:18 +01:00
Averell Dalton
db0cf2a9c2 jetbrains.pycharm-professional: 2018.1.4 -> 2018.2
(cherry picked from commit 92da0cc767)
2018-07-29 22:45:14 +01:00
Averell Dalton
ea94719449 jetbrains.pycharm-community: 2018.1.4 -> 2018.2
(cherry picked from commit df169bfe90)
2018-07-29 22:45:09 +01:00
Averell Dalton
75937fc0bf jetbrains.idea-ultimate: 2018.1.6 -> 2018.2
(cherry picked from commit 57cde57b01)
2018-07-29 22:45:03 +01:00
Averell Dalton
7ccf600243 jetbrains.idea-community: 2018.1.6 -> 2018.2
(cherry picked from commit ba83cd406b)
2018-07-29 22:44:56 +01:00
Averell Dalton
c34b1295fd jetbrains.clion: 2018.1.6 -> 2018.2
(cherry picked from commit 93dc95d68a)
2018-07-29 22:44:51 +01:00
Averell Dalton
5bca1a2bbd jetbrains.webstorm: 2018.1.5 -> 2018.2
(cherry picked from commit 9181456576)
2018-07-29 22:44:46 +01:00
Averell Dalton
64afbfaf14 jetbrains.ruby-mine: 2018.1.3 -> 2018.1.4
(cherry picked from commit e8a15d070f)
2018-07-29 22:44:40 +01:00
Averell Dalton
dd5644acea jetbrains.idea-ultimate: 2018.1.5 -> 2018.1.6
(cherry picked from commit 8b80a9481e)
2018-07-29 22:44:36 +01:00
Averell Dalton
8db9f1d9a5 jetbrains.idea-community: 2018.1.5 -> 2018.1.6
(cherry picked from commit 47c2046f90)
2018-07-29 22:44:31 +01:00
Averell Dalton
33a97cb148 jetbrains.goland: 2018.1.4 -> 2018.1.5
(cherry picked from commit e9d12e649f)
2018-07-29 22:44:26 +01:00
Averell Dalton
4133dd7203 jetbrains.datagrip: 2018.1.4 -> 2018.1.5
(cherry picked from commit 8d621910f5)
2018-07-29 22:44:20 +01:00
Averell Dalton
11fa42880b jetbrains.clion: 2018.1.5 -> 2018.1.6
(cherry picked from commit 07348da4d7)
2018-07-29 22:44:13 +01:00
Tim Steinbach
6ffbde26ad openjdk: 8u172-b11 -> 8u181-b13
(cherry picked from commit 01183f3c89)
2018-07-29 20:34:22 +00:00
Tim Steinbach
78029b84dd oh-my-zsh: 2018-04-25 -> 2018-07-29
(cherry picked from commit 28c314b94efeca0145afb14f6bcfdfa2bf9e8a39)
2018-07-29 20:07:53 +00:00
R. RyanTM
f4990255a3 php: 7.2.7 -> 7.2.8 (#43740)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/php/versions.

(cherry picked from commit 09766b55f0)
2018-07-29 20:25:13 +02:00
Michael Raskin
30f7cd981f Merge pull request #44163 from YorikSar/update-chromium-18.03
chromium: 67.0.3396.87 -> 68.0.3440.75 (18.03 backport)
2018-07-29 12:46:25 +00:00
Jörg Thalheim
84d9355dde Merge pull request #44055 from ljli/vscode-fix-stable
vscode: fix keymapping.node rpath
2018-07-29 13:10:48 +01:00
Tim Steinbach
eee71d85d5 linux: 4.17.10 -> 4.17.11
(cherry picked from commit ac39c03337e5bea4e581fc580b226a6d42964cb4)
2018-07-28 17:52:31 -04:00
Tim Steinbach
a156001a7d linux: 4.14.58 -> 4.14.59
(cherry picked from commit 21760b05b548f49020ddb8036f3166ff86845ead)
2018-07-28 17:52:11 -04:00
Tim Steinbach
d08d4ec396 linux: 4.9.115 -> 4.9.116
(cherry picked from commit 5734fea7d943a4d35f5046699bcc2f63bf205508)
2018-07-28 17:51:51 -04:00
Tim Steinbach
71011e1f4f linux: 4.4.144 -> 4.4.145
(cherry picked from commit 8805424b2cb05bf7234c2ff98794133b6ed7b8b9)
2018-07-28 17:51:30 -04:00
Frederik Rietdijk
acc6971044 Merge pull request #44169 from samueldr/backport/18.03/xx-0009ae3d
Backports: onboard: fix missing typelibs
2018-07-28 09:37:52 +02:00
Jan Tojnar
92262dffe5 onboard: fix missing typelibs
(cherry picked from commit 0009ae3d5e)
2018-07-28 00:08:24 -04:00
Yuriy Taraday
8fbae9da23 chromium: 67.0.3396.99 -> 68.0.3440.75 2018-07-27 19:58:48 +04:00
Yuriy Taraday
59c297c855 chromium: fix 68 (beta) build
Also replace openh264 patch with one landed in upstream.
2018-07-27 19:58:47 +04:00
Yuriy Taraday
038263eedc chromium: 67.0.3396.87 -> 67.0.3396.99 2018-07-27 19:58:47 +04:00
Shea Levy
95aa869f04 pythonPackages.rfc7464: Init at 17.7.0
(cherry picked from commit 886871538c)
2018-07-26 12:09:00 -04:00
Michael Raskin
7d85757bc3 Merge pull request #44090 from balsoft/release-18.03
Cherry-pick commit that fixes libreoffice wrapper to release-18.04
2018-07-26 14:20:14 +00:00
Tim Steinbach
adf8df1bb1 linux: 4.17.9 -> 4.17.10
(cherry picked from commit 202e270bbf)
2018-07-25 14:23:15 -04:00
Tim Steinbach
1fa84d3a4b linux: 4.14.57 -> 4.14.58
(cherry picked from commit 6cd6eb0513)
2018-07-25 14:22:49 -04:00
Tim Steinbach
f682d0050f linux: 4.9.114 -> 4.9.115
(cherry picked from commit 0fde78112e)
2018-07-25 14:22:28 -04:00
Tim Steinbach
f0edaf7e72 linux: 4.4.143 -> 4.4.144
(cherry picked from commit a2833a06b9)
2018-07-25 14:22:10 -04:00
Александр Бантьев
0bf3851863 Fixed merge 2018-07-25 16:08:17 +03:00
Michael Raskin
7bb2300026 Fix libreoffice theme 2018-07-25 15:25:07 +03:00
Eelco Dolstra
afffbe50fb EC2 AMIs: 18.03.131792.becbe4dbe16 -> 18.03.132946.1caae7247b8
(cherry picked from commit c9ea04b57f)
2018-07-24 21:21:00 +02:00
Eelco Dolstra
dba78f04c2 create-amis.sh: Change directory for AMIs
(cherry picked from commit b240822cfa)
2018-07-24 21:20:59 +02:00
Leon Isenberg
8582bf5e3e vscode: fix keymapping.node rpath 2018-07-24 14:31:10 +02:00
Jörg Thalheim
1caae7247b Merge pull request #44031 from andir/18.03/networkmanager-vpnc
networkmanager-vpnc: 1.2.4 -> 1.2.6
2018-07-24 06:18:20 -04:00
Andreas Rammhold
858513635f networkmanager-vpnc: 1.2.4 -> 1.2.6
fixes CVE-2018-10900

(cherry picked from commit f4f8cb5b22)
2018-07-23 23:13:12 +02:00
Wael M. Nasreddine
3cf06212b0 neovim: fix the xsel path in the clipboard runtime provider
(cherry picked from commit 5c7c2be709)
2018-07-23 21:42:15 +01:00
Jörg Thalheim
d6691935eb Merge pull request #44026 from andir/18.03/mutt
mutt: 1.9.4 -> 1.10.1
2018-07-23 21:35:11 +01:00
Andreas Rammhold
2a45ea1dba mutt: 1.9.4 -> 1.10.1
address multiple CVEs including the following batch:
CVE-2018-14362 CVE-2018-14359 CVE-2018-14358 CVE-2018-14357
CVE-2018-14356 CVE-2018-14355 CVE-2018-14354 CVE-2018-14353
CVE-2018-14352 CVE-2018-14351 CVE-2018-14350 CVE-2018-14349
2018-07-23 21:39:42 +02:00
Andreas Rammhold
917906a23e Merge pull request #44024 from andir/18.03/neomutt
[18.03] neomutt: 20180223 -> 20180716
2018-07-23 21:38:37 +02:00
Andreas Rammhold
3e6c2583ca neomutt: 20180223 -> 20180716
fixes CVE-2018-14362 CVE-2018-14359 CVE-2018-14358 CVE-2018-14357
CVE-2018-14356 CVE-2018-14355 CVE-2018-14354 CVE-2018-14353
CVE-2018-14352 CVE-2018-14351 CVE-2018-14350 CVE-2018-14349
2018-07-23 21:17:58 +02:00
Bastian Köcher
5b190ea8ce skypeforlinux: 8.18.0.6 -> 8.24.0.2
(cherry picked from commit 67c7b00abf)
2018-07-23 20:37:29 +02:00
Thomas Kerber
cb6b846a12 skypeforlinux: remove libstdc++5 dependency (#41590)
(cherry picked from commit 979a835c46)
2018-07-23 20:37:28 +02:00
worldofpeace
38c28b34d9 skypeforlinux: gnome2 cleanup (#41176)
* skypeforlinux: gnome2 cleanup

* skypeforlinux: use toplevel gdk_pixbuf and gtk2

(cherry picked from commit 1f14408b0e)
2018-07-23 20:37:23 +02:00
Jörg Thalheim
bd834a5653 Merge pull request #44005 from Mic92/gitea-backport
[backport] gitea: 1.3.3 -> 1.4.3 (security + bug fixes)
2018-07-23 12:32:59 +01:00
Daniël de Kok
e850302491 gitea: 1.4.2 -> 1.4.3
(cherry picked from commit 8b695a7353)
2018-07-23 11:41:37 +01:00
Elis Hirwing
d1d8c12f01 gitea: 1.4.1 -> 1.4.2
Not much of a changelog: https://github.com/go-gitea/gitea/releases/tag/v1.4.2

(cherry picked from commit 106bde413e)
2018-07-23 11:41:37 +01:00
Tobias Happ
42c35dea37 nixos/gitea: fix pre start script
The hooks directory contains now one level deep subdirectories which
need to be updated as well.
If you use gitea via ssh, ~/.ssh/authorized_keys also needs to be
updated because of the hardcoded path to gitea in the "command" option.

(cherry picked from commit 28c20a4731)
2018-07-23 11:41:37 +01:00
zimbatm
36472c1526 gitea: 1.4.0 -> 1.4.1
(cherry picked from commit 716d877d0f)
2018-07-23 11:41:37 +01:00
Sondre Nilsen
1b7d8567d5 gitea: 1.3.3 -> 1.4.0
(cherry picked from commit a73cdc7333)
2018-07-23 11:41:37 +01:00
Tim Steinbach
dea932eabf linux: 4.17.8 -> 4.17.9
(cherry picked from commit f89e07dd24)
2018-07-22 22:44:46 -04:00
Tim Steinbach
3c61f44ace linux: 4.14.56 -> 4.14.57
(cherry picked from commit bbf1770e40)
2018-07-22 22:44:30 -04:00
Tim Steinbach
83e93c76f3 linux: 4.9.113 -> 4.9.114
(cherry picked from commit 486f37cf5b)
2018-07-22 22:44:15 -04:00
Tim Steinbach
cf584f5da3 linux: 4.4.142 -> 4.4.143
(cherry picked from commit 05b0bdb309)
2018-07-22 22:43:59 -04:00
Matthew Bauer
e20106f31a Merge #43538: fetchpatch: quote excludes
(cherry picked from commit fddd90e9ea)
This seems safe enough.  It solves a bug in a conservative way;
it also adds features, possibly easing cherry-picks of fixes from master.
2018-07-22 15:22:13 +02:00
Jan Tojnar
c7ac94bd0c gtkspell3: add gir
(cherry picked from commit 79092439ca)
2018-07-21 20:55:09 +02:00
Jan Tojnar
1f1aa5f888 eolie: fix build 2018-07-21 20:24:43 +02:00
Sarah Brofeldt
79e6571eaa Merge pull request #43811 from taku0/oraclejdk-8u181
oraclejdk: 10.0.1 -> 10.0.2 [Critical security fixes]

(cherry picked from commit defa76037f)
2018-07-21 11:37:55 +02:00
Frederik Rietdijk
7ee55ebf16 Merge pull request #43667 from FRidh/1803_python36
python36: 3.6.5 -> 3.6.6
2018-07-21 10:51:49 +02:00
Silvan Mosberger
6115f47770 postgresql100: 10.3 -> 10.4
Fixes CVE-2018-1115

Release notes: https://www.postgresql.org/docs/10/static/release-10-4.html

(cherry picked from commit 446ec6df2d)
2018-07-20 12:24:09 -05:00
Silvan Mosberger
1eefe30e03 postgresql96: 9.6.8 -> 9.6.9
Fixes CVE-2018-1115

Release notes: https://www.postgresql.org/docs/10/static/release-9-6-9.html

(cherry picked from commit d066cecd7d)
2018-07-20 12:24:03 -05:00
Silvan Mosberger
88c6f0ca34 postgresql95: 9.5.12 -> 9.5.13
Release notes: https://www.postgresql.org/docs/10/static/release-9-5-13.html

(cherry picked from commit ac5fdda5a6)
2018-07-20 12:23:57 -05:00
Silvan Mosberger
0c238624a9 postgresql94: 9.4.17 -> 9.4.18
Release notes: https://www.postgresql.org/docs/10/static/release-9-4-18.html

(cherry picked from commit 3d16732102)
2018-07-20 12:23:53 -05:00
Silvan Mosberger
129ae17266 postgresql93: 9.3.22 -> 9.3.23
Release notes: https://www.postgresql.org/docs/10/static/release-9-3-23.html

(cherry picked from commit 73aaf63fb1)
2018-07-20 12:23:49 -05:00
Vladimír Čunát
99adfd0a42 nixos tests: bring back non-blocking nfs tests
... at least for the big combined jobset where it's easy.
I don't know what I was thinking; this is clearly a better way.
2018-07-20 17:24:18 +02:00
Vladimír Čunát
d6c6c7fcec fixup: nixos tests: temporarily disable nfs tests
We really have these things spread over too many files.
2018-07-20 16:40:00 +02:00
Tim Steinbach
e8a7f5dfcc gradle: 4.8.1 -> 4.9
(cherry picked from commit a4d5583a85)
2018-07-20 08:14:16 -04:00
Tim Steinbach
f0bc8d8bc5 gradle: 4.8 -> 4.8.1
(cherry picked from commit fd269b9d0a)
2018-07-20 08:14:16 -04:00
Vladimír Čunát
b9dccd8fa1 nixos tests: temporarily disable nfs tests (/cc #43473)
The regression in ext4 kernel code appears to cause no real issue
to anyone, so I hate it would block other fixes from 18.03 for longer
than a full week.
(The ext4 changes themselves fix some CVE, though apparently minor.)
2018-07-20 13:23:51 +02:00
Tim Steinbach
f156984a61 linux: 4.4.141 -> 4.4.142
(cherry picked from commit 037e06f0b3)
2018-07-19 20:51:25 -04:00
Kamil Chmielewski
8ef4368bd6 oraclejdk: 8u171 -> 8u181 2018-07-19 21:08:06 +02:00
Andreas Rammhold
6dc8550451 Merge pull request #43642 from stefano-m/release-18.03
release-18.03: Update VLC to version 3.0.3
2018-07-19 20:14:28 +02:00
Tim Steinbach
70b2b1273d docker: 18.03 -> 18.06
(cherry picked from commit e953d314a8)
2018-07-19 08:37:37 -04:00
Tim Steinbach
441a92af61 linux: 4.17.7 -> 4.17.8
(cherry picked from commit 8432dec854)
2018-07-18 07:15:20 -04:00
Peter Hoeg
2da449ea6f Merge pull request #43660 from dotlambda/home-assistant-insecure
[18.03] home-assistant: mark as insecure
2018-07-18 10:58:24 +08:00
Florian Klink
bbad2e5555 virtualbox: 5.2.12 -> 5.2.14
backport of #43659
closes #41360

(cherry picked from commit fa4c1eeae6)
2018-07-18 00:34:05 +02:00
Shea Levy
1a7efa0226 pythonPackages.simpy: init at 3.0.11.
(cherry picked from commit 711c56dd67)
2018-07-17 17:50:39 -04:00
Michael Weiss
f9f9657e9e Merge pull request #43678 from primeos/signal-desktop-backport
Backport signal-desktop to stable (18.03)

Reason: According to an IRC discussion the Signal team might regularly
break older clients.
2018-07-17 19:47:53 +02:00
Graham Christensen
796b2b524d Merge pull request #43677 from benley/benley/backport-kbfs-mount-check
keybase-gui: fix kbfs mount path check
2018-07-17 12:21:07 -04:00
Michael Weiss
4709aaadeb signal-desktop: 1.14.0 -> 1.14.1
(cherry picked from commit c4fca64980)
2018-07-17 18:05:44 +02:00
Michael Weiss
e5872b3e40 signal-desktop: 1.13.0 -> 1.14.0
(cherry picked from commit c4d94d64c3)
2018-07-17 18:05:43 +02:00
Michael Weiss
a25bb84894 signal-desktop: 1.12.1 -> 1.13.0
(cherry picked from commit db0da282c3)
2018-07-17 18:05:43 +02:00
Michael Weiss
702df6c9ea signal-desktop: 1.12.0 -> 1.12.1
(cherry picked from commit 54ea1cd58a)
2018-07-17 18:05:43 +02:00
Michael Weiss
1916d89820 signal-desktop: Refactor the package description
Removed some redundancy (src check via meta.platforms) and made some
changes according to our style-guide.
I've changed meta.description and added meta.longDescription.

(cherry picked from commit ab593d46dc)
2018-07-17 18:05:43 +02:00
Michael Weiss
6bb53aab24 signal-desktop: Fix a possible crash when saving an attachment
If executed in a pure environment (nix-shell --pure) or depending on the
`gtk3` version of the system Signal-Desktop was e.g. crashing when
clicking on a PDF attachment (instead of showing the dialog to save a
file).
Using wrapGAppsHook and setting XDG_DATA_DIRS to the correct version
fixes this bug.

The error message was the following:
```
(signal-desktop:30756): Gtk-WARNING **: 14:04:49.073: Could not find the icon 'user-home-symbolic-ltr'. The 'hicolor' theme
was not found either, perhaps you need to install it.
You can get a copy from:
        http://icon-theme.freedesktop.org/releases

(signal-desktop:30756): GLib-GIO-ERROR **: 14:04:49.134: No GSettings schemas are installed on the system
Trace/breakpoint trap
```

(cherry picked from commit 5d795355a0)
2018-07-17 18:05:43 +02:00
Michael Weiss
0e4f91a43c signal-desktop: 1.11.0 -> 1.12.0
(cherry picked from commit 507d24a7de)
2018-07-17 18:05:43 +02:00
Jan Tojnar
ad29edf8e5 signal-desktop: use top-level gtk
(cherry picked from commit 1ac4be3052)
2018-07-17 18:05:43 +02:00
worldofpeace
5d27cfc817 signal-desktop: gnome2 cleanup (#41156)
(cherry picked from commit e1b501a7f6)
2018-07-17 18:05:43 +02:00
Michael Weiss
58df45417a signal: s/xlibs/xorg/g (#36889)
(cherry picked from commit 7ec0471242)
This isn't a real cherry pick, as I've only applied the changes
affecting Signal (these changes are required to cherry-pick further
commits) and customized the subject to avoid confusion.
2018-07-17 18:05:43 +02:00
Márton Boros
a6644783b8 keybase-gui: fix kbfs mount path check (#40080)
(cherry picked from commit b3c3df4007)
2018-07-17 11:59:56 -04:00
Frederik Rietdijk
634c7e62cd python36: 3.6.5 -> 3.6.6
(cherry picked from commit 78e05215a7)
2018-07-17 16:09:14 +02:00
Tim Steinbach
be11b88b92 linux: 4.17.6 -> 4.17.7
(cherry picked from commit 5f9770ff0be8fa74533ba26de516281b94fc8925)
2018-07-17 09:20:35 -04:00
Tim Steinbach
36700357ec linux: 4.14.55 -> 4.14.56
(cherry picked from commit c7e1e0a92f1d5adcd886597951e481ecf23ee530)
2018-07-17 09:20:24 -04:00
Tim Steinbach
1bfd10abb1 linux: 4.9.112 -> 4.9.113
(cherry picked from commit b73dc5b80aafae473ca3be2d24629c4505e4e370)
2018-07-17 09:20:14 -04:00
Tim Steinbach
befa20bd0d linux: 4.4.130 -> 4.4.141
(cherry picked from commit 5b259a67f97af82556653d8a3452aa60346f2e19)
2018-07-17 09:19:59 -04:00
Robert Schütz
a49962cbfb home-assistant: mark as insecure
The packaged version is susceptible to man-in-the-middle attacks.
See https://www.home-assistant.io/blog/2018/07/16/release-73-2/.
2018-07-17 14:51:39 +02:00
Matthew Bauer
fd4b5ac23b spidermonkey: fix i686 error on 38
spidermonkey doesn’t compile correctly on i686 linux & gcc7. It gives
the error:

  with gcc-7: undefined reference to `__divmoddi4'
2018-07-16 21:42:58 -04:00
Stefano Mazzucco
b0ea994f5c phonon-backend-vlc: 0.9.0 -> 0.10.1
Backported from master. Needed after vlc update
2018-07-16 20:19:32 +01:00
Stefano Mazzucco
d96ade368c vlc: 2.2.8 -> 3.0.3
Backported from master to solve a number of known security vulnerabilities.

Reference:
https://github.com/NixOS/nixpkgs/issues/43307
2018-07-16 20:19:32 +01:00
Alexey Muranov
b3dd272f09 gnome3.geary: 0.12.2 → 0.12.3 (#43569)
(cherry picked from commit 1997deab8d)
2018-07-16 10:52:07 +02:00
Peter Simons
a4110f3429 Merge pull request #43549 from LumiGuide/network-2.6.3.6-release-18.03
haskell/network: 2.6.3.4 -> 2.6.3.6 (release-18.03)
2018-07-16 09:44:36 +02:00
Franz Pletz
eb9a6c6eb4 Merge pull request #43592 from samueldr/auto/dbeaver/nixos-18.03/5.1.3
dbeaver: 5.1.2 -> 5.1.3 (18.03)
2018-07-16 03:41:33 +00:00
Samuel Dionne-Riel
cd51d16149 dbeaver: 5.1.2 -> 5.1.3
(cherry picked from commit 7d1076873c)
2018-07-15 19:00:53 -04:00
Robert Schütz
f981bade21 qutebrowser: fix patch excludes 2018-07-15 12:27:03 +02:00
Andrew Childs
ffb512277f ffmpeg: fix includedir in pkg-config files
(cherry picked from commit 342f72e747)
2018-07-15 11:33:33 +02:00
Vladimír Čunát
cf3effcc48 ffmpeg{,-full}: 3.4.2 -> 3.4.3 (security)
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/89355585366:/Changelog
/cc #42883: it certainly seems to fix some security issues,
but I'm not sure about mapping to particular CVE numbers;
perhaps it will appear on http://ffmpeg.org/security.html

(cherry picked from commit 10cbebe3df)
2018-07-15 11:31:44 +02:00
Bas van Dijk
aae92fe2fe haskell/network: 2.6.3.4 -> 2.6.3.6
http://hackage.haskell.org/package/network-2.6.3.6/changelog
2018-07-15 03:06:21 +02:00
adisbladis
263304fd51 Merge pull request #43033 from bkchr/plasma_5_12_6
Plasma5 & KdeApplications bugfix releases
2018-07-14 16:08:12 +08:00
Jörg Thalheim
2192f3a096 go_1_10: remove cache artifacts from package
fixes #42465
2018-07-13 21:39:53 -04:00
Vladimír Čunát
861211217f Merge branch 'staging-18.03' into release-18.03 2018-07-12 11:48:58 +02:00
Tad Fisher
411cc559c0 firefox: add u2f support
(cherry picked from commit c1740904ae)
2018-07-11 17:57:37 -04:00
Tim Steinbach
324aafeb38 linux: 4.17.5 -> 4.17.6
(cherry picked from commit b34a147eef)
2018-07-11 13:29:57 -04:00
Tim Steinbach
f8694c35db linux: 4.14.54 -> 4.14.55
(cherry picked from commit ed9578b7b1)
2018-07-11 13:29:48 -04:00
Tim Steinbach
e746289c19 linux: 4.9.111 -> 4.9.112
(cherry picked from commit 62b1759719)
2018-07-11 13:29:38 -04:00
Tim Steinbach
783be35403 linux: 4.4.139 -> 4.4.140
(cherry picked from commit f8daa11d41)
2018-07-11 13:29:28 -04:00
xeji
e38e1635f2 Merge pull request #43368 from dotlambda/qutebrowser-cve-2018-10895
[18.03] qutebrowser: fix CVE-2018-10895
2018-07-11 18:42:49 +02:00
Robert Schütz
af1313e915 qutebrowser: fix CVE-2018-10895 2018-07-11 18:04:49 +02:00
Peter Simons
cdc2ab971b Merge pull request #43271 from vaibhavsagar/bump-all-cabal-hashes
all-cabal-hashes: update snapshot to Hackage at 2018-07-03T07:36:18Z
2018-07-11 10:09:18 +02:00
xeji
55e4a4e8cd Merge pull request #43237 from samueldr/backport/virtualbox
virtualbox: 5.2.8 -> 5.2.12 (18.03)
2018-07-11 01:02:54 +02:00
Vladimír Čunát
315da196c6 Merge #43279: linux-hardened: Adjust for Linux 4.17 2018-07-10 17:50:06 +02:00
Vladimír Čunát
b273e63752 knot-dns: 2.6.7 -> 2.6.8 (maintenance)
https://lists.nic.cz/pipermail/knot-dns-users/2018-July/001409.html
(cherry picked from commit 2698bb461f)
2018-07-10 15:33:46 +02:00
talyz
c5f7795803 linux: Temporary fix for issue #42755
Fix a serious issue with the xen-netfront driver introduced in
upstream commit f599c64fdf7d ("xen-netfront: Fix race between device
setup and open") where the MTU of the device cannot be set
properly. This should be removed once it's included in upstream.

(cherry picked from commit 656335cd8b)
2018-07-10 20:38:09 +08:00
Tim Steinbach
1fd6aaa5ca linux-hardened: Adjust config for 4.17.4
(cherry picked from commit a4d56d0635)
2018-07-10 10:20:19 +02:00
Tim Steinbach
ba00e916c1 linux-hardened: Adjust for Linux 4.17
(cherry picked from commit 4f3ba3b1f8)
2018-07-10 10:20:08 +02:00
Vladimír Čunát
41088a6945 Merge #42888: nghttp2: backport fix for CVE-2018-1000168 2018-07-10 10:01:15 +02:00
Vladimír Čunát
b7f4e86b68 Merge branch 'release-18.03' into staging-18.03 2018-07-10 09:57:12 +02:00
Peter Simons
8949d12cea all-cabal-hashes: update snapshot to Hackage at 2018-07-03T07:36:18Z
(cherry picked from commit af701cff96)
2018-07-10 12:12:50 +08:00
xeji
aec217852f Merge pull request #43257 from samueldr/fix/revert-bcachefs
Revert removal of `linux_testing_bcachefs` from "linux: remove versions unmaintained upstream"
2018-07-09 22:52:19 +02:00
aszlig
c158f43b37 stdenv-setup: Remove superfluous check for /bin/sh
The line was essentially checking whether /bin/sh exists and is
executable and if that's the case, the isScript function returns
successfully.

When asking the author of this line on IRC it seems that even they can't
remember or imagine what this was supposed to be.

In summary: Whenever /bin/sh doesn't exist during a build, *any* file
given to isScript is reported as being a script even if it isn't.

This is kinda counter-intuitive and not something what somebody would
expect from a function called "isScript".

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra
(cherry picked from commit 739c835515)
2018-07-09 20:51:48 +02:00
Vladimír Čunát
5e10df3982 linux_testing: reinstate the attribute
Make it an alias of linux_latest ATM.
Previously it was 4.16-rc4 (i.e. very outdated).
2018-07-09 20:49:05 +02:00
Kim Ingmar Ferenc ALLAMANDOLA
8a35f2c387 nilfs-utils: force enable limbount support
https://discourse.nixos.org/t/how-to-contribute-send-bugreport-without-github-account/475
https://nilfs.sourceforge.io/en/faq.html
(cherry picked from commit 58021b77a0)
2018-07-09 17:54:49 +02:00
Samuel Dionne-Riel
25a932ed2b Revert removal of linux_testing_bcachefs from "linux: remove versions unmaintained upstream"
This reverts parts of commit 298e170b36.
2018-07-09 11:25:01 -04:00
Vladimír Čunát
d1eac65600 Merge #43235: backport linux_4_17 2018-07-09 12:03:43 +02:00
Florian Klink
581f65f79e virtualbox: update extpack and guest additions checksums
(cherry picked from commit b6708a4c9a)
2018-07-08 19:30:59 -04:00
R. RyanTM
e611c44fbc virtualbox: 5.2.10 -> 5.2.12
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/virtualbox/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage -h’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage --help’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage help’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxBalloonCtrl -h’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxBalloonCtrl --help’ got 0 exit code
- found 5.2.12 with grep in /nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12
- directory tree listing: https://gist.github.com/f9bf852a0a8e6e0b4c44a9b68764850b

(cherry picked from commit 2c591d6622)
2018-07-08 19:30:59 -04:00
Florian Klink
c8d95f71bc virtualbox: 5.2.8 -> 5.2.10
closes #39182.

(cherry picked from commit 8eb3167e2e)
2018-07-08 19:30:59 -04:00
Tim Steinbach
7e650248b6 linux: 4.17.4 -> 4.17.5
(cherry picked from commit 0c69a75009)
2018-07-08 17:57:05 -04:00
Tim Steinbach
3f72b1487d linux: 4.17.3 -> 4.17.4
(cherry picked from commit ed8e468ad1)
2018-07-08 17:56:04 -04:00
Tim Steinbach
01c9da0ebb linux: 4.17.2 -> 4.17.3
(cherry picked from commit 7dc31f5033)
2018-07-08 17:55:58 -04:00
Tim Steinbach
1aa59c4eac linux: 4.17.1 -> 4.17.2
(cherry picked from commit 3afc706c74)
2018-07-08 17:55:54 -04:00
Tim Steinbach
97bf845067 linux: 4.17 -> 4.17.1
(cherry picked from commit 91cda44cf9)
2018-07-08 17:55:49 -04:00
Tim Steinbach
fe727a9b95 linux: Add 4.17
(cherry picked from commit 39444569e0)

all-packages.nix differs in that only 4_17 has been added.
2018-07-08 17:01:47 -04:00
Tim Steinbach
1069e32c4a linux: 4.16-rc7 -> 4.17-rc1
(cherry picked from commit f8665f18fb)

One file has been dropped from the commit:

```
 Conflicts:
	pkgs/os-specific/linux/kernel/linux-testing.nix
```
2018-07-08 17:01:47 -04:00
Tim Steinbach
e930c685d5 linux: 4.14.53 -> 4.14.54
(cherry picked from commit e2807ebe44e623b7c501e8c3f18082845e123ec3)
2018-07-08 15:16:46 -04:00
Vladimír Čunát
de7ca40ac3 knot_resolver: support prefill module in extraFeatures
(cherry picked from commit 1c5addde5f)
2018-07-08 09:23:03 +02:00
Vladimír Čunát
a9f1b57371 lua*Packages.lfs: init at 1.7.0.2
(cherry picked from commit bfc123803d)
2018-07-08 09:22:59 +02:00
Tim Steinbach
298e170b36 linux: remove versions unmaintained upstream
It would be nice to have 4.17, but ATM it won't build;
some changes in the (shared) kernel config would be needed.
2018-07-07 11:05:09 +02:00
Bastian Köcher
31d2cd8fdd kernelPatches: Adds bcm2835_mmal_v4l2_camera_driver
The kernel patch is required for raspberry pi, to enable the camera
module.

[dezgeg: Add some comments indicating it's only needed for 4.16]

(cherry picked from commit 438631e401)
2018-07-07 11:01:56 +02:00
Tim Steinbach
0a76d2f03e linux: Remove 4.15.x
(cherry picked from commit fc79bf4374)
2018-07-07 10:46:43 +02:00
Vladimír Čunát
249463f6f4 Merge #43113: firefox*: 61.0 -> 61.0.1
(cherry picked from commit 6ea4c3d335)
2018-07-07 09:01:28 +02:00
Graham Christensen
f872318e76 networking: Fix timeout when lo has aliased IPs
With a config like

    {
      networking.interfaces."lo".ip4 = [
        { address = "10.8.8.8"; prefixLength = 32; }
      ];
    }

a nixos-rebuild switch would take a long time, and you'd see:

    $ systemctl list-jobs
       JOB UNIT                                TYPE  STATE
    734400 network-interfaces.target           start waiting
    734450 sys-subsystem-net-devices-lo.device start running
    734449 network-link-lo.service             start waiting

and:

    systemd[1]: sys-subsystem-net-devices-lo.device: Job sys-subsystem-net-devices-lo.device/star>
    systemd[1]: sys-subsystem-net-devices-lo.device: Job sys-subsystem-net-devices-lo.device/star>
    systemd[1]: Timed out waiting for device sys-subsystem-net-devices-lo.device.

This removes the device dependency for `lo` and fixes this bug.

Closes #7227

(cherry picked from commit 48d292e8a1)
2018-07-06 17:17:23 -04:00
xeji
072b99dff2 Merge pull request #43124 from flokli/gocryptfs-1.5-18.03
[backport 18.03] gocryptfs: 1.1.1 -> 1.5
2018-07-06 20:53:13 +02:00
Florian Klink
5f0b44fa3c gocryptfs: 1.1.1 -> 1.5
Bold marked applicable changelog entries:

 - Support extended attributes (xattr) in forward mode<Paste>
 - Add -fsck function
 - Fix several symlink race attacks
 - Use memory pools for buffer handling
 - Parallelize file content encryption
 - Use HKDF to derive separate keys for GCM and EME

(cherry picked from commit 7e579aa994)
2018-07-06 18:41:46 +02:00
Florian Klink
5537a4870d gocryptfs: fix typo in folder name
(cherry picked from commit dff0cfc3b0)
2018-07-06 18:41:41 +02:00
Vladimír Čunát
477b53dad5 Merge #43012: thunderbird*: 52.8.0 -> 52.9.0 (security)
(cherry picked from commit 07ac57182b)
2018-07-06 08:27:22 +02:00
Tim Steinbach
03928bebe9 hipchat: 4.30.4.1672 -> 4.30.5.1676
(cherry picked from commit 0753601e8211c570b6d1cf6525c1ca8ef5e96d09)
2018-07-05 08:34:06 -04:00
Bastian Köcher
745e90ed74 kde-applications: 17.12.2 -> 17.12.3 2018-07-04 20:43:52 +02:00
Bastian Köcher
b4f107def3 plasma5: 5.12.5 -> 5.12.6 2018-07-04 20:42:44 +02:00
Sébastien Maccagnoni
2f2c44c792 gnomeExtensions.system-monitor: do not need global sessionPath modification
(cherry picked from commit a180a52dd3)
2018-07-04 14:30:43 +02:00
Sébastien Maccagnoni
1aafdb403a gnomeExtensions.system-monitor: Fix the version number
(cherry picked from commit 058be360d3)
2018-07-04 14:30:33 +02:00
Sébastien Maccagnoni
b443d3cb2d gnomeExtensions.system-monitor: fix this package and upgrade to v33
(cherry picked from commit 0935cbf287)
2018-07-04 14:30:20 +02:00
Vladimír Čunát
b6646cb732 knot-resolver: 2.3.0 -> 2.4.0
It includes security-relevant fixes.
https://gitlab.labs.nic.cz/knot/knot-resolver/tags/v2.4.0

(cherry picked from commit ea8b0fa1cc)
2018-07-04 13:23:13 +02:00
Moritz Angermann
56fad146a1 ghc: fix dylib load command limits in compiler version 8.x
See https://phabricator.haskell.org/D4714 for the full details.
This will be part of ghc 8.6.

Closes https://github.com/NixOS/nixpkgs/pull/40877.

(cherry picked from commit 4b2eceaa35)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-04 11:04:44 +01:00
Silvan Mosberger
244c2db26c Merge pull request #42847 from worldofpeace/multimc-picked
multimc: create compatibility symlink to fix desktop icon (18.03)
2018-07-04 01:09:40 +02:00
Will Dietz
330ba503d4 Merge pull request #42825 from dtzWill/update/llvm-6.0.1-staging-18.03
llvm6: 6.0.0 -> 6.0.1 (18.03 edition)
2018-07-03 14:58:03 -05:00
Tim Steinbach
c8bdf68bfa linux: 4.14.52 -> 4.14.53
(cherry picked from commit d5b62b1575744b1b67339cafbea6df3d076a76fa)
2018-07-03 08:36:10 -04:00
Tim Steinbach
20c0898eab linux: 4.9.110 -> 4.9.111
(cherry picked from commit 389d8b28ec3221d49f74448957a12242018ff8d2)
2018-07-03 08:35:53 -04:00
Tim Steinbach
923fd70fe8 linux: 4.4.138 -> 4.4.139
(cherry picked from commit e7270cbf16caa61b6bb51c9b7e8dc228a6f6b8ab)
2018-07-03 08:35:44 -04:00
Rickard Nilsson
5a566004a2 nixos: Fix error in assertion (introduced by #41715) 2018-07-03 14:11:00 +02:00
Rickard Nilsson
dad6f732d5 Merge pull request #41715 from rickynils/networkmanager-dynamichosts
nixos: Add option networking.networkmanager.dynamicHosts
2018-07-03 12:26:58 +02:00
Symphorien Gibol
c8d83a16c1 nghttp2: backport fix for CVE-2018-1000168
backports commit b1bd6035e8
2018-07-02 23:51:15 +02:00
Peter Simons
949bddfae3 ghc: add version 8.4.3
(cherry picked from commit deeeb5002c)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-07-02 18:38:23 +01:00
Mario Rodas
c6884523e9 buildRustCrate: Set target_os to "macos" on darwin
The rust compiler uses "macos" as "target_os" conditional on Mac OS[1]

[1] 8e7a609e63/src/librustc_back/target/x86_64_apple_darwin.rs (L29)

(cherry picked from commit bdf031dd4f)
2018-07-02 11:24:10 -04:00
Sarah Brofeldt
cf204a7012 Merge pull request #42853 from samueldr/auto/dbeaver/nixos-18.03/5.1.2
dbeaver: 5.1.1 -> 5.1.2 (18.03)
2018-07-02 11:28:35 +02:00
Samuel Dionne-Riel
24ebe96705 dbeaver: 5.1.1 -> 5.1.2
(cherry picked from commit 964fde7eec)
2018-07-01 20:50:15 -04:00
Kevin Liu
7749573943 multimc: create compatibility symlink to fix desktop icon
(cherry picked from commit be47f95083)
2018-07-01 17:23:03 -04:00
Okina Matara
5bae582c1d multimc: 0.6.1 -> 0.6.2
(cherry picked from commit c52beb18ad)
2018-07-01 17:22:47 -04:00
Will Dietz
2c22f9b4e4 tor-browser-bundle-bin: 7.5.5 -> 7.5.6
(cherry picked from commit 3e6eb94038)
2018-06-30 22:28:32 +02:00
Will Dietz
73ef59e9c6 llvm_6: refresh sanitizers-non-gnu patch
(cherry picked from commit 8cd268adf0)
2018-06-30 12:30:28 -05:00
Will Dietz
2817cf2a2a llvm6: 6.0.0 -> 6.0.1
(cherry picked from commit 4a8104af49)

Pick wasn't entirely clean, required touchup because on master
compiler-rt is split into separate expression (and file),
which just meant the hash to update was in default.nix instead :).
2018-06-30 12:27:50 -05:00
xeji
2f06e04b74 Merge pull request #42792 from flokli/manual-fixes-users-users-18.03
Manual fixes: users.extraUsers -> users.users (18.03)
2018-06-30 01:23:12 +02:00
Florian Klink
192179b875 manual: rename user added to networkmanager from "youruser" to "alice"
to be consistent with the rest of the manual

Reported-By: Cedric Shahabi <cedric.shahabi@gmail.com>
(cherry picked from commit 329983f6c7)
2018-06-30 01:09:04 +02:00
Florian Klink
3a5f893de2 manual: rename users.extraUsers to users.users
Is called like this since 14321ae, but
docs were still using the old option in some cases.

Reported-By: Cedric Shahabi <cedric.shahabi@gmail.com>
(cherry picked from commit 6cabce9abd)
2018-06-30 01:08:50 +02:00
Sander van der Burg
dcf113cd46 nodePackages: regenerate with node2nix 1.6.0 2018-06-29 21:55:26 +02:00
Jörg Thalheim
d039b5822a Merge pull request #42758 from flokli/sqldeveloper-desktop-item-18.03
sqldeveloper: add desktop item
2018-06-29 14:11:37 +01:00
Vladimír Čunát
0a70d65fd4 Merge branch 'staging-18.03' into release-18.03
Firefox-related security updates.
2018-06-29 14:37:52 +02:00
Florian Klink
d214b55b96 sqldeveloper: add desktop item
(cherry picked from commit b73c44ece4)
2018-06-29 10:43:18 +02:00
Vladimír Čunát
4af706ba92 Merge #42729: firefox updates (critical security)
The commits are really cherry-picked from the PR.
2018-06-29 09:10:09 +02:00
Vladimír Čunát
1732e017b3 Merge branch 'release-18.03' into staging-18.03 2018-06-29 09:09:48 +02:00
taku0
d9e184bfe4 firefox-esr: 52.8.1esr -> 52.9.0esr, 60.0.2esr -> 60.1.0esr
(cherry picked from commit 9662c68751)
2018-06-29 09:05:08 +02:00
taku0
5bc60f4f16 firefox: 60.0.2 -> 61.0
(cherry picked from commit ce6cd30320)
2018-06-29 09:05:05 +02:00
taku0
0648462fd8 nss: 3.36.4 -> 3.38
(cherry picked from commit 4927422609)
2018-06-29 09:02:18 +02:00
taku0
1dad2f26ca firefox-bin: 60.0.2 -> 61.0
(cherry picked from commit 33cbdecac4)
2018-06-29 09:02:09 +02:00
Andy Dirnberger
a50a942b4f python36: fix version in identifier
(cherry picked from commit 780959ce8f)
2018-06-29 08:49:05 +02:00
Matthew Bauer
2e0ea4e044 Merge pull request #42339 from ookhoi/18.03-google-authenticator-failed-to-use-libqrencode
18.03-google-authenticator-failed-to-use-libqrencode - use libqrencod…
2018-06-28 22:12:22 -04:00
Jörg Thalheim
a4e1e9cbd7 Merge pull request #42654 from clefru/zfs-cherry
Disable fortify and stackprotector hardening for spl/zfs.
2018-06-27 15:35:11 +01:00
Clemens Fruhwirth
ee2fab6069 Disable fortify and stackprotector hardening for spl/zfs.
Linux 4.16 introduces a stackprotector detection script that returns
different results for the kernel compilation run and the spl/zfs
compilation run, as the setting for hardening are different. This
results in a broken ABI between spl/zfs and the compiled kernel,
breaking ZFS. Also disabling the fortify and stackprotector hardening,
as we do for the kernel, fixes that.

(cherry picked from commit 43a737b81c)
2018-06-27 16:01:22 +02:00
Peter Simons
e037231f76 git-annex: update to version 6.20180626
This update fixes CVE-2018-10857 and CVE-2018-10859.
2018-06-27 11:07:37 +02:00
Tim Steinbach
58905881da nano: 2.9.7 -> 2.9.8
(cherry picked from commit 978397d358)
2018-06-26 20:53:50 -04:00
Will Dietz
26119d4c2b nano: 2.9.6 -> 2.9.7
http://git.savannah.gnu.org/cgit/nano.git/tree/ChangeLog?h=v2.9.7
(cherry picked from commit 0f30db4222)
2018-06-26 20:53:50 -04:00
Will Dietz
a105a38e58 nano: 2.9.4 -> 2.9.6
(cherry picked from commit decaeb1bfa)
2018-06-26 20:53:49 -04:00
Tuomas Tynkkynen
8908be63ef nano: 2.9.3 -> 2.9.4
(cherry picked from commit 532bd714ba)
2018-06-26 20:53:48 -04:00
Tim Steinbach
f362e1d1d4 linux: 4.16.17 -> 4.16.18
(cherry picked from commit a25eb5da24)
2018-06-26 20:52:17 -04:00
Tim Steinbach
866fec11d0 linux: 4.14.51 -> 4.14.52
(cherry picked from commit 60a541bfa9)
2018-06-26 20:51:59 -04:00
Tim Steinbach
2d4809e745 linux: 4.9.109 -> 4.9.110
(cherry picked from commit 81769a461a)
2018-06-26 20:51:39 -04:00
Will Dietz
e560aaff98 editline: init at 1.15.3
(cherry picked from commit 4f1b14b513)
2018-06-26 12:25:43 -05:00
Joachim Fasting
d1cd6c432f tor-browser-bundle-bin: 7.5.4 -> 7.5.5
(cherry picked from commit fc618a15e8)
2018-06-26 09:09:44 +02:00
Will Dietz
5a3fdf27d3 libgcrypt: don't disable checks on Darwin, let's see if patch fixes
(cherry picked from commit d6bffa6aa4)
("yes the patch does fix tests on Darwin", by the way :))
2018-06-25 17:10:08 -05:00
Will Dietz
57c09688d2 libgcrypt: mention PR, upstream issue
(cherry picked from commit 6c16f3d626)
2018-06-25 17:09:53 -05:00
Will Dietz
94e261d1c0 libgcrypt: keep new lock behavior but only do so around collector access
Not around a function that itself will grab the rng lock.

Unfortunate that we obtain/release the lock twice
but this seems least invasive way to fix this.

(cherry picked from commit 7cfdb8950d)
2018-06-25 17:09:12 -05:00
Elis Hirwing
b3f42ae53c php71: 7.1.18 -> 7.1.19
Changelog: https://secure.php.net/ChangeLog-7.php#7.1.19
(cherry picked from commit 910cb27384)
2018-06-25 13:04:30 +02:00
Elis Hirwing
18abd869df php71: 7.1.17 -> 7.1.18 (#41145)
Changelog: http://www.php.net/ChangeLog-7.php#7.1.18
(cherry picked from commit 463b9c9ea3)
2018-06-25 13:04:24 +02:00
Andreas Rammhold
1b910d5dc0 Merge pull request #42520 from andir/18.03/kubernetes
[18.03] kubernetes: 1.9.1 -> 1.9.8
2018-06-25 08:56:15 +02:00
xeji
94d80eb724 Merge pull request #42402 from alexeymuranov/update-geary-cherry
[18.03] geary: 0.12.1 -> 0.12.2
2018-06-25 00:17:48 +02:00
xeji
93532944b1 Merge pull request #42427 from LumiGuide/pgmanage-10.3.0-release-18.03
Cherry-pick pgmanage-10.3.0 on release-18.03
2018-06-24 22:53:49 +02:00
xeji
f115a92649 Merge pull request #42366 from LumiGuide/fix-chronyd-release-18.03
chrony: disable the whole timesyncd module when chronyd is enabled (cherry-pick on release-18.03)
2018-06-24 22:32:54 +02:00
R. RyanTM
4c4e26b6aa php: 7.2.6 -> 7.2.7 (#42461)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/php/versions.

These checks were done:

- built on NixOS
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/phar.phar passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/phar passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/php passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/phpdbg passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/php-cgi passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/pear passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/peardev passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/pecl passed the binary check.
- /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7/bin/php-fpm passed the binary check.
- 9 of 9 passed binary check by having a zero exit code.
- 0 of 9 passed binary check by having the new version present in output.
- found 7.2.7 with grep in /nix/store/n62w6pi30bkz1i08h1wr1icrabkky794-php-7.2.7
- directory tree listing: https://gist.github.com/6ecb6c21e261466b865908a41564ca3e
- du listing: https://gist.github.com/2ca1dc05af5d5240a6b63fadd59ee0d0

(cherry picked from commit 15ec13dad1)
2018-06-24 20:59:30 +02:00
R. RyanTM
1f6b527f0f php: 7.2.5 -> 7.2.6
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/php/versions.

These checks were done:

- built on NixOS
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/phar.phar passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/phar passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/php passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/phpdbg passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/php-cgi passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/pear passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/peardev passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/pecl passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/php-fpm passed the binary check.
- 9 of 9 passed binary check by having a zero exit code.
- 0 of 9 passed binary check by having the new version present in output.
- found 7.2.6 with grep in /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6
- directory tree listing: https://gist.github.com/409d2cfaa7e805714825281fbaba0d0f
- du listing: https://gist.github.com/7fbd8e3d56524f70b3dfb94c045fccd2

(cherry picked from commit 98c4ac2fa5)
2018-06-24 20:59:09 +02:00
Pascal Wittmann
170937eb4f Merge pull request #42519 from LumiGuide/strongswan-5.6.3-release-18.03
cherry-pick strongswan-5.6.3 on release-18.03
2018-06-24 17:45:33 +02:00
Bastian Köcher
444d3d53b3 nvidia_x11: 390.48 -> 390.67
(cherry picked from commit 95ee1bc937)
I don't experience any regressions.
2018-06-24 13:13:20 +02:00
Andreas Rammhold
69881896d1 kubernetes: 1.9.1 -> 1.9.8 2018-06-24 11:52:12 +02:00
R. RyanTM
196d2f93bb strongswan: 5.6.2 -> 5.6.3 (#41237)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/strongswan/versions.

These checks were done:

- built on NixOS
- /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/pki passed the binary check.
- /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/charon-cmd passed the binary check.
- Warning: no invocation of /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/charon-systemd had a zero exit code or showed the expected version
- /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/ipsec passed the binary check.
- /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/swanctl passed the binary check.
- 4 of 5 passed binary check by having a zero exit code.
- 1 of 5 passed binary check by having the new version present in output.
- found 5.6.3 with grep in /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3
- directory tree listing: https://gist.github.com/258736889db4e822d054b65e7035147b
- du listing: https://gist.github.com/478dbb4f44b4ed18b112076b17451a4e

(cherry picked from commit 30c3a7f5c6)
2018-06-24 11:45:46 +02:00
Benjamin Staffin
8c9510b0ac strongswan: include curl plugin by default (#39506)
This is necessary for OCSP and/or remote CRL verification of server
certificates to work, which is a fairly common thing to need.

(cherry picked from commit 1022dc54ba)
2018-06-24 11:45:38 +02:00
Bas van Dijk
289f8118a1 pgmanage: 10.1.1 -> 10.3.0
Release notes: https://github.com/pgManage/pgManage/releases/tag/v10.3.0

Also fixes #40247

(cherry picked from commit e385630434)
2018-06-23 13:44:01 +02:00
Anders Riutta
e3f190cfcc pgmanage: update to current name (minor).
(cherry picked from commit c218cd38d3)
2018-06-23 13:43:51 +02:00
Bas van Dijk
b3beddddb0 pgmanage: 10.1.0 -> 10.1.1
(cherry picked from commit 65b1c735de)
2018-06-23 13:43:42 +02:00
Lancelot SIX
58845d3c4a pgmanage: fix build
The configure script uses the `command` builtin command which is bash
specific while having a "#!/bin/sh" head.

This forces the use nix default shell (bash)

(cherry picked from commit 159a021bd8)
(cherry picked from commit 2653355a9c)
2018-06-23 13:43:30 +02:00
Jan Tojnar
74b1b5dfbf geary: 0.12.1 → 0.12.2 2018-06-22 23:49:50 +02:00
Jan Tojnar
2c9325e223 gnome3.geary: clean up 2018-06-22 23:49:23 +02:00
Alexey Muranov
b36ee286a9 geary: downgrade Vala back 0.40 -> 0.38 2018-06-22 23:45:05 +02:00
Jan Tojnar
5108b852d5 gnome3.geary: fix build 2018-06-22 23:27:55 +02:00
Robert Schütz
91b286c893 qutebrowser: 1.3.2 -> 1.3.3
(cherry picked from commit 3c8d19fc69)
2018-06-22 16:15:40 +02:00
R. RyanTM
d19bdb7f05 qutebrowser: 1.3.1 -> 1.3.2 (#41965)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qutebrowser/versions.

These checks were done:

- built on NixOS
- /nix/store/d5f7w3hcgxzhk1sgk1gjnl36nrq30wlm-qutebrowser-1.3.2/bin/qutebrowser passed the binary check.
- /nix/store/d5f7w3hcgxzhk1sgk1gjnl36nrq30wlm-qutebrowser-1.3.2/bin/..qutebrowser-wrapped-wrapped passed the binary check.
- /nix/store/d5f7w3hcgxzhk1sgk1gjnl36nrq30wlm-qutebrowser-1.3.2/bin/.qutebrowser-wrapped passed the binary check.
- 3 of 3 passed binary check by having a zero exit code.
- 0 of 3 passed binary check by having the new version present in output.
- found 1.3.2 with grep in /nix/store/d5f7w3hcgxzhk1sgk1gjnl36nrq30wlm-qutebrowser-1.3.2
- directory tree listing: https://gist.github.com/86db26ab52e4c4aaabb2949ceba69142
- du listing: https://gist.github.com/47c80976cbfff66061ccbffa47d02669

(cherry picked from commit c9fe43c668)
2018-06-22 16:15:25 +02:00
Bas van Dijk
942097db53 chrony: disable the whole timesyncd module when chronyd is enabled
Peviously only the timesyncd systemd unit was disabled. This meant
that when you activate a system that has chronyd enabled the following
strange startup behaviour takes place:

  systemd[1]: Starting chrony NTP daemon...
  systemd[1]: Stopping Network Time Synchronization...
  systemd[1]: Stopped chrony NTP daemon.
  systemd[1]: Starting Network Time Synchronization...

(cherry picked from commit 56ef106848)
2018-06-22 12:12:40 +02:00
Sander Hollaar
eaa6c3d4de 18.03-google-authenticator-failed-to-use-libqrencode - use libqrencode 4 and update both qrencode and google-authenticator 2018-06-21 20:56:40 +02:00
Léo Gaspard
68e02f8ff2 opensmtpd: revert non-retro-compatible 6.0.2p1 -> 6.0.3p1 upgrade 2018-06-21 15:12:34 +01:00
Tim Steinbach
cec9192c6d linux: 4.16.16 -> 4.16.17
(cherry picked from commit 599e3aa7a0)
2018-06-21 08:21:11 -04:00
Tim Steinbach
9e9b85a5f6 linux: 4.14.50 -> 4.14.51
(cherry picked from commit 310bfc9aa7)
2018-06-21 08:21:00 -04:00
adisbladis
829be45e7c Merge pull request #42316 from samueldr/backport/lastpass-cli
lastpass-cli: 1.2.2 -> 1.3.1 (18.03)
2018-06-21 18:34:00 +08:00
Eli Flanagan
c0450b9789 lastpass-cli: 1.3.0 -> 1.3.1 (#40734)
(cherry picked from commit c44e565315)
2018-06-20 22:03:30 -04:00
Ryan Mulligan
a48ea21608 lastpass-cli: 1.2.2 -> 1.3.0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/l6j73nin5ip68kl9nn6zgllp88hlbdli-lastpass-cli-1.3.0/bin/lpass -V` and found version 1.3.0
- ran `/nix/store/l6j73nin5ip68kl9nn6zgllp88hlbdli-lastpass-cli-1.3.0/bin/lpass -v` and found version 1.3.0
- ran `/nix/store/l6j73nin5ip68kl9nn6zgllp88hlbdli-lastpass-cli-1.3.0/bin/lpass --version` and found version 1.3.0
- found 1.3.0 with grep in /nix/store/l6j73nin5ip68kl9nn6zgllp88hlbdli-lastpass-cli-1.3.0
- directory tree listing: https://gist.github.com/67aab5e731ed5d963e433d03c1a27870

(cherry picked from commit 3783316b6a)
2018-06-20 22:03:21 -04:00
Jörg Thalheim
625c0b35d4 google-cloud-sdk: 190.0.1 -> 206.0.0 (#42307)
(cherry picked from commit ef1a18b584)
2018-06-20 23:23:01 +01:00
Will Fancher
b96cd4134a Make getHaskellBuildInputs / shellFor work with overrideCabal
(cherry picked from commit 5523ec8f3c)

This fixes some bugs with this helper.
2018-06-20 16:08:04 -04:00
Peter Simons
6b690b20c3 esniper: update to latest version 0.35.0
(cherry picked from commit bbf359ecc8)
2018-06-20 09:50:21 +02:00
R. RyanTM
0db29434a2 smcroute: 2.4.0 -> 2.4.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/smcroute/versions.

These checks were done:

- built on NixOS
- /nix/store/919h9vn683b5whq3229sl3f907m1jsik-smcroute-2.4.1/bin/smcroutectl passed the binary check.
- /nix/store/919h9vn683b5whq3229sl3f907m1jsik-smcroute-2.4.1/bin/smcrouted passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 2 of 2 passed binary check by having the new version present in output.
- found 2.4.1 with grep in /nix/store/919h9vn683b5whq3229sl3f907m1jsik-smcroute-2.4.1
- directory tree listing: https://gist.github.com/f35692e1d0eaf5b66e1203fcdc9cdf6d
- du listing: https://gist.github.com/6170a85a1ce970d7ef1388b28005dfee

(cherry picked from commit ac3b07b581)
2018-06-19 23:03:01 +02:00
Franz Pletz
d982e950c8 libressl_2_6: 2.6.4 -> 2.6.5
(cherry picked from commit 26501a9bf9)
2018-06-19 23:02:01 +02:00
R. RyanTM
080ac28493 xmr-stak: 2.4.4 -> 2.4.5
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xmr-stak/versions.

These checks were done:

- built on NixOS
- /nix/store/wbq2l97g7y24hnbz1zzs17yl8qh1csd3-xmr-stak-2.4.5/bin/xmr-stak passed the binary check.
- Warning: no invocation of /nix/store/wbq2l97g7y24hnbz1zzs17yl8qh1csd3-xmr-stak-2.4.5/bin/libxmrstak_opencl_backend.so had a zero exit code or showed the expected version
- 1 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 2.4.5 with grep in /nix/store/wbq2l97g7y24hnbz1zzs17yl8qh1csd3-xmr-stak-2.4.5
- directory tree listing: https://gist.github.com/d748f1490c29ab43e9426b5d283a5e4e
- du listing: https://gist.github.com/06e416d3c3db5caf733655c9ab632eea

(cherry picked from commit 1c479b27fa)
2018-06-19 16:06:03 +02:00
R. RyanTM
a38d19148a xmr-stak: 2.4.3 -> 2.4.4 (#41506)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xmr-stak/versions.

These checks were done:

- built on NixOS
- /nix/store/bfj12k7pz2bj2jzx3swkmz2kk3dfqx5p-xmr-stak-2.4.4/bin/xmr-stak passed the binary check.
- Warning: no invocation of /nix/store/bfj12k7pz2bj2jzx3swkmz2kk3dfqx5p-xmr-stak-2.4.4/bin/libxmrstak_opencl_backend.so had a zero exit code or showed the expected version
- 1 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 2.4.4 with grep in /nix/store/bfj12k7pz2bj2jzx3swkmz2kk3dfqx5p-xmr-stak-2.4.4
- directory tree listing: https://gist.github.com/5ef7f1fd13c10bef56522a028b52c82e
- du listing: https://gist.github.com/be63ac59af2a152db46085c4509cdcd3

(cherry picked from commit f138129894)
2018-06-19 16:06:00 +02:00
WilliButz
d94cbd1610 grafana: 5.1.0 -> 5.1.4 2018-06-19 15:43:10 +02:00
Jörg Thalheim
43d3e539c5 Merge pull request #42182 from markuskowa/pgbackup-18.03
nixos-18.03/pgbackup: Fix bug in postgresql-backup module that causes to fail
2018-06-19 10:01:24 +01:00
Vladimír Čunát
d320a06229 Merge branch 'staging-18.03' into release-18.03
Not completely finished on Hydra yet, but they're security updates.
2018-06-19 10:08:17 +02:00
Anders Riutta
3f18caed9e docs: minor rewording for easier reading. 2018-06-19 08:00:27 +01:00
Markus Kowalewski
508477f076 nixos-18.03/pgbackup: Fix bug in postgresql-backup module that causes
pg_dump to fail

Run pg_dump as postgres super user instead of root.
See https://github.com/NixOS/nixpkgs/issues/41388
2018-06-18 23:58:30 +02:00
xeji
4f9f2cbb40 Merge pull request #42168 from Ekleog/opensmtpd-dovecot-fix-backport
Opensmtpd dovecot fix backport
2018-06-18 22:09:06 +02:00
Will Dietz
e942479be4 ngx_brotli: 0.1.1 -> 0.1.2
Fixes socket closing issues
(only happened in some circumstances AFAICT).

(cherry picked from commit 516c5f54ed)
2018-06-18 12:43:09 -05:00
Will Dietz
b761f83ffc ngx_brotli: -> 0.1.1
(cherry picked from commit bec9726946)
2018-06-18 12:43:09 -05:00
Will Dietz
e250a4a7c8 ngx_brotli: update for fixes, zero copy.
(cherry picked from commit 0fdc4cb94b)
2018-06-18 12:43:09 -05:00
Will Dietz
9c06e554ed nginx/modules: brotli: no-op bump to latest that uses 1.0.2 as submodule
We have it use our system copy regardless, but might as well.

(yes, hash does not change, since we don't fetch submodule here)

(cherry picked from commit 40b14109d3)
2018-06-18 12:43:09 -05:00
Will Dietz
f7521dd46f nginx/modules: use eustas' brotli module, google one is abandoned
This fork is also used by FreeBSD as of Dec 2017:
https://svnweb.freebsd.org/ports?view=revision&revision=455560

See also:
https://github.com/google/ngx_brotli/issues/62

(cherry picked from commit df9ebaf8c7)
2018-06-18 12:43:08 -05:00
Léo Gaspard
2fe2f47742 opensmtpd: fix interaction with dovecot-2.3.1
This has been merged upstream with
    https://github.com/OpenSMTPD/OpenSMTPD/pull/847
2018-06-18 17:59:51 +02:00
obadz
a6903c95a2 opensmtpd: 6.0.2p1 -> 6.0.3p1 2018-06-18 17:59:51 +02:00
Mario Rodas
a888484a3a nodejs: 9.11.1 -> 9.11.2
(cherry picked from commit f6422928e9)
2018-06-18 22:14:28 +08:00
Mario Rodas
ef08c777c9 nodejs: 8.11.2 -> 8.11.3
(cherry picked from commit 4ad3a21baf)
2018-06-18 22:14:27 +08:00
Mario Rodas
28f1d037fd nodejs: 6.14.2 -> 6.14.3
(cherry picked from commit 38ac2f63c3)
2018-06-18 22:14:26 +08:00
Vladimír Čunát
18a810439f pythonPackages.xml2rfc: init at 2.9.8
It seems to work fine, in python2Packages and python3Packages.
If you find a problem, let me know and I'll try to fix it.

(cherry picked from commit 3756efbdcc)
2018-06-18 14:18:19 +02:00
Ioannis Koutras
2109443207 jetbrains.clion: 2018.1.3 -> 2018.1.5
(cherry picked from commit efe77a8e78)
2018-06-18 10:25:56 +01:00
Ioannis Koutras
8cf6b3d26c jetbrains.rider: 2018.1 -> 2018.1.2
(cherry picked from commit e9ad12ae92)
2018-06-18 10:25:56 +01:00
Ioannis Koutras
3cbb2a4be9 jetbrains.phpstorm: 2018.1.4 -> 2018.1.6
(cherry picked from commit e8d8592937)
2018-06-18 10:25:56 +01:00
Ioannis Koutras
8e250a130b jetbrains.idea-ultimate: 2018.1.4 -> 2018.1.5
(cherry picked from commit d4257c1a98)
2018-06-18 10:25:56 +01:00
Ioannis Koutras
a50a0bf95d jetbrains.idea-community: 2018.1.4 -> 2018.1.5
(cherry picked from commit c380165885)
2018-06-18 10:25:56 +01:00
Ioannis Koutras
be1408b5be jetbrains.webstorm: 2018.1.3 -> 2018.1.5
(cherry picked from commit 79a94d5dea)
2018-06-18 10:25:56 +01:00
Ioannis Koutras
50c7233547 jetbrains.pycharm-professional: 2018.1.3 -> 2018.1.4
(cherry picked from commit 7b35d856ce)
2018-06-18 10:25:56 +01:00
Ioannis Koutras
b60e4e2066 jetbrains.pycharm-community: 2018.1.3 -> 2018.1.4
(cherry picked from commit 16b7ba2f04)
2018-06-18 10:25:56 +01:00
Ioannis Koutras
18dcc92499 jetbrains.goland: 2018.1.3 -> 2018.1.4
(cherry picked from commit ff3d215e70)
2018-06-18 10:25:56 +01:00
Ioannis Koutras
6dcde598b4 jetbrains.datagrip: 2018.1.3 -> 2018.1.4
(cherry picked from commit 955b349c53)
2018-06-18 10:25:56 +01:00
Ioannis Koutras
f0246c4906 jetbrains: update.pl use channel name
(cherry picked from commit 9e64556dbc)
2018-06-18 10:25:56 +01:00
adisbladis
fe4b2a6d71 Merge pull request #42145 from samueldr/auto/dbeaver/nixos-18.03/5.1.1
dbeaver: 5.1.0 -> 5.1.1 (18.03)
2018-06-18 16:57:31 +08:00
Léo Gaspard
989884026b opensmtpd module: allow changing the package
(cherry picked from commit bb08686f1e)
2018-06-18 16:45:05 +08:00
Samuel Dionne-Riel
e4ee062acd dbeaver: 5.1.0 -> 5.1.1
(cherry picked from commit 65f16a5818)
2018-06-17 18:26:17 -04:00
Andreas Rammhold
c11bc93fb0 Merge pull request #42140 from andir/18.03/pass
[18.03] pass: 1.7.1 -> 1.7.2
2018-06-17 22:59:37 +02:00
Andreas Rammhold
3e4f183e74 pass: 1.7.1 -> 1.7.2
This addresses some issues regarding CVE-2018-12356. There is a
annoucement for that version on the password-store ML [1] which goes
into details.

This is more or less a backport of #42049 which couldn't be
cherry-picked due to larger changes in the pass expression.

[1] https://lists.zx2c4.com/pipermail/password-store/2018-June/003308.html
2018-06-17 22:50:32 +02:00
Ryan Mulligan
9db8a27dd9 remmina: 1.2.0-rcgit.24 -> 1.2.30.1
The project moved to GitLab.

Add @ryantm and @melsigl as maintainers. Melsigl from
https://github.com/NixOS/nixpkgs/pull/41549

Closes #41549

(cherry picked from commit df74d3720a)
2018-06-17 17:53:06 +02:00
Vladimír Čunát
839f7afde3 ffmpeg_2: 2.8.13 -> 2.8.14
Lots of bugfixes:
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/3f8a0d5ad1:/Changelog

(cherry picked from commit 06b602b192)
2018-06-17 12:14:31 +02:00
Vladimír Čunát
04c80fe53f libvorbis: upstream patch for CVE-2018-10392
/cc #41748.

(cherry picked from commit 7ccece3227)
2018-06-17 11:51:34 +02:00
Will Dietz
47c09dff62 sqlite: 3.22.0 -> 3.23.1
https://sqlite.org/releaselog/3_23_1.html

(also contains notes for 3.23.0)

Adds CLI support for SQLite archive files:
https://sqlite.org/sqlar.html

(cherry picked from commit a6d8d54e79)
Fixes CVE-2018-8740; /cc #41749 and #40626.
We have 3.24 on master already, but that's rather fresh and I can't see
any serious fixes in that bump.  Also, the analyzer packages and other
changes in the expressions are left behind, as they don't seem required.
2018-06-17 11:24:23 +02:00
Vladimír Čunát
e57877ec42 Merge branch 'release-18.03' into staging-18.03
Let's unify this.  Both branches got a cherry-pick of the libgcrypt
update...
2018-06-17 10:38:54 +02:00
Tim Steinbach
154f0cc7d6 linux: 4.16.15 -> 4.16.16
(cherry picked from commit 8ac6a7f402f392c436a0851ef63ed84327e88611)
2018-06-16 20:38:07 -04:00
Tim Steinbach
a002a4e2cb linux: 4.14.49 -> 4.14.50
(cherry picked from commit 1eaa00d8b9f38e71a447b60d29a89569f6cec55e)
2018-06-16 20:37:52 -04:00
Tim Steinbach
ff02fd6468 linux: 4.9.108 -> 4.9.109
(cherry picked from commit 7dbdcf6ee5d42a3ba7f4dcb94fd78e460759c422)
2018-06-16 20:37:39 -04:00
Tim Steinbach
577bea55ea linux: 4.4.137 -> 4.4.138
(cherry picked from commit 82363caf3bee73f910c7c1f814e73b090c3260c6)
2018-06-16 20:37:26 -04:00
Jörg Thalheim
480e88581b Merge pull request #42091 from woffs/zfsfix-1803
zfs: various fixes for extraPools
2018-06-16 08:46:01 +01:00
Frank Doepper
15353c2d8f nixos/zfs: mount AFTER import
(cherry picked from commit 909cbc9f785a2c87bfbff530abef2ce555030934)
2018-06-16 09:20:57 +02:00
Frank Doepper
dcaa902187 nixos/zfs: enable zfs services
(cherry picked from commit 0e51428280020a5859e515de294fac22e1d1ed30)
2018-06-16 09:20:56 +02:00
Frank Doepper
68160b1e9e zfs: fix substitution of /bin/rm
(cherry picked from commit f14437cab25808f1b95813ebeaaf38569d7f6bba)
2018-06-16 09:20:55 +02:00
Daiderd Jordan
a52d2c1e46 libgcrypt: disable tests on darwin
The test binaries hang for some reason (psynch_mutexwait),
gnupg seems to work fine so hopefully it's not an actual issue.

(cherry picked from commit eeb6211944)
2018-06-16 02:01:29 +02:00
Peter Simons
14c248a4ab git-annex: update from version 6.20180227 to 6.20180529
Upstream changes are:

 - git-annex (6.20180529) upstream; urgency=medium

    * Prevent haskell http-client from decompressing gzip files, so downloads
      of such files works the same as it used to with wget and curl.
    * Workaround for bug in an old version of cryptonite that broke https
      downloads, by using curl for downloads when git-annex is built with it.
    * view, vadd: Fix crash when a git submodule has a name starting with a dot.
    * Don't allow entering a view with staged or unstaged changes.
    * move: --force was accidentially enabling two unrelated behaviors
      since 6.20180427. The older behavior, which has never been well
      documented and seems almost entirely useless, has been removed.
    * copy: --force no longer does anything.
    * migrate: Fix bug in migration between eg SHA256 and SHA256E,
      that caused the extension to be included in SHA256 keys,
      and omitted from SHA256E keys.
      (Bug introduced in version 6.20170214)
    * migrate: Check for above bug when migrating from SHA256 to SHA256
      (and same for SHA1 to SHA1 etc), and remove the extension that should
      not be in the SHA256 key.
    * fsck: Detect and warn when keys need an upgrade, either to fix up
      from the above migrate bug, or to add missing size information
      (a long ago transition), or because of a few other past key related
      bugs.
    * git-annex-shell: GIT_ANNEX_SHELL_APPENDONLY makes it allow writes,
      but not deletion of annexed content. Note that securing pushes to
      the git repository is left up to the user.
    * setpresentkey: Added --batch support.

 - git-annex (6.20180509) upstream; urgency=medium

    * The old git-annex Android app is now deprecated in favor of running
      git-annex in termux.
    * runshell: Use proot when running on Android, to work around
      Android 8's ill-advised seccomp filtering of system calls,
      including ones crucial for reliable thread locking.
      (This will only work with termux's version of proot.)
    * Fix bug in last release that crashes when using
      --all or running git-annex in a bare repository. May have also
      affected git-annex unused and git-annex info.
    * Fix bug in last release that prevented the webapp opening on
      non-Linux systems.
    * Support building with hinotify-0.3.10.
    * Display error message when http download fails.
    * Avoid forward retry when 0 bytes were received.

 - git-annex (6.20180427) upstream; urgency=medium

    * move: Now takes numcopies configuration, and required content
      configuration into account, and refuses to reduce the current
      number of copies of a file, or remove content that a repository
      requires. --force can override these checks.
      Note that it's still allowed to move the content of a file
      from one repository to another when numcopies is not satisfied, as long
      as the move does not result in there being fewer copies.
    * Fix mangling of --json output of utf-8 characters when not
      running in a utf-8 locale.
    * Fix build with yesod 1.6.
    * Clean up some build warnings with newer versions of ghc and haskell
      libraries.
    * runshell: Unset LD_PRELOAD since preloaded libraries from the host
      system may not get along with the bundled linker.
    * runshell: Added some tweaks to make git-annex work in termux on
      Android. The regular arm standalone tarball now works in termux.
    * Webapp: Support being run inside termux on Android, and offer to set up
      a repository on the sdcard.
    * Assistant: Integrate with Termux:Boot, so when it's installed, the
      assistant is autostarted on boot.
    * Assistant: Fix installation of menus, icons, etc when run
      from within runshell.
    * import: Avoid buffering all filenames to be imported in memory.
    * Improve memory use and speed of --all and git-annex info remote,
      by not buffering list of all keys.

 - git-annex (6.20180409) upstream; urgency=medium

    * Added adb special remote which allows exporting files to Android devices.
    * For url downloads, git-annex now defaults to using a http library,
      rather than wget or curl. But, if annex.web-options is set, it will
      use curl. To use the .netrc file, run:
        git config annex.web-options --netrc
    * git-annex no longer uses wget (and wget is no longer shipped with
      git-annex builds).
    * Enable HTTP connection reuse across multiple files for improved speed.
    * Fix calculation of estimated completion for progress meter.
    * OSX app: Work around libz/libPng/ImageIO.framework version skew
      by not bundling libz, assuming OSX includes a suitable libz.1.dylib.
    * Added annex.retry, annex.retry-delay, and per-remote versions
      to configure transfer retries.
    * Also do forward retrying in cases where no exception is thrown,
      but the transfer failed.
    * When adding a new version of a file, and annex.genmetadata is enabled,
      don't copy the data metadata from the old version of the file,
      instead use the mtime of the file.
    * Avoid running annex.http-headers-command more than once.
    * info: Added "combined size of repositories containing these files"
      stat when run on a directory.
    * info: Changed sorting of numcopies stats table, so it's ordered
      by the variance from the desired number of copies.
    * Fix resuming a download when using curl.

 - git-annex (6.20180316) upstream; urgency=medium

    * New protocol for communicating with git-annex-shell increases speed
      of operations involving ssh remotes. When not transferring large files,
      git-annex is between 200% and 400% faster using the new protocol,
      and it's just as fast as before when transferring large files.
      (When the remote has an old git-annex-shell, git-annex falls back
      to the old slower code. This fallback is planned to be removed
      after 5 years or so.)
    * Note that, due to not using rsync to transfer files over ssh
      any longer, permissions and other file metadata of annexed files
      will no longer be preserved when copying them to and from ssh remotes.
      Other remotes never supported preserving that information, so
      this is not considered a regression.
    * Fix data loss bug in content locking over tor, when the remote
      repository is in direct mode, it neglected to check that the content
      was actually present when locking it. This could cause git annex drop
      to remove the only copy of a file when it thought the tor remote had
      a copy.
    * Fix data loss bug when the local repository uses direct mode, and a
      locally modified file is dropped from a remote repsitory. The bug
      caused the modified file to be counted as a copy of the original file.
      (This is not a severe bug because in such a situation, dropping
      from the remote and then modifying the file is allowed and has the same
      end result.)
    * Some downloads will be verified, even when annex.verify=false.
      This is done in some edge cases where there's a likelyhood than an
      object was downloaded incorrectly.
    * Support exporttree=yes for rsync special remotes.
    * Added backends for the BLAKE2 family of hashes, when built with
      a new enough version of cryptonite.
    * Improve SHA*E extension extraction code to not treat parts of the
      filename that contain punctuation or other non-alphanumeric characters
      as extensions. Before, such characters were filtered out.
    * Better ssh connection warmup when using -J for concurrency.
      Avoids ugly messages when forced ssh command is not git-annex-shell.
    * Fix race condition in ssh warmup that caused git-annex to get
      stuck and never process some files when run with high levels of
      concurrency.
    * Fix reversion introduced in 6.20171214 that caused concurrent
      transfers to incorrectly fail with "transfer already in progress".
    * Note that Remote/Git.hs now contains AGPL licensed code,
      thus the license of git-annex as a whole is AGPL. This was already
      the case when git-annex was built with the webapp enabled.
    * Include amount of data transferred in progress display.
    * Dial back optimisation when building on arm, which prevents
      ghc and llc from running out of memory when optimising some files.
      (Unfortunately this fix is incomplete due to a ghc bug.)
2018-06-15 19:46:20 +02:00
Jörg Thalheim
3a87c1aaba Merge pull request #42066 from Mic92/pythonix
[18.03] python3.pkgs.pythonix: 0.1.0 -> 0.1.4
2018-06-15 12:45:24 +01:00
Jörg Thalheim
a2533e1dbb python.pkgs.pythonix: 0.1.0 -> 0.1.4
also fix the build

(cherry picked from commit 3f9d48168b)
2018-06-15 12:42:01 +01:00
Lancelot SIX
bc0e0f293c libgcrypt: 1.8.2 -> 1.8.3
See http://lists.gnu.org/archive/html/info-gnu/2018-06/msg00006.html for
release information

(cherry picked from commit a0b2ce5102)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
2018-06-15 09:25:57 +02:00
Lancelot SIX
f3c913d466 libgcrypt: 1.8.2 -> 1.8.3
See http://lists.gnu.org/archive/html/info-gnu/2018-06/msg00006.html for
release information

(cherry picked from commit a0b2ce5102)
2018-06-15 01:30:51 +00:00
Andreas Rammhold
5fbbeaa31d Merge pull request #42030 from andir/18.03/webkitgtk
[18.03] webkitgtk: 2.20.2 -> 2.20.3
2018-06-14 22:59:20 +02:00
Andreas Rammhold
7e05b0a3b5 webkitgtk: 2.20.2 -> 2.20.3
This addresses several issues with webkitgtk 2.20.2:

- CVE-2018-4190, information leak (credentials)
- CVE-2018-4199, arbitrary code execution
- CVE-2018-4218, arbitrary code execution
- CVE-2018-4222, arbitrary code execution
- CVE-2018-4232, cookies might be overriden
- CVE-2018-4233, arbitrary code execution
- CVE-2018-11646, application crash
- CVE-2018-12293, heap buffer overflow

(cherry picked from commit 155cb9e1e1312fa2baf0907d636f859befda0871)
2018-06-14 19:55:06 +02:00
Andreas Rammhold
ea3f3f46a8 Merge pull request #42029 from fadenb/synapse_v.0.31.2_on_release-18.03
[18.03] matrix-synapse: 0.30.0 -> 0.31.2
2018-06-14 19:19:27 +02:00
Tristan Helmich
ebf9700a4a matrix-synapse: 0.30.0 -> 0.31.2 2018-06-14 19:02:30 +02:00
Franz Pletz
8149f69b44 pythonPackages.prometheus_client: init at 0.2.0
(cherry picked from commit 59a6f939f8)

Required dependency for matrix-synapse >= v0.31.1
2018-06-14 18:57:04 +02:00
Tim Steinbach
e2b7cc8ee3 linux: 4.9.107 -> 4.9.108
(cherry picked from commit 89f7639de5ec3297716dbc8f3cdaca71fea95669)
2018-06-13 18:13:21 -04:00
Tim Steinbach
a302914788 linux: 4.4.136 -> 4.4.137
(cherry picked from commit 96ae35f620d4d804d5d003243272fdb68a026e29)
2018-06-13 18:13:07 -04:00
Michael Raskin
34ed4d2980 Merge pull request #41919 from YorikSar/update-chromium
chromium: 67.0.3396.62 -> 67.0.3396.87
(cherry picked from commit 9c495cffd0)
2018-06-13 20:36:04 +02:00
Michael Fellinger
e5a710d1db Riemann-tools: 0.2.6 -> 0.2.13 (#41927)
0.2.6 didn't build

(cherry picked from commit c4de089cbd)
2018-06-13 18:58:52 +02:00
Will Dietz
a7b6a9199e qt-5.10: don't use features that require new-ish kernels, stay compat
Before this change:
$ readelf --notes /nix/store/zf5yja02g8n8dzgs25pqfd8w3myfzgzc-qtbase-5.10.1/lib/libQt5Core.so

Displaying notes found at file offset 0x004a7778 with length 0x00000020:
  Owner                 Data size       Description
  GNU                  0x00000010       NT_GNU_ABI_TAG (ABI version tag)
    OS: Linux, ABI: 3.17.0

After:
$ readelf --notes /nix/store/sg1s9hdw0b7p6h0dwg09g4lxy1acq7y6-qtbase-5.10.1/lib/libQt5Core.so

Displaying notes found at file offset 0x004a7dcc with length 0x00000020:
  Owner                 Data size       Description
  GNU                  0x00000010       NT_GNU_ABI_TAG (ABI version tag)
    OS: Linux, ABI: 2.6.28

-----------

The above paths were before rebasing the commit onto staging,
and it'd probably be good to have someone confirm the same happens
when built on a hydra builder or other non-dtzWill machine :).

[dezgeg: added comments]

(cherry picked from commit 39696b6d56)
2018-06-13 17:24:10 +03:00
Vladimír Čunát
4d8a4bcc3d Merge #41921: texlive: Fix 'match-parens' ruby dependency
(cherry picked from commit 606ff955fb)
2018-06-13 15:55:27 +02:00
Shea Levy
2bbb168905 Merge branch 'rust-1.26-backport' into release-18.03 2018-06-13 07:36:11 -04:00
Léo Gaspard
0cdd824bd5 nixos/gogs: allow git operations over ssh
Without `ROOT_PATH` set, `gogs serv` tries to open logs in writing in
its store directory. This blocks cloning or pushing over ssh, and
results in a gogs internal error.

(cherry picked from commit b59570eac0)
2018-06-13 11:57:27 +02:00
Shea Levy
1d2c750d58 Backport rust 1.26 from master.
As of afad9983e3.
2018-06-12 19:02:30 -04:00
lassulus
f829a6f0ee tinc: 1.0.33 -> 10.0.34
(cherry picked from commit 1677759a7b)
2018-06-12 21:12:45 +01:00
lassulus
7017c78ce4 tinc_pre: 1.1pre15 -> 1.1pre16
(cherry picked from commit eb6189e154)
2018-06-12 21:12:45 +01:00
Tim Steinbach
b97e353985 linux: 4.16.14 -> 4.16.15
(cherry picked from commit 388b57ac87)
2018-06-12 08:56:11 -04:00
Tim Steinbach
e07e9ace78 linux: 4.14.48 -> 4.14.49
(cherry picked from commit f077e5f87c)
2018-06-12 08:55:57 -04:00
Sarah Brofeldt
44358ff94b docker: Ensure references to go are removed from docker-containerd (#41849)
(cherry picked from commit c80e0fbb08)
2018-06-11 19:46:26 +02:00
adisbladis
338b407b27 Merge pull request #41830 from tokudan/ff-bin6002-sec-1803
firefox-bin: 60.0.1 -> 60.0.2 critical security update
2018-06-11 20:27:34 +08:00
Vladimír Čunát
c3e75dd8b7 Merge branch 'staging-18.03' into release-18.03 2018-06-11 14:22:28 +02:00
Michael Bishop
333fca1bec ntp: fix a missed syscall in seccomp
ntpd uses openat to adjust the drift file, which it only does after a few hours of uptime

(cherry picked from commit f115afa5d5)
2018-06-11 12:09:57 +01:00
Daniel Frank
1461461426 firefox-bin: 60.0.1 -> 60.0.2 critical security update
(cherry picked from commit 3df3e155f0)
2018-06-11 12:20:43 +02:00
Svein Ove Aas
cc1b088a94 zfs: Fix "zfs-sync" for modern systemd
(cherry picked from commit deb6c6e052)
2018-06-11 10:19:19 +01:00
Uli Baum
19d04024ff nixos/tomcat: fix eval error introduced by #40657
(cherry picked from commit 93cbb9b72f)
2018-06-11 11:05:15 +02:00
Tim Steinbach
f2ddbba1d8 linux-copperhead: LTS based on regular 4.14
(cherry picked from commit f58999f88fe1e6a83dbc2c4a360179a9201802cd)
2018-06-10 21:01:19 -04:00
Andreas Rammhold
b7c661ce57 Merge pull request #41809 from andir/18.03/gnupg-2.2.8
[18.03] gnupg: 2.2.6 -> 2.2.8
2018-06-11 00:22:05 +02:00
Christian Kauhaus
0338ce0812 libtiff: 4.0.9 update ptches
Get libtiff on the same patch level as Debian. The imported patch file contains:

CVE-2017-9935
CVE-2017-11613
CVE-2017-17095
CVE-2017-18013
CVE-2018-5784
CVE-2018-7456

Re #41748 (master)
Re #41749 (release-18.03 - needs to be cherry-picked)

(cherry picked from commit cca45cc3e1)
2018-06-10 21:52:28 +02:00
Andreas Rammhold
02c42d0883 gnupg: 2.2.6 -> 2.2.8
This addresses CVE-2018-12020. The details can be retrived from the
changelog [1].

[1] https://lists.gnupg.org/pipermail/gnupg-announce/2018q2/000425.html

(cherry picked from commit 1abc0537b6)
2018-06-10 21:50:26 +02:00
Tristan Helmich
3939055dda tomcat service: fix webapps default option (#40657)
The old package tomcat.webapps does not exist

(cherry picked from commit 1daa77160e)
2018-06-10 20:10:51 +02:00
Benjamin Hipple
08d245eb31 p7zip: fix src URL for debian gitlab move (#41769)
Another broken URL related to: https://github.com/NixOS/nixpkgs/issues/39927

Note that the patch file has legitimately changed, because ~4 months ago Debian
replaced their CVE security fix with a newer version that fixes some additional
bugs: d6fd3b3734

(cherry picked from commit e20abf829a)
2018-06-10 09:19:22 +02:00
Austin Seipp
43c77db3aa pythonPackages.pylibmc: fix runtime dependency on libsasl2.so, by way of cyrus_sasl
Without explicitly specifying that libsasl2 is part of the build, and
without explicitly making it part of pylibmc's linker flags for its
CPython extension, the cpython code enters a build state error where it
instead attempts to blindly `dlopen("libsasl2.so")` out of
$LD_LIBRARY_PATH; this fails as it can't be found in the store,
obviously.

The bigger problem with this is that it otherwise makes pylibmc
unusable, as it will try to immediately load libsasl2 at startup. This
means even using 'import pylibmc' at all will cause a failure.

Instead, add cyrus_sasl into the build closure of the library, and pass
an argument to the setup.py script to properly pass -lsasl2 to the C
extension. This causes a link to properly be formed.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 350f49734b)
2018-06-09 17:36:01 -05:00
Vladyslav Mykhailichenko
158525da9f flashplayer: fix sha256 hash
(cherry picked from commit 16ee92eba9)
2018-06-09 16:06:07 +02:00
Vladyslav Mykhailichenko
ef2da27b72 flashplayer: 29.0.0.171 -> 30.0.0.113
(cherry picked from commit 95aa3f4cc6)
2018-06-09 16:06:07 +02:00
Bjørn Forsman
7dcd2a4293 lttng-modules: use kernel.moduleBuildDependencies
Instead of explicitly depending on libelf, use
kernel.moduleBuildDependencies which was introduced in 1e77d0b975
("kernel 4.14 require libelf to compile modules.").

(cherry picked from commit 7dbd9a6378)
2018-06-09 16:06:07 +02:00
Bjørn Forsman
4d6f07c375 lttng-modules: add 'libelf' to fix build against linux 4.14
Fixes this:

$ nix-build -A linuxPackages.lttng-modules
[...]
/nix/store/...-linux-4.14.48-dev/lib/modules/4.14.48/source/Makefile:948: \
  *** "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfu

(Linux 4.16+ has other issues, so mark as broken.)

(cherry picked from commit 0f8594170a)
2018-06-09 16:06:07 +02:00
Andreas Rammhold
9452b4a914 memcached: 1.5.5 -> 1.5.8 (#41727)
Backport of the (automated) version bump to address the famous UDP
amplification CVE-2018-1000115. While the issue only manifests on localhost (with our
default nixos configuration) the issue might be more relevant for people
that expose it to other hosts and only restrict the TCP access. UDP was
enabled per default, it had to be disabled. The NixOS module does only
configure the TCP port.

(cherry picked from commit 7e30cfff78)
2018-06-09 01:37:00 +02:00
Andreas Rammhold
8b95e263c6 Merge pull request #41465 from andir/18.03/haproxy-1.8.9
18.03/haproxy 1.8.9
2018-06-08 23:58:11 +02:00
Andreas Rammhold
ba7f78c960 haproxy: fix build on darwin
(cherry picked from commit 4c9c4c0a97)
2018-06-08 23:44:54 +02:00
Andreas Rammhold
5a927299aa nixos/tests; add haproxy
(cherry picked from commit e179003026)
2018-06-08 23:44:35 +02:00
Andreas Rammhold
cf1c5918c7 haproxy: fix CVE-2018-11469
(cherry picked from commit ea8b37c1c8)
2018-06-08 23:44:20 +02:00
Andreas Rammhold
4697ed67bd haproxy: 1.8.4 -> 1.8.9
This fixes CVE-2018-10184 a potential remote denial of service in the
http/2 module. The version bump also includes various other changes that
are described in the changelog [1]:

2018/05/18 : 1.8.9
    - BUG/MINOR: pattern: Add a missing HA_SPIN_INIT() in pat_ref_newid()
    - BUG/MAJOR: channel: Fix crash when trying to read from a closed socket
    - BUG/MINOR: log: t_idle (%Ti) is not set for some requests
    - BUG/MEDIUM: lua: Fix segmentation fault if a Lua task exits
    - MINOR: h2: detect presence of CONNECT and/or content-length
    - BUG/MEDIUM: h2: implement missing support for chunked encoded uploads
    - BUG/MINOR: lua/threads: Make lua's tasks sticky to the current thread
    - BUG/MINOR: config: disable http-reuse on TCP proxies
    - BUG/MINOR: checks: Fix check->health computation for flapping servers
    - BUG/MEDIUM: threads: Fix the sync point for more than 32 threads
    - BUG/MINOR: lua: Put tasks to sleep when waiting for data
    - DOC/MINOR: clean up LUA documentation re: servers & array/table.
    - BUG/MINOR: map: correctly track reference to the last ref_elt being dumped
    - BUG/MEDIUM: task: Don't free a task that is about to be run.
    - BUG/MINOR: lua: schedule socket task upon lua connect()
    - BUG/MINOR: lua: ensure large proxy IDs can be represented
    - BUG/MEDIUM: http: don't always abort transfers on CF_SHUTR
    - BUG/MEDIUM: pollers: Use a global list for fd shared between threads.
    - BUG/MEDIUM: ssl: properly protect SSL cert generation
    - BUG/MINOR: spoe: Mistake in error message about SPOE configuration

2018/04/19 : 1.8.8
    - BUG/MEDIUM: threads: Fix the max/min calculation because of name clashes
    - BUG/MEDIUM: connection: Make sure we have a mux before calling detach().
    - BUG/MINOR: http: Return an error in proxy mode when url2sa fails
    - BUG/MEDIUM: kqueue: When adding new events, provide an output to get errors.
    - BUG/MINOR: cli: Guard against NULL messages when using CLI_ST_PRINT_FREE
    - MINOR: cli: Ensure the CLI always outputs an error when it should
    - DOC: lua: update the links to the config and Lua API
    - BUG/CRITICAL: h2: fix incorrect frame length check

2018/04/07 : 1.8.7
    - BUG/MAJOR: cache: always initialize newly created objects
    - MINOR: servers: Support alphanumeric characters for the server templates names

2018/04/05 : 1.8.6
    - BUG/MINOR: lua: the function returns anything
    - BUG/MINOR: lua funtion hlua_socket_settimeout don't check negative values
    - BUILD/MINOR: fix build when USE_THREAD is not defined
    - MINOR: cli/threads: make "show fd" report thread_sync_io_handler instead of "unknown"
    - MINOR: cli: make "show fd" report the mux and mux_ctx pointers when available
    - BUILD/MINOR: cli: fix a build warning introduced by last commit
    - BUG/MINOR: hpack: fix harmless use of uninitialized value in hpack_dht_insert
    - CLEANUP: h2: rename misleading h2c_stream_close() to h2s_close()
    - MINOR: h2: provide and use h2s_detach() and h2s_free()
    - BUG/MAJOR: h2: remove orphaned streams from the send list before closing
    - MINOR: h2: always call h2s_detach() in h2_detach()
    - MINOR: h2: fuse h2s_detach() and h2s_free() into h2s_destroy()
    - BUG/MEDIUM: h2/threads: never release the task outside of the task handler
    - BUG/MEDIUM: h2: don't consider pending data on detach if connection is in error
    - BUILD/MINOR: threads: always export thread_sync_io_handler()
    - BUG/MEDIUM: h2: always add a stream to the send or fctl list when blocked
    - BUG/MINOR: checks: check the conn_stream's readiness and not the connection
    - BUG/MINOR: email-alert: Set the mailer port during alert initialization
    - BUG/MINOR: cache: fix "show cache" output
    - BUG/MINOR: fd: Don't clear the update_mask in fd_insert.
    - BUG/MAJOR: cache: fix random crashes caused by incorrect delete() on non-first blocks
    - BUG/MINOR: spoe: Initialize variables used during conf parsing before any check
    - BUG/MINOR: spoe: Don't release the context buffer in .check_timeouts callbaclk

2018/03/23 : 1.8.5
    - BUG/MINOR: threads: fix missing thread lock labels for 1.8
    - BUG/MEDIUM: ssl: Don't always treat SSL_ERROR_SYSCALL as unrecovarable.
    - BUG/MEDIUM: ssl: Shutdown the connection for reading on SSL_ERROR_SYSCALL
    - BUG/MINOR: init: Add missing brackets in the code parsing -sf/-st
    - BUG/MINOR: ssl/threads: Make management of the TLS ticket keys files thread-safe
    - BUG/MEDIUM: http: Switch the HTTP response in tunnel mode as earlier as possible
    - BUG/MEDIUM: ssl/sample: ssl_bc_* fetch keywords are broken.
    - DOC: lua: new prototype for function "register_action()"
    - DOC: cfgparse: Warn on option (tcp|http)log in backend
    - BUG/MINOR: debug/pools: properly handle out-of-memory when building with DEBUG_UAF
    - MINOR: debug/pools: make DEBUG_UAF also detect underflows
    - BUG/MINOR: h2: Set the target of dbuf_wait to h2c
    - MINOR: stats: display the number of threads in the statistics.
    - BUG/MEDIUM: h2: always consume any trailing data after end of output buffers
    - BUG/MEDIUM: buffer: Fix the wrapping case in bo_putblk
    - BUG/MEDIUM: buffer: Fix the wrapping case in bi_putblk
    - Revert "BUG/MINOR: send-proxy-v2: string size must include ('\0')"
    - MINOR: systemd: Add section for SystemD sandboxing to unit file
    - MINOR: systemd: Add SystemD's Protect*= options to the unit file
    - MINOR: systemd: Add SystemD's SystemCallFilter option to the unit file
    - MINOR/BUILD: fix Lua build on Mac OS X
    - BUILD/MINOR: fix Lua build on Mac OS X (again)
    - BUG/MINOR: session: Fix tcp-request session failure if handshake.
    - CLEANUP: .gitignore: Ignore binaries from the contrib directory
    - BUG/MINOR: unix: Don't mess up when removing the socket from the xfer_sock_list.
    - BUG/MEDIUM: h2: also arm the h2 timeout when sending
    - BUG/MINOR: cli: Fix a crash when passing a negative or too large value to "show fd"
    - CLEANUP: ssl: Remove a duplicated #include
    - CLEANUP: cli: Remove a leftover debug message
    - BUG/MINOR: cli: Fix a typo in the 'set rate-limit' usage
    - BUG/MEDIUM: fix a 100% cpu usage with cpu-map and nbthread/nbproc
    - BUG/MINOR: force-persist and ignore-persist only apply to backends
    - BUG/MEDIUM: spoe: Remove idle applets from idle list when HAProxy is stopping
    - BUG/MEDIUM: threads/unix: Fix a deadlock when a listener is temporarily disabled
    - BUG/MAJOR: threads/queue: Fix thread-safety issues on the queues management
    - BUG/MINOR: dns: don't downgrade DNS accepted payload size automatically
    - BUG/MINOR: seemless reload: Fix crash when an interface is specified.
    - BUG/MINOR: cli: Fix a crash when sending a command with too many arguments
    - BUILD: ssl: Fix build with OpenSSL without NPN capability
    - BUG/MINOR: spoa-example: unexpected behavior for more than 127 args
    - BUG/MINOR: lua: return bad error messages
    - BUG/MEDIUM: tcp-check: single connect rule can't detect DOWN servers
    - BUG/MINOR: tcp-check: use the server's service port as a fallback
    - BUG/MEDIUM: threads/queue: wake up other threads upon dequeue
    - MINOR: log: stop emitting alerts when it's not possible to write on the socket
    - BUILD/BUG: enable -fno-strict-overflow by default
    - DOC: log: more than 2 log servers are allowed
    - DOC: don't suggest using http-server-close
    - BUG/MEDIUM: h2: properly account for DATA padding in flow control
    - BUG/MINOR: h2: ensure we can never send an RST_STREAM in response to an RST_STREAM
    - BUG/MINOR: listener: Don't decrease actconn twice when a new session is rejected

[1] https://www.haproxy.org/download/1.8/src/CHANGELOG

(cherry picked from commit 6d03390d12)
2018-06-08 23:43:38 +02:00
xeji
1fbc655f53 Merge pull request #41697 from taku0/firefox-60.0.2-staging-18.03
firefox, firefox-bin: 60.0.1 -> 60.0.2, firefox-esr: 52.8.0esr -> 52.8.1esr, 60.0.1esr -> 60.0.2esr [Critical security fix] [staging-18.03]
2018-06-08 19:28:53 +02:00
John Ericson
5c2d2ad432 haskell infra: Use self.ghc rather than closing over initial value, take II
My cherry-pick 94073e791b forgot one
due to me overly conservatively handling a conflict.
2018-06-08 13:25:06 -04:00
aszlig
9b3c53e0f7 autoPatchelfHook: Patch PIC exes/libs as well
If there is a shared object or executable that's using
position-independent code, the file's mime type is
"application/x-pie-executable", so until this change its dependencies
wouldn't be patched.

This simply adds the mime type to the search loop.

Signed-off-by: aszlig <aszlig@nix.build>
(cherry picked from commit ff5cecf821)
Reason: The fix is non-intrusive and should not break anything that
        wasn't broken before. I've tested whether oracle-instantclient
        builds and it still does. Other than that no other package is
        using autoPatchelfHook in NixOS 18.03.
2018-06-08 18:56:22 +02:00
R. RyanTM
f4fdffd1ea eid-mw: 4.4.1 -> 4.4.2 (#41571)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/eid-mw/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2/bin/eid-viewer had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2/bin/.eid-viewer-wrapped had a zero exit code or showed the expected version
- /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2/bin/beid-update-nssdb passed the binary check.
- /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2/bin/eid-nssdb passed the binary check.
- 2 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 4.4.2 with grep in /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2
- directory tree listing: https://gist.github.com/9bc7e47978cdc6d1c57b60a0cdf06ffc
- du listing: https://gist.github.com/8f3d2be711226cec456c9d62c6e114d6

(cherry picked from commit a2f8e94439)
2018-06-08 18:47:28 +02:00
Eelco Dolstra
561585f264 nix: 2.0.3 -> 2.0.4
(cherry picked from commit 47b85dc5ab)
2018-06-08 18:15:23 +02:00
Sondre Nilsen
7179bad1b2 Jetbrains CLion: 2018.1.2 -> 2018.1.3
(cherry picked from commit 5d9a182f8a)
2018-06-08 16:31:23 +01:00
Rickard Nilsson
e6c3d5a507 nixos: Add option networking.networkmanager.dynamicHosts
This allows non-privileged users to configure local DNS
entries by editing hosts files read by NetworkManager's dnsmasq
instance.
2018-06-08 16:59:32 +02:00
Sorixelle
aab0775d9e jetbrainsjdk: 152b1136.20 -> 152b1248.6
(cherry picked from commit a0b7475e23)
2018-06-08 15:58:15 +01:00
taku0
d741c1a991 firefox-esr: 52.8.0esr -> 52.8.1esr, 60.0.1esr -> 60.0.2esr 2018-06-08 22:57:55 +09:00
taku0
aec9cd045c firefox: 60.0.1 -> 60.0.2 2018-06-08 22:57:55 +09:00
taku0
2d00b47c43 nss: 3.36.1 -> 3.36.4 2018-06-08 22:57:55 +09:00
taku0
b8d6a31702 firefox-bin: 60.0.1 -> 60.0.2 2018-06-08 22:57:55 +09:00
Tim Steinbach
a381b78998 linux: 4.9.106 -> 4.9.107
(cherry picked from commit 8cee6cbe81)
2018-06-07 21:16:50 -04:00
Tim Steinbach
ccf423e9ac linux: 4.4.135 -> 4.4.136
(cherry picked from commit 16a575c6bf)
2018-06-07 21:16:25 -04:00
John Ericson
94073e791b haskell infra: Use self.ghc rather than closing over initial value
(cherry picked from commit f379be939c)
2018-06-07 15:01:33 -04:00
Vladimír Čunát
c544e12c1f Merge branch 'staging-18.03' into release-18.03 2018-06-07 20:32:49 +02:00
Matthew Justin Bauer
59bd1808b7 Merge pull request #41612 from ookhoi/18.03-intltool-debian-patch
18.03-intltool-debian-patch - fix "error: cannot download perl-5.22.p…
2018-06-07 10:01:21 -04:00
Peter Simons
1d66f56953 Merge pull request #41592 from erictapen/nixos-1803-http-link-header-disable-tests
[nixos-18.03] haskellPackages.http-link-header: disable tests
2018-06-07 08:22:37 +02:00
Sander Hollaar
826651fb2f 18.03-intltool-debian-patch - fix "error: cannot download perl-5.22.patch from any mirror" 2018-06-07 06:34:56 +02:00
Pascal Wittmann
4436745e9b bro: 2.5.3 -> 2.5.4
(cherry picked from commit f2ea885bed)
2018-06-06 19:14:19 +02:00
Justin Humm
b37489676e haskellPackages.http-link-header: disable tests
The test

  Network.HTTP.Link, writeLinkHeader → parseLinkHeader, roundtrips successfully

seems to flap, as I cannot reproduce the failure locally, but it occured on
Hydra [0]. Also upstream is aware of the problem [1].

[0] https://hydra.nixos.org/build/75041105
[1] https://github.com/myfreeweb/http-link-header/issues/7
2018-06-06 18:33:42 +02:00
Vladimír Čunát
7c91f6d93e Merge #41326: procps-ng: 3.3.12 -> 3.3.15 (security) 2018-06-06 08:40:34 +02:00
Vladimír Čunát
1f841fcf4c Merge branch 'release-18.03' into staging-18.03 2018-06-06 08:26:58 +02:00
Dmitry Kalinkin
0f73fef53a cacert: fix certdata2pem url (#41504)
backports 933d7f37ac
2018-06-06 00:40:52 +02:00
xeji
17232131b5 Merge pull request #41344 from samueldr/fix/doc/formatting-oopsies-unstable_18.03
Fixes doc auto-formatting oopsies [18.03]
2018-06-06 00:19:55 +02:00
Graham Christensen
49a6964a42 install-grub: only try to loadfont if font is not null
(cherry picked from commit ab889c14b5)
2018-06-05 13:29:56 -04:00
Graham Christensen
4da554df0f grub-config.xml: handle a null font
(cherry picked from commit 52de38f5f4)
2018-06-05 13:29:48 -04:00
Daniel Peebles
fb16f66418 Merge pull request #41456 from ngortheone/release-18.03
Do not kill udev during boot
2018-06-05 12:55:06 -04:00
Tim Steinbach
c7137f041b linux: 4.16.13 -> 4.16.14
(cherry picked from commit 6842319f81)
2018-06-05 12:26:00 -04:00
Tim Steinbach
a167462b78 linux: 4.14.47 -> 4.14.48
(cherry picked from commit 661721f998)
2018-06-05 12:25:49 -04:00
Tim Steinbach
4bb86e8704 linux: 4.9.105 -> 4.9.106
(cherry picked from commit 967467c0e5)
2018-06-05 12:25:37 -04:00
Ben Wolsieffer
aae7d68c45 spl, zfs: 0.7.8 -> 0.7.9, unstable to latest (#41093)
(cherry picked from commit c5a088bf2b)
2018-06-05 17:26:23 +02:00
Lancelot SIX
0aea622c48 qgis: 2.18.17 -> 2.18.20 (#41195)
(cherry picked from commit e48b54c078)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
2018-06-05 13:33:36 +02:00
xeji
099528bc6a Merge pull request #41469 from samueldr/auto/dbeaver/nixos-18.03/5.1.0
dbeaver: 5.0.6 -> 5.1.0 (18.03)
2018-06-05 13:30:49 +02:00
Tim Steinbach
9df3c53f38 gradle: 4.7 -> 4.8
(cherry picked from commit 84440379ba)
2018-06-05 00:14:42 +00:00
Samuel Dionne-Riel
cd6e687a43 dbeaver: 5.0.6 -> 5.1.0
(cherry picked from commit 35a188a1f936cfee2dd8647fb7956bbc5206e595)
2018-06-04 16:00:06 -04:00
Ihor Antonov
654a57247a Merge branch 'release-18.03' of github.com:ngortheone/nixpkgs into release-18.03 2018-06-04 13:01:58 -04:00
Ihor Antonov
07ba0ed756 Do not kill udev during boot
Backport of https://github.com/NixOS/nixpkgs/pull/40230/files
Fixes #39867
2018-06-04 13:00:44 -04:00
Tim Steinbach
c58d0fc367 linux-copperhead: 4.16.12.a -> 4.16.13.a
(cherry picked from commit b03de18acffdda51cb3a34698d083b3d5ed751f5)
2018-06-04 10:22:59 -04:00
Rob Vermaas
102d3d0946 julia: add some version info to passthru, will be used by julia2nix
(cherry picked from commit c548814b81)
2018-06-04 15:06:59 +02:00
AmineChikhaoui
cb0eb5b271 avoid redundant rm calls
(cherry picked from commit 1398d0c312)
2018-06-04 11:39:39 +02:00
AmineChikhaoui
91f7231b72 revert 4a86f8c9ab and properly remove
the temporary ssh host keys file/directory.

(cherry picked from commit 95c05343ce)
2018-06-04 11:39:18 +02:00
xeji
3eadeb7c3c Merge pull request #41427 from woffs/qutebrowser131
qutebrowser: 1.2.0 -> 1.3.1
2018-06-03 23:45:15 +02:00
R. RyanTM
684f69a558 qutebrowser: 1.3.0 -> 1.3.1 (#41263)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qutebrowser/versions.

These checks were done:

- built on NixOS
- /nix/store/g9592dbmfj1icx0njg1dhj094v2l8rcj-qutebrowser-1.3.1/bin/qutebrowser passed the binary check.
- /nix/store/g9592dbmfj1icx0njg1dhj094v2l8rcj-qutebrowser-1.3.1/bin/..qutebrowser-wrapped-wrapped passed the binary check.
- /nix/store/g9592dbmfj1icx0njg1dhj094v2l8rcj-qutebrowser-1.3.1/bin/.qutebrowser-wrapped passed the binary check.
- 3 of 3 passed binary check by having a zero exit code.
- 0 of 3 passed binary check by having the new version present in output.
- found 1.3.1 with grep in /nix/store/g9592dbmfj1icx0njg1dhj094v2l8rcj-qutebrowser-1.3.1
- directory tree listing: https://gist.github.com/c6f74ace4cd8ac51662079876bcef904
- du listing: https://gist.github.com/c1a964f74432d7f8c83f9825d26fbad0

(cherry picked from commit a8925a2188)
2018-06-03 22:24:39 +02:00
R. RyanTM
02b0389cbc qutebrowser: 1.2.1 -> 1.3.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qutebrowser/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/qutebrowser -h’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/qutebrowser --help’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/..qutebrowser-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/..qutebrowser-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/.qutebrowser-wrapped -h’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/.qutebrowser-wrapped --help’ got 0 exit code
- found 1.3.0 with grep in /nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0
- directory tree listing: https://gist.github.com/b9f575b232cde51598aeed723a03f7ec

(cherry picked from commit 871bffd98f)
2018-06-03 22:24:31 +02:00
R. RyanTM
3a453d9fbb qutebrowser: 1.2.0 -> 1.2.1
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/qutebrowser/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/p9a5d6129dvx6gqbxn9fqgsmx7hnhwxb-qutebrowser-1.2.1/bin/qutebrowser -h` got 0 exit code
- ran `/nix/store/p9a5d6129dvx6gqbxn9fqgsmx7hnhwxb-qutebrowser-1.2.1/bin/qutebrowser --help` got 0 exit code
- ran `/nix/store/p9a5d6129dvx6gqbxn9fqgsmx7hnhwxb-qutebrowser-1.2.1/bin/..qutebrowser-wrapped-wrapped -h` got 0 exit code
- ran `/nix/store/p9a5d6129dvx6gqbxn9fqgsmx7hnhwxb-qutebrowser-1.2.1/bin/..qutebrowser-wrapped-wrapped --help` got 0 exit code
- ran `/nix/store/p9a5d6129dvx6gqbxn9fqgsmx7hnhwxb-qutebrowser-1.2.1/bin/.qutebrowser-wrapped -h` got 0 exit code
- ran `/nix/store/p9a5d6129dvx6gqbxn9fqgsmx7hnhwxb-qutebrowser-1.2.1/bin/.qutebrowser-wrapped --help` got 0 exit code
- found 1.2.1 with grep in /nix/store/p9a5d6129dvx6gqbxn9fqgsmx7hnhwxb-qutebrowser-1.2.1
- directory tree listing: https://gist.github.com/b85ebb5c38a8861cac255f78b5c16525

(cherry picked from commit 88423094f4)
2018-06-03 22:24:07 +02:00
R. RyanTM
99e9e7e76d bind: 9.12.1 -> 9.12.1-P2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/bind/versions.

These checks were done:

- built on NixOS
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/delv passed the binary check.
- Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/arpaname had a zero exit code or showed the expected version
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-rrchecker passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/mdig passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/ddns-confgen passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-cds passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-dsfromkey passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-importkey passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-keyfromlabel passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-keygen passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-revoke passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-settime passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-signzone passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-verify passed the binary check.
- Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/genrandom had a zero exit code or showed the expected version
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-checkconf passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-checkzone passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-compilezone passed the binary check.
- Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-journalprint had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/nsec3hash had a zero exit code or showed the expected version
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/rndc passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/rndc-confgen passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/tsig-keygen passed the binary check.
- 20 of 24 passed binary check by having a zero exit code.
- 14 of 24 passed binary check by having the new version present in output.
- found 9.12.1-P2 with grep in /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2
- directory tree listing: https://gist.github.com/d95b236ef147c4c8ad6a99ca42db1acd
- du listing: https://gist.github.com/f6bcea6b6bdce7df3f66bbf02768bd20

(cherry picked from commit d2329184a9)
2018-06-03 19:47:39 +02:00
Ryan Mulligan
2951636600 bind: 9.12.0 -> 9.12.1
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/delv help` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/delv -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-rrchecker -h` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-rrchecker --help` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-rrchecker -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-rrchecker -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-rrchecker --version` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-rrchecker --help` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/mdig -h` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/mdig -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/ddns-confgen -h` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-cds -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-dsfromkey -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-importkey -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-keyfromlabel -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-keygen -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-revoke -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-settime -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-signzone -h` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-signzone --help` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-signzone -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-signzone -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-signzone --version` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-signzone -h` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-signzone --help` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-verify -h` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-verify --help` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-verify -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-verify -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-verify --version` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-verify -h` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/dnssec-verify --help` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named -V` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-checkconf -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/named-checkzone -v` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/rndc -h` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/rndc -h` and found version 9.12.1
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/rndc-confgen -h` got 0 exit code
- ran `/nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1/bin/rndc-confgen -h` and found version 9.12.1
- found 9.12.1 with grep in /nix/store/9i6c9yx3p0gvhphd4ahj8pfcm0n78han-bind-9.12.1
- directory tree listing: https://gist.github.com/e9daefd05b7c96cd83a144018a3b6aaf

(cherry picked from commit eb7b4ce256)
2018-06-03 19:47:30 +02:00
Ioannis Koutras
9d62774359 jetbrains.idea-community: 2018.1.3 -> 2018.1.4
(cherry picked from commit 613e4dec6b)
2018-06-03 19:41:56 +02:00
Ioannis Koutras
2773c329cb jetbrains.idea-ultimate: 2018.1.3 -> 2018.1.4
(cherry picked from commit 60762627bf)
2018-06-03 19:41:45 +02:00
Herman Fries
7295e175bf jetbrains.ruby-mine: 2018.1.2 -> 2018.1.3
(cherry picked from commit 68fa5505d8)
2018-06-03 13:35:22 +01:00
Herman Fries
c5617e90fd jetbrains.rider: 2017.3.1 -> 2018.1
(cherry picked from commit a3d40ac0ee)
2018-06-03 13:35:22 +01:00
Herman Fries
177c3504de jetbrains.pycharm-professional: 2018.1.2 -> 2018.1.3
(cherry picked from commit ce5e076329)
2018-06-03 13:35:21 +01:00
Herman Fries
2dc819fc4b jetbrains.pycharm-community: 2018.1.2 -> 2018.1.3
(cherry picked from commit e4ed6ca841)
2018-06-03 13:35:21 +01:00
Herman Fries
4b4edd42d9 jetbrains.phpstorm: 2018.1.2 -> 2018.1.4
(cherry picked from commit 4310d7f11b)
2018-06-03 13:35:20 +01:00
Herman Fries
a2643262c6 jetbrains.goland: 2018.1.2 -> 2018.1.3
(cherry picked from commit c0dec69ee0)
2018-06-03 13:35:20 +01:00
Herman Fries
e5c935a76f jetbrains.datagrip: 2018.1.2 -> 2018.1.3
(cherry picked from commit 61604ff9a6)
2018-06-03 13:35:20 +01:00
Ioannis Koutras
eee4785528 jetbrains.webstorm: 2018.1.2 -> 2018.1.3
(cherry picked from commit 27dc2a6883)
2018-06-03 13:35:19 +01:00
Ioannis Koutras
80b6238986 jetbrains.ruby-mine: 2018.1.1 -> 2018.1.2
(cherry picked from commit 494188557b)
2018-06-03 13:35:19 +01:00
Ioannis Koutras
106ba75e7a jetbrains.idea-ultimate: 2018.1.2 -> 2018.1.3
(cherry picked from commit b184f60d7a)
2018-06-03 13:35:18 +01:00
Ioannis Koutras
17cab8b380 jetbrains.idea-community: 2018.1.2 -> 2018.1.3
(cherry picked from commit dd32c31605)
2018-06-03 13:35:18 +01:00
Robin Gloster
e5f151ce58 idea.*: bump
Closes #39873

(cherry picked from commit 646865afe2)
2018-06-03 13:35:17 +01:00
Ioannis Koutras
a72943e203 clion: 2018.1 -> 2018.1.1
(cherry picked from commit 8ffaeecfca)
2018-06-03 13:35:17 +01:00
Ioannis Koutras
522d427e97 goland: 2018.1 -> 2018.1.1
(cherry picked from commit a52b5be4a2)
2018-06-03 13:35:17 +01:00
Ioannis Koutras
667fa79e95 idea-community: 2018.1 -> 2018.1.2
(cherry picked from commit e74d28ef96)
2018-06-03 13:35:16 +01:00
Ioannis Koutras
ca965c2c12 idea-ultimate: 2018.1 -> 2018.1.2
(cherry picked from commit 21feb8a2ed)
2018-06-03 13:35:16 +01:00
Ioannis Koutras
90dcc85909 pycharm-community: 2018.1 -> 2018.1.1
(cherry picked from commit 12f07ac1bc)
2018-06-03 13:35:16 +01:00
Ioannis Koutras
7a902a7462 pycharm-professional: 2018.1 -> 2018.1.1
(cherry picked from commit 609766bf80)
2018-06-03 13:35:15 +01:00
Ioannis Koutras
4537e8ce3f ruby-mine: 2017.3.3 -> 2017.3.4
(cherry picked from commit ef038375f8)
2018-06-03 13:35:15 +01:00
Ioannis Koutras
6c2aaf9971 webstorm: 2018.1 -> 2018.1.2
(cherry picked from commit 2479b449b6)
2018-06-03 13:35:15 +01:00
Andreas Rammhold
320e278ffb Merge pull request #41406 from andir/18.03/prosody-cve-2018-10847
prosody: 0.10.0 -> 0.10.2
2018-06-03 10:35:45 +02:00
Andreas Rammhold
f9370095e6 prosody: 0.10.0 -> 0.10.2
Fixes CVE-2018-10847 [1] and a bunch of minor things [2].

This backport from master also includes the intermediate bump to 0.10.1
which was never backported. That change also contains a security fix
related to purging chat history of deleted users amongst other fixes
[3].

[1] https://prosody.im/security/advisory_20180531/
[2] http://blog.prosody.im/prosody-0-10-2-security-release/
[3] http://blog.prosody.im/prosody-0-10-1-released/

(cherry picked from commit 83e4f66347)
2018-06-03 10:22:28 +02:00
Robert Helgesson
0286c2b2e1 mpd: fix spelling in description
(cherry picked from commit 323c2a1c6b)
2018-06-03 09:57:05 +02:00
Uli Baum
03ba84eb56 nixos/release-combined: remove keymap tests from tested job
.. temporarily as non-deterministic failures blocked the release channel
2018-06-02 18:26:48 +02:00
Adel Prokurov
59a56cd95a spotify: 1.0.79.223.g92622cc2-21 -> 1.0.80.480.g51b03ac3-13 (#41356)
Version 1.0.79.223.g92622cc2-21 doesn't exists in [spotify](https://repository-origin.spotify.com/pool/non-free/s/spotify-client/) repository, so i updated it to exists version

(cherry picked from commit 44b52c10ea)
2018-06-02 17:57:12 +02:00
Tim Steinbach
7743e5b6c7 sbt: 1.1.4 -> 1.1.6
(cherry picked from commit 35a284ad4a)
2018-06-02 10:03:07 -04:00
Andreas Rammhold
a9fdfb689b nixos/mpd: allow services.mpd.dbFile to be null
This change allows users to specify an alternative database method. For
example an mpd satellite setup where another mpd on the network shares
it's database with the local instance. The `dbFile` parameter must not be
configured in that case.

(cherry picked from commit a0797bad2c)
2018-06-01 19:39:57 +02:00
Sarah Brofeldt
042b073198 haskell.packages.ghcjs.terminfo: Bump version (#41337)
(cherry picked from commit 19fa9b2e30)
2018-06-01 19:19:57 +02:00
Samuel Dionne-Riel
3a33c586dc nixos/doc+man: Fixes squishedtogether definitions. 2018-05-31 21:46:50 -04:00
Samuel Dionne-Riel
eeea0ff82f doc: Fixes squishedtogether definitions. 2018-05-31 21:45:10 -04:00
Samuel Dionne-Riel
8b19c1216b nixos/doc: ran make format
With visual inspection that nothing got worse.
2018-05-31 21:43:09 -04:00
Samuel Dionne-Riel
820ca3c56c doc: ran make format
With visual inspection that nothing got worse.
2018-05-31 21:41:59 -04:00
Samuel Dionne-Riel
5a4c26c35b doc: Adds xml fixing script. (see previous and next commits)
This script is used to automatically fix issues within xml documentation
files.

The script is *for now* intended to be used ad-hoc, and the commits to
be examined.

A future discussion will define whether:

  * This commit and scripts are kept.
  * The script is extended for common use.

The biggest issue right now with the script is that it *could* in theory
destroy a valid space-less varlistentry.

The script could, in practical use, be changed and extended to normalize
some parts of the XML files, mainly:

  * A common quoting style for attributes
  * Fix-up some weird formatting automatically that xmlformat doesn't
    catch

(cherry picked from commit bc0421c4cf)
2018-05-31 21:37:52 -04:00
Samuel Dionne-Riel
0f8fcfa026 doc: Adds rule to xmlformat to help keep spacing right.
The other definitions broke term, cmdsynopsis and arg tags; spaces
inside were removed, making workdsrun-ininstead of keeping them spaced.

(cherry picked from commit aa59151c21)
2018-05-31 21:37:41 -04:00
Vincent Ambo
c11a4a5f4d dd-agent: fix compatibility issue with iostat (#41035)
Applies a patch to the dd-agent derivation that fixes a compatibility
issue with the current version of iostat, which no longer contains a
colon after its table headers.

This patch is applied in order for the fix to be backportable to
existing stable releases. A final "proper" fix will be an upgrade to a
newer version of dd-agent, but that requires several other changes.

This fixes #40103.

(cherry picked from commit aee19ca7f8)
2018-05-31 23:48:19 +02:00
John Ericson
df1d6acdbc Merge pull request #41331 from obsidiansystems/haskellSrc2nix-overriding
haskell infra: Allow overriding `haskellSrc2nix`
2018-05-31 16:42:21 -04:00
Dmitry Kalinkin
589636aad8 procps-ng: 3.3.12 -> 3.3.15
Fix CVE's https://www.freelists.org/post/procps/Procps-3315-Security-Update
2018-05-31 23:36:26 +03:00
Michael Raskin
8f374ba631 Merge pull request #41291 from YorikSar/update-chromium
chromium: 66.0.3359.181 -> 67.0.3396.62
(cherry picked from commit 5957fab607)
2018-05-31 17:43:16 +02:00
Uli Baum
0b32220c07 perlPackages.DBDPg: disable tests
Build was broken because tests freeze in sandbox, disable them.
Fixes #41199.

(cherry picked from commit 828ddc2e20)
2018-05-31 12:02:08 +02:00
xeji
8b4f5f4de1 Merge pull request #41272 from jensbin/openshift_fix
openshift: Fix path to mount and findmnt command
2018-05-31 09:29:59 +02:00
Jens Binkert
3641ef43db openshift: fix mkdir command 2018-05-31 05:37:03 +02:00
Tim Steinbach
b9d98c06eb linux: 4.14.46 -> 4.14.47
(cherry picked from commit 4afe59cb36)
2018-05-30 19:58:40 -04:00
Tim Steinbach
730b6165e0 linux: 4.9.104 -> 4.9.105
(cherry picked from commit 943d2fce81)
2018-05-30 19:58:26 -04:00
Tim Steinbach
9085461e2c linux: 4.4.134 -> 4.4.135
(cherry picked from commit e055b76336)
2018-05-30 19:58:12 -04:00
Florian Klink
c40fdcd26c gitAndTools.svn-all-fast-export: 1.0.11 -> 1.0.12 (#41214)
patch for https://github.com/svn-all-fast-export/svn2git/pull/40 is
contained in this release, so we can drop it here.

(cherry picked from commit 01f91267e2)
2018-05-30 22:58:30 +02:00
Shea Levy
91ceb6e0ab nix-plugins: 4.0.4 -> 4.0.5.
Allows building against nix stable.

(cherry picked from commit e2126dfd71)
2018-05-30 16:27:14 -04:00
Jens Binkert
82b02fd93f openshift: Fix path to mount and findmnt command
Fix openshift oc cluster up mount

(cherry picked from commit fd09c3dcae)
Reason: The basic functionality to spin up a local cluster using "oc
cluster up" is broken due to wrong paths to mount and findmnt.
2018-05-30 20:30:52 +02:00
Rob Vermaas
8aa385069f Update GCE image for 18.03 2018-05-30 19:36:16 +02:00
Tim Steinbach
a0b977bdb4 linux: 4.16.12 -> 4.16.13
(cherry picked from commit bbfd8e4f6f)
2018-05-30 10:08:12 -04:00
Tim Steinbach
b1663dd1e7 linux: 4.14.44 -> 4.14.46
(cherry picked from commit 346304cc78)
2018-05-30 10:08:00 -04:00
Tim Steinbach
68f0d2691d linux: 4.9.103 -> 4.9.104
(cherry picked from commit 1267e75d44)
2018-05-30 10:07:47 -04:00
Tim Steinbach
a56011a824 linux: 4.4.133 -> 4.4.134
(cherry picked from commit 4f2d387a64)
2018-05-30 10:07:23 -04:00
Orivej Desh
949cf436f2 Merge pull request #41244 from orivej/release-git
git: 2.16.2 -> 2.16.4 (for release-18.03)
2018-05-30 05:32:57 +00:00
Orivej Desh
53b3fd591f git: 2.16.2 -> 2.16.4
This is a security update, see [1].

It is not backported from master because master is at 2.17.x after #38636.

[1] https://github.com/git/git/blob/master/Documentation/RelNotes/2.17.1.txt
2018-05-30 04:17:02 +00:00
Bernard Fortz
fdb5ba4cdf eid-mw: 4.1.9 -> 4.4.1 (#40237)
* 
* Added bfortz to maintainers
2018-05-29 13:44:05 +02:00
Lancelot SIX
2ee48415af wireshark: 2.4.6 -> 2.4.7 (#41175)
See https://www.wireshark.org/docs/relnotes/wireshark-2.4.7.html for
release information
2018-05-29 09:16:46 +02:00
R. RyanTM
7f5d45a105 wireshark-gtk: 2.4.5 -> 2.4.6
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wireshark-gtk/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/wireshark-gtk -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/wireshark-gtk --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tshark -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tshark --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tfshark -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tfshark --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/tfshark help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/rawshark -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/rawshark --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/randpkt -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/randpkt --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/randpkt help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/text2pcap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/text2pcap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/mergecap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/mergecap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/reordercap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/reordercap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/capinfos -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/capinfos --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/capinfos help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/captype -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/captype --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/captype help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/editcap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/editcap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/editcap help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/dumpcap -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/dumpcap --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.wireshark-gtk-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.wireshark-gtk-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tshark-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tshark-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tfshark-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tfshark-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.tfshark-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.rawshark-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.rawshark-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.randpkt-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.randpkt-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.randpkt-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.text2pcap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.text2pcap-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.mergecap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.mergecap-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.reordercap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.reordercap-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.capinfos-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.capinfos-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.capinfos-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.captype-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.captype-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.captype-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.editcap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.editcap-wrapped --help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.editcap-wrapped help’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.dumpcap-wrapped -h’ got 0 exit code
- ran ‘/nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6/bin/.dumpcap-wrapped --help’ got 0 exit code
- found 2.4.6 with grep in /nix/store/4ir513hd62f2xyqdgapzzl7ksf4k6znq-wireshark-gtk-2.4.6
- directory tree listing: https://gist.github.com/ca5179603a5aebfd1a1ba1b1e3945de9
2018-05-29 09:16:24 +02:00
Robert Schütz
b70664a645 python.pkgs.cherrypy: clean up checkInputs
(cherry picked from commit a141b15e97)
2018-05-29 08:15:24 +02:00
Frederik Rietdijk
2c26bc6c7a python: CherryPy: 14.0.0 -> 14.0.1
(cherry picked from commit 762c93c00d)
2018-05-29 08:15:09 +02:00
Frederik Rietdijk
ab6d08132d python: cffi: 1.11.4 -> 1.11.5
(cherry picked from commit 0e5e184836)
2018-05-28 17:58:04 +02:00
Jörg Thalheim
2dbe029b67 Merge pull request #41159 from samueldr/auto/dbeaver/nixos-18.03/5.0.6
dbeaver: 5.0.5 -> 5.0.6 (18.03)
2018-05-28 09:45:32 +01:00
adisbladis
44fd18218e go-ethereum: 1.8.1 -> 1.8.8
(cherry picked from commit 9f6af81c3e)
2018-05-28 13:18:48 +08:00
Samuel Dionne-Riel
d3f070fa99 dbeaver: 5.0.5 -> 5.0.6
(cherry picked from commit 7b744c9287)
2018-05-27 20:13:51 -04:00
Vladimír Čunát
30ff9ca195 python: 2.7.14 -> 2.7.15 (bugfix + security)
Fixes CVE-2018-1000030, /cc #38993.

The ncurses patch no longer applied, and it appears the problems have
been resolved upstream https://bugs.python.org/issue25720
https://github.com/python/cpython/commit/6ba0b583d67

(cherry picked from commit 59beaf7fa2)
2018-05-27 17:49:49 +02:00
Tim Steinbach
fd72137e68 linux: 4.16.11 -> 4.16.12
(cherry picked from commit ae995625d8)
2018-05-26 18:35:02 -04:00
Tim Steinbach
0c00bf8ffc linux: 4.16.10 -> 4.16.11
(cherry picked from commit 69dad57049)
2018-05-26 18:35:02 -04:00
Tim Steinbach
c86e54af10 linux: 4.16.9 -> 4.16.10
(cherry picked from commit 950e17fdd9)
2018-05-26 18:35:01 -04:00
Tim Steinbach
737e9e06ec linux: 4.16.8 -> 4.16.9
(cherry picked from commit f58c4d9a9d)
2018-05-26 18:35:00 -04:00
Tim Steinbach
bb5c265987 linux: 4.16.7 -> 4.16.8
(cherry picked from commit d21ec84b05)
2018-05-26 18:35:00 -04:00
Tim Steinbach
c91d0db137 linux: 4.16.6 -> 4.16.7
(cherry picked from commit d6d9d75942)
2018-05-26 18:34:59 -04:00
Tim Steinbach
1b980cbe4e linux: 4.16.5 -> 4.16.6
(cherry picked from commit cf994a3d3d)
2018-05-26 18:34:59 -04:00
Tim Steinbach
84c49b8271 linux: 4.16.4 -> 4.16.5
(cherry picked from commit 7f3832bf93)
2018-05-26 18:34:58 -04:00
Tim Steinbach
42835a4328 linux: 4.16.3 -> 4.16.4
(cherry picked from commit 6a8b57799d)
2018-05-26 18:34:57 -04:00
Tim Steinbach
5b3caddb02 linux: 4.16.2 -> 4.16.3
(cherry picked from commit f99c283f50)
2018-05-26 18:34:57 -04:00
Tim Steinbach
6f48741762 linux: 4.16.1 -> 4.16.2
(cherry picked from commit aa9bc17767)
2018-05-26 18:34:56 -04:00
Tim Steinbach
9378f2b8b7 linux: 4.16 -> 4.16.1
(cherry picked from commit 9adee13f38)
2018-05-26 18:34:56 -04:00
Tim Steinbach
aad73bcdea linux: Add 4.16
(cherry picked from commit 71f28a2ca0)
2018-05-26 18:34:55 -04:00
Tim Steinbach
e37f64bd23 linux-copperhead: 4.16.10.a -> 4.16.12.a
(cherry picked from commit 4605fef14b)
2018-05-26 18:32:52 -04:00
Tim Steinbach
4aa13d0a3f linux-copperhead: 4.14.42 -> 4.14.44
(cherry picked from commit 388469e59a)
2018-05-26 18:32:40 -04:00
Tim Steinbach
661751dad3 linux: 4.14.43 -> 4.14.44
(cherry picked from commit b4e2fb578e)
2018-05-26 12:46:50 -04:00
Tim Steinbach
c913c313a1 linux: 4.9.102 -> 4.9.103
(cherry picked from commit 64c4ea0241)
2018-05-26 12:46:36 -04:00
Tim Steinbach
085225882f linux: 4.4.132 -> 4.4.133
(cherry picked from commit e49af77735)
2018-05-26 12:46:20 -04:00
Michael Weiss
a43a4eb8ca signal-desktop-beta: Mark as broken (really outdated)
(cherry picked from commit 9cb0b49673)
Reason: No-one should use signal-desktop-beta anymore, especially since
the signal-desktop updates where cherry-picked (up to version 1.11.0).
This version should not be affected by CVE-2018-10994, CVE-2018-11101
or any other security issues but it's better to be safe than sorry.
2018-05-26 17:05:32 +02:00
adisbladis
5f2da7f837 firefox-beta-bin: 61.0b6 -> 61.0b8
(cherry picked from commit b44eec37f7)
2018-05-26 14:01:09 +08:00
adisbladis
0da331b3f2 firefox-devedition-bin: 61.0b6 -> 61.0b8
(cherry picked from commit e0997ff781)
2018-05-26 14:00:21 +08:00
adisbladis
c25b6aed19 nodejs-8_x: 8.11.1 -> 8.11.2
(cherry picked from commit 092554e718)
2018-05-26 13:57:44 +08:00
adisbladis
75af05537b nodejs-6_x: 6.14.1 -> 6.14.2
(cherry picked from commit 480b9524d8)
2018-05-26 13:57:35 +08:00
Peter Simons
26b6be69c4 Merge pull request #41060 from vaibhavsagar/bump-all-cabal-hashes
all-cabal-hashes: update Hackage snapshot to latest version
2018-05-25 14:12:48 +02:00
Sarah Brofeldt
765598998d matrix-synapse: 0.28.1 -> 0.30.0 (#41075)
Backport of #41036
(cherry picked from commit 429d81db2b)
2018-05-25 13:49:22 +02:00
Vincent Ambo
2f6440eb09 maintainers: Add tazjin
(cherry picked from commit db2da8097c)
2018-05-25 08:51:59 +01:00
Uli Baum
006c1b8d65 Revert "Merge pull request from ThomasMader/dlang-update (#41008)"
Darwin build succeeded locally but failed on Hydra,
see discussion in #41008.

This reverts commit 849e261a1d.
2018-05-25 08:25:13 +02:00
Peter Simons
eabc2e6507 all-cabal-hashes: update Hackage snapshot to latest version
(cherry picked from commit bd60d9a6bb)
2018-05-25 06:01:22 +08:00
Vincent Ambo
48b3da9924 nixos/dd-agent: fix runtime errors by adding gohai to $PATH
The Datadog agent requires `gohai` to be available on its `$PATH` in
order to collect certain metrics.

It would previously start up and collect certain types of metrics, but
log errors related to the missing gohai binary.

This commit configures the systemd-unit to make gohai available at
runtime.

This fixes #39810.

(cherry picked from commit f4c87183df)
2018-05-24 22:13:07 +01:00
Vincent Ambo
6e7d5cf613 gohai: init at 2018-05-23
This project does not have a default versioning scheme. go2nix
suggests using the date of the most recent change.

(cherry picked from commit ab500439cd)
2018-05-24 22:13:07 +01:00
Thomas Mader
849e261a1d Merge pull request #40228 from ThomasMader/dlang-update (#41008)
dmd,dtools,dub: 2.079.0 -> 2.079.1 and wrap ldc2 binary with $CC

(cherry picked from commit 4aa04d185c)

Reason: This bumps the version to a newer release and fixes package
issues.
2018-05-24 22:40:59 +02:00
Pascal Wittmann
1ae2d600b4 ragel: 7.0.0.10 -> 7.0.0.11 2018-05-24 22:17:03 +02:00
Pascal Wittmann
2522b7b1bc colm: 0.13.0.5 -> 0.13.0.6 2018-05-24 22:16:58 +02:00
Lancelot SIX
a2ce9bb610 pythonPackages.django: 1.11.12 -> 1.11.13
See https://docs.djangoproject.com/en/1.11/releases/1.11.13/ for release
information

(cherry picked from commit 8733a3b932)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
2018-05-24 09:12:30 +02:00
Andreas Rammhold
87e30d3ed7 Merge pull request #41004 from flokli/18.03-zziplib-0.13.69
zziplib: 0.13.68 -> 0.13.69
2018-05-24 08:09:08 +02:00
Vladimír Čunát
5d70e5d2fc Merge branch 'staging-18.03' into release-18.03 2018-05-24 07:33:02 +02:00
R. RyanTM
e6d143c7c8 zziplib: 0.13.68 -> 0.13.69
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/zziplib/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzcat -h` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzcat --help` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzcat help` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzcat --version` and found version 0.13.69
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzdir --help` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzdir --version` and found version 0.13.69
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxorcat -h` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxorcat --help` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxorcat help` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxorcat --version` and found version 0.13.69
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxordir -h` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxordir --help` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxordir --version` and found version 0.13.69
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxorcopy -h` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxorcopy --help` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/zzxorcopy --version` and found version 0.13.69
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip --help` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip -v` and found version 0.13.69
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip --version` and found version 0.13.69
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-mix --help` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-mix -v` and found version 0.13.69
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-mix --version` and found version 0.13.69
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-mem --help` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-mem -v` and found version 0.13.69
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-mem --version` and found version 0.13.69
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-big --help` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-big -v` and found version 0.13.69
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzzip-big --version` and found version 0.13.69
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzip-mem -h` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzip-mem --help` got 0 exit code
- ran `/nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69/bin/unzip-mem --version` and found version 0.13.69
- found 0.13.69 with grep in /nix/store/9lh4yxh3lq6mv354jvbd3gqjv4dha740-zziplib-0.13.69
- directory tree listing: https://gist.github.com/fec112f9114c98b118a59917224af5ff

(cherry picked from commit 3f36f6095f)
2018-05-24 01:35:07 +02:00
Tim Steinbach
f869c8aeb3 linux: 4.14.42 -> 4.14.43
(cherry picked from commit 8758c00160)
2018-05-23 17:46:47 -04:00
Tim Steinbach
e4fa6a60df linux: 4.9.101 -> 4.9.102
(cherry picked from commit 6d31c68e19)
2018-05-23 17:46:26 -04:00
Sarah Brofeldt
33682d9af4 gmsh: gfortran -> nativeBuildInputs (fix #40976) (#40984)
(cherry picked from commit 6ea941d3fd)
2018-05-23 17:34:43 +02:00
Sarah Brofeldt
b2a36e6424 Merge pull request #40981 from phile314/slimserver-fix-18.03
nixos/slimserver: Fix media scanning & transcoding (backport #40778)
2018-05-23 13:04:39 +02:00
Philipp Hausmann
599ea9eda7 nixos/slimserver: Fix transcoding 2018-05-23 12:33:43 +02:00
Philipp Hausmann
f36bb87d0a nixos/slimserver: Disable broken image/video support (#40589) 2018-05-23 12:33:01 +02:00
Sander van der Burg
9062afb7cb dysnomia module: change postgres administration user to root 2018-05-22 22:56:51 +02:00
Robert Schütz
077bb0876b postfix: 3.2.5 -> 3.2.6 (#40913)
Release notes: http://www.postfix.org/announcements/postfix-3.3.1.html
2018-05-22 20:56:50 +02:00
Eelco Dolstra
cee73f524b nix: 2.0.1 -> 2.0.2
(cherry picked from commit 9d0b6b9dfc)
2018-05-22 14:45:48 +02:00
Robin Gloster
99d5d5f90f networking.routes: static routes are proto static
(cherry picked from commit a32b6d5c9a)
2018-05-22 14:34:33 +02:00
Jörg Thalheim
daebac6146 Merge pull request #40695 from flokli/oracle-fixes-18.03
pythonPackages.cx_oracle: fix dlopen, patchelf and fix library path for oracle-instantclient binaries
2018-05-22 13:33:57 +01:00
Florian Klink
047c7abe8e oracle-instantclient: disable building on hydra
we requireFile, so hydra can't build it anyways.

(cherry picked from commit 9770699ebd)
2018-05-22 03:37:51 +02:00
Florian Klink
741316dbf8 oracle-instantclient: simplify, use autoPatchelfHook
Split `buildCommand`, provide `unpackCmd` and add `installPhase`.

Use autoPatchelfHook, we can get rid of all the manual hacking around
with patchelf.

Use install to install to $out

(cherry picked from commit fe56ad70f0)
2018-05-22 03:37:47 +02:00
Florian Klink
7fbdb82544 oracle-instantclient: add flokli as maintainer
(cherry picked from commit 82eaa5ba37)
2018-05-22 03:37:40 +02:00
Tim Steinbach
58f02f269f ammonite: 1.1.0 -> 1.1.2
(cherry picked from commit d4aa6b626947f10e93b6e236d5709451fa9e72d1)
2018-05-21 21:37:37 -04:00
Tim Steinbach
fee1acad35 linux-copperhead: 4.14.41 -> 4.14.42
(cherry picked from commit d775dc9160)
2018-05-21 14:42:15 -04:00
Tim Steinbach
230e815ec7 linux-copperhead: 4.16.9.a -> 4.16.10.a
(cherry picked from commit e8ef471df4)
2018-05-21 14:42:01 -04:00
xeji
a16c31244b faust2: fix build with llvm 5.0.2 (#40672)
build was broken by  llvm: 5.0.1 -> 5.0.2 (#39979)
2018-05-21 17:44:15 +02:00
R. RyanTM
ccece05ade wireguard: 0.0.20180514 -> 0.0.20180519
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wireguard-tools/versions.

These checks were done:

- built on NixOS
- /nix/store/c48vhaf6wqmra1g6sv4hv3i6vqlw7ll1-wireguard-tools-0.0.20180519/bin/wg passed the binary check.
- /nix/store/c48vhaf6wqmra1g6sv4hv3i6vqlw7ll1-wireguard-tools-0.0.20180519/bin/wg-quick passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.0.20180519 with grep in /nix/store/c48vhaf6wqmra1g6sv4hv3i6vqlw7ll1-wireguard-tools-0.0.20180519
- directory tree listing: https://gist.github.com/64bccf9c57ca84c49486890ccbf17239
- du listing: https://gist.github.com/f28d6cfd8bcbf6ab1a6c39ad40ce1606

(cherry picked from commit 410be1aa1d)
2018-05-21 13:31:15 +01:00
R. RyanTM
f40961ffb8 linuxPackages.wireguard: 0.0.20180420 -> 0.0.20180514 (#40631)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wireguard/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/ed69b3dfb89cc9d82136b356d54d21bb
- du listing: https://gist.github.com/0f8c8caf71b9d18efa2341ce03a212f1

(cherry picked from commit 2355a7f0e4)
2018-05-21 13:24:23 +01:00
R. RyanTM
e9b9e344fb linuxPackages.wireguard: 0.0.20180413 -> 0.0.20180420
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wireguard/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/62dbb660d0b10010e5638c9be376d68b

(cherry picked from commit 751aa3dff2)
2018-05-21 13:24:23 +01:00
Michael Weiss
3e0f81d400 signal-desktop: 1.10.1 -> 1.11.0
(cherry picked from commit 1af7302dd4)
2018-05-21 13:04:23 +02:00
Michael Weiss
e18d382094 signal-desktop: 1.10.0 -> 1.10.1
(cherry picked from commit 2490c50346)
2018-05-21 13:04:23 +02:00
Michael Weiss
eb4ff65829 signal-desktop: 1.9.0 -> 1.10.0
(cherry picked from commit 938ff5401a)
2018-05-21 13:04:23 +02:00
Michael Weiss
7fd1535f76 signal-desktop: 1.7.1 -> 1.9.0
(cherry picked from commit 1095c414a6)
2018-05-21 13:04:23 +02:00
Peter Schuller
73b46ed0f5 signal-desktop: 0.7.0 -> 0.7.1
(cherry picked from commit 70588bc82e)
2018-05-21 13:04:23 +02:00
R. RyanTM
094a7ec1ef signal-desktop: 1.6.1 -> 1.7.0
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/signal-desktop/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.7.0 with grep in /nix/store/xkslw2sdzbpbzy0ddd0f5qxk1wkfahs6-signal-desktop-1.7.0
- directory tree listing: https://gist.github.com/05c86387ecf6ea0334f3d0c18b44542e

(cherry picked from commit 50c6900fd4)
2018-05-21 13:04:23 +02:00
Ryan Mulligan
4a24c6ced6 signal-desktop: 1.5.2 -> 1.6.1
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/signal-desktop/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.6.1 with grep in /nix/store/pvdn1xmg25m71qciqgin0flihwbvf7p3-signal-desktop-1.6.1
- directory tree listing: https://gist.github.com/5e549f57e17894ca01ff108753e073e6

(cherry picked from commit b7046ab2aa)
2018-05-21 13:04:22 +02:00
Vladimír Čunát
fd8bd42d1b Merge branch 'release-18.03' into staging-18.03 2018-05-21 07:39:04 +02:00
Tim Steinbach
650557675b linux: 4.14.41 -> 4.14.42
(cherry picked from commit 33632bc43e26552f3dc1e33726e18cf0d7301b0f)
2018-05-20 22:46:25 -04:00
Tim Steinbach
b39f0102bb linux: 4.9.100 -> 4.9.101
(cherry picked from commit 61fe3e86f65ec74b1710d1e63710c08250e4acc4)
2018-05-20 22:46:11 -04:00
Thomas Tuegel
eb5a7a5bf9 Merge #37636: wrapFirefox: update icon location
(cherry picked from commit 6ca5577699)
Fixes #38536.
2018-05-20 11:37:22 +02:00
xeji
7dac24446c nixos/cjdns: fix service for i686 (#40740)
service failed to start because of MemoryDenyWriteExecute = true,
which seems not to work on i686

(cherry picked from commit f4ec18aaac)
2018-05-20 10:58:04 +02:00
Vladimír Čunát
238554904f Merge #40407: xquartz: fix build 2018-05-19 19:20:57 +02:00
Vladimír Čunát
6d9aa78743 Merge #40718: chromium: 66.0.3359.139 -> 66.0.3359.181 2018-05-19 19:20:00 +02:00
taku0
ee80654b52 thunderbird: 52.7.0 -> 52.8.0
(cherry picked from commit 6099ad3316)
2018-05-19 11:04:05 +02:00
taku0
db0720e2c8 thunderbird-bin: 52.7.0 -> 52.8.0
(cherry picked from commit 0544c38ba4)
2018-05-19 11:03:53 +02:00
taku0
69de43c1b8 firefox-esr: 60.0esr -> 60.0.1esr
(cherry picked from commit 2f076b403a)
2018-05-19 15:59:56 +09:00
taku0
11e2968529 firefox: 60.0 -> 60.0.1
(cherry picked from commit f2b3cdd950)
2018-05-19 15:59:56 +09:00
taku0
6a451a52f2 firefox-bin: 60.0 -> 60.0.1
(cherry picked from commit f4152ea6ed)
2018-05-19 15:59:56 +09:00
Yuriy Taraday
fcea258c56 chromium: 66.0.3359.170 -> 66.0.3359.181
(cherry picked from commit 272987524a)
2018-05-18 15:55:16 +04:00
Yuriy Taraday
c6a5b16117 chromium: 66.0.3359.139 -> 66.0.3359.170
Update includes 4 security fixes, including one critical (see [0]):

* [835887] Critical: Chain leading to sandbox escape. Reported by Anonymous on 2018-04-23:
* [836858] High CVE-2018-6121: Privilege Escalation in extensions.
* [836141] High CVE-2018-6122: Type confusion in V8.
* [$5000][833721] High CVE-2018-6120: Heap buffer overflow in PDFium.  Reported by Zhou Aiting(@zhouat1) of Qihoo 360 Vulcan Team on 2018-04-17

[0] https://chromereleases.googleblog.com/2018/05/stable-channel-update-for-desktop.html

PS: Didn't build Beta and Dev, verified only Stable for now

cc @bendlas @aszlig

(cherry picked from commit 18370267ef)
2018-05-18 15:55:16 +04:00
R. RyanTM
78d4a1e3ea ntp: 4.2.8p10 -> 4.2.8p11 (#40661)
Contains several CVE fixes.

(cherry picked from commit 81a0a3b39c)
2018-05-18 01:10:05 +02:00
Florian Klink
311c44c03b pythonPackages.cx_oracle: fix dlopen
previously, $ORACLE_HOME had to be set for each python script using this
library.

We now patch odpi to load libclntsh.so from oracle-instantclient if
$ORACLE_HOME was not provided.

(cherry picked from commit 639f7952be)
2018-05-17 21:08:04 +02:00
Florian Klink
b6bf5bccc6 pythonPackages.cx_oracle: 6.2.1 -> 6.3.1
(cherry picked from commit a88354d99f)
2018-05-17 21:02:11 +02:00
Frederik Rietdijk
0e56c7b482 python: cx_Oracle: 6.1 -> 6.2.1
(cherry picked from commit c1932f5156)
2018-05-17 20:58:37 +02:00
y0no
c16fd70216 pythonPackages.cx_oracle: init at 6.1
(cherry picked from commit c9366518fa)
2018-05-17 20:58:33 +02:00
Florian Klink
630482062a oracle-instantclient: patchelf and wrap adrci and genezi, too
(cherry picked from commit 7824c60a43)
2018-05-17 20:52:43 +02:00
Florian Klink
4ff26da750 oracle-instantclient: prefix LD_LIBRARY_PATH
(cherry picked from commit ccb4558a91)
2018-05-17 20:52:35 +02:00
Florian Klink
5048d0f1cf oracle-instantclient: remove unused arguments
(cherry picked from commit 0f4269bf48)
2018-05-17 20:52:31 +02:00
Florian Klink
5d8bc76290 oracle-instantclient: move rpmextract and patchelf to nativeBuildInputs
(cherry picked from commit 276f2897cb)
2018-05-17 20:52:26 +02:00
Vladimír Čunát
3de03b6d46 knot-dns: 2.6.5 -> 2.6.7
https://lists.nic.cz/pipermail/knot-dns-users/2018-May/001356.html
Some of the fixed bugs could be exploited to crash knot-resolver
if running in --verbose mode.

(cherry picked from commit 24f61ca48e)
2018-05-17 17:08:30 +02:00
Domen Kožar
03b44ad3ed minio: use go 1.10 2018-05-17 14:04:18 +02:00
Pascal Bach
745075df6a minio: 2018-03-30T00-38-44Z -> 2018-05-11T00-29-24Z
(cherry picked from commit 3518211d63)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-05-17 13:41:26 +02:00
adisbladis
3931bf8c02 minio: 2018-03-19T19-22-06Z -> 2018-03-30T00-38-44Z
(cherry picked from commit 2dc8520225)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-05-17 13:41:19 +02:00
Pascal Bach
aa156590bb minio: 2018-02-09T22-40-05Z -> 2018-03-19T19-22-06Z
(cherry picked from commit a76a8cc594)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-05-17 13:41:09 +02:00
Tim Steinbach
eab067fd9e kafka: 1.0.0 -> 1.0.1
(cherry picked from commit c65686c7f9)
2018-05-16 22:27:12 -04:00
Tim Steinbach
14f84df3ab linux-copperhead: 4.16.7.a -> 4.16.9.a
(cherry picked from commit 1006c8c8d2)
2018-05-16 21:57:37 -04:00
Tim Steinbach
ab8b9271b6 linux-copperhead: 4.14.39.a -> 4.14.41.a
(cherry picked from commit b577dc3bd0)
2018-05-16 21:57:24 -04:00
Uli Baum
ec1ee660c9 nixos/mesos-slave: start after docker
If docker is enabled, start mesos-slave.service after docker.service
to avoid a race condition that could result in mesos-slave to fail
with "Failed to create docker: Timed out getting docker version"

(cherry picked from commit ec00b6fbb3)
2018-05-17 00:29:44 +02:00
Uli Baum
345f14e304 nixos/tests/mesos: wait for all services and ports
to be available before sending requests.
Avoids non-deterministic test failure.

(cherry picked from commit 0d2a4ed49c)
2018-05-17 00:24:55 +02:00
Robert Helgesson
ee951c348b dunst: add wrapper to find librsvg (#40050)
(cherry picked from commit e3b3eac630 and
resolved merge conflict)
2018-05-17 00:21:24 +02:00
Andreas Rammhold
6b438a5771 Merge pull request #40609 from andir/18.03/firefox-60-aarch64
firefox: fix build on aarch64 with version >= 60
2018-05-17 00:07:35 +02:00
Andreas Rammhold
11af138321 firefox: fix build on aarch64 with version >= 60
The firefox build fails with an error referring to ssse2 which doesn't
exist on aarch64.
2018-05-16 21:12:14 +02:00
Tim Steinbach
e9ba8d936e linux: 4.14.40 -> 4.14.41
(cherry picked from commit 8d68eca6d2)
2018-05-16 07:25:11 -04:00
Tim Steinbach
35620c319a linux: 4.9.99 -> 4.9.100
(cherry picked from commit b8aa95185c)
2018-05-16 07:24:58 -04:00
Tim Steinbach
30016b387a linux: 4.4.131 -> 4.4.132
(cherry picked from commit 56beb9b9fd)
2018-05-16 07:24:50 -04:00
Matthew Justin Bauer
56f199b482 Merge pull request #40561 from ElvishJerricco/backport-18.03-fix-overriding-all-cabal-hashes
backport: haskellPackages: Fix overriding all-cabal-hashes
2018-05-16 01:40:21 -05:00
Uli Baum
d92331c7fd nixos/tests/kafka: fix and refactor tests
- refactor into single file for all versions
- improve timing, prevent non-deterministic failures
- fix tests for i686-linux

(cherry picked from commit 13f83ba05f)
2018-05-15 23:42:57 +02:00
Jean-Baptiste Giraudeau
e11b29507b Add bash to jira PATH: required by health checks.
(cherry picked from commit 15e44477b3)
2018-05-15 21:58:47 +01:00
Jörg Thalheim
380d7d0971 nix-review: 0.1.2 -> 0.2.0
(cherry picked from commit caa45305fe)
2018-05-15 21:44:17 +01:00
Jörg Thalheim
bbb46b144f nix-review: 0.1.0 -> 0.1.2
(cherry picked from commit 6bd669f0f9)
2018-05-15 21:44:16 +01:00
Jörg Thalheim
303cb2e5fa nix-review: init at 0.1.0
(cherry picked from commit 96b106bc5c)
2018-05-15 21:44:16 +01:00
LightDiscord
6f7f6876e5 discord: 0.0.4 -> 0.0.5
(cherry picked from commit d72b870079)
2018-05-15 12:09:30 -07:00
Will Fancher
81a48c8581 haskellPackages: Fix overriding all-cabal-hashes 2018-05-15 14:26:57 -04:00
Jan Malakhovski
888792545e nixos: systemd.services.*.environment: fix type
(cherry picked from commit fb2a8d6669)
2018-05-15 20:03:54 +02:00
John Ericson
7394e5b15a Merge commit 'd7160f39bd46e8ee86e95cbaf7a8f3d5685ab30c' into staging-18.03 2018-05-14 22:59:34 -04:00
John Ericson
da9db091a3 Merge remote-tracking branch 'upstream/release-18.03' into staging-18.03 2018-05-14 22:53:44 -04:00
John Ericson
f952058df7 Merge pull request #40538 from obsidiansystems/linux-pam-cross
pam: Remove crossAttrs
2018-05-14 22:52:40 -04:00
John Ericson
7a8f0b3b80 Merge pull request #40532 from obsidiansystems/mingw-cleanup
MinGW, Hurd: Clean ups and crossConfig removal
2018-05-14 21:05:48 -04:00
John Ericson
38cf2c2f30 Merge commit 'de169a59500bd77d947c27b3c32aec37c81e87fe' into staging-18.03 2018-05-14 14:21:44 -04:00
John Ericson
98cb3b3d8e Merge remote-tracking branch 'upstream/release-18.03' into staging-18.03 2018-05-14 14:19:04 -04:00
John Ericson
ef779f836b Merge pull request #40511 from obsidiansystems/gcc-hurd-condition
gcc: Simplify this old Hurd condition
2018-05-14 13:57:01 -04:00
John Ericson
1023285902 Merge pull request #40505 from obsidiansystems/gnu-config-arm
gnu-config: Update, allowing hacks to be removed
2018-05-14 11:47:09 -04:00
Jean-Baptiste Giraudeau
73699a03c9 azure-agent: add bash to service path.
as is often required by linux extensions.

(cherry picked from commit 28e352cff8)
2018-05-14 15:24:35 +01:00
Jean-Baptiste Giraudeau
49a697781f azure-agent: add option to control auto mount
of resource disk.

(cherry picked from commit 1d971b7a9f)
2018-05-14 15:24:35 +01:00
Thomas Tuegel
0a941b03d0 Merge pull request #40492 from ttuegel/feature/18.03/plasma-5.12.5
Plasma 5.12.5 (backport to 18.03)
2018-05-14 06:47:39 -05:00
Ben Creasy
aa220b46e2 docs: fix broken link to staging policy
(cherry picked from commit 18ae1b6d31)
2018-05-14 12:20:58 +01:00
adisbladis
a2b8e0c288 Merge pull request #40467 from samueldr/dbeaver/18.03/5.0.5
dbeaver: 5.0.4 -> 5.0.5 (18.03)

Backported from commit 68ae161f53
2018-05-14 18:26:39 +08:00
Samuel Dionne-Riel
102940172f dbeaver: 5.0.4 -> 5.0.5
(cherry picked from commit 68ae161f53)
2018-05-13 22:30:28 -04:00
Bastian Köcher
785d6e7e40 plasma5: 5.12.4 -> 5.12.5
(cherry picked from commit b53182b437)
2018-05-13 21:28:00 -05:00
Nikolay Amiantov
9fe618eade kdeApplications.kgamma5: fix build
(cherry picked from commit c6a3380445)
2018-05-13 21:27:04 -05:00
adisbladis
a56b31fa28 plasma: 5.12.3 -> 5.12.4
(cherry picked from commit c91c50367e)
2018-05-13 21:26:53 -05:00
Bastian Köcher
1483e54aed plasma5: 5.12.2 -> 5.12.3
(cherry picked from commit 334538e72b)
2018-05-13 21:26:45 -05:00
Thomas Tuegel
4cafff64bb Merge pull request #40447 from ttuegel/bugfix/18.03/kde-gtk-config/gsettings
kde-gtk-config: Set path for GSettings schemas
2018-05-13 20:19:44 -05:00
John Ericson
671f70e246 Merge branch 'strict-deps-base' into staging-18.03 2018-05-13 16:19:44 -04:00
John Ericson
b6aa592385 Merge branch 'uboot-merge-base' into release-18.03 2018-05-13 16:14:32 -04:00
xeji
a7be27a8a1 nixos/tests/acme: fix on i686, improve timing (#40410)
... to prevent non-deterministic failures

(cherry picked from commit 642bed4b3e)
2018-05-13 21:14:12 +02:00
Robert Schütz
465de5981f Merge pull request #40450 from fadenb/graylog_2.4.4_on_release-18.03
[18.03] graylog: 2.4.3 -> 2.4.4
2018-05-13 20:54:09 +02:00
Tristan Helmich
8252dee658 graylog: wrap graylogctl
Wrapper ensures graylogctl script can find java

(cherry picked from commit 9817b4aa5f)
2018-05-13 20:35:53 +02:00
Tristan Helmich
7d8dbc5f52 graylog: 2.4.3 -> 2.4.4
(cherry picked from commit 08eba842b0)
Reason: 2.4.4 contains a security fix
2018-05-13 20:35:38 +02:00
xeji
453498677a virtmanager: add missing virt-install runtime deps (#40380)
virt-install calls some programs from initrdinject.py
that were missing on PATH

(cherry picked from commit 66d204188b)
2018-05-13 20:01:38 +02:00
florianjacob
efd2addff6 matomo: 3.4.0 -> 3.5.0 (#40439)
(cherry picked from commit 468c09edc6)
2018-05-13 19:34:06 +02:00
John Ericson
f06f2f4736 Merge pull request #40445 from obsidiansystems/guile-backport
guile: Backport cross fixes
2018-05-13 12:14:35 -04:00
Thomas Tuegel
84e1102929 kde-gtk-config: Set path for GSettings schemas
Fixes: #38919

The KCModule is patched to set the appropriate environment variables in
the parent process when it is initialized.
2018-05-13 10:47:40 -05:00
John Ericson
2b688cf309 Merge remote-tracking branch 'upstream/release-18.03' into staging-18.03 2018-05-13 11:05:26 -04:00
Isaac Shapira
b88d66ce05 pywal: init at 2.0.5 (#38443)
(cherry picked from commit ff5baea979)
2018-05-13 10:22:11 +01:00
Robert Helgesson
c04fbec77c lib.types: fix loaOf behavior for long lists
Assigning a list of 10 or more elements to an option having the type
`loaOf a` produces a configuration value that is not honoring the
order of the original list. This commit fixes this and a related issue
arising when 10 or more lists are merged into this type of option.

(cherry picked from commit 08e8701673)
2018-05-13 10:02:22 +02:00
Matthew Bauer
7e14bdca57 xquartz: fix build
Things done:

- use libGLU instead of mesa for darwin support
- move patches from local to github url
- fixup xquartz install

There may still be some issues at runtime. PRs welcome!

Fixes #40196

(cherry picked from commit c839771129)
2018-05-12 21:47:36 +02:00
John Ericson
2d867df5b4 Merge branch 'fix-gcc-with-float' into release-18.03 2018-05-12 15:21:52 -04:00
Vladimír Čunát
c3da680b11 Merge branch 'staging-18.03' into release-18.03 2018-05-12 20:33:39 +02:00
Andreas Rammhold
beb2a87c1c Merge pull request #40396 from andir/18.03/firefox-60
[18.03] firefox-{esr,} 60
2018-05-12 19:49:52 +02:00
xeji
ef74cafd3e nixos/test/systemd: fix broken test
timing bug resulted in sporadic test failures on hydra

(cherry picked from commit 9d5af5871d)
2018-05-12 17:11:00 +02:00
xeji
6b50b98bf1 nixos/tests/gnome3-gdm: fix broken test
test always failed due to multiple bugs

(cherry picked from commit 4c14202bd1)
2018-05-12 17:11:00 +02:00
obadz
99389f0574 Merge pull request #40402 from obadz/libraw-1803
libraw: 0.18.7 -> 0.18.11 [18.03]
2018-05-12 16:39:05 +02:00
R. RyanTM
b6a8398e2c libraw: 0.18.10 -> 0.18.11
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libraw/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/raw-identify -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/raw-identify --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/raw-identify help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/unprocessed_raw -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/unprocessed_raw --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/unprocessed_raw help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/4channels -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/4channels --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/4channels help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/simple_dcraw -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/simple_dcraw --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/simple_dcraw help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/mem_image -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/mem_image --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/mem_image help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_half -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_half --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_half help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/half_mt -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/half_mt --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/half_mt help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/multirender_test -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/multirender_test --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/multirender_test help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/postprocessing_benchmark -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/postprocessing_benchmark help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_emu -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_emu help’ got 0 exit code
- found 0.18.11 with grep in /nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11
- directory tree listing: https://gist.github.com/237be4ff577316cefd0205ca6699ea88

(cherry picked from commit 9572c5415f)
2018-05-12 14:37:39 +01:00
R. RyanTM
d8278481f2 libraw: 0.18.9 -> 0.18.10
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libraw/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/raw-identify -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/raw-identify --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/raw-identify help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/unprocessed_raw -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/unprocessed_raw --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/unprocessed_raw help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/4channels -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/4channels --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/4channels help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/simple_dcraw -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/simple_dcraw --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/simple_dcraw help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/mem_image -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/mem_image --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/mem_image help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_half -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_half --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_half help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/half_mt -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/half_mt --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/half_mt help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/multirender_test -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/multirender_test --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/multirender_test help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/postprocessing_benchmark -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/postprocessing_benchmark help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_emu -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_emu help’ got 0 exit code
- found 0.18.10 with grep in /nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10
- directory tree listing: https://gist.github.com/8de105fd367301af8971e9bc3012a0d3

(cherry picked from commit d3a8e05538)
2018-05-12 14:37:35 +01:00
R. RyanTM
c27a29d0b5 libraw: 0.18.8 -> 0.18.9
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libraw/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/raw-identify -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/raw-identify --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/raw-identify help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/unprocessed_raw -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/unprocessed_raw --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/unprocessed_raw help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/4channels -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/4channels --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/4channels help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/simple_dcraw -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/simple_dcraw --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/simple_dcraw help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/mem_image -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/mem_image --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/mem_image help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_half -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_half --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_half help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/half_mt -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/half_mt --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/half_mt help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/multirender_test -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/multirender_test --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/multirender_test help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/postprocessing_benchmark -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/postprocessing_benchmark help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_emu -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_emu help’ got 0 exit code
- found 0.18.9 with grep in /nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9
- directory tree listing: https://gist.github.com/5d0a0f5fe58f15c25701c4dc878c5080

(cherry picked from commit cd3047f313)
2018-05-12 14:37:31 +01:00
Ryan Mulligan
63ec66ceef libraw: 0.18.7 -> 0.18.8
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/raw-identify -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/raw-identify --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/raw-identify help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw -V` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw -v` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw --version` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw -h` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/unprocessed_raw --help` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels -V` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels -v` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels --version` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels -h` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/4channels --help` and found version 0.18.8
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/simple_dcraw -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/simple_dcraw --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/simple_dcraw help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/mem_image -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/mem_image --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/mem_image help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/dcraw_half -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/dcraw_half --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/dcraw_half help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/half_mt -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/half_mt --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/half_mt help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/multirender_test -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/multirender_test --help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/multirender_test help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/postprocessing_benchmark -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/postprocessing_benchmark help` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/dcraw_emu -h` got 0 exit code
- ran `/nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8/bin/dcraw_emu help` got 0 exit code
- found 0.18.8 with grep in /nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8
- found 0.18.8 in filename of file in /nix/store/k3cxddpbxlpyp3dx8gqif6s7c63zzbrm-libraw-0.18.8

(cherry picked from commit f3d17b66fb)
2018-05-12 14:37:28 +01:00
R. RyanTM
e65548964f gnome3.webkitgtk: 2.20.1 -> 2.20.2 (PR #40315)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/webkitgtk/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2/bin/WebKitWebDriver -h’ got 0 exit code
- ran ‘/nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2/bin/WebKitWebDriver --help’ got 0 exit code
- found 2.20.2 with grep in /nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2
- directory tree listing: https://gist.github.com/e3496e2d8a6b933a107141f5caecb92d

(cherry picked from commit 926dc3881e)
Fixes CVE-2018-4200.
See https://webkitgtk.org/2018/05/07/webkitgtk2.20.2-released.html
2018-05-12 15:33:02 +02:00
xeji
8c27464d43 nixos/tests/mysql-backup: fix non-deterministic failure (#40258)
Sometimes failed because of delayed creation of the backup file.

(cherry picked from commit a19cc36e1a)
2018-05-12 15:14:52 +02:00
obadz
8eca57b4dc citrix-receiver: 13.9.0 -> 13.9.1
(cherry picked from commit 204049763b)
2018-05-12 14:04:41 +01:00
taku0
bb5c693237 firefox-esr: 52.7.4esr -> 52.8.0esr, 60.0esr
(cherry picked from commit b2725027d63eb6a507a4adfbdcbabc453d7071bd)
2018-05-12 12:50:04 +02:00
taku0
811c411022 firefox: 59.0.3 -> 60.0
(cherry picked from commit 5a15da04b8101324b15a02ce1a6216ecd9a4e1dc)
2018-05-12 12:50:04 +02:00
taku0
7416cbd33d nspr: 4.18 -> 4.19
(cherry picked from commit 05a2f8f4a7be373153f95e07ee4625d77e41095b)
2018-05-12 12:50:04 +02:00
Andreas Rammhold
bcb1f176fb nss: removed aarch64 patch
With the update to 3.36 the patch introduced with e96473b is no longer
required.
2018-05-12 12:50:03 +02:00
taku0
f2d528f402 nss: 3.35 -> 3.36.1
(cherry picked from commit e96473b24982694efe9c1f2f10e01310a01750b7)
2018-05-12 11:03:31 +02:00
taku0
936ad91fd6 firefox-bin: 59.0.3 -> 60.0
(cherry picked from commit 2872345b9b3e00939fea4c7ddf1b7a3d2b9ee9db)
2018-05-12 11:03:30 +02:00
taku0
c46f787747 firefox: use fetchzip instead of fetchurl
(cherry picked from commit 1a708fc0633a8d5e2477e7e5c8d3d70baf951ab2)
2018-05-12 11:03:30 +02:00
taku0
548e907d54 firefox-esr: 52.7.3esr -> 52.7.4esr
(cherry picked from commit c259ecc04e77a0783b6be49c5b97bd44ab555154)
2018-05-12 11:03:30 +02:00
taku0
baf15b6360 firefox: 59.0.2 -> 59.0.3
(cherry picked from commit 632f437e5604ef33796e12dfd7fdf6c61b622f93)
2018-05-12 11:03:29 +02:00
taku0
69ec1c4a88 firefox-bin: 59.0.2 -> 59.0.3
(cherry picked from commit 8a16d53897cf6d6e1a8f01a9961438e821099d71)
2018-05-12 11:03:29 +02:00
Jan Malakhovski
df178dee76 firefoxPackages: add a patch to fix pulseaudio initialization bug
This is optional (`libcardiacarrest` has a workaround for this bug
because there's `firefox-bin` that I can't fix), but with this applied things
are a bit smoother.
2018-05-12 11:03:29 +02:00
sjau
b10689510b sqlite: Raising max variable number and max expr depth values
fixes #36293

(cherry picked from commit fe5f012d07)
2018-05-12 11:03:28 +02:00
volth
f0ee54f751 sqlite: 3.21.0 -> 3.22.0
(cherry picked from commit 6450c19419)
2018-05-12 11:03:28 +02:00
John Ericson
c674fa8eac Merge pull request #40386 from obsidiansystems/lib-android-platforms
lib: Add 32-bit Android platforms
2018-05-11 19:01:31 -04:00
John Ericson
62ccc2324f Merge pull request #40379 from obsidiansystems/lib-platform-sort
lib/systems: Sort platforms, and space CPUs
2018-05-11 17:10:55 -04:00
Tim Steinbach
870bb44a7d docker-edge: 18.04.0-ce -> 18.05.0-ce
(cherry picked from commit 46440d3426)
2018-05-11 09:20:13 -04:00
Uli Baum
32aecad0f8 nixos/tests/graphite: fix test
- adapt netcat options to libressl-nc
- wait for services to be started and accepting connections

(cherry picked from commit 840e5d8bda)
2018-05-11 14:47:33 +02:00
Joachim Fasting
e41af9a1a0 tor-browser-bundle-bin: 7.5.3 -> 7.5.4
(cherry picked from commit b15da3e330)
2018-05-11 14:09:23 +02:00
Domen Kožar
77a26e1246 i3status: 2.11 -> 2.12
(cherry picked from commit b7074a600b)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-05-11 12:09:21 +02:00
xeji
e41817b841 nixos/systemd-networkd: wait for udev to settle
... to avoid race condition between udevd renaming and
networkd configuring interfaces (39069)

Fixes non-deterministic failure of
nixos.tests.predictable-interface-names.vm-test-run-predictableInterfaceNames-with-networkd

(cherry picked from commit 236703f9f3)
2018-05-11 11:15:18 +02:00
John Ericson
ad1af29791 Merge pull request #40307 from obsidiansystems/lib-float-for-18.03
lib: Simplify float handling
2018-05-11 01:23:18 -04:00
Uli Baum
b1a9f68ed0 nixos/release-combined.nix: fix eval of tested job
bug introduced by e5be49aec1
2018-05-11 01:06:52 +02:00
Uli Baum
461e6843b5 nixos/tests/statsd: fix non-deterministic failure
Test failed sometimes because the service took more time to start.

(cherry picked from commit 844698c436)
2018-05-10 19:52:17 +02:00
Uli Baum
6b1bc176f4 nixos/tests/fleet: disable test
test fails, package broken, was dropped on master
2018-05-10 19:43:51 +02:00
xeji
e5be49aec1 nixos/release-combined.nix: make tests consistent (#40131)
... with release-small.nix
Tests for small channel should be a subset of tests for full channel.

(cherry picked from commit f8d047da50)
2018-05-10 19:42:49 +02:00
xeji
f1e419f3cc nixos/tests/plotinus: fix non-deterministic failure (#40239)
Test failed sometimes, likely because a window didn't get focus.

(cherry picked from commit 558f4b3368)
2018-05-10 19:41:54 +02:00
Profpatsch
a08e4908e2 skopeo: build manpage
(cherry picked from commit 679ac626dc)
2018-05-10 13:51:21 +01:00
Antoine Eiche
897a827d78 skopeo: 1.28 -> 1.29
Also add myself in the maintainer list.

(cherry picked from commit 919d68e687)
2018-05-10 13:51:14 +01:00
Tim Steinbach
2db8fad70f linux: 4.14.39 -> 4.9.40
(cherry picked from commit 6c8aff71c1)
2018-05-10 07:58:38 -04:00
Tim Steinbach
18e62db681 linux: 4.9.98 -> 4.9.99
(cherry picked from commit 1bb5a80ab9)
2018-05-10 07:58:31 -04:00
John Ericson
45cd6090d9 Merge pull request #40272 from obsidiansystems/lib-platform-simplify-18.03
treewide: Get rid of `*Platform.arch`
2018-05-10 01:54:17 -04:00
John Ericson
c7be9f247a Merge pull request #40269 from obsidiansystems/uclibc-18.03
Uclibc 18.03
2018-05-10 00:47:43 -04:00
John Ericson
4009b08110 Merge pull request #40262 from obsidiansystems/more-arm
lib/systems: Parse more arm cpu types
2018-05-09 20:05:16 -04:00
taku0
8bf6df2b8e flashplayer: 29.0.0.140 -> 29.0.0.171
Security update, see
https://helpx.adobe.com/security/products/flash-player/apsb18-16.html

(cherry picked from commit 219b1c1e1b)
2018-05-08 23:10:53 +02:00
John Ericson
9746c1ac17 Merge pull request #40185 from obsidiansystems/stdenv-arm-alias
stdenv: Put back isArm, with deprecation notice.

Back-port of #40154
2018-05-08 14:40:22 -04:00
Franz Pletz
0c4cadfc28 oraclejdk9: mark as insecure (EOL) 2018-05-08 18:31:41 +02:00
taku0
58c56a84ad oraclejdk: 10 -> 10.0.1
(cherry picked from commit 7042807f0e)
2018-05-08 18:31:06 +02:00
Matthew Justin Bauer
5d7d0842b6 openjdk: get rid of warning
This warning breaks tarball creation:

https://hydra.nixos.org/build/71825197/nixlog/1
(cherry picked from commit 3884d24466)
2018-05-08 18:31:06 +02:00
taku0
042cd6ecd4 oraclejdk: add version 10
(cherry picked from commit d2d859d5c5)
2018-05-08 18:31:06 +02:00
Vladimír Čunát
7dde6517eb Re-revert "Merge #39979: llvm5: 5.0.1 -> 5.0.2"
This reverts commit 08aea7c3c6.
2018-05-08 10:42:01 +02:00
Vladimír Čunát
f981e958ea Merge branch 'release-18.03' into staging-18.03 2018-05-08 10:41:49 +02:00
Vladimír Čunát
08aea7c3c6 Revert "Merge #39979: llvm5: 5.0.1 -> 5.0.2"
This reverts commit ff510fd88c.
Moved to staging-18.03; I didn't intend to have this in 18.03 *yet*.
2018-05-08 10:40:24 +02:00
volth
e325c77dd8 perlPackages.TypesSerialiser: init at 1.0
(cherry picked from part of commit 161683e13a)
The main point is to fix evaluation after 730247bbe0.
2018-05-08 09:37:31 +02:00
Vladimír Čunát
78ac53ba60 Merge branch 'staging-18.03' into release-18.03 2018-05-08 09:27:38 +02:00
Ryan Trinkle
2a17d7ca30 dockerTools: optionally preserve directory symlinks
In some cases, this seems to save a lot (>40%) of space.

(cherry picked from commit dce2c258ac)
2018-05-07 14:15:23 -04:00
Jörg Thalheim
e08245f87b mbedtls: 2.7.1 -> 2.7.3
Security update. master has already 2.9.0
2018-05-07 15:10:28 +01:00
R. RyanTM
7dceb0a596 libcue: 2.2.0 -> 2.2.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libcue/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.2.1 with grep in /nix/store/lqppvr2arq1jmmdil3519c2y7hhm0vq3-libcue-2.2.1
- directory tree listing: https://gist.github.com/49da59ef9dfe640d50f9bc6ee72a7457

(cherry picked from commit f08e06ba2f)
2018-05-07 11:46:26 +01:00
Bjørn Forsman
730247bbe0 shutter: add missing dependencies for Screenshot->Export (Ctrl+U) support
However, none of the exporters I tried actually _worked_, but now
shutter at least returns an error to the user (pop-up UI element)
instead of silently hanging and only leaving messages on stdout/stderr
about the missing deps.

AFAICS, this changes the failure of Screenshot->Export functionality
from a packaging bug to an application bug (upstream).

(cherry picked from commit 8a5b142545)
2018-05-07 12:06:39 +02:00
Maximilian Bosch
92e6593b28 shutter: wrap XDG_DATA_DIRS with hicolor-icon-theme
When opening `shutter` it adds an indicator icon to the status bar.
However this doesn't happen (and an ugly default icon will be used) if
`shutter` can't find the `hicolor-icon-theme`. In such a case a warning
like this can be found in `stderr`:

```
Gtk-WARNING **: Could not find the icon 'image-png'. The 'hicolor' theme
was not found either, perhaps you need to install it.
```

As I don't think that we should force users to install this theme
globally and several other packages including `tor-browser`, `gparted`
or `clawsmail` add `hicolor-icon-theme` to their closure this seems to
be a fair measure.

(cherry picked from commit 40226e647e)
2018-05-07 12:06:20 +02:00
Jean-Baptiste Giraudeau
758144ea44 blobfuse: 1.0.1-RC-Preview -> 1.0.2 2018-05-07 10:48:45 +01:00
Jean-Baptiste Giraudeau
1fbf13265e blobfuse: init at 1.0.1-RC-Preview (#39073) 2018-05-07 10:48:45 +01:00
Franz Pletz
2352d46904 wget: 1.19.4 -> 1.19.5 for CVE-2018-0494
(cherry picked from commit 2b499afa63)
2018-05-07 03:01:44 +02:00
R. RyanTM
816101fed3 transmission-gtk: 2.93 -> 2.94
(cherry picked from commit 66aedd583e)

Bug-fix release, see [1]

[1]: https://github.com/transmission/transmission/releases/tag/2.94
2018-05-06 18:47:13 +02:00
Erik Arvstedt
d953df9640 refind: fix runtime errors
In newer versions, instead of using $PWD to locate its ressource files,
Refind now refers to the dir containing $0.
This causes runtime errors due to missing ressources.

In lieu a wrapper binary, we now simply patch the variable 'RefindDir'
which stores the path to the ressource dir.

(cherry picked from commit adce6bf638)
2018-05-06 18:47:12 +02:00
voobscout
7245e3382c ntfs-3g: fix debian url
(cherry picked from commit 04d126a3f0)
2018-05-06 18:47:11 +02:00
bricewge
30c90bfed2 sshguard: service creates /var/lib/sshguard
(cherry picked from commit 21b926003d)
2018-05-06 18:47:10 +02:00
Tristan Helmich
056047492e nixos/matrix-synapse service: url_preview_url_blacklist fix (#40027)
Moved list of ip ranges to url_preview_ip_range_blacklist defaults.
Fixes #40017

(cherry picked from commit 560e91f1a7)
2018-05-06 18:47:05 +02:00
Daiderd Jordan
ff510fd88c Merge #39979: llvm5: 5.0.1 -> 5.0.2
(cherry picked from commit 8994bf53d7)
2018-05-06 11:22:28 +02:00
R. RyanTM
b0dac30ab5 uftp: 4.9.5 -> 4.9.6
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/uftp/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6/bin/uftpd help’ got 0 exit code
- ran ‘/nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6/bin/uftp_keymgt -h’ got 0 exit code
- ran ‘/nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6/bin/uftp_keymgt --help’ got 0 exit code
- ran ‘/nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6/bin/uftp_keymgt help’ got 0 exit code
- found 4.9.6 with grep in /nix/store/97wm1cjgqd5ih45689h2xmqfv7ywv8bi-uftp-4.9.6
- directory tree listing: https://gist.github.com/c08d432d7a238559a904561aa46161bd
2018-05-06 10:24:32 +02:00
Matthew Justin Bauer
5f16ba8fb0 Merge pull request #40011 from ambrop72/vscode-backport
Vscode backport
2018-05-05 15:47:21 -05:00
Sander van der Burg
1540594b27 libgdiplus: remove conflicting libungif that causes segfaults when opening a GIF file
(cherry picked from commit b41ede5e3a)
2018-05-05 21:18:47 +02:00
Vladimír Čunát
7979cb54e6 utillinux: patch CVE-2018-7738 (upstream)
On nixpkgs master/staging we have 2.32 - that includes this patch.
https://nvd.nist.gov/vuln/detail/CVE-2018-7738 claims 2.32-rc1 fixes
this and upstream master hasn't changed umount completion except for
this patch, so it has to be it. /cc #38994.
2018-05-05 13:38:02 +02:00
Vladimír Čunát
e877435000 Merge branch 'release-18.03' into staging-18.03 2018-05-05 13:34:28 +02:00
Tim Steinbach
b43b76dd52 vscode: 1.22.2 -> 1.23.0 2018-05-05 12:04:29 +02:00
Ambroz Bizjak
92296a7763 vscode-with-extensions: Move to vscode dir
This synchronizes with the move in master to make backports easier.
2018-05-05 12:02:11 +02:00
Jason Legler
debe6649f4 vscode: 1.22.1 -> 1.22.2 2018-05-05 12:00:17 +02:00
Winnie Quinn
39d212d4e1 vscode: 1.21.1 -> 1.22.1 2018-05-05 12:00:01 +02:00
Antoine Eiche
0a73111bc2 gcc49: backport retpoline support
To mitigate Spectre Variant 2, GCC needs to have retpoline
support (-mindirect-branch and -mfunction-return arguments on amd64
and i386).

Patches were pulled from H.J. Lu's backport branch to
4.9 (hjl/indirect/gcc-4_9-branch), available at
https://github.com/hjl-tools/gcc/tree/hjl/indirect/gcc-4_9-branch/master. Upstream
GCC does not apply patches to anything older than the
gcc-6-branch. H.J. Lu is the author of the upstream retpoline commits
as well.

Several Linux distributions already backported these patches to GCC 4
branches and some old kernels (3.13 for instance) have been recompiled
with these GCC patches. These kernels only allow to load kernel
modules that are compiled with the retpoline support.

References:
- Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/gcc-4.8/+bug/1749261
- Ubuntu package: https://launchpad.net/ubuntu/+source/gcc-4.8/4.8.4-2ubuntu1~14.04.4

Fixes #38394

(cherry picked from commit ada2fc088c)
2018-05-05 09:32:18 +02:00
Tim Steinbach
40a97926b7 vscode: 1.22.2 -> 1.23.0
(cherry picked from commit 97ca2f5d58)
2018-05-04 22:36:43 +00:00
Jason Legler
b995dcf949 vscode: 1.22.1 -> 1.22.2
(cherry picked from commit 6fd4462fcf)
2018-05-04 22:36:38 +00:00
Winnie Quinn
c114f619ef vscode: 1.21.1 -> 1.22.1
(cherry picked from commit 374fde067b)
2018-05-04 22:36:33 +00:00
Daiderd Jordan
94a3649e4c ruby: fix darwin dependencies
(cherry picked from commit 814938a7ce)
2018-05-04 22:36:20 +02:00
Michael Fellinger
0b12dee0c2 Ruby: 2.3.6 -> 2.3.7, 2.4.3 -> 2.4.4, 2.5.0 -> 2.5.1
(cherry picked from commit f99ded298f)
2018-05-04 22:36:05 +02:00
Sarah Brofeldt
b56c386dc3 Merge pull request #39953 from cleverca22/fix-virtualbox
runInLinuxVM: fix ext4 and crc32c-intel interactions
2018-05-04 11:48:14 +02:00
Robert Schütz
472ed7520c Merge pull request #39948 from xeji/backport-39922
[18.03] matrix-synapse: 0.26.1 -> 0.28.1 (security update)
2018-05-04 08:08:24 +02:00
Michael Bishop
a629e50b61 runInLinuxVM: fix ext4 and crc32c-intel interactions 2018-05-03 20:04:11 -03:00
Florian Jacob
a824fbcace python-frozendict: 0.5 -> 1.2
(cherry picked from commit ce3961cc70)
2018-05-04 00:14:13 +02:00
Florian Jacob
76f1b17c61 canonicaljson: 1.0.0 -> 1.1.3
(cherry picked from commit 3d974552f3)
2018-05-04 00:14:12 +02:00
florianjacob
202c9e6d1b matrix-synapse: 0.26.1 -> 0.28.1
Security update, backport of #39922.
2018-05-04 00:12:40 +02:00
AmineChikhaoui
3a2ad3e4c0 barf if pulling the ssh host keys fails 2018-05-03 17:17:41 +02:00
AmineChikhaoui
3a48839be0 remove the entire temporary directory 2018-05-03 17:17:27 +02:00
AmineChikhaoui
01db522035 pull the ssh host keys from the metadata service as expected by NixOps. Issues: #38623 https://github.com/NixOS/nixops/issues/930. 2018-05-03 17:17:12 +02:00
Peter Simons
f5f0b6850a all-cabal-hashes: update data to Hackage at 2018-05-03T12:04:48Z 2018-05-03 14:47:03 +02:00
Peter Simons
aa0c2d59fc cabal2nix: update to version 2.9.2
Fixes https://github.com/NixOS/nixpkgs/issues/39806.
2018-05-03 14:36:56 +02:00
zimbatm
7a37ed59a4 fetchs3: allow to name the derivation output (#39823)
* fetchs3: add configurable name

Change the default from "foo" to the basename of the s3 URL and make it
configurable.

* fetchs3: fix error on missing credentials.session_token

The session token should default to null instead of failing

* fetchs3: make use of the region argument

Set it to null if you don't want to use it

* fetchs3: prefer local build

Fetcher-types spend more time on network than CPU

(cherry picked from commit f7abcb0752)
2018-05-03 11:09:13 +01:00
Franz Pletz
171aa0d90b youtubeDL: 2018.04.25 -> 2018.05.01
(cherry picked from commit 4d6a14e915)
2018-05-03 10:18:24 +02:00
Franz Pletz
2779bd9c29 youtubeDL: 2018.04.16 -> 2018.04.25
(cherry picked from commit c208823e2d)
2018-05-03 10:18:24 +02:00
R. RyanTM
1728f8e113 python27Packages.youtube-dl: 2018.03.26.1 -> 2018.04.16
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/youtube-dl/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/.youtube-dl-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/.youtube-dl-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/.youtube-dl-wrapped --version’ and found version 2018.04.16
- ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/youtube-dl -h’ got 0 exit code
- ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/youtube-dl --help’ got 0 exit code
- ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/youtube-dl --version’ and found version 2018.04.16
- found 2018.04.16 with grep in /nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16
- directory tree listing: https://gist.github.com/359ce5add8ebf04a1dfe79aecb499137

(cherry picked from commit 65d5a82729)
2018-05-03 10:18:23 +02:00
R. RyanTM
30c3cdb8d8 python27Packages.youtube-dl: 2018.03.14 -> 2018.03.26.1
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/youtube-dl/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/xh1vx2vp7syc711vijy1qs452xxkmk1n-youtube-dl-2018.03.26.1/bin/.youtube-dl-wrapped -h` got 0 exit code
- ran `/nix/store/xh1vx2vp7syc711vijy1qs452xxkmk1n-youtube-dl-2018.03.26.1/bin/.youtube-dl-wrapped --help` got 0 exit code
- ran `/nix/store/xh1vx2vp7syc711vijy1qs452xxkmk1n-youtube-dl-2018.03.26.1/bin/youtube-dl -h` got 0 exit code
- ran `/nix/store/xh1vx2vp7syc711vijy1qs452xxkmk1n-youtube-dl-2018.03.26.1/bin/youtube-dl --help` got 0 exit code
- found 2018.03.26.1 with grep in /nix/store/xh1vx2vp7syc711vijy1qs452xxkmk1n-youtube-dl-2018.03.26.1
- directory tree listing: https://gist.github.com/0697ddb269c38c62a33bd198ac505324

(cherry picked from commit ba580b84b7)
2018-05-03 10:18:23 +02:00
Bart Brouns
6c9bfc1b08 youtube-dl: 2018.03.10 -> 2018.03.14
(cherry picked from commit 95f1754a52)
2018-05-03 10:18:23 +02:00
pjan vandaele
88c8cb0bf7 youtube-dl: 2018.03.03 -> 2018.03.10
Fixes #36843

(cherry picked from commit 86f96237ee)
2018-05-03 10:18:22 +02:00
Tim Steinbach
ed83f5c574 linux-copperhead: 4.16.6.a -> 4.16.7.a
(cherry picked from commit 8495f3b7f3d79caad7d1f348d483d22337581697)
2018-05-02 17:29:23 -04:00
Tim Steinbach
4d228f17c8 linux-copperhead: 4.14.38.a -> 4.14.39.a
(cherry picked from commit 03d39c36fa73d5f03973096f6479512a83434759)
2018-05-02 17:29:02 -04:00
Tor Hedin Brønner
0dd1214d05 nix-zsh-completions: 0.3.9 -> 0.4.0
Fix a nasty regression when completing eg. `-f`.
2018-05-02 14:42:16 -05:00
xeji
9e5caa8c19 Merge pull request #39688 from veprbl/pr/release-18.03/CVE-2018-7033_v2
[release-18.03] slurm: 17.11.3 -> 17.11.5 (Fix CVE-2018-7033)
2018-05-02 20:45:30 +02:00
Tim Steinbach
66fa4057ff linux: 4.9.97 -> 4.9.98
(cherry picked from commit 89e995d215)
2018-05-02 12:25:45 -04:00
Tim Steinbach
f92ab67fa5 linux: 4.14.38 -> 4.14.39
(cherry picked from commit d9c575be82)
2018-05-02 12:25:45 -04:00
Tim Steinbach
e58f2fb681 linux: 4.4.130 -> 4.4.131
(cherry picked from commit 14167763cd)
2018-05-02 12:25:44 -04:00
Dmitry Kalinkin
be099f0471 pythonPackages.pyslurm: 20170302 -> 20180427
Fixes build against slurm 17.11.5

Fixes: 0e0b80d4b4 ('slurm: 17.11.3 -> 17.11.5')
(cherry picked from commit bb12277049)
2018-05-02 11:57:19 -04:00
Benjamin Saunders
7cbf6ca1c8 vulkan-loader: fix broken symlink in output
backport of #39094

(cherry picked from commit d1f7c51d17)
2018-05-02 05:50:08 +02:00
Herwig Hochleitner
291df3bdb2 chromium: 66.0.3359.117 -> 66.0.3359.139
(cherry picked from commit c07c23b914)
2018-05-02 02:45:36 +02:00
Graham Christensen
d3644fc26a nixos docs: format =) 2018-05-01 20:02:27 -04:00
Graham Christensen
760be1907a nixos docs: ignore generated files
(cherry picked from commit fd2dce9708)
(cherry picked from commit 0d9597868bc5330c706f02870479a48aa79f7385)
2018-05-01 20:00:51 -04:00
Graham Christensen
5eae581d52 nixpkgs docs: format =) 2018-05-01 19:59:35 -04:00
Graham Christensen
972920be80 nixos docs: fixup 2018-05-01 19:44:09 -04:00
Graham Christensen
b7c6e7295d nixos docs: makefile for formatting 2018-05-01 19:42:39 -04:00
Graham Christensen
89187d1221 nixpkgs doc: add format Make target 2018-05-01 19:42:38 -04:00
Graham Christensen
614a0f9318 nixos docs: include note about make for debugging the nixos docs
(cherry picked from commit 74fcb1c770)
2018-05-01 19:42:28 -04:00
Graham Christensen
7fd45e4367 nixos manual: update xi:include for configuruation.nix's options-db
(cherry picked from commit a77dc213a7)
2018-05-01 19:42:27 -04:00
Graham Christensen
65872183ed nixos docs: Add a makefile for hacking on the nixos docs
(cherry picked from commit 0ff0d138e4)
2018-05-01 19:42:27 -04:00
Graham Christensen
902f5e1611 nixos docs: Move generated XML in to a specific subdirectory to allow easier hacking
(cherry picked from commit 59f8b1e844)
2018-05-01 19:42:27 -04:00
Matthew Justin Bauer
c56ebaba1b Merge pull request #39821 from flokli/spotify-1.0.77.338.g758ebd78-41-release-18.03
Backport #39820: spotify: 1.0.77.338.g758ebd78-41 -> 1.0.79.223.g92622cc2-21
2018-05-01 12:44:56 -05:00
Florian Klink
31f7f31908 spotify: 1.0.77.338.g758ebd78-41 -> 1.0.79.223.g92622cc2-21
(cherry picked from commit 6cd06ae05b)
2018-05-01 19:28:16 +02:00
Ben Gamari
793f74a3d6 notmuch: 0.26.1 -> 0.26.2
backport of #39727

(cherry picked from commit eaf71dd33e)
2018-05-01 17:53:31 +02:00
Tim Steinbach
716c478875 linux-copperhead: 4.16.5.a -> 4.16.6.a
(cherry picked from commit 8ef1d22e1e2e72bf41296e36207e99bdffad8455)
2018-05-01 11:35:31 -04:00
Tim Steinbach
015dc13f54 linux-copperhead: 4.14.37.a -> 4.14.38.a
(cherry picked from commit 3a32ecf42250715a432d260ddf4a171558086258)
2018-05-01 11:35:25 -04:00
Linus Heckemann
4647755b9f nixos-install manual: remove --chroot option
This option has been removed from the tool in favour of nixos-enter.

(cherry picked from commit 152454d987)
2018-05-01 10:05:03 +01:00
Vladimír Čunát
4c36c0ad76 Merge branch 'staging-18.03' into release-18.03 2018-05-01 10:45:00 +02:00
John Ericson
e1c7e990d2 Merge pull request #39787 from obsidiansystems/aarch32-for-18.03
treewide: isArm -> isAarch32
2018-04-30 23:28:30 -04:00
Graham Christensen
00e6e395d3 xmlformat: init at 1.04
(cherry picked from commit 07c025424e)
2018-04-30 21:14:56 -04:00
Ryan Mulligan
e50476dd8e slurm: 17.11.3 -> 17.11.5
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/slurm/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/kpn869z54bm58ib47qmv74lv01dfyp4f-slurm-17.11.5/bin/sattach -h` got 0 exit code
- ran `/nix/store/kpn869z54bm58ib47qmv74lv01dfyp4f-slurm-17.11.5/bin/sattach --help` got 0 exit code
- ran `/nix/store/kpn869z54bm58ib47qmv74lv01dfyp4f-slurm-17.11.5/bin/sattach -V` and found version 17.11.5
- ran `/nix/store/kpn869z54bm58ib47qmv74lv01dfyp4f-slurm-17.11.5/bin/sattach --version` and found version 17.11.5
- ran `/nix/store/kpn869z54bm58ib47qmv74lv01dfyp4f-slurm-17.11.5/bin/slurmd -h` got 0 exit code
- ran `/nix/store/kpn869z54bm58ib47qmv74lv01dfyp4f-slurm-17.11.5/bin/slurmd -V` and found version 17.11.5
- found 17.11.5 with grep in /nix/store/kpn869z54bm58ib47qmv74lv01dfyp4f-slurm-17.11.5
- directory tree listing: https://gist.github.com/a4fb120a8f87f92e70daccf30910015b

(cherry picked from commit 0e0b80d4b4)
2018-04-30 11:32:01 -04:00
Tim Steinbach
bafd695ca2 linux: 4.14.37 -> 4.14.38
(cherry picked from commit 6cbded6551)
2018-04-30 07:14:16 -04:00
Tim Steinbach
26a6b4deb1 linux: 4.9.96 -> 4.9.97
(cherry picked from commit 24a7d14ab4)
2018-04-30 07:14:09 -04:00
Tim Steinbach
df4afa854f linux: 4.4.129 -> 4.4.130
(cherry picked from commit d5eef36abb)
2018-04-30 07:13:58 -04:00
Jörg Thalheim
27c6eaa48d Merge pull request #39703 from samueldr/dbeaver/18.03/5.0.4
dbeaver: 5.0.3 -> 5.0.4 (18.03)
2018-04-30 07:55:23 +01:00
Samuel Dionne-Riel
fd6d36098d dbeaver: 5.0.3 -> 5.0.4
(cherry picked from commit d0c8bf86e4)
2018-04-29 23:21:19 -04:00
Sarah Brofeldt
ce0d9d638d Merge pull request #39670 from xeji/keymap-tests-18.03
[18.03] nixos/tests/keymap: improve keymap tests
2018-04-29 11:51:42 +02:00
xeji
d0de57d784 nixos/tests/keymap: wait for xdotool to succeed
xdotool failed in rare cases when a window was already created
but not yet decorated by the window manager.
also prevent a (never observed but possible) race condition

(cherry picked from commit 6891bda370)
2018-04-29 10:33:45 +02:00
xeji
f0e2572909 nixos/tests/keymap: improve keymap tests
simplify tests, prevent timeouts and non-deterministic failures

(cherry picked from commit 84a6e18947)
2018-04-29 10:33:45 +02:00
Tim Steinbach
4b750d6277 openjdk: 8u172-b02 -> 8u172-b11
(cherry picked from commit 1b1be29bf8)
2018-04-28 20:09:42 -04:00
Tim Steinbach
804060ff9a linux-copperhead: Fix all-packages reference
(cherry picked from commit 1cf5aad65b)
2018-04-28 16:32:29 -04:00
Tim Steinbach
8f71488f62 openjdk: 10.0.0 -> 10.0.1
(cherry picked from commit 628dca8af5c26d82896bc10c9a4cb090dbc0ef85)
2018-04-28 20:20:54 +00:00
Tim Steinbach
9b997dff48 linux-copperhead: Add 4.16.5.a
Separate LTS and stable kernel releases

(cherry picked from commit 844c08ec0a)
2018-04-28 19:47:08 +00:00
Tim Steinbach
541116d4d7 linux-copperhead: 4.14.36.a -> 4.14.37.a
(cherry picked from commit 2eb42290e7)
2018-04-28 19:06:12 +00:00
Tim Steinbach
f4be777468 scala: 2.12.5 -> 2.12.6
(cherry picked from commit e8012dd2dd)
2018-04-28 19:02:14 +00:00
aszlig
5965316f74 nixos/tests/chromium: Wait 10s after new window
This is a very very very ugly workaround and it's because Chromium seems
to eat keystroke for a few seconds after a new window is created.

I haven't found a better solution yet, so let's at least unbreak the
test until we come up with a better way.

Thanks to @vcunat for bringing this to my attention and also doing the
initial bisect.

The change that brought up this problem was 2b29e40153,
which updated Chromium from version 65.0.3325.181 to version
66.0.3359.117. Unfortunately the upstream changelog[1] is way too large
to actually guess what the breaking change is.

[1]: https://chromium.googlesource.com/chromium/src/+log/65.0.3325.181..66.0.3359.117?pretty=fuller&n=10000

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @bendlas, @vcunat
(cherry picked from commit 1b1b76f70a)
2018-04-28 18:22:40 +02:00
R. RyanTM
a67a7e41dc php: 7.2.4 -> 7.2.5
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/php/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phar.phar help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phar help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phpdbg help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-cgi -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-cgi --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-fpm -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-fpm --help’ got 0 exit code
- found 7.2.5 with grep in /nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5
- directory tree listing: https://gist.github.com/c9aa24f676de9bcd4cc434c086932362

(cherry picked from commit 1ec8160f8c)
2018-04-28 11:48:05 +01:00
Elis Hirwing
317567626b php71: 7.1.16 -> 7.1.17
Changelog: http://www.php.net/ChangeLog-7.php#7.1.17
(cherry picked from commit 707f7ca1d2)
2018-04-28 11:19:30 +01:00
Elis Hirwing
21b39d0651 php70: 7.0.29 -> 7.0.30
Changelog: http://www.php.net/ChangeLog-7.php#7.0.30
(cherry picked from commit bd547f6688)
2018-04-28 11:19:30 +01:00
Elis Hirwing
85b7bd0ae0 php56: 5.6.35 -> 5.6.36
Changelog: http://www.php.net/ChangeLog-5.php#5.6.36
(cherry picked from commit 51190e4d8c)
2018-04-28 11:19:29 +01:00
Elis Hirwing
0ec977f5e0 php56: 5.6.34 -> 5.6.35
Changelog: http://www.php.net/ChangeLog-5.php#5.6.35
(cherry picked from commit 130008101d)
2018-04-28 11:19:29 +01:00
Elis Hirwing
ca82aa9b68 php71: 7.1.15 -> 7.1.16
Changelog: http://www.php.net/ChangeLog-7.php#7.1.16
(cherry picked from commit 9b59a912f6)
2018-04-28 11:19:29 +01:00
Elis Hirwing
d68f32e40f php70: 7.0.28 -> 7.0.29
Changelog: http://www.php.net/ChangeLog-7.php#7.0.29
(cherry picked from commit a56b5d6793)
2018-04-28 11:19:28 +01:00
Andreas Rammhold
2b292fedbf Merge pull request #39645 from andir/18.03/quassel-rce-dos
[18.03] quassel: 0.12.4 fix RCE & DOS
2018-04-28 12:03:55 +02:00
Andreas Rammhold
8ae91ea6a3 quassel: 0.12.4 fix RCE & DOS
It was found that Quassel could be remotely crashed and had an
unauthenticated RCE vulnerability. The public annoucement can be found
on the oss-sec archive [1]. The added patches are supposed fix both issues.

[1] http://seclists.org/oss-sec/2018/q2/77
2018-04-28 11:24:12 +02:00
Sander Hollaar
18e0f8e34e netcat-openbsd: 1.187 -> 1.190: (#39605)
http://metadata.ftp-master.debian.org/changelogs/main/n/netcat-openbsd/netcat-openbsd_1.190-1_changelog
(cherry picked from commit 14568ddaab)
2018-04-28 09:32:57 +01:00
Ryan Mulligan
9ece83c251 lib/eval-config: document NIXOS_EXTRA_MODULE_PATH
This adds some documentation about importing modules external to
Nixpkgs, which provides context for documenting
NIXOS_EXTRA_MODULE_PATH.

Closes #30376

(cherry picked from commit 1cc97befd5)
2018-04-27 21:27:30 -04:00
Thomas Bach
c599bd8192 cassandra: 3.11.1 -> 3.11.2
(cherry picked from commit 53e3aa1539)
Backport #39595
2018-04-28 00:37:07 +02:00
Jörg Thalheim
f234b4872c nixos/nixos-generate-config: update search command
(cherry picked from commit e8d5070e23)
Backport #39617
2018-04-28 00:34:01 +02:00
R. RyanTM
1485afc842 cups-filters: 1.20.2 -> 1.20.3
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/cups-filters/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/h8hpf5fjx7fg0p1sv9yyvg6b803k61k4-cups-filters-1.20.3/bin/foomatic-rip -h’ got 0 exit code
- ran ‘/nix/store/h8hpf5fjx7fg0p1sv9yyvg6b803k61k4-cups-filters-1.20.3/bin/foomatic-rip --help’ got 0 exit code
- found 1.20.3 with grep in /nix/store/h8hpf5fjx7fg0p1sv9yyvg6b803k61k4-cups-filters-1.20.3
- directory tree listing: https://gist.github.com/aa62a318dc23326b357322da3e567915
2018-04-27 13:36:00 -05:00
Guillaume Maudoux
772e588777 cups-filters: remove myself from maintainers 2018-04-27 13:36:00 -05:00
R. RyanTM
6c3cde8401 cups-filters: 1.20.1 -> 1.20.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/cups-filters/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.20.2 with grep in /nix/store/zbwgknzkhih8rlcizp4s5yi5kinjfv5w-cups-filters-1.20.2
- directory tree listing: https://gist.github.com/a1bcdc4c27ed6a03fa20b81303aaa036
2018-04-27 13:36:00 -05:00
Ryan Mulligan
4a148bedf5 cups-filters: 1.20.0 -> 1.20.1
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.20.1 with grep in /nix/store/233chsllrfymrvizn74nf8sav0r0llrb-cups-filters-1.20.1
2018-04-27 13:36:00 -05:00
Franz Pletz
b3a1afba86 selfoss: 2016-07-31 -> 2.18
Fixes PHP7 compatibility.

(cherry picked from commit 555d2db620)
2018-04-27 20:05:14 +02:00
Rodney Lorrimar
6473360dc7 nixos/buildkite-agent: fix variable expansion in hook scripts
@cleverca found this bug in the declarative hooks config. Any shell
variables referenced in a hook script would get expanded by the hooks
directory builder.

Prevent variable expansion by quoting the here doc limit string.

(cherry picked from commit 3e446ecd56)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-04-27 12:19:09 +01:00
Yucheng Zhang
492d81266f fcitx-libpinyin: fix data path
(cherry picked from commit 19f6fe6e9c)
2018-04-27 11:00:10 +01:00
Tim Steinbach
eafab96f0d linux-copperhead: 4.15.18.a -> 4.14.36.a
The 4.15.x series is EOL'd, we should instead follow the LTS kernel

(cherry picked from commit 4975378b21)
2018-04-27 02:05:05 +00:00
Tim Steinbach
2d7bc8072e linux: 4.14.36 -> 4.14.37
(cherry picked from commit 8efe41dfb2)
2018-04-27 01:58:07 +00:00
Franz Pletz
0c0de21b47 smcroute: fix smcroutectl
(cherry picked from commit 70bcb50798)
2018-04-27 01:44:28 +02:00
Franz Pletz
d12f6e48a5 pssh: add explicit references to openssh and rsync
(cherry picked from commit 1ae220b689)
2018-04-27 01:44:27 +02:00
Franz Pletz
87f64fb0b2 nixos/caddy: fix ca api endpoint, now uses v2
(cherry picked from commit dc62e8509a)
2018-04-27 01:44:27 +02:00
WilliButz
33762873ce grafana: 5.0.4 -> 5.1.0
(cherry picked from commit f925480215)
2018-04-27 01:43:59 +02:00
Vladimír Čunát
9bdca39554 Revert "release-combined: don't include tests.chromium"
This reverts commit f7c8e08c7f.
We now get a build and maybe have a workaround (grandparent commit); /cc #39476.
2018-04-27 01:28:17 +02:00
Michael Raskin
b50443b5c4 check-meta.nix: specify meta.timeout (used by Hydra) 2018-04-26 23:47:10 +02:00
Sarah Brofeldt
4d0e9b9000 chromium: See if Hydra obeys a 24h meta.timeout
(cherry picked from commit 537d14f4e2)
Backport #39570 - discussion in #39476
2018-04-26 22:10:35 +02:00
Robin Gloster
ac364d82a8 gem-config.grpc: disable format hardening
(cherry picked from commit 7673593c85)
2018-04-26 18:43:20 +02:00
Robin Gloster
7baa950e72 Revert "gitlab: disable"
This reverts commit 68c4605f1a.

Gitlab has been fixed

(cherry picked from commit 94f5e5ad14)
2018-04-26 18:43:20 +02:00
Robin Gloster
9f9d9f4805 gitlab module: update to gitlab 10.7
(cherry picked from commit 783fb86de4)
2018-04-26 18:43:20 +02:00
Robin Gloster
789113ecf4 gitlab: 10.5.6 -> 10.7.0
(cherry picked from commit 04ab1ed623)
2018-04-26 18:43:19 +02:00
Robin Gloster
922fd39e0c gitlab-workhorse: 3.6.0 -> 4.1.0
(cherry picked from commit 775bbc2d57)
2018-04-26 18:43:19 +02:00
Robin Gloster
92ba0f71ec gitlab-shell: 6.0.3 -> 7.1.2
(cherry picked from commit ddec4ae7a0)
2018-04-26 18:43:19 +02:00
Robin Gloster
c37bedd7e7 gitaly: 0.81.0 -> 0.95.0
(cherry picked from commit 59ad9933ff)
2018-04-26 18:43:19 +02:00
Matthew Justin Bauer
f7c8e08c7f release-combined: don't include tests.chromium
The chromium package will frequently time out . Note that this is unrelated to the test but a side effect because the test depends on chromium.

https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.chromium.x86_64-linux

See also #39476
2018-04-26 11:28:01 -05:00
Peter Simons
04d9a46db5 Merge pull request #39199 from vaibhavsagar/release-18.03
Merge pull request #39062 from vaibhavsagar/bump-all-cabal-hashes
2018-04-26 17:46:42 +02:00
Tim Steinbach
db2ebc7bd6 oh-my-zsh: 2018-04-06 -> 2018-04-25
(cherry picked from commit 14ebf244fe)
2018-04-26 08:09:11 -04:00
Tim Steinbach
ded54d4cbb docker: 18.03.0 -> 18.03.1
(cherry picked from commit e0ad325cd4)
2018-04-26 08:02:37 -04:00
Jörg Thalheim
2456e8475f Merge pull request #39508 from xeji/kde-mbox-importer
kdeApplications.mbox-importer: fix hydra build [18.03]
2018-04-25 22:48:37 +01:00
xeji
74d8daf2fd kdeApplications.mbox-importer: fix hydra build
build failed with "log limit exceeded", disable verbose logging

(cherry picked from commit 223aad2053)
2018-04-25 23:38:20 +02:00
Matthew Justin Bauer
dc3dc330b2 Merge pull request #39487 from bfortz/staging-18.03-notmuch-0.26.1
notmuch: 0.26 -> 0.26.1
2018-04-25 16:37:52 -05:00
Jörg Thalheim
71bf440694 Merge pull request #39481 from flokli/notmuch-18.03-patch-shebangs
notmuch: add missing "patchShebangs configure"
2018-04-25 22:33:36 +01:00
Ihor Antonov
c9ab6a5835 growPartition: fix volume resizing on EC2 NVME instances
The previous code for this accidentally picked up a "p" when computing the partition number.
This logic should be more robust

fixes #39491

(cherry picked from commit 3a47c7e8f6)
2018-04-25 22:26:43 +01:00
John Ericson
2cbb138147 Merge remote-tracking branch 'upstream/release-18.03' into aarch32-for-18.03 2018-04-25 16:00:44 -04:00
Daiderd Jordan
01bcf3f2f2 vim-nix: 2018-02-25 -> 2018-04-24
(cherry picked from commit e609551090)
2018-04-25 21:50:39 +02:00
Tor Hedin Brønner
a9252c6a63 notmuch: fix /bin/sh impurity in ./configure
(cherry picked from commit d97416198a)
2018-04-25 21:10:26 +02:00
Ihor Antonov
4be6922522 Fix root volume resizing on EC2 KVM instances (M5, C5, etc)
This is a backport of #39164 PR
2018-04-25 12:56:22 -04:00
Tor Hedin Brønner
e249e59377 nix-bash-completions: 0.6.5 -> 0.6.6
(cherry picked from commit 954e02f835)
2018-04-25 18:52:02 +02:00
Tor Hedin Brønner
a61f935fb7 nix-zsh-completions: 0.3.8 -> 0.3.9
(cherry picked from commit 2848b5db7d)
2018-04-25 18:51:57 +02:00
R. RyanTM
35f3da5a12 notmuch: 0.26 -> 0.26.1
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/notmuch/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1/bin/notmuch --help’ got 0 exit code
- ran ‘/nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1/bin/notmuch help’ got 0 exit code
- ran ‘/nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1/bin/notmuch --version’ and found version 0.26.1
- found 0.26.1 with grep in /nix/store/05v4k89ni4phwyxvqskr0hji49b5fmck-notmuch-0.26.1
- directory tree listing: https://gist.github.com/adeae189f9ac416571a7c0e3beca712f
2018-04-25 16:37:13 +02:00
Lancelot SIX
20183371f5 motuclient: 1.4.00 -> 1.5.00
(cherry picked from commit 9b5793790e)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
2018-04-25 14:15:43 +02:00
Robert Helgesson
c7def568de eclipse-plugin-spotbugs: 3.1.2 -> 3.1.3
Also switch to using zipped update site provided on GitHub.

(cherry picked from commit f54a9994e3)
2018-04-24 23:02:05 +02:00
Linus Heckemann
33913f22bd xdot: disable for python 2.x
It just fails at runtime otherwise.

(cherry picked from commit 701f22275c)
2018-04-24 19:59:27 +01:00
Sarah Brofeldt
d3881bfcb3 Revert "nixos/tests/keymap: improve keymap tests"
This reverts commit d5d2e66a89.
Discussion in #39400
2018-04-24 19:04:08 +02:00
R. RyanTM
02af7567e9 xmr-stak: 2.3.0 -> 2.4.3
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xmr-stak/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/xdp6rb1bvdmpkd77vbqq8dq175dfvrvl-xmr-stak-2.4.3/bin/xmr-stak -h’ got 0 exit code
- ran ‘/nix/store/xdp6rb1bvdmpkd77vbqq8dq175dfvrvl-xmr-stak-2.4.3/bin/xmr-stak --help’ got 0 exit code
- found 2.4.3 with grep in /nix/store/xdp6rb1bvdmpkd77vbqq8dq175dfvrvl-xmr-stak-2.4.3
- directory tree listing: https://gist.github.com/ba044f08ae439ad36ac7e143f14e0fb0

(cherry picked from commit 42f2bd3a5d)
2018-04-24 17:08:12 +02:00
Franz Pletz
e0d70d70ba openarena: needs libcurl for fast assets downloads
(cherry picked from commit b6dbdaa28c)
2018-04-24 17:07:44 +02:00
Franz Pletz
1046a96f5c xmr-stak: doesn't build with gcc7 if cuda is enabled
(cherry picked from commit 0520634725)
2018-04-24 17:07:44 +02:00
Austin Seipp
2c54c2d491 pg_repack: 1.4.0.1 -> 1.4.2
This allows pg_repack to be built against PostgreSQL 10.x.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 5570fc1427)
2018-04-24 17:01:54 +02:00
Austin Seipp
9ae108d470 postgresql100: 10.2 -> 10.3
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 7e21fd72ce)
2018-04-24 17:01:44 +02:00
Austin Seipp
2d346ef981 postgresql96: 9.6.7 -> 9.6.8
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 371721a57b)
2018-04-24 17:01:44 +02:00
Austin Seipp
015fbb9550 postgresql95: 9.5.11 -> 9.5.12
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 7c9f817abe)
2018-04-24 17:01:43 +02:00
Austin Seipp
c897aeaaf0 postgresql94: 9.4.16 -> 9.4.17
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 1e3e134b04)
2018-04-24 17:01:43 +02:00
Austin Seipp
65c0b24adf postgresql93: 9.3.21 -> 9.3.22
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 1617fa98c7)
2018-04-24 17:01:42 +02:00
Lancelot SIX
847e334ec9 postgresql100: 10.1 -> 10.2
See https://www.postgresql.org/docs/10/static/release-10-2.html for
release information

(cherry picked from commit 4080c2ae8b)
2018-04-24 17:01:42 +02:00
Lancelot SIX
b7209476ca postgresql96: 9.6.6 -> 9.6.7
See https://www.postgresql.org/docs/9.6/static/release-9-6-7.html for
release information

(cherry picked from commit 67f892b08f)
2018-04-24 17:01:42 +02:00
Lancelot SIX
11e9aec7b2 postgresql95: 9.5.10 -> 9.5.11
See https://www.postgresql.org/docs/9.5/static/release-9-5-11.html for
release information.

(cherry picked from commit 67e45dfd58)
2018-04-24 17:01:41 +02:00
Lancelot SIX
d1cb11d787 postgresql94: 9.4.15 -> 9.4.16
See https://www.postgresql.org/docs/9.4/static/release-9-4-16.html for
release information

(cherry picked from commit 10ef07fd62)
2018-04-24 17:01:41 +02:00
Lancelot SIX
c3fc1bf805 postgresql93: 9.3.20 -> 9.3.21
See https://www.postgresql.org/docs/9.3/static/release-9-3-21.html for
release information

(cherry picked from commit 104dfd6f85)
2018-04-24 17:01:41 +02:00
WilliButz
1851e5a37c grafana: 5.0.3 -> 5.0.4
(cherry picked from commit 93561ed0bf)
2018-04-24 16:58:18 +02:00
Jörg Thalheim
df29e697fd Merge pull request #39369 from flokli/notmuch-18.03
gpgme: 1.10.0 -> 1.11.1
2018-04-24 13:48:49 +01:00
Tim Steinbach
a172b1ca21 linux: 4.14.35 -> 4.14.36
(cherry picked from commit d9f9b58873)
2018-04-24 08:13:15 -04:00
Tim Steinbach
33635f2651 linux: 4.9.95 -> 4.9.96
(cherry picked from commit 93f1969b04)
2018-04-24 08:12:28 -04:00
Tim Steinbach
e8a673be7f linux: 4.4.128 -> 4.4.129
(cherry picked from commit 047d17b2d8)
2018-04-24 08:12:18 -04:00
xeji
d5d2e66a89 nixos/tests/keymap: improve keymap tests
simplify tests, prevent timeouts and non-deterministic failures

(cherry picked from commit 84a6e18947)
Backport #39400
2018-04-24 11:44:16 +02:00
Michael Raskin
e932b5be26 Merge pull request #39342 from samueldr/fix/nixos-enter-efivarfs
nixos-enter: Ensures presence of full /sys tree. (for efivarfs)
(cherry picked from commit 6048470df1)
2018-04-24 00:37:35 +02:00
Florian Klink
00dca0ef63 systemd: cherry-pick 848e863acc51ecfb0f3955c498874588201d9130
fixes build after bump of libgpg-error from 1.27 to 1.28.
2018-04-23 22:38:37 +02:00
Michael Weiss
2f680ffb15 gpgme: 1.10.0 -> 1.11.1
I've rebuild all packages that depend on gpgme and everything seems fine
so far (there are a few failures but the ones I've checked are unrelated
to gpgme).

Upstream release notes (Noteworthy changes in version 1.11.1):

 * Fixed build problems in the 1.11.0 release.

 * Added C++ interfaces which were planned for 1.11.0.

 The 1.11.0 release came with these changes:

 * New encryption API to support direct key specification including
   hidden recipients option and taking keys from a file.  This also
   allows to enforce the use of a subkey.

 * New encryption flag for the new API to enforce the use of plain
   mail addresses (addr-spec).

 * The import API can now tell whether v3 keys are skipped.  These old
   and basically broken keys are not anymore supported by GnuPG 2.1.

 * The decrypt and verify API will now return the MIME flag as
   specified by RFC-4880bis.

 * The offline mode now has an effect on gpg by disabling all network
   access.  [#3831]

 * A failed OpenPGP verification how returns the fingerprint of the
   intended key if a recent gpg version was used for signature
   creation.

 * New tool gpgme-json as native messaging server for web browsers.
   As of now public key encryption and decryption is supported.
   Requires Libgpg-error 1.29.

 * New context flag "request-origin" which has an effect when used
   with GnuPG 2.2.6 or later.

 * New context flag "no-symkey-cache" which has an effect when used
   with GnuPG 2.2.7 or later.

 * New convenience constant GPGME_KEYLIST_MODE_LOCATE.

 * Improved the Python documentation.

 * Fixed a potential regression with GnuPG 2.2.6 or later.

 * Fixed a crash in the Python bindings on 32 bit platforms.  [#3892]

 * Various minor fixes.

(cherry picked from commit f76c842706)
2018-04-23 22:38:36 +02:00
Nikolay Amiantov
a0bd25dd19 libgpg-error: fix on ARM
(cherry picked from commit 7a77439b03)
2018-04-23 22:38:36 +02:00
Shea Levy
d6cfc781ca libgpg-error: 1.27 -> 1.28
(cherry picked from commit 380171c9f6)
2018-04-23 22:38:36 +02:00
Vladimír Čunát
20e349a302 knot-resolver: 2.1.1 -> 2.3.0 (security)
Contains fixes for CVE-2018-1110.

(cherry picked from commit 2becf90c93)
The server unavailabality caching is a "potentially breaking" change
for some use cases, but as it seems OK on 1.1.1.1, I think we're good
for 18.03 as well.
2018-04-23 18:24:56 +02:00
LightDiscord
884f78a229 vscode: fix files with space(s) #39112
(cherry picked from commit dc48e68221)
2018-04-23 09:59:42 -04:00
Eric Litak
14656d7031 trezord: Added Trezor Model-T (v2) udev rules
(cherry picked from commit 4bf61fa67a)
2018-04-23 18:54:37 +08:00
Vladimír Čunát
a9384fd6ff Merge branch 'staging-18.03' into release-18.03 2018-04-23 12:11:54 +02:00
Eelco Dolstra
f04f75acee nix: 2.0 -> 2.0.1
(cherry picked from commit 03b36522e7)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-04-23 00:47:18 +01:00
Jörg Thalheim
b3c84d4340 zfs: mark as broken for 4.16
(cherry picked from commit bc7c7b2b09)
2018-04-22 23:46:41 +01:00
Corbin Simpson
691a6fc5ca enhanced-ctorrent: fix CVE-2009-1759 (#39311)
Patches from Debian.

(cherry picked from commit 69f23d9e73)
2018-04-22 22:42:51 +01:00
Tuomas Tynkkynen
fe0da425ce nixos/installer/channel: Add some files that the channel also has
Nothing probably uses this, but let's be pedantic and have the
pre-included channel on the install media be as close as possible to
what 'nix-channel --update' will give them.

The only remaining difference is that the channel adds programs.sqlite,
which is fundamentally unfixable.

(cherry picked from commit bd77849b2f)
2018-04-22 20:45:25 +03:00
Ryan Mulligan
bae7df6943 exempi: 2.4.4 -> 2.4.5
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.4.5 with grep in /nix/store/l4nmjlanshgdwrh95g1h0714zcm1kk3z-exempi-2.4.5
- directory tree listing: https://gist.github.com/2d437e9ea408cfda7abaa772865a0b82

(cherry picked from commit 34682ddc49)
2018-04-22 18:07:49 +02:00
geistesk
4adf3a777e farbfeld, sent: wrap PATH for 2ff and sent
(cherry picked from commit fa3f620256)
2018-04-22 15:42:56 +01:00
Giumo X. Clanjor (哆啦比猫/兰威举)
0517698587 systemd.nspawn: fix missing suffix
Fix files placed in `/etc/systemd/nspawn/` missing `.nspawn` suffix

(cherry picked from commit 87cbb86214)
2018-04-22 15:22:33 +01:00
Vladimír Čunát
ad222f3c14 Merge #31320: docs and glibc: explicit comments on outputs
(cherry picked from commit 17c4b83d05)
2018-04-22 12:00:25 +02:00
Pascal Wittmann
7395480bd4 libusbmuxd: use cve tag in patchname for vulnix auto-detection 2018-04-22 11:42:49 +02:00
Pascal Wittmann
29e5da8e2f libimobiledevice: use cve tag in patchname for vulnix auto-detection
(cherry picked from commit 81a255dc93)
2018-04-22 11:37:35 +02:00
Dirk Lemstra
b68697c3a4 Fixed repo for ImageMagick 6 (#39276)
(cherry picked from commit 5d3c7ff2e1)
2018-04-21 22:59:21 +02:00
Richard Marko
f4fdebf685 zfs: patch exportfs path for sharenfs functionality
(cherry picked from commit 1eddfaffb1)
2018-04-21 19:34:53 +01:00
Jörg Thalheim
ca5bc1e798 rustc: disable test on i686
They run out of memory and lead to failing tests.

fixes #39110

(cherry picked from commit 14a119e198)
2018-04-21 18:54:18 +01:00
Silvan Mosberger
df4eae6a01 nixos/systemd: Fix environment type -> allows overriding
(cherry picked from commit e9fc2558f9)
2018-04-21 19:52:22 +02:00
Tim Steinbach
e8f32d0385 gradle: 4.6 -> 4.7
(cherry picked from commit 82f70b63c0)
2018-04-21 11:25:44 -04:00
Pascal Wittmann
fc3dfe659a cyrus-sasl: use cve tag in patchname for vulnix auto-detection 2018-04-21 16:13:58 +02:00
Pascal Wittmann
1768eb6531 jasper: include cve name in patch for auto-detection in vulnix 2018-04-21 15:33:13 +02:00
Herwig Hochleitner
423be37a0b chromium: 65.0.3325.181 -> 66.0.3359.117
Critical CVE-2018-6085: Use after free in Disk Cache. Reported by Ned Williamson on 2018-03-28
Critical CVE-2018-6086: Use after free in Disk Cache. Reported by Ned Williamson on 2018-03-30
High CVE-2018-6087: Use after free in WebAssembly. Reported by Anonymous on 2018-02-20
High CVE-2018-6088: Use after free in PDFium. Reported by Anonymous on 2018-03-15
High CVE-2018-6089: Same origin policy bypass in Service Worker. Reported by Rob Wu on 2018-02-04
High CVE-2018-6090: Heap buffer overflow in Skia. Reported by ZhanJia Song on 2018-03-12
High CVE-2018-6091: Incorrect handling of plug-ins by Service Worker. Reported by Jun Kokatsu (@shhnjk) on 2017-10-05
High CVE-2018-6092: Integer overflow in WebAssembly. Reported by Natalie Silvanovich of Google Project Zero on 2018-03-08
Medium CVE-2018-6093: Same origin bypass in Service Worker. Reported by Jun Kokatsu (@shhnjk) on 2017-11-01
Medium CVE-2018-6094: Exploit hardening regression in Oilpan. Reported by Chris Rohlf on 2016-08-01
Medium CVE-2018-6095: Lack of meaningful user interaction requirement before file upload. Reported by Abdulrahman Alqabandi (@qab) on 2016-08-11
Medium CVE-2018-6096: Fullscreen UI spoof. Reported by WenXu Wu of Tencent's Xuanwu Lab on 2017-10-19
Medium CVE-2018-6097: Fullscreen UI spoof. Reported by xisigr of Tencent's Xuanwu Lab on 2018-01-26
Medium CVE-2018-6098: URL spoof in Omnibox. Reported by Khalil Zhani on 2018-01-03
Medium CVE-2018-6099: CORS bypass in ServiceWorker. Reported by Jun Kokatsu (@shhnjk) on 2018-02-03
Medium CVE-2018-6100: URL spoof in Omnibox. Reported by Lnyas Zhang on 2018-02-11
Medium CVE-2018-6101: Insufficient protection of remote debugging prototol in DevTools . Reported by Rob Wu on 2018-02-19
Medium CVE-2018-6102: URL spoof in Omnibox. Reported by Khalil Zhani on 2018-02-20
Medium CVE-2018-6103: UI spoof in Permissions. Reported by Khalil Zhani on 2018-02-24
Medium CVE-2018-6104: URL spoof in Omnibox. Reported by Khalil Zhani on 2018-03-08
Medium CVE-2018-6105: URL spoof in Omnibox. Reported by Khalil Zhani on 2018-01-18
Medium CVE-2018-6106: Incorrect handling of promises in V8. Reported by lokihardt of Google Project Zero on 2018-01-25
Medium CVE-2018-6107: URL spoof in Omnibox. Reported by Khalil Zhani on 2018-02-02
Medium CVE-2018-6108: URL spoof in Omnibox. Reported by Khalil Zhani on 2018-02-27
Low CVE-2018-6109: Incorrect handling of files by FileAPI. Reported by Dominik Weber (@DoWeb_) on 2017-04-10
Low CVE-2018-6110: Incorrect handling of plaintext files via file:// . Reported by Wenxiang Qian (aka blastxiang) on 2017-10-24
Low CVE-2018-6111: Heap-use-after-free in DevTools. Reported by Khalil Zhani on 2017-11-02
Low CVE-2018-6112: Incorrect URL handling in DevTools. Reported by Rob Wu on 2017-12-29
Low CVE-2018-6113: URL spoof in Navigation. Reported by Khalil Zhani on 2018-01-25
Low CVE-2018-6114: CSP bypass. Reported by Lnyas Zhang on 2018-02-13
Low CVE-2018-6115: SmartScreen bypass in downloads. Reported by James Feher on 2018-03-07
Low CVE-2018-6116: Incorrect low memory handling in WebAssembly. Reported by Jin from Chengdu Security Response Center of Qihoo 360 Technology Co. Ltd. on 2018-03-15
Low CVE-2018-6117: Confusing autofill settings. Reported by Spencer Dailey on 2018-03-15
Low CVE-2018-6084: Incorrect use of Distributed Objects in Google Software Updater on MacOS. Reported by Ian Beer of Google Project Zero on 2018-03-15

(cherry picked from commit 2b29e40153)
2018-04-21 14:59:11 +02:00
Herwig Hochleitner
d4c0dffee5 i2p: 0.9.33 -> 0.9.34
(cherry picked from commit dcf7e63f37)
2018-04-21 14:59:11 +02:00
Herwig Hochleitner
dde48bbec6 webkitgtk: 2.20.0 -> 2.20.1
(cherry picked from commit 996238e532)
2018-04-21 14:59:11 +02:00
Herwig Hochleitner
f0d44d8eec dwarf-fortress: 0.44.05 -> 0.44.09
(cherry picked from commit 23aaf1cf97)
2018-04-21 14:59:10 +02:00
Jörg Thalheim
2c9c89054b peek: add ffmpeg to PATH 2018-04-21 13:16:36 +01:00
Vladimír Čunát
88c4a29dea Merge branch 'release-18.03' into staging-18.03 2018-04-21 10:55:00 +02:00
Ryan Mulligan
ce86b8f1b4 xorg.libXfixes: 5.0.2 -> 5.0.3
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.0.3 with grep in /nix/store/g5hcg35wmg25sgfjp7mvi4cx3shldbxd-libXfixes-5.0.3
- directory tree listing: https://gist.github.com/7398ada0908969ebbd1e7e629a1e0ef7

(cherry picked from commit 0e443ceb9e)
Only fixes CVE-2016-7944; /cc #38994.
2018-04-21 10:54:28 +02:00
Tim Steinbach
06c576b052 linux: 4.9.94 -> 4.9.95
(cherry picked from commit 966defff34)
2018-04-20 20:35:25 -04:00
Peter Simons
4a73c1fa1a Merge pull request #39062 from vaibhavsagar/bump-all-cabal-hashes
all-cabal-hashes: bump to 2018-04-19T00:28:09Z
(cherry picked from commit eb0943feb0)

This allows us to use newer packages from Hackage.
2018-04-20 16:01:30 +08:00
Josef Kemetmüller
bca05472a7 xsok: enable darwin build
(cherry picked from commit 4838234918)
2018-04-20 08:42:41 +02:00
Josef Kemetmüller
f1809821fc gv: enable darwin build
(cherry picked from commit 625fa4dfe8)
2018-04-20 08:42:41 +02:00
Josef Kemetmüller
4fe63563df Xaw3d: enable darwin build
(cherry picked from commit 7637894bf2)
2018-04-20 08:42:41 +02:00
Josef Kemetmüller
73a44ec713 oneko: enable darwin build
(cherry picked from commit ac02a1348f)
2018-04-20 08:42:41 +02:00
Josef Kemetmüller
3e12faf704 xskat: enable darwin build
(cherry picked from commit 4f7941406e)
2018-04-20 08:42:40 +02:00
Josef Kemetmüller
03993c0927 xorg.xorgcffiles: Don't use darwin's /usr/bin
All imake (xmkmf) based builds use the lib/X11/config/darwin.cf file to
define locations of cpp, cc, c++ (in /usr/bin by default). We remove the
directoy part to force darwin builds to search the $PATH for those
commands.

(cherry picked from commit 820da05d78)
2018-04-20 08:42:40 +02:00
Russell O'Connor
24eb7a974f trezord: 1.2.1 -> 2.0.12
The old trezord is obsolete and no longer functions with Trezor's password manager app.

(cherry picked from commit a60e17438e)
2018-04-20 10:51:17 +08:00
Tim Steinbach
50c0a4c880 linux-copperhead: 4.15.17.a -> 4.15.18.a
(cherry picked from commit 4631fde2ab)
2018-04-19 21:38:01 -04:00
Peter Hoeg
fdfa9c34f1 Revert "beep: fix for CVE-2018-0492"
This reverts commit aebd54c267.
2018-04-20 08:51:01 +08:00
Peter Hoeg
52d8ffa8c7 Merge pull request #39131 from peterhoeg/u/rdp_stable
freerdp: 2.0.0-rc1 -> 2.0.0-rc2
2018-04-20 00:43:41 +00:00
Sander van der Burg
b23c4d7c6a Fix invalid Baseaddress must be > 0x200000000 on cygwin
(cherry picked from commit a7adffdd47)
2018-04-20 00:04:33 +02:00
Sander van der Burg
b4c7a0e742 Fix stdenv-native by creating a bintools wrapper with similar settings
(cherry picked from commit 5a545ca9bd)
2018-04-20 00:04:11 +02:00
adisbladis
c2131a2e6e bazaar: Fix CVE-2017-14176
(cherry picked from commit 19bc90f911)
2018-04-20 02:10:11 +08:00
Graham Christensen
a0f5d776fe Merge pull request #39157 from taku0/oraclejdk-8u171-release-18.03
oraclejdk: 8u161, 8u162 -> 8u171, 8u172 (backporting to 18.03)
2018-04-19 14:05:39 -04:00
Matthew Justin Bauer
bee61947a2 Merge pull request #38488 from xeji/p/shogun
shogun: disable parallel building
2018-04-19 12:23:55 -05:00
Tim Steinbach
5f88700510 linux: 4.15.17 -> 4.15.18
(cherry picked from commit 69353cdf57)
2018-04-19 12:18:36 -04:00
Tim Steinbach
aacc276852 linux: 4.14.34 -> 4.14.35
(cherry picked from commit da788ed80b)
2018-04-19 12:18:30 -04:00
Tim Steinbach
aeafbbf89a linux: 4.9.93 -> 4.9.94
(cherry picked from commit dd72b6cb42)
2018-04-19 12:18:24 -04:00
Tim Steinbach
a70dd75955 linux: 4.4.127 -> 4.4.128
(cherry picked from commit 9e5e51d07f)
2018-04-19 12:18:16 -04:00
taku0
f8acb573be oraclejdk: 8u161, 8u162 -> 8u171, 8u172 2018-04-19 23:55:00 +09:00
Shea Levy
8673808927 rdkafka: Build with openssl support.
(cherry picked from commit e821f40c26)
2018-04-19 09:20:26 -04:00
Peter Hoeg
aebd54c267 beep: fix for CVE-2018-0492
(cherry picked from commit 12ce0db1bf)
2018-04-19 16:14:43 +08:00
adisbladis
f045ed13e8 Merge pull request #39104 from LumiGuide/elk-6.2.4-5.6.9-release-18.03
release-18.03: ELK 5.6.9 & 6.2.4 & fixes for elasticsearch6 and logstash6 not starting up
2018-04-19 15:23:04 +08:00
Peter Hoeg
6329fab75c freerdp: 2.0.0-rc1 -> 2.0.0-rc2
(cherry picked from commit da4695009c)
2018-04-19 10:39:40 +08:00
Bas van Dijk
ffb31e8f57 elk6: 6.2.3 -> 6.2.4
(cherry picked from commit 9c8fa9729c)
2018-04-18 11:30:43 +02:00
Bas van Dijk
5f82c83942 elk5: 5.6.8 -> 5.6.9
(cherry picked from commit 1593ff3f51)
2018-04-18 11:30:37 +02:00
Bas van Dijk
9af68dc73e logstash6: fix startup due to unpatched shebangs
(cherry picked from commit baf5d4d537)
2018-04-18 11:30:31 +02:00
Bas van Dijk
2fb4bf7299 elasticsearch6: fix startup due to missing jvm.options
(cherry picked from commit ae94825b4a)
2018-04-18 11:19:58 +02:00
Bas van Dijk
bcafb7265f elk6: 6.2.2 -> 6.2.3
(cherry picked from commit 54e6c0e7ae)
2018-04-18 10:48:26 +02:00
Bas van Dijk
37bd229fa1 elk6: 6.1.2 -> 6.2.2
(cherry picked from commit b3e94a2385)
2018-04-18 10:48:19 +02:00
Bas van Dijk
428c055e4a elk5: 5.6.6 -> 5.6.8
(cherry picked from commit 390abceb2b)
2018-04-18 10:48:14 +02:00
Jörg Thalheim
0a97eb36be Merge pull request #38980 from samueldr/dbeaver/5.0.3_18.03
dbeaver: 5.0.2 -> 5.0.3 (18.03)
2018-04-17 23:37:25 +01:00
Jason Hilton
41bc49a0e5 grass: compile with libLAS
(cherry picked from commit 577bbdc501)
2018-04-17 21:03:55 +02:00
Matthew Pickering
163c1e79e1 Fix libLAS darwin build
(cherry picked from commit 406e20b832)
2018-04-17 21:02:34 +02:00
Matthew Pickering
fc5d522e65 Build LASZip on unix
(cherry picked from commit 985cd571f3)
2018-04-17 21:02:29 +02:00
Vladimír Čunát
4dd40e05d3 Merge branch 'staging-18.03' into release-18.03 2018-04-17 20:39:52 +02:00
Josef Kemetmüller
3fd2b19d39 pythonPackages.libgpuarray: enable darwin build
(cherry picked from commit d96f0c5682)
2018-04-17 19:27:12 +02:00
Josef Kemetmüller
5f937db407 clblas: Enable darwin build
(cherry picked from commit 357d8f600c)
2018-04-17 19:26:56 +02:00
Tim Steinbach
8caa3e2010 zsh: 5.5 -> 5.5.1
(cherry picked from commit c69eae9a91)
2018-04-17 12:09:44 -04:00
Tor Hedin Brønner
0c928597c4 zsh: 5.4.2 -> 5.5
(cherry picked from commit 9d53bc38c1)
2018-04-17 12:09:33 -04:00
Pascal Wittmann
32f08fe6c5 jasper: add patch to fix CVE-2018-9055
Part of vulnerability roundup 39 (issue #38993)

(cherry picked from commit bbbbbbc349)
2018-04-17 15:03:00 +02:00
R. RyanTM
a8592ce09d linuxPackages.wireguard: 0.0.20180304 -> 0.0.20180413
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wireguard/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/a450c64fa037f3700caf3cd2b1e7eadb

(cherry picked from commit 3ea4441ce9)
2018-04-17 14:01:38 +01:00
Matthieu Coudron
7df808da0e kernel: fix boot.consoleLogLevel description
The current description describes the opposite influence of the setting
https://www.kernel.org/doc/Documentation/admin-guide/kernel-parameters.txt

(cherry picked from commit 9f7eabcc21)
2018-04-17 08:51:25 -04:00
Christian Kauhaus
b065fd7bdd Clarify installation steps w.r.t. disk partitions
- mkfs.fat needs `-n` to set a partition label, not `-L`.
- create /mnt/boot before mounting
- leave out detailed LVM example as advanced users already how to create
  LVs while it is detracting for novices.

Re #38674

(cherry picked from commit bca80d67a0)
2018-04-17 08:50:07 -04:00
Lancelot SIX
31ed7ab453 gnupg: 2.2.5 -> 2.2.6
See http://lists.gnu.org/archive/html/info-gnu/2018-04/msg00005.html for
release information

(cherry picked from commit ecc5a2bc15)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
2018-04-17 13:46:11 +02:00
Lancelot SIX
876d6c72d1 gnupg: 2.2.4 -> 2.2.5
See http://lists.gnu.org/archive/html/info-gnu/2018-02/msg00005.html
for release information

(cherry picked from commit 0b455cec93)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
2018-04-17 13:46:03 +02:00
Lancelot SIX
b97b50fb26 pythonPackages.django: 1.11.9 -> 1.11.12
Release notes and associated fixed CVEs:
- https://docs.djangoproject.com/en/2.0/releases/1.11.10/
  - CVE-2018-6188
- https://docs.djangoproject.com/en/2.0/releases/1.11.11/
  - CVE-2018-7536
  - CVE-2018-7537
- https://docs.djangoproject.com/en/2.0/releases/1.11.12/

Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
2018-04-17 13:42:44 +02:00
Vladimír Čunát
55d7df262b Merge #38702: Mark packages as broken (ZHF)
(cherry picked from commit db071c4d1d)
2018-04-17 13:39:00 +02:00
Shea Levy
84aac7b5de nix-plugins: 4.0.3 -> 4.0.4
(cherry picked from commit 622745c3bf)
2018-04-17 07:24:59 -04:00
Shea Levy
c1732e6087 nixUnstable: 2.0pre6137_e3cdcf89 -> 2.1pre6148_a4aac7f
(cherry picked from commit 48d9754d2b)
2018-04-17 07:15:23 -04:00
Shea Levy
9b3b5467c6 hydra: build against nix stable.
Fixes #39001

(cherry picked from commit 192221ae3f)
2018-04-17 07:06:56 -04:00
Nikolay Amiantov
c3799d33d3 acme service: generate a CA for self-signed certificate
This is needed because simp_le expects two certificates in fullchain.pem, leading to error:

> Not enough PEM encoded messages were found in fullchain.pem; at least 2 were expected, found 1.

We now create a CA and sign the key with it instead, providing correct fullchain.pem.

Also cleanup service a bit -- use PATH and a private temporary directory (which
is more suitable).

(cherry picked from commit 4fc0b4edca)
2018-04-17 12:54:22 +03:00
Vladimír Čunát
8102a41bb4 Merge branch 'release-18.03' into staging-18.03
Not many rebuilds, but let's sync anyway.
2018-04-17 10:00:34 +02:00
Jörg Thalheim
b694e7b8ee Merge #39000: rustc: disable tests for aarch64
(cherry picked from commit 74ed06efa0)
2018-04-17 09:54:36 +02:00
Elis Hirwing
c0c5571ec1 browserpass: fix gnupg dependency issue
(cherry picked from commit be660b8f51)
2018-04-16 22:16:57 +01:00
Jörg Thalheim
cb13b7d46a Merge pull request #39013 from booxter/release-18.03
git-review: 1.25.0 -> 1.26.0
2018-04-16 22:10:43 +01:00
Vincent Laporte
3658e3fa68 yosys: fix build with clang
(cherry picked from commit f13cb56360)
2018-04-16 21:14:50 +02:00
Vincent Laporte
008af14525 symbiyosys: larger meta.platforms
(cherry picked from commit dc4a8435f0)
2018-04-16 21:14:42 +02:00
Ryan Mulligan
4cd87acaf5 git-review: 1.25.0 -> 1.26.0
Fixes #39012.

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0/bin/.git-review-wrapped -h` got 0 exit code
- ran `/nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0/bin/.git-review-wrapped --help` got 0 exit code
- ran `/nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0/bin/.git-review-wrapped --version` and found version 1.26.0
- ran `/nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0/bin/git-review -h` got 0 exit code
- ran `/nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0/bin/git-review --help` got 0 exit code
- ran `/nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0/bin/git-review --version` and found version 1.26.0
- found 1.26.0 with grep in /nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0
- found 1.26.0 in filename of file in /nix/store/p5k6zxrdcnl84xjnkicm3wblq20c82l5-git-review-1.26.0

(cherry picked from commit dafc368d72)
2018-04-16 12:07:45 -07:00
Jean-Philippe Braun
f3353fffc4 dockerTools.buildImage: add /nix/store with correct permissions
Fixes #38835.

(cherry picked from commit 9751771c73)
2018-04-16 20:14:48 +02:00
Daiderd Jordan
dfa8a5e9dc docker-tools: add a test for permissions issues with AUFS/overlay
docker# [   11.054736] d24d6cdd57c9[763]: /bin/bash: error while loading
shared libraries: libreadline.so.7: cannot open shared object file:
Permission denied
docker# /bin/bash: error while loading shared libraries:
libreadline.so.7: cannot open shared object file: Permission denied
docker: exit status 127
docker: output:
error: command `docker run --rm -u 1000:1000 bash /bin/bash --version'
did not succeed (exit code 127)
command `docker run --rm -u 1000:1000 bash /bin/bash --version' did not
succeed (exit code 127)

(cherry picked from commit d538fc06e2)
2018-04-16 20:04:05 +02:00
Raitis Veinbahs
7ea6c39587 ruby-modules: Import gemset if it's a path OR a string. (#38959)
This fixes the bug introduced by 8686b98612 which broke bundlerEnv
exprs when gemdir was a string (thus making gemset a string by
`gemset = gemdir + "/gemset.nix"`) which made it being treated as a
set.

(cherry picked from commit a6a2e75804)
2018-04-16 10:24:38 +01:00
Samuel Dionne-Riel
2ed3099e20 dbeaver: 5.0.2 -> 5.0.3
(cherry picked from commit 8c3ef5e680)
2018-04-15 18:50:56 -04:00
Linus Heckemann
41b1c57d8d requireFile: exit with non-zero error message
Since the script running is a failure condition, we should fail the
build properly, not leaving it up to the missing output to determine
that the build went wrong.  This should partly address #38952 — nix
build will print out the build log on non-zero exits.

(cherry picked from commit 4a30f2efec)
2018-04-16 00:10:18 +02:00
Jonathan C. Otsuka
0f72b034ab update erlangR20 from 20.3.1 to 20.3.2
(cherry picked from commit db1ac62e45)
2018-04-15 23:52:19 +02:00
Florian Jacob
efd6eae024 matomo: 3.3.0 -> 3.4.0
(cherry picked from commit 8a7bf54f52)
2018-04-15 21:34:57 +01:00
xeji
a228c69892 extundelete: fix build with e2fsprogs 1.44
(cherry picked from commit 0a74fca535)
2018-04-15 20:33:41 +01:00
Daiderd Jordan
42a99bcfb8 vim-plugins: add bats.vim
(cherry picked from commit 1935782c00)
2018-04-15 20:45:57 +02:00
Aneesh Agrawal
ad771371fb salt: 2017.7.2 -> 2017.7.4
Release notes: https://docs.saltstack.com/en/2017.7/topics/releases/2017.7.4.html

(cherry picked from commit e797e00913)
2018-04-15 08:12:54 +02:00
Aneesh Agrawal
bd1583b7e9 salt: fix msgpack dependency
(cherry picked from commit ee8495c4c2)
2018-04-15 08:12:23 +02:00
Shea Levy
6ba9b9c9fa Revert "buildSetupcfg: Include unzip for zip sources."
Misunderstood the error I was seeing.

This reverts commit 0d3eb70133.

(cherry picked from commit 603a369b89)
2018-04-14 20:12:44 -04:00
Shea Levy
d11a6cfee1 buildSetupcfg: Include unzip for zip sources.
(cherry picked from commit 0d3eb70133)
2018-04-14 20:09:59 -04:00
Tim Steinbach
7a2670d067 oh-my-zsh: 2017-01-22 -> 2017-04-06
(cherry picked from commit cdf68596c8)
2018-04-14 15:53:44 -04:00
xeji
e695a74337 splLegacyCrypto: fix build
(cherry picked from commit b48ba55ab1)
2018-04-14 18:08:41 +01:00
Vladyslav Mykhailichenko
1c22feb9b0 sway: 0.15.1 -> 0.15.2
(cherry picked from commit 8cd25c50c0)
2018-04-13 22:16:23 +01:00
Renato Alves
2421252094 mailutils: fix path to sendmail for local mail delivery
Re-apply patch originally introduced in 23da6f9ca4 ("mailutils: fix
for sendmail path"), fixing regression introduced in 27a9ef8709
("mailutils: fix build break").

Fixes #21008.
Closes #38708.

[Bjørn: modify/extend commit message.]

(cherry picked from commit b2b44c9e9f)
2018-04-13 21:05:53 +02:00
John Ericson
d72aa27592 Merge pull request #38911 from obsidiansystems/sierra-hack
Sierra hack
2018-04-13 15:04:27 -04:00
Peter Simons
c920ba026d Merge pull request #38908 from xeji/haskell-disable-hydra
[18.03]: haskellPackages: disable some failing hydra builds
2018-04-13 20:04:41 +02:00
xeji
8945d596c3 haskellPackages: disable some hydra builds
for fsnotify-conduit, powerqueue-distributed, rocksdb-haskell
2018-04-13 18:26:56 +02:00
Shea Levy
9ec5ff26ba pythonPackages.buildSetupcfg: Allow disabling tests.
(cherry picked from commit da8fc391a0)
2018-04-13 12:25:20 -04:00
Shea Levy
c1dc24b8ca qemu-riscv: Mark lowPrio
(cherry picked from commit fddb1457b0)
2018-04-13 10:53:28 -04:00
Tim Steinbach
94bdeac70b ostree: 2017.12 -> 2018.4
(cherry picked from commit ee7e6cdbaddd370fb758b45e7af2a9574d344786)
2018-04-13 09:57:23 -04:00
Tim Steinbach
1889b8ad7b hipchat: 4.30.3.1670 -> 4.30.4.1672
(cherry picked from commit 32d620d739)
2018-04-13 09:39:26 -04:00
Tim Steinbach
aab374503b linux-copperhead: 4.15.16.a -> 4.15.17.a
(cherry picked from commit 909d90d6a8804a0cd2d4e39531503356a10db6ab)
2018-04-13 09:02:38 -04:00
Tim Steinbach
e3fa856c14 Fix kernel-copperhead test
(cherry picked from commit 3b0180fb95493d6afbf535dafcdaa77859019295)
2018-04-13 09:02:32 -04:00
Nikolay Amiantov
4f5b9016ec dnscache service: fix bug with several assigned DNS servers
(cherry picked from commit 98270cb959)
2018-04-13 15:36:02 +03:00
André-Patrick Bubel
bc0bcf326a josm: 13500 -> 13576
(cherry picked from commit 49d0fa7729)
2018-04-13 11:42:12 +01:00
Benjamin Andresen
bcaf2aeb4f libsForQt5.qtstyleplugin-kvantum: 0.10.4 -> 0.10.6
also fixes #34854 and correct license to GPL3

(cherry picked from commit 35049f9e61)
2018-04-13 11:36:34 +01:00
Ben Wolsieffer
f956b4fa6c grafana: support socket protocol
(cherry picked from commit ed6f1761cc)
2018-04-13 11:14:51 +01:00
Sarah Brofeldt
324874a6e5 Merge pull request #38893 from srhb/backports/38874-spotify-1.0.77.338
spotify: 1.0.72.117 -> 1.0.77.338
2018-04-13 10:39:01 +02:00
Utku Demir
198d7161da spotify: 1.0.72.117 -> 1.0.77.338
(cherry picked from commit e9e823c178)
2018-04-13 10:34:05 +02:00
Jörg Thalheim
f26d890403 zfsUnstable: fix build
fixes #38859

(cherry picked from commit 6b796a9c23)
2018-04-13 00:32:36 +01:00
Tuomas Tynkkynen
c5575c46db nixos/make-ext4-fs: Use closureInfo
exportReferencesGraph is deprecated and doesn't have the generated
initial Nix database contain the SHA256 of the contents of the store
paths, which breaks various things under Nix 2.0.

(cherry picked from commit 487be791d7)
2018-04-13 01:59:02 +03:00
Vladimír Čunát
563ee7f808 Merge branch 'release-18.03' into staging-18.03 2018-04-12 23:34:51 +02:00
Vladimír Čunát
17fb44e2e3 Merge #38823: various build fixes from master 2018-04-12 23:07:29 +02:00
R. RyanTM
8750b47f0e pick: 2.0.1 -> 2.0.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pick/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/mr0512zhzbbarb99l6v31pgsw1f8k859-pick-2.0.2/bin/pick -h’ got 0 exit code
- ran ‘/nix/store/mr0512zhzbbarb99l6v31pgsw1f8k859-pick-2.0.2/bin/pick -v’ and found version 2.0.2
- found 2.0.2 with grep in /nix/store/mr0512zhzbbarb99l6v31pgsw1f8k859-pick-2.0.2
- directory tree listing: https://gist.github.com/797cf336b38181f76cab1e08936713b1

(cherry picked from commit ab96418801)
2018-04-12 21:19:50 +01:00
Josef Kemetmüller
11f58c2b1e darwin.opencflite: fix build
(cherry picked from commit d1dfe27ad9)
2018-04-12 21:12:39 +02:00
Tim Steinbach
b2f138c062 linux: 4.14.33 -> 4.14.34
(cherry picked from commit 2bb811c6a0)
2018-04-12 11:37:14 -04:00
R. RyanTM
4a59632fec ncmpcpp: 0.8.1 -> 0.8.2
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ncmpcpp/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/gaym98lkncirfi09qwv0g3n6jgnknzm8-ncmpcpp-0.8.2/bin/ncmpcpp --help’ got 0 exit code
- found 0.8.2 with grep in /nix/store/gaym98lkncirfi09qwv0g3n6jgnknzm8-ncmpcpp-0.8.2
- directory tree listing: https://gist.github.com/bfab0afd2242f12a3754d3267a41b66f

(cherry picked from commit 8a41729c5c)
2018-04-12 16:26:37 +01:00
Jörg Thalheim
b1fe608835 coreclr: 2.0.0 -> 2.0.7
(cherry picked from commit f386994413)
2018-04-12 14:45:10 +01:00
Tim Steinbach
c243e07eb3 linux: 4.15.16 -> 4.15.17
(cherry picked from commit 2c8d79ff0e6ef58963702e644e63fa7e8e880f7d)
2018-04-12 07:44:36 -04:00
Lancelot SIX
82233e0bb7 pythonPackages.libais: 0.16 -> 0.17 (#37876)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
2018-04-12 10:08:17 +02:00
lassulus
1092f6d086 bepasty: make it a package again
this fixes running bepasty with gunicorn, which is needed for
services.bepasty

(cherry picked from commit 9a182f57c5)
2018-04-12 08:48:52 +02:00
Elis Hirwing
2a9fdf9c8c pythonPackages.pyechonest: Move to own file
Also disable on Py3k due to syntax errors.

(cherry picked from commit 85e3b5bd41)
2018-04-12 08:19:01 +02:00
rardiol
a74311f28c Renpy and pygame_sdl2 update - 6.99.14 (#33943)
* pygame_sdl2: 6.99.10.1227 -> 2.1.0-6.99.14

* renpy: 6.99.12.4 -> 6.99.14

(cherry picked from commit f83cbf2029)
2018-04-12 08:19:01 +02:00
Alain Lehmann
97aa2f367d graph-tool: use buildPythonPackage with format = "other";
(cherry picked from commit 83dc28cae2)
2018-04-12 08:19:01 +02:00
Alain Lehmann
a34a2d0599 graph-tool: 2.16 -> 2.26
- add ncurses: configure links against ncurses and fails otherwise
    configure: error: Could not link test program to Python.
    https://travis-ci.org/NixOS/nixpkgs/builds/48759067
    The given hint (Maybe the main Python library has been installed
    in some non-standard library path) is misleading.
    The config.log reveals that the failure is due to missing ncurses link option
- with-boost-libdir is need to find Boost::IOStreams/regex/etc.
- expat/cgal are detected in /usr/lib when not specified explicitly
- boost > boost159 is needed to have -lboost_python3 (and -lboost_python)

- set pythonModule = Python;
  => inorder to be used in python.buildEnv { extraLibs = [..]; }

tested on MacOSX and in a linux Docker container with:
> nix-shell -I nixpkgs=. -p python2.pkgs.graph-tool
> nix-shell -I nixpkgs=. -p python3.pkgs.graph-tool

(cherry picked from commit a842f0e905)
2018-04-12 08:19:01 +02:00
Ryan Mulligan
8f5b4e42ed hpx: 1.0.0 -> 1.1.0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/hpx/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0/bin/hpxrun.py -h` got 0 exit code
- ran `/nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0/bin/hpxrun.py --help` got 0 exit code
- found 1.1.0 with grep in /nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0
- found 1.1.0 in filename of file in /nix/store/xg48bc9gkcq2hyk51hxy5s7x8l0s70r9-hpx-1.1.0
- directory tree listing: https://gist.github.com/377d8c673231332bb40acb55fed39e53

(cherry picked from commit e28170ccc8)
2018-04-12 08:19:00 +02:00
Jens Binkert
afee871189 openshift: 3.6.0 -> 3.9.0
(cherry picked from commit fbf29e5f55)
2018-04-12 08:19:00 +02:00
Corey O'Connor
6c29a6c95d opendylan: 2013.1 -> 2016.1pre
(cherry picked from commit 00823f016d)
2018-04-12 08:19:00 +02:00
Maximilian Bosch
0397525876 commandergenius: 1822release -> 2.2.0
The `1822-release` build breaks on Hydra, some days ago the stable
`2.2.0` release has been tagged on upstream.

It required some new build inputs (zlib, curl, SDL2_mixer, python3) and
some minor changes in the cmakeFlags and makeFlags for the build.

See https://hydra.nixos.org/build/71818713/log
See ticket #36453 and #31747

(cherry picked from commit d7894d022c)
2018-04-12 08:19:00 +02:00
Shea Levy
12cecfc2c3 nix-plugins: 4.0.2 -> 4.0.3
(cherry picked from commit 2a64482026)
2018-04-11 21:43:35 -04:00
Shea Levy
051c85a91a nix-plugins: 4.0.1 -> 4.0.2
(cherry picked from commit 74914dd075)
2018-04-11 18:42:52 -04:00
Will Dietz
f300713f36 numpy: fix on musl
(cherry picked from commit fda18caaaf2b58eea67ba4ee9e693ee9babe209a)
2018-04-11 14:45:15 -05:00
Will Dietz
1299a0b540 numpy: 1.14.0 -> 1.14.2
(cherry picked from commit 00b98624d93879e1c8c17bc5cfa268056afb5f8c)
2018-04-11 14:45:14 -05:00
Will Dietz
9e8aa535bb openblas: don't build w/openmp on musl
(cherry picked from commit 1531be41d08acf386ce155d619a6f5a569d828c5)
2018-04-11 14:45:14 -05:00
Shea Levy
2e04c58f67 nix-plugins: Backport 4.x series 2018-04-11 15:27:19 -04:00
Shea Levy
8667719f30 nixUnstable: Reinit at 2.0pre6137_e3cdcf89
(cherry picked from commit 0a9f34ad27)
2018-04-11 14:52:27 -04:00
Shea Levy
56a49d0aea Add setupcfg2nix and supporting infrastructure
(cherry picked from commit 0901b3e195)
2018-04-11 12:13:05 -04:00
Pascal Wittmann
22f212537f Switch suckless.org URLs to https 2018-04-11 15:09:51 +02:00
Michael Raskin
2569e48290 Merge pull request #38765 from taku0/flashplayer-29.0.0.140
flashplayer: 29.0.0.113 -> 29.0.0.140 [Critical security fixes]
(cherry picked from commit 896cc0847a)
2018-04-11 14:23:13 +02:00
Tim Steinbach
cc95cbed4a minikube: 0.25.2 -> 0.26.0
(cherry picked from commit cb7f774265)
2018-04-10 18:45:30 -04:00
Tim Steinbach
434490a4b4 htop: 2.1.0 -> 2.2.0
(cherry picked from commit ee4835add6)
2018-04-10 18:32:45 -04:00
Tim Steinbach
6e5dfe0817 docker-edge: 18.03 -> 18.04
(cherry picked from commit be93161af066de4bdfd211f0419cafb6da2acb8e)
2018-04-10 18:28:43 -04:00
Jörg Thalheim
1c52531bbe linuxPackages.perf: use prefix instead of DESTDIR
Otherwise the build system computes incorrect references and looks for
perf-core in /libexec. DESTDIR for normal buildsystems is never the
right choice for nixpkgs.

(cherry picked from commit 0e2b222c24)
2018-04-10 15:39:51 +01:00
Eelco Dolstra
cb4067b412 vmTools: Add crc32c_generic to the initrd
This is necessary due to a e2fsprogs update
(e6114781b0) that causes mke2fs to
enable a feature (metadata_csum) that depends on crc32c.

https://hydra.nixos.org/build/72636785
(cherry picked from commit 8787c131ed)
2018-04-10 14:32:04 +02:00
Eelco Dolstra
a3460acd73 Fix typo
(cherry picked from commit 7b539c0629)
2018-04-10 13:08:30 +02:00
Ryan Mulligan
f01a0e15b2 libuv: 1.19.1 -> 1.19.2
Semi-automatic update. These checks were performed:

- built on NixOS
- found 1.19.2 with grep in /nix/store/f45rl4z9a2rqd7hdhwnj9g831z1k4ilr-libuv-1.19.2
- found 1.19.2 in filename of file in /nix/store/f45rl4z9a2rqd7hdhwnj9g831z1k4ilr-libuv-1.19.2

cc "@cstrahan"

(cherry picked from commit 04ec090f6f)
2018-04-10 18:59:49 +08:00
adisbladis
d7d22a8c6f nodejs-9_x: 9.10.1 -> 9.11.1
(cherry picked from commit 1fcc23d2a1d06ef4b2dc7efe95a804b78c4ead77)
2018-04-10 18:59:48 +08:00
adisbladis
03cbd91a6d nodejs-9_x: 9.8.0 -> 9.10.1
(cherry picked from commit 357a2cc547)
2018-04-10 18:59:47 +08:00
adisbladis
6089f8e18f nodejs-9_x: 9.7.1 -> 9.8.0
(cherry picked from commit 03efbb01c6)
2018-04-10 18:59:46 +08:00
Fatih Altinok
3624a8f4f7 nodejs: 9.6.1 -> 9.7.1
(cherry picked from commit 399edfec52)
2018-04-10 18:59:45 +08:00
adisbladis
46ed995f1f nodejs-8_x: 8.10.0 -> 8.11.1
(cherry picked from commit 017fffc149)
2018-04-10 18:59:44 +08:00
adisbladis
c00bfc1cb6 nodejs-8_x: 8.9.4 -> 8.10.0
(cherry picked from commit a36ae7a685)
2018-04-10 18:59:43 +08:00
adisbladis
29f1290d89 nodejs-6_x: 6.13.1 -> 6.14.1
(cherry picked from commit 042c001481)
2018-04-10 18:59:43 +08:00
adisbladis
5a16d26bbd nodejs-6_x: 6.13.0 -> 6.13.1
(cherry picked from commit 0cadbb8416)
2018-04-10 18:59:42 +08:00
Jean-Baptiste Giraudeau
dcc85ff666 terraform_0_11: 0.11.5 -> 0.11.6
(cherry picked from commit d6e8371071)
2018-04-10 11:25:08 +01:00
zimbatm
a864266f95 terraform_0_11: 0.11.4 -> 0.11.5
(cherry picked from commit 4009338ff9)
2018-04-10 11:24:52 +01:00
Peter Hoeg
ad46d18f8b terraform: 0.11.3 -> 0.11.4
(cherry picked from commit 059f33c6de)
2018-04-10 11:24:52 +01:00
Jean-Philippe Braun
fc403a8d7e nextcloud: 13.0.0 -> 13.0.1
(cherry picked from commit ae3782b2fb)

fixes #38550
2018-04-10 10:40:14 +01:00
Ryan Mulligan
4dea3cf2f6 nextcloud-news-updater: 10.0.0 -> 10.0.1
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/.nextcloud-news-updater-wrapped -h` got 0 exit code
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/.nextcloud-news-updater-wrapped --help` got 0 exit code
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/.nextcloud-news-updater-wrapped -v` and found version 10.0.1
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/.nextcloud-news-updater-wrapped --version` and found version 10.0.1
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/nextcloud-news-updater -h` got 0 exit code
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/nextcloud-news-updater --help` got 0 exit code
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/nextcloud-news-updater -v` and found version 10.0.1
- ran `/nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1/bin/nextcloud-news-updater --version` and found version 10.0.1
- found 10.0.1 with grep in /nix/store/58kz8y29n2habv056d7iz20484rq87mr-nextcloud-news-updater-10.0.1
- directory tree listing: https://gist.github.com/ef3eb260a3fd46598a3b70c142c2ef2c

(cherry picked from commit a7046d5ecf)
2018-04-10 10:40:05 +01:00
Jörg Thalheim
023feb5fe6 linuxPackages.{zfs,spl}{Stable,Unstable}: 0.7.7 -> 0.7.8; 2018-04-04 -> 2018-04-10
(cherry picked from commit ad229677a3)
2018-04-10 08:08:32 +01:00
Michael Raskin
62658a37e3 libreoffice: wrap to set JAVA_HOME, SAL_USE_VCLPLUGIN and DBus session if not set
(cherry picked from commit 95a819c002)
2018-04-09 23:33:46 +02:00
Tim Steinbach
fecaa5491e sbt: 1.1.3 -> 1.1.4
(cherry picked from commit 83229813b3)
2018-04-09 17:05:42 -04:00
Jan Tojnar
03667476e3 gsmartcontrol: 0.8.7 → 1.1.3
Closes: https://github.com/NixOS/nixpkgs/issues/37444

(cherry picked from commit 9acdfbfd72)
2018-04-09 16:06:11 +02:00
Domen Kožar
1944dc7e70 xalanc: /usr -> /
(cherry picked from commit 2e0dfb49f7)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-04-09 14:29:12 +01:00
Tim Steinbach
40fd4903c2 sbt: 1.1.2 -> 1.1.3
(cherry picked from commit 3e88838f3f2fe4e56d10e5eb60d9d8b4c544fb17)
2018-04-09 08:56:50 -04:00
Okina Matara
61249b5de8 terraria-server: 1.3.1.1 -> 1.3.5.3 2018-04-09 08:52:09 +01:00
Matthew Justin Bauer
d74b169e6f Merge pull request #38521 from yesbox/nixos-18.03-backport
rclone: 1.39 -> 1.40
2018-04-08 21:37:03 -05:00
Tuomas Tynkkynen
06ba591a85 nixos/release.nix: Fix eval
ac3d9c3d13 merged some stuff renaming things without renaming all
the things.
2018-04-09 02:11:54 +03:00
Tim Steinbach
66b1cc8340 linux-copperhead: 4.15.15.a -> 4.15.16.a
(cherry picked from commit 099facb20a236d89c3224d097ab80b866d6369ed)
2018-04-08 19:10:07 -04:00
Tim Steinbach
f6dde140d8 linux: 4.15.15 -> 4.15.16
(cherry picked from commit dffe68b0d58f93c388bcdbf1b8182b02a4630e4f)
2018-04-08 19:09:53 -04:00
Tim Steinbach
638e3855eb linux: 4.14.32 -> 4.14.33
(cherry picked from commit 1acab367b41c98bb1e83cc1f8f3038720bbc2785)
2018-04-08 19:09:42 -04:00
Tim Steinbach
9fe9c07933 linux: 4.9.92 -> 4.9.93
(cherry picked from commit 93f1477067ed0a559ae9e8a8f78d57a2bfae911a)
2018-04-08 19:09:32 -04:00
Tim Steinbach
365bd6367f linux: 4.4.126 -> 4.4.127
(cherry picked from commit beecc3ff5400efcd60144a361f09ec56833924e1)
2018-04-08 19:09:20 -04:00
xeji
df3a740579 pythonPackages.kmsxx: fix build
gcc7 build fails with "internal compiler error", use gcc6 instead
by inheriting stdenv from pkgs.kmsxx

(cherry picked from commit 2c84e347ee)
2018-04-08 23:30:42 +02:00
Bastian Köcher
53daaf588c nvidia-x11: 390.25 -> 390.48
Also fixes missing symbol error with kernel 4.16.

(cherry picked from commit 5d2331e3c6)
2018-04-08 17:14:12 +01:00
Jonathan Curran
079a2ac469 psc-package v0.3.2-pre -> v0.3.2
v0.3.2 is released

(cherry picked from commit 7a510176c2)
2018-04-08 12:45:25 +01:00
Vladimír Čunát
39809e31d6 Merge branch 'release-18.03' into staging-18.03 2018-04-08 13:40:45 +02:00
Jörg Thalheim
065fd9645a webstorm: fix incorrect jre usuage
it tried to use its own jre, which is not patched

fixes #36943 #37328

(cherry picked from commit b9b08f8a09)
2018-04-08 12:37:11 +01:00
Issam Maghni
f578eaea94 jetbrainsjdk: 1036.1 ~> 1136.20 (build 181.4203)
(cherry picked from commit eff7a19d97)
2018-04-08 12:36:27 +01:00
Aleksey Kladov
63ebe889e3 jetbrains.webstorm: 2017.3.5 -> 2018.1
(cherry picked from commit 1a870dfe99)
2018-04-08 12:36:26 +01:00
Aleksey Kladov
022b17cb68 jetbrains.pycharm-professional: 2017.3.4 -> 2018.1
(cherry picked from commit 89a16a152c)
2018-04-08 12:36:26 +01:00
Aleksey Kladov
5e0cde94af jetbrains.pycharm-community: 2017.3.4 -> 2018.1
(cherry picked from commit a55f0e65c7)
2018-04-08 12:36:26 +01:00
Aleksey Kladov
dd41020ab7 jetbrains.phpstorm: 2017.3.5 -> 2017.3.6
(cherry picked from commit 62d0a0685d)
2018-04-08 12:36:26 +01:00
Aleksey Kladov
ed6d46e9ae jetbrains.idea-ultimate: 2017.3.5 -> 2018.1
(cherry picked from commit 672c98ded0)
2018-04-08 12:36:25 +01:00
Aleksey Kladov
223a76f58e jetbrains.idea-community: 2017.3.5 -> 2018.1
(cherry picked from commit 0215ae062d)
2018-04-08 12:36:25 +01:00
Aleksey Kladov
54c1cbb56a jetbrains.goland: 2017.3.3 -> 2018.1
(cherry picked from commit 2bddfb16d5)
2018-04-08 12:36:25 +01:00
Aleksey Kladov
a455594465 jetbrains.clion: 2017.3.4 -> 2018.1
(cherry picked from commit b2491ba52d)
2018-04-08 12:36:25 +01:00
Averell Dalton
6d6867cd3a jetbrains.clion: 2017.3.3 -> 2017.3.4
(cherry picked from commit 33e6ef1790)
2018-04-08 12:36:24 +01:00
Averell Dalton
946a35f178 jetbrains.datagrip: 2017.3.5 -> 2017.3.7
(cherry picked from commit 89cd01dabd)
2018-04-08 12:36:24 +01:00
Averell Dalton
af84eb9e10 jetbrains.goland: 2017.3.2 -> 2017.3.3
(cherry picked from commit be827e70c3)
2018-04-08 12:36:24 +01:00
Averell Dalton
50126f54fe jetbrains.idea-community: 2017.3.4 -> 2017.3.5
(cherry picked from commit 09b05ede82)
2018-04-08 12:36:24 +01:00
Averell Dalton
75b30227fe jetbrains.idea-ultimate: 2017.3.4 -> 2017.3.5
(cherry picked from commit 413f63c512)
2018-04-08 12:36:24 +01:00
Averell Dalton
befa6c515f jetbrains.phpstorm: 2017.3.4 -> 2017.3.5
(cherry picked from commit 9438b02411)
2018-04-08 12:36:23 +01:00
Averell Dalton
eb7dc8e8a0 jetbrains.pycharm-community: 2017.3.3 -> 2017.3.4
(cherry picked from commit a144405dd9)
2018-04-08 12:36:23 +01:00
Averell Dalton
8458aae045 jetbrains.pycharm-professional: 2017.3.3 -> 2017.3.4
(cherry picked from commit 4360ab458f)
2018-04-08 12:36:23 +01:00
Averell Dalton
b157efcd03 jetbrains.ruby-mine: 2017.3.2 -> 2017.3.3
(cherry picked from commit 10909f0916)
2018-04-08 12:36:23 +01:00
Averell Dalton
1dee074f72 jetbrains.webstorm: 2017.3.4 -> 2017.3.5
(cherry picked from commit 0cf4d76897)
2018-04-08 12:36:22 +01:00
Vladimír Čunát
504f962a20 Merge #38108: python3: 3.6.4 -> 3.6.5 2018-04-08 13:35:56 +02:00
Jörg Thalheim
dcae46f469 zfsLegacyCrypto: set incompatibleKernelVersion to 4.16
(cherry picked from commit 692e0b5f3a)
2018-04-08 12:08:21 +01:00
Samuel Dionne-Riel
ec77d8b0e0 doc: Fixes in-text callouts and screen callouts.
(cherry picked from commit d807aa1c8d)
2018-04-08 11:58:34 +01:00
aszlig
7361cadca8 Increase max group name length to 32 characters
With #36556, a check was introduced to make sure the user and group
names do not exceed their respective maximum length. This is in part
because systemd also enforces that length, but only at runtime.

So in general it's a good idea to catch as much as we can during
evaluation time, however the maximum length of the group name was set to
16 characters according groupadd(8).

The maximum length of the group names however is a compile-time option
and even systemd allows more than 16 characters. In the mentioned pull
request (#36556) there was already a report that this has broken
evaluation for people out there.

I have also checked what other distributions are doing and they set the
length to either 31 characters or 32 characters, the latter being more
common.

Unfortunately there is a difference between the maximum length enforced
by the shadow package and systemd, both for user name lengths and group
name lengths. However, systemd enforces both length to have a maximum of
31 characters and I'm not sure if this is intended or just a off-by-one
error in systemd.

Nevertheless, I choose 32 characters simply to bring it in par with the
maximum user name length.

For the NixOS assertion however, I use a maximum length of 31 to make
sure that nobody accidentally creates services that contain group names
that systemd considers invalid because of a length of 32 characters.

Signed-off-by: aszlig <aszlig@nix.build>
Closes: #38548
Cc: @vcunat, @fpletz, @qknight
(cherry picked from commit 99ba1cb424)
2018-04-08 12:52:34 +02:00
Taahir Ahmed
6c3618690e nomacs: 3.6.1 -> 3.8.1
Fixes a build issue introduced by a Qt5 upgrade [1], and lets us drop
our installation-path patch.

[1] https://github.com/nomacs/nomacs/issues/203

(cherry picked from commit 642bd5fe92)
2018-04-08 11:36:54 +01:00
Jörg Thalheim
41055cc047 openmvs-unstable: 2017-05-01 -> 2018-05-26
fix build

(cherry picked from commit 1e9e19b2aa)
2018-04-08 10:36:58 +01:00
Kevin Cox
8faa9c2edc rust: Allow setting cargoSha256 to null.
Setting the hash to null is a convenient way to bypass the hash check
while developing. It looks like the ability to do this was inadvertently
removed while adding vendor directory support.

This still checks that the user is explicitly setting the value but
allows null as a valid option.

(cherry picked from commit 4499513e54)
2018-04-08 09:09:46 +01:00
Wout Mertens
2d039bb0c3 google-compute-image: provide correct MTU
(cherry picked from commit fc6ab8dfa7)
2018-04-08 09:08:25 +01:00
Robert Hensing
f5f89dd97c linuxPackages_custom: fix missing argument and add test
The required argument 'hostPlatform' was missing from linuxPackages_custom's
call to linuxManualConfig.

In order to prevent this in the future, this commit adds
linuxPackages_custom_tinyconfig_kernel so linuxPackages_custom gets tested.

This also adds linuxConfig, to derivate default linux configurations
via make defconfig, make tinyconfig, etc.

Closes #38035.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2018-04-07 16:44:44 -05:00
Alexandre Peyroux
4bf9658900 resilio-sync: 2.5.2 -> 2.5.12
(cherry picked from commit 26f450f5f6)
2018-04-07 16:44:44 -05:00
Ryan Mulligan
ae2266b0fb libsForQt5.libopenshot: 0.1.7 -> 0.1.9
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.1.9 with grep in /nix/store/nrg54a2kxlz3r8c4wf2if5vzq0y452fs-libopenshot-0.1.9
- found 0.1.9 in filename of file in /nix/store/nrg54a2kxlz3r8c4wf2if5vzq0y452fs-libopenshot-0.1.9
- directory tree listing: https://gist.github.com/a521e923923cd5ac4f188b8dede33a2e
2018-04-07 10:55:19 -05:00
Pascal Wittmann
3fa32939ab spin: switch back to dropbox mirror
see #38542 for details

(cherry picked from commit 95ece9efe5)
2018-04-07 17:49:46 +02:00
Pascal Wittmann
afddafa731 spin: 6.4.7 -> 6.4.8
(cherry picked from commit ed3ad74a48)
2018-04-07 17:49:24 +02:00
Pascal Wittmann
315cd0159b accountsservice: 0.6.45 -> 0.6.46 2018-04-07 16:55:05 +02:00
Michael Weiss
d306abafcd wlroots,rootston: Mark them as broken until the first stable release
Upstream requested that we remove these packages until the first stable
release. More details are in #38344. This isn't ideal but it seems like
the best solution for now.
Close #38344.

(cherry picked from commit 9db699e4a3)
Reason: Disable these two packages before anyone starts using them.
Especially on the stable branch (NixOS 18.03) these packages are of no
use (due to the lack of updates) and might result in unwanted upstream
bug reports.
2018-04-07 01:58:13 +02:00
John Ericson
7060c5261e Merge pull request #37337 from obsidiansystems/meta-check-18.03
lib: Fix #30902 on 18.03
2018-04-06 16:20:02 -04:00
Dmitry Kalinkin
8244fb16eb libevent: fix install_name on darwin
(cherry picked from commit 3868973c41)
2018-04-06 20:20:01 +02:00
Dmitry Kalinkin
9e96a696b9 leveldb: fix install_name on darwin
(cherry picked from commit c639649ef0)
2018-04-06 20:20:00 +02:00
Dmitry Kalinkin
b1b56b5e07 mesos: fix on darwin by disabling java interface
(cherry picked from commit e120915248)
2018-04-06 20:19:55 +02:00
Michael Weiss
e8853782a0 neomutt: Fix the path to the auxiliary tools
This path changed from $out/lib/neomutt to $out/libexec/neomutt.

(cherry picked from commit 80faa73fc0)
Reason: This fix is required to use OpenPGP encryption (via GnuPG) in
NeoMutt with the default gpg.rc [0]. (When using crypt_use_gpgme this
fix isn't required.)

[0]: 32dfd7baf3/contrib/gpg.rc
2018-04-06 19:54:33 +02:00
Herwig Hochleitner
c1c70849ad vimb-unwrapped: depend on generic webkitgtk instead of 218x
Currently ahead of the upgrade to webkitgtk220x, this will make future
webkitgtk maintenance easier.

WebkitGTK, from 2.6 onwards has maintained API stability and will
continue to do so, as opposed to the jump from 2.4 to 2.6

cc @rickynils

(cherry picked from commit 80582c600d)
2018-04-06 13:48:14 -04:00
Herwig Hochleitner
4bbaec1b39 wxwidgets: depend on generic webkitgtk instead of 218x
Currently ahead of the upgrade to webkitgtk220x, this will make future
webkitgtk maintenance easier.

WebkitGTK, from 2.6 onwards has maintained API stability and will
continue to do so, as opposed to the jump from 2.4 to 2.6

(cherry picked from commit 0b8d7fb16e)
2018-04-06 13:48:04 -04:00
Daniel Fullmer
9f3cfef619 rclone: 1.39 -> 1.40 2018-04-06 19:12:48 +02:00
Jörg Thalheim
b47c503fad zfsUnstable: fix evaluation of error message
(cherry picked from commit 0af5b254ab)
2018-04-06 16:19:01 +01:00
Peter Simons
c194065fa4 Merge pull request #38442 from ElvishJerricco/backport-callhackage-deriver-18.03
Backport: callHackage: Keep deriver, like callCabal2nix
2018-04-06 16:20:33 +02:00
Rob Vermaas
41f3a4e003 julia: remove wrapper from julia binaries, in stead
symlink shared libraries from LD_LIBRARY_PATH into lib/julia,
as using a wrapper with LD_LIBRARY_PATH causes segmentation
faults when program returns an error:

 $ julia -e 'throw(Error())'

only applied for 0.6, which is the current julia version. Will
see if we can remove the older versions in master.
2018-04-06 14:18:16 +02:00
Jörg Thalheim
97de18f5aa zfsUnstable: mark correct zfs version as incompatible
(cherry picked from commit e7f2b7692b)
2018-04-06 12:10:48 +01:00
Patrick Hilhorst
0d633d63b7 atom : 1.25.0 -> 1.25.1
(cherry picked from commit e7a352f96f)
2018-04-06 11:54:51 +01:00
Rob Vermaas
748d96ffa3 Update create-gce.sh script. Set default option for GCE images to disable host key replacement by service. 2018-04-06 10:56:56 +02:00
Tim Engler
207b429e4b nixos/lxqt: enable upower if config.powerManagement is enabled (#38318)
(cherry picked from commit d488a9dc7a)
2018-04-06 08:50:47 +01:00
Corey O'Connor
0504cbe4e7 godot: add application metadata and man page to share.
(cherry picked from commit 39db8ac1d8)
2018-04-06 00:18:33 +01:00
Herwig Hochleitner
6aea1df2c9 woff2: propagate brotli build input
brotli is a runtime dependency, as per pc files in woff2.dev

cc @hrdinka

(cherry picked from commit 86fbdfdd4c)

https://github.com/NixOS/nixpkgs/pull/37050
2018-04-05 23:30:37 +02:00
Herwig Hochleitner
cae87f6297 webkitgtk: use enchant instead of enchant2
see https://github.com/NixOS/nixpkgs/pull/37050
2018-04-05 23:26:12 +02:00
Tor Hedin Brønner
4aeff6dbeb webkitgtk: fix non-deterministic build failure
The build sometimes fails, mostly when using a single core. This is a simple
stopgap, see upstream bug: https://bugs.webkit.org/show_bug.cgi?id=183788

(cherry picked from commit 5058529572)

see https://github.com/NixOS/nixpkgs/pull/37050
2018-04-05 23:20:26 +02:00
Jan Tojnar
88c5eeee72 webkitgtk220x: cleanup
(cherry picked from commit 9fa2844784)

see https://github.com/NixOS/nixpkgs/pull/37050
2018-04-05 23:20:08 +02:00
Herwig Hochleitner
ed6c49f05c webkitgtk: patch shebangs in postPatch
this eliminates a build error due to /bin/bash in build scripts

(cherry picked from commit 3a3ea1a69d)

see https://github.com/NixOS/nixpkgs/pull/37050
2018-04-05 23:18:01 +02:00
Herwig Hochleitner
d9a2552420 webkitgtk: 2.18 -> 2.20
(cherry picked from commit 562ae56056)

see https://github.com/NixOS/nixpkgs/pull/37050
2018-04-05 23:17:53 +02:00
Jan Tojnar
cb285ddd1f gnome3.webkitgtk: fix build
(cherry picked from commit f1b19d3a20)

see https://github.com/NixOS/nixpkgs/pull/37050
2018-04-05 23:17:34 +02:00
xeji
96f5d52c93 shogun: disable paralllel building
... to avoid sporadic failures
2018-04-05 22:53:34 +02:00
Johannes Lötzsch
41a9722917 mate/mate-screensaver: fixed unixAuth
Without this fix, it's not possible to unlock the mate-screensaver.

(cherry picked from commit 1ab3736146)
2018-04-05 21:02:58 +01:00
Daiderd Jordan
0d53924d70 sg3_utils: mark linux only
(cherry picked from commit 1a9423ad6d)
2018-04-05 21:37:20 +02:00
Daiderd Jordan
a2a6f6bb5a schroedinger: mark linux only
(cherry picked from commit df776afc3d)
2018-04-05 21:37:19 +02:00
Daiderd Jordan
5019bfc50b s6-rc: mark linux only
(cherry picked from commit cc0fc1724b)
2018-04-05 21:37:19 +02:00
Daiderd Jordan
41ba9036cf pure-ftpd: mark linux only
(cherry picked from commit 32227af3a6)
2018-04-05 21:37:19 +02:00
Daiderd Jordan
283c0c2df3 posterazor: mark linux only
(cherry picked from commit f6cf8e3426)
2018-04-05 21:37:18 +02:00
Daiderd Jordan
086c45ce25 openvdb: mark linux only
(cherry picked from commit 7053b097de)
2018-04-05 21:37:18 +02:00
Daiderd Jordan
04aa4ef2ee opensmtpd-extras: mark linux only
(cherry picked from commit 2483f218cd)
2018-04-05 21:37:18 +02:00
Daiderd Jordan
3529de3e7a offrss: mark linux only
(cherry picked from commit b0894c42ea)
2018-04-05 21:37:17 +02:00
Daiderd Jordan
2b263985a0 mtx: mark linux only
(cherry picked from commit 73a3e39c92)
2018-04-05 21:37:17 +02:00
Daiderd Jordan
0e3aa01a29 mate-icon-theme: mark linux only
(cherry picked from commit 318d8fea44)
2018-04-05 21:37:17 +02:00
Daiderd Jordan
58a57d0505 mate-calc: mark linux only
(cherry picked from commit bdf28cc2b1360dbc202bd2106fa20bbe85fe1b91)
(cherry picked from commit a45ada6614)
2018-04-05 21:37:17 +02:00
Daiderd Jordan
d2351763af jgmenu: mark linux only
(cherry picked from commit 18bc2aeadb)
2018-04-05 21:37:16 +02:00
Daiderd Jordan
b071803bb4 ipmitool: mark linux only
(cherry picked from commit 7fea3e2acc)
2018-04-05 21:37:16 +02:00
Daiderd Jordan
504b9ac6b6 icewm: mark linux only
(cherry picked from commit 3890c471de)
2018-04-05 21:37:16 +02:00
Daiderd Jordan
57c7013838 htpdate: mark linux only
(cherry picked from commit 2174683e0c)
2018-04-05 21:37:15 +02:00
Daiderd Jordan
c4cbc0fba4 herqq: mark linux only
(cherry picked from commit 3030252b1e)
2018-04-05 21:37:15 +02:00
Daiderd Jordan
9c0892ac22 guile-fibers: mark linux only
(cherry picked from commit 43a686f4c7)
2018-04-05 21:37:15 +02:00
Daiderd Jordan
8b60be0f00 gstreamermm: mark linux only
(cherry picked from commit 8a4ed1b3c2)
2018-04-05 21:37:14 +02:00
Daiderd Jordan
9bb656b8db globalplatform: mark linux only
(cherry picked from commit 3642e1c581)
2018-04-05 21:37:14 +02:00
Daiderd Jordan
3987110cb2 gkrellm: mark linux only
(cherry picked from commit 1fe1b9c8c1)
2018-04-05 21:37:14 +02:00
Daiderd Jordan
dc86c7ec24 focuswriter: mark linux only
(cherry picked from commit 13139fccc6)
2018-04-05 21:37:13 +02:00
Daiderd Jordan
91cab9ec5f emojione: mark linux only
(cherry picked from commit d152039927)
2018-04-05 21:37:13 +02:00
Daiderd Jordan
d9f57d50bf dlib: mark linux only
(cherry picked from commit 9b322eb45d)
2018-04-05 21:37:13 +02:00
Daiderd Jordan
82c6d92c21 catfish: mark linux only
(cherry picked from commit 12e87a1ffb)
2018-04-05 21:37:13 +02:00
Daiderd Jordan
4ea4af71e8 caffe2: mark linux only
(cherry picked from commit a378141684)
2018-04-05 21:37:12 +02:00
Daiderd Jordan
ac05363f5b axel: mark linux only
(cherry picked from commit c195e52df5)
2018-04-05 21:37:12 +02:00
Jörg Thalheim
c0a0b2d917 Merge pull request #38359 from pbogdan/telegram-gapps-hook
[18.03] tdesktop: use wrapGAppsHook
2018-04-05 19:12:57 +01:00
John Wiegley
6c8abecbef Allow some packages to build on darwin as well
(cherry picked from commit 80e730c9a4)
2018-04-05 19:23:42 +02:00
Andrew Childs
489a14add9 apg: Fix build on case insensitive filesystems
(cherry picked from commit 7d55577852)
2018-04-05 19:13:36 +02:00
Andrew Childs
d8a173a398 apg: Widen meta.platforms from linux to unix
(cherry picked from commit b206311c80)
2018-04-05 19:13:17 +02:00
Giulio Eulisse
46adfec9f9 remake: enable on darwin
(cherry picked from commit 606a945f64)
2018-04-05 15:25:45 +02:00
xeji
c2147068b1 tome4: aarch64 not supported
(cherry picked from commit 6a49d53392)
2018-04-05 15:20:16 +02:00
xeji
f17fa49e71 tome4: disable parallel build
... it caused sporadic build failures

(cherry picked from commit 8a65d19e21)
2018-04-05 15:20:16 +02:00
Graham Christensen
4b4bbce199 nixos docs: syntax highlight
- Rectifies diverging CSS by combining
   nixos/nixpkgs docs CSS
 - Moves our custom Highlight.js loader in to
   the hljs package
 - Switches the nixos docs to use SVG
   callouts too

(cherry picked from commit 8f33464ca7)
2018-04-05 08:39:27 -04:00
Joachim Schiele
0a2663e1d4 nixos/dhcp: fix permissions of statedir
(cherry picked from commit 7be79f22f2)
2018-04-05 14:12:30 +02:00
Rob Vermaas
ac3437aa06 gce: needs bigger diskSize 2018-04-05 12:09:23 +02:00
Rob Vermaas
e5a4fb31bd ec2-amis.nix: add 18.03 images 2018-04-05 11:54:55 +02:00
Linus Heckemann
89472dce77 18.03 release notes: fix typo
(cherry picked from commit 0594acc6aa)
2018-04-05 11:01:50 +02:00
Daiderd Jordan
847c797dd2 monero: fix darwin build
(cherry picked from commit 4df34f803c)
2018-04-05 10:47:55 +02:00
Jörg Thalheim
366df2cb6b monero: actually wants CoreData instead of monero-gui
(cherry picked from commit b9e5aeaf79)
2018-04-05 10:47:07 +02:00
rnhmjoj
846e3623e3 monero-gui: 2018-03-31 -> 0.12.0.0
(cherry picked from commit 650aec314f)
2018-04-05 10:44:11 +02:00
Peter Hoeg
b073b2d375 syncthing: 0.14.45 -> 0.14.46
(cherry picked from commit c011843b0c)
2018-04-05 10:43:55 +02:00
volth
df66f3111f network-interfaces-scripted: wlanInterfaces have .device, no "${dev}-netdev.service"
(cherry picked from commit dd9f776509)
2018-04-05 10:43:43 +02:00
xeji
becbe4dbe1 python27Packages.rootpy: fix build (tests)
run tests properly, skip problematic tests

(cherry picked from commit 837dd2e371)
2018-04-05 00:29:28 +02:00
Will Fancher
312a8b4649 callHackage: Keep deriver, like callCabal2nix 2018-04-04 17:40:19 -04:00
John Ericson
ac3d9c3d13 Merge remote-tracking branch 'upstream/release-18.03' into meta-check-18.03 2018-04-04 15:28:17 -04:00
John Ericson
df52863076 top-level: Move comma for stylistic consistency
(cherry picked from commit abf27609c6)
2018-04-04 15:27:37 -04:00
John Ericson
e7cc45429d haskell-generic-builder: Default to window + unix platforms,
Since GHC is a cross compiler, it's perfectly possible to make haskell
binaries on platforms without GHCs. `windows ++ unix` seems good enough
for now.

Also don't default `hydraPlatforms` to `platforms`. The former must be a
list of systems (strings), but the latter is a list of systems or
patterns.

(cherry picked from commit 65e24f22e6)
2018-04-04 15:27:37 -04:00
John Ericson
3edb2b8e29 libatomic_ops: Allow Building on Windows too
(cherry picked from commit e49c14c35b)
2018-04-04 15:27:37 -04:00
John Ericson
6afaa74826 lib: Add lib.platforms.windows
(cherry picked from commit d9a1800239)
2018-04-04 15:27:37 -04:00
John Ericson
7ca53e2a73 lib: Make platforms.all actually match all platforms
Otherwise obscure cross-compilations are hampered. `all` breaks all but
the initial derivation (which we can't even write yet) in an open world
setting however, so we really shouldn't have it.

(cherry picked from commit 3c8ae01a45)
2018-04-04 15:27:37 -04:00
Daiderd Jordan
4833d90e96 darwin-frameworks: cleanup
(cherry picked from commit 9f516c23c5)
2018-04-04 19:05:20 +02:00
Periklis Tsirakidis
a835759e18 ngrok: enable darwin build
(cherry picked from commit 592ce9d930)
2018-04-04 19:01:48 +02:00
Michishige Kaito
3aa937505b factorio: 16.24 -> 16.36
Update all factorio packages to their latest version. The fact that the
experimental version is lower than the alpha version is just because
they haven't made an experimental release after the last stable.

(cherry picked from commit f56b733e31)
2018-04-04 17:03:57 +01:00
Michishige Kaito
68ddf22fb0 Add missing package factorio-headless-experimental
All combinations of headless/alpha and stable/experimental were present,
except for this one.

(cherry picked from commit ff20c6c765)
2018-04-04 17:03:54 +01:00
Corey O'Connor
6efb3d2b37 firmware-linux-nonfree: Update SHA and add rev to prevent breakage on future commits.
(cherry picked from commit fccddb2556)
2018-04-04 16:55:36 +01:00
Jörg Thalheim
1196096063 linuxPackages.zfsUnstable: 2018-02-02 -> 2018-04-04
(cherry picked from commit 41958e5d2b)
2018-04-04 16:51:40 +01:00
Jörg Thalheim
d1a12429b4 linuxPackages.splUnstable: 2018-01-24 -> 2018-03-09
(cherry picked from commit 28ba64c433)
2018-04-04 16:51:40 +01:00
Tim Steinbach
7177defdf1 openldap: Fix test
(cherry picked from commit 5fbf9dbf9b)
2018-04-04 18:39:07 +03:00
Tuomas Tynkkynen
b0ca63cf79 nixos/tests/openldap: Fix name
(cherry picked from commit bbc80227ab)
2018-04-04 18:33:05 +03:00
xeji
cb1b28f352 mailutils: disable parallel building
to avoid sporadic build failures

(cherry picked from commit b913e36ab9)
2018-04-04 18:22:06 +03:00
Tuomas Tynkkynen
046f49dadc gcc45: Not supported on aarch64
https://hydra.nixos.org/build/70699663

This package is already dropped on master, after the 18.03 cut-off.
2018-04-04 18:18:19 +03:00
Tuomas Tynkkynen
4b07fbd7b7 gsl: Disable tests on aarch64
https://hydra.nixos.org/build/70700906

I opened an upstream bug, but their bug system is e-mail based and I
haven't got a single reply which contains an web link :(

(cherry picked from commit af16d71e88)
2018-04-04 16:55:22 +03:00
Maximilian Bode
386e8324d3 kubernetes: add kubectl zsh completion
(cherry picked from commit 357760ad25)
2018-04-04 12:45:32 +01:00
nyanloutre
fa4759862e transmission: settings doc location changed
(cherry picked from commit 172ca5884b)
2018-04-04 12:04:43 +01:00
Silvan Mosberger
ac6a68de06 xburst-tools: Fix build
(cherry picked from commit 4645b12e03)
2018-04-04 12:02:52 +01:00
Jörg Thalheim
dabd73ae52 lightstep-tracer-cpp: mark as broken
needs an update + https://github.com/opentracing/opentracing-cpp

(cherry picked from commit eea21b2835)
2018-04-04 11:58:46 +01:00
Andreas Rammhold
41164d94ab go_1_9: 1.9.4 -> 1.9.5
This is a maintenance bump of the golang 1.9 version.

Within the updates are a few bug fixes including an (extended?)
fix for CVE-2018-7187 [1].

The complete changelog is available at the golang GitHub project [2].

[1] https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7187
[2] https://github.com/golang/go/issues?q=milestone%3AGo1.9.5

(cherry picked from commit e9f74b91d6)
2018-04-04 11:26:37 +01:00
Andreas Rammhold
ba49d72669 go_1_10: 1.10 -> 1.10.1
This updates go to the latest version of the golang 1.10 branch.
A few minor (but important) things are fixed in this version:

* CVE-2018-7187 - arbitrary code execution in `go get` (when used with
  --insecure) [1]
* Extended Key Usage verification in client certificate scenarios [3]
* a bunch of stability changes

The full list of changes can se been on GitHub [2] & [4].

[1] https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-7187
[2] https://github.com/golang/go/issues?q=milestone%3AGo1.10.1
[3] https://github.com/golang/go/issues/23884
[4] https://github.com/golang/go/issues/24563

(cherry picked from commit 568d30bb10)
2018-04-04 11:26:37 +01:00
Michael Raskin
d78695d195 nixos/tests.chromium: actually notice the tab crash
Argh, debugging NixOS tests takes forever…

(cherry picked from commit 1afb6e790a)
2018-04-04 12:19:19 +02:00
Piotr Bogdan
590320e107 libqtxdg: fix pkgconfig files
Without this change pkgconfig files contain incorrect values for libdir and
includedir in the form of:

prefix: /nix/store/...liblibqtxdg
libdir: ${prefix}//nix/store/.../libqtxdg/lib
includedir: ${prefix}//nix/store/.../libqtxdg/include
(cherry picked from commit a1fec88085)
2018-04-04 10:02:20 +01:00
Mario Rodas
e8982eb4b1 libtorrent: enable darwin build
(cherry picked from commit 88bb01481e)
2018-04-04 09:06:40 +01:00
Mario Rodas
1a7464ea49 xmlrpc-c: enable darwin build
(cherry picked from commit eb6a85e03d)
2018-04-04 09:06:40 +01:00
Vladimír Čunát
259db94930 README: 17.09 -> 18.03
(cherry picked from commit a308118d64)
2018-04-04 09:50:22 +02:00
Florian Klink
a74969256b svn-all-fast-export: update patch sha256, --prefix is now used
also, rename to svn-all-fast-export, but keep an alias to the old name

(cherry picked from commit 594130f39c)
2018-04-04 08:24:55 +01:00
Vladimír Čunát
120b013e0c 18.03 release notes: final edits
(cherry picked from commit 0bee079d97)
2018-04-04 09:02:31 +02:00
Tim Steinbach
e4cc8c1397 openjdk10: Use included cacerts
(cherry picked from commit a415963ef7464d7ce8f9c73684728625e83d8d63)
2018-04-03 19:18:25 -04:00
Franz Pletz
ca6b64ae7b nixos/version: fix nixops pre 1.6 compatibility
We should be able to deploy a NixOS 18.03 system with the current nixops
stable release. Some options were renamed, so instead of
`mkRenamedOptionModule` we introduce them as read-only interal options
that won't be rendered in the manual.

Only the options that are needed to make nixops evaluations succeed were
added.

This commit should probably be reverted after or before the 18.09 release,
depending on the nixops 1.6 release.

The user will not get the warning that these have been renamed but
this change is mentioned in the release notes.

Fixes #34253.

(cherry picked from commit 70c6f6572d)
2018-04-04 00:10:21 +02:00
Maximilian Bode
cbccde97dd tectonic: fix darwin build
(cherry picked from commit 8f2102def6)
2018-04-03 22:08:42 +02:00
Matthieu Coudron
d5c26dd063 qemu-vm: passing QEMU_NET_OPTS would fail
because of a change in #36850.
spotted by @jtojnar b7a2333ebe (commitcomment-28134992)

(cherry picked from commit 33b0ad83e9)
2018-04-03 17:57:17 +02:00
Samuel Dionne-Riel
251bc50e95 dbeaver: 4.3.3 -> 5.0.2
(cherry picked from commit a829977561)

Reason: backports the current revision of the software.
2018-04-03 22:01:43 +08:00
Piotr Bogdan
8fd0d2eeb9 tdesktop: use wrapGAppsHook 2018-04-03 00:09:31 +01:00
Tuomas Tynkkynen
43f1db5b0d nixos/sd-image-*: Raspberry Pi firmware no longer falls under unfree
It's just unfreeRedistributableFirmware now.

(cherry picked from commit 1e5cb384d5)
2018-04-03 00:13:17 +03:00
Tuomas Tynkkynen
c1c01c7848 raspberrypifw: Drop all non-firmware parts
They are now built from source in raspberrypi-tools.

(cherry picked from commit b59f9497aa)
2018-04-03 00:13:10 +03:00
Tuomas Tynkkynen
d93b08e6d2 raspberrypi-tools: Init at 2018-02-05
(cherry picked from commit 434722ba62)
2018-04-03 00:13:08 +03:00
Tuomas Tynkkynen
c51459026a nixos/release.nix: Add Hydra job for AArch64 SD image
Based on how ISO images are added to the release.

(cherry picked from commit 181e0675da)
2018-04-03 00:12:53 +03:00
Tuomas Tynkkynen
ac447b0524 nixos/sd-image: Make it more similar to iso-image.nix
- Add `imageName` and `imageBaseName` options similar to the `isoName`
  and `isoBaseName` options
- Make the filename of the iso match what iso-image.nix does
- Generate a nix-support/hydra-build-products like iso-image.nix does

(cherry picked from commit 4c21180a13)
2018-04-03 00:12:18 +03:00
Nikolay Amiantov
47caeb1272 nodePackages.parsoid: pin service-runner to 2.3.0
service-runner had a backwards incompatible update, and parsoid 0.9.0
doesn't work with current stable MediaWiki. Instead use as a source
a repository with 0.8.0 and pinned service-runner version.

(cherry picked from commit 37546be900)
2018-04-02 22:43:02 +03:00
Sébastien Maccagnoni
5bcdc86715 nodePackages vue-cli: init at 2.9.3 (#36391)
(cherry picked from commit e8ad790710)
2018-04-02 22:42:37 +03:00
Peter Romfeld
ecb39c43c2 nodePackages_8_x.swagger: init at 0.7.5
(cherry picked from commit 72e8987068)
2018-04-02 22:42:08 +03:00
Michael Raskin
d7aa359bcd Merge pull request #38331 from r-ryantm/auto-update/veracrypt
veracrypt: 1.21 -> 1.22
(cherry picked from commit cace5017cb)
2018-04-02 17:53:19 +02:00
Vladimír Čunát
bc632a2f55 Merge branch 'staging-18.03' into release-18.03 2018-04-02 17:13:45 +02:00
Vladimír Čunát
b3c938bfeb Merge: systemd: 238 -> 237 (downgrade!)
Let's be conservative and stay with version we've been testing
on unstable/master for a long time.
Discussion on https://github.com/NixOS/nixpkgs/commit/6b9771e4a
2018-04-02 12:14:59 +02:00
Vladimír Čunát
6684b3e160 Merge branch 'release-18.03' into staging-18.03 2018-04-02 12:14:42 +02:00
Vladimír Čunát
b2bc3db8f5 Revert "systemd: 237 -> 238"
This reverts commit 2d2ab94cd2.
2018-04-02 12:10:54 +02:00
Vladimír Čunát
b39bb9bead Revert "systemd: use stable tree"
This reverts commit 48856a91c0.
2018-04-02 12:10:51 +02:00
Vladimír Čunát
a6d00d0d8f nixos.tests.containers-imperative: fix impurity failure
I can't claim to fully understand this, but the change seems safe,
and it fixes the test on my machine.

(cherry picked from commit 75e4d3f2f0)
2018-04-02 11:43:02 +02:00
xeji
f0c713c813 pythonPackages.python-gnupg: 0.4.1 -> 0.4.2 2018-04-02 03:53:48 -05:00
xeji
9af18ff545 ixgbevf: 4.3.3 -> 4.3.4
4.3.3 didn't build with linux 4.15

(cherry picked from commit a7435092c0)
2018-04-02 03:44:03 -05:00
Austin Seipp
9331411a27 timescaledb: 0.6.0 -> 0.9.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
(cherry picked from commit 6ac2b11d13)
2018-04-02 03:44:03 -05:00
Vladimír Čunát
652a754cad Merge #38133: dwb: remove abandoned package
cf. https://wiki.archlinux.org/index.php/dwb

(cherry picked from commit 333245e852)
2018-04-02 10:04:27 +02:00
rnhmjoj
09bca91e3b monero-gui: 0.11.1.0 -> 2018-03-31
(cherry picked from commit e0fbaaa595)
2018-04-02 00:46:19 +02:00
rnhmjoj
ba239f468f monero: cleanup
(cherry picked from commit 6545d15020)
2018-04-02 00:46:19 +02:00
Piotr Bogdan
1dd960f66e buildGoPackage: use a separator when joining extraSrcPaths together
(cherry picked from commit d1fad21401)
2018-04-02 00:37:47 +02:00
xeji
f67968cdfa pythonPackages.root_numpy: fix build
checkPhase must use nosetest

(cherry picked from commit ebd4d38651)
2018-04-02 00:33:25 +02:00
xeji
79910a4452 pythonPackages.smart_open: fix build, 1.5.6 -> 1.5.7
(cherry picked from commit 3ea8574f17)
2018-04-02 00:33:24 +02:00
Franz Pletz
27974ed369 nixos/unbound: don't fail on root trust anchor updates
Exit code on updates is 1 which makes the inital start of unbound fail.

(cherry picked from commit 35f474d61d)
2018-04-01 23:57:43 +02:00
xeji
da36dfff14 pythonPackages.imbalanced-learn: 0.3.2 -> 0.3.3, fix build
minor bump, fix tests, move to development/python-modules

(cherry picked from commit 6b2bc4b5d1)
2018-04-01 11:13:21 +02:00
Vladimír Čunát
154e0a254a knot-resolver: fix /bin/sh impurity
Manifestation in this case: ./scripts/embed-lua.sh: line 4: alias: not found

(cherry picked from commit 366ae3dfe0)
2018-04-01 10:53:53 +02:00
Johannes Lötzsch
829d2cdb5c monitoring-plugins: fix typo in meta (#38259)
(cherry picked from commit 2e566aaf95)
2018-04-01 10:53:52 +02:00
Dan Lidral-Porter
021ee7d93b gflags: build on case-insensitive FSs, add meta
Darwin machines come with a case-insensitive filesystem by default. The
gflags package's source contains a file 'BUILD' and the build process
attempts to create a directory called 'build', which fails on
case-insensitive filesystems.

Add a prePatch hook to rename the BUILD file (which is for use with an
unrelated build tool) to something that doesn't conflict with the
'build' directory. This hook allows this derivation to be built on
case-insensitive filesystems.

Add metadata to the derivation because previously it had none.

(cherry picked from commit 66bbee3b81)
2018-04-01 09:24:38 +02:00
Tim Steinbach
b8edfed0e2 linux-copperhead: 4.15.14.a -> 4.15.15.a
(cherry picked from commit 2dfaf6992c)
2018-03-31 17:17:45 -04:00
Tim Steinbach
311dcc7462 linux: 4.15.14 -> 4.15.15
(cherry picked from commit 32e47b19f2)
2018-03-31 17:17:18 -04:00
Tim Steinbach
e54a063017 linux: 4.14.31 -> 4.14.32
(cherry picked from commit c8e2312c88)
2018-03-31 17:17:09 -04:00
Tim Steinbach
585aa0e9ee linux: 4.9.91 -> 4.9.92
(cherry picked from commit 804789e49b)
2018-03-31 17:17:00 -04:00
Tim Steinbach
8039a49f1e linux: 4.4.125 -> 4.4.126
(cherry picked from commit b9bde5bc03)
2018-03-31 17:16:51 -04:00
Daiderd Jordan
96ccbe16ee gnumake: mark head variant lowPrio
Fixes #38257

(cherry picked from commit 86705445dc)
2018-03-31 23:01:01 +02:00
Robert Schütz
a2c57c5336 pythonPackages.nipype: enable tests
(cherry picked from commit ee1896d63d)
2018-03-31 21:12:41 +02:00
Maximilian Bosch
a7c0fdbc9e pythonPackage.nipype: fix build
`pythonPackages.prov` has been bumped to `1.5.2`, however `nipype`
pinned `prov` to `1.5.0`. Patching `nipype/info.py` fixes this issue by
bumping to the current `prov` version in nixpkgs.

See https://hydra.nixos.org/build/71817962/log
See ticket #36453

(cherry picked from commit db0fa06fce)
2018-03-31 21:12:41 +02:00
Maximilian Bosch
97afec420e frescobaldi: 2.0.16 -> 3.0.0; fix build
3.0.0 works with Python 3 and QT5 (proivded by pyqt5). These fixes are
another step towards #32883 by getting rid of the unused poppler-qt4.

See https://hydra.nixos.org/build/71816154/log
See ticket #36453

(cherry picked from commit 545495b132)
2018-03-31 17:29:04 +02:00
Maximilian Bosch
29a6d29e66 pythonPackages.poppler-qt5: init at 0.24.2
related to #32883

(cherry picked from commit 8446cd9c32)
2018-03-31 17:28:59 +02:00
Maximilian Bosch
d798fa02f9 pythonPackages.python-ly: init at 0.9.5
(cherry picked from commit d50943ad46)
2018-03-31 17:28:53 +02:00
Maximilian Bosch
cde1f31f28 pythonPackages.mrbob: fix build
Tests broke on Hydra as the `checkPhase` wasn't configured properly. By
explicitly relying on `nosetests` and injecting `LC_ALL` into the
`checkPhase` the tests work again.

The license (bsd3) according to `LICENSE` distributed with the upstream
package wasn't specified in the meta section which could've caused legal
issues.

The expression has been moved into its own file to reduce the length and
complexity of `pkgs/top-level/python-packages.nix`.

See https://hydra.nixos.org/build/70689499/log
See #36453

(cherry picked from commit 9215e03e17)
2018-03-31 17:05:50 +02:00
Joachim Schiele
0a224fe280 user/group assertion to not exceed the 32 character limit
(cherry picked from commit 1b0cb040d9)
(original PR: #36556)
2018-03-31 14:29:14 +02:00
Maxime Dénès
834d892989 psc-package: 0.2.5 -> 0.3.2-pre
Note: the previous version was not building due to outdated upstream
dependencies.

(cherry picked from commit 1e1839239c)
Signed-off-by: Domen Kožar <domen@dev.si>
2018-03-31 10:43:20 +01:00
Symphorien Gibol
7d9e35afc2 giac: fix url
the previous url was a moving target and was updated at each point
release. Use a frozen source instead.

(cherry picked from commit 262fff26ed)
2018-03-30 22:58:44 +02:00
Vladimír Čunát
0c79da12a3 cups: fix patch download without a rebuild
One needs to specify git commit to make the fetch always work.
Close #38113.

(cherry picked from commit 514e3e8a07)
2018-03-30 21:35:41 +02:00
Silvan Mosberger
efb1868bba tlspool: 20170123 -> 20180227 and fix
(cherry picked from commit 7ffbbd334f)
2018-03-30 21:28:05 +02:00
Vladimír Čunát
1de51da824 dhcpcd: fix /bin/sh impurity
The usual error during configuration:
syntax error: you disabled math support for $((arith)) syntax

(cherry picked from commit cb196f490e)
2018-03-30 21:24:21 +02:00
Dmitry Kalinkin
2013114be0 rivet: 2.6.0 -> 2.6.0
upstream just replaced the tarball with a new version without bumping anything
2018-03-30 20:22:51 +01:00
Tor Hedin Brønner
2bbd0df63a nix-bash-completions: 0.6.4 -> 0.6.5 2018-03-30 19:08:50 +02:00
Pascal Wittmann
43106ec955 nzbget: 19.0 -> 19.1 2018-03-30 18:49:24 +02:00
Domen Kožar
11238ffbe1 btrfs-progs: 4.14.1 -> 4.15.1 2018-03-30 14:21:43 +01:00
Piotr Bogdan
0d91583166 ppp: fix build with newer kernel headers
The package would build but with some components missing, see
https://github.com/NixOS/nixpkgs/issues/37926 and
https://hydra.nixos.org/build/70939248/nixlog/1 -> CTRL-F error:

(cherry picked from commit da9b564bed)
2018-03-30 10:17:40 +03:00
Piotr Bogdan
a4f5011b73 linuxPackages.v4l2loopback: 0.9.1 -> 0.11.0
(cherry picked from commit 6b8a6faf62)
2018-03-30 10:16:23 +03:00
Piotr Bogdan
0f51a9b9d9 linuxPackages.phc-intel: 0.4.0-rev24 -> 0.4.0-rev25
(cherry picked from commit 1365d6ad9c)
2018-03-30 10:15:42 +03:00
Frederik Rietdijk
786f498cb3 python3: 3.6.4 -> 3.6.5
(cherry picked from commit 402a074cfe)
2018-03-30 08:21:11 +02:00
Ryan Mulligan
c8163071bf yakuake: 3.0.4 -> 3.0.5
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/yakuake/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.0.5 with grep in /nix/store/8ynmx32jvp39xw8x1n6spjxn7acamcys-yakuake-3.0.5
- directory tree listing: https://gist.github.com/b997d1ba53b4383b309cdbe6423958b6

(cherry picked from commit adc39a9b98)
2018-03-30 07:58:18 +02:00
Matthew Pickering
7292975ca0 Fix grass build on darwin
(cherry picked from commit 49182bcd34)
2018-03-29 23:36:33 +02:00
Franz Pletz
69a03de038 nixos/dovecot: set group in config
The dovecot bump to 2.3.1 caused the dovecot service to fail to start
because it would try to chgrp sockets to dovecot whereas our default
dovecot group is called dovecot2.

(cherry picked from commit 6a15c8d6f7)
2018-03-29 21:39:22 +02:00
Franz Pletz
e79abe3062 dovecot_pigeonhole: 0.5.0.1 -> 0.5.1
(cherry picked from commit 96d4f13fc5)
2018-03-29 21:39:16 +02:00
Ryan Mulligan
2ddacd2959 dovecot: 2.3.0.1 -> 2.3.1
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/dovecot/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/c20ip7wyymd39l7zisx38ky3bxp1sybv-dovecot-2.3.1/bin/dovecot --help` got 0 exit code
- ran `/nix/store/c20ip7wyymd39l7zisx38ky3bxp1sybv-dovecot-2.3.1/bin/dovecot --version` and found version 2.3.1
- found 2.3.1 with grep in /nix/store/c20ip7wyymd39l7zisx38ky3bxp1sybv-dovecot-2.3.1
- directory tree listing: https://gist.github.com/6d90467ee7649d7efc0a48eeacfc42c8

(cherry picked from commit a668ca4aac)
2018-03-29 21:39:09 +02:00
Robin Gloster
c30303e038 gitlab: disable
The last rubygems update broke this

(cherry picked from commit 68c4605f1a)
2018-03-29 19:18:45 +02:00
Domen Kožar
e6114781b0 e2fsprogs: 1.43.8 -> 1.44.1 2018-03-29 17:43:31 +01:00
Bastian Köcher
fbc2cb78b7 hplip: Adds missing depdency sip
(cherry picked from commit 8152db99d7)
2018-03-29 12:10:58 +02:00
Tim Steinbach
d40fc89bc2 linux-copperhead: 4.15.13.a -> 4.15.14.a
(cherry picked from commit decfd44b19)
2018-03-28 16:56:54 -04:00
Tim Steinbach
343a3e28cc linux: 4.15.13 -> 4.15.14
(cherry picked from commit e6ec944444)
2018-03-28 16:56:45 -04:00
Tim Steinbach
a07b79c3fd linux: 4.14.30 -> 4.14.31
(cherry picked from commit 6baf64f8f1)
2018-03-28 16:56:37 -04:00
Tim Steinbach
1dbe306ede linux: 4.9.90 -> 4.9.91
(cherry picked from commit 97c840eeeb)
2018-03-28 16:56:28 -04:00
Tim Steinbach
21dd95bacf linux: 4.4.124 -> 4.4.125
(cherry picked from commit 50e8d2ad8d)
2018-03-28 16:56:20 -04:00
Vladyslav M
1784c7727a skypeforlinux: 8.17.0.2 -> 8.18.0.6
(cherry picked from commit f4b9da7c6a)
2018-03-28 22:12:17 +02:00
Vasyl Solovei
8f354913e6 skypeforlinux: 8.16.0.4 -> 8.17.0.2
(cherry picked from commit 044d4b0875)
2018-03-28 22:12:05 +02:00
Daiderd Jordan
75e1a7ed59 python-celery: fix darwin build
(cherry picked from commit d33a26b370)
2018-03-28 20:56:23 +02:00
Maximilian Bosch
78e13f5da2 Revert restrictive validation behavior for DM/WM defaults in the X module
The original idea behind this change (described in ticket #11064) was to
improve the assertions to avoid that users of the X server accidentally
forget to configure a DM or WM.

However this caused several issues with setups that require X, but no DM
or WM. The keymap testcases became instable as well as now disabling DMs
needs to be done explicitly.
(see https://github.com/NixOS/nixpkgs/pull/31268#issuecomment-347080036)

In the end the idea behind the change and #11064 was obviously a
mistake, so reverting it completely for now should be fine.

(cherry picked from commit 5caa22fe0a)
2018-03-28 20:34:40 +02:00
Shea Levy
ba717c5471 ghc: Use persistent URL for abi-depends determinism patch.
(cherry picked from commit fbe8deb282)
2018-03-28 12:31:50 -04:00
Rob Vermaas
7daf4299f5 nixops: update to 1.6
(cherry picked from commit 2a28e65742)
2018-03-28 13:05:38 +02:00
Ryan Mulligan
9f24495851 php: 7.2.3 -> 7.2.4
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/php/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phar.phar help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phar.phar version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phar.phar help` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php -v` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php --version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phpdbg -V` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/phpdbg --version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-cgi -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-cgi --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-cgi -v` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-cgi --version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear -V` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pear version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev -V` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/peardev version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl -V` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/pecl version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm -h` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm --help` got 0 exit code
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm -v` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm --version` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm -h` and found version 7.2.4
- ran `/nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4/bin/php-fpm --help` and found version 7.2.4
- found 7.2.4 with grep in /nix/store/jkzy4favahn0mxn1i9ags1zazg4z7y8l-php-7.2.4
- directory tree listing: https://gist.github.com/3c197892ad9174dae3d07c1dd61b418c

(cherry picked from commit 43c6a3f23a)
2018-03-28 11:15:21 +02:00
Bart Brouns
4b148bce24 helmholtz: fix failing build
(cherry picked from commit 5bb96e7161)
2018-03-28 08:44:34 +02:00
xeji
da3ef811d1 spice-gtk: fix symlink errors, add withPolkit option
(cherry picked from commit e26810069e)
2018-03-28 08:44:34 +02:00
Piotr Bogdan
6d04965db9 cloudfoundry-cli: fix build
(cherry picked from commit 760e972a86)
2018-03-28 08:44:34 +02:00
xeji
255f999541 nixos/tests/atd : remove test of batch command
"batch" executes jobs based on system load.
test was not deterministic.

(cherry picked from commit b08560fb0a)
2018-03-28 08:44:33 +02:00
Matt McHenry
b0f5bc0f4a openjdk10: minor cleanups
* with only one source bundle (per JEP-296), we can use src instead of
  srcs, and avoid the need to cd in prePatch

* fetch sources from jdk10u instead of jdk10, to make it easier to
  grab updates when they start coming.

* removed commented-out code that became irrelevant in the 8 -> 9
  transition (*.pf files, infinality font rendering)

* create jdk10, jre10, and jre10_headless attributes in
  all-packages.nix

(cherry picked from commit aabf45c163)
2018-03-28 08:43:14 +02:00
Ryan Mulligan
b65794b46e telepathy-gabble: 0.18.3 -> 0.18.4
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/telepathy-gabble/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.18.4 with grep in /nix/store/pg936ixgiw96xqsrdzbwc1civylmy1q5-telepathy-gabble-0.18.4
- found 0.18.4 in filename of file in /nix/store/pg936ixgiw96xqsrdzbwc1civylmy1q5-telepathy-gabble-0.18.4
- directory tree listing: https://gist.github.com/92190024cdfe17a3e79730f988d904f6

(cherry picked from commit 14e24db9db)
2018-03-28 08:43:13 +02:00
Justin Humm
be798556eb apache-httpd: fix typo in config servedFiles
(cherry picked from commit 169468c406)
2018-03-28 08:43:08 +02:00
Franz Pletz
b6474a3a3b Merge pull request #37948 from andir/18.03/openssl
[18.03] openssl{,1_1_0} update (1.0.2o, 1.1.0h)
2018-03-28 06:00:59 +00:00
Franz Pletz
718952b03b Merge pull request #37964 from andir/18.03/firefox
[18.03] firefox{,-bin,-esr} updates for MFSA2018-10
2018-03-28 05:59:02 +00:00
Franz Pletz
caba43d6fa xmrig: init at 2.5.2
(cherry picked from commit 5d86c50057)
2018-03-28 07:28:04 +02:00
Franz Pletz
d9e3401dbe xmr-stak: 2.2.0 -> 2.3.0
(cherry picked from commit d12daee695)
2018-03-28 07:28:04 +02:00
Franz Pletz
2f5dae1b33 monero: 0.11.1.0 -> 0.12.0.0
(cherry picked from commit 28c00f8f3b)
2018-03-28 07:28:04 +02:00
Franz Pletz
4d9d3cbfeb lib/modules: fix typo
(cherry picked from commit e6f4614e85)
2018-03-28 07:28:03 +02:00
Franz Pletz
39e76f5a34 caddy: 0.10.11 -> 0.10.12
(cherry picked from commit a8375e4056)
2018-03-28 07:28:03 +02:00
Franz Pletz
d206dca875 firmwareLinuxNonfree: simplify source fetching
The iwlwifi repo has been merged into linux-firmware.

(cherry picked from commit ecf5caf457)
2018-03-28 07:28:03 +02:00
Will Dietz
4bf9dd12af firmwareLinuxNonfree: 2018-01-04 -> 2018-03-20
(cherry picked from commit c787555b94)
2018-03-28 07:28:02 +02:00
Garrett Berg
54c76d597f docs: extend rust docs (#35587)
- Add example for setting up nix-shell, improve rust docs
- Rust docs: add gcc rust dependencies and fix carnix commands
- Fix a typo with the carnix command.

(cherry picked from commit f7342a3625)
2018-03-28 02:08:10 +01:00
Piotr Bogdan
51c49db0f0 linuxPackages.ena: 1.5.0 -> 1.5.2
(cherry picked from commit b353ff944a)
2018-03-28 01:23:44 +01:00
Sarah Brofeldt
f74188b551 Merge pull request #37940 from srhb/mythtv-cherry
Backport: mythtv: 0.27.4 -> 29.1
2018-03-28 00:50:30 +02:00
Maximilian Bosch
27ae4cea4e qpid-cpp: fix build
The compilation broke due to the flag `-Werror=int-in-bool-context`
which caused several compilation errors with GCC v7. Disabling this
warning manually with `-Wno-error` in `NIX_CFLAGS_COMPILE` should be
fine.

This package experienced several radical changes as the entire python
build in `$src/management/python` was broken since the given Python
interpreter missed several needed modules (including
`pythonPackages.qpid-python`). As the CMake build tried to invoke the
affected `setup.py` manually and patched the shebangs with `disutil` and
caused non-functional executables, I split the package up into two
parts, the actual `qpid-cpp` lib and the Python module that will be
composed using `buildEnv`.

Furthermore I added myself as maintainer for the package as the diff
became quite huge and we should have more folks available to maintain
this.

See https://hydra.nixos.org/build/71519082/log
See tickets #36453 and #31747
2018-03-28 00:37:22 +02:00
Carles Pagès
a7d6297032 qpid-cpp: 0.34 -> 1.37.0 2018-03-28 00:37:22 +02:00
Michael Raskin
d5f40d0ebd firefox: 59.0.1 -> 59.0.2
(cherry picked from commit 73a7d67795)
2018-03-28 00:36:41 +02:00
Andreas Rammhold
2251b7bfa7 firefox-esr: 52.7.2esr -> 52.7.3esr
Fixes MFSA2018-10 [1].

[1] https://www.mozilla.org/en-US/security/advisories/mfsa2018-10/

(cherry picked from commit 24a2c3fe58)
2018-03-28 00:36:41 +02:00
Andreas Rammhold
7c4115b0c4 firefox-bin: 59.0.1 -> 59.0.2
Fixes MFSA2018-10 [1].

[1] https://www.mozilla.org/en-US/security/advisories/mfsa2018-10/

(cherry picked from commit 6abbe39551)
2018-03-28 00:36:41 +02:00
Mario Rodas
0101637e2e gerbil: enable on darwin
(cherry picked from commit f43878ca4d)
2018-03-28 00:18:05 +02:00
Mario Rodas
b052ce05d0 gambit: enable on darwin
(cherry picked from commit 0874789dd5)
2018-03-28 00:17:49 +02:00
Sarah Brofeldt
6c056757fb Merge pull request #37944 from srhb/s3ql-cherry
s3ql: 2.21 -> 2.26
2018-03-28 00:13:19 +02:00
Sarah Brofeldt
f21299103f Merge pull request #37942 from srhb/opal-cherry
Backport: opal: build with gcc6
2018-03-28 00:10:37 +02:00
Sarah Brofeldt
7b43a4ffec Merge pull request #37941 from srhb/notary-cherry
Backport: notary: 0.5.1 -> 0.6.0
2018-03-27 23:47:49 +02:00
Andreas Rammhold
877cde2272 openssl: 1.0.2n -> 1.0.2o (fixes CVE-2017-3738, CVE-2018-0739)
Announcement can be found at [1].

[1] https://www.openssl.org/news/secadv/20180327.txt

(cherry picked from commit 4bf9b4a328)
2018-03-27 23:47:17 +02:00
Andreas Rammhold
f9b510b476 openssl_1_1_0: 1.1.0g -> 1.1.0h (fixes CVE-2018-0739, CVE-2017-3738)
Also fixes CVE-2018-0733 but we do not support HP-UX to my knowledge :-)

Announcement at [1].

[1] https://www.openssl.org/news/secadv/20180327.txt

(cherry picked from commit 72110322c0)
2018-03-27 23:47:13 +02:00
Sarah Brofeldt
45715be8a9 Merge pull request #37939 from srhb/kmsxx-cherry
Backport: kmsxx: build with gcc6
2018-03-27 23:38:55 +02:00
Sarah Brofeldt
bfd827cba1 Merge pull request #37938 from srhb/gosmore-cherry
gosmore: fix build with gcc7
2018-03-27 23:37:47 +02:00
Ryan Mulligan
8410194b6b s3ql: 2.21 -> 2.26
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.fsck.s3ql-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.fsck.s3ql-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.fsck.s3ql-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/fsck.s3ql -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/fsck.s3ql --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/fsck.s3ql --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mkfs.s3ql-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mkfs.s3ql-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mkfs.s3ql-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mkfs.s3ql -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mkfs.s3ql --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mkfs.s3ql --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mount.s3ql-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mount.s3ql-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.mount.s3ql-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mount.s3ql -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mount.s3ql --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/mount.s3ql --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_oauth_client-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_oauth_client-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_oauth_client-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_oauth_client -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_oauth_client --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_oauth_client --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_verify-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_verify-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3ql_verify-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_verify -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_verify --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3ql_verify --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qladm-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qladm-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qladm-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qladm -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qladm --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qladm --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlcp-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlcp-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlcp-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlcp -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlcp --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlcp --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlctrl-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlctrl-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlctrl-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlctrl -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlctrl --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlctrl --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qllock-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qllock-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qllock-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qllock -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qllock --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qllock --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlrm-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlrm-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlrm-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlrm -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlrm --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlrm --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlstat-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlstat-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.s3qlstat-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlstat -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlstat --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/s3qlstat --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.umount.s3ql-wrapped -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.umount.s3ql-wrapped --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/.umount.s3ql-wrapped --version` and found version 2.26
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/umount.s3ql -h` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/umount.s3ql --help` got 0 exit code
- ran `/nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26/bin/umount.s3ql --version` and found version 2.26
- found 2.26 with grep in /nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26
- found 2.26 in filename of file in /nix/store/rkms0h08sfvsbpz7yp7fikhd272g28p2-s3ql-2.26

(cherry picked from commit e3db2501f9)
2018-03-27 23:31:43 +02:00
Michael Raskin
df8996671e opal: build with gcc6
(cherry picked from commit 6a589dea59)
2018-03-27 23:28:36 +02:00
lewo
65d266574e notary: 0.5.1 -> 0.6.0
(cherry picked from commit a12ad22c2c)
2018-03-27 23:26:36 +02:00
Daniel Fullmer
2d11ec0612 mythtv: 0.27.4 -> 29.1
(cherry picked from commit 70abab8eaf)
2018-03-27 23:24:42 +02:00
xeji
45a8928acd kmsxx: build with gcc6
gcc7 build fails with "internal compiler error"

(cherry picked from commit d78464723b)
2018-03-27 23:22:17 +02:00
Symphorien Gibol
0a73cde76f gosmore: fix build with gcc7
(cherry picked from commit d6aff3d65b)
2018-03-27 23:17:32 +02:00
Joachim F
2ee303490f Merge pull request #37937 from srhb/godot-cherry
Backport: godot: 2.1.4 -> 3.0 + godot_headers
2018-03-27 21:14:39 +00:00
Sarah Brofeldt
0bf74b94ba godot: 2.1.4 -> 3.0 + godot_headers
(cherry picked from commit 048724c4af)
2018-03-27 23:00:45 +02:00
Shea Levy
92b1816591 pythonPackages.pyspark: Init at 2.3.0
(cherry picked from commit 2963d76ca3)
2018-03-27 14:17:13 -04:00
Shea Levy
77c457b2b2 pythonPackages.py4j: Init at 0.10.6.
(cherry picked from commit 4322f2b8c8)
2018-03-27 14:17:05 -04:00
Joachim Fasting
9e8f45e671 tor-browser-bundle-bin: 7.5.2 -> 7.5.3
(cherry picked from commit 707a1ce0da)
2018-03-27 18:16:01 +02:00
Joachim Fasting
43a979c918 electrum: 3.1.0 -> 3.1.1
(cherry picked from commit f5a48fe3c9)

Bugfix release
2018-03-27 18:13:44 +02:00
Nikolay Amiantov
05c9191a20 linuxPackages.nvidia_x11_legacy173: drop mentions
Thanks to pbogdan for noticing this. I'd like to have a "no direct commit"
policy implemented for my own good ^_^".

Tested with ofborg's outpaths.nix

(cherry picked from commit 67adb994bc)
2018-03-27 17:21:29 +03:00
Tristan Helmich
7c34ee2b80 apacheHttpd: 2.4.29 -> 2.4.33
(cherry picked from commit 737bf1d229)
2018-03-27 16:13:30 +02:00
Nikolay Amiantov
824d63448b linuxPackages.nvidia_x11_legacy304.settings: force i686
This legacy settings application doesn't support x86_64.

(cherry picked from commit 4b67702e5b)
2018-03-27 16:54:57 +03:00
Nikolay Amiantov
34a2cd7d08 linuxPackages.nvidia_x11: build only for x86 Linux
(cherry picked from commit 00e5b20d17)
2018-03-27 16:54:49 +03:00
Nikolay Amiantov
d2b6e655ca linuxPackages.nvidia_x11_legacy173: drop
There's no kernel in nixpkgs suitable for this old driver -- tested with 4.4.

(cherry picked from commit 25ac79647c)
2018-03-27 16:54:35 +03:00
volth
b65061a3fd nvidiaLegacy304: fix build
Fixes #37768. Fixes #33395. Closes #37866.

abbradar: don't fix settings in a NixOS module.

(cherry picked from commit f396dd1dcb)
2018-03-27 16:51:02 +03:00
Graham Christensen
0d02468af7 nixpkgs docs: syntax highlight
(cherry picked from commit 8dac5ce146)
2018-03-27 09:41:37 -04:00
Tim Steinbach
5afb48364d ammonite: 1.0.5 -> 1.1.0
(cherry picked from commit 945b681d3b)
2018-03-27 08:59:22 -04:00
Tim Steinbach
6a582b7a78 sbt: 1.1.1 -> 1.1.2
(cherry picked from commit ca28546bfc)
2018-03-27 08:56:52 -04:00
Shea Levy
8e34b6def1 Merge branch 'staging-18.03' into release-18.03 2018-03-27 07:54:39 -04:00
Daniel Kuehn
40212de191 ceph: Change hardcoded site-packages path to utilizing the python2Packages.python.sitePackages attribute instead
(cherry picked from commit d74bcbc8ad)
2018-03-27 10:56:29 +01:00
Daniel Kuehn
38302326ce ceph: Add makeWrapper to dependencies and nativeBuildInputs
The ceph-mgr daemon needs to know the location of cephs own-made python modules for some of the modules
that you can enable for it.
With wrapProgram, a wrapper is added that sets the proper pythonpath environment variable for the ceph-mgr
daemon so its modules can find the ceph python modules

(cherry picked from commit a9a7580c3f)
2018-03-27 10:56:29 +01:00
Graham Christensen
22782ef953 documentation-highlighter: init
(cherry picked from commit a8d08b04a2)
2018-03-26 21:43:11 -04:00
Alex Vorobiev
37b5385f88 Update default.nix
(cherry picked from commit 8c7883c027)
2018-03-27 00:14:39 +02:00
Moritz Ulrich
2e569319fa erlang: Fix order of commands in postPach and postInstall phases.
Fixes #36853
Fixes #36823
2018-03-26 22:43:05 +02:00
Shea Levy
883b7c54d8 haskellPackages.lenz-template: Fix against lenz 3
(cherry picked from commit 2456060458)
2018-03-26 16:13:56 -04:00
Graham Christensen
a50e55382b Move the overridden CSS to overrides.css which can be applied on nixos.org
(cherry picked from commit da17974541)
2018-03-26 16:02:04 -04:00
Graham Christensen
c0c6e98690 nixpkgs docs: Use SVGs for callouts
(cherry picked from commit a80856cec5)
2018-03-26 16:02:00 -04:00
Shea Levy
bccc513396 haskellPackages.lenz: Remove outdated patch.
(cherry picked from commit 2b3ba40c03)
2018-03-26 13:40:31 -04:00
Sarah Brofeldt
5d817cfa4b Merge pull request #37879 from srhb/backport-#37877
Backport: dockerTools.tarsum: Fix upstream import
2018-03-26 19:31:55 +02:00
Sarah Brofeldt
d610810de0 dockerTools.tarsum: Fix upstream import
(cherry picked from commit 4874ce1701)
Backport of #37877
2018-03-26 19:17:27 +02:00
Lancelot SIX
732e3d05de qgis: 2.18.16 -> 2.18.17
(cherry picked from commit 4aaf23a698)
2018-03-26 17:49:26 +02:00
Shea Levy
ae174ee217 haskell.compiler.ghc8{22,41}: Fix abi-depends non-determinism.
See https://github.com/haskell/cabal/issues/4728 for symptoms,
https://phabricator.haskell.org/D4159 for the base of the fix.

(cherry picked from commit 59a53aada0)
2018-03-26 10:17:06 -04:00
Joachim Fasting
a585401f3f tor-browser-bundle-bin: 7.5.1 -> 7.5.2
(cherry picked from commit d09b4d7b2e)
2018-03-26 15:09:26 +02:00
Joachim Fasting
3d007c880e tor-browser-bundle-bin: 7.5 -> 7.5.1
(cherry picked from commit 6f9a9e8876)
2018-03-26 15:09:20 +02:00
Graham Christensen
0f188554ac Add 'make debug' to call xmloscopy
(cherry picked from commit 67f9d2425d)
2018-03-26 08:37:15 -04:00
Graham Christensen
a758dcd467 Move validate to top-level so it doesn't rebuild the outputs every time
(cherry picked from commit fce1fb7e75)
2018-03-26 08:37:15 -04:00
Graham Christensen
dad020675d Validate when building outputs
(cherry picked from commit 30dd2d3feb)
2018-03-26 08:37:14 -04:00
Graham Christensen
0e8f36fb1f Document shell.nix / xmloscopy / make for the nixpkgs docs
(cherry picked from commit f67ea4a6d0)
2018-03-26 08:37:14 -04:00
Graham Christensen
a4c1951910 docs: Build with a makefile
(cherry picked from commit 7e25ff7106)
2018-03-26 08:37:14 -04:00
Graham Christensen
663c605492 Ignore generated XML and other generated files
(cherry picked from commit 8c7be5927e)
2018-03-26 08:37:14 -04:00
Graham Christensen
b38f07ccac Move all nixpkgs doc files in to the doc directory
This makes a makefile-driven developer workflow nicer.

(cherry picked from commit 92d53362d4)

Edited to remove the emscripten references, which were new on
master
2018-03-26 08:37:08 -04:00
Graham Christensen
8ebd176017 xmloscopy: 0.1.1 -> 0.1.2
Ugh this is embarassing

(cherry picked from commit 6e4a51fe54)
2018-03-26 08:30:20 -04:00
Graham Christensen
a1b27036c5 xmloscopy: init at 0.1.1
(cherry picked from commit 72a4c54c71)
2018-03-26 08:30:19 -04:00
Josef Kemetmüller
0b9fea1e1a keepassxc: 2.3.0 -> 2.3.1
(cherry picked from commit 3f1a03b20e)
2018-03-26 10:05:41 +01:00
Josef Kemetmüller
58d56020b7 keepassxc: fix darwin build
(cherry picked from commit 2a80448fed)
2018-03-26 10:05:41 +01:00
Peter Hoeg
35e62a279d Merge pull request #37847 from peterhoeg/hass1803
home-assistant: backport of a number of python packages
2018-03-26 16:02:13 +08:00
Peter Hoeg
7662b6c9f4 home-assistant: add missing dependencies
(cherry picked from commit 15f63cb114)
2018-03-26 15:03:16 +08:00
Robert Schütz
972c80d30e pythonPackages.async: uninit because deprecated
Citing from PyPI:
DEPRECATION NOTE: Please do not use this library ! It’s not working correctly in python 3, and besides that might be called a failed experiment.

(cherry picked from commit 33e16997b9)
2018-03-26 15:01:19 +08:00
Peter Hoeg
1d3e888bda pythonPackages.miniupnpc: init at 2.0.2
(cherry picked from commit b1d7d13e64)
2018-03-26 15:01:12 +08:00
Peter Hoeg
79086fbc1e pythonPackages.ha-ffmpeg: init at 1.9
(cherry picked from commit 083ac5add3)
2018-03-26 15:01:06 +08:00
Peter Hoeg
05e0dc4c6d pythonPackages.sseclient: init at 0.0.19
(cherry picked from commit 91456c6705)
2018-03-26 15:00:54 +08:00
Peter Hoeg
af9b83af22 pythonPackages.deluge-client: init at 1.2.0
(cherry picked from commit 0bb55edb3a)
2018-03-26 15:00:46 +08:00
Peter Hoeg
c4e37974c3 pythonPackages.yahooweather: init at 0.10
(cherry picked from commit 4af9a88107)
2018-03-26 15:00:33 +08:00
Herwig Hochleitner
4166986dfa chromium: 65.0.3325.162 -> 65.0.3325.181
dev: 66 -> 67

cc @YorikSar @aszlig

(cherry picked from commit 8cbf295b6c)
2018-03-26 01:54:11 +02:00
Will Dietz
f9245e3e80 erlang R18-20: updates
(cherry picked from commit f967d23403)
2018-03-25 23:40:04 +02:00
Tim Steinbach
79bf41dfb0 linux: 4.15.12 -> 4.15.13
(cherry picked from commit 5040564737f8fdc0d5edb1c5bcef0925e125f648)
2018-03-25 15:06:55 -04:00
Tim Steinbach
2208739d1c linux: 4.14.29 -> 4.14.30
(cherry picked from commit ab2b67ebfe76a885a9f0cfbf5a4e5a4a110ab4e5)
2018-03-25 15:06:47 -04:00
Tim Steinbach
933ba214e9 linux: 4.9.89 -> 4.9.90
(cherry picked from commit 32a9c9ff73f8b43e6f370754777a2ab20c5d7158)
2018-03-25 15:06:37 -04:00
Tim Steinbach
4e0b497cab linux: 4.4.123 -> 4.4.124
(cherry picked from commit 1df36eba3170897ad44ca9e4d19460a233aedf10)
2018-03-25 15:06:28 -04:00
Tim Steinbach
06022fff51 linux-copperhead: 4.15.12.a -> 4.15.13.a
(cherry picked from commit 64396ec8c1343828749f4866d941148104f2d0de)
2018-03-25 15:06:20 -04:00
Michael Raskin
741ae94dc0 Merge pull request #35073 from Infinisil/fix/znapzend
nixos/znapzend: fix when no previous zetup

(cherry picked from commit 296dca019b)
2018-03-25 19:42:25 +02:00
xeji
0192dc6321 ptlib: fix build
patch typedef clashes with unixODBC>=2.3.5

(cherry picked from commit 4308403c30)
2018-03-25 20:03:39 +03:00
Josef Kemetmüller
c9ab869bd2 mp3blaster: fix darwin build
/cc ZHF #36454

(cherry picked from commit 11aae21cf8)
2018-03-25 19:01:24 +02:00
Tuomas Tynkkynen
ad027421c3 nixos/tests/misc: Fix on aarch64
The psmouse module is for PS/2 mouse only, which doesn't exist outside
x86. But we can test for the mousedev module just as well which is used
for the '-device usb-tablet' emulated by QEMU.

(cherry picked from commit d27f7942b7)
2018-03-25 18:38:57 +03:00
Daiderd Jordan
b6ddb9913f swftools: fix darwin build
/cc ZHF #36454

(cherry picked from commit 3301258190)
2018-03-25 17:02:01 +02:00
Tuomas Tynkkynen
4403f33860 llvm_34, llvm_35: Disable on aarch64
https://hydra.nixos.org/build/71176565
https://hydra.nixos.org/build/71167754
(cherry picked from commit bec461a35a)
2018-03-25 17:58:23 +03:00
Gabriel Ebner
7a752aa8f8 gogs: 0.11.29 -> 0.11.34
There were security fixes in the 0.11.33 release.

(cherry picked from commit 19fa3a5e53)
2018-03-25 16:15:08 +02:00
Daiderd Jordan
12deb60a67 shairplay: fix darwin build
/cc ZHF #36454

(cherry picked from commit 3ca8b20328)
2018-03-25 15:35:21 +02:00
Daiderd Jordan
642a86ba84 scowl: fix darwin build
/cc ZHF #36454

(cherry picked from commit e52250b33c)
2018-03-25 15:27:25 +02:00
Daiderd Jordan
22ad26e23d runit: mark linux only
/cc ZHF #36454

(cherry picked from commit 713ff855e0)
2018-03-25 15:03:37 +02:00
Daiderd Jordan
2224dd1599 ragel: fix clang build
/cc ZHF #36454

(cherry picked from commit 319c61c893)
2018-03-25 14:41:37 +02:00
Tuomas Tynkkynen
91b09422cf U-Boot: Disable parallel build
https://hydra.nixos.org/build/71880710
(cherry picked from commit 50dc85ed62)
2018-03-25 12:59:46 +03:00
Tuomas Tynkkynen
c4597d2568 armTrustedFirmware: Disable parallel build
I think https://hydra.nixos.org/build/71541345 is parallel build
related.

(cherry picked from commit bab5a0664c)
2018-03-25 12:59:45 +03:00
Tuomas Tynkkynen
f2c9a2557b armTrustedFirmwareQemu: 1.4 -> 1.5, fixes build with GCC7
(cherry picked from commit 107eaa8780)
2018-03-25 12:59:45 +03:00
Tuomas Tynkkynen
298ea40d39 armTrustedFirmware: Remove targetPlatforms like was done in U-Boot
Should also fix Hydra attempting to build this stuff on x86, like
https://hydra.nixos.org/build/71533289

(cherry picked from commit a2d8a9aad7)
2018-03-25 12:59:45 +03:00
Tuomas Tynkkynen
a68e60f450 U-Boot: Make ubootJetsonTK1 install even more files
(cherry picked from commit 4fe75d11b2)
2018-03-25 12:59:45 +03:00
Tuomas Tynkkynen
1896fcff60 U-Boot: Add Pine64 build
(cherry picked from commit 4b77663edf)
2018-03-25 12:59:45 +03:00
Samuel Dionne-Riel
176d151f4d U-Boot: Add SOPINE Baseboard build
This build is compatible with PINE A64-LTS.

[dezgeg changed the original device tree patch to v4 of the patch series
"sunxi: sync H3, H5, A64 DTs from mainline Linux" submitted to the
upstream mailing list by Andre Przywara. Also install the
u-boot-sunxi-with-spl.bin binary similar to 32-bit boards
since it's now being built by the upstream build system.]

(cherry picked from commit 2ff31f71ae)
2018-03-25 12:59:44 +03:00
Samuel Dionne-Riel
cf87889431 arm-trusted-firmware: Inits at various versions
For qemu, at 1.4 from upstream.

For Sopine / Pine A64-LTS, at 1.0 from fork.

(cherry picked from commit f2175e1bd4)
2018-03-25 12:59:44 +03:00
Tuomas Tynkkynen
eff6d9628c U-Boot: Add AArch64 QEMU build
See

https://github.com/u-boot/u-boot/blob/master/doc/README.qemu-arm

on how to use it.

(cherry picked from commit 6b069c656a)
2018-03-25 12:59:44 +03:00
Ben Wolsieffer
4c669db598 uboot: fix cross-build of ubootTools
(cherry picked from commit 28fd7d9594)
2018-03-25 12:59:44 +03:00
Ben Wolsieffer
48ade50d8e uboot: sheevplug and guruplug: use mainline U-Boot
These derivations have not seen any updates since they were created in 2010,
and some of their sources have disappeared. There are upstream configs for
these boards, so these are now used, and they build correctly. I have no way
of testing them, and I don't if anyone even uses either board with Nix anymore.

(cherry picked from commit 01020b3263)
2018-03-25 12:59:44 +03:00
Ben Wolsieffer
b0abe78b5c uboot: rock64: use binary blob for TPL
This stops the kernel from crashing immediately after boot.

(cherry picked from commit ba3e470651)
2018-03-25 12:59:43 +03:00
Ben Wolsieffer
828fdd61b9 uboot: add patch to increase maximum path length in extlinux.conf
This fixes problems with cross compiled kernels failing to boot.

(cherry picked from commit 1f4bb8c61d)
2018-03-25 12:59:43 +03:00
Ben Wolsieffer
94c403fb92 arm-trusted-firmware: init
ARM trusted firmware is required as part of the boot process on some ARMv8-A
boards. Currently, only the RK3328 is supported in nixpkgs.

This makes the Rock64 u-boot image bootable.

(cherry picked from commit 0ab76c5a4e)
2018-03-25 12:59:43 +03:00
Ben Wolsieffer
e794f9abbf maintainers: add lopsided98
(cherry picked from commit 0264c9bb47)
2018-03-25 12:59:43 +03:00
Ben Wolsieffer
dc01b66eef uboot: add Rock64 support
The bootloader is currently non-functional because it lacks the ARM Trusted
Firmware image (bl31.elf).

(cherry picked from commit 6f5a0bded2)
2018-03-25 12:59:42 +03:00
Ben Wolsieffer
7c46833b04 uboot: 2017.11 -> 2018.03, cross fixes
(cherry picked from commit 5804547243)
2018-03-25 12:59:42 +03:00
Kai Harries
1da25dd104 debian-devscripts: add dpkg in PATH
The script uscan was complaining about missing dpkg, therefore I have
added it to the PATH.

(cherry picked from commit 404c80791f)
2018-03-25 10:25:21 +01:00
Tim Steinbach
d843d7f21a minikube: 0.25.0 -> 0.25.2
(cherry picked from commit 040a9ab240)
2018-03-25 00:50:19 -04:00
Tim Steinbach
ccabf39f5c zulu: 9.0.4 -> 10
(cherry picked from commit 351688f53e)
2018-03-25 00:50:12 -04:00
Tim Steinbach
35a6799b17 openjdk: Add JDK 10
(cherry picked from commit f00db926c6)
2018-03-25 00:50:05 -04:00
Tim Steinbach
e2b8732980 vault: Fix test
(cherry picked from commit 3aa3738bb2)
2018-03-25 01:01:34 +01:00
Robin Gloster
bdac630c1d grpcio: use protobuf3_5
(cherry picked from commit c71bcb2744)
2018-03-24 20:34:39 +01:00
Robin Gloster
85d5fdce26 protobuf3_5: init at 3.5.1.1
partly cherry-picked from 4bbd6900f8
2018-03-24 20:34:39 +01:00
Jon Banafato
a903faf1d5 keybase-gui: Enable desktop notifications (#37711)
Add `libnotify` as a build input to make message notifications work.

(cherry picked from commit 8ac272f98d)
2018-03-24 19:28:37 +00:00
Josef Kemetmüller
a978eee06f libcdio-paranoia: fix darwin build
(cherry picked from commit 285ef9be09)
2018-03-24 19:21:11 +00:00
Josef Kemetmüller
e32dee886f glyr: enable darwin build
(cherry picked from commit ad3eb5d8fc)
2018-03-24 19:15:40 +00:00
volth
6f384b77d2 babelstone-han: 10.0.2 -> 11.0.0
new font version; old link answers with 404

(cherry picked from commit 64c756d50d)
2018-03-24 19:15:40 +00:00
Pascal Wittmann
898cddd756 autossh: 1.4e -> 1.4f 2018-03-24 19:35:44 +01:00
Tuomas Tynkkynen
e789f6f6e5 ghc: Disable on AArch64
For some reason compiling the proper GHC from the binary one eventually
segfaults at some point.

Since it has never worked, just disable it and investigate later.

(cherry picked from commit a6425fc66d)
2018-03-24 18:37:20 +02:00
Tuomas Tynkkynen
be44525d04 nixos/tests/installer: Give eval failure on unsupported boot methods
(cherry picked from commit 3131daace1)
2018-03-24 18:37:20 +02:00
Tim Steinbach
9d8c6c71c0 docker: 18.02 -> 18.03
(cherry picked from commit b072dcffae)
2018-03-24 12:33:47 -04:00
Franz Pletz
15e3aad1a2 openra: 20180218 -> 20180307
(cherry picked from commit 204a029101)
2018-03-24 17:11:59 +01:00
Franz Pletz
4e67f8974a browserpass: 2.0.13 -> 2.0.17
(cherry picked from commit 8df9cf585a)
2018-03-24 17:11:58 +01:00
Tad Fisher
86508d4ea4 browserpass: 2.0.11 -> 2.0.13
(cherry picked from commit 82f2c19d98)
2018-03-24 17:11:56 +01:00
Tuomas Tynkkynen
f45bc2b3e4 nixos/tests: Make simpleUefiGrub test work on AArch64
Needs more refactoring for the AArch64 '-enable-kvm' stuff some day...

(cherry picked from commit e58624a877)
2018-03-24 16:51:06 +02:00
Tuomas Tynkkynen
ad57d1ec63 edk2, OVMF: Build on aarch64
And also build in parallel.

I don't understand why we manually tediously link every single directory
from the source, but I don't want to investigate too much.

(cherry picked from commit f59eab75d2)
2018-03-24 16:51:00 +02:00
Tuomas Tynkkynen
75276115bf OVMF: Reformat a bit for readability
- Use 'somePkg == null' instead of 'somePkg == false' which is more
  conventional in rest of Nixpkgs
- Use lib.optionalString where applicable

(cherry picked from commit 1645011983)
2018-03-24 16:50:48 +02:00
Tuomas Tynkkynen
7a79af0b8d edk2: Reformat a bit for readability
- Have only one sed expression per line
- Put the important stuff closer to the command and not hidden in some
continuation line. That is, don't do:

sed \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <IMPORTANT STUFF>

but:

sed <IMPORTANT STUFF> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff>

(cherry picked from commit 1d854b479c)
2018-03-24 16:50:41 +02:00
Vladimír Čunát
0d20e7db5b Merge #37702: telepathy-gabble: fix source URL
(cherry picked from commit 902b3a161c)
2018-03-24 15:14:35 +01:00
Vladimír Čunát
a3be411dbd Merge #37262: snabb: 2016.04 -> 2018.01.2
(cherry picked from commit 7110d4a63b)
It didn't build before this commit.
2018-03-24 15:06:11 +01:00
Daiderd Jordan
2a57fc65b0 qscreenshot: fix darwin build
/cc ZHF #36454

(cherry picked from commit b5b77a6886)
2018-03-24 14:28:02 +01:00
Robin Gloster
d4f3c16982 jsduck: fix build
json 1.8.3 is broken with ruby 2.4

(cherry picked from commit f59a544bf1)
2018-03-24 14:08:31 +01:00
Matthew Justin Bauer
f61244da2e Merge #33685: amdgpu-pro: 17.10 -> 17.40
(cherry picked from commit ce01740dae)
> It's definitely less broken than 17.10.
2018-03-24 12:57:47 +01:00
Robin Gloster
f4770f2030 qgroundcontrol: 3.2.7 -> 3.3.0
(cherry picked from commit 1b27260a0b)
2018-03-24 12:09:03 +01:00
Robin Gloster
1febd196e7 libsForQt5.qtspeech: enable
(cherry picked from commit 8a244db9f3)
2018-03-24 12:09:02 +01:00
Vladimír Čunát
9c85d196a9 Merge #37724:thunderbird*: 52.6.0 -> 52.7.0 (security)
(cherry picked from commit 56fb68dcef)
2018-03-24 11:01:55 +01:00
Robin Gloster
0058e51c8c python.pkgs.logster: 7475c53822 -> 1.0.1
(cherry picked from commit 2e6aacb056)
2018-03-24 10:36:40 +01:00
Robin Gloster
4a34e749f7 python.pkgs.pygtail: init at 0.8.0
(cherry picked from commit 6a286fcba7)
2018-03-24 10:36:39 +01:00
Daiderd Jordan
3976ff79e8 picosat: fix darwin build
/cc ZHF #36454

(cherry picked from commit 23d0c17130)
2018-03-24 02:25:57 +01:00
Daiderd Jordan
f6c0edb3ec openexrid-unstable: fix clang build
/cc ZHF #36454

(cherry picked from commit f16db19610)
2018-03-24 02:25:47 +01:00
Jörg Thalheim
08101d052d Merge pull request #37714 from flokli/nuke-networkmanager-pptp-18.03
networkmanager-pptp: remove package (18.03)
2018-03-23 22:58:21 +00:00
Florian Klink
fb4847ebdd networkmanager-pptp: remove package
backport of #37712

Currently broken on NixOS due to hardcoded modprobe binary path (see
bug #30756 from Oct 2017), no activity on a proposed fix for months.
As the protocol is terribly broken anyways, let's better remove it
completely, and not talk about anymore ;-)

Closes #30756.

(cherry picked from commit 6ac74d60ad)
2018-03-23 23:16:09 +01:00
Tuomas Tynkkynen
ba2a04f656 glslviewer: 1.2 -> 2018-01-31, fixes build
(cherry picked from commit a8eb2c9ef9)
2018-03-23 21:06:23 +02:00
Tuomas Tynkkynen
af6cc8e704 riscv-pk: Set correct platforms
https://hydra.nixos.org/build/70691103

(cherry picked from commit a2c37c0700)
2018-03-23 20:06:09 +02:00
xeji
296c09a355 t: 2.9.0 -> 3.1.0
2.9.0 didn't build anymore

(cherry picked from commit 8cd005b6fb)
2018-03-23 20:01:51 +02:00
Nikolay Amiantov
48856a91c0 systemd: use stable tree
This fixes a bug with changed qemu network interface names and also generally
should be preferred to using a release tag.

(cherry picked from commit 6b9771e4a7)
2018-03-23 17:23:10 +01:00
Albert Safin
cdb97353df wine: disable bindnow hardening
(cherry picked from commit ba960ac383)
2018-03-23 18:13:13 +02:00
Shea Levy
9e804ba5bf Remove HIE package set until automation can be put in place.
(cherry picked from commit ead2ba8809)
2018-03-23 10:25:59 -04:00
Jörg Thalheim
3cf448faf2 vis: patch shebang to use system bash
(cherry picked from commit 0203a6281c)
2018-03-23 07:59:59 +00:00
Andrew Childs
01204cf872 avrdude: add darwin platform
(cherry picked from commit b4888489e3)
2018-03-23 01:42:18 +01:00
Andrew Childs
eef14cb305 libftdi1: add darwin platform
(cherry picked from commit d0df007843)
2018-03-23 01:42:17 +01:00
Daiderd Jordan
31ba589e50 ntbtls: fix darwin build
/cc ZHF #36454

(cherry picked from commit 366bf3a309)
2018-03-22 23:17:43 +01:00
Nikolay Amiantov
2d2ab94cd2 systemd: 237 -> 238
(cherry picked from commit 0ccab4946d)
2018-03-22 23:12:42 +01:00
Nikolay Amiantov
01cce78ec4 kernel: enable CGROUP_NET_PRIO
It's required by systemd 238 because of a bug, otherwise systemd aborts.

(cherry picked from commit e31c3f8b9f)
2018-03-22 23:12:39 +01:00
Josef Kemetmüller
361bd591ea streamripper: Don't use included libmad
streamripper ships its own version of libmad, which does not compile on
clang, due to the usage of incompatible compiler flags. We can get the
build working by using the already packaged libmad, which includes
patches for clang.

(cherry picked from commit e77071289e)
2018-03-22 21:57:42 +01:00
Robin Gloster
a614f9f4c1 openpts: remove
Broken, dead prject that only was a PoC implementation.

(cherry picked from commit 678211bb37)
2018-03-22 17:16:11 +01:00
WilliButz
b828d00ffd nixos/prometheus-exporters: add postfix exporter & documentation
(cherry picked from commit c54aa1f293)
2018-03-22 15:24:55 +01:00
WilliButz
135e13f8fc release notes: add information about prometheus exporters
(cherry picked from commit 8a13101226)
2018-03-22 15:24:55 +01:00
WilliButz
55e97a2ebb nixos/prometheus-exporters: rewrite and restructure
- prometheus exporters are now configured with
  `services.prometheus.exporters.<name>`
- the exporters are now defined by attribute sets
  from which the options for each exporter are generated
- most of the exporter definitions are used unchanged,
  except for some changes that should't have any impact
  on the functionality.

(cherry picked from commit f4d03b5c9c)
2018-03-22 15:24:55 +01:00
Sander van der Burg
510fd552eb xcodeenv: publish xcarchive directory in the output store path if requested
(cherry picked from commit 112ebed491)
2018-03-22 15:02:41 +01:00
Sander van der Burg
d200e2cfde xcodeenv: replace deprecated package application procedure by the new export archive operation
(cherry picked from commit f2bd9d4745)
2018-03-22 14:34:18 +01:00
Robin Gloster
ba11500aa8 prosody: add test to release.nix
(cherry picked from commit faaf32a0ee)
2018-03-22 14:33:10 +01:00
Robin Gloster
766a80ec84 prosody: improve module handling
(cherry picked from commit 0a80f2c0f4)
2018-03-22 14:33:10 +01:00
Florian Jacob
b9084d0160 nixos/prosody: add a basic test
(cherry picked from commit 88f06c5ce9)
2018-03-22 14:33:09 +01:00
Florian Jacob
05f206c3c1 prosody: update community modules
(cherry picked from commit 2c0b230330)
2018-03-22 14:33:09 +01:00
Florian Jacob
7ef13f58b6 prosody: 0.9.12 -> 0.10.0
updating config options, removing luazlib as mod_compression was removed
for security reasons.

(cherry picked from commit 226965da67)
2018-03-22 14:33:09 +01:00
Florian Jacob
64301d0a32 luaevent: 0.4.3 -> 0.4.4
(cherry picked from commit 0c74665bad)
2018-03-22 14:33:08 +01:00
Tim Steinbach
d01e4430b3 linux: 4.9.88 -> 4.9.89
(cherry picked from commit d9e21f3270a3dcc2a67b6e20248a3f83e98dada3)
2018-03-22 09:17:31 -04:00
Tim Steinbach
bbde130fd7 linux: 4.4.122 -> 4.4.123
(cherry picked from commit 8b18ed859285127c40a2cf90c0ad8b172b532732)
2018-03-22 09:17:22 -04:00
Tim Steinbach
d011c7bd02 linux-copperhead: 4.15.11.a -> 4.15.12.a
(cherry picked from commit b7dff1f41fec299eb4b7e09813bfd09aa52a5c5e)
2018-03-22 09:17:13 -04:00
Michael Brantley
ef716bb5cf perlPackages.GSSAPI: depend on krb5Full, fix misspelling
(cherry picked from commit 0d6fdac8e2)
2018-03-22 11:43:58 +00:00
adisbladis
13958f4a36 Merge pull request #37614 from clefru/cherry-18.03
pycurl: 7.19.5.1 -> 7.43.0.1
2018-03-22 17:35:21 +08:00
Will Dietz
72314d37e8 pycurl: 7.19.5.1 -> 7.43.0.1
(cherry picked from commit 99131b4fc2)
2018-03-22 10:23:27 +01:00
giraffito
0e735393c7 python.md: fix grammar around bdist_wheel FAQ
(cherry picked from commit 319866ae11)
2018-03-22 07:30:22 +01:00
Robin Gloster
103e2c4efb graylog: use jre_headless
(cherry picked from commit fa347164b6)
2018-03-22 02:32:43 +01:00
Franz Pletz
eb80bdc402 gitlab service: use recommended unicorn config
(cherry picked from commit e5a854e740)
2018-03-22 02:32:27 +01:00
Robin Gloster
07d1b17941 gitlab: 10.5.4 -> 10.5.6
(cherry picked from commit 08946efdc8)
2018-03-22 02:32:27 +01:00
Simon Lackerbauer
d6595b4d5b gitlab: 10.3.4 -> 10.5.4
(cherry picked from commit 1b55905806)
2018-03-22 02:32:27 +01:00
Robin Gloster
ca3bf23f5f gitaly: 0.59.2 -> 0.81.0
(cherry picked from commit 73a7f984d6)
2018-03-22 02:32:27 +01:00
Simon Lackerbauer
9680902949 gitlab-workhorse: 3.3.1 -> 3.6.0
(cherry picked from commit 9ccd010217)
2018-03-22 02:32:26 +01:00
Simon Lackerbauer
5445bb1583 gitlab-shell: 5.10.2 -> 6.0.3
(cherry picked from commit 08bf87420f)
2018-03-22 02:32:26 +01:00
Robin Gloster
75842fe98c gitlab-shell: fix config path finding
and remove TimeoutSec for gitlab

(cherry picked from commit 31d77fd4f3)
2018-03-22 02:32:26 +01:00
Franz Pletz
8c3cb029e0 zfs, spl: 0.7.6 -> 0.7.7
Remove spl patch that was introduced for grsecurity which we don't support
anymore. ZFS now needs perl for some scripts that are call in the configure
script.

(cherry picked from commit f744f83072)
2018-03-22 01:50:06 +01:00
Franz Pletz
b8673bc3e0 altcoins.masari: init at 0.1.4.0
(cherry picked from commit ab5f98a77e)
2018-03-22 01:50:06 +01:00
Franz Pletz
2b397bfa75 nmap: 7.60 -> 7.70
(cherry picked from commit f2fea9042e)
2018-03-22 01:50:05 +01:00
Franz Pletz
0782536e49 squid4: 4.0.23 -> 4.0.24
(cherry picked from commit 1e15d08cac)
2018-03-22 01:50:05 +01:00
Franz Pletz
8b578b862b matterircd: 0.12.0 -> 0.16.5
(cherry picked from commit 7dee8ab568)
2018-03-22 01:50:05 +01:00
Franz Pletz
5150a7ef50 prometheus-node-exporter: 0.15.0 -> 0.15.2
(cherry picked from commit 9152ef910b)
2018-03-22 01:50:04 +01:00
Franz Pletz
a6146ec8bb clamav: 0.99.3 -> 0.99.4 for multiple CVEs
Fixes CVE-2012-6706, CVE-2017-6419, CVE-2017-11423, CVE-2018-0202,
CVE-2018-1000085.

(cherry picked from commit 5050d05656)
2018-03-22 01:50:04 +01:00
Franz Pletz
96c97c51cb prometheus-blackbox-exporter: 0.11.0 -> 0.12.0
(cherry picked from commit 1497815543)
2018-03-22 01:50:04 +01:00
Tim Steinbach
ad06aec8b5 linux: 4.15.11 -> 4.15.12
(cherry picked from commit 55b96a4a3c)
2018-03-21 20:45:19 -04:00
Tim Steinbach
80c6cd1a9e linux: 4.14.28 -> 4.14.29
(cherry picked from commit deb9ff164f)
2018-03-21 20:45:08 -04:00
Daiderd Jordan
9914060dfb nullmailer: fix darwin build
/cc ZHF #36454

(cherry picked from commit 0477af8a09)
2018-03-22 00:11:49 +01:00
Daiderd Jordan
d49e4f607f mysocketw: fix darwin build
/cc ZHF #36454

(cherry picked from commit 18474c1842)
2018-03-21 23:55:29 +01:00
Daiderd Jordan
beea3c9d36 monero: fix darwin build
/cc ZHF #36454

(cherry picked from commit 5d4d4df8c0)
2018-03-21 22:44:37 +01:00
xeji
5995e9c217 libhttpseverywhere: fix build
run tests in correct directory

(cherry picked from commit fa50e903cf)
2018-03-21 23:24:27 +02:00
Daiderd Jordan
c0b813ed17 masscan: fix build
(cherry picked from commit 38323015e2)
2018-03-21 21:51:26 +01:00
Nikolay Amiantov
da20f8dd22 pyqt5: propagate Qt dependencies
This is so that Qt user environment packages are also propagated. Fixes
Electrum environment installations when no other Qt applications are installed.

Added `dev` output so that closure size won't explode.

(cherry picked from commit b1b4c6c4eb)
2018-03-21 23:36:48 +03:00
Daiderd Jordan
d775a130a3 lxtask: fix darwin build
/cc ZHF #36454

(cherry picked from commit 9b5669b5a6)
2018-03-21 21:30:04 +01:00
Daiderd Jordan
9a81f1ba5b luaffi: fix darwin build
/cc ZHF #36454

(cherry picked from commit fe37684525)
2018-03-21 21:29:57 +01:00
Daiderd Jordan
79378daa0e libqglviewer: fix darwin build
/cc ZHF #36454

(cherry picked from commit c2ca5c057d)
2018-03-21 21:29:50 +01:00
Daiderd Jordan
c6603050ba libnfs: fix clang build
/cc ZHF #36454

(cherry picked from commit 9a054d7cd6)
2018-03-21 21:29:35 +01:00
Hendrik Schaeidt
11f1cb7819 add hschaeidt to maintainer list
(cherry picked from commit 86ff559f82)
2018-03-21 19:39:04 +01:00
Hendrik Schaeidt
555ac8418c stabber: init at 2016-11-09
(cherry picked from commit 6634049f22)
2018-03-21 19:38:48 +01:00
Hendrik Schaeidt
dc70be405f profanity: refactor build to build from source
* fix osx build
* fix undefined macros in configure.ac
* activate the check phase to run the test suite

(cherry picked from commit 501b6d0e13)
2018-03-21 19:38:19 +01:00
Sander van der Burg
0f74315456 titaniumenv: fix renaming strategy
(cherry picked from commit 479ec3d888)
2018-03-21 16:09:30 +01:00
Sander van der Burg
6297c190d0 titaniumenv: update example app
(cherry picked from commit 603556085b)
2018-03-21 15:51:36 +01:00
Sander van der Burg
7fa2f865b8 titaniumenv: fix Android signing on darwin
(cherry picked from commit 4beb695ece)
2018-03-21 14:58:56 +01:00
Michael Raskin
ea9f3fca65 Merge pull request #37559 from dylex/release-18.03
julia: update rmath-julia hash for 0.1
2018-03-21 13:25:25 +00:00
Dylan Simon
c0cd5eeab8 julia: update rmath-julia hash for 0.1 2018-03-21 08:30:58 -04:00
Lancelot SIX
cc25915367 octave: 4.2.1 -> 4.2.2
See http://lists.gnu.org/archive/html/info-gnu/2018-03/msg00006.html
for release announcement

(cherry picked from commit 3a7854032a)
2018-03-21 11:48:30 +01:00
Antoine Eiche
5df02d9783 dockerTools: add --sort=name options on all tar calls
This is to go to a reproducible image build.
Note without this options image are identical from the Docker point of
view but generated docker archives could have different hashes.

(cherry picked from commit ac0c491836)
2018-03-21 08:56:49 +01:00
Antoine Eiche
e28a58fb09 dockerTools: dereference hard links in tar archives
This is to improve image creation reproducibility. Since the nar
format doesn't support hard link, the tar stream of a layer can be
different if a dependency of a layer has been built locally or if it
has been fetched from a binary cache.

If the dependency has been build locally, it can contain hard links
which are encoded in the tar stream. If the dependency has been
fetched from a binary cache, the tar stream doesn't contain any hard
link. So even if the content is the same, tar streams are different.

(cherry picked from commit 346996ceec)
2018-03-21 08:56:49 +01:00
Florian Klink
032a3286fd sqldeveloper: 17.4.0.355.2349 -> 17.4.1.054.0712
(cherry picked from commit f9dda86b39)
2018-03-20 21:59:42 +00:00
Johannes Frankenau
9cd1122df5 masterpdfeditor: 4.3.61 -> 4.3.82
(cherry picked from commit 77b205b9fd)
2018-03-20 21:59:42 +00:00
Nikolay Amiantov
97a2621dae xdg_utils: fix xdg-screensaver
(cherry picked from commit ab67f36e73)
2018-03-20 22:21:03 +03:00
Nikolay Amiantov
69e8d7ddd8 steam: add dependencies for Surviving Mars
(cherry picked from commit 792161895f)
2018-03-20 22:21:00 +03:00
Andrew Kelley
77c052d908 zig: 0.1.1 -> 0.2.0
(cherry picked from commit dc3b791854)
2018-03-20 13:56:53 -05:00
Will Dietz
fa78cd4d68 brotli: 1.0.2 -> 1.0.3
https://github.com/google/brotli/releases/tag/v1.0.3
(cherry picked from commit c1c502e93b)
2018-03-20 13:53:26 -05:00
Will Dietz
9fd4a62b64 llvm6: patch to enable sanitizers w/musl
(cherry picked from commit 60bf299e6a)
2018-03-20 13:52:11 -05:00
Will Dietz
043ee6c65d llvm_5: patch sanitizers to enable w/musl
https://gitweb.gentoo.org/proj/musl.git/plain/sys-libs/compiler-rt-sanitizers/files/compiler-rt-sanitizers-5.0.0-musl-patches.patch
(cherry picked from commit a8824ab4fb)
2018-03-20 13:52:06 -05:00
Will Dietz
67cdc01ba8 llvm4: same treatment
(cherry picked from commit b2e6952f37)
2018-03-20 13:51:00 -05:00
Will Dietz
828d15e9d3 python*: set thread stack size on musl
Ensure recursion limit is reached before stack overflow.

Python does this for OSX and BSD:
13ff24582c/Python/thread_pthread.h (L22)

Size of 1MB chosen to match value in Alpine:
https://git.alpinelinux.org/cgit/aports/commit/main/python2/APKBUILD?id=2f35283fec8ec451fe5fb477dd32ffdcc0776e89

Manual testing via Alpine's test-stacksize.py crashes on these
previously, and works with these changes.

(cherry picked from commit 9aa22191cf)
2018-03-20 13:50:20 -05:00
Robert Schütz
7b9ca7b7c5 pythonPackages.altair: fix build
(cherry picked from commit 43d822178b)
2018-03-20 18:11:24 +01:00
Robert Schütz
f638751bb2 pythonPackages.WSME: 0.8.0 -> 0.9.2
(cherry picked from commit 2773b76f33)
2018-03-20 18:11:23 +01:00
Robert Schütz
7098c05b59 pythonPackages.WSME: move expression
(cherry picked from commit 9f54b031fd)
2018-03-20 18:11:23 +01:00
Robert Schütz
c6eac40de4 pythonPackages.astropy: disable for python 2
(cherry picked from commit 3d989e3d7a)
2018-03-20 18:11:23 +01:00
Robert Schütz
c8ac1a2176 pythonPackages.klein: 15.3.1 -> 17.10.0
(cherry picked from commit b34af91889)
2018-03-20 18:11:23 +01:00
Robert Schütz
c7b7779ee2 pythonPackages.klein: move expression
(cherry picked from commit 86e007bd31)
2018-03-20 18:11:22 +01:00
Robert Schütz
19e7212940 pythonPackages.deform: 2.0.a2 -> 2.0.5
(cherry picked from commit 86f21360ac)
2018-03-20 18:11:22 +01:00
Robert Schütz
7185278447 pythonPackages.deform: move expression
(cherry picked from commit a1b9cc7938)
2018-03-20 18:11:22 +01:00
Robert Schütz
6d2fd84beb pythonPackages.zope_copy: 4.0.2 -> 4.1.0
(cherry picked from commit 12695be641)
2018-03-20 18:11:22 +01:00
Robert Schütz
9fd7e2eee2 pythonPackages.stem: run unit tests
(cherry picked from commit 685dd8d21d)
2018-03-20 18:11:22 +01:00
Robert Schütz
15d741b62b pythonPackages.stem: move expression
(cherry picked from commit 061e79806e)
2018-03-20 18:11:21 +01:00
Robert Schütz
b87bafdffd pythonPackages.{reviewboard,djblets}: uninit
Djblets is unmaintained: has not been updated since 2015, but had many releases.
Dependency django_pipeline_1_3 is broken and should anyway be removed from pythonPackages because we want to have a consistent package set.
Because the reviewboard package also hasn't been updated since 2015 and depends on djblets, it is removed as well.

(cherry picked from commit fbff08f2f2)
2018-03-20 18:11:21 +01:00
Robert Schütz
0aafdaecee pythonPackages.django_pipeline: 1.5.1 -> 1.6.14
(cherry picked from commit 6e78005ef1)
2018-03-20 18:11:21 +01:00
Robert Schütz
99ac0883cc pythonPackages.slimit: init at 0.8.1
(cherry picked from commit 127045d8e0)
2018-03-20 18:11:21 +01:00
Robert Schütz
f6c66f6cb1 pythonPackages.django_pipeline: move expression
(cherry picked from commit ba74cf4d5c)
2018-03-20 18:11:09 +01:00
Sander van der Burg
5a777d237c titaniumenv: remove obsolete java fix wrapper on darwin
(cherry picked from commit 5532cc1641)
2018-03-20 17:55:25 +01:00
Sander van der Burg
0938277468 titaniumenv: add 7.1 SDK and make it the default
(cherry picked from commit e8e7e78d9f)
2018-03-20 17:55:15 +01:00
zimbatm
d2bb154421 nix-serve: patch for nix 2.0 (#37459)
Fixes incompatible secret file handling. See https://github.com/edolstra/nix-serve/pull/8

(cherry picked from commit 8add42f90c)
2018-03-20 16:41:10 +00:00
Tim Steinbach
f086e3ebde scala: 2.12.4 -> 2.12.5
(cherry picked from commit a429ae273ab752c61ed0c5dc955331617b9e7364)
2018-03-20 09:38:51 -04:00
Robert Schütz
225eac1f37 pythonPackages.bleach: 2.1.2 -> 2.1.3
(cherry picked from commit 9f276ccd38)
2018-03-20 12:29:21 +01:00
Matthieu Coudron
8337d1ddca pythonPackages.neovim: 0.2.3 -> 0.2.4
required to work with latest deoplete for instance

(cherry picked from commit 366c79e17f)
2018-03-20 11:06:12 +01:00
Frederik Rietdijk
8d24d4fac9 python: neovim: 0.2.1 -> 0.2.3
(cherry picked from commit 7ce85c014e)
2018-03-20 11:06:05 +01:00
Peter Hoeg
14cbca54da Merge pull request #37402 from badi/unifi
unifi: 5.6.30 -> 5.6.36
2018-03-20 13:24:05 +08:00
Tim Steinbach
e530ee1af5 linux-copperhead: 4.15.10.a -> 4.15.11.a
(cherry picked from commit bb2c260a231154b743d4c7ba6c43bd14da9d0284)
2018-03-19 22:32:55 -04:00
Badi Abdul-Wahid
9553628c22 unifi: 5.6.30 -> 5.6.36
[Release Notes](https://community.ubnt.com/t5/UniFi-Updates-Blog/UniFi-5-6-36-LTS-Stable-has-been-released/ba-p/2277323)

(cherry picked from commit 754911847e)
2018-03-19 22:00:36 -04:00
Andrew Childs
c2a0eeeb1a Chromium: fix skia build on aarch64
Patch imported from Arch Linux ARM

(cherry picked from commit 3928fd9081)
2018-03-20 02:44:23 +02:00
Yuriy Taraday
5abaf2a959 chromium: 65.0.3325.146 -> 65.0.3325.162
Also bump dev branch to ensure that next beta will work.

(cherry picked from commit 6b0732a956)
2018-03-20 02:43:45 +02:00
Tuomas Tynkkynen
607fc823d0 nss: Fix aarch64 build
(cherry picked from commit 8254d2cfb0)
2018-03-20 02:43:35 +02:00
gnidorah
63e3251637 cgit: wrap python scripts
(cherry picked from commit 55f1bbe623)
2018-03-19 23:24:07 +00:00
Josef Kemetmüller
42e2ed6520 pythonPackages.notebook: fix darwin build
The send2trash library, which is now included in the notebook doesn't
succeed during build, even though it works.

(cherry picked from commit 8aaa17c52a)
2018-03-20 00:05:24 +01:00
Daiderd Jordan
a3983d6d05 libftdi: mark linux only
(cherry picked from commit 3f964978d8)
2018-03-20 00:04:11 +01:00
Daiderd Jordan
a2b75703d5 kore: fix clang build
/cc ZHF #36454

(cherry picked from commit 031492cbfe)
2018-03-20 00:03:57 +01:00
Daiderd Jordan
9ba0bf3e52 iniparser: fix darwin build
/cc ZHF #36454

(cherry picked from commit 5873a3418b)
2018-03-20 00:03:01 +01:00
Daiderd Jordan
517d8261d1 imatix_gsl: fix clang build
/cc ZHF #36454

(cherry picked from commit e616725ba0)
2018-03-20 00:02:52 +01:00
Daiderd Jordan
ed8c29fa65 ii: fix darwin build
/cc ZHF #36454

(cherry picked from commit d7856d3c2a)
2018-03-20 00:02:42 +01:00
Josef Kemetmüller
7e39d25600 python3Packages.pycurl: fix darwin build
(cherry picked from commit bd836b7761)
2018-03-19 23:57:09 +01:00
xeji
084993f345 altermime: fix build
(cherry picked from commit f9ed23d271)
2018-03-19 22:36:13 +00:00
Robert Schütz
7a5c7c1818 nixos/borgbackup: init
(cherry picked from commit fdf0f037be)
2018-03-19 20:32:43 +01:00
WilliButz
280d762338 grafana: 5.0.1 -> 5.0.3, fix headless phantomjs
(cherry picked from commit ca7b29050f)
2018-03-19 20:00:45 +01:00
Ryan Mulligan
f6779e0f45 graylog: 2.4.1 -> 2.4.3
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl -h` got 0 exit code
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl --help` got 0 exit code
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl help` got 0 exit code
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl -V` and found version 2.4.3
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl -v` and found version 2.4.3
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl --version` and found version 2.4.3
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl version` and found version 2.4.3
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl -h` and found version 2.4.3
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl --help` and found version 2.4.3
- ran `/nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3/bin/graylogctl help` and found version 2.4.3
- found 2.4.3 with grep in /nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3
- found 2.4.3 in filename of file in /nix/store/qyrv15995w1pl2vmf1i720ii4s9gb3x3-graylog-2.4.3

(cherry picked from commit e716a11026)
2018-03-19 20:00:45 +01:00
Andreas Rammhold
b8b740808c Merge pull request #37309 from andir/18.03/firefox
[18.03] firefox updates (59.0 -> 59.0.1, firefox-esr: 52.7.1esr -> 52.7.2esr)
2018-03-19 19:29:52 +01:00
Andreas Rammhold
f87594f3ca firefox-esr: add CVE-2018-5147 patch for ARM platforms
The patch was missing in the release tag and must be added manually.
Read [1] for further details.

[1] http://seclists.org/oss-sec/2018/q1/242
2018-03-19 19:17:35 +01:00
taku0
a8cdcc52d8 firefox-bin: 59.0 -> 59.0.1
(cherry picked from commit 3d28c32921)
2018-03-19 19:17:35 +01:00
taku0
89ed0cfde6 firefox: 58.0.2 -> 59.0.1
(cherry picked from commit 9aae5d7c80 & 8170c05afc)
2018-03-19 19:17:35 +01:00
Robert Schütz
ddbff03f0f asciidoc: add enableJava option
fixes https://github.com/NixOS/nixpkgs/issues/37045

(cherry picked from commit 9ede31bfbe)
2018-03-19 17:51:40 +01:00
Tim Steinbach
5bbfe48355 linux: 4.15.10 -> 4.15.11
(cherry picked from commit 80d0ccaaab)
2018-03-19 09:03:24 -04:00
Tim Steinbach
19daa8ca0d linux: 4.14.27 -> 4.14.28
(cherry picked from commit e9ce4c019b)
2018-03-19 09:03:19 -04:00
Tim Steinbach
6c3638cff5 linux: 4.9.87 -> 4.9.88
(cherry picked from commit c4963d395d)
2018-03-19 09:03:13 -04:00
Tim Steinbach
10c404acd2 linux: 4.4.121 -> 4.4.122
(cherry picked from commit 04f11faa68)
2018-03-19 09:03:08 -04:00
Vaibhav Sagar
e8f7e1e76c pythonPackages.thumbor: mark as broken under Python 3 2018-03-19 10:27:34 +01:00
Vladimír Čunát
27994f8cdf Merge #37335: wideland: fix build and .desktop
(cherry picked from commit 940fab424a)
2018-03-18 23:47:42 +01:00
Josef Kemetmüller
b964be2410 pythonPackages.tkinter: fix darwin build
(cherry picked from commit af0f9fa26b)
2018-03-18 23:24:03 +01:00
Daiderd Jordan
3b1e354a2c guile-lint: disable tests on darwin
(cherry picked from commit 4e1ab9d44c)
2018-03-18 22:29:19 +01:00
Pascal Wittmann
6759a03179 homebank: 5.1.7 -> 5.1.8 2018-03-18 20:51:16 +01:00
Pascal Wittmann
0b0bd0c8cc icmake: 9.02.06 -> 9.02.07 2018-03-18 20:45:58 +01:00
taku0
ac2378d812 firefox-esr: 52.6.0esr -> 52.7.2esr
(cherry picked from commit d947db7e3c)
2018-03-18 20:20:00 +01:00
taku0
548044350a nss: 3.34.1 -> 3.35; cacert.certdata2pem: 20160104 -> 20170717
(cherry picked from commit 16ee6b5ed9)
2018-03-18 20:19:52 +01:00
Ryan Mulligan
6924132355 spaceFM: 1.0.5 -> 1.0.6
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-wrapped -h` got 0 exit code
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-wrapped --help` got 0 exit code
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-wrapped --version` and found version 1.0.6
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm -h` got 0 exit code
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm --help` got 0 exit code
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm --version` and found version 1.0.6
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-installer-wrapped --help` got 0 exit code
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/.spacefm-installer-wrapped help` got 0 exit code
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm-installer --help` got 0 exit code
- ran `/nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6/bin/spacefm-installer help` got 0 exit code
- found 1.0.6 with grep in /nix/store/4hdgd1vlac5isgsb728f3qjpqcs2zxqp-spacefm-1.0.6
- directory tree listing: https://gist.github.com/1af4e8f53a36978c67e557c6c4c22b8d

(cherry picked from commit bb165a9d6f)
2018-03-18 18:50:24 +00:00
Maximilian Bode
b506cdbf90 spass: make gcc dependency explicit
(cherry picked from commit 9dc0f229ad)
2018-03-18 18:30:31 +01:00
Maximilian Bode
dda33d697d samtools: make gcc dependency explicit
(cherry picked from commit 92c5097c6d)
2018-03-18 18:30:15 +01:00
Daiderd Jordan
715338b4bb gnu-apl: fix clang build
/cc ZHF #36454

(cherry picked from commit ec15ef011a)
2018-03-18 18:13:29 +01:00
Pascal Wittmann
0184e3f8cc zim: 0.67 -> 0.68 2018-03-18 18:12:18 +01:00
Maximilian Bosch
6baf97fe61 pythonPackages.thumbor: 6.3.2 -> 6.4.2; fix build
Origianlly the package was broken as bumping `pythonPackages.pillow` to
5.x broke `thumbor`. The latest upstream version `6.4.2` solved this
issue, so a simple package bump was sufficient.

Furthermore the following changes were made:

- moved the expression into its own file
- added myself as maintainer in case of any further breackage
- re-enabled python3 build: 6.4.2 is fine with python3, however the
  `futures` dependency can't be satisfied anymore as it's part of
  Python3. Therefore a patch for `setup.py` will be applied for Python3
  buildsto drop the dependency

Note: the testsuite is disabled for now as several impure tests are done
and our testing environment seems to be unable to work the with the
natively compiled python modules properly.

Therefore I tested the module using the following expression:

``` nix
with import ./. {};

stdenv.mkDerivation {
  name = "thumbor-test";
  src = null;
  buildInputs = [ python pythonPackages.thumbor ];
}
```

Inside this nix shell `thumbor` works fine and the native modules can be
imported.

See https://hydra.nixos.org/build/71062729/log
See ticket #36453

(cherry picked from commit 23e6689578)
2018-03-18 17:19:08 +01:00
Robert Schütz
747a426ce6 pythonPackages.flake8-debugger: fix build
(cherry picked from commit 5c897bdd59)
2018-03-18 16:44:09 +01:00
Robert Schütz
1287bc21b2 pythonPackages.dlib: fix build
(cherry picked from commit 4779989c4e)
2018-03-18 16:44:09 +01:00
Robert Schütz
c310c64d71 pythonPackages.colander: 1.0 -> 1.4
(cherry picked from commit 93b10cd879)
2018-03-18 16:44:09 +01:00
Robert Schütz
b34d370eb7 pythonPackages.colander: move expression
(cherry picked from commit a6cbdeaef3)
2018-03-18 16:44:09 +01:00
Robert Schütz
18221dde69 pythonPackages.robomachine: fix build
(cherry picked from commit edc94294c8)
2018-03-18 16:44:09 +01:00
Robert Schütz
eecc751716 pythonPackages.allpairspy: init at 2.4.0
(cherry picked from commit bd7a7bd817)
2018-03-18 16:44:09 +01:00
Robert Schütz
ce032734c7 pythonPackages.pyshphere: uninit
Build is broken and project is unmaintained since 2013.

(cherry picked from commit 097dd635fa)
2018-03-18 16:44:09 +01:00
Robert Schütz
f999bc180b pythonPackages.pyhomematic: disable tests because of unreliable timimg
(cherry picked from commit 97e54c4f75)
2018-03-18 16:44:09 +01:00
Robert Schütz
f1f0134dbd pythonPackages.credstash: fix build
This applies https://github.com/fugue/credstash/pull/178.

(cherry picked from commit 14ed0f5fe0)
2018-03-18 16:44:09 +01:00
Robert Schütz
7a85df0ecd pythonPackages.odo: mark as broken
Odo is incompatible with Networkx 2.
See https://github.com/blaze/odo/pull/601.

(cherry picked from commit 0b6a2b2037)
2018-03-18 16:44:09 +01:00
Robert Schütz
e68997c03a klaus: move out of pythonPackages and 0.9.1 -> 1.2.2
(cherry picked from commit 19797d8464)
2018-03-18 16:44:09 +01:00
Robert Schütz
5141fe1cf3 pythonPackages.python-ctags3: init at 1.2.4
(cherry picked from commit bd3280fbae)
2018-03-18 16:44:09 +01:00
Robert Schütz
ee97df8432 pythonPackages.scikitlearn: disable doctests
fixes https://github.com/NixOS/nixpkgs/issues/35436

(cherry picked from commit cc305174e2)
2018-03-18 16:44:09 +01:00
Robert Schütz
e496420972 pythonPackages.hvac: 0.2.15 -> 0.5.0
(cherry picked from commit bc9dc2ccf1)
2018-03-18 16:44:09 +01:00
Robert Schütz
a5d75da87f pythonPackages.hvac: move expression
(cherry picked from commit 3394feaeef)
2018-03-18 16:44:09 +01:00
Robert Schütz
bf4578f62e pythonPackages.paypalrestsdk: 0.7.0 -> 1.13.1
(cherry picked from commit 5ec4b9d819)
2018-03-18 16:44:09 +01:00
Robert Schütz
d3c1ae3576 pythonPackages.paypalrestsdk: move expression
(cherry picked from commit ba5d1bb28b)
2018-03-18 16:44:09 +01:00
Robert Schütz
7249ff9d5b pythonPackages.pyamf: disable for Python 3
(cherry picked from commit 104f58d6a1)
2018-03-18 16:44:09 +01:00
Robert Schütz
244e3da862 pythonPackages.pushbullet: 0.10.0 -> 0.11.0 and fix build
(cherry picked from commit 4e35388878)
2018-03-18 16:44:09 +01:00
Robert Schütz
02a6deb7af pythonPackages.pushbullet: move expression
(cherry picked from commit 127f99e22e)
2018-03-18 16:44:08 +01:00
Robert Schütz
35ca4c5115 pythonPackages.moinmoin: disable for Python 3
(cherry picked from commit 7e8e3807f3)
2018-03-18 16:44:08 +01:00
Robert Schütz
f9def2f4e3 pythonPackages.readme_renderer: 17.2 -> 17.4
(cherry picked from commit 922b0cec82)
2018-03-18 16:44:08 +01:00
Robert Schütz
090ca7e47c pythonPackages.CommonMark: 0.6.3 -> 0.7.5
(cherry picked from commit d7d4ce735e)
2018-03-18 16:44:08 +01:00
Robert Schütz
9dfac9497d pythonPackages.CommonMark: move expression
(cherry picked from commit b549f18b6c)
2018-03-18 16:44:08 +01:00
Peter Hoeg
6e30c6b265 nixos home-assistant: a couple of fixes (#36338)
a) set path to /run/wrappers so ping works
b) run via a target so we can easily inject other components (config copier,
appdaemon)

(cherry picked from commit 2859483fe9)
2018-03-18 23:43:24 +08:00
Robert Schütz
6daee8c3f8 pythonPackages.tmdb3: 0.6.17 -> 0.7.2
(cherry picked from commit f76e8cb742)
2018-03-18 16:33:42 +01:00
Robert Schütz
5e4411f45b pythonPackages.tmdb3: move expression
(cherry picked from commit 9e29b4b269)
2018-03-18 16:33:29 +01:00
Benjamin Saunders
f2390ae057 matrix-synapse: 0.26.0 -> 0.26.1
Security hotfix

(cherry picked from commit cef5ed1bc2)
2018-03-18 14:33:33 +00:00
Peter Hoeg
199da0db1e home-assistant: support pushover
(cherry picked from commit e1080b0d43)
2018-03-18 21:03:38 +08:00
Jörg Thalheim
0b3170b874 python.pkgs.pushover: tests exists, but require network
(cherry picked from commit c3535901c3)
2018-03-18 21:03:25 +08:00
Jörg Thalheim
3ae19a3610 python.pkgs.pushover: there are no tests
(cherry picked from commit 3336a7b8ac)
2018-03-18 21:03:18 +08:00
Peter Hoeg
c68ed70878 pythonPackages.pushover: init at 0.3
(cherry picked from commit 1b129b0b54)
2018-03-18 21:03:00 +08:00
giraffito
0869801a69 nixos/security: fix description of sudo.wheelNeedsPassword
the previous description mistakenly described the opposite semantics

(cherry picked from commit b9639d7e1f)
2018-03-18 12:29:00 +00:00
Andreas Wiese
fce096accc nixos/window-managers: actually add evilwm to default.nix
Commit 1f2b938 introduced a module for evilwm as a window-manager, but
did not actually add this module to window-manager's default.nix which
renders it useless.

(cherry picked from commit c7e1dff94e)
2018-03-18 11:13:53 +00:00
Echo Nolan
3f6c94e3df workrave: fix alert sounds by including the right GST plugins
(cherry picked from commit 5b0985d055)
2018-03-18 10:51:10 +00:00
Echo Nolan
2380e3071c workrave: 1.10.7 -> 1.10.20
Also: switch to GTK-3, fix GSettings by using wrapGAppsHook.
(cherry picked from commit 250c19c746)
2018-03-18 10:51:09 +00:00
Vladimír Čunát
617d73f229 Merge #37264: archiveopteryx: fix build w/gcc7
(cherry picked from commit 214016c118)
2018-03-18 11:02:41 +01:00
Tim Steinbach
557aa6e7d7 curl: 7.58.0 -> 7.59.0
(cherry picked from commit 837ecc2f6a)
It fixes three vulnerabilities.
2018-03-18 10:52:47 +01:00
xeji
5aeb26da06 heapster: fix build
fetchFromGitHub returned a different sha256 for the same revision

(cherry picked from commit 690939730a)
2018-03-18 09:43:48 +00:00
Elis Hirwing
280ac9b471 gitea: fix usage over ssh
Using gitea over ssh had two isses:
 1. No shell was set for the user
 2. Gitea tried to write logs to
 /nix/store/x83q12kyd9gw1pay036dxz2dq0apf17h-gitea-1.3.2-bin/log when
 serving the ssh usage.

(cherry picked from commit fa76c9a385)
2018-03-18 09:42:23 +00:00
Vladimír Čunát
ebcf130a84 tremor: rename according to our docs
https://nixos.org/nixpkgs/manual/#sec-package-naming
I forgot to include this commit in the parent merge.

(cherry picked from commit bbe8c1e593)
2018-03-18 10:34:14 +01:00
Vladimír Čunát
ed6e9c5e19 Merge #37267: libvorbis, tremor: CVE-2018-5146 updates + SDL build impurity.
(cherry picked from commit 65cf335715)
2018-03-18 10:34:10 +01:00
Dmitry Kalinkin
f949149dc4 pyslurm: 20171102 -> 20170302 to fix after slurm bump
(cherry picked from commit 8b1fba582a)
2018-03-18 09:16:08 +00:00
Corey O'Connor
d64af3e40f jenkins: Add "java.awt.headless=true" to JDK options.
This is consistent with the recommended jenkins startup script. See:

* https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript

(cherry picked from commit 28a55f5bd6)
2018-03-18 08:54:39 +00:00
Corey O'Connor
83e6969c44 jenkins: Include Deja-Vu fonts in system environment to silence jenkins warning.
(cherry picked from commit 241160aacc)
2018-03-18 08:54:34 +00:00
rnhmjoj
592fb2c5a1 noteshrink: init at 0.1.1
(cherry picked from commit dc1c9fb251)
2018-03-18 09:39:57 +01:00
Richard Marko
4937ce0100 nixos manual: fix (n)of typo
(cherry picked from commit d5de7bbc92)
2018-03-18 08:35:45 +00:00
Jörg Thalheim
d0d3a639a3 telegraf: 1.5.1 -> 1.5.3
(cherry picked from commit d5c077b109)
2018-03-18 08:32:33 +00:00
Ryan Mulligan
5b2d17228c autofs: 5.1.3 -> 5.1.4
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/wbax6msw4jcf95a3b56rgb5qyy08v3gb-autofs-5.1.4/bin/automount -h` got 0 exit code
- ran `/nix/store/wbax6msw4jcf95a3b56rgb5qyy08v3gb-autofs-5.1.4/bin/automount --help` got 0 exit code
- ran `/nix/store/wbax6msw4jcf95a3b56rgb5qyy08v3gb-autofs-5.1.4/bin/automount -V` and found version 5.1.4
- ran `/nix/store/wbax6msw4jcf95a3b56rgb5qyy08v3gb-autofs-5.1.4/bin/automount --version` and found version 5.1.4
- ran `/nix/store/wbax6msw4jcf95a3b56rgb5qyy08v3gb-autofs-5.1.4/bin/automount -h` and found version 5.1.4
- ran `/nix/store/wbax6msw4jcf95a3b56rgb5qyy08v3gb-autofs-5.1.4/bin/automount --help` and found version 5.1.4
- found 5.1.4 with grep in /nix/store/wbax6msw4jcf95a3b56rgb5qyy08v3gb-autofs-5.1.4
- directory tree listing: https://gist.github.com/419a24d78045772aea1e7ca68b950f1f

(cherry picked from commit 6cd68c2ad9)
2018-03-18 09:04:25 +01:00
Michiel Derhaeg
d467692907 spotify: 1.0.69.336.g7edcc575-39 -> 1.0.72.117.g6bd7cc73-35
(cherry picked from commit febe728bf5)
2018-03-17 23:16:39 +00:00
Daiderd Jordan
8a7a75372b gargoyle: fix darwin build
/cc ZHF #36454

(cherry picked from commit 6da3ba48a7)
2018-03-17 22:20:53 +01:00
DarkScythe97
725c6f452b microcode-intel: 20171117 -> 20180312
(cherry picked from commit a4fd4e3af0)
2018-03-17 21:12:57 +01:00
Maximilian Bosch
039365d20f pythonPackages.tablib: fix build
`openpyxl` v5 breaks `tablib`, the following patch fixes the API
incompatibility: https://github.com/kennethreitz/tablib/pull/296

See https://hydra.nixos.org/build/70694938/log
See ticket #36453

(cherry picked from commit 4a0c0401b5)
2018-03-17 20:46:32 +01:00
Daiderd Jordan
88075cf435 libconfuse: fix tests on darwin
/cc ZHF #36454

(cherry picked from commit 1798563e62)
2018-03-17 19:41:33 +01:00
Daiderd Jordan
de8842891f far2l: fix clang build
/cc ZHF #36454

(cherry picked from commit 879f144d7f)
2018-03-17 18:48:48 +01:00
Robert Schütz
c8b6fd95d4 pythonPackages.wp_export_parser: uninit
Package is broken and umnaintained.
Upstream has not been updated since 2013.

(cherry picked from commit 94baae5e6b)
2018-03-17 16:30:42 +01:00
Vladimír Čunát
0e7c9b3281 Merge #37059: liferea: 1.12.1 -> 1.12.2 (bugfix)
(cherry picked from commit c3aadd5b4e)
2018-03-17 13:59:13 +01:00
xeji
6e6417c013 libdynd: fix build w/gcc7
(cherry picked from commit 4436d21dfa)
2018-03-17 13:58:40 +01:00
xeji
b1053e6191 rename: fix build
failed since there is no 'devdoc' output

(cherry picked from commit 6f01885fbe)
2018-03-17 13:58:17 +01:00
xeji
c1c6b00627 manticore: 2014.08.18 -> 2017.08.22, fix build
(cherry picked from commit 7ec30b3fcd)
2018-03-17 13:25:04 +01:00
xeji
deebf75a72 libs3: 2015-04-23 -> 2017-06-01, fix build
(cherry picked from commit 823b155adb)
2018-03-17 13:23:32 +01:00
xeji
c4e19a11bc itk: 4.11.0 -> 4.12.2, fix build 2018-03-17 13:17:41 +01:00
Maximilian Bosch
d862661b7c aspino: fix build
Aspino patched `libglucose` for their own uses, however they currently
depend on glucose v4.0.
(see e31c3b4e57/patches)

The patches don't apply properly on `glucose-4.1` anymore, furthermore
the new source directory caused the `bootstrap.sh` from `aspino` which
was supposed to apply the patches and recompile the setup to break.

Furthermore some minor changes to the derivation were introduced:

- upgraded from `2016-01-31` to `2017-03-09`
- the name contains an `-unstable-` infix as upstream has no releases
- instead of a `patchPhase` the `postPatch` hook will be used for
  `substituteInPlace` to keep advanced patching features from `nixpkgs`
  available.
- `patchShebangs` will be called to avoid impurities because of the
  implicit reliance on `/bin/sh`
- added myself as second maintainer to have more people available in
  case of any further breackage

See https://hydra.nixos.org/build/70688471/log
See ticket #36453
2018-03-17 13:07:35 +01:00
Ryan Mulligan
4062990844 lighttpd: 1.4.48 -> 1.4.49
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd -h` got 0 exit code
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd -V` and found version 1.4.49
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd -v` and found version 1.4.49
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd -h` and found version 1.4.49
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel -h` got 0 exit code
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel --help` got 0 exit code
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel help` got 0 exit code
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel -V` and found version 1.4.49
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel -v` and found version 1.4.49
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel --version` and found version 1.4.49
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel -h` and found version 1.4.49
- ran `/nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49/bin/lighttpd-angel --help` and found version 1.4.49
- found 1.4.49 with grep in /nix/store/zqq4z003jl443djfygasflfqk091wphx-lighttpd-1.4.49
- directory tree listing: https://gist.github.com/3f87cc8cd06f4c87b583c225172f1c2e

(cherry picked from commit f589e77842)
2018-03-17 11:22:33 +01:00
Jörg Thalheim
3c3e44a506 flexget: add disclaimer
(cherry picked from commit 7c680e1f39)
2018-03-17 09:56:00 +00:00
rnhmjoj
473fd8a01e flexget: 2.10.82 -> 2.13.5 2018-03-17 09:55:31 +00:00
Vladimír Čunát
0c52ab986b policycoreutils: fixup build with gcc7
Close #37148.  It's safer do disable warnings than to switch the compiler.
2018-03-17 09:36:17 +01:00
volth
0e00bd52bd rpm: 4.14.0 -> 4.14.1
(cherry picked from commit e47175638b)
2018-03-17 07:37:31 +00:00
Jude Taylor
2a32f6bc0c review comment
(cherry picked from commit ea1377419c)
2018-03-16 21:36:15 +01:00
Jude Taylor
f23e611426 fix whois build
(cherry picked from commit a34479850e)
2018-03-16 21:35:51 +01:00
Graham Christensen
5cef3289e7 Merge pull request #36923 from tokudan/ffb59-1803
firefox-bin: 58.0.2 -> 59.0
2018-03-16 10:35:06 -04:00
Nikolay Amiantov
9e3aa30b79 nvidiabl: 0.87 -> 2017-09-26
Fix build on newer kernels. Fixes #36356.

Thanks to yorickvP for suggestions and maintainership.

(cherry picked from commit 7cf6df8903)
2018-03-16 16:49:03 +03:00
Maximilian Bode
7f16996a35 kubernetes: use go 1.9 instead of 1.10
Build using go 1.10 fails due to an error in a vendored dependency
[Upstream Issue](https://github.com/kubernetes/kubernetes/pull/60373)

(cherry picked from commit 29be8dd70c)
2018-03-16 12:53:18 +00:00
Andreas Rammhold
e557b37549 dino: unstable-2018-02-11 -> unstable-2018-03-10
(cherry picked from commit 97ab4c1072)
2018-03-16 09:44:45 +00:00
Nikolay Amiantov
12a88b2c51 steam: improvements for native runtime
* Update dependencies using steam-native-runtime from Arch Linux as a
  reference.
* Remove native-only Steam Runtime, just use installed libraries
  instead.
* Mark native-only Steam as broken (due to segfault inside D-Bus). Seems it was
  already broken for a long time. Doesn't apply to steam-run.
* Some cleanups for chrootenv.

(cherry picked from commit 9c8137ca81)
2018-03-16 03:20:36 +03:00
Nikolay Amiantov
685cf3ee5e steam: don't add zoneinfo manually
We already have this done for FHS environments in general.

(cherry picked from commit 8332b7aef9)
2018-03-16 03:19:46 +03:00
Nikolay Amiantov
39099eafe8 buildFHSEnv: export TZDIR
This is needed since NixOS keeps tzdata in non-standard /etc/zoneinfo path.

(cherry picked from commit 9db2a3e638)
2018-03-16 03:19:29 +03:00
Nikolay Amiantov
af126c64fb libva1: init at 1.7.3
(cherry picked from commit a4a04528e4)
2018-03-16 03:17:42 +03:00
Tim Steinbach
90d01305fb vscode: 1.21.0 -> 1.21.1
(cherry picked from commit f93d4b6181)
2018-03-15 18:41:01 -04:00
Tim Steinbach
6fc7f86338 atom: 1.24.1 -> 1.25.0
(cherry picked from commit eed77950a9196ccb299e8af5da8f5388b63582f7)
2018-03-15 18:35:14 -04:00
Tim Steinbach
6dc10f3d04 linux-copperhead: 4.15.9.a -> 4.15.10.a
(cherry picked from commit ff9db1ffc4)
2018-03-15 16:28:36 -04:00
Elis Hirwing
812b2196fc gitea: enable and configure postgres service if selected as database
(cherry picked from commit 1ad75d0c50)
2018-03-15 14:04:09 -04:00
Tim Steinbach
e95d2412ac linux: 4.15.9 -> 4.15.10
(cherry picked from commit 64c5795c2be9c60e3d7ca716888e7b5a397a7d97)
2018-03-15 10:52:44 -04:00
Tim Steinbach
10e896f4e2 linux: 4.14.26 -> 4.14.27
(cherry picked from commit cad9fabfc26a6c2e31f61966b2e6a24e3f3acf16)
2018-03-15 10:52:35 -04:00
Robert Schütz
408c8c0678 home-assistant: 0.63.3 -> 0.65.5
(cherry picked from commit 306ee199a7)
2018-03-15 15:20:12 +01:00
Robert Schütz
27a8abf0e8 pythonPackages.aiohttp: 3.0.5 -> 3.0.9
(cherry picked from commit 7dfbb8c53c)
2018-03-15 15:20:06 +01:00
Robert Schütz
b1ef373069 pythonPackages.idna-ssl: 1.0.0 -> 1.0.1
(cherry picked from commit cdd2593da1)
2018-03-15 15:20:00 +01:00
Robert Schütz
fb3308d17a python36Packages.hbmqtt: 0.9.1 -> 0.9.2
(cherry picked from commit 81f0cf2cd5)
2018-03-15 15:19:54 +01:00
Timo Kaufmann
177e20c14e conan: Locally pin deps, enable tests
(cherry picked from commit 488835ec6e)
2018-03-15 13:55:14 +01:00
Maximilian Bosch
94ed4376e8 pythonPackages.diff_cover: fix build
In order to adjust the language with `LC_ALL` properly the
`glibcLocales` is needed as `checkInput`. This was the only thing
preventing the testsuite from passing.

See ticket #36453
See https://hydra.nixos.org/build/70682982/nixlog/3

(cherry picked from commit 7dd7638cba)
2018-03-15 12:57:19 +01:00
Augustin Borsu
52e6f6f60c python.spacy: 1.8.2 -> 2.0.9
(cherry picked from commit 22fdb0bd9d)
2018-03-14 23:44:37 +01:00
Augustin Borsu
6381f5a4ee python.ftfy: 5.3.0 -> 4.4.3
V5 only supports python3. Since at the moment the only packages
that use ftfy are spacy and textacy which both support
python2 and 3, I propose to roll back to v4 until another package
requires v5, at that point we can make a duplicate package.

(cherry picked from commit 8187d93da2)
2018-03-14 23:44:30 +01:00
Augustin Borsu
a2684671a1 add aborsu as maintainer
(cherry picked from commit 458ba30fa9)
2018-03-14 23:42:50 +01:00
Augustin Borsu
be85709dfb python.thinc: 6.5.1 -> 6.10.2
(cherry picked from commit 9478948f4d)
2018-03-14 23:41:15 +01:00
Augustin Borsu
4aa47178c9 python.murmurhash: 0.26.4 -> 0.28.0
(cherry picked from commit 2e67c8e030)
2018-03-14 23:40:57 +01:00
Augustin Borsu
92548bc6f0 python.msgpack-numpy: init 0.4.1
(cherry picked from commit 5568e25fa0)
2018-03-14 23:40:37 +01:00
Daiderd Jordan
95f07cc550 cdo: fix darwin build
/cc ZHF #36454

(cherry picked from commit 0c8e8ce7e8)
2018-03-14 23:16:56 +01:00
Daiderd Jordan
2401186d2c ccl: fix darwin build
/cc ZHF #36454

(cherry picked from commit ee6d0a7025)
2018-03-14 23:04:00 +01:00
Will Dietz
655704bf00 busybox: patchshebangs to fix build on "limited" /bin/sh builders
(cherry picked from commit b546c7440e)
2018-03-14 16:59:40 -05:00
taku0
37b31ea04f flashplayer: 28.0.0.161 -> 29.0.0.113
(cherry picked from commit 864f4ceba4)
2018-03-14 16:46:54 -05:00
Daiderd Jordan
af97515d70 cataclysm-dda: fix clang build
/cc ZHF #36454

(cherry picked from commit 5defdee634)
2018-03-14 22:43:19 +01:00
Will Dietz
1d5485c8c8 libdwarf: 20170709 -> 20180129
Upstream describes changes:

Fixes libdwarf/dwarfdump vulnerabilities related to detecting corrupt
DWARF and includes other small improvements

(cherry picked from commit 4bc0f88bb3)
2018-03-14 16:36:06 -05:00
Peter Simons
622c5bebbe haskell-SHA: fix compiler crash while trying to build the test suite on i686
Fixes https://github.com/NixOS/nixpkgs/issues/36949.

(cherry picked from commit 1583cc6449)
2018-03-14 21:24:44 +01:00
Peter Simons
0bdb853ef8 Fix cross-compilation builds of several Haskell packages some more.
(cherry picked from commit 2f2ad74369)
2018-03-14 21:09:34 +01:00
Will Dietz
32c2d99f01 gllvm: init at 2018-02-09
(cherry picked from commit 43c474457c)
2018-03-14 15:02:14 -05:00
Daiderd Jordan
07f1fe42bb python-selenium: fix darwin build
/cc ZHF #36454

(cherry picked from commit b02694dd45)
2018-03-14 21:00:57 +01:00
Tuomas Tynkkynen
b26595f873 nixos/qemu-vm: Add virtualized display + HID devices on AArch64
(cherry picked from commit 9e78baf5c7)
2018-03-14 21:55:32 +02:00
Peter Simons
736189fe74 Fix cross-compilation builds of several Haskell packages.
(cherry picked from commit 70467b9a12)
2018-03-14 20:51:13 +01:00
Josef Kemetmüller
490e46dea6 pythonPackages.pycurl: Fix darwin build
(cherry picked from commit 42555f6c7d)
2018-03-14 20:43:44 +01:00
Daiderd Jordan
6692ae9684 avian: fix darwin build
/cc ZHF #36454

(cherry picked from commit db691029d6)
2018-03-14 20:41:43 +01:00
Daiderd Jordan
7cb4bebacd python-tkinter: mark linux only
/cc ZHF #36454

(cherry picked from commit 9b044a1dba)
2018-03-14 19:53:48 +01:00
Josef Kemetmüller
f024b57f39 glm: fix darwin build
(cherry picked from commit 863fb7b86a)
2018-03-14 19:42:47 +01:00
Matthew Pickering
ec191e7d96 Only apply patch on darwin
(cherry picked from commit 4e96d0e2b7)
2018-03-14 19:35:15 +01:00
Matthew Pickering
4ab4af1bb5 Fix qca-qt5 build on darwin
(cherry picked from commit 2b114a8c29)
2018-03-14 19:35:03 +01:00
xeji
f2d24b8ec6 pythonPackages.nevow: fix build, 0.14.2->0.14.3
fix tests, minor update, move to development/python-modules/

(cherry picked from commit 9a10c55a8a)
2018-03-14 19:09:05 +01:00
Robert Schütz
683c5794b0 pythonPackages.csvkit: fix build
(cherry picked from commit c0466ef834)
2018-03-14 17:00:31 +01:00
Robert Schütz
b4645c3783 pythonPackages.mysql_connector_repackaged: uninit
Package has last been updated in 2012.
There is now also pythonPackages.mysql-connector.

(cherry picked from commit 198bdf39b6)
2018-03-14 16:59:04 +01:00
Robert Schütz
22f0d6474c pythonPackages.ecpy: disable for python 2
setup.py specifies
    python_requires='>=3'

(cherry picked from commit 9b37f0a06d)
2018-03-14 16:58:32 +01:00
Robert Schütz
0f1c8dded7 pythonPackages.konfig: fix tests
(cherry picked from commit 0862ca375c)
2018-03-14 16:58:03 +01:00
Robert Schütz
e666b54155 pythonPackages.konfig: move expression
(cherry picked from commit c7a6483309)
2018-03-14 16:57:57 +01:00
Robert Schütz
4116dd129d pythonPackages.promegranate: mark as broken
"pomegranate does not yet work with networkx 2.0"

(cherry picked from commit 882cf122be)
2018-03-14 16:56:51 +01:00
Robert Schütz
f50a31681e pythonPackages.faker: 0.8.8 -> 0.8.11
This fixes the build failure by adding a missing dependency and because 0.8.11 allows a newer version of ukpostcodeparser.

(cherry picked from commit 495bb794d1)
2018-03-14 16:52:42 +01:00
Robert Schütz
6121f5b376 pythonPackages.text-unidecode: init at 1.1
(cherry picked from commit 35ee24f966)
2018-03-14 16:52:35 +01:00
Robert Schütz
d2326197be pythonPackages.daphne: fix build and enable tests
(cherry picked from commit 40b0c58549)
2018-03-14 16:51:06 +01:00
Robert Schütz
6564e4f227 pythonPackages.green: 2.3.0 -> 2.12.0
(cherry picked from commit 2bdee9b0c3)
2018-03-14 16:42:17 +01:00
Robert Schütz
39609cc945 pythonPackages.xdot: move expression
(cherry picked from commit fac32de1db)
2018-03-14 16:41:37 +01:00
Robert Schütz
2bebfbd3cc pythonPackages.prov: fix build and enable tests
Tests do not actually take 60 minutes.

(cherry picked from commit 8f93cba89c)
2018-03-14 16:40:36 +01:00
Robert Schütz
88d768c59e pythonPackages.networkx: 1.11 -> 2.1
(cherry picked from commit 46d7d069ef)
2018-03-14 16:40:27 +01:00
Robert Schütz
736661ec4b pythonPackages.rednose: 1.2.1 -> 1.3.0
(cherry picked from commit 276fb96532)
2018-03-14 16:38:00 +01:00
Robert Schütz
82378f031a pythonPackages.termstyle: 0.1.10 -> 0.1.11
(cherry picked from commit 09ae15ea50)
2018-03-14 16:37:21 +01:00
Robert Schütz
6480eb59f7 pythonPackages.dbf: fix tests
(cherry picked from commit 84fbf2a410)
2018-03-14 16:36:15 +01:00
Robert Schütz
300ceef5c3 pythonPackages.curtsies: correct dependencies
(cherry picked from commit 674ceb9c2b)
2018-03-14 16:35:51 +01:00
Robert Schütz
480fb8c05e pythonPackages.bibtexparser: enable tests
(cherry picked from commit d322a5b3ec)
2018-03-14 16:35:26 +01:00
Robert Schütz
362b9457a0 pythonPackages.bibtexparser: add propagatedBuildInputs
(cherry picked from commit e1176503e9)
2018-03-14 16:35:13 +01:00
Robert Schütz
a34123b711 pythonPackages.binaryornot: 0.4.0 -> 0.4.4
(cherry picked from commit 4a9a7d3036)
2018-03-14 16:34:37 +01:00
Vladimír Čunát
ddc2ad4e2e Merge #36788: nextcloud-client: restrict to linux
(cherry picked from commit 883b26b98f)
2018-03-14 15:51:40 +01:00
Vladimír Čunát
857d5a086a Merge #36936: libsemanage: fixup build with gcc7
(cherry picked from commit 527ff9c5fd)
2018-03-14 15:47:18 +01:00
Robert Schütz
5e38637412 pythonPackages.ftputil: 3.3 -> 3.4 and fix tests
(cherry picked from commit 62bb869309)
2018-03-14 13:45:14 +01:00
Robert Schütz
1a4173a683 pythonPackages.ftputil: move expression
(cherry picked from commit 92896e2739)
2018-03-14 13:45:05 +01:00
Robert Schütz
81afea1f98 pythonPackages.django-polymorphic: fix tests
(cherry picked from commit ae56cc1f30)
2018-03-14 13:44:02 +01:00
Robert Schütz
8860315c20 pythonPackages.dj-database-url: init at 0.5.0
(cherry picked from commit 7b525acee2)
2018-03-14 13:43:49 +01:00
Robert Schütz
ab326cb02a pythonPackages.affinity: disable for Python 3
(cherry picked from commit 143fd427d4)
2018-03-14 13:42:37 +01:00
Robert Schütz
4d7ed482dc pythonPackages.pycups: fix on Darwin
(cherry picked from commit a5e1dfe3e2)
2018-03-14 13:42:19 +01:00
Robert Schütz
5ab9937099 pythonPackages.pycups: move expression
(cherry picked from commit 150d0b7428)
2018-03-14 13:42:13 +01:00
Robert Schütz
5f9ae3929b pythonPackages.ldappool: 1.0 -> 2.2.0
(cherry picked from commit 3680fc9fd4)
2018-03-14 13:42:00 +01:00
Robert Schütz
4298a313ad pythonPackages.ldappool: move expression
(cherry picked from commit f14c9ae883)
2018-03-14 13:41:53 +01:00
Robert Schütz
cd7765df84 pythonPackages.BlinkStick: patch for newer pyusb version
(cherry picked from commit bfe6d6ab34)
2018-03-14 13:40:47 +01:00
Robert Schütz
7c37a863e0 pythonPackages.BlinkStick: move expression
(cherry picked from commit 250aa352c4)
2018-03-14 13:40:38 +01:00
Robert Schütz
fda0d2fbbe pythonPackages.virtual-display: 0.1.5 -> 0.2.1 and disable tests
(cherry picked from commit 5d7f24e8b5)
2018-03-14 13:40:09 +01:00
Robert Schütz
fed17ce233 pythonPackages.virtual-display: move expression
(cherry picked from commit 7076991eec)
2018-03-14 13:40:02 +01:00
Robert Schütz
11d8ea3f8f pythonPackages.tunigo: fix tests
(cherry picked from commit c5d6e665c9)
2018-03-14 13:38:50 +01:00
Robert Schütz
beccfcd7a1 pythonPackages.tunigo: move expression
(cherry picked from commit cf5b06f9ce)
2018-03-14 13:38:42 +01:00
Piotr Bogdan
fa8e61d118 pingus: fix build with gcc7
(cherry picked from commit 2dfeb6fc53)
2018-03-14 12:57:37 +01:00
Michael Raskin
5687a38cb0 netsurfPackages.libcss: fix build by -Wno-error=implicit-fallthrough.
(cherry picked from commit 0077c7651c)
2018-03-14 12:09:28 +01:00
Michael Raskin
dcb1b693ef Merge pull request #36871 from vbgl/clingo-fix-url
clingo: fix URL
2018-03-14 11:51:59 +01:00
Michael Raskin
016274cc6c graphviz_2_32: restore libgraph, the reason to keep this version
(cherry picked from commit 352c567d1c)
2018-03-14 11:47:38 +01:00
Jörg Thalheim
136a39ee4d shuttle: disable buggy test on darwin
(cherry picked from commit ca1921eb5b)
2018-03-14 09:35:04 +00:00
volth
fd6d464cfc sshuttle: fix build on i686-linux
(cherry picked from commit f161fe06b8)
2018-03-14 09:35:04 +00:00
Badi Abdul-Wahid
85cbd5391a qtlocation: fix darwin build
A dependency (boost) makes use of `std::auto_ptr`, which is no longer
supported in C++17 in Clang. This change re-enables `std::auto_ptr`
capabilities.

(cherry picked from commit 833851cd6e)
2018-03-14 00:15:31 +01:00
Will Dietz
f9cb527902 virtualbox: 5.2.6 -> 5.2.8
Tested against all the VirtualBox VM tests.

Signed-off-by: aszlig <aszlig@nix.build>
Closes: #36127
(cherry picked from commit 273fd896bc)
Reason: The update is trivial in terms of affected packages and contains
        a bunch of Linux-specific fixes.
Signed-off-by: aszlig <aszlig@nix.build>
2018-03-13 23:38:20 +01:00
Peter Simons
3fcbb254fb hackage2nix: update list of failing Hydra builds 2018-03-13 22:04:08 +01:00
aszlig
b05df747cb nixos/tests/virtualbox: Work around test failures
I've started digging into the actual cause of the problem a week ago but
didn't continue fixing this.

The reason why the tests are failing is because
torvalds/linux/commit/72f5e08dbba2d01aa90b592cf76c378ea233b00b has
remapped the location of the TSS into the CPU entry area and we did
update our default kernel to version 4.14 in NixOS/nixpkgs@88530e02b6.

Back to VirtualBox: The guru meditation happens in
selmRCGuestTssPostWriteCheck, which I think is only a followup error. I
believe the right location couldn't be determined by VirtualBox and thus
the write check function triggers that panic because it's reading from
the wrong location.

So the actual problem *only* surfaces whenever we use software
virtualization, which we do for our tests because we don't have nested
virtualization available.

Our tests are also for testing the functionality of VirtualBox itself
and not certain kernel versions or kernel features, so for the time
being and until this is fixed, let's actually use kernel version 4.9 for
the guests within the VM tests. Kernel 4.9 didn't have the mentioned
change of the TSS location and thus the tests succeed.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @dtzWill
(cherry picked from commit ba816ee087)
2018-03-13 22:01:22 +01:00
volth
72fa68058e xfce: do not use old names
(cherry picked from commit fe70fbdefe)
2018-03-13 19:46:31 +01:00
Averell Dalton
4a573f8ae1 teamviewer: 12.0.85001 -> 12.0.90041
(cherry picked from commit 4b00e5c1a9)
2018-03-13 19:46:30 +01:00
Bart Brouns
2d3e899b06 qutebrowser: 1.1.1 -> 1.2.0
(cherry picked from commit f043e09e02)
2018-03-13 19:46:30 +01:00
Eli Flanagan
2a5231c403 timewarrior: enable for darwin
(cherry picked from commit e0bf8113bf)
2018-03-13 19:46:09 +01:00
Will Dietz
038560d68b metrics: fix "values" to be count not bytes, to match prev behavior
https://github.com/NixOS/nixpkgs/pull/36896#discussion_r174163744
(cherry picked from commit 29d46471e0)
2018-03-13 19:45:58 +01:00
Daiderd Jordan
5c5b188afd v8: only use -Wno-error=unused-lambda-capture with clang
(cherry picked from commit 15ee5ff446)
2018-03-13 19:23:48 +01:00
Daniel Frank
a64dea5c2f firefox-bin: 58.0.2 -> 59.0
(cherry picked from commit 43da40ecae)
2018-03-13 19:22:50 +01:00
Maximilian Bosch
9697a84a79 freeorion: fix build
`boost::system::posix_error` is deprecated since v1.37, however the
default Boost version in NixOS is 1.66.

The following upstream patch fixed the issue:
c9b5b13fb8

See ticket #36453

(cherry picked from commit 7da70c0b87)
2018-03-13 18:55:33 +01:00
Franz Pletz
a35928047c fetchurl: remove broken samba mirror
(cherry picked from commit 4f17851fb2)
2018-03-13 17:17:04 +01:00
Franz Pletz
6afb73a984 samba: 4.7.5 -> 4.7.6 for multiple CVEs
Fixes CVE-2018-1050, CVE-2018-1057.

(cherry picked from commit d2582dc92a)
2018-03-13 15:46:51 +01:00
Tim Steinbach
b7a4c0e3c0 samba: 4.7.4 -> 4.7.5
Also, fix kerberos dependency to include krb5kdc

(cherry picked from commit a14df21aae)
2018-03-13 15:46:51 +01:00
Lassulus
66ed24239d altcoins.bitcoin-unlimited: 1.0.2.0 - > 1.0.3.0 (#36715)
* altcoins.bitcoin-unlimited: 1.0.2.0 - > 1.0.3.0

* Update default.nix

(cherry picked from commit bfc75b5198)
2018-03-13 15:02:06 +01:00
Matthieu Coudron
075908d34b grub-install.pl: more details on blkid failure
(cherry picked from commit c476d2f592)
2018-03-13 15:02:05 +01:00
Matthieu Coudron
3264fe594d build-vm: remove trailing dot from script path
Allow to double click/middle click paste path a bit quicker.

(cherry picked from commit 7b7860ff89)
2018-03-13 15:02:05 +01:00
Matthieu Coudron
2c8a6a879c qemu-vm: removes warning when running build-vm
get rid of deprecated qemu commands

(cherry picked from commit b7a2333ebe)
2018-03-13 15:02:05 +01:00
Timo Kaufmann
570cf67110 conan: Fix build
conan has very strict requirements on the versions of its dependencies.
This patch adds downgraded versinos of node-semver and distro to
statisfy these requirements.

(cherry picked from commit 5fdfe61b35)
2018-03-13 15:02:04 +01:00
Luke Adams
9a02553f8a sambaMaster: 4.8.0_2018-01-25 -> 2018-03-09
(cherry picked from commit da45e8d099)
2018-03-13 15:02:04 +01:00
Antoine Eiche
763ec32dd7 tests/docker-tools: add onTopOfPulledImage test
(cherry picked from commit bc1e8f95d4)
2018-03-13 15:02:04 +01:00
Antoine Eiche
7ad7c976d8 dockerTools: add an onTopOfPulledImage example
This allows to test if a pulled image can be updated by using our
Docker tools.

(cherry picked from commit e8f452f110)
2018-03-13 15:02:03 +01:00
Will Dietz
1f9ffb4004 metrics: fixup sed expr to work with Nix 2
(cherry picked from commit 5eb07e2396)
2018-03-13 15:02:03 +01:00
adisbladis
06e99e0a7f overmind: init at 1.1.1
(cherry picked from commit ce78db79a3)
2018-03-13 15:02:03 +01:00
Bart Brouns
75f8209e3b i3: 4.14.1 -> 4.15
(cherry picked from commit cfa4c065d9)
2018-03-13 15:02:02 +01:00
Michael Weiss
2271731c30 androidStudioPackages.{dev,canary}: init at 3.2.0.5
Switch the naming scheme to the channel names.

(cherry picked from commit 74d922638b)
2018-03-13 15:02:02 +01:00
Michael Weiss
a14d18e39b androidStudioPackages.beta: 3.1.0.12 -> 3.1.0.14
(cherry picked from commit 310a665b98)
2018-03-13 15:02:02 +01:00
Nikolay Amiantov
1769af7a28 android-studio: fix GTK LaF
Closes #36887.

(cherry picked from commit d7470c1f1e)
2018-03-13 16:13:43 +03:00
Sander van der Burg
98bc0c37bf airfield: regenerate with node2nix 1.5.3
(cherry picked from commit ebb562d29a)
2018-03-13 10:47:26 +01:00
Sander van der Burg
41f93c6273 nixui: regenerate with node2nix 1.5.3
(cherry picked from commit e2cb020a27)
2018-03-13 10:47:05 +01:00
Sander van der Burg
f04f613270 remarkjs: regenerate dependencies with node2nix 1.5.3
(cherry picked from commit 3a5e38fa00)
2018-03-13 10:46:46 +01:00
Sander van der Burg
74f70f91a2 zed: regenerate packages with node2nix 1.5.3
(cherry picked from commit f9bb730d77)
2018-03-13 10:46:28 +01:00
Johannes Frankenau
3d5ae7dd9c gitea: 1.3.2 -> 1.3.3
(cherry picked from commit fa9950c0ae)
2018-03-12 22:45:58 -04:00
xeji
ad6601bc06 rush: fix build
see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853649

(cherry picked from commit 50d3c09e67)
2018-03-13 01:35:24 +01:00
Symphorien Gibol
d75137ece7 ssr: fix build
ssr uses the deprecated get_generic_category() in ./configure
pass the flag enabling that to boost

(cherry picked from commit 7ba5a94e35)
2018-03-13 01:33:52 +01:00
Yuriy Taraday
14d6a5dd23 bitcoin-unlimited: fix build with boost 1.66
Use part of fix for mainline bitcoin:
1ec0c0a01c

Also enable parallel builds for speed.

(cherry picked from commit 876420f04e)
2018-03-13 01:33:52 +01:00
Franz Pletz
bfb9424e13 nodePackages: fix evaluation
Introduced in 40e3ad60aa.

(cherry picked from commit 2c9d2d6526)
2018-03-13 00:45:14 +01:00
xeji
ef49c300a6 ufraw: fix build by using gcc6
doesn't build with gcc7 due to ill-formed upstream code,
see https://gcc.gnu.org/gcc-7/porting_to.html#cmath

(cherry picked from commit 817cd00bb9)
2018-03-13 00:41:37 +01:00
xeji
f275ec88ad torque: fix build w/gcc7
(cherry picked from commit db2b306747)
2018-03-13 00:41:37 +01:00
xeji
380dac18a0 vxl: fix build by using gcc6
upstream code incompatible w/gcc7. no newer version available.

(cherry picked from commit 0367a6235c)
2018-03-13 00:41:36 +01:00
Maximilian Bosch
c8adc90361 pythonPackages.gplaycli: 0.1.2 -> 3.21
Fix the broken package: https://hydra.nixos.org/build/70687256/log

The newer version requires two new dependencies that have been added as
well:

- gpapi (Unofficial Python API for Google Play) at version 0.4.2
- pyaxmlparser (Parser for Android's XML handler) at version 0.3.7

See ticket #36453
See https://hydra.nixos.org/build/70687256/log

(cherry picked from commit 4feaaa7f06)
2018-03-13 00:41:36 +01:00
Maximilian Bosch
5ceb25c217 pythonPackages.asana: fix build
Fetching sources from GitHub to have needed files like `LICENSE` and
tests available to provide safer builds.

See https://hydra.nixos.org/build/70676254/log
See ticket #36453

(cherry picked from commit 17e1795db0)
2018-03-13 00:41:36 +01:00
xeji
36eee0b9a3 dislocker: 0.6.1 -> 0.7.1
(cherry picked from commit 2d70431553)
2018-03-13 00:41:35 +01:00
xeji
a332101652 codeblocks: 16.01 -> 17.12, fix build
(cherry picked from commit 58b7f17a0f)
2018-03-13 00:41:35 +01:00
xeji
2062aef4f0 jfbview: mark as broken (upstream issue)
incompatible with current libmupdf:
https://github.com/jichu4n/JFBView/issues/17
does not appear actively maintained.

(cherry picked from commit a4f53eae2c)
2018-03-13 00:41:35 +01:00
Yuri Aisaka
050ad5dd36 cpp-gsl: treat sign-conversion as warning (#36630)
(cherry picked from commit 77e2f28b45)
2018-03-13 00:41:34 +01:00
WilliButz
442da8b898 grafana: 5.0.0 -> 5.0.1
(cherry picked from commit ef90ff2d8e)
2018-03-13 00:39:44 +01:00
Ryan Mulligan
378041f1b6 sdcc: 3.6.0 -> 3.7.0
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/as2gbmap -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/as2gbmap --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcdb -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcdb --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/s51 -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/s51 -v` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sz80 -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sz80 -v` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/stlcs -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/stlcs -v` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/shc08 -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/shc08 -v` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sstm8 -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sstm8 -v` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdar -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdar --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdar -h` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdar --help` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdranlib -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdranlib --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdranlib -h` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdranlib --help` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdobjcopy -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdobjcopy --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdobjcopy -h` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdobjcopy --help` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdnm -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdnm --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdnm -h` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdnm --help` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/packihx -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/packihx --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/makebin -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcpp --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcc -h` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcc --help` got 0 exit code
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcc -v` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcc --version` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcc -h` and found version 3.7.0
- ran `/nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0/bin/sdcc --help` and found version 3.7.0
- found 3.7.0 with grep in /nix/store/5xwjrizy4782acsnrjjfpypif8yjp41n-sdcc-3.7.0

(cherry picked from commit 29ea34c6db)
2018-03-13 00:30:28 +01:00
Sander van der Burg
89242aadcc nodePackages: regenerate with node2nix 1.5.3 2018-03-13 00:13:12 +01:00
Maximilian Bosch
f0da9baaa4 pythonPackages.mt-940: fix build (#36784)
- added missing `enum34` dependency
- enabled tests
- moved expression into its own file

See ticket #36453
See https://hydra.nixos.org/build/70677609/log

/cc @the-kenny
2018-03-12 23:36:04 +01:00
Nikolay Amiantov
52d6b940ff warsow: add missing patch
(cherry picked from commit 28264de9fc)
2018-03-13 01:12:29 +03:00
Nikolay Amiantov
0f558b07e3 warsow: 1.03 -> 2.1.2
Fix build, split into engine and game to build engine on Hydra.

(cherry picked from commit 5ed883a40b)
2018-03-13 01:11:09 +03:00
Nikolay Amiantov
99901537c7 dfhack: fix checksum
Fixes #36819.

(cherry picked from commit 2dfbef2764)
2018-03-13 01:11:02 +03:00
Nikolay Amiantov
8f7a7dfbdd xgboost: disable on AArch64
It requires SSE2.

(cherry picked from commit 5e9e30799b)
2018-03-13 01:10:49 +03:00
Amine Chikhaoui
8be8c91d0a pcstat: init at 2017-05-28 (#33643)
(cherry picked from commit d5dd7f4413)
2018-03-12 23:02:25 +01:00
symphorien
0cc0001756 wxhexeditor: 0.22 -> 0.24 (#36832)
(cherry picked from commit 991e5ca486)
2018-03-12 22:44:23 +01:00
Vladyslav M
b9cfe0cefb hplip: 3.17.10 -> 3.17.11
(cherry picked from commit be6d9e1e69)
2018-03-12 22:44:22 +01:00
Lenz Weber
d6986819fb gitkraken: 3.3.4 -> 3.4.0
(cherry picked from commit e11f0aee7c)
2018-03-12 22:32:47 +01:00
Markus Kowalewski
55f626e58f beegfs: 6.17 -> 6.18
(cherry picked from commit 11d40d5331)
2018-03-12 22:31:22 +01:00
Niklas Hambüchen
0c077427e1 nixos-container: Fix destroy terminating before it's done. Fixes #32545.
This also fixes the race condition found in #32551.

And it fixes nixops's repeated destroy/deploy being broken
(https://github.com/NixOS/nixops/issues/809).

(cherry picked from commit 5d83988c1e)
2018-03-12 22:29:04 +01:00
Franz Pletz
a3d87f1ed8 nixos/tests/containers-tmpfs: fix test name
(cherry picked from commit b0fa004fa9)
2018-03-12 22:28:51 +01:00
Johannes Frankenau
2783e4e755 wireguard: 0.0.20180218 -> 0.0.20180304
(cherry picked from commit a0cc592c3e)
2018-03-12 22:14:44 +01:00
Lloyd Hazlett
60d6d53eee spideroak: 6.1.9 -> 7.0.1
(cherry picked from commit 47c7ad14ef)
2018-03-12 22:10:21 +01:00
Sarah Brofeldt
9dbc763949 nixos/tests/acme: use mail-test-srv tls certs from source
(cherry picked from commit df3706c47c)
2018-03-12 22:10:20 +01:00
Sarah Brofeldt
665c75eccb nixos/tests/acme: go compat update, unvendor pkcs11
(cherry picked from commit bd35580860)
2018-03-12 22:10:20 +01:00
Daiderd Jordan
449ad50644 libcdio: fix darwin build
/cc ZHF #36454

(cherry picked from commit af041b34a2)
2018-03-12 21:35:07 +01:00
Daiderd Jordan
30c9664568 libpar2: fix clang build
/cc ZHF #36454

(cherry picked from commit 4ba61cd136)
2018-03-12 21:24:48 +01:00
Daiderd Jordan
7fbb31a12b sslscan: fix clang build
/cc ZHF #36454

(cherry picked from commit 0fdbf3edeb)
2018-03-12 21:14:48 +01:00
Daiderd Jordan
9bf324b5d0 v8: fix clang build
/cc ZHF #36454

(cherry picked from commit 0c629e9c23)
2018-03-12 21:09:52 +01:00
Vladimír Čunát
ec46986f86 Merge #36764: bip: fixup build with gcc7
(cherry picked from commit 8eca63588d)
2018-03-12 20:35:37 +01:00
Daiderd Jordan
545665b51a xarchiver: fix darwion build
/cc ZHF #36454

(cherry picked from commit c5d531ddfb)
2018-03-12 20:34:06 +01:00
Vladimír Čunát
580d00d507 Merge #36686: darling-dmg: fix build with gcc7
(cherry picked from commit 1d968d180a)
2018-03-12 20:29:56 +01:00
Vladimír Čunát
bb88585479 Merge #36626: libgroove: fix build
(cherry picked from commit 8a74c75e22)
2018-03-12 20:22:38 +01:00
Vladimír Čunát
0092cf65e9 Merge #36807: fcgiwrap: avoid failure on warning
(cherry picked from commit b0b1de897f)
2018-03-12 20:22:34 +01:00
Johannes Frankenau
b999b5e80c bcal: 1.7 -> 1.8
The tests failed for a good reason on Darwin and should not have been
disabled. The issue has been resolved upstream with version 1.8 which
now also supports AArch64.

(cherry picked from commit 59cc47d802)
2018-03-12 19:49:52 +01:00
Josef Kemetmüller
6b44b2ee32 pythonPackages.shapely: fix darwin build
(cherry picked from commit 74b81ea91c)
2018-03-12 19:43:20 +01:00
Josef Kemetmüller
a333b11963 petsc: fix darwin build
(cherry picked from commit edef344458)
2018-03-12 19:12:04 +01:00
Matthias Beyer
c568f4d21a lumail: Use lua5.1
This is necessary because the standard library which is distributed with
lumail (the lumail core configuration so to speak) is written for lua5.1
apparently.

The website states 5.1 or 5.2 or 5.3, but 5.2 fails because "loadstring"
was deprecated in lua 5.2.

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 13e95f33db)
2018-03-12 16:38:44 +00:00
Matthias Beyer
556857bc22 lumail: Fix package definition
Includes:

* Package gets a flag to use the debug build
* install phase installs all lua scripts from the package and makes
  lumail find them
* global configuration which is shipped with the package can be
  overridden, if desired
* parallel building enabled

(cherry picked from commit bb8e1c4512)
2018-03-12 16:38:44 +00:00
Matthias Beyer
a215099636 lumail: 2.9 -> 3.1
(cherry picked from commit 29c33ba5af)
2018-03-12 16:38:43 +00:00
Rok Garbas
d4fc1a0c0b vimPlugins: updating all vim plugings 2018-03-12 14:32:45 +01:00
John Children
11caaec824 LanguageClient-neovim: 2017-12-05 -> 2018-03-06
Following up from issue #33391, building LanguageClient-neovim now
requires some rust dependencies. This patch makes the plugin now longer
listed in vim-plugin-names file so that it will not be automatically
generated and instead lists it in non-generated plugins.

Also adds rustPlatform to arguments for vim plugins set.
2018-03-12 14:32:45 +01:00
Peter Simons
5065d28a1c hackage-packages.nix: fix gnome3-related evaluation errors
The file was generated by hackage2nix v2.9-5-g32974fc using Hackage at
2018-03-11T00:47:10Z (3efaeb24c3f48ef7f430beea9e9274c535a81c12).
2018-03-12 14:20:17 +01:00
Sander van der Burg
6afcd42e3b nodejs: patch bundled node-gyp module to not invoke xcodebuild on macOS causing modules with native dependencies to fail
(cherry picked from commit 634cbfa8f2)
2018-03-12 13:19:15 +01:00
Izorkin
ce68ae5d9a nftables: 0.8.2 -> 0.8.3
(cherry picked from commit c10b7a7d27)
2018-03-12 11:52:35 +00:00
Silvan Mosberger
313dab0c3f resilio: Adjust option description to 3d17573
(cherry picked from commit 86ca617948)
2018-03-12 11:05:27 +00:00
Tuomas Tynkkynen
1f34ba8343 nix: Fix build on ARMv6
(cherry picked from commit 22df741045)
2018-03-11 21:24:18 +02:00
Robert Helgesson
9ac481091f josm: 13478 -> 13500
(cherry picked from commit 37f6b0ff9c)
2018-03-11 19:45:52 +01:00
Tim Steinbach
62bdacf6bd rofi: Fix patches
(cherry picked from commit edec57043e)
2018-03-11 14:22:25 -04:00
Tim Steinbach
80a280f609 linux-copperhead: 4.15.8.a -> 4.15.9.a
(cherry picked from commit a5a14c3e5e0899ca836fcdca366f3ac8c20fd973)
2018-03-11 13:49:07 -04:00
Tim Steinbach
cb47e35408 linux: 4.4.120 -> 4.4.121
(cherry picked from commit 376c1272d74eae5f522b3ae3d02214705c96f290)
2018-03-11 13:49:00 -04:00
Tim Steinbach
656e1561f8 linux: 4.9.86 -> 4.9.87
(cherry picked from commit 06d5f03359b68b513090bd5e05156f7148e96e5d)
2018-03-11 13:48:54 -04:00
Tim Steinbach
7ec3ba485d linux: 4.14.25 -> 4.14.26
(cherry picked from commit 1e319c70e0322264871e2aba5ccc477447f4e4f8)
2018-03-11 13:48:48 -04:00
Tim Steinbach
131f9a4fe1 linux: 4.15.8 -> 4.15.9
(cherry picked from commit 3d7c5af2583dfa2033051267b6d5e926b8c4e562)
2018-03-11 13:48:42 -04:00
Tim Steinbach
f57a786cfb vscode: 1.20.1 -> 1.21.0
(cherry picked from commit 46037503f6)
2018-03-11 13:35:33 -04:00
Tim Steinbach
8fb34d8fc2 rofi: 1.4.2 -> 1.5.0
(cherry picked from commit de5a77c12f2dd8df2e88712867b0e2f659f927f5)
2018-03-11 13:24:32 -04:00
Peter Simons
b8ebbc0e3d Synchronize Haskell infrastructure with master @ f62deb0f92. 2018-03-11 16:08:16 +01:00
Michael Raskin
b6bd99869d Merge pull request #36794 from xeji/deprecate-xen-4-5-on-18-03
xenPackages: deprecate Xen 4.5 on 18.03, security support ended
2018-03-11 14:14:52 +00:00
Badi Abdul-Wahid
2f93afbd51 languagemachines: fix darwin build
(cherry picked from commit ff0f112527)
2018-03-11 15:11:38 +01:00
Badi Abdul-Wahid
81f8347c01 libtar: add darwin to supported platforms
(cherry picked from commit 3117ae6c4f)
2018-03-11 15:11:25 +01:00
Josef Kemetmüller
f9387d8e33 pythonPackages.discid: fix darwin build
(cherry picked from commit 57d862fecf)
2018-03-11 14:40:44 +01:00
Josef Kemetmüller
328a1c6ea2 pythonPackages.construct: Fix darwin build
The package runs fine on darwin. Using pytest as a test runner also
resolves the checkPhase issue on Python 3.5+.

(cherry picked from commit 91a9453496)
2018-03-11 14:38:56 +01:00
Josef Kemetmüller
bdb9c3b4e9 pythonPackages.regex: fix darwin build
The package works fine on darwin. We run some tests to prove this.

(cherry picked from commit d289736def)
2018-03-11 14:30:05 +01:00
Josef Kemetmüller
fc3b588207 mpv: fix darwin build
The optional video acceleration api (vaapi) is not supported on darwin.

(cherry picked from commit 38c589b5d0)
2018-03-11 13:21:20 +01:00
Josef Kemetmüller
013d0ba929 pythonPackages.robotframework: fix darwin build
(cherry picked from commit 8f9e814132)
2018-03-11 12:35:13 +01:00
Jan Malakhovski
af64b8d165 xenPackages: deprecate Xen 4.5, security support ended
cherry-picked from commit 3e3d72b95a
and resolved conflicts
2018-03-11 12:05:06 +01:00
Moritz Maxeiner
af554ad3cc Remove myself as maintainer
(cherry picked from commit 12a70fd571)
2018-03-11 09:00:38 +01:00
Maximilian Bosch
3b75b1004d pythonPackages.htmltreediff: fix build
- add `pythonPackages.nose` as `checkInput` to make the tests passing
- extract expression into its own file

See https://hydra.nixos.org/build/70680974/log
See ticket #36453

(cherry picked from commit 94458721a7)
2018-03-11 08:35:42 +01:00
Frederik Rietdijk
5b772cd2a5 python.pkgs.humanize: enable darwin build
(cherry picked from commit e2e4df611e908a5738a8d6913d75e0334f78a007)
2018-03-11 08:31:31 +01:00
lassulus
252397d7c1 altcoins.memorycoin: use boost165
(cherry picked from commit 8684de926c)
2018-03-10 22:08:38 +00:00
Nikolay Amiantov
6233a34505 zandronum: sound improvements
* Update fmod version to one with PulseAudio support;
* Dynamically link FluidSynth instead of using LD_LIBRARY_PATH;
* Use system libgme.

Fixes sound on some machines.

(cherry picked from commit f7c2288cfc)
2018-03-11 00:06:18 +03:00
Nikolay Amiantov
035c9265d3 buildFHSEnv: fix compiler search paths
Fixes OpenWrt compilation.

(cherry picked from commit 94f0ef6628)
2018-03-11 00:06:15 +03:00
xeji
3708494230 kore: fix build with gcc7
(cherry picked from commit 41cdea68da)
2018-03-10 13:17:36 -05:00
Timo Kaufmann
b43fbc45f4 blackmagic: Revert to gcc6
(cherry picked from commit 6b53a7cd09)
2018-03-10 18:23:50 +01:00
Michael Raskin
d19d0544bd Merge pull request #36690 from YorikSar/fix-chromium-build
chromium: fix GCC 7 related build issues
(cherry picked from commit cac24ccbe9)
2018-03-10 17:26:03 +01:00
lassulus
0bd5b4aa99 altcoins.btc1: 1.14.5 -> 1.15.1
(cherry picked from commit 0c15e1d1ee)
2018-03-10 16:11:08 +00:00
lassulus
330204b212 altcoins.dogecoin: use boost165
(cherry picked from commit 54572276ec)
2018-03-10 16:09:33 +00:00
lassulus
0585d51567 namecoin: nc0.13.0rc1 -> nc0.15.99-name-tab-beta2
(cherry picked from commit e50c1ad98a)
2018-03-10 16:07:13 +00:00
Jörg Thalheim
a32fcfd0da ht: fix gcc7 compilation
(cherry picked from commit 672e808dd3)
2018-03-10 16:01:32 +00:00
Silvan Mosberger
c536d4030b nixos/network-interfaces: Fix 2 small typos
(cherry picked from commit 08704aa2f7)
2018-03-10 15:56:16 +00:00
Lancelot SIX
c5ba8b96e9 pythonPackages.daphne: 2.0.3 -> 2.1.0
(cherry picked from commit ddddca5c2f)
2018-03-10 14:56:36 +01:00
Lancelot SIX
6ac7a6f909 pythonPackages.asgiref: 2.1.5 -> 2.2.0
(cherry picked from commit 38753d52bc)
2018-03-10 14:56:29 +01:00
Lancelot SIX
fa8607a4c7 pythonPackages.asgi_redis: drop
This was part of django-channel-1.x. The current version (2) does not
use it anymore

(cherry picked from commit dadba1cce3)
2018-03-10 14:56:22 +01:00
Lancelot SIX
57b6a82d95 pythonPackages.asgi_ipc: drop
This wath used for django-channels-1.x. The current version (2) does
not use it anymore

(cherry picked from commit 1347f90953)
2018-03-10 14:56:14 +01:00
lassulus
061f2bd51b altcoins.freicoin: fix hash
(cherry picked from commit 00c2008bee)
2018-03-10 12:59:39 +00:00
Robin Gloster
12a39b0f92 rugged: fix build
(cherry picked from commit 83ee88e70f)
2018-03-10 13:00:52 +01:00
Michael Raskin
f9f9c47419 mupdf: import upstream patches for CVEs: 2017-17858, 2018-1000051, 2018-6187, 2018-6192
(cherry picked from commit f2f7b0579b)
2018-03-10 12:58:36 +01:00
Robin Gloster
2b9270f54c errbot: fix build
Those version specs only exist to keep compat with python 3.3 which we
are not using anyway.

(cherry picked from commit 560b2bce6ce84628f97e242a3015201378a90eef)
(cherry picked from commit 679580be35)
2018-03-10 12:58:01 +01:00
Robert Schütz
a8aacac1bd pythonPackages.aiohttp: 3.0.1 -> 3.0.5
(cherry picked from commit 3387115364)
2018-03-10 12:50:42 +01:00
Frederik Rietdijk
da702c3ecb Python: fix update script for nix 2.0
(cherry picked from commit b92d994501)
2018-03-10 12:41:47 +01:00
Frederik Rietdijk
237391c8a8 python.pkgs.odo: disable failing test
(cherry picked from commit 2c406f6329)
2018-03-10 12:37:04 +01:00
Frederik Rietdijk
58cc2513d8 python.pkgs.datashape: disable several tests
(cherry picked from commit 5c1c6a3071)
2018-03-10 12:36:57 +01:00
lassulus
ece5594fd0 altcoins.litecoin: 0.14.2 -> 0.15.1
(cherry picked from commit 1bad821710)
2018-03-10 11:36:05 +00:00
Ryan Mulligan
379c3fd1cf taktuk: 3.7.5 -> 3.7.7
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk -h` got 0 exit code
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk --help` got 0 exit code
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk help` got 0 exit code
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk -v` and found version 3.7.7
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk --version` and found version 3.7.7
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk version` and found version 3.7.7
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk -h` and found version 3.7.7
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk --help` and found version 3.7.7
- ran `/nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7/bin/taktuk help` and found version 3.7.7
- found 3.7.7 with grep in /nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7
- found 3.7.7 in filename of file in /nix/store/l4zd353icm418x6asy4123a3gcpy14cr-taktuk-3.7.7

(cherry picked from commit c995db0853)
2018-03-10 12:16:07 +01:00
Elis Hirwing
124228bcfa polib: move to own file and fix homepage
(cherry picked from commit b6fc08795e)
2018-03-10 12:14:13 +01:00
Elis Hirwing
22b9e5d37f progressbar: move to own file and fix homepage
(cherry picked from commit 6c55f5479d)
2018-03-10 12:12:12 +01:00
Elis Hirwing
0cf830ecb6 publicsuffix: move to own file and fix homepage
(cherry picked from commit 605a373468)
2018-03-10 12:11:22 +01:00
Elis Hirwing
9a6e742e94 pyjade: move to own file and fix homepage
(cherry picked from commit 77330e18f4)
2018-03-10 12:06:29 +01:00
Frederik Rietdijk
2f3ea8863d Python: introduce toPythonApplication function
This commit introduces the `toPythonApplication` function. Certain
Python packages are considered both a library and an application, that
is, they expose importable modules, but typically executables that are
part of the package are used instead.

In this case, the package needs to be added to `python-packages.nix` in
order for it to be available as a library. An alias with this function
can then be added in `all-packages.nix`, e.g.:

```
ansible = with pythonPackages; toPythonApplication ansible;
```

(cherry picked from commit 03e54c5e88)
2018-03-10 12:05:06 +01:00
Elis Hirwing
ff94b5ced4 pychart: move to own file
Also update website and download of source.

(cherry picked from commit f1795e3957)
2018-03-10 12:03:04 +01:00
Elis Hirwing
8088cd2fbe proboscis: move to own file and fix homepage
(cherry picked from commit b29348257a)
2018-03-10 11:01:32 +00:00
Hugo Tavares Reis
db7068e685 nixnote2: fix icon and version
(cherry picked from commit 6e5cd9cbfb)
2018-03-09 20:46:34 +00:00
Vladimír Čunát
08d2a6a981 Merge #36680: apvlv: fix build with gcc7
(cherry picked from commit 922d55aae8)
2018-03-09 21:10:27 +01:00
Vladimír Čunát
7086687469 Merge #36663: hexcurse: fix build with gcc7
(cherry picked from commit 0ce2f04a04)
2018-03-09 20:51:59 +01:00
Vladimír Čunát
280b912570 Merge #36644: caffe2: fix compilation on gcc7
(cherry picked from commit b441512ced)
2018-03-09 20:50:00 +01:00
Vladimír Čunát
99dcf80e4b Merge #36645: mps: fix build with gcc7
(cherry picked from commit 897cecfb13)
2018-03-09 20:49:56 +01:00
Vladimír Čunát
d9f179252d WIP:
waiting for https://github.com/NixOS/nixos-org-configurations/pull/39
2018-03-09 20:49:56 +01:00
Matthew Bauer
e06c2d9cfe network_cmds: fix on darwin
(cherry picked from commit c7abef4c5d)
2018-03-09 19:33:41 +01:00
Matthew Bauer
33a4313eba darwin: disable broken packages
(cherry picked from commit 54e2c28b09)
2018-03-09 19:33:26 +01:00
Tim Steinbach
5d1b222116 atom: 1.24.0 -> 1.24.1
(cherry picked from commit 8338d38e20ed0ab961430d8629dfd3a16ad169bd)
2018-03-09 13:13:18 -05:00
Tim Steinbach
1189fd2504 linux-copperhead: 4.15.7.a -> 4.15.8.a
(cherry picked from commit 72dede4203)
2018-03-09 12:33:24 -05:00
Tim Steinbach
602e64b42d linux: 4.15.7 -> 4.15.8
(cherry picked from commit 3fdb1c57c88db51b72af47065249066b1e7a552a)
2018-03-09 12:28:19 -05:00
Tim Steinbach
cc1cda8bae linux: 4.14.24 -> 4.14.25
(cherry picked from commit e5efdb0f67cc195ee963391037fb0a2cf081baba)
2018-03-09 12:28:12 -05:00
Piotr Bogdan
7b72d7f713 yate: patch shebangs in configure
(cherry picked from commit 5a3550ede6)
2018-03-09 16:10:22 +00:00
Piotr Bogdan
d2bf584a75 yate: restrict platforms
doesn't build on aarch64-linux

(cherry picked from commit f497a39328)
2018-03-09 16:09:55 +00:00
Nikolay Amiantov
8234bcad01 double-conversion: hopefully fix on Darwin
(cherry picked from commit 948533180f)
2018-03-09 16:38:23 +03:00
Nikolay Amiantov
9bfeba6fc6 slade: disable on AArch64
Wants SSE.

(cherry picked from commit 325dece6a0)
2018-03-09 16:38:17 +03:00
Nikolay Amiantov
bef3bb584b linuxPackages.bbswitch: disable on AArch64
It makes no sense on non-x86 platforms.

(cherry picked from commit 1890fe359a)
2018-03-09 16:38:12 +03:00
Nikolay Amiantov
ceb427eb50 citra: disable on AArch64
Wants SSE2 instructions.

(cherry picked from commit 9983c7004b)
2018-03-09 16:38:06 +03:00
Nikolay Amiantov
c26c22b7ab tdesktop: disable on AArch64
Errors out with "please add support for your architecture".

(cherry picked from commit 4c3c71fdd4)
2018-03-09 16:38:00 +03:00
Nikolay Amiantov
0a0b31db3d dwarf-fortress-packages.dwarf-therapist: disable on AArch64
The game works only on x86 anyway.

(cherry picked from commit 986ea06036)
2018-03-09 16:37:52 +03:00
Nikolay Amiantov
686ce4dade deadbeef: disable on AArch64
(cherry picked from commit c292489da0)
2018-03-09 16:37:46 +03:00
Nikolay Amiantov
180d071c3a the-powder-toy: disable on AArch64
Wants SSE.

(cherry picked from commit 809297e595)
2018-03-09 16:37:37 +03:00
Ryan Mulligan
67a504ed46 cppcheck: 1.80 -> 1.82
Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/misra.py -h` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/misra.py --help` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/misra.py help` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/naming.py -h` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/naming.py --help` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/naming.py help` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/y2038.py -h` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/y2038.py --help` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/y2038.py help` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/cppcheck -h` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/cppcheck --help` got 0 exit code
- ran `/nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82/bin/cppcheck --version` and found version 1.82
- found 1.82 with grep in /nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82
- found 1.82 in filename of file in /nix/store/klfqwbh75zch4zzdbwdyvk9qhgf28sln-cppcheck-1.82

(cherry picked from commit 62190a66ae)
2018-03-09 14:12:09 +01:00
Joachim Fasting
861f8bf015 electrum: 3.0.6 -> 3.1.0
(cherry picked from commit 53f057f21b)
2018-03-09 14:12:02 +01:00
Vladimír Čunát
01360a2845 gnat: mark as broken
https://github.com/NixOS/nixpkgs/commit/6ac7b19c978e9#commitcomment-27971572
https://github.com/NixOS/nixpkgs/pull/36551
2018-03-09 13:54:23 +01:00
Márton Boros
f1333eeaa1 idrisPackages.wl-pprint: 2016-09-28 -> 2017-03-13
(cherry picked from commit 4d4171d5f6)
2018-03-09 11:40:18 +00:00
Márton Boros
a9ee2cf9cc idrisPackages: fix errors
(cherry picked from commit 4f1d26288f)
2018-03-09 11:40:18 +00:00
Matthew Bauer
02a0fb8e74 demo: autologin through xserver
also disable upower on virtualbox
Fixes #36348
2018-03-09 11:37:11 +00:00
Maximilian Bosch
d308c7fc7a bonfire: fix build
The requirement's constraint for `pythonPackages.keyring` didn't allow
keyring v11. However it has been bumped in 93a16a2ace
by @FRidh.

Current failure: https://nix-cache.s3.amazonaws.com/log/2nw5adfx86jwiax32mn11kqpc35xwhsh-bonfire-unstable-2017-01-19.drv
See ticket #36453
2018-03-09 11:33:46 +00:00
Vladimír Čunát
77e99aa707 Merge #36518: xtreemfs: build with boost165
(cherry picked from commit d2d07a0bce)
It didn't build.
2018-03-09 11:05:15 +01:00
Vladimír Čunát
b8ec973e7d Merge #36555: libreswan: fix build with gcc7
(cherry picked from commit ffe2c4be02)
2018-03-09 10:52:01 +01:00
lassulus
e6d0584d78 bitcoin-abc: 0.16.0 -> 0.16.2
(cherry picked from commit d940c79130)
2018-03-09 08:03:44 +00:00
xeji
3c4c5913bb v8: build with gcc6 on linux
doesn't build with gcc 7 due to this issue in upstream code:
https://bugs.chromium.org/p/chromium/issues/detail?id=614289

(cherry picked from commit aa5a07977e)
2018-03-09 08:00:55 +00:00
Herwig Hochleitner
058417c31e chromium: 64.0.3282.186 -> 65.0.3325.146
see https://chromereleases.googleblog.com/2018/03/stable-channel-update-for-desktop.html

cc @aszlig @YorikSar

CVE-2017-11215
CVE-2017-11225
CVE-2018-6060
CVE-2018-6061
CVE-2018-6062
CVE-2018-6057
CVE-2018-6063
CVE-2018-6064
CVE-2018-6065
CVE-2018-6066
CVE-2018-6067
CVE-2018-6068
CVE-2018-6069
CVE-2018-6070
CVE-2018-6071
CVE-2018-6072
CVE-2018-6073
CVE-2018-6074
CVE-2018-6075
CVE-2018-6076
CVE-2018-6077
CVE-2018-6078
CVE-2018-6079
CVE-2018-6080
CVE-2018-6081
CVE-2018-6082
CVE-2018-6083

(cherry picked from commit 9b4ffd98a4)
2018-03-09 03:14:06 +01:00
xeji
8e58deb53f libav: remove /bin/sh dependencies
that resulted in some Hydra build fails

(cherry picked from commit adbd25c75c)
2018-03-08 20:21:23 -05:00
lassulus
eadbc34c6d bitcoin-classic: 1.3.6 -> 1.3.8
(cherry picked from commit bbd8664e01)
2018-03-08 23:00:32 +00:00
lassulus
0bbaa51b4c bitcoin-xt: 0.11G2 -> 0.11H
(cherry picked from commit 75f4b0fc0f)
2018-03-08 23:00:20 +00:00
Jörg Thalheim
1ce672458c google-cloud-sdk: also fix darwin
(cherry picked from commit a30cb1bf55)
2018-03-08 22:38:02 +00:00
xeji
6d88a00f01 rapidjson: fix gcc7 compile error
(cherry picked from commit 81776365f4)
2018-03-08 22:22:50 +00:00
Michael Brantley
ee88a41926 perlPackages.Socket: 2.020 -> 2.027
Also disable t/getaddrinfo.t test which requires network access.

(cherry picked from commit 467c03de31)
2018-03-08 21:52:06 +00:00
Ryan Mulligan
b312bdcd53 google-cloud-sdk: 184.0.0 -> 190.0.1
Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 190.0.1 with grep in /nix/store/y7rvgsj3077w8div5qny11xhgyjvy06c-google-cloud-sdk-190.0.1

(cherry picked from commit 84cb658505)
2018-03-08 21:50:34 +00:00
Daiderd Jordan
9cde87b0ee bchunk: fix clang build
/cc ZHF #36454

(cherry picked from commit 13ca830f1d)
2018-03-08 22:33:39 +01:00
Daiderd Jordan
b31fd67d79 bazel_0_4: mark linux only
/cc ZHF #36454

(cherry picked from commit 37a97fa8e3)
2018-03-08 22:20:03 +01:00
Vincent Laporte
bd6d6078c6 wyrd: fix build
(cherry picked from commit 1d4bbef0e8)
2018-03-08 14:49:54 -06:00
Daiderd Jordan
f394f5230a libjack2: remove clang patch
/cc ZHF #36454

(cherry picked from commit f2661ed72b)
2018-03-08 21:27:50 +01:00
Daiderd Jordan
a4340341a6 nixos: inline set-environment for bash and zsh
(cherry picked from commit b00a3fc6fd)
2018-03-08 21:07:40 +01:00
Daiderd Jordan
9defa1d4c0 skhd: init at 0.0.10
(cherry picked from commit b84d22cbbd)
2018-03-08 21:04:44 +01:00
obadz
e78837f435 citrix-receiver: 13.8.0 -> 13.9.0
The "A network error occured (SSL error 4)" is finally fixed!

(cherry picked from commit daafd1d71f)
2018-03-08 19:27:17 +00:00
Will Dietz
ad6a090cfe llvmPackages_6: build using gcc6 on i686, like others.
(cherry picked from commit 42c33ce12f)
2018-03-08 13:21:02 -06:00
Will Dietz
43dd25e579 Merge pull request #34457 from dtzWill/feature/llvm-6
llvm 6: init

(cherry picked from commit b09b557fb7)
2018-03-08 13:20:50 -06:00
xeji
a053461720 wyrd: fix build error with ncurses-6.0-abi5-compat
(cherry picked from commit de1427fabf)
2018-03-08 12:52:38 -06:00
Will Dietz
724dcdd066 squishyball: fix w/new ncurses
https://github.com/NixOS/nixpkgs/pull/34477
https://bugs.debian.org/860334
(cherry picked from commit ce37526ed7)
2018-03-08 12:36:59 -06:00
Will Dietz
46fc5c8419 virtualbox: drop headless patch that no longer applies, fixed upstream
(cherry picked from commit 4191058bdd)
2018-03-08 12:36:42 -06:00
Will Dietz
fac8c4d2d9 lldb_4: fix w/gcc7
Same fix used in swift4, FWIW.

(cherry picked from commit 535ba5f7f7)
2018-03-08 12:36:02 -06:00
Jascha Geerds
0feab3dabe maintainer-list: Change my email address
(cherry picked from commit 300e272e02)
2018-03-08 16:33:39 +01:00
Peter Hoeg
df63bd6b9a syncthing: 0.14.44 -> 0.14.45
(cherry picked from commit 05412c95da)
2018-03-08 09:23:31 +08:00
Matthew Bauer
bf5e7c48c4 git-sizer: init at 1.0.0
(cherry picked from commit 0b04beb805)
2018-03-07 22:21:31 +01:00
Andrew Childs
17ff10ab83 gdb: Flexible target matching for darwin
Outside of the nix-build the target is `x86_64-apple-darwin17.4.0`,
while inside the target is `x86_64-apple-darwin`. This difference
causes the fallback target configuration for darwin, which disables
gdb. Add a patch to make the target matching more flexible.

(cherry picked from commit 4c76a21aae)
(cherry picked from commit fe0728fa2c)
2018-03-07 22:17:01 +01:00
Vladimír Čunát
82bb0a18f0 nixos release: more evaluation fixes
... if missing x86 in supportedSystems

(cherry picked from commit eab479a5f0)
2018-03-07 17:32:56 +01:00
Vladimír Čunát
aa84b58f00 nixos/release: fix evaluation if missing x86
... in supportedSystems

(cherry picked from commit e59b91bc9a)
2018-03-07 16:07:02 +01:00
Nikolay Amiantov
01f9a70647 gajim: add plugin installer
It's not included into repository checkout (which we use because of tests), so
get it from release tarball instead.

(cherry picked from commit 9edd4c8835)
2018-03-07 16:47:48 +03:00
Vladimír Čunát
5f98ff26d9 texlive: fix eval after parent commit 2018-03-07 14:40:45 +01:00
Vladimír Čunát
c43e04dd94 Revert "Merge #35370: texlive.bin: fix with poppler 0.62"
This reverts commit 4dd70f96cc.
It actually broke texlive - I somehow forgot we don't have the new
poppler in 18.03.
2018-03-07 14:40:06 +01:00
Ryan Mulligan
03dc796bbc nspr: 4.17 -> 4.18
Semi-automatic update. These checks were performed:

- built on NixOS
- found 4.18 with grep in /nix/store/23322yndj5lh6n4pr3maj26irnwklq31-nspr-4.18
- found 4.18 in filename of file in /nix/store/23322yndj5lh6n4pr3maj26irnwklq31-nspr-4.18

(cherry picked from commit 52b2e79a8b)
We would probably have to pick it soon anyway, due to Firefox updates.
2018-03-07 13:30:35 +01:00
Vladimír Čunát
eec99996ec mesa: 17.3.5 -> 17.3.6 (bugfix)
It's emergency bugfix for intel.

(cherry picked from commit 6a9ab8db11)
2018-03-07 13:30:34 +01:00
Jörg Thalheim
52859c481a Merge pull request #36203 from lsix/libunistring_0.9.9
libunistring: 0.9.8 -> 0.9.9
(cherry picked from commit ad338b8268)
It claims to contain a single bugfix only.
2018-03-07 13:30:34 +01:00
Daiderd Jordan
c6de8f318e Merge pull request #35349 from matthewbauer/qt5-darwin-pkgconfig
qt5: install pkg_config files on darwin
(cherry picked from commit b4cf3f7909)
2018-03-07 13:30:33 +01:00
Will Dietz
70e1ebe0c7 Merge pull request #35674 from dtzWill/fix/llvm-4-cmdline-help
llvm_4: fix cosmetic issue in help output

(cherry picked from commit 3092659d96)
2018-03-07 13:30:32 +01:00
Vladimír Čunát
69a3a1dce1 lightdm-gtk-greeter: fix build by ignoring a warning
(cherry picked from commit 0479e91309)
2018-03-07 13:30:32 +01:00
Shea Levy
48a724cebd texlive.bin: Fix duplicate patch definition
(cherry picked from commit 1ad37a8c6e)
2018-03-07 13:30:31 +01:00
Vladimír Čunát
4dd70f96cc Merge #35370: texlive.bin: fix with poppler 0.62
(cherry picked from commit 63ca2cc786)
2018-03-07 13:30:30 +01:00
Vladimír Čunát
e4fe0e4555 gtk3: 3.22.26 -> 3.22.28 (maintenance)
(cherry picked from commit 01bf8381fd)
2018-03-07 13:30:30 +01:00
Vladimír Čunát
8056287c13 Merge #35113: cups: upstream patch for a bug
(cherry picked from commit e719327694)
2018-03-07 13:30:29 +01:00
Vladimír Čunát
8022ebc47c Merge #34878: fontconfig: Fix for HFS+ 1s date resolution
(cherry picked from commit 753db3e2d0)
2018-03-07 13:30:28 +01:00
Vladimír Čunát
fee03226a6 mesa: 17.3.3 -> 17.3.5 (maintenance)
(cherry picked from commit ddb422714d)
2018-03-07 13:30:28 +01:00
Vladimír Čunát
b759739d05 libdrm: 2.4.89 -> 2.4.90
(cherry picked from commit b6476968c4)
2018-03-07 13:30:27 +01:00
adisbladis
f93e902ab2 Merge pull request #35421 from flokli/CVE-zziplib-0.13.67
zziplib: 0.13.67 -> 0.13.68
(cherry picked from commit 6f13032b6e)
Security fixes inside.
2018-03-07 13:30:27 +01:00
Nikolay Amiantov
6b3d6a9f7a cups service: fix client sockets
Use systemd to create the directory for UNIX socket. Also use localhost instead
of 127.0.0.1 as is done in default cupsd.conf so that IPv6 is enabled when
available.

(cherry picked from commit 9c1c424e52)
2018-03-07 13:30:26 +01:00
Nikolay Amiantov
9b53db5d7e cups: fix path to socket and run directory
We use default /var/run/cups/cups.sock in NixOS but here it's misdefined to be
/run/cups.sock. Return it to default.

(cherry picked from commit 998fdfdc94)
2018-03-07 13:30:25 +01:00
Eelco Dolstra
b0eb9ec92d nixUnstable: Point to Nix 2.0
(cherry picked from commit 1deb779a7a)
2018-03-07 13:30:25 +01:00
Michael Raskin
e4f2f026bd Merge pull request #36403 from elts/fix/cl-launch
cl-launch: change platforms to unix
(cherry picked from commit 07be75d512)
2018-03-07 13:30:24 +01:00
Marius Bergmann
fa64b9e64f restic: update project website (#36408)
* restic: update project website

The project website has changed, so I updated it.

* restic: no trailing slash

(cherry picked from commit 8154f9ebd5)
2018-03-07 13:30:23 +01:00
obadz
4069dab3ca nixos doc: give context and definition re NIXOS_LUSTRATE
Re #36272

(cherry picked from commit ee9a785c30)
2018-03-07 13:30:23 +01:00
Carles Pagès
2c1addb451 maintainers: remove wrong info
I tried to contact bjg through mail but got no answer and can't find his
actual github account.

(cherry picked from commit 15ddc6fcf8)
2018-03-07 13:30:22 +01:00
Carles Pagès
d0aa15abca SDL2_gfx: update homepage
(cherry picked from commit 5eb70d3481)
2018-03-07 13:30:21 +01:00
Michael Raskin
7b987e2e86 Merge pull request #36389 from cpages/sdl2
Sdl2 and friends update

(cherry picked from commit c8664a2640)
Security fixes inside, reportedly.
2018-03-07 13:30:21 +01:00
Tuomas Tynkkynen
6569c4f184 trinity: Fix 32-bit build
(cherry picked from commit 2372e93981)
2018-03-07 13:30:20 +01:00
lewo
1bebf7af74 Merge pull request #36343 from bignaux/soulseekqt
soulseekqt: init at 2016-1-17 (last official stable)
(cherry picked from commit 9cfeabb327)
2018-03-07 13:30:19 +01:00
Michael Raskin
f43ea6e7ff Merge pull request #36275 from oxij/lib/maintainers-list
lib: rename maintainers-list.nix into maintainers/maintainer-list.nix
(cherry picked from commit 1bd790d613)
The intention is to reduce conflicts during maintenance.
2018-03-07 13:30:19 +01:00
Michael Raskin
05ddccd657 Merge pull request #36380 from xeji/xen-4-8-xsa
xen 4.8: add xsa security patches 252-256

(cherry picked from commit 346e68d4f0)
2018-03-07 13:30:18 +01:00
Michael Raskin
4d6473908f Merge pull request #36375 from volth/commandLineArgs-escaping
chromium, google-chrome: fix escaping of commandLineArgs

(cherry picked from commit da97c73fb3)
2018-03-07 13:30:18 +01:00
Jörg Thalheim
4fb6f7b83d Merge pull request #36250 from sengaya/add-ansible-lint
ansible-lint: init at 3.4.20
(cherry picked from commit 07bc1ddace)
2018-03-07 13:30:17 +01:00
Jörg Thalheim
77d3830fda Merge pull request #36353 from xeji/xen-4-8
xen 4.8: fix gcc7-related build errors

(cherry picked from commit c7a92f3fee)
2018-03-07 13:30:16 +01:00
Jörg Thalheim
487731bcd3 Merge pull request #36350 from volth/nix-serve
nix-serve: nix 2.0 fixes
(cherry picked from commit 5fe1be88a5)
2018-03-07 13:30:16 +01:00
Robin Gloster
7539b80e17 json-c-0-11: remove
(cherry picked from commit ddba7e3ae9)
2018-03-07 13:30:15 +01:00
Robin Gloster
b5088858f6 grive: remove
dead and obsoleted by grive2

(cherry picked from commit fe7039b08b)
2018-03-07 13:30:14 +01:00
Robin Gloster
a2ab45f547 newsbeuter: dead and obsoleted by newsboat
(cherry picked from commit 1fb08b90dd)
2018-03-07 13:30:14 +01:00
Robert Helgesson
8e75367ced xfce4-timer-plugin: remove icon cache file from output
Adds hicolor-icon-theme as a build input to use its build hook to
clean up icon cache files.

(cherry picked from commit c7f40209c1)
2018-03-07 13:30:13 +01:00
Robert Helgesson
141aec6186 parole: remove icon cache file from output
Adds hicolor-icon-theme as a build input to use its build hook to
clean up icon cache files.

(cherry picked from commit 0203ab2ff9)
2018-03-07 13:30:12 +01:00
Nikolay Amiantov
0e44dd1677 megatools: 1.9.98 -> 2017-10-26
Old version doesn't work with new Mega API.

(cherry picked from commit b6a28336e5)
2018-03-07 14:45:14 +03:00
Nikolay Amiantov
5868f9ae1e primusLib: build only for x86 Linux
(cherry picked from commit 41939f29a1)
2018-03-07 13:58:18 +03:00
Peter Hoeg
5b18373a45 dxx-rebirth: fix compilation with gcc7
(cherry picked from commit 2e2063074d)
2018-03-07 12:37:35 +08:00
Eelco Dolstra
66a621d314 Merge pull request #36360 from dtzWill/fix/nix-use-brotli-for-sanity
nix: fix conditional so brotli is used w/2.0 builds, needed for logs!
(cherry picked from commit 40f9a3e9d2)
2018-03-06 20:25:37 +01:00
Nikolay Amiantov
a2037bb238 avidemux: restrict platforms
(cherry picked from commit 1f8d30f0bf)
2018-03-06 13:58:59 +03:00
1563 changed files with 70703 additions and 44799 deletions

View File

@@ -12,12 +12,12 @@ build daemon as so-called channels. To get channel information via git, add
```
For stability and maximum binary package support, it is recommended to maintain
custom changes on top of one of the channels, e.g. `nixos-17.09` for the latest
custom changes on top of one of the channels, e.g. `nixos-18.03` for the latest
release and `nixos-unstable` for the latest successful build of master:
```
% git remote update channels
% git rebase channels/nixos-17.09
% git rebase channels/nixos-18.03
```
For pull-requests, please rebase onto nixpkgs `master`.
@@ -31,9 +31,9 @@ For pull-requests, please rebase onto nixpkgs `master`.
* [Manual (NixOS)](https://nixos.org/nixos/manual/)
* [Community maintained wiki](https://nixos.wiki/)
* [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
* [Continuous package builds for 17.09 release](https://hydra.nixos.org/jobset/nixos/release-17.09)
* [Continuous package builds for 18.03 release](https://hydra.nixos.org/jobset/nixos/release-18.03)
* [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
* [Tests for 17.09 release](https://hydra.nixos.org/job/nixos/release-17.09/tested#tabs-constituents)
* [Tests for 18.03 release](https://hydra.nixos.org/job/nixos/release-18.03/tested#tabs-constituents)
Communication:

6
doc/.gitignore vendored Normal file
View File

@@ -0,0 +1,6 @@
*.chapter.xml
*.section.xml
.version
out
manual-full.xml
highlightjs

100
doc/Makefile Normal file
View File

@@ -0,0 +1,100 @@
MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md)))
.PHONY: all
all: validate format out/html/index.html out/epub/manual.epub
.PHONY: debug
debug:
nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"
.PHONY: format
format:
find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {}
.PHONY: fix-misc-xml
fix-misc-xml:
find . -iname '*.xml' -type f \
-exec ../nixos/doc/varlistentry-fixer.rb {} ';'
.PHONY: clean
clean:
rm -f ${MD_TARGETS} .version manual-full.xml
rm -rf ./out/ ./highlightjs
.PHONY: validate
validate: manual-full.xml
jing "$$RNG" manual-full.xml
out/html/index.html: manual-full.xml style.css highlightjs
mkdir -p out/html
xsltproc ${xsltFlags} \
--nonet --xinclude \
--output $@ \
"$$XSL/docbook/xhtml/docbook.xsl" \
./manual-full.xml
mkdir -p out/html/highlightjs/
cp -r highlightjs out/html/
cp ./overrides.css out/html/
cp ./style.css out/html/style.css
mkdir -p out/html/images/callouts
cp "$$XSL/docbook/images/callouts/"*.svg out/html/images/callouts/
chmod u+w -R out/html/
out/epub/manual.epub: manual-full.xml
mkdir -p out/epub/scratch
xsltproc ${xsltFlags} --nonet \
--output out/epub/scratch/ \
"$$XSL/docbook/epub/docbook.xsl" \
./manual-full.xml
cp ./overrides.css out/epub/scratch/OEBPS
cp ./style.css out/epub/scratch/OEBPS
mkdir -p out/epub/scratch/OEBPS/images/callouts/
cp "$$XSL/docbook/images/callouts/"*.svg out/epub/scratch/OEBPS/images/callouts/
echo "application/epub+zip" > mimetype
zip -0Xq "out/epub/manual.epub" mimetype
rm mimetype
cd "out/epub/scratch/" && zip -Xr9D "../manual.epub" *
rm -rf "out/epub/scratch/"
highlightjs:
mkdir -p highlightjs
cp -r "$$HIGHLIGHTJS/highlight.pack.js" highlightjs/
cp -r "$$HIGHLIGHTJS/LICENSE" highlightjs/
cp -r "$$HIGHLIGHTJS/mono-blue.css" highlightjs/
cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/
manual-full.xml: ${MD_TARGETS} .version *.xml
xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
.version:
nix-instantiate --eval \
-E '(import ../lib).nixpkgsVersion' > .version
%.section.xml: %.section.md
pandoc $^ -w docbook+smart \
-f markdown+smart \
| sed -e 's|<ulink url=|<link xlink:href=|' \
-e 's|</ulink>|</link>|' \
-e 's|<sect. id=|<section xml:id=|' \
-e 's|</sect[0-9]>|</section>|' \
-e '1s| id=| xml:id=|' \
-e '1s|\(<[^ ]* \)|\1xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" |' \
| cat > $@
%.chapter.xml: %.chapter.md
pandoc $^ -w docbook+smart \
--top-level-division=chapter \
-f markdown+smart \
| sed -e 's|<ulink url=|<link xlink:href=|' \
-e 's|</ulink>|</link>|' \
-e 's|<sect. id=|<section xml:id=|' \
-e 's|</sect[0-9]>|</section>|' \
-e '1s| id=| xml:id=|' \
-e '1s|\(<[^ ]* \)|\1|' \
| cat > $@

File diff suppressed because it is too large Load Diff

View File

@@ -1,40 +1,45 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-packageconfig">
<title>Global configuration</title>
<para>Nix comes with certain defaults about what packages can and
cannot be installed, based on a package's metadata. By default, Nix
will prevent installation if any of the following criteria are
true:</para>
<itemizedlist>
<listitem><para>The package is thought to be broken, and has had
its <literal>meta.broken</literal> set to
<literal>true</literal>.</para></listitem>
<listitem><para>The package's <literal>meta.license</literal> is set
to a license which is considered to be unfree.</para></listitem>
<listitem><para>The package has known security vulnerabilities but
has not or can not be updated for some reason, and a list of issues
has been entered in to the package's
<literal>meta.knownVulnerabilities</literal>.</para></listitem>
</itemizedlist>
<para>Note that all this is checked during evaluation already,
and the check includes any package that is evaluated.
In particular, all build-time dependencies are checked.
<literal>nix-env -qa</literal> will (attempt to) hide any packages
that would be refused.
</para>
<para>Each of these criteria can be altered in the nixpkgs
configuration.</para>
<para>The nixpkgs configuration for a NixOS system is set in the
<literal>configuration.nix</literal>, as in the following example:
<title>Global configuration</title>
<para>
Nix comes with certain defaults about what packages can and cannot be
installed, based on a package's metadata. By default, Nix will prevent
installation if any of the following criteria are true:
</para>
<itemizedlist>
<listitem>
<para>
The package is thought to be broken, and has had its
<literal>meta.broken</literal> set to <literal>true</literal>.
</para>
</listitem>
<listitem>
<para>
The package's <literal>meta.license</literal> is set to a license which is
considered to be unfree.
</para>
</listitem>
<listitem>
<para>
The package has known security vulnerabilities but has not or can not be
updated for some reason, and a list of issues has been entered in to the
package's <literal>meta.knownVulnerabilities</literal>.
</para>
</listitem>
</itemizedlist>
<para>
Note that all this is checked during evaluation already, and the check
includes any package that is evaluated. In particular, all build-time
dependencies are checked. <literal>nix-env -qa</literal> will (attempt to)
hide any packages that would be refused.
</para>
<para>
Each of these criteria can be altered in the nixpkgs configuration.
</para>
<para>
The nixpkgs configuration for a NixOS system is set in the
<literal>configuration.nix</literal>, as in the following example:
<programlisting>
{
nixpkgs.config = {
@@ -42,151 +47,157 @@ configuration.</para>
};
}
</programlisting>
However, this does not allow unfree software for individual users.
Their configurations are managed separately.</para>
<para>A user's of nixpkgs configuration is stored in a user-specific
configuration file located at
<filename>~/.config/nixpkgs/config.nix</filename>. For example:
However, this does not allow unfree software for individual users. Their
configurations are managed separately.
</para>
<para>
A user's of nixpkgs configuration is stored in a user-specific configuration
file located at <filename>~/.config/nixpkgs/config.nix</filename>. For
example:
<programlisting>
{
allowUnfree = true;
}
</programlisting>
</para>
<para>Note that we are not able to test or build unfree software on Hydra
due to policy. Most unfree licenses prohibit us from either executing or
distributing the software.</para>
<section xml:id="sec-allow-broken">
</para>
<para>
Note that we are not able to test or build unfree software on Hydra due to
policy. Most unfree licenses prohibit us from either executing or
distributing the software.
</para>
<section xml:id="sec-allow-broken">
<title>Installing broken packages</title>
<para>There are two ways to try compiling a package which has been
marked as broken.</para>
<para>
There are two ways to try compiling a package which has been marked as
broken.
</para>
<itemizedlist>
<listitem><para>
For allowing the build of a broken package once, you can use an
environment variable for a single invocation of the nix tools:
<programlisting>$ export NIXPKGS_ALLOW_BROKEN=1</programlisting>
</para></listitem>
<listitem><para>
For permanently allowing broken packages to be built, you may
add <literal>allowBroken = true;</literal> to your user's
configuration file, like this:
<listitem>
<para>
For allowing the build of a broken package once, you can use an
environment variable for a single invocation of the nix tools:
<programlisting>$ export NIXPKGS_ALLOW_BROKEN=1</programlisting>
</para>
</listitem>
<listitem>
<para>
For permanently allowing broken packages to be built, you may add
<literal>allowBroken = true;</literal> to your user's configuration file,
like this:
<programlisting>
{
allowBroken = true;
}
</programlisting>
</para></listitem>
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-allow-unfree">
</section>
<section xml:id="sec-allow-unfree">
<title>Installing unfree packages</title>
<para>There are several ways to tweak how Nix handles a package
which has been marked as unfree.</para>
<para>
There are several ways to tweak how Nix handles a package which has been
marked as unfree.
</para>
<itemizedlist>
<listitem><para>
To temporarily allow all unfree packages, you can use an
environment variable for a single invocation of the nix tools:
<programlisting>$ export NIXPKGS_ALLOW_UNFREE=1</programlisting>
</para></listitem>
<listitem><para>
It is possible to permanently allow individual unfree packages,
while still blocking unfree packages by default using the
<literal>allowUnfreePredicate</literal> configuration
option in the user configuration file.</para>
<para>This option is a function which accepts a package as a
parameter, and returns a boolean. The following example
configuration accepts a package and always returns false:
<listitem>
<para>
To temporarily allow all unfree packages, you can use an environment
variable for a single invocation of the nix tools:
<programlisting>$ export NIXPKGS_ALLOW_UNFREE=1</programlisting>
</para>
</listitem>
<listitem>
<para>
It is possible to permanently allow individual unfree packages, while
still blocking unfree packages by default using the
<literal>allowUnfreePredicate</literal> configuration option in the user
configuration file.
</para>
<para>
This option is a function which accepts a package as a parameter, and
returns a boolean. The following example configuration accepts a package
and always returns false:
<programlisting>
{
allowUnfreePredicate = (pkg: false);
}
</programlisting>
</para>
<para>A more useful example, the following configuration allows
only allows flash player and visual studio code:
</para>
<para>
A more useful example, the following configuration allows only allows
flash player and visual studio code:
<programlisting>
{
allowUnfreePredicate = (pkg: elem (builtins.parseDrvName pkg.name).name [ "flashplayer" "vscode" ]);
}
</programlisting>
</para></listitem>
<listitem>
<para>It is also possible to whitelist and blacklist licenses
that are specifically acceptable or not acceptable, using
<literal>whitelistedLicenses</literal> and
<literal>blacklistedLicenses</literal>, respectively.
</para>
<para>The following example configuration whitelists the
licenses <literal>amd</literal> and <literal>wtfpl</literal>:
</para>
</listitem>
<listitem>
<para>
It is also possible to whitelist and blacklist licenses that are
specifically acceptable or not acceptable, using
<literal>whitelistedLicenses</literal> and
<literal>blacklistedLicenses</literal>, respectively.
</para>
<para>
The following example configuration whitelists the licenses
<literal>amd</literal> and <literal>wtfpl</literal>:
<programlisting>
{
whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ];
}
</programlisting>
</para>
<para>The following example configuration blacklists the
<literal>gpl3</literal> and <literal>agpl3</literal> licenses:
</para>
<para>
The following example configuration blacklists the <literal>gpl3</literal>
and <literal>agpl3</literal> licenses:
<programlisting>
{
blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ];
}
</programlisting>
</para>
</listitem>
</para>
</listitem>
</itemizedlist>
<para>A complete list of licenses can be found in the file
<filename>lib/licenses.nix</filename> of the nixpkgs tree.</para>
</section>
<para>
A complete list of licenses can be found in the file
<filename>lib/licenses.nix</filename> of the nixpkgs tree.
</para>
</section>
<section xml:id="sec-allow-insecure">
<title>Installing insecure packages</title>
<section xml:id="sec-allow-insecure">
<title>
Installing insecure packages
</title>
<para>There are several ways to tweak how Nix handles a package
which has been marked as insecure.</para>
<para>
There are several ways to tweak how Nix handles a package which has been
marked as insecure.
</para>
<itemizedlist>
<listitem><para>
To temporarily allow all insecure packages, you can use an
environment variable for a single invocation of the nix tools:
<programlisting>$ export NIXPKGS_ALLOW_INSECURE=1</programlisting>
</para></listitem>
<listitem><para>
It is possible to permanently allow individual insecure
packages, while still blocking other insecure packages by
default using the <literal>permittedInsecurePackages</literal>
configuration option in the user configuration file.</para>
<para>The following example configuration permits the
installation of the hypothetically insecure package
<literal>hello</literal>, version <literal>1.2.3</literal>:
<listitem>
<para>
To temporarily allow all insecure packages, you can use an environment
variable for a single invocation of the nix tools:
<programlisting>$ export NIXPKGS_ALLOW_INSECURE=1</programlisting>
</para>
</listitem>
<listitem>
<para>
It is possible to permanently allow individual insecure packages, while
still blocking other insecure packages by default using the
<literal>permittedInsecurePackages</literal> configuration option in the
user configuration file.
</para>
<para>
The following example configuration permits the installation of the
hypothetically insecure package <literal>hello</literal>, version
<literal>1.2.3</literal>:
<programlisting>
{
permittedInsecurePackages = [
@@ -194,47 +205,44 @@ distributing the software.</para>
];
}
</programlisting>
</para>
</listitem>
<listitem><para>
It is also possible to create a custom policy around which
insecure packages to allow and deny, by overriding the
<literal>allowInsecurePredicate</literal> configuration
option.</para>
<para>The <literal>allowInsecurePredicate</literal> option is a
function which accepts a package and returns a boolean, much
like <literal>allowUnfreePredicate</literal>.</para>
<para>The following configuration example only allows insecure
packages with very short names:
</para>
</listitem>
<listitem>
<para>
It is also possible to create a custom policy around which insecure
packages to allow and deny, by overriding the
<literal>allowInsecurePredicate</literal> configuration option.
</para>
<para>
The <literal>allowInsecurePredicate</literal> option is a function which
accepts a package and returns a boolean, much like
<literal>allowUnfreePredicate</literal>.
</para>
<para>
The following configuration example only allows insecure packages with
very short names:
<programlisting>
{
allowInsecurePredicate = (pkg: (builtins.stringLength (builtins.parseDrvName pkg.name).name) &lt;= 5);
}
</programlisting>
</para>
<para>Note that <literal>permittedInsecurePackages</literal> is
only checked if <literal>allowInsecurePredicate</literal> is not
specified.
</para></listitem>
</para>
<para>
Note that <literal>permittedInsecurePackages</literal> is only checked if
<literal>allowInsecurePredicate</literal> is not specified.
</para>
</listitem>
</itemizedlist>
</section>
</section>
<!--============================================================-->
<section xml:id="sec-modify-via-packageOverrides">
<title>Modify packages via <literal>packageOverrides</literal></title>
<section xml:id="sec-modify-via-packageOverrides"><title>Modify
packages via <literal>packageOverrides</literal></title>
<para>You can define a function called
<varname>packageOverrides</varname> in your local
<filename>~/.config/nixpkgs/config.nix</filename> to override nix packages. It
must be a function that takes pkgs as an argument and return modified
set of packages.
<para>
You can define a function called <varname>packageOverrides</varname> in your
local <filename>~/.config/nixpkgs/config.nix</filename> to override nix
packages. It must be a function that takes pkgs as an argument and return
modified set of packages.
<programlisting>
{
packageOverrides = pkgs: rec {
@@ -242,30 +250,27 @@ set of packages.
};
}
</programlisting>
</para>
</section>
<section xml:id="sec-declarative-package-management">
</para>
</section>
<section xml:id="sec-declarative-package-management">
<title>Declarative Package Management</title>
<section xml:id="sec-building-environment">
<title>Build an environment</title>
<title>Build an environment</title>
<para>
Using <literal>packageOverrides</literal>, it is possible to manage
packages declaratively. This means that we can list all of our desired
packages within a declarative Nix expression. For example, to have
<literal>aspell</literal>, <literal>bc</literal>,
<literal>ffmpeg</literal>, <literal>coreutils</literal>,
<literal>gdb</literal>, <literal>nixUnstable</literal>,
<literal>emscripten</literal>, <literal>jq</literal>,
<literal>nox</literal>, and <literal>silver-searcher</literal>, we could
use the following in <filename>~/.config/nixpkgs/config.nix</filename>:
</para>
<para>
Using <literal>packageOverrides</literal>, it is possible to manage
packages declaratively. This means that we can list all of our desired
packages within a declarative Nix expression. For example, to have
<literal>aspell</literal>, <literal>bc</literal>,
<literal>ffmpeg</literal>, <literal>coreutils</literal>,
<literal>gdb</literal>, <literal>nixUnstable</literal>,
<literal>emscripten</literal>, <literal>jq</literal>,
<literal>nox</literal>, and <literal>silver-searcher</literal>, we could
use the following in <filename>~/.config/nixpkgs/config.nix</filename>:
</para>
<screen>
<screen>
{
packageOverrides = pkgs: with pkgs; {
myPackages = pkgs.buildEnv {
@@ -276,17 +281,17 @@ set of packages.
}
</screen>
<para>
To install it into our environment, you can just run <literal>nix-env -iA
nixpkgs.myPackages</literal>. If you want to load the packages to be built
from a working copy of <literal>nixpkgs</literal> you just run
<literal>nix-env -f. -iA myPackages</literal>. To explore what's been
installed, just look through <filename>~/.nix-profile/</filename>. You can
see that a lot of stuff has been installed. Some of this stuff is useful
some of it isn't. Let's tell Nixpkgs to only link the stuff that we want:
</para>
<para>
To install it into our environment, you can just run <literal>nix-env -iA
nixpkgs.myPackages</literal>. If you want to load the packages to be built
from a working copy of <literal>nixpkgs</literal> you just run
<literal>nix-env -f. -iA myPackages</literal>. To explore what's been
installed, just look through <filename>~/.nix-profile/</filename>. You can
see that a lot of stuff has been installed. Some of this stuff is useful
some of it isn't. Let's tell Nixpkgs to only link the stuff that we want:
</para>
<screen>
<screen>
{
packageOverrides = pkgs: with pkgs; {
myPackages = pkgs.buildEnv {
@@ -298,31 +303,30 @@ set of packages.
}
</screen>
<para>
<literal>pathsToLink</literal> tells Nixpkgs to only link the paths listed
which gets rid of the extra stuff in the profile.
<filename>/bin</filename> and <filename>/share</filename> are good
defaults for a user environment, getting rid of the clutter. If you are
running on Nix on MacOS, you may want to add another path as well,
<filename>/Applications</filename>, that makes GUI apps available.
</para>
<para>
<literal>pathsToLink</literal> tells Nixpkgs to only link the paths listed
which gets rid of the extra stuff in the profile. <filename>/bin</filename>
and <filename>/share</filename> are good defaults for a user environment,
getting rid of the clutter. If you are running on Nix on MacOS, you may
want to add another path as well, <filename>/Applications</filename>, that
makes GUI apps available.
</para>
</section>
<section xml:id="sec-getting-documentation">
<title>Getting documentation</title>
<title>Getting documentation</title>
<para>
After building that new environment, look through
<filename>~/.nix-profile</filename> to make sure everything is there that
we wanted. Discerning readers will note that some files are missing. Look
inside <filename>~/.nix-profile/share/man/man1/</filename> to verify this.
There are no man pages for any of the Nix tools! This is because some
packages like Nix have multiple outputs for things like documentation (see
section 4). Let's make Nix install those as well.
</para>
<para>
After building that new environment, look through
<filename>~/.nix-profile</filename> to make sure everything is there that
we wanted. Discerning readers will note that some files are missing. Look
inside <filename>~/.nix-profile/share/man/man1/</filename> to verify this.
There are no man pages for any of the Nix tools! This is because some
packages like Nix have multiple outputs for things like documentation (see
section 4). Let's make Nix install those as well.
</para>
<screen>
<screen>
{
packageOverrides = pkgs: with pkgs; {
myPackages = pkgs.buildEnv {
@@ -335,14 +339,13 @@ set of packages.
}
</screen>
<para>
This provides us with some useful documentation for using our packages.
However, if we actually want those manpages to be detected by man, we need
to set up our environment. This can also be managed within Nix
expressions.
</para>
<para>
This provides us with some useful documentation for using our packages.
However, if we actually want those manpages to be detected by man, we need
to set up our environment. This can also be managed within Nix expressions.
</para>
<screen>
<screen>
{
packageOverrides = pkgs: with pkgs; rec {
myProfile = writeText "my-profile" ''
@@ -374,13 +377,13 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
}
</screen>
<para>
For this to work fully, you must also have this script sourced when you
are logged in. Try adding something like this to your
<filename>~/.profile</filename> file:
</para>
<para>
For this to work fully, you must also have this script sourced when you are
logged in. Try adding something like this to your
<filename>~/.profile</filename> file:
</para>
<screen>
<screen>
#!/bin/sh
if [ -d $HOME/.nix-profile/etc/profile.d ]; then
for i in $HOME/.nix-profile/etc/profile.d/*.sh; do
@@ -391,23 +394,22 @@ if [ -d $HOME/.nix-profile/etc/profile.d ]; then
fi
</screen>
<para>
Now just run <literal>source $HOME/.profile</literal> and you can starting
loading man pages from your environent.
</para>
<para>
Now just run <literal>source $HOME/.profile</literal> and you can starting
loading man pages from your environent.
</para>
</section>
<section xml:id="sec-gnu-info-setup">
<title>GNU info setup</title>
<title>GNU info setup</title>
<para>
Configuring GNU info is a little bit trickier than man pages. To work
correctly, info needs a database to be generated. This can be done with
some small modifications to our environment scripts.
</para>
<para>
Configuring GNU info is a little bit trickier than man pages. To work
correctly, info needs a database to be generated. This can be done with
some small modifications to our environment scripts.
</para>
<screen>
<screen>
{
packageOverrides = pkgs: with pkgs; rec {
myProfile = writeText "my-profile" ''
@@ -449,16 +451,13 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
}
</screen>
<para>
<literal>postBuild</literal> tells Nixpkgs to run a command after building
the environment. In this case, <literal>install-info</literal> adds the
installed info pages to <literal>dir</literal> which is GNU info's default
root node. Note that <literal>texinfoInteractive</literal> is added to the
environment to give the <literal>install-info</literal> command.
</para>
<para>
<literal>postBuild</literal> tells Nixpkgs to run a command after building
the environment. In this case, <literal>install-info</literal> adds the
installed info pages to <literal>dir</literal> which is GNU info's default
root node. Note that <literal>texinfoInteractive</literal> is added to the
environment to give the <literal>install-info</literal> command.
</para>
</section>
</section>
</section>
</chapter>

View File

@@ -1,20 +1,35 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-contributing">
<title>Contributing to this documentation</title>
<para>The DocBook sources of the Nixpkgs manual are in the <filename
<title>Contributing to this documentation</title>
<para>
The DocBook sources of the Nixpkgs manual are in the
<filename
xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename>
subdirectory of the Nixpkgs repository. If you make modifications to
the manual, it's important to build it before committing. You can do that as follows:
subdirectory of the Nixpkgs repository.
</para>
<para>
You can quickly check your edits with <command>make</command>:
</para>
<screen>
$ cd /path/to/nixpkgs
$ nix-build doc
$ cd /path/to/nixpkgs/doc
$ nix-shell
[nix-shell]$ make
</screen>
If the build succeeds, the manual will be in
<filename>./result/share/doc/nixpkgs/manual.html</filename>.</para>
<para>
If you experience problems, run <command>make debug</command> to help
understand the docbook errors.
</para>
<para>
After making modifications to the manual, it's important to build it before
committing. You can do that as follows:
<screen>
$ cd /path/to/nixpkgs/doc
$ nix-shell
[nix-shell]$ make clean
[nix-shell]$ nix-build .
</screen>
If the build succeeds, the manual will be in
<filename>./result/share/doc/nixpkgs/manual.html</filename>.
</para>
</chapter>

View File

@@ -1,308 +1,478 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-cross">
<title>Cross-compilation</title>
<section xml:id="sec-cross-intro">
<title>Cross-compilation</title>
<section xml:id="sec-cross-intro">
<title>Introduction</title>
<para>
"Cross-compilation" means compiling a program on one machine for another type of machine.
For example, a typical use of cross compilation is to compile programs for embedded devices.
These devices often don't have the computing power and memory to compile their own programs.
One might think that cross-compilation is a fairly niche concern, but there are advantages to being rigorous about distinguishing build-time vs run-time environments even when one is developing and deploying on the same machine.
Nixpkgs is increasingly adopting the opinion that packages should be written with cross-compilation in mind, and nixpkgs should evaluate in a similar way (by minimizing cross-compilation-specific special cases) whether or not one is cross-compiling.
"Cross-compilation" means compiling a program on one machine for another
type of machine. For example, a typical use of cross compilation is to
compile programs for embedded devices. These devices often don't have the
computing power and memory to compile their own programs. One might think
that cross-compilation is a fairly niche concern, but there are advantages
to being rigorous about distinguishing build-time vs run-time environments
even when one is developing and deploying on the same machine. Nixpkgs is
increasingly adopting the opinion that packages should be written with
cross-compilation in mind, and nixpkgs should evaluate in a similar way (by
minimizing cross-compilation-specific special cases) whether or not one is
cross-compiling.
</para>
<para>
This chapter will be organized in three parts.
First, it will describe the basics of how to package software in a way that supports cross-compilation.
Second, it will describe how to use Nixpkgs when cross-compiling.
Third, it will describe the internal infrastructure supporting cross-compilation.
This chapter will be organized in three parts. First, it will describe the
basics of how to package software in a way that supports cross-compilation.
Second, it will describe how to use Nixpkgs when cross-compiling. Third, it
will describe the internal infrastructure supporting cross-compilation.
</para>
</section>
</section>
<!--============================================================-->
<section xml:id="sec-cross-packaging">
<section xml:id="sec-cross-packaging">
<title>Packaging in a cross-friendly manner</title>
<section>
<title>Platform parameters</title>
<para>
Nixpkgs follows the <link xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html">common historical convention of GNU autoconf</link> of distinguishing between 3 types of platform: <wordasword>build</wordasword>, <wordasword>host</wordasword>, and <wordasword>target</wordasword>.
<title>Platform parameters</title>
In summary, <wordasword>build</wordasword> is the platform on which a package is being built, <wordasword>host</wordasword> is the platform on which it is to run. The third attribute, <wordasword>target</wordasword>, is relevant only for certain specific compilers and build tools.
</para>
<para>
Nixpkgs follows the
<link xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html">common
historical convention of GNU autoconf</link> of distinguishing between 3
types of platform: <wordasword>build</wordasword>,
<wordasword>host</wordasword>, and <wordasword>target</wordasword>. In
summary, <wordasword>build</wordasword> is the platform on which a package
is being built, <wordasword>host</wordasword> is the platform on which it
is to run. The third attribute, <wordasword>target</wordasword>, is
relevant only for certain specific compilers and build tools.
</para>
<para>
In Nixpkgs, these three platforms are defined as attribute sets under the names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal>.
All three are always defined as attributes in the standard environment, and at the top level. That means one can get at them just like a dependency in a function that is imported with <literal>callPackage</literal>:
<programlisting>{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform...</programlisting>, or just off <varname>stdenv</varname>:
<programlisting>{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...</programlisting>.
</para>
<variablelist>
<varlistentry>
<term><varname>buildPlatform</varname></term>
<listitem><para>
The "build platform" is the platform on which a package is built.
Once someone has a built package, or pre-built binary package, the build platform should not matter and be safe to ignore.
</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>hostPlatform</varname></term>
<listitem><para>
The "host platform" is the platform on which a package will be run.
This is the simplest platform to understand, but also the one with the worst name.
</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>targetPlatform</varname></term>
<listitem>
<para>
The "target platform" attribute is, unlike the other two attributes, not actually fundamental to the process of building software.
Instead, it is only relevant for compatibility with building certain specific compilers and build tools.
It can be safely ignored for all other packages.
</para>
<para>
The build process of certain compilers is written in such a way that the compiler resulting from a single build can itself only produce binaries for a single platform.
The task specifying this single "target platform" is thus pushed to build time of the compiler.
The root cause of this mistake is often that the compiler (which will be run on the host) and the the standard library/runtime (which will be run on the target) are built by a single build process.
</para>
<para>
There is no fundamental need to think about a single target ahead of time like this.
If the tool supports modular or pluggable backends, both the need to specify the target at build time and the constraint of having only a single target disappear.
An example of such a tool is LLVM.
</para>
<para>
Although the existance of a "target platfom" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf.
Nixpkgs tries to avoid sharing in the mistake where possible.
Still, because the concept of a target platform is so ingrained, it is best to support it as is.
</para>
</listitem>
</varlistentry>
</variablelist>
<para>
The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up.
You can see examples of ones used in practice in <literal>lib.systems.examples</literal>; note how they are not all very consistent.
For now, here are few fields can count on them containing:
</para>
<variablelist>
<varlistentry>
<term><varname>system</varname></term>
<listitem>
<para>
This is a two-component shorthand for the platform.
Examples of this would be "x86_64-darwin" and "i686-linux"; see <literal>lib.systems.doubles</literal> for more.
This format isn't very standard, but has built-in support in Nix, such as the <varname>builtins.currentSystem</varname> impure string.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>config</varname></term>
<listitem>
<para>
This is a 3- or 4- component shorthand for the platform.
Examples of this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14".
This is a standard format called the "LLVM target triple", as they are pioneered by LLVM and traditionally just used for the <varname>targetPlatform</varname>.
This format is strictly more informative than the "Nix host double", as the previous format could analogously be termed.
This needs a better name than <varname>config</varname>!
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>parsed</varname></term>
<listitem>
<para>
This is a nix representation of a parsed LLVM target triple with white-listed components.
This can be specified directly, or actually parsed from the <varname>config</varname>.
[Technically, only one need be specified and the others can be inferred, though the precision of inference may not be very good.]
See <literal>lib.systems.parse</literal> for the exact representation.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>libc</varname></term>
<listitem>
<para>
This is a string identifying the standard C library used.
Valid identifiers include "glibc" for GNU libc, "libSystem" for Darwin's Libsystem, and "uclibc" for µClibc.
It should probably be refactored to use the module system, like <varname>parse</varname>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>is*</varname></term>
<listitem>
<para>
These predicates are defined in <literal>lib.systems.inspect</literal>, and slapped on every platform.
They are superior to the ones in <varname>stdenv</varname> as they force the user to be explicit about which platform they are inspecting.
Please use these instead of those.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>platform</varname></term>
<listitem>
<para>
This is, quite frankly, a dumping ground of ad-hoc settings (it's an attribute set).
See <literal>lib.systems.platforms</literal> for examples—there's hopefully one in there that will work verbatim for each platform that is working.
Please help us triage these flags and give them better homes!
</para>
</listitem>
</varlistentry>
</variablelist>
<para>
In Nixpkgs, these three platforms are defined as attribute sets under the
names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>,
and <literal>targetPlatform</literal>. All three are always defined as
attributes in the standard environment, and at the top level. That means
one can get at them just like a dependency in a function that is imported
with <literal>callPackage</literal>:
<programlisting>{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform...</programlisting>
, or just off <varname>stdenv</varname>:
<programlisting>{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...</programlisting>
.
</para>
<variablelist>
<varlistentry>
<term>
<varname>buildPlatform</varname>
</term>
<listitem>
<para>
The "build platform" is the platform on which a package is built. Once
someone has a built package, or pre-built binary package, the build
platform should not matter and be safe to ignore.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>hostPlatform</varname>
</term>
<listitem>
<para>
The "host platform" is the platform on which a package will be run. This
is the simplest platform to understand, but also the one with the worst
name.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>targetPlatform</varname>
</term>
<listitem>
<para>
The "target platform" attribute is, unlike the other two attributes, not
actually fundamental to the process of building software. Instead, it is
only relevant for compatibility with building certain specific compilers
and build tools. It can be safely ignored for all other packages.
</para>
<para>
The build process of certain compilers is written in such a way that the
compiler resulting from a single build can itself only produce binaries
for a single platform. The task specifying this single "target platform"
is thus pushed to build time of the compiler. The root cause of this
mistake is often that the compiler (which will be run on the host) and
the the standard library/runtime (which will be run on the target) are
built by a single build process.
</para>
<para>
There is no fundamental need to think about a single target ahead of
time like this. If the tool supports modular or pluggable backends, both
the need to specify the target at build time and the constraint of
having only a single target disappear. An example of such a tool is
LLVM.
</para>
<para>
Although the existance of a "target platfom" is arguably a historical
mistake, it is a common one: examples of tools that suffer from it are
GCC, Binutils, GHC and Autoconf. Nixpkgs tries to avoid sharing in the
mistake where possible. Still, because the concept of a target platform
is so ingrained, it is best to support it as is.
</para>
</listitem>
</varlistentry>
</variablelist>
<para>
The exact schema these fields follow is a bit ill-defined due to a long and
convoluted evolution, but this is slowly being cleaned up. You can see
examples of ones used in practice in
<literal>lib.systems.examples</literal>; note how they are not all very
consistent. For now, here are few fields can count on them containing:
</para>
<variablelist>
<varlistentry>
<term>
<varname>system</varname>
</term>
<listitem>
<para>
This is a two-component shorthand for the platform. Examples of this
would be "x86_64-darwin" and "i686-linux"; see
<literal>lib.systems.doubles</literal> for more. This format isn't very
standard, but has built-in support in Nix, such as the
<varname>builtins.currentSystem</varname> impure string.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>config</varname>
</term>
<listitem>
<para>
This is a 3- or 4- component shorthand for the platform. Examples of
this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14".
This is a standard format called the "LLVM target triple", as they are
pioneered by LLVM and traditionally just used for the
<varname>targetPlatform</varname>. This format is strictly more
informative than the "Nix host double", as the previous format could
analogously be termed. This needs a better name than
<varname>config</varname>!
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>parsed</varname>
</term>
<listitem>
<para>
This is a nix representation of a parsed LLVM target triple with
white-listed components. This can be specified directly, or actually
parsed from the <varname>config</varname>. [Technically, only one need
be specified and the others can be inferred, though the precision of
inference may not be very good.] See
<literal>lib.systems.parse</literal> for the exact representation.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>libc</varname>
</term>
<listitem>
<para>
This is a string identifying the standard C library used. Valid
identifiers include "glibc" for GNU libc, "libSystem" for Darwin's
Libsystem, and "uclibc" for µClibc. It should probably be refactored to
use the module system, like <varname>parse</varname>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>is*</varname>
</term>
<listitem>
<para>
These predicates are defined in <literal>lib.systems.inspect</literal>,
and slapped on every platform. They are superior to the ones in
<varname>stdenv</varname> as they force the user to be explicit about
which platform they are inspecting. Please use these instead of those.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>platform</varname>
</term>
<listitem>
<para>
This is, quite frankly, a dumping ground of ad-hoc settings (it's an
attribute set). See <literal>lib.systems.platforms</literal> for
examples—there's hopefully one in there that will work verbatim for
each platform that is working. Please help us triage these flags and
give them better homes!
</para>
</listitem>
</varlistentry>
</variablelist>
</section>
<section>
<title>Specifying Dependencies</title>
<title>Specifying Dependencies</title>
<para>
In this section we explore the relationship between both runtime and
buildtime dependencies and the 3 Autoconf platforms.
</para>
<para>
A runtime dependency between 2 packages implies that between them both the
host and target platforms match. This is directly implied by the meaning of
"host platform" and "runtime dependency": The package dependency exists
while both packages are running on a single host platform.
</para>
<para>
A build time dependency, however, implies a shift in platforms between the
depending package and the depended-on package. The meaning of a build time
dependency is that to build the depending package we need to be able to run
the depended-on's package. The depending package's build platform is
therefore equal to the depended-on package's host platform. Analogously,
the depending package's host platform is equal to the depended-on package's
target platform.
</para>
<para>
In this manner, given the 3 platforms for one package, we can determine the
three platforms for all its transitive dependencies. This is the most
important guiding principle behind cross-compilation with Nixpkgs, and will
be called the <wordasword>sliding window principle</wordasword>.
</para>
<para>
Some examples will probably make this clearer. If a package is being built
with a <literal>(build, host, target)</literal> platform triple of
<literal>(foo, bar, bar)</literal>, then its build-time dependencies would
have a triple of <literal>(foo, foo, bar)</literal>, and <emphasis>those
packages'</emphasis> build-time dependencies would have triple of
<literal>(foo, foo, foo)</literal>. In other words, it should take two
"rounds" of following build-time dependency edges before one reaches a
fixed point where, by the sliding window principle, the platform triple no
longer changes. Indeed, this happens with cross compilation, where only
rounds of native dependencies starting with the second necessarily coincide
with native packages.
</para>
<note>
<para>
In this section we explore the relationship between both runtime and buildtime dependencies and the 3 Autoconf platforms.
The depending package's target platform is unconstrained by the sliding
window principle, which makes sense in that one can in principle build
cross compilers targeting arbitrary platforms.
</para>
</note>
<para>
How does this work in practice? Nixpkgs is now structured so that
build-time dependencies are taken from <varname>buildPackages</varname>,
whereas run-time dependencies are taken from the top level attribute set.
For example, <varname>buildPackages.gcc</varname> should be used at build
time, while <varname>gcc</varname> should be used at run time. Now, for
most of Nixpkgs's history, there was no <varname>buildPackages</varname>,
and most packages have not been refactored to use it explicitly. Instead,
one can use the six (<emphasis>gasp</emphasis>) attributes used for
specifying dependencies as documented in
<xref linkend="ssec-stdenv-dependencies"/>. We "splice" together the
run-time and build-time package sets with <varname>callPackage</varname>,
and then <varname>mkDerivation</varname> for each of four attributes pulls
the right derivation out. This splicing can be skipped when not cross
compiling as the package sets are the same, but is a bit slow for cross
compiling. Because of this, a best-of-both-worlds solution is in the works
with no splicing or explicit access of <varname>buildPackages</varname>
needed. For now, feel free to use either method.
</para>
<note>
<para>
A runtime dependency between 2 packages implies that between them both the host and target platforms match.
This is directly implied by the meaning of "host platform" and "runtime dependency":
The package dependency exists while both packages are running on a single host platform.
There is also a "backlink" <varname>targetPackages</varname>, yielding a
package set whose <varname>buildPackages</varname> is the current package
set. This is a hack, though, to accommodate compilers with lousy build
systems. Please do not use this unless you are absolutely sure you are
packaging such a compiler and there is no other way.
</para>
<para>
A build time dependency, however, implies a shift in platforms between the depending package and the depended-on package.
The meaning of a build time dependency is that to build the depending package we need to be able to run the depended-on's package.
The depending package's build platform is therefore equal to the depended-on package's host platform.
Analogously, the depending package's host platform is equal to the depended-on package's target platform.
</para>
<para>
In this manner, given the 3 platforms for one package, we can determine the three platforms for all its transitive dependencies.
This is the most important guiding principle behind cross-compilation with Nixpkgs, and will be called the <wordasword>sliding window principle</wordasword>.
</para>
<para>
Some examples will probably make this clearer.
If a package is being built with a <literal>(build, host, target)</literal> platform triple of <literal>(foo, bar, bar)</literal>, then its build-time dependencies would have a triple of <literal>(foo, foo, bar)</literal>, and <emphasis>those packages'</emphasis> build-time dependencies would have triple of <literal>(foo, foo, foo)</literal>.
In other words, it should take two "rounds" of following build-time dependency edges before one reaches a fixed point where, by the sliding window principle, the platform triple no longer changes.
Indeed, this happens with cross compilation, where only rounds of native dependencies starting with the second necessarily coincide with native packages.
</para>
<note><para>
The depending package's target platform is unconstrained by the sliding window principle, which makes sense in that one can in principle build cross compilers targeting arbitrary platforms.
</para></note>
<para>
How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from <varname>buildPackages</varname>, whereas run-time dependencies are taken from the top level attribute set.
For example, <varname>buildPackages.gcc</varname> should be used at build time, while <varname>gcc</varname> should be used at run time.
Now, for most of Nixpkgs's history, there was no <varname>buildPackages</varname>, and most packages have not been refactored to use it explicitly.
Instead, one can use the six (<emphasis>gasp</emphasis>) attributes used for specifying dependencies as documented in <xref linkend="ssec-stdenv-dependencies"/>.
We "splice" together the run-time and build-time package sets with <varname>callPackage</varname>, and then <varname>mkDerivation</varname> for each of four attributes pulls the right derivation out.
This splicing can be skipped when not cross compiling as the package sets are the same, but is a bit slow for cross compiling.
Because of this, a best-of-both-worlds solution is in the works with no splicing or explicit access of <varname>buildPackages</varname> needed.
For now, feel free to use either method.
</para>
<note><para>
There is also a "backlink" <varname>targetPackages</varname>, yielding a package set whose <varname>buildPackages</varname> is the current package set.
This is a hack, though, to accommodate compilers with lousy build systems.
Please do not use this unless you are absolutely sure you are packaging such a compiler and there is no other way.
</para></note>
</note>
</section>
<section>
<title>Cross packagaing cookbook</title>
<para>
Some frequently problems when packaging for cross compilation are good to just spell and answer.
Ideally the information above is exhaustive, so this section cannot provide any new information,
but its ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem.
Feel free to add to this list!
</para>
<qandaset>
<qandaentry>
<question><para>
What if my package's build system needs to build a C program to be run under the build environment?
</para></question>
<answer><para>
<programlisting>depsBuildBuild = [ buildPackages.stdenv.cc ];</programlisting>
Add it to your <function>mkDerivation</function> invocation.
</para></answer>
</qandaentry>
<qandaentry>
<question><para>
My package fails to find <command>ar</command>.
</para></question>
<answer><para>
Many packages assume that an unprefixed <command>ar</command> is available, but Nix doesn't provide one.
It only provides a prefixed one, just as it only does for all the other binutils programs.
It may be necessary to patch the package to fix the build system to use a prefixed `ar`.
</para></answer>
</qandaentry>
<qandaentry>
<question><para>
My package's testsuite needs to run host platform code.
</para></question>
<answer><para>
<programlisting>doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom;</programlisting>
Add it to your <function>mkDerivation</function> invocation.
</para></answer>
</qandaentry>
</qandaset>
</section>
</section>
<title>Cross packagaing cookbook</title>
<para>
Some frequently problems when packaging for cross compilation are good to
just spell and answer. Ideally the information above is exhaustive, so this
section cannot provide any new information, but its ludicrous and cruel to
expect everyone to spend effort working through the interaction of many
features just to figure out the same answer to the same common problem.
Feel free to add to this list!
</para>
<qandaset>
<qandaentry>
<question>
<para>
What if my package's build system needs to build a C program to be run
under the build environment?
</para>
</question>
<answer>
<para>
<programlisting>depsBuildBuild = [ buildPackages.stdenv.cc ];</programlisting>
Add it to your <function>mkDerivation</function> invocation.
</para>
</answer>
</qandaentry>
<qandaentry>
<question>
<para>
My package fails to find <command>ar</command>.
</para>
</question>
<answer>
<para>
Many packages assume that an unprefixed <command>ar</command> is
available, but Nix doesn't provide one. It only provides a prefixed one,
just as it only does for all the other binutils programs. It may be
necessary to patch the package to fix the build system to use a prefixed
`ar`.
</para>
</answer>
</qandaentry>
<qandaentry>
<question>
<para>
My package's testsuite needs to run host platform code.
</para>
</question>
<answer>
<para>
<programlisting>doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom;</programlisting>
Add it to your <function>mkDerivation</function> invocation.
</para>
</answer>
</qandaentry>
</qandaset>
</section>
</section>
<!--============================================================-->
<section xml:id="sec-cross-usage">
<section xml:id="sec-cross-usage">
<title>Cross-building packages</title>
<note><para>
More information needs to moved from the old wiki, especially <link xlink:href="https://nixos.org/wiki/CrossCompiling" />, for this section.
</para></note>
<note>
<para>
More information needs to moved from the old wiki, especially
<link xlink:href="https://nixos.org/wiki/CrossCompiling" />, for this
section.
</para>
</note>
<para>
Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in which case there is no cross compiling and everything is built by and for that system,
or also with <varname>crossSystem</varname>, in which case packages run on the latter, but all building happens on the former.
Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section.
As mentioned above, <literal>lib.systems.examples</literal> has some platforms which are used as arguments for these parameters in practice.
You can use them programmatically, or on the command line: <programlisting>
Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in
which case there is no cross compiling and everything is built by and for
that system, or also with <varname>crossSystem</varname>, in which case
packages run on the latter, but all building happens on the former. Both
parameters take the same schema as the 3 (build, host, and target) platforms
defined in the previous section. As mentioned above,
<literal>lib.systems.examples</literal> has some platforms which are used as
arguments for these parameters in practice. You can use them
programmatically, or on the command line:
<programlisting>
nix-build &lt;nixpkgs&gt; --arg crossSystem '(import &lt;nixpkgs/lib&gt;).systems.examples.fooBarBaz' -A whatever</programlisting>
</para>
<note>
<para>
Eventually we would like to make these platform examples an unnecessary convenience so that <programlisting>
<para>
Eventually we would like to make these platform examples an unnecessary
convenience so that
<programlisting>
nix-build &lt;nixpkgs&gt; --arg crossSystem.config '&lt;arch&gt;-&lt;os&gt;-&lt;vendor&gt;-&lt;abi&gt;' -A whatever</programlisting>
works in the vast majority of cases.
The problem today is dependencies on other sorts of configuration which aren't given proper defaults.
We rely on the examples to crudely to set those configuration parameters in some vaguely sane manner on the users behalf.
Issue <link xlink:href="https://github.com/NixOS/nixpkgs/issues/34274">#34274</link> tracks this inconvenience along with its root cause in crufty configuration options.
</para>
works in the vast majority of cases. The problem today is dependencies on
other sorts of configuration which aren't given proper defaults. We rely on
the examples to crudely to set those configuration parameters in some
vaguely sane manner on the users behalf. Issue
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/34274">#34274</link>
tracks this inconvenience along with its root cause in crufty configuration
options.
</para>
</note>
<para>
While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields.
As discussed in the previous section, only one of <varname>system</varname>, <varname>config</varname>, and <varname>parsed</varname> is needed to infer the other two.
Additionally, <varname>libc</varname> will be inferred from <varname>parse</varname>.
Finally, <literal>localSystem.system</literal> is also <emphasis>impurely</emphasis> inferred based on the platform evaluation occurs.
This means it is often not necessary to pass <varname>localSystem</varname> at all, as in the command-line example in the previous paragraph.
While one is free to pass both parameters in full, there's a lot of logic to
fill in missing fields. As discussed in the previous section, only one of
<varname>system</varname>, <varname>config</varname>, and
<varname>parsed</varname> is needed to infer the other two. Additionally,
<varname>libc</varname> will be inferred from <varname>parse</varname>.
Finally, <literal>localSystem.system</literal> is also
<emphasis>impurely</emphasis> inferred based on the platform evaluation
occurs. This means it is often not necessary to pass
<varname>localSystem</varname> at all, as in the command-line example in the
previous paragraph.
</para>
<note>
<para>
Many sources (manual, wiki, etc) probably mention passing <varname>system</varname>, <varname>platform</varname>, along with the optional <varname>crossSystem</varname> to nixpkgs:
<literal>import &lt;nixpkgs&gt; { system = ..; platform = ..; crossSystem = ..; }</literal>.
Passing those two instead of <varname>localSystem</varname> is still supported for compatibility, but is discouraged.
Indeed, much of the inference we do for these parameters is motivated by compatibility as much as convenience.
</para>
<para>
Many sources (manual, wiki, etc) probably mention passing
<varname>system</varname>, <varname>platform</varname>, along with the
optional <varname>crossSystem</varname> to nixpkgs: <literal>import
&lt;nixpkgs&gt; { system = ..; platform = ..; crossSystem = ..;
}</literal>. Passing those two instead of <varname>localSystem</varname> is
still supported for compatibility, but is discouraged. Indeed, much of the
inference we do for these parameters is motivated by compatibility as much
as convenience.
</para>
</note>
<para>
One would think that <varname>localSystem</varname> and <varname>crossSystem</varname> overlap horribly with the three <varname>*Platforms</varname> (<varname>buildPlatform</varname>, <varname>hostPlatform,</varname> and <varname>targetPlatform</varname>; see <varname>stage.nix</varname> or the manual).
Actually, those identifiers are purposefully not used here to draw a subtle but important distinction:
While the granularity of having 3 platforms is necessary to properly *build* packages, it is overkill for specifying the user's *intent* when making a build plan or package set.
A simple "build vs deploy" dichotomy is adequate: the sliding window principle described in the previous section shows how to interpolate between the these two "end points" to get the 3 platform triple for each bootstrapping stage.
That means for any package a given package set, even those not bound on the top level but only reachable via dependencies or <varname>buildPackages</varname>, the three platforms will be defined as one of <varname>localSystem</varname> or <varname>crossSystem</varname>, with the former replacing the latter as one traverses build-time dependencies.
A last simple difference then is <varname>crossSystem</varname> should be null when one doesn't want to cross-compile, while the <varname>*Platform</varname>s are always non-null.
<varname>localSystem</varname> is always non-null.
One would think that <varname>localSystem</varname> and
<varname>crossSystem</varname> overlap horribly with the three
<varname>*Platforms</varname> (<varname>buildPlatform</varname>,
<varname>hostPlatform,</varname> and <varname>targetPlatform</varname>; see
<varname>stage.nix</varname> or the manual). Actually, those identifiers are
purposefully not used here to draw a subtle but important distinction: While
the granularity of having 3 platforms is necessary to properly *build*
packages, it is overkill for specifying the user's *intent* when making a
build plan or package set. A simple "build vs deploy" dichotomy is adequate:
the sliding window principle described in the previous section shows how to
interpolate between the these two "end points" to get the 3 platform triple
for each bootstrapping stage. That means for any package a given package
set, even those not bound on the top level but only reachable via
dependencies or <varname>buildPackages</varname>, the three platforms will
be defined as one of <varname>localSystem</varname> or
<varname>crossSystem</varname>, with the former replacing the latter as one
traverses build-time dependencies. A last simple difference then is
<varname>crossSystem</varname> should be null when one doesn't want to
cross-compile, while the <varname>*Platform</varname>s are always non-null.
<varname>localSystem</varname> is always non-null.
</para>
</section>
</section>
<!--============================================================-->
<section xml:id="sec-cross-infra">
<section xml:id="sec-cross-infra">
<title>Cross-compilation infrastructure</title>
<para>To be written.</para>
<note><para>
If one explores nixpkgs, they will see derivations with names like <literal>gccCross</literal>.
Such <literal>*Cross</literal> derivations is a holdover from before we properly distinguished between the host and target platforms
—the derivation with "Cross" in the name covered the <literal>build = host != target</literal> case, while the other covered the <literal>host = target</literal>, with build platform the same or not based on whether one was using its <literal>.nativeDrv</literal> or <literal>.crossDrv</literal>.
This ugliness will disappear soon.
</para></note>
</section>
<para>
To be written.
</para>
<note>
<para>
If one explores nixpkgs, they will see derivations with names like
<literal>gccCross</literal>. Such <literal>*Cross</literal> derivations is
a holdover from before we properly distinguished between the host and
target platforms —the derivation with "Cross" in the name covered the
<literal>build = host != target</literal> case, while the other covered the
<literal>host = target</literal>, with build platform the same or not based
on whether one was using its <literal>.nativeDrv</literal> or
<literal>.crossDrv</literal>. This ugliness will disappear soon.
</para>
</note>
</section>
</chapter>

View File

@@ -7,112 +7,42 @@ in
pkgs.stdenv.mkDerivation {
name = "nixpkgs-manual";
buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing xmlformat ];
buildInputs = with pkgs; [ pandoc libxml2 libxslt zip ];
src = ./.;
xsltFlags = ''
--param section.autolabel 1
--param section.label.includes.component.label 1
--param html.stylesheet 'style.css'
--param xref.with.number.and.title 1
--param toc.section.depth 3
--param admon.style '''
--param callout.graphics.extension '.gif'
# Hacking on these variables? Make sure to close and open
# nix-shell between each test, maybe even:
# $ nix-shell --run "make clean all"
# otherwise they won't reapply :)
HIGHLIGHTJS = pkgs.documentation-highlighter;
XSL = "${pkgs.docbook5_xsl}/xml/xsl";
RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng";
XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf;
xsltFlags = lib.concatStringsSep " " [
"--param section.autolabel 1"
"--param section.label.includes.component.label 1"
"--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'"
"--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'"
"--param xref.with.number.and.title 1"
"--param toc.section.depth 3"
"--stringparam admon.style ''"
"--stringparam callout.graphics.extension .svg"
];
postPatch = ''
echo ${lib.nixpkgsVersion} > .version
'';
installPhase = ''
dest="$out/share/doc/nixpkgs"
mkdir -p "$(dirname "$dest")"
mv out/html "$dest"
mv "$dest/index.html" "$dest/manual.html"
buildCommand = let toDocbook = { useChapters ? false, inputFile, outputFile }:
let
extraHeader = lib.optionalString (!useChapters)
''xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" '';
in ''
{
pandoc '${inputFile}' -w docbook+smart ${lib.optionalString useChapters "--top-level-division=chapter"} \
-f markdown+smart \
| sed -e 's|<ulink url=|<link xlink:href=|' \
-e 's|</ulink>|</link>|' \
-e 's|<sect. id=|<section xml:id=|' \
-e 's|</sect[0-9]>|</section>|' \
-e '1s| id=| xml:id=|' \
-e '1s|\(<[^ ]* \)|\1${extraHeader}|'
} > '${outputFile}'
'';
in
mv out/epub/manual.epub "$dest/nixpkgs-manual.epub"
''
ln -s '${sources}/'*.xml .
mkdir ./languages-frameworks
cp -s '${sources-langs}'/* ./languages-frameworks
''
+ toDocbook {
inputFile = ./introduction.md;
outputFile = "introduction.xml";
useChapters = true;
}
+ toDocbook {
inputFile = ./shell.md;
outputFile = "shell.xml";
}
+ toDocbook {
inputFile = ./languages-frameworks/python.md;
outputFile = "./languages-frameworks/python.xml";
}
+ toDocbook {
inputFile = ./languages-frameworks/haskell.md;
outputFile = "./languages-frameworks/haskell.xml";
}
+ toDocbook {
inputFile = ../pkgs/development/idris-modules/README.md;
outputFile = "languages-frameworks/idris.xml";
}
+ toDocbook {
inputFile = ../pkgs/development/node-packages/README.md;
outputFile = "languages-frameworks/node.xml";
}
+ toDocbook {
inputFile = ../pkgs/development/r-modules/README.md;
outputFile = "languages-frameworks/r.xml";
}
+ toDocbook {
inputFile = ./languages-frameworks/rust.md;
outputFile = "./languages-frameworks/rust.xml";
}
+ toDocbook {
inputFile = ./languages-frameworks/vim.md;
outputFile = "./languages-frameworks/vim.xml";
}
+ ''
echo ${lib.nixpkgsVersion} > .version
# validate against relaxng schema
xmllint --nonet --xinclude --noxincludenode manual.xml --output manual-full.xml
${pkgs.jing}/bin/jing ${pkgs.docbook5}/xml/rng/docbook/docbook.rng manual-full.xml
dst=$out/share/doc/nixpkgs
mkdir -p $dst
xsltproc $xsltFlags --nonet --xinclude \
--output $dst/manual.html \
${pkgs.docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \
./manual.xml
cp ${./style.css} $dst/style.css
mkdir -p $dst/images/callouts
cp "${pkgs.docbook5_xsl}/xml/xsl/docbook/images/callouts/"*.gif $dst/images/callouts/
mkdir -p $out/nix-support
echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products
xsltproc $xsltFlags --nonet --xinclude \
--output $dst/epub/ \
${pkgs.docbook5_xsl}/xml/xsl/docbook/epub/docbook.xsl \
./manual.xml
cp -r $dst/images $dst/epub/OEBPS
echo "application/epub+zip" > mimetype
manual="$dst/nixpkgs-manual.epub"
zip -0Xq "$manual" mimetype
cd $dst/epub && zip -Xr9D "$manual" *
rm -rf $dst/epub
mkdir -p $out/nix-support/
echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products
'';
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,124 +1,137 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-beam">
<title>BEAM Languages (Erlang, Elixir &amp; LFE)</title>
<title>BEAM Languages (Erlang, Elixir &amp; LFE)</title>
<section xml:id="beam-introduction">
<title>Introduction</title>
<para>
In this document and related Nix expressions, we use the term,
<emphasis>BEAM</emphasis>, to describe the environment. BEAM is the name
of the Erlang Virtual Machine and, as far as we're concerned, from a
packaging perspective, all languages that run on the BEAM are
interchangeable. That which varies, like the build system, is transparent
to users of any given BEAM package, so we make no distinction.
</para>
</section>
<section xml:id="beam-structure">
<title>Structure</title>
<para>
All BEAM-related expressions are available via the top-level
<literal>beam</literal> attribute, which includes:
</para>
<itemizedlist>
<listitem>
<para>
<literal>interpreters</literal>: a set of compilers running on the
BEAM, including multiple Erlang/OTP versions
(<literal>beam.interpreters.erlangR19</literal>, etc), Elixir
(<literal>beam.interpreters.elixir</literal>) and LFE
(<literal>beam.interpreters.lfe</literal>).
</para>
</listitem>
<listitem>
<para>
<literal>packages</literal>: a set of package sets, each compiled with
a specific Erlang/OTP version, e.g.
<literal>beam.packages.erlangR19</literal>.
</para>
</listitem>
</itemizedlist>
<para>
The default Erlang compiler, defined by
<literal>beam.interpreters.erlang</literal>, is aliased as
<literal>erlang</literal>. The default BEAM package set is defined by
<literal>beam.packages.erlang</literal> and aliased at the top level as
<literal>beamPackages</literal>.
</para>
<para>
To create a package set built with a custom Erlang version, use the
lambda, <literal>beam.packagesWith</literal>, which accepts an Erlang/OTP
derivation and produces a package set similar to
<literal>beam.packages.erlang</literal>.
</para>
<para>
Many Erlang/OTP distributions available in
<literal>beam.interpreters</literal> have versions with ODBC and/or Java
enabled. For example, there's
<literal>beam.interpreters.erlangR19_odbc_javac</literal>, which
corresponds to <literal>beam.interpreters.erlangR19</literal>.
</para>
<para xml:id="erlang-call-package">
We also provide the lambda,
<literal>beam.packages.erlang.callPackage</literal>, which simplifies
writing BEAM package definitions by injecting all packages from
<literal>beam.packages.erlang</literal> into the top-level context.
</para>
</section>
<section xml:id="build-tools">
<title>Build Tools</title>
<section xml:id="build-tools-rebar3">
<title>Rebar3</title>
<para>
By default, Rebar3 wants to manage its own dependencies. This is perfectly
acceptable in the normal, non-Nix setup, but in the Nix world, it is not.
To rectify this, we provide two versions of Rebar3:
<itemizedlist>
<listitem>
<para>
<literal>rebar3</literal>: patched to remove the ability to download
anything. When not running it via <literal>nix-shell</literal> or
<literal>nix-build</literal>, it's probably not going to work as
desired.
</para>
</listitem>
<listitem>
<para>
<literal>rebar3-open</literal>: the normal, unmodified Rebar3. It
should work exactly as would any other version of Rebar3. Any Erlang
package should rely on <literal>rebar3</literal> instead. See <xref
linkend="rebar3-packages"/>.
</para>
</listitem>
</itemizedlist>
</para>
</section>
<section xml:id="build-tools-other">
<title>Mix &amp; Erlang.mk</title>
<para>
Both Mix and Erlang.mk work exactly as expected. There is a bootstrap
process that needs to be run for both, however, which is supported by the
<literal>buildMix</literal> and <literal>buildErlangMk</literal>
derivations, respectively.
</para>
</section>
</section>
<section xml:id="beam-introduction">
<title>Introduction</title>
<section xml:id="how-to-install-beam-packages">
<title>How to Install BEAM Packages</title>
<para>
BEAM packages are not registered at the top level, simply because they are
not relevant to the vast majority of Nix users. They are installable using
the <literal>beam.packages.erlang</literal> attribute set (aliased as
<literal>beamPackages</literal>), which points to packages built by the
default Erlang/OTP version in Nixpkgs, as defined by
<literal>beam.interpreters.erlang</literal>.
In this document and related Nix expressions, we use the term,
<emphasis>BEAM</emphasis>, to describe the environment. BEAM is the name of
the Erlang Virtual Machine and, as far as we're concerned, from a packaging
perspective, all languages that run on the BEAM are interchangeable. That
which varies, like the build system, is transparent to users of any given
BEAM package, so we make no distinction.
</para>
</section>
To list the available packages in
<literal>beamPackages</literal>, use the following command:
<section xml:id="beam-structure">
<title>Structure</title>
<para>
All BEAM-related expressions are available via the top-level
<literal>beam</literal> attribute, which includes:
</para>
<programlisting>
<itemizedlist>
<listitem>
<para>
<literal>interpreters</literal>: a set of compilers running on the BEAM,
including multiple Erlang/OTP versions
(<literal>beam.interpreters.erlangR19</literal>, etc), Elixir
(<literal>beam.interpreters.elixir</literal>) and LFE
(<literal>beam.interpreters.lfe</literal>).
</para>
</listitem>
<listitem>
<para>
<literal>packages</literal>: a set of package sets, each compiled with a
specific Erlang/OTP version, e.g.
<literal>beam.packages.erlangR19</literal>.
</para>
</listitem>
</itemizedlist>
<para>
The default Erlang compiler, defined by
<literal>beam.interpreters.erlang</literal>, is aliased as
<literal>erlang</literal>. The default BEAM package set is defined by
<literal>beam.packages.erlang</literal> and aliased at the top level as
<literal>beamPackages</literal>.
</para>
<para>
To create a package set built with a custom Erlang version, use the lambda,
<literal>beam.packagesWith</literal>, which accepts an Erlang/OTP derivation
and produces a package set similar to
<literal>beam.packages.erlang</literal>.
</para>
<para>
Many Erlang/OTP distributions available in
<literal>beam.interpreters</literal> have versions with ODBC and/or Java
enabled. For example, there's
<literal>beam.interpreters.erlangR19_odbc_javac</literal>, which corresponds
to <literal>beam.interpreters.erlangR19</literal>.
</para>
<para xml:id="erlang-call-package">
We also provide the lambda,
<literal>beam.packages.erlang.callPackage</literal>, which simplifies
writing BEAM package definitions by injecting all packages from
<literal>beam.packages.erlang</literal> into the top-level context.
</para>
</section>
<section xml:id="build-tools">
<title>Build Tools</title>
<section xml:id="build-tools-rebar3">
<title>Rebar3</title>
<para>
By default, Rebar3 wants to manage its own dependencies. This is perfectly
acceptable in the normal, non-Nix setup, but in the Nix world, it is not.
To rectify this, we provide two versions of Rebar3:
<itemizedlist>
<listitem>
<para>
<literal>rebar3</literal>: patched to remove the ability to download
anything. When not running it via <literal>nix-shell</literal> or
<literal>nix-build</literal>, it's probably not going to work as
desired.
</para>
</listitem>
<listitem>
<para>
<literal>rebar3-open</literal>: the normal, unmodified Rebar3. It should
work exactly as would any other version of Rebar3. Any Erlang package
should rely on <literal>rebar3</literal> instead. See
<xref
linkend="rebar3-packages"/>.
</para>
</listitem>
</itemizedlist>
</para>
</section>
<section xml:id="build-tools-other">
<title>Mix &amp; Erlang.mk</title>
<para>
Both Mix and Erlang.mk work exactly as expected. There is a bootstrap
process that needs to be run for both, however, which is supported by the
<literal>buildMix</literal> and <literal>buildErlangMk</literal>
derivations, respectively.
</para>
</section>
</section>
<section xml:id="how-to-install-beam-packages">
<title>How to Install BEAM Packages</title>
<para>
BEAM packages are not registered at the top level, simply because they are
not relevant to the vast majority of Nix users. They are installable using
the <literal>beam.packages.erlang</literal> attribute set (aliased as
<literal>beamPackages</literal>), which points to packages built by the
default Erlang/OTP version in Nixpkgs, as defined by
<literal>beam.interpreters.erlang</literal>. To list the available packages
in <literal>beamPackages</literal>, use the following command:
</para>
<programlisting>
$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A beamPackages
beamPackages.esqlite esqlite-0.2.1
beamPackages.goldrush goldrush-0.1.7
@@ -128,34 +141,43 @@ beamPackages.lager lager-3.0.2
beamPackages.meck meck-0.8.3
beamPackages.rebar3-pc pc-1.1.0
</programlisting>
<para>
To install any of those packages into your profile, refer to them by their
attribute path (first column):
To install any of those packages into your profile, refer to them by their
attribute path (first column):
</para>
<programlisting>
<programlisting>
$ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
</programlisting>
<para>
The attribute path of any BEAM package corresponds to the name of that
particular package in <link xlink:href="https://hex.pm">Hex</link> or its
OTP Application/Release name.
The attribute path of any BEAM package corresponds to the name of that
particular package in <link xlink:href="https://hex.pm">Hex</link> or its
OTP Application/Release name.
</para>
</section>
<section xml:id="packaging-beam-applications">
</section>
<section xml:id="packaging-beam-applications">
<title>Packaging BEAM Applications</title>
<section xml:id="packaging-erlang-applications">
<title>Erlang Applications</title>
<section xml:id="rebar3-packages">
<title>Rebar3 Packages</title>
<para>
The Nix function, <literal>buildRebar3</literal>, defined in
<literal>beam.packages.erlang.buildRebar3</literal> and aliased at the
top level, can be used to build a derivation that understands how to
build a Rebar3 project. For example, we can build <link
xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link> as
follows:
</para>
<programlisting>
<title>Erlang Applications</title>
<section xml:id="rebar3-packages">
<title>Rebar3 Packages</title>
<para>
The Nix function, <literal>buildRebar3</literal>, defined in
<literal>beam.packages.erlang.buildRebar3</literal> and aliased at the top
level, can be used to build a derivation that understands how to build a
Rebar3 project. For example, we can build
<link
xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>
as follows:
</para>
<programlisting>
{ stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }:
buildRebar3 rec {
@@ -172,33 +194,40 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
beamDeps = [ ibrowse jsx erlware_commons ];
}
</programlisting>
<para>
Such derivations are callable with
<literal>beam.packages.erlang.callPackage</literal> (see <xref
linkend="erlang-call-package"/>). To call this package using the normal
<literal>callPackage</literal>, refer to dependency packages via
<literal>beamPackages</literal>, e.g.
<literal>beamPackages.ibrowse</literal>.
</para>
<para>
Notably, <literal>buildRebar3</literal> includes
<literal>beamDeps</literal>, while
<literal>stdenv.mkDerivation</literal> does not. BEAM dependencies added
there will be correctly handled by the system.
</para>
<para>
If a package needs to compile native code via Rebar3's port compilation
mechanism, add <literal>compilePort = true;</literal> to the derivation.
</para>
</section>
<section xml:id="erlang-mk-packages">
<title>Erlang.mk Packages</title>
<para>
Erlang.mk functions similarly to Rebar3, except we use
<literal>buildErlangMk</literal> instead of
<literal>buildRebar3</literal>.
</para>
<programlisting>
<para>
Such derivations are callable with
<literal>beam.packages.erlang.callPackage</literal> (see
<xref
linkend="erlang-call-package"/>). To call this package using
the normal <literal>callPackage</literal>, refer to dependency packages
via <literal>beamPackages</literal>, e.g.
<literal>beamPackages.ibrowse</literal>.
</para>
<para>
Notably, <literal>buildRebar3</literal> includes
<literal>beamDeps</literal>, while <literal>stdenv.mkDerivation</literal>
does not. BEAM dependencies added there will be correctly handled by the
system.
</para>
<para>
If a package needs to compile native code via Rebar3's port compilation
mechanism, add <literal>compilePort = true;</literal> to the derivation.
</para>
</section>
<section xml:id="erlang-mk-packages">
<title>Erlang.mk Packages</title>
<para>
Erlang.mk functions similarly to Rebar3, except we use
<literal>buildErlangMk</literal> instead of
<literal>buildRebar3</literal>.
</para>
<programlisting>
{ buildErlangMk, fetchHex, cowlib, ranch }:
buildErlangMk {
@@ -222,14 +251,17 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
};
}
</programlisting>
</section>
<section xml:id="mix-packages">
<title>Mix Packages</title>
<para>
Mix functions similarly to Rebar3, except we use
<literal>buildMix</literal> instead of <literal>buildRebar3</literal>.
</para>
<programlisting>
</section>
<section xml:id="mix-packages">
<title>Mix Packages</title>
<para>
Mix functions similarly to Rebar3, except we use
<literal>buildMix</literal> instead of <literal>buildRebar3</literal>.
</para>
<programlisting>
{ buildMix, fetchHex, plug, absinthe }:
buildMix {
@@ -253,10 +285,12 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
};
}
</programlisting>
<para>
Alternatively, we can use <literal>buildHex</literal> as a shortcut:
</para>
<programlisting>
<para>
Alternatively, we can use <literal>buildHex</literal> as a shortcut:
</para>
<programlisting>
{ buildHex, buildMix, plug, absinthe }:
buildHex {
@@ -278,21 +312,25 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
};
}
</programlisting>
</section>
</section>
</section>
</section>
<section xml:id="how-to-develop">
</section>
<section xml:id="how-to-develop">
<title>How to Develop</title>
<section xml:id="accessing-an-environment">
<title>Accessing an Environment</title>
<para>
Often, we simply want to access a valid environment that contains a
specific package and its dependencies. We can accomplish that with the
<literal>env</literal> attribute of a derivation. For example, let's say
we want to access an Erlang REPL with <literal>ibrowse</literal> loaded
up. We could do the following:
</para>
<programlisting>
<title>Accessing an Environment</title>
<para>
Often, we simply want to access a valid environment that contains a
specific package and its dependencies. We can accomplish that with the
<literal>env</literal> attribute of a derivation. For example, let's say we
want to access an Erlang REPL with <literal>ibrowse</literal> loaded up. We
could do the following:
</para>
<programlisting>
$ nix-shell -A beamPackages.ibrowse.env --run "erl"
Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false]
@@ -333,22 +371,25 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
ok
2>
</programlisting>
<para>
Notice the <literal>-A beamPackages.ibrowse.env</literal>. That is the key
to this functionality.
</para>
<para>
Notice the <literal>-A beamPackages.ibrowse.env</literal>. That is the key
to this functionality.
</para>
</section>
<section xml:id="creating-a-shell">
<title>Creating a Shell</title>
<para>
Getting access to an environment often isn't enough to do real
development. Usually, we need to create a <literal>shell.nix</literal>
file and do our development inside of the environment specified therein.
This file looks a lot like the packaging described above, except that
<literal>src</literal> points to the project root and we call the package
directly.
</para>
<programlisting>
<title>Creating a Shell</title>
<para>
Getting access to an environment often isn't enough to do real development.
Usually, we need to create a <literal>shell.nix</literal> file and do our
development inside of the environment specified therein. This file looks a
lot like the packaging described above, except that <literal>src</literal>
points to the project root and we call the package directly.
</para>
<programlisting>
{ pkgs ? import &quot;&lt;nixpkgs&quot;&gt; {} }:
with pkgs;
@@ -368,13 +409,16 @@ in
drv
</programlisting>
<section xml:id="building-in-a-shell">
<section xml:id="building-in-a-shell">
<title>Building in a Shell (for Mix Projects)</title>
<para>
We can leverage the support of the derivation, irrespective of the build
derivation, by calling the commands themselves.
We can leverage the support of the derivation, irrespective of the build
derivation, by calling the commands themselves.
</para>
<programlisting>
<programlisting>
# =============================================================================
# Variables
# =============================================================================
@@ -431,44 +475,54 @@ analyze: build plt
$(NIX_SHELL) --run "mix dialyzer --no-compile"
</programlisting>
<para>
Using a <literal>shell.nix</literal> as described (see <xref
Using a <literal>shell.nix</literal> as described (see
<xref
linkend="creating-a-shell"/>) should just work. Aside from
<literal>test</literal>, <literal>plt</literal>, and
<literal>analyze</literal>, the Make targets work just fine for all of the
build derivations.
<literal>test</literal>, <literal>plt</literal>, and
<literal>analyze</literal>, the Make targets work just fine for all of the
build derivations.
</para>
</section>
</section>
</section>
</section>
<section xml:id="generating-packages-from-hex-with-hex2nix">
</section>
<section xml:id="generating-packages-from-hex-with-hex2nix">
<title>Generating Packages from Hex with <literal>hex2nix</literal></title>
<para>
Updating the <link xlink:href="https://hex.pm">Hex</link> package set
requires <link
xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>. Given the
path to the Erlang modules (usually
<literal>pkgs/development/erlang-modules</literal>), it will dump a file
called <literal>hex-packages.nix</literal>, containing all the packages that
use a recognized build system in <link
xlink:href="https://hex.pm">Hex</link>. It can't be determined, however,
whether every package is buildable.
</para>
<para>
To make life easier for our users, try to build every <link
xlink:href="https://hex.pm">Hex</link> package and remove those that fail.
To do that, simply run the following command in the root of your
<literal>nixpkgs</literal> repository:
</para>
<programlisting>
Updating the <link xlink:href="https://hex.pm">Hex</link> package set
requires
<link
xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>.
Given the path to the Erlang modules (usually
<literal>pkgs/development/erlang-modules</literal>), it will dump a file
called <literal>hex-packages.nix</literal>, containing all the packages that
use a recognized build system in
<link
xlink:href="https://hex.pm">Hex</link>. It can't be determined,
however, whether every package is buildable.
</para>
<para>
To make life easier for our users, try to build every
<link
xlink:href="https://hex.pm">Hex</link> package and remove those
that fail. To do that, simply run the following command in the root of your
<literal>nixpkgs</literal> repository:
</para>
<programlisting>
$ nix-build -A beamPackages
</programlisting>
<para>
That will attempt to build every package in
<literal>beamPackages</literal>. Then manually remove those that fail.
Hopefully, someone will improve <link
xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link> in the
future to automate the process.
</para>
</section>
<para>
That will attempt to build every package in <literal>beamPackages</literal>.
Then manually remove those that fail. Hopefully, someone will improve
<link
xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>
in the future to automate the process.
</para>
</section>
</section>

View File

@@ -1,40 +1,37 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-bower">
<title>Bower</title>
<title>Bower</title>
<para>
<link xlink:href="http://bower.io">Bower</link> is a package manager for web
site front-end components. Bower packages (comprising of build artefacts and
sometimes sources) are stored in <command>git</command> repositories,
typically on Github. The package registry is run by the Bower team with
package metadata coming from the <filename>bower.json</filename> file within
each package.
</para>
<para>
<link xlink:href="http://bower.io">Bower</link> is a package manager
for web site front-end components. Bower packages (comprising of
build artefacts and sometimes sources) are stored in
<command>git</command> repositories, typically on Github. The
package registry is run by the Bower team with package metadata
coming from the <filename>bower.json</filename> file within each
package.
</para>
<para>
The end result of running Bower is a <filename>bower_components</filename>
directory which can be included in the web app's build process.
</para>
<para>
The end result of running Bower is a
<filename>bower_components</filename> directory which can be included
in the web app's build process.
</para>
<para>
<para>
Bower can be run interactively, by installing
<varname>nodePackages.bower</varname>. More interestingly, the Bower
components can be declared in a Nix derivation, with the help of
<varname>nodePackages.bower2nix</varname>.
</para>
</para>
<section xml:id="ssec-bower2nix-usage">
<section xml:id="ssec-bower2nix-usage">
<title><command>bower2nix</command> usage</title>
<para>
Suppose you have a <filename>bower.json</filename> with the following contents:
<example xml:id="ex-bowerJson"><title><filename>bower.json</filename></title>
<para>
Suppose you have a <filename>bower.json</filename> with the following
contents:
<example xml:id="ex-bowerJson">
<title><filename>bower.json</filename></title>
<programlisting language="json">
<![CDATA[{
"name": "my-web-app",
@@ -44,14 +41,12 @@
}
}]]>
</programlisting>
</example>
</para>
<para>
Running <command>bower2nix</command> will produce something like the
following output:
</example>
</para>
<para>
Running <command>bower2nix</command> will produce something like the
following output:
<programlisting language="nix">
<![CDATA[{ fetchbower, buildEnv }:
buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
@@ -60,31 +55,31 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
(fetchbower "jquery" "2.2.2" "1.9.1 - 2" "10sp5h98sqwk90y4k6hbdviwqzvzwqf47r3r51pakch5ii2y7js1")
]; }]]>
</programlisting>
</para>
<para>
Using the <command>bower2nix</command> command line arguments, the
output can be redirected to a file. A name like
<filename>bower-packages.nix</filename> would be fine.
</para>
<para>
The resulting derivation is a union of all the downloaded Bower
packages (and their dependencies). To use it, they still need to be
linked together by Bower, which is where
<varname>buildBowerComponents</varname> is useful.
</para>
</section>
<section xml:id="ssec-build-bower-components"><title><varname>buildBowerComponents</varname> function</title>
</para>
<para>
The function is implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/bower-modules/generic/default.nix">
<filename>pkgs/development/bower-modules/generic/default.nix</filename></link>.
Example usage:
Using the <command>bower2nix</command> command line arguments, the output
can be redirected to a file. A name like
<filename>bower-packages.nix</filename> would be fine.
</para>
<example xml:id="ex-buildBowerComponents"><title>buildBowerComponents</title>
<para>
The resulting derivation is a union of all the downloaded Bower packages
(and their dependencies). To use it, they still need to be linked together
by Bower, which is where <varname>buildBowerComponents</varname> is useful.
</para>
</section>
<section xml:id="ssec-build-bower-components">
<title><varname>buildBowerComponents</varname> function</title>
<para>
The function is implemented in
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/bower-modules/generic/default.nix">
<filename>pkgs/development/bower-modules/generic/default.nix</filename></link>.
Example usage:
<example xml:id="ex-buildBowerComponents">
<title>buildBowerComponents</title>
<programlisting language="nix">
bowerComponents = buildBowerComponents {
name = "my-web-app";
@@ -92,42 +87,42 @@ bowerComponents = buildBowerComponents {
src = myWebApp; <co xml:id="ex-buildBowerComponents-2" />
};
</programlisting>
</example>
</example>
</para>
<para>
In <xref linkend="ex-buildBowerComponents" />, the following arguments
are of special significance to the function:
<para>
In <xref linkend="ex-buildBowerComponents" />, the following arguments are
of special significance to the function:
<calloutlist>
<callout arearefs="ex-buildBowerComponents-1">
<para>
<varname>generated</varname> specifies the file which was created by
<command>bower2nix</command>.
</para>
</callout>
<callout arearefs="ex-buildBowerComponents-2">
<para>
<varname>src</varname> is your project's sources. It needs to contain a
<filename>bower.json</filename> file.
</para>
</callout>
</calloutlist>
</para>
<calloutlist>
<callout arearefs="ex-buildBowerComponents-1">
<para>
<varname>generated</varname> specifies the file which was created by <command>bower2nix</command>.
</para>
</callout>
<para>
<varname>buildBowerComponents</varname> will run Bower to link together the
output of <command>bower2nix</command>, resulting in a
<filename>bower_components</filename> directory which can be used.
</para>
<callout arearefs="ex-buildBowerComponents-2">
<para>
<varname>src</varname> is your project's sources. It needs to
contain a <filename>bower.json</filename> file.
</para>
</callout>
</calloutlist>
</para>
<para>
Here is an example of a web frontend build process using
<command>gulp</command>. You might use <command>grunt</command>, or anything
else.
</para>
<para>
<varname>buildBowerComponents</varname> will run Bower to link
together the output of <command>bower2nix</command>, resulting in a
<filename>bower_components</filename> directory which can be used.
</para>
<para>
Here is an example of a web frontend build process using
<command>gulp</command>. You might use <command>grunt</command>, or
anything else.
</para>
<example xml:id="ex-bowerGulpFile"><title>Example build script (<filename>gulpfile.js</filename>)</title>
<example xml:id="ex-bowerGulpFile">
<title>Example build script (<filename>gulpfile.js</filename>)</title>
<programlisting language="javascript">
<![CDATA[var gulp = require('gulp');
@@ -142,10 +137,10 @@ gulp.task('build', [], function () {
.pipe(gulp.dest("./gulpdist/"));
});]]>
</programlisting>
</example>
</example>
<example xml:id="ex-buildBowerComponentsDefaultNix">
<title>Full example — <filename>default.nix</filename></title>
<example xml:id="ex-buildBowerComponentsDefaultNix">
<title>Full example — <filename>default.nix</filename></title>
<programlisting language="nix">
{ myWebApp ? { outPath = ./.; name = "myWebApp"; }
, pkgs ? import &lt;nixpkgs&gt; {}
@@ -172,73 +167,63 @@ pkgs.stdenv.mkDerivation {
installPhase = "mv gulpdist $out";
}
</programlisting>
</example>
</example>
<para>
A few notes about <xref linkend="ex-buildBowerComponentsDefaultNix" />:
<calloutlist>
<callout arearefs="ex-buildBowerComponentsDefault-1">
<para>
The result of <varname>buildBowerComponents</varname> is an
input to the frontend build.
</para>
</callout>
<callout arearefs="ex-buildBowerComponentsDefault-2">
<para>
Whether to symlink or copy the
<filename>bower_components</filename> directory depends on the
build tool in use. In this case a copy is used to avoid
<command>gulp</command> silliness with permissions.
</para>
</callout>
<callout arearefs="ex-buildBowerComponentsDefault-3">
<para>
<command>gulp</command> requires <varname>HOME</varname> to
refer to a writeable directory.
</para>
</callout>
<callout arearefs="ex-buildBowerComponentsDefault-4">
<para>
<para>
A few notes about <xref linkend="ex-buildBowerComponentsDefaultNix" />:
<calloutlist>
<callout arearefs="ex-buildBowerComponentsDefault-1">
<para>
The result of <varname>buildBowerComponents</varname> is an input to the
frontend build.
</para>
</callout>
<callout arearefs="ex-buildBowerComponentsDefault-2">
<para>
Whether to symlink or copy the <filename>bower_components</filename>
directory depends on the build tool in use. In this case a copy is used
to avoid <command>gulp</command> silliness with permissions.
</para>
</callout>
<callout arearefs="ex-buildBowerComponentsDefault-3">
<para>
<command>gulp</command> requires <varname>HOME</varname> to refer to a
writeable directory.
</para>
</callout>
<callout arearefs="ex-buildBowerComponentsDefault-4">
<para>
The actual build command. Other tools could be used.
</para>
</callout>
</calloutlist>
</para>
</section>
</para>
</callout>
</calloutlist>
</para>
</section>
<section xml:id="ssec-bower2nix-troubleshooting">
<section xml:id="ssec-bower2nix-troubleshooting">
<title>Troubleshooting</title>
<variablelist>
<varlistentry>
<variablelist>
<varlistentry>
<term>
<literal>ENOCACHE</literal> errors from
<varname>buildBowerComponents</varname>
<literal>ENOCACHE</literal> errors from <varname>buildBowerComponents</varname>
</term>
<listitem>
<para>
This means that Bower was looking for a package version which
doesn't exist in the generated
<filename>bower-packages.nix</filename>.
</para>
<para>
If <filename>bower.json</filename> has been updated, then run
<command>bower2nix</command> again.
</para>
<para>
It could also be a bug in <command>bower2nix</command> or
<command>fetchbower</command>. If possible, try reformulating
the version specification in <filename>bower.json</filename>.
</para>
<para>
This means that Bower was looking for a package version which doesn't
exist in the generated <filename>bower-packages.nix</filename>.
</para>
<para>
If <filename>bower.json</filename> has been updated, then run
<command>bower2nix</command> again.
</para>
<para>
It could also be a bug in <command>bower2nix</command> or
<command>fetchbower</command>. If possible, try reformulating the version
specification in <filename>bower.json</filename>.
</para>
</listitem>
</varlistentry>
</variablelist>
</section>
</varlistentry>
</variablelist>
</section>
</section>

View File

@@ -1,36 +1,38 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-coq">
<title>Coq</title>
<title>Coq</title>
<para>
Coq libraries should be installed in
<literal>$(out)/lib/coq/${coq.coq-version}/user-contrib/</literal>.
Such directories are automatically added to the
<literal>$COQPATH</literal> environment variable by the hook defined
in the Coq derivation.
</para>
<para>
Some libraries require OCaml and sometimes also Camlp5 or findlib.
The exact versions that were used to build Coq are saved in the
<literal>coq.ocaml</literal> and <literal>coq.camlp5</literal>
and <literal>coq.findlib</literal> attributes.
</para>
<para>
Coq libraries may be compatible with some specific versions of Coq only.
The <literal>compatibleCoqVersions</literal> attribute is used to
precisely select those versions of Coq that are compatible with this
derivation.
</para>
<para>
Here is a simple package example. It is a pure Coq library, thus it
depends on Coq. It builds on the Mathematical Components library, thus it
also takes <literal>mathcomp</literal> as <literal>buildInputs</literal>.
Its <literal>Makefile</literal> has been generated using
<literal>coq_makefile</literal> so we only have to
set the <literal>$COQLIB</literal> variable at install time.
</para>
<programlisting>
<para>
Coq libraries should be installed in
<literal>$(out)/lib/coq/${coq.coq-version}/user-contrib/</literal>. Such
directories are automatically added to the <literal>$COQPATH</literal>
environment variable by the hook defined in the Coq derivation.
</para>
<para>
Some libraries require OCaml and sometimes also Camlp5 or findlib. The exact
versions that were used to build Coq are saved in the
<literal>coq.ocaml</literal> and <literal>coq.camlp5</literal> and
<literal>coq.findlib</literal> attributes.
</para>
<para>
Coq libraries may be compatible with some specific versions of Coq only. The
<literal>compatibleCoqVersions</literal> attribute is used to precisely
select those versions of Coq that are compatible with this derivation.
</para>
<para>
Here is a simple package example. It is a pure Coq library, thus it depends
on Coq. It builds on the Mathematical Components library, thus it also takes
<literal>mathcomp</literal> as <literal>buildInputs</literal>. Its
<literal>Makefile</literal> has been generated using
<literal>coq_makefile</literal> so we only have to set the
<literal>$COQLIB</literal> variable at install time.
</para>
<programlisting>
{ stdenv, fetchFromGitHub, coq, mathcomp }:
stdenv.mkDerivation rec {

View File

@@ -1,14 +1,14 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-go">
<title>Go</title>
<title>Go</title>
<para>
The function <varname>buildGoPackage</varname> builds standard Go programs.
</para>
<para>The function <varname>buildGoPackage</varname> builds
standard Go programs.
</para>
<example xml:id='ex-buildGoPackage'><title>buildGoPackage</title>
<example xml:id='ex-buildGoPackage'>
<title>buildGoPackage</title>
<programlisting>
deis = buildGoPackage rec {
name = "deis-${version}";
@@ -29,55 +29,56 @@ deis = buildGoPackage rec {
buildFlags = "--tags release"; <co xml:id='ex-buildGoPackage-4' />
}
</programlisting>
</example>
</example>
<para><xref linkend='ex-buildGoPackage'/> is an example expression using buildGoPackage,
the following arguments are of special significance to the function:
<calloutlist>
<callout arearefs='ex-buildGoPackage-1'>
<para>
<xref linkend='ex-buildGoPackage'/> is an example expression using
buildGoPackage, the following arguments are of special significance to the
function:
<calloutlist>
<callout arearefs='ex-buildGoPackage-1'>
<para>
<varname>goPackagePath</varname> specifies the package's canonical Go import path.
<varname>goPackagePath</varname> specifies the package's canonical Go
import path.
</para>
</callout>
<callout arearefs='ex-buildGoPackage-2'>
</callout>
<callout arearefs='ex-buildGoPackage-2'>
<para>
<varname>subPackages</varname> limits the builder from building child packages that
have not been listed. If <varname>subPackages</varname> is not specified, all child
packages will be built.
<varname>subPackages</varname> limits the builder from building child
packages that have not been listed. If <varname>subPackages</varname> is
not specified, all child packages will be built.
</para>
<para>
In this example only <literal>github.com/deis/deis/client</literal> will be built.
In this example only <literal>github.com/deis/deis/client</literal> will
be built.
</para>
</callout>
<callout arearefs='ex-buildGoPackage-3'>
</callout>
<callout arearefs='ex-buildGoPackage-3'>
<para>
<varname>goDeps</varname> is where the Go dependencies of a Go program are listed
as a list of package source identified by Go import path.
It could be imported as a separate <varname>deps.nix</varname> file for
readability. The dependency data structure is described below.
<varname>goDeps</varname> is where the Go dependencies of a Go program are
listed as a list of package source identified by Go import path. It could
be imported as a separate <varname>deps.nix</varname> file for
readability. The dependency data structure is described below.
</para>
</callout>
<callout arearefs='ex-buildGoPackage-4'>
</callout>
<callout arearefs='ex-buildGoPackage-4'>
<para>
<varname>buildFlags</varname> is a list of flags passed to the go build command.
<varname>buildFlags</varname> is a list of flags passed to the go build
command.
</para>
</callout>
</callout>
</calloutlist>
</para>
</calloutlist>
<para>
The <varname>goDeps</varname> attribute can be imported from a separate
<varname>nix</varname> file that defines which Go libraries are needed and
should be included in <varname>GOPATH</varname> for
<varname>buildPhase</varname>.
</para>
</para>
<para>The <varname>goDeps</varname> attribute can be imported from a separate
<varname>nix</varname> file that defines which Go libraries are needed and should
be included in <varname>GOPATH</varname> for <varname>buildPhase</varname>.
</para>
<example xml:id='ex-goDeps'><title>deps.nix</title>
<example xml:id='ex-goDeps'>
<title>deps.nix</title>
<programlisting>
[ <co xml:id='ex-goDeps-1' />
{
@@ -100,67 +101,60 @@ the following arguments are of special significance to the function:
}
]
</programlisting>
</example>
</example>
<para>
<calloutlist>
<callout arearefs='ex-goDeps-1'>
<para>
<calloutlist>
<callout arearefs='ex-goDeps-1'>
<para>
<varname>goDeps</varname> is a list of Go dependencies.
<varname>goDeps</varname> is a list of Go dependencies.
</para>
</callout>
<callout arearefs='ex-goDeps-2'>
</callout>
<callout arearefs='ex-goDeps-2'>
<para>
<varname>goPackagePath</varname> specifies Go package import path.
<varname>goPackagePath</varname> specifies Go package import path.
</para>
</callout>
<callout arearefs='ex-goDeps-3'>
</callout>
<callout arearefs='ex-goDeps-3'>
<para>
<varname>fetch type</varname> that needs to be used to get package source. If <varname>git</varname>
is used there should be <varname>url</varname>, <varname>rev</varname> and <varname>sha256</varname>
defined next to it.
<varname>fetch type</varname> that needs to be used to get package source.
If <varname>git</varname> is used there should be <varname>url</varname>,
<varname>rev</varname> and <varname>sha256</varname> defined next to it.
</para>
</callout>
</callout>
</calloutlist>
</para>
</calloutlist>
<para>
To extract dependency information from a Go package in automated way use
<link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>. It can
produce complete derivation and <varname>goDeps</varname> file for Go
programs.
</para>
</para>
<para>To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>.
It can produce complete derivation and <varname>goDeps</varname> file for Go programs.</para>
<para>
<varname>buildGoPackage</varname> produces <xref linkend='chap-multiple-output' xrefstyle="select: title" />
where <varname>bin</varname> includes program binaries. You can test build a Go binary as follows:
<screen>
<para>
<varname>buildGoPackage</varname> produces
<xref linkend='chap-multiple-output' xrefstyle="select: title" /> where
<varname>bin</varname> includes program binaries. You can test build a Go
binary as follows:
<screen>
$ nix-build -A deis.bin
</screen>
or build all outputs with:
<screen>
<screen>
$ nix-build -A deis.all
</screen>
<varname>bin</varname> output will be installed by default with
<varname>nix-env -i</varname> or <varname>systemPackages</varname>.
</para>
<varname>bin</varname> output will be installed by default with <varname>nix-env -i</varname>
or <varname>systemPackages</varname>.
</para>
<para>
You may use Go packages installed into the active Nix profiles by adding
the following to your ~/.bashrc:
<para>
You may use Go packages installed into the active Nix profiles by adding the
following to your ~/.bashrc:
<screen>
for p in $NIX_PROFILES; do
GOPATH="$p/share/go:$GOPATH"
done
</screen>
</para>
</para>
</section>

View File

@@ -0,0 +1,39 @@
Idris packages
==============
This directory contains build rules for idris packages. In addition,
it contains several functions to build and compose those packages.
Everything is exposed to the user via the `idrisPackages` attribute.
callPackage
------------
This is like the normal nixpkgs callPackage function, specialized to
idris packages.
builtins
---------
This is a list of all of the libraries that come packaged with Idris
itself.
build-idris-package
--------------------
A function to build an idris package. Its sole argument is a set like
you might pass to `stdenv.mkDerivation`, except `build-idris-package`
sets several attributes for you. See `build-idris-package.nix` for
details.
build-builtin-package
----------------------
A version of `build-idris-package` specialized to builtin libraries.
Mostly for internal use.
with-packages
-------------
Bundle idris together with a list of packages. Because idris currently
only supports a single directory in its library path, you must include
all desired libraries here, including `prelude` and `base`.

View File

@@ -1,35 +1,30 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude"
xml:id="chap-language-support">
<title>Support for specific programming languages and frameworks</title>
<para>The <link linkend="chap-stdenv">standard build
environment</link> makes it easy to build typical Autotools-based
packages with very little code. Any other kind of package can be
accomodated by overriding the appropriate phases of
<literal>stdenv</literal>. However, there are specialised functions
in Nixpkgs to easily build packages for other programming languages,
such as Perl or Haskell. These are described in this chapter.</para>
<xi:include href="beam.xml" />
<xi:include href="bower.xml" />
<xi:include href="coq.xml" />
<xi:include href="go.xml" />
<xi:include href="haskell.xml" />
<xi:include href="idris.xml" /> <!-- generated from ../../pkgs/development/idris-modules/README.md -->
<xi:include href="java.xml" />
<xi:include href="lua.xml" />
<xi:include href="node.xml" /> <!-- generated from ../../pkgs/development/node-packages/README.md -->
<xi:include href="perl.xml" />
<xi:include href="python.xml" />
<xi:include href="qt.xml" />
<xi:include href="r.xml" /> <!-- generated from ../../pkgs/development/r-modules/README.md -->
<xi:include href="ruby.xml" />
<xi:include href="rust.xml" />
<xi:include href="texlive.xml" />
<xi:include href="vim.xml" />
<title>Support for specific programming languages and frameworks</title>
<para>
The <link linkend="chap-stdenv">standard build environment</link> makes it
easy to build typical Autotools-based packages with very little code. Any
other kind of package can be accomodated by overriding the appropriate phases
of <literal>stdenv</literal>. However, there are specialised functions in
Nixpkgs to easily build packages for other programming languages, such as
Perl or Haskell. These are described in this chapter.
</para>
<xi:include href="beam.xml" />
<xi:include href="bower.xml" />
<xi:include href="coq.xml" />
<xi:include href="go.xml" />
<xi:include href="haskell.section.xml" />
<xi:include href="idris.section.xml" />
<xi:include href="java.xml" />
<xi:include href="lua.xml" />
<xi:include href="node.section.xml" />
<xi:include href="perl.xml" />
<xi:include href="python.section.xml" />
<xi:include href="qt.xml" />
<xi:include href="r.section.xml" />
<xi:include href="ruby.xml" />
<xi:include href="rust.section.xml" />
<xi:include href="texlive.xml" />
<xi:include href="vim.section.xml" />
</chapter>

View File

@@ -1,11 +1,10 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-java">
<title>Java</title>
<title>Java</title>
<para>Ant-based Java packages are typically built from source as follows:
<para>
Ant-based Java packages are typically built from source as follows:
<programlisting>
stdenv.mkDerivation {
name = "...";
@@ -16,33 +15,33 @@ stdenv.mkDerivation {
buildPhase = "ant";
}
</programlisting>
Note that <varname>jdk</varname> is an alias for the OpenJDK.
</para>
Note that <varname>jdk</varname> is an alias for the OpenJDK.</para>
<para>JAR files that are intended to be used by other packages should
be installed in <filename>$out/share/java</filename>. The OpenJDK has
a stdenv setup hook that adds any JARs in the
<filename>share/java</filename> directories of the build inputs to the
<envar>CLASSPATH</envar> environment variable. For instance, if the
package <literal>libfoo</literal> installs a JAR named
<filename>foo.jar</filename> in its <filename>share/java</filename>
directory, and another package declares the attribute
<para>
JAR files that are intended to be used by other packages should be installed
in <filename>$out/share/java</filename>. The OpenJDK has a stdenv setup hook
that adds any JARs in the <filename>share/java</filename> directories of the
build inputs to the <envar>CLASSPATH</envar> environment variable. For
instance, if the package <literal>libfoo</literal> installs a JAR named
<filename>foo.jar</filename> in its <filename>share/java</filename>
directory, and another package declares the attribute
<programlisting>
buildInputs = [ jdk libfoo ];
</programlisting>
then <envar>CLASSPATH</envar> will be set to
<filename>/nix/store/...-libfoo/share/java/foo.jar</filename>.
</para>
then <envar>CLASSPATH</envar> will be set to
<filename>/nix/store/...-libfoo/share/java/foo.jar</filename>.</para>
<para>Private JARs
should be installed in a location like
<filename>$out/share/<replaceable>package-name</replaceable></filename>.</para>
<para>If your Java package provides a program, you need to generate a
wrapper script to run it using the OpenJRE. You can use
<literal>makeWrapper</literal> for this:
<para>
Private JARs should be installed in a location like
<filename>$out/share/<replaceable>package-name</replaceable></filename>.
</para>
<para>
If your Java package provides a program, you need to generate a wrapper
script to run it using the OpenJRE. You can use
<literal>makeWrapper</literal> for this:
<programlisting>
buildInputs = [ makeWrapper ];
@@ -53,32 +52,27 @@ installPhase =
--add-flags "-cp $out/share/java/foo.jar org.foo.Main"
'';
</programlisting>
Note the use of <literal>jre</literal>, which is the part of the OpenJDK
package that contains the Java Runtime Environment. By using
<literal>${jre}/bin/java</literal> instead of
<literal>${jdk}/bin/java</literal>, you prevent your package from depending
on the JDK at runtime.
</para>
Note the use of <literal>jre</literal>, which is the part of the
OpenJDK package that contains the Java Runtime Environment. By using
<literal>${jre}/bin/java</literal> instead of
<literal>${jdk}/bin/java</literal>, you prevent your package from
depending on the JDK at runtime.</para>
<para>It is possible to use a different Java compiler than
<command>javac</command> from the OpenJDK. For instance, to use the
Eclipse Java Compiler:
<para>
It is possible to use a different Java compiler than <command>javac</command>
from the OpenJDK. For instance, to use the Eclipse Java Compiler:
<programlisting>
buildInputs = [ jre ant ecj ];
</programlisting>
(Note that here you dont need the full JDK as an input, but just the
JRE.) The ECJ has a stdenv setup hook that sets some environment
variables to cause Ant to use ECJ, but this doesnt work with all Ant
files. Similarly, you can use the GNU Java Compiler:
(Note that here you dont need the full JDK as an input, but just the JRE.)
The ECJ has a stdenv setup hook that sets some environment variables to cause
Ant to use ECJ, but this doesnt work with all Ant files. Similarly, you
can use the GNU Java Compiler:
<programlisting>
buildInputs = [ gcj ant ];
</programlisting>
Here, Ant will automatically use <command>gij</command> (the GNU Java
Runtime) instead of the OpenJRE.</para>
Here, Ant will automatically use <command>gij</command> (the GNU Java
Runtime) instead of the OpenJRE.
</para>
</section>

View File

@@ -1,24 +1,22 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-lua">
<title>Lua</title>
<title>Lua</title>
<para>
Lua packages are built by the <varname>buildLuaPackage</varname> function. This function is
implemented
in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules/generic/default.nix">
<para>
Lua packages are built by the <varname>buildLuaPackage</varname> function.
This function is implemented in
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules/generic/default.nix">
<filename>pkgs/development/lua-modules/generic/default.nix</filename></link>
and works similarly to <varname>buildPerlPackage</varname>. (See
<xref linkend="sec-language-perl"/> for details.)
</para>
</para>
<para>
Lua packages are defined
in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/lua-packages.nix"><filename>pkgs/top-level/lua-packages.nix</filename></link>.
<para>
Lua packages are defined in
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/lua-packages.nix"><filename>pkgs/top-level/lua-packages.nix</filename></link>.
Most of them are simple. For example:
<programlisting>
<programlisting>
fileSystem = buildLuaPackage {
name = "filesystem-1.6.2";
src = fetchurl {
@@ -32,20 +30,19 @@ fileSystem = buildLuaPackage {
};
};
</programlisting>
</para>
</para>
<para>
<para>
Though, more complicated package should be placed in a seperate file in
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules"><filename>pkgs/development/lua-modules</filename></link>.
</para>
<para>
Lua packages accept additional parameter <varname>disabled</varname>, which defines
the condition of disabling package from luaPackages. For example, if package has
<varname>disabled</varname> assigned to <literal>lua.luaversion != "5.1"</literal>,
it will not be included in any luaPackages except lua51Packages, making it
only be built for lua 5.1.
</para>
</para>
<para>
Lua packages accept additional parameter <varname>disabled</varname>, which
defines the condition of disabling package from luaPackages. For example, if
package has <varname>disabled</varname> assigned to <literal>lua.luaversion
!= "5.1"</literal>, it will not be included in any luaPackages except
lua51Packages, making it only be built for lua 5.1.
</para>
</section>

View File

@@ -0,0 +1,51 @@
Node.js packages
================
The `pkgs/development/node-packages` folder contains a generated collection of
[NPM packages](https://npmjs.com/) that can be installed with the Nix package
manager.
As a rule of thumb, the package set should only provide *end user* software
packages, such as command-line utilities. Libraries should only be added to the
package set if there is a non-NPM package that requires it.
When it is desired to use NPM libraries in a development project, use the
`node2nix` generator directly on the `package.json` configuration file of the
project.
The package set also provides support for multiple Node.js versions. The policy
is that a new package should be added to the collection for the latest stable LTS
release (which is currently 6.x), unless there is an explicit reason to support
a different release.
If your package uses native addons, you need to examine what kind of native
build system it uses. Here are some examples:
* `node-gyp`
* `node-gyp-builder`
* `node-pre-gyp`
After you have identified the correct system, you need to override your package
expression while adding in build system as a build input. For example, `dat`
requires `node-gyp-build`, so we override its expression in `default-v6.nix`:
```nix
dat = nodePackages.dat.override (oldAttrs: {
buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-gyp-build ];
});
```
To add a package from NPM to nixpkgs:
1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update
or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json`
for packages depending on Node.js 4.x)
2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`.
3. Build your new package to test your changes:
`cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`.
To build against a specific Node.js version (e.g. 4.x):
`nix-build -A nodePackages_4_x.<new-or-updated-package>`
4. Add and commit all modified and generated files.
For more information about the generation process, consult the
[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix`
tool.

View File

@@ -1,24 +1,27 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-perl">
<title>Perl</title>
<title>Perl</title>
<para>
Nixpkgs provides a function <varname>buildPerlPackage</varname>, a generic
package builder function for any Perl package that has a standard
<varname>Makefile.PL</varname>. Its implemented in
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.
</para>
<para>Nixpkgs provides a function <varname>buildPerlPackage</varname>,
a generic package builder function for any Perl package that has a
standard <varname>Makefile.PL</varname>. Its implemented in <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.</para>
<para>Perl packages from CPAN are defined in <link
<para>
Perl packages from CPAN are defined in
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>,
rather than <filename>pkgs/all-packages.nix</filename>. Most Perl
packages are so straight-forward to build that they are defined here
directly, rather than having a separate function for each package
called from <filename>perl-packages.nix</filename>. However, more
complicated packages should be put in a separate file, typically in
<filename>pkgs/development/perl-modules</filename>. Here is an
example of the former:
rather than <filename>pkgs/all-packages.nix</filename>. Most Perl packages
are so straight-forward to build that they are defined here directly, rather
than having a separate function for each package called from
<filename>perl-packages.nix</filename>. However, more complicated packages
should be put in a separate file, typically in
<filename>pkgs/development/perl-modules</filename>. Here is an example of the
former:
<programlisting>
ClassC3 = buildPerlPackage rec {
name = "Class-C3-0.21";
@@ -28,74 +31,72 @@ ClassC3 = buildPerlPackage rec {
};
};
</programlisting>
Note the use of <literal>mirror://cpan/</literal>, and the
<literal>${name}</literal> in the URL definition to ensure that the
name attribute is consistent with the source that were actually
downloading. Perl packages are made available in
<filename>all-packages.nix</filename> through the variable
<varname>perlPackages</varname>. For instance, if you have a package
that needs <varname>ClassC3</varname>, you would typically write
Note the use of <literal>mirror://cpan/</literal>, and the
<literal>${name}</literal> in the URL definition to ensure that the name
attribute is consistent with the source that were actually downloading.
Perl packages are made available in <filename>all-packages.nix</filename>
through the variable <varname>perlPackages</varname>. For instance, if you
have a package that needs <varname>ClassC3</varname>, you would typically
write
<programlisting>
foo = import ../path/to/foo.nix {
inherit stdenv fetchurl ...;
inherit (perlPackages) ClassC3;
};
</programlisting>
in <filename>all-packages.nix</filename>. You can test building a
Perl package as follows:
in <filename>all-packages.nix</filename>. You can test building a Perl
package as follows:
<screen>
$ nix-build -A perlPackages.ClassC3
</screen>
<varname>buildPerlPackage</varname> adds <literal>perl-</literal> to
the start of the name attribute, so the package above is actually
called <literal>perl-Class-C3-0.21</literal>. So to install it, you
can say:
<varname>buildPerlPackage</varname> adds <literal>perl-</literal> to the
start of the name attribute, so the package above is actually called
<literal>perl-Class-C3-0.21</literal>. So to install it, you can say:
<screen>
$ nix-env -i perl-Class-C3
</screen>
(Of course you can also install using the attribute name: <literal>nix-env -i
-A perlPackages.ClassC3</literal>.)
</para>
(Of course you can also install using the attribute name:
<literal>nix-env -i -A perlPackages.ClassC3</literal>.)</para>
<para>So what does <varname>buildPerlPackage</varname> do? It does
the following:
<orderedlist>
<listitem><para>In the configure phase, it calls <literal>perl
Makefile.PL</literal> to generate a Makefile. You can set the
variable <varname>makeMakerFlags</varname> to pass flags to
<filename>Makefile.PL</filename></para></listitem>
<listitem><para>It adds the contents of the <envar>PERL5LIB</envar>
environment variable to <literal>#! .../bin/perl</literal> line of
Perl scripts as <literal>-I<replaceable>dir</replaceable></literal>
flags. This ensures that a script can find its
dependencies.</para></listitem>
<listitem><para>In the fixup phase, it writes the propagated build
inputs (<varname>propagatedBuildInputs</varname>) to the file
<filename>$out/nix-support/propagated-user-env-packages</filename>.
<command>nix-env</command> recursively installs all packages listed
in this file when you install a package that has it. This ensures
that a Perl package can find its dependencies.</para></listitem>
</orderedlist>
</para>
<para><varname>buildPerlPackage</varname> is built on top of
<varname>stdenv</varname>, so everything can be customised in the
usual way. For instance, the <literal>BerkeleyDB</literal> module has
a <varname>preConfigure</varname> hook to generate a configuration
file used by <filename>Makefile.PL</filename>:
<para>
So what does <varname>buildPerlPackage</varname> do? It does the following:
<orderedlist>
<listitem>
<para>
In the configure phase, it calls <literal>perl Makefile.PL</literal> to
generate a Makefile. You can set the variable
<varname>makeMakerFlags</varname> to pass flags to
<filename>Makefile.PL</filename>
</para>
</listitem>
<listitem>
<para>
It adds the contents of the <envar>PERL5LIB</envar> environment variable
to <literal>#! .../bin/perl</literal> line of Perl scripts as
<literal>-I<replaceable>dir</replaceable></literal> flags. This ensures
that a script can find its dependencies.
</para>
</listitem>
<listitem>
<para>
In the fixup phase, it writes the propagated build inputs
(<varname>propagatedBuildInputs</varname>) to the file
<filename>$out/nix-support/propagated-user-env-packages</filename>.
<command>nix-env</command> recursively installs all packages listed in
this file when you install a package that has it. This ensures that a Perl
package can find its dependencies.
</para>
</listitem>
</orderedlist>
</para>
<para>
<varname>buildPerlPackage</varname> is built on top of
<varname>stdenv</varname>, so everything can be customised in the usual way.
For instance, the <literal>BerkeleyDB</literal> module has a
<varname>preConfigure</varname> hook to generate a configuration file used by
<filename>Makefile.PL</filename>:
<programlisting>
{ buildPerlPackage, fetchurl, db }:
@@ -113,18 +114,15 @@ buildPerlPackage rec {
'';
}
</programlisting>
</para>
</para>
<para>Dependencies on other Perl packages can be specified in the
<varname>buildInputs</varname> and
<varname>propagatedBuildInputs</varname> attributes. If something is
exclusively a build-time dependency, use
<varname>buildInputs</varname>; if its (also) a runtime dependency,
use <varname>propagatedBuildInputs</varname>. For instance, this
builds a Perl module that has runtime dependencies on a bunch of other
modules:
<para>
Dependencies on other Perl packages can be specified in the
<varname>buildInputs</varname> and <varname>propagatedBuildInputs</varname>
attributes. If something is exclusively a build-time dependency, use
<varname>buildInputs</varname>; if its (also) a runtime dependency, use
<varname>propagatedBuildInputs</varname>. For instance, this builds a Perl
module that has runtime dependencies on a bunch of other modules:
<programlisting>
ClassC3Componentised = buildPerlPackage rec {
name = "Class-C3-Componentised-1.0004";
@@ -137,24 +135,26 @@ ClassC3Componentised = buildPerlPackage rec {
];
};
</programlisting>
</para>
</para>
<section xml:id="ssec-generation-from-CPAN">
<title>Generation from CPAN</title>
<section xml:id="ssec-generation-from-CPAN"><title>Generation from CPAN</title>
<para>Nix expressions for Perl packages can be generated (almost)
automatically from CPAN. This is done by the program
<command>nix-generate-from-cpan</command>, which can be installed
as follows:</para>
<para>
Nix expressions for Perl packages can be generated (almost) automatically
from CPAN. This is done by the program
<command>nix-generate-from-cpan</command>, which can be installed as
follows:
</para>
<screen>
$ nix-env -i nix-generate-from-cpan
</screen>
<para>This program takes a Perl module name, looks it up on CPAN,
fetches and unpacks the corresponding package, and prints a Nix
expression on standard output. For example:
<para>
This program takes a Perl module name, looks it up on CPAN, fetches and
unpacks the corresponding package, and prints a Nix expression on standard
output. For example:
<screen>
$ nix-generate-from-cpan XML::Simple
XMLSimple = buildPerlPackage rec {
@@ -170,12 +170,9 @@ $ nix-generate-from-cpan XML::Simple
};
};
</screen>
The output can be pasted into
<filename>pkgs/top-level/perl-packages.nix</filename> or wherever else
you need it.</para>
The output can be pasted into
<filename>pkgs/top-level/perl-packages.nix</filename> or wherever else you
need it.
</para>
</section>
</section>
</section>

View File

@@ -871,8 +871,10 @@ Executing `python setup.py bdist_wheel` in a `nix-shell `fails with
```
ValueError: ZIP does not support timestamps before 1980
```
This is because files are included that depend on items in the Nix store which have a timestamp of, that is, it corresponds to January the 1st, 1970 at 00:00:00. And as the error informs you, ZIP does not support that.
The command `bdist_wheel` takes into account `SOURCE_DATE_EPOCH`, and `nix-shell` sets this to 1. By setting it to a value corresponding to 1980 or later, or by unsetting it, it is possible to build wheels.
This is because files from the Nix store (which have a timestamp of the UNIX epoch of January 1, 1970) are included in the .ZIP, but .ZIP archives follow the DOS convention of counting timestamps from 1980.
The command `bdist_wheel` reads the `SOURCE_DATE_EPOCH` environment variable, which `nix-shell` sets to 1. Unsetting this variable or giving it a value corresponding to 1980 or later enables building wheels.
Use 1980 as timestamp:
```shell
@@ -882,7 +884,7 @@ or the current time:
```shell
nix-shell --run "SOURCE_DATE_EPOCH=$(date +%s) python3 setup.py bdist_wheel"
```
or unset:
or unset `SOURCE_DATE_EPOCH`:
```shell
nix-shell --run "unset SOURCE_DATE_EPOCH; python3 setup.py bdist_wheel"
```

View File

@@ -1,58 +1,74 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-qt">
<title>Qt</title>
<title>Qt</title>
<para>
Qt is a comprehensive desktop and mobile application development toolkit for
C++. Legacy support is available for Qt 3 and Qt 4, but all current
development uses Qt 5. The Qt 5 packages in Nixpkgs are updated frequently to
take advantage of new features, but older versions are typically retained
until their support window ends. The most important consideration in
packaging Qt-based software is ensuring that each package and all its
dependencies use the same version of Qt 5; this consideration motivates most
of the tools described below.
</para>
<para>
Qt is a comprehensive desktop and mobile application development toolkit for C++.
Legacy support is available for Qt 3 and Qt 4, but all current development uses Qt 5.
The Qt 5 packages in Nixpkgs are updated frequently to take advantage of new features,
but older versions are typically retained until their support window ends.
The most important consideration in packaging Qt-based software is ensuring that each package and all its dependencies use the same version of Qt 5;
this consideration motivates most of the tools described below.
</para>
<section xml:id="ssec-qt-libraries">
<title>Packaging Libraries for Nixpkgs</title>
<section xml:id="ssec-qt-libraries"><title>Packaging Libraries for Nixpkgs</title>
<para>
Whenever possible, libraries that use Qt 5 should be built with each
available version. Packages providing libraries should be added to the
top-level function <varname>mkLibsForQt5</varname>, which is used to build a
set of libraries for every Qt 5 version. A special
<varname>callPackage</varname> function is used in this scope to ensure that
the entire dependency tree uses the same Qt 5 version. Import dependencies
unqualified, i.e., <literal>qtbase</literal> not
<literal>qt5.qtbase</literal>. <emphasis>Do not</emphasis> import a package
set such as <literal>qt5</literal> or <literal>libsForQt5</literal>.
</para>
<para>
Whenever possible, libraries that use Qt 5 should be built with each available version.
Packages providing libraries should be added to the top-level function <varname>mkLibsForQt5</varname>,
which is used to build a set of libraries for every Qt 5 version.
A special <varname>callPackage</varname> function is used in this scope to ensure that the entire dependency tree uses the same Qt 5 version.
Import dependencies unqualified, i.e., <literal>qtbase</literal> not <literal>qt5.qtbase</literal>.
<emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal>.
</para>
<para>
If a library does not support a particular version of Qt 5, it is best to
mark it as broken by setting its <literal>meta.broken</literal> attribute. A
package may be marked broken for certain versions by testing the
<literal>qtbase.version</literal> attribute, which will always give the
current Qt 5 version.
</para>
</section>
<para>
If a library does not support a particular version of Qt 5, it is best to mark it as broken by setting its <literal>meta.broken</literal> attribute.
A package may be marked broken for certain versions by testing the <literal>qtbase.version</literal> attribute, which will always give the current Qt 5 version.
</para>
<section xml:id="ssec-qt-applications">
<title>Packaging Applications for Nixpkgs</title>
<para>
Call your application expression using
<literal>libsForQt5.callPackage</literal> instead of
<literal>callPackage</literal>. Import dependencies unqualified, i.e.,
<literal>qtbase</literal> not <literal>qt5.qtbase</literal>. <emphasis>Do
not</emphasis> import a package set such as <literal>qt5</literal> or
<literal>libsForQt5</literal>.
</para>
<para>
Qt 5 maintains strict backward compatibility, so it is generally best to
build an application package against the latest version using the
<varname>libsForQt5</varname> library set. In case a package does not build
with the latest Qt version, it is possible to pick a set pinned to a
particular version, e.g. <varname>libsForQt55</varname> for Qt 5.5, if that
is the latest version the package supports. If a package must be pinned to
an older Qt version, be sure to file a bug upstream; because Qt is strictly
backwards-compatible, any incompatibility is by definition a bug in the
application.
</para>
<para>
When testing applications in Nixpkgs, it is a common practice to build the
package with <literal>nix-build</literal> and run it using the created
symbolic link. This will not work with Qt applications, however, because
they have many hard runtime requirements that can only be guaranteed if the
package is actually installed. To test a Qt application, install it with
<literal>nix-env</literal> or run it inside <literal>nix-shell</literal>.
</para>
</section>
</section>
<section xml:id="ssec-qt-applications"><title>Packaging Applications for Nixpkgs</title>
<para>
Call your application expression using <literal>libsForQt5.callPackage</literal> instead of <literal>callPackage</literal>.
Import dependencies unqualified, i.e., <literal>qtbase</literal> not <literal>qt5.qtbase</literal>.
<emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal>.
</para>
<para>
Qt 5 maintains strict backward compatibility, so it is generally best to build an application package against the latest version using the <varname>libsForQt5</varname> library set.
In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. <varname>libsForQt55</varname> for Qt 5.5, if that is the latest version the package supports.
If a package must be pinned to an older Qt version, be sure to file a bug upstream;
because Qt is strictly backwards-compatible, any incompatibility is by definition a bug in the application.
</para>
<para>
When testing applications in Nixpkgs, it is a common practice to build the package with <literal>nix-build</literal> and run it using the created symbolic link.
This will not work with Qt applications, however, because they have many hard runtime requirements that can only be guaranteed if the package is actually installed.
To test a Qt application, install it with <literal>nix-env</literal> or run it inside <literal>nix-shell</literal>.
</para>
</section>
</section>

View File

@@ -0,0 +1,120 @@
R packages
==========
## Installation
Define an environment for R that contains all the libraries that you'd like to
use by adding the following snippet to your $HOME/.config/nixpkgs/config.nix file:
```nix
{
packageOverrides = super: let self = super.pkgs; in
{
rEnv = super.rWrapper.override {
packages = with self.rPackages; [
devtools
ggplot2
reshape2
yaml
optparse
];
};
};
}
```
Then you can use `nix-env -f "<nixpkgs>" -iA rEnv` to install it into your user
profile. The set of available libraries can be discovered by running the
command `nix-env -f "<nixpkgs>" -qaP -A rPackages`. The first column from that
output is the name that has to be passed to rWrapper in the code snipped above.
However, if you'd like to add a file to your project source to make the
environment available for other contributors, you can create a `default.nix`
file like so:
```nix
let
pkgs = import <nixpkgs> {};
stdenv = pkgs.stdenv;
in with pkgs; {
myProject = stdenv.mkDerivation {
name = "myProject";
version = "1";
src = if pkgs.lib.inNixShell then null else nix;
buildInputs = with rPackages; [
R
ggplot2
knitr
];
};
}
```
and then run `nix-shell .` to be dropped into a shell with those packages
available.
## RStudio
RStudio uses a standard set of packages and ignores any custom R
environments or installed packages you may have. To create a custom
environment, see `rstudioWrapper`, which functions similarly to
`rWrapper`:
```nix
{
packageOverrides = super: let self = super.pkgs; in
{
rstudioEnv = super.rstudioWrapper.override {
packages = with self.rPackages; [
dplyr
ggplot2
reshape2
];
};
};
}
```
Then like above, `nix-env -f "<nixpkgs>" -iA rstudioEnv` will install
this into your user profile.
Alternatively, you can create a self-contained `shell.nix` without the need to
modify any configuration files:
```nix
{ pkgs ? import <nixpkgs> {}
}:
pkgs.rstudioWrapper.override {
packages = with pkgs.rPackages; [ dplyr ggplot2 reshape2 ];
}
```
Executing `nix-shell` will then drop you into an environment equivalent to the
one above. If you need additional packages just add them to the list and
re-enter the shell.
## Updating the package set
```bash
nix-shell generate-shell.nix
Rscript generate-r-packages.R cran > cran-packages.nix.new
mv cran-packages.nix.new cran-packages.nix
Rscript generate-r-packages.R bioc > bioc-packages.nix.new
mv bioc-packages.nix.new bioc-packages.nix
```
`generate-r-packages.R <repo>` reads `<repo>-packages.nix`, therefor the renaming.
## Testing if the Nix-expression could be evaluated
```bash
nix-build test-evaluation.nix --dry-run
```
If this exits fine, the expression is ok. If not, you have to edit `default.nix`

View File

@@ -1,17 +1,19 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-ruby">
<title>Ruby</title>
<title>Ruby</title>
<para>
There currently is support to bundle applications that are packaged as Ruby
gems. The utility "bundix" allows you to write a
<filename>Gemfile</filename>, let bundler create a
<filename>Gemfile.lock</filename>, and then convert this into a nix
expression that contains all Gem dependencies automatically.
</para>
<para>There currently is support to bundle applications that are packaged as
Ruby gems. The utility "bundix" allows you to write a
<filename>Gemfile</filename>, let bundler create a
<filename>Gemfile.lock</filename>, and then convert this into a nix
expression that contains all Gem dependencies automatically.
</para>
<para>For example, to package sensu, we did:</para>
<para>
For example, to package sensu, we did:
</para>
<screen>
<![CDATA[$ cd pkgs/servers/monitoring
@@ -42,17 +44,18 @@ bundlerEnv rec {
}]]>
</screen>
<para>Please check in the <filename>Gemfile</filename>,
<filename>Gemfile.lock</filename> and the
<filename>gemset.nix</filename> so future updates can be run easily.
</para>
<para>
Please check in the <filename>Gemfile</filename>,
<filename>Gemfile.lock</filename> and the <filename>gemset.nix</filename> so
future updates can be run easily.
</para>
<para>For tools written in Ruby - i.e. where the desire is to install
a package and then execute e.g. <command>rake</command> at the command
line, there is an alternative builder called <literal>bundlerApp</literal>.
Set up the <filename>gemset.nix</filename> the same way, and then, for
example:
</para>
<para>
For tools written in Ruby - i.e. where the desire is to install a package and
then execute e.g. <command>rake</command> at the command line, there is an
alternative builder called <literal>bundlerApp</literal>. Set up the
<filename>gemset.nix</filename> the same way, and then, for example:
</para>
<screen>
<![CDATA[{ lib, bundlerApp }:
@@ -72,31 +75,31 @@ bundlerApp {
}]]>
</screen>
<para>The chief advantage of <literal>bundlerApp</literal> over
<literal>bundlerEnv</literal> is the executables introduced in the
environment are precisely those selected in the <literal>exes</literal>
list, as opposed to <literal>bundlerEnv</literal> which adds all the
executables made available by gems in the gemset, which can mean e.g.
<command>rspec</command> or <command>rake</command> in unpredictable
versions available from various packages.
</para>
<para>
The chief advantage of <literal>bundlerApp</literal> over
<literal>bundlerEnv</literal> is the executables introduced in the
environment are precisely those selected in the <literal>exes</literal> list,
as opposed to <literal>bundlerEnv</literal> which adds all the executables
made available by gems in the gemset, which can mean e.g.
<command>rspec</command> or <command>rake</command> in unpredictable versions
available from various packages.
</para>
<para>Resulting derivations for both builders also have two helpful
attributes, <literal>env</literal> and <literal>wrappedRuby</literal>.
The first one allows one to quickly drop into
<command>nix-shell</command> with the specified environment present.
E.g. <command>nix-shell -A sensu.env</command> would give you an
environment with Ruby preset so it has all the libraries necessary
for <literal>sensu</literal> in its paths. The second one can be
used to make derivations from custom Ruby scripts which have
<filename>Gemfile</filename>s with their dependencies specified. It is
a derivation with <command>ruby</command> wrapped so it can find all
the needed dependencies. For example, to make a derivation
<literal>my-script</literal> for a <filename>my-script.rb</filename>
(which should be placed in <filename>bin</filename>) you should run
<command>bundix</command> as specified above and then use
<literal>bundlerEnv</literal> like this:
</para>
<para>
Resulting derivations for both builders also have two helpful attributes,
<literal>env</literal> and <literal>wrappedRuby</literal>. The first one
allows one to quickly drop into <command>nix-shell</command> with the
specified environment present. E.g. <command>nix-shell -A sensu.env</command>
would give you an environment with Ruby preset so it has all the libraries
necessary for <literal>sensu</literal> in its paths. The second one can be
used to make derivations from custom Ruby scripts which have
<filename>Gemfile</filename>s with their dependencies specified. It is a
derivation with <command>ruby</command> wrapped so it can find all the needed
dependencies. For example, to make a derivation <literal>my-script</literal>
for a <filename>my-script.rb</filename> (which should be placed in
<filename>bin</filename>) you should run <command>bundix</command> as
specified above and then use <literal>bundlerEnv</literal> like this:
</para>
<programlisting>
<![CDATA[let env = bundlerEnv {
@@ -118,5 +121,4 @@ in stdenv.mkDerivation {
'';
}]]>
</programlisting>
</section>

View File

@@ -16,6 +16,12 @@ cargo
into the `environment.systemPackages` or bring them into
scope with `nix-shell -p rustc cargo`.
> If you are using NixOS and you want to use rust without a nix expression you
> probably want to add the following in your `configuration.nix` to build
> crates with C dependencies.
>
> environment.systemPackages = [binutils gcc gnumake openssl pkgconfig]
For daily builds (beta and nightly) use either rustup from
nixpkgs or use the [Rust nightlies
overlay](#using-the-rust-nightlies-overlay).
@@ -76,7 +82,7 @@ an example for a minimal `hello` crate:
Compiling hello v0.1.0 (file:///tmp/hello)
Finished dev [unoptimized + debuginfo] target(s) in 0.20 secs
$ carnix -o hello.nix --src ./. Cargo.lock --standalone
$ nix-build hello.nix
$ nix-build hello.nix -A hello_0_1_0
Now, the file produced by the call to `carnix`, called `hello.nix`, looks like:
@@ -276,6 +282,84 @@ features, we would write:
Where `diesel.nix` is the file generated by Carnix, as explained above.
## Setting Up `nix-shell`
Oftentimes you want to develop code from within `nix-shell`. Unfortunately
`buildRustCrate` does not support common `nix-shell` operations directly
(see [this issue](https://github.com/NixOS/nixpkgs/issues/37945))
so we will use `stdenv.mkDerivation` instead.
Using the example `hello` project above, we want to do the following:
- Have access to `cargo` and `rustc`
- Have the `openssl` library available to a crate through it's _normal_
compilation mechanism (`pkg-config`).
A typical `shell.nix` might look like:
```
with import <nixpkgs> {};
stdenv.mkDerivation {
name = "rust-env";
buildInputs = [
rustc cargo
# Example Additional Dependencies
pkgconfig openssl
];
# Set Environment Variables
RUST_BACKTRACE = 1;
}
```
You should now be able to run the following:
```
$ nix-shell --pure
$ cargo build
$ cargo test
```
### Controlling Rust Version Inside `nix-shell`
To control your rust version (i.e. use nightly) from within `shell.nix` (or
other nix expressions) you can use the following `shell.nix`
```
# Latest Nightly
with import <nixpkgs> {};
let src = fetchFromGitHub {
owner = "mozilla";
repo = "nixpkgs-mozilla";
# commit from: 2018-03-27
rev = "2945b0b6b2fd19e7d23bac695afd65e320efcebe";
sha256 = "034m1dryrzh2lmjvk3c0krgip652dql46w5yfwpvh7gavd3iypyw";
};
in
with import "${src.out}/rust-overlay.nix" pkgs pkgs;
stdenv.mkDerivation {
name = "rust-env";
buildInputs = [
# Note: to use use stable, just replace `nightly` with `stable`
latest.rustChannels.nightly.rust
# Add some extra dependencies from `pkgs`
pkgconfig openssl
];
# Set Environment Variables
RUST_BACKTRACE = 1;
}
```
Now run:
```
$ rustc --version
rustc 1.26.0-nightly (188e693b3 2018-03-26)
```
To see that you are using nightly.
## Using the Rust nightlies overlay
Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into scope.

View File

@@ -1,27 +1,42 @@
<section xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="sec-language-texlive">
<title>TeX Live</title>
<title>TeX Live</title>
<para>
Since release 15.09 there is a new TeX Live packaging that lives entirely
under attribute <varname>texlive</varname>.
</para>
<section>
<title>User's guide</title>
<para>Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute <varname>texlive</varname>.</para>
<section><title>User's guide</title>
<itemizedlist>
<listitem><para>
For basic usage just pull <varname>texlive.combined.scheme-basic</varname> for an environment with basic LaTeX support.</para></listitem>
<listitem><para>
It typically won't work to use separately installed packages together.
Instead, you can build a custom set of packages like this:
<programlisting>
<listitem>
<para>
For basic usage just pull <varname>texlive.combined.scheme-basic</varname>
for an environment with basic LaTeX support.
</para>
</listitem>
<listitem>
<para>
It typically won't work to use separately installed packages together.
Instead, you can build a custom set of packages like this:
<programlisting>
texlive.combine {
inherit (texlive) scheme-small collection-langkorean algorithms cm-super;
}
</programlisting>
There are all the schemes, collections and a few thousand packages, as defined upstream (perhaps with tiny differences).
</para></listitem>
<listitem><para>
By default you only get executables and files needed during runtime, and a little documentation for the core packages. To change that, you need to add <varname>pkgFilter</varname> function to <varname>combine</varname>.
<programlisting>
There are all the schemes, collections and a few thousand packages, as
defined upstream (perhaps with tiny differences).
</para>
</listitem>
<listitem>
<para>
By default you only get executables and files needed during runtime, and a
little documentation for the core packages. To change that, you need to
add <varname>pkgFilter</varname> function to <varname>combine</varname>.
<programlisting>
texlive.combine {
# inherit (texlive) whatever-you-want;
pkgFilter = pkg:
@@ -30,31 +45,47 @@ texlive.combine {
# there are also other attributes: version, name
}
</programlisting>
</para></listitem>
<listitem><para>
You can list packages e.g. by <command>nix-repl</command>.
<programlisting>
</para>
</listitem>
<listitem>
<para>
You can list packages e.g. by <command>nix-repl</command>.
<programlisting>
$ nix-repl
nix-repl> :l &lt;nixpkgs>
nix-repl> texlive.collection-&lt;TAB>
</programlisting>
</para></listitem>
</para>
</listitem>
</itemizedlist>
</section>
</section>
<section>
<title>Known problems</title>
<section><title>Known problems</title>
<itemizedlist>
<listitem><para>
Some tools are still missing, e.g. luajittex;</para></listitem>
<listitem><para>
some apps aren't packaged/tested yet (asymptote, biber, etc.);</para></listitem>
<listitem><para>
feature/bug: when a package is rejected by <varname>pkgFilter</varname>, its dependencies are still propagated;</para></listitem>
<listitem><para>
in case of any bugs or feature requests, file a github issue or better a pull request and /cc @vcunat.</para></listitem>
<listitem>
<para>
Some tools are still missing, e.g. luajittex;
</para>
</listitem>
<listitem>
<para>
some apps aren't packaged/tested yet (asymptote, biber, etc.);
</para>
</listitem>
<listitem>
<para>
feature/bug: when a package is rejected by <varname>pkgFilter</varname>,
its dependencies are still propagated;
</para>
</listitem>
<listitem>
<para>
in case of any bugs or feature requests, file a github issue or better a
pull request and /cc @vcunat.
</para>
</listitem>
</itemizedlist>
</section>
</section>
</section>

View File

@@ -1,29 +1,24 @@
<book xmlns="http://docbook.org/ns/docbook"
xmlns:xi="http://www.w3.org/2001/XInclude">
<info>
<title>Nixpkgs Contributors Guide</title>
<subtitle>Version <xi:include href=".version" parse="text" /></subtitle>
</info>
<xi:include href="introduction.xml" />
<xi:include href="quick-start.xml" />
<xi:include href="stdenv.xml" />
<xi:include href="multiple-output.xml" />
<xi:include href="cross-compilation.xml" />
<xi:include href="configuration.xml" />
<xi:include href="functions.xml" />
<xi:include href="meta.xml" />
<xi:include href="languages-frameworks/index.xml" />
<xi:include href="platform-notes.xml" />
<xi:include href="package-notes.xml" />
<xi:include href="overlays.xml" />
<xi:include href="coding-conventions.xml" />
<xi:include href="submitting-changes.xml" />
<xi:include href="reviewing-contributions.xml" />
<xi:include href="contributing.xml" />
<info>
<title>Nixpkgs Contributors Guide</title>
<subtitle>Version <xi:include href=".version" parse="text" />
</subtitle>
</info>
<xi:include href="introduction.chapter.xml" />
<xi:include href="quick-start.xml" />
<xi:include href="stdenv.xml" />
<xi:include href="multiple-output.xml" />
<xi:include href="cross-compilation.xml" />
<xi:include href="configuration.xml" />
<xi:include href="functions.xml" />
<xi:include href="meta.xml" />
<xi:include href="languages-frameworks/index.xml" />
<xi:include href="platform-notes.xml" />
<xi:include href="package-notes.xml" />
<xi:include href="overlays.xml" />
<xi:include href="coding-conventions.xml" />
<xi:include href="submitting-changes.xml" />
<xi:include href="reviewing-contributions.xml" />
<xi:include href="contributing.xml" />
</book>

View File

@@ -1,14 +1,12 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-meta">
<title>Meta-attributes</title>
<para>Nix packages can declare <emphasis>meta-attributes</emphasis>
that contain information about a package such as a description, its
homepage, its license, and so on. For instance, the GNU Hello package
has a <varname>meta</varname> declaration like this:
<title>Meta-attributes</title>
<para>
Nix packages can declare <emphasis>meta-attributes</emphasis> that contain
information about a package such as a description, its homepage, its license,
and so on. For instance, the GNU Hello package has a <varname>meta</varname>
declaration like this:
<programlisting>
meta = {
description = "A program that produces a familiar, friendly greeting";
@@ -22,16 +20,15 @@ meta = {
platforms = stdenv.lib.platforms.all;
};
</programlisting>
</para>
<para>Meta-attributes are not passed to the builder of the package.
Thus, a change to a meta-attribute doesnt trigger a recompilation of
the package. The value of a meta-attribute must be a string.</para>
<para>The meta-attributes of a package can be queried from the
command-line using <command>nix-env</command>:
</para>
<para>
Meta-attributes are not passed to the builder of the package. Thus, a change
to a meta-attribute doesnt trigger a recompilation of the package. The
value of a meta-attribute must be a string.
</para>
<para>
The meta-attributes of a package can be queried from the command-line using
<command>nix-env</command>:
<screen>
$ nix-env -qa hello --json
{
@@ -70,252 +67,311 @@ $ nix-env -qa hello --json
</screen>
<command>nix-env</command> knows about the
<varname>description</varname> field specifically:
<command>nix-env</command> knows about the <varname>description</varname>
field specifically:
<screen>
$ nix-env -qa hello --description
hello-2.3 A program that produces a familiar, friendly greeting
</screen>
</para>
<section xml:id="sec-standard-meta-attributes">
<title>Standard meta-attributes</title>
</para>
<para>
It is expected that each meta-attribute is one of the following:
</para>
<section xml:id="sec-standard-meta-attributes"><title>Standard
meta-attributes</title>
<para>It is expected that each meta-attribute is one of the following:</para>
<variablelist>
<varlistentry>
<term><varname>description</varname></term>
<listitem><para>A short (one-line) description of the package.
This is shown by <command>nix-env -q --description</command> and
also on the Nixpkgs release pages.</para>
<para>Dont include a period at the end. Dont include newline
characters. Capitalise the first character. For brevity, dont
repeat the name of package — just describe what it does.</para>
<para>Wrong: <literal>"libpng is a library that allows you to decode PNG images."</literal></para>
<para>Right: <literal>"A library for decoding PNG images"</literal></para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>longDescription</varname></term>
<listitem><para>An arbitrarily long description of the
package.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>branch</varname></term>
<listitem><para>Release branch. Used to specify that a package is not
going to receive updates that are not in this branch; for example, Linux
kernel 3.0 is supposed to be updated to 3.0.X, not 3.1.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>homepage</varname></term>
<listitem><para>The packages homepage. Example:
<literal>http://www.gnu.org/software/hello/manual/</literal></para></listitem>
</varlistentry>
<varlistentry>
<term><varname>downloadPage</varname></term>
<listitem><para>The page where a link to the current version can be found. Example:
<literal>http://ftp.gnu.org/gnu/hello/</literal></para></listitem>
</varlistentry>
<varlistentry>
<term><varname>license</varname></term>
<variablelist>
<varlistentry>
<term>
<varname>description</varname>
</term>
<listitem>
<para>
The license, or licenses, for the package. One from the attribute set
defined in <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
<filename>nixpkgs/lib/licenses.nix</filename></link>. At this moment
using both a list of licenses and a single license is valid. If the
license field is in the form of a list representation, then it means
that parts of the package are licensed differently. Each license
should preferably be referenced by their attribute. The non-list
attribute value can also be a space delimited string representation of
the contained attribute shortNames or spdxIds. The following are all valid
examples:
<itemizedlist>
<listitem><para>Single license referenced by attribute (preferred)
<literal>stdenv.lib.licenses.gpl3</literal>.
</para></listitem>
<listitem><para>Single license referenced by its attribute shortName (frowned upon)
<literal>"gpl3"</literal>.
</para></listitem>
<listitem><para>Single license referenced by its attribute spdxId (frowned upon)
<literal>"GPL-3.0"</literal>.
</para></listitem>
<listitem><para>Multiple licenses referenced by attribute (preferred)
<literal>with stdenv.lib.licenses; [ asl20 free ofl ]</literal>.
</para></listitem>
<listitem><para>Multiple licenses referenced as a space delimited string of attribute shortNames (frowned upon)
<literal>"asl20 free ofl"</literal>.
</para></listitem>
</itemizedlist>
For details, see <xref linkend='sec-meta-license'/>.
</para>
<para>
A short (one-line) description of the package. This is shown by
<command>nix-env -q --description</command> and also on the Nixpkgs
release pages.
</para>
<para>
Dont include a period at the end. Dont include newline characters.
Capitalise the first character. For brevity, dont repeat the name of
package — just describe what it does.
</para>
<para>
Wrong: <literal>"libpng is a library that allows you to decode PNG
images."</literal>
</para>
<para>
Right: <literal>"A library for decoding PNG images"</literal>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>maintainers</varname></term>
<listitem><para>A list of names and e-mail addresses of the
maintainers of this Nix expression. If
you would like to be a maintainer of a package, you may want to add
yourself to <link
</varlistentry>
<varlistentry>
<term>
<varname>longDescription</varname>
</term>
<listitem>
<para>
An arbitrarily long description of the package.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>branch</varname>
</term>
<listitem>
<para>
Release branch. Used to specify that a package is not going to receive
updates that are not in this branch; for example, Linux kernel 3.0 is
supposed to be updated to 3.0.X, not 3.1.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>homepage</varname>
</term>
<listitem>
<para>
The packages homepage. Example:
<literal>http://www.gnu.org/software/hello/manual/</literal>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>downloadPage</varname>
</term>
<listitem>
<para>
The page where a link to the current version can be found. Example:
<literal>http://ftp.gnu.org/gnu/hello/</literal>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>license</varname>
</term>
<listitem>
<para>
The license, or licenses, for the package. One from the attribute set
defined in
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
<filename>nixpkgs/lib/licenses.nix</filename></link>. At this moment
using both a list of licenses and a single license is valid. If the
license field is in the form of a list representation, then it means that
parts of the package are licensed differently. Each license should
preferably be referenced by their attribute. The non-list attribute value
can also be a space delimited string representation of the contained
attribute shortNames or spdxIds. The following are all valid examples:
<itemizedlist>
<listitem>
<para>
Single license referenced by attribute (preferred)
<literal>stdenv.lib.licenses.gpl3</literal>.
</para>
</listitem>
<listitem>
<para>
Single license referenced by its attribute shortName (frowned upon)
<literal>"gpl3"</literal>.
</para>
</listitem>
<listitem>
<para>
Single license referenced by its attribute spdxId (frowned upon)
<literal>"GPL-3.0"</literal>.
</para>
</listitem>
<listitem>
<para>
Multiple licenses referenced by attribute (preferred) <literal>with
stdenv.lib.licenses; [ asl20 free ofl ]</literal>.
</para>
</listitem>
<listitem>
<para>
Multiple licenses referenced as a space delimited string of attribute
shortNames (frowned upon) <literal>"asl20 free ofl"</literal>.
</para>
</listitem>
</itemizedlist>
For details, see <xref linkend='sec-meta-license'/>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>maintainers</varname>
</term>
<listitem>
<para>
A list of names and e-mail addresses of the maintainers of this Nix
expression. If you would like to be a maintainer of a package, you may
want to add yourself to
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/maintainers.nix"><filename>nixpkgs/lib/maintainers.nix</filename></link>
and write something like <literal>[ stdenv.lib.maintainers.alice
stdenv.lib.maintainers.bob ]</literal>.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>priority</varname></term>
<listitem><para>The <emphasis>priority</emphasis> of the package,
used by <command>nix-env</command> to resolve file name conflicts
between packages. See the Nix manual page for
<command>nix-env</command> for details. Example:
<literal>"10"</literal> (a low-priority
package).</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>platforms</varname></term>
<listitem><para>The list of Nix platform types on which the
package is supported. Hydra builds packages according to the
platform specified. If no platform is specified, the package does
not have prebuilt binaries. An example is:
and write something like <literal>[ stdenv.lib.maintainers.alice
stdenv.lib.maintainers.bob ]</literal>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>priority</varname>
</term>
<listitem>
<para>
The <emphasis>priority</emphasis> of the package, used by
<command>nix-env</command> to resolve file name conflicts between
packages. See the Nix manual page for <command>nix-env</command> for
details. Example: <literal>"10"</literal> (a low-priority package).
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>platforms</varname>
</term>
<listitem>
<para>
The list of Nix platform types on which the package is supported. Hydra
builds packages according to the platform specified. If no platform is
specified, the package does not have prebuilt binaries. An example is:
<programlisting>
meta.platforms = stdenv.lib.platforms.linux;
</programlisting>
Attribute Set <varname>stdenv.lib.platforms</varname> defines
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix">
various common lists</link> of platforms types.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>hydraPlatforms</varname></term>
<listitem><para>The list of Nix platform types for which the Hydra
instance at <literal>hydra.nixos.org</literal> will build the
package. (Hydra is the Nix-based continuous build system.) It
defaults to the value of <varname>meta.platforms</varname>. Thus,
the only reason to set <varname>meta.hydraPlatforms</varname> is
if you want <literal>hydra.nixos.org</literal> to build the
package on a subset of <varname>meta.platforms</varname>, or not
at all, e.g.
Attribute Set <varname>stdenv.lib.platforms</varname> defines
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix">
various common lists</link> of platforms types.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>hydraPlatforms</varname>
</term>
<listitem>
<para>
The list of Nix platform types for which the Hydra instance at
<literal>hydra.nixos.org</literal> will build the package. (Hydra is the
Nix-based continuous build system.) It defaults to the value of
<varname>meta.platforms</varname>. Thus, the only reason to set
<varname>meta.hydraPlatforms</varname> is if you want
<literal>hydra.nixos.org</literal> to build the package on a subset of
<varname>meta.platforms</varname>, or not at all, e.g.
<programlisting>
meta.platforms = stdenv.lib.platforms.linux;
meta.hydraPlatforms = [];
</programlisting>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>broken</varname>
</term>
<listitem>
<para>
If set to <literal>true</literal>, the package is marked as “broken”,
meaning that it wont show up in <literal>nix-env -qa</literal>, and
cannot be built or installed. Such packages should be removed from
Nixpkgs eventually unless they are fixed.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>updateWalker</varname>
</term>
<listitem>
<para>
If set to <literal>true</literal>, the package is tested to be updated
correctly by the <literal>update-walker.sh</literal> script without
additional settings. Such packages have <varname>meta.version</varname>
set and their homepage (or the page specified by
<varname>meta.downloadPage</varname>) contains a direct link to the
package tarball.
</para>
</listitem>
</varlistentry>
</variablelist>
</section>
<section xml:id="sec-meta-license">
<title>Licenses</title>
</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>broken</varname></term>
<listitem><para>If set to <literal>true</literal>, the package is
marked as “broken”, meaning that it wont show up in
<literal>nix-env -qa</literal>, and cannot be built or installed.
Such packages should be removed from Nixpkgs eventually unless
they are fixed.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>updateWalker</varname></term>
<listitem><para>If set to <literal>true</literal>, the package is
tested to be updated correctly by the <literal>update-walker.sh</literal>
script without additional settings. Such packages have
<varname>meta.version</varname> set and their homepage (or
the page specified by <varname>meta.downloadPage</varname>) contains
a direct link to the package tarball.</para></listitem>
</varlistentry>
</variablelist>
</section>
<section xml:id="sec-meta-license"><title>Licenses</title>
<para>The <varname>meta.license</varname> attribute should preferrably contain
a value from <varname>stdenv.lib.licenses</varname> defined in
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
<filename>nixpkgs/lib/licenses.nix</filename></link>,
or in-place license description of the same format if the license is
unlikely to be useful in another expression.</para>
<para>Although it's typically better to indicate the specific license,
a few generic options are available:
<variablelist>
<varlistentry>
<term><varname>stdenv.lib.licenses.free</varname>,
<varname>"free"</varname></term>
<listitem><para>Catch-all for free software licenses not listed
above.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>stdenv.lib.licenses.unfreeRedistributable</varname>,
<varname>"unfree-redistributable"</varname></term>
<listitem><para>Unfree package that can be redistributed in binary
form. That is, its legal to redistribute the
<emphasis>output</emphasis> of the derivation. This means that
the package can be included in the Nixpkgs
channel.</para>
<para>Sometimes proprietary software can only be redistributed
unmodified. Make sure the builder doesnt actually modify the
original binaries; otherwise were breaking the license. For
instance, the NVIDIA X11 drivers can be redistributed unmodified,
but our builder applies <command>patchelf</command> to make them
work. Thus, its license is <varname>"unfree"</varname> and it
cannot be included in the Nixpkgs channel.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>stdenv.lib.licenses.unfree</varname>,
<varname>"unfree"</varname></term>
<listitem><para>Unfree package that cannot be redistributed. You
can build it yourself, but you cannot redistribute the output of
the derivation. Thus it cannot be included in the Nixpkgs
channel.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>stdenv.lib.licenses.unfreeRedistributableFirmware</varname>,
<varname>"unfree-redistributable-firmware"</varname></term>
<listitem><para>This package supplies unfree, redistributable
firmware. This is a separate value from
<varname>unfree-redistributable</varname> because not everybody
cares whether firmware is free.</para></listitem>
</varlistentry>
</variablelist>
</para>
</section>
<para>
The <varname>meta.license</varname> attribute should preferrably contain a
value from <varname>stdenv.lib.licenses</varname> defined in
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
<filename>nixpkgs/lib/licenses.nix</filename></link>, or in-place license
description of the same format if the license is unlikely to be useful in
another expression.
</para>
<para>
Although it's typically better to indicate the specific license, a few
generic options are available:
<variablelist>
<varlistentry>
<term>
<varname>stdenv.lib.licenses.free</varname>, <varname>"free"</varname>
</term>
<listitem>
<para>
Catch-all for free software licenses not listed above.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>stdenv.lib.licenses.unfreeRedistributable</varname>, <varname>"unfree-redistributable"</varname>
</term>
<listitem>
<para>
Unfree package that can be redistributed in binary form. That is, its
legal to redistribute the <emphasis>output</emphasis> of the derivation.
This means that the package can be included in the Nixpkgs channel.
</para>
<para>
Sometimes proprietary software can only be redistributed unmodified.
Make sure the builder doesnt actually modify the original binaries;
otherwise were breaking the license. For instance, the NVIDIA X11
drivers can be redistributed unmodified, but our builder applies
<command>patchelf</command> to make them work. Thus, its license is
<varname>"unfree"</varname> and it cannot be included in the Nixpkgs
channel.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>stdenv.lib.licenses.unfree</varname>, <varname>"unfree"</varname>
</term>
<listitem>
<para>
Unfree package that cannot be redistributed. You can build it yourself,
but you cannot redistribute the output of the derivation. Thus it cannot
be included in the Nixpkgs channel.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>stdenv.lib.licenses.unfreeRedistributableFirmware</varname>, <varname>"unfree-redistributable-firmware"</varname>
</term>
<listitem>
<para>
This package supplies unfree, redistributable firmware. This is a
separate value from <varname>unfree-redistributable</varname> because
not everybody cares whether firmware is free.
</para>
</listitem>
</varlistentry>
</variablelist>
</para>
</section>
</chapter>

View File

@@ -5,99 +5,319 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-multiple-output">
<title>Multiple-output packages</title>
<section>
<title>Introduction</title>
<title>Multiple-output packages</title>
<para>
The Nix language allows a derivation to produce multiple outputs, which is
similar to what is utilized by other Linux distribution packaging systems.
The outputs reside in separate nix store paths, so they can be mostly
handled independently of each other, including passing to build inputs,
garbage collection or binary substitution. The exception is that building
from source always produces all the outputs.
</para>
<section><title>Introduction</title>
<para>The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems. The outputs reside in separate nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution. The exception is that building from source always produces all the outputs.</para>
<para>The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less.</para>
<note><para>The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb.</para></note>
</section>
<para>
The main motivation is to save disk space by reducing runtime closure sizes;
consequently also sizes of substituted binaries get reduced. Splitting can
be used to have more granular runtime dependencies, for example the typical
reduction is to split away development-only files, as those are typically
not needed during runtime. As a result, closure sizes of many packages can
get reduced to a half or even much less.
</para>
<note>
<para>
The reduction effects could be instead achieved by building the parts in
completely separate derivations. That would often additionally reduce
build-time closures, but it tends to be much harder to write such
derivations, as build systems typically assume all parts are being built at
once. This compromise approach of single source package producing multiple
binary packages is also utilized often by rpm and deb.
</para>
</note>
</section>
<section>
<title>Installing a split package</title>
<para>
When installing a package via <varname>systemPackages</varname> or
<command>nix-env</command> you have several options:
</para>
<section><title>Installing a split package</title>
<para>When installing a package via <varname>systemPackages</varname> or <command>nix-env</command> you have several options:</para>
<itemizedlist>
<listitem><para>You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package. The <varname>outputs</varname> attribute contains a list of output names.</para></listitem>
<listitem><para>You can let it use the default outputs. These are handled by <varname>meta.outputsToInstall</varname> attribute that contains a list of output names.</para>
<para>TODO: more about tweaking the attribute, etc.</para></listitem>
<listitem><para>NixOS provides configuration option <varname>environment.extraOutputsToInstall</varname> that allows adding extra outputs of <varname>environment.systemPackages</varname> atop the default ones. It's mainly meant for documentation and debug symbols, and it's also modified by specific options.</para>
<note><para>At this moment there is no similar configurability for packages installed by <command>nix-env</command>. You can still use approach from <xref linkend="sec-modify-via-packageOverrides" /> to override <varname>meta.outputsToInstall</varname> attributes, but that's a rather inconvenient way.</para></note>
</listitem>
<listitem>
<para>
You can install particular outputs explicitly, as each is available in the
Nix language as an attribute of the package. The
<varname>outputs</varname> attribute contains a list of output names.
</para>
</listitem>
<listitem>
<para>
You can let it use the default outputs. These are handled by
<varname>meta.outputsToInstall</varname> attribute that contains a list of
output names.
</para>
<para>
TODO: more about tweaking the attribute, etc.
</para>
</listitem>
<listitem>
<para>
NixOS provides configuration option
<varname>environment.extraOutputsToInstall</varname> that allows adding
extra outputs of <varname>environment.systemPackages</varname> atop the
default ones. It's mainly meant for documentation and debug symbols, and
it's also modified by specific options.
</para>
<note>
<para>
At this moment there is no similar configurability for packages installed
by <command>nix-env</command>. You can still use approach from
<xref linkend="sec-modify-via-packageOverrides" /> to override
<varname>meta.outputsToInstall</varname> attributes, but that's a rather
inconvenient way.
</para>
</note>
</listitem>
</itemizedlist>
</section>
</section>
<section>
<title>Using a split package</title>
<section><title>Using a split package</title>
<para>In the Nix language the individual outputs can be reached explicitly as attributes, e.g. <varname>coreutils.info</varname>, but the typical case is just using packages as build inputs.</para>
<para>When a multiple-output derivation gets into a build input of another derivation, the <varname>dev</varname> output is added if it exists, otherwise the first output is added. In addition to that, <varname>propagatedBuildOutputs</varname> of that package which by default contain <varname>$outputBin</varname> and <varname>$outputLib</varname> are also added. (See <xref linkend="multiple-output-file-type-groups" />.)</para>
</section>
<para>
In the Nix language the individual outputs can be reached explicitly as
attributes, e.g. <varname>coreutils.info</varname>, but the typical case is
just using packages as build inputs.
</para>
<para>
When a multiple-output derivation gets into a build input of another
derivation, the <varname>dev</varname> output is added if it exists,
otherwise the first output is added. In addition to that,
<varname>propagatedBuildOutputs</varname> of that package which by default
contain <varname>$outputBin</varname> and <varname>$outputLib</varname> are
also added. (See <xref linkend="multiple-output-file-type-groups" />.)
</para>
</section>
<section>
<title>Writing a split derivation</title>
<section><title>Writing a split derivation</title>
<para>Here you find how to write a derivation that produces multiple outputs.</para>
<para>In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior. You can find the source separated in &lt;<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>&gt;; it's relatively well-readable. The whole machinery is triggered by defining the <varname>outputs</varname> attribute to contain the list of desired output names (strings).</para>
<programlisting>outputs = [ "bin" "dev" "out" "doc" ];</programlisting>
<para>Often such a single line is enough. For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. By convention, the first output should contain the executable programs provided by the package as that output is used by Nix in string conversions, allowing references to binaries like <literal>${pkgs.perl}/bin/perl</literal> to always work. Typically you also want to have the main <varname>out</varname> output, as it catches any files that didn't get elsewhere.</para>
<para>
Here you find how to write a derivation that produces multiple outputs.
</para>
<note><para>There is a special handling of the <varname>debug</varname> output, described at <xref linkend="stdenv-separateDebugInfo" />.</para></note>
<para>
In nixpkgs there is a framework supporting multiple-output derivations. It
tries to cover most cases by default behavior. You can find the source
separated in
&lt;<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>&gt;;
it's relatively well-readable. The whole machinery is triggered by defining
the <varname>outputs</varname> attribute to contain the list of desired
output names (strings).
</para>
<programlisting>outputs = [ "bin" "dev" "out" "doc" ];</programlisting>
<para>
Often such a single line is enough. For each output an equally named
environment variable is passed to the builder and contains the path in nix
store for that output. Typically you also want to have the main
<varname>out</varname> output, as it catches any files that didn't get
elsewhere.
</para>
<note>
<para>
There is a special handling of the <varname>debug</varname> output,
described at <xref linkend="stdenv-separateDebugInfo" />.
</para>
</note>
<section xml:id="multiple-output-file-binaries-first-convention">
<title><quote>Binaries first</quote></title>
<para>
A commonly adopted convention in <literal>nixpkgs</literal> is that
executables provided by the package are contained within its first output.
This convention allows the dependent packages to reference the executables
provided by packages in a uniform manner. For instance, provided with the
knowledge that the <literal>perl</literal> package contains a
<literal>perl</literal> executable it can be referenced as
<literal>${pkgs.perl}/bin/perl</literal> within a Nix derivation that needs
to execute a Perl script.
</para>
<para>
The <literal>glibc</literal> package is a deliberate single exception to
the <quote>binaries first</quote> convention. The <literal>glibc</literal>
has <literal>libs</literal> as its first output allowing the libraries
provided by <literal>glibc</literal> to be referenced directly (e.g.
<literal>${stdenv.glibc}/lib/ld-linux-x86-64.so.2</literal>). The
executables provided by <literal>glibc</literal> can be accessed via its
<literal>bin</literal> attribute (e.g.
<literal>${stdenv.glibc.bin}/bin/ldd</literal>).
</para>
<para>
The reason for why <literal>glibc</literal> deviates from the convention is
because referencing a library provided by <literal>glibc</literal> is a
very common operation among Nix packages. For instance, third-party
executables packaged by Nix are typically patched and relinked with the
relevant version of <literal>glibc</literal> libraries from Nix packages
(please see the documentation on
<link xlink:href="https://nixos.org/patchelf.html">patchelf</link> for more
details).
</para>
</section>
<section xml:id="multiple-output-file-type-groups">
<title>File type groups</title>
<para>The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an <varname>outputFoo</varname> variable specifying the output name where they should go. If that variable isn't defined by the derivation writer, it is guessed &ndash; a default output name is defined, falling back to other possibilities if the output isn't defined.</para>
<variablelist>
<title>File type groups</title>
<varlistentry><term><varname>
$outputDev</varname></term><listitem><para>
is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files. They go to <varname>dev</varname> or <varname>out</varname> by default.
</para></listitem>
</varlistentry>
<para>
The support code currently recognizes some particular kinds of outputs and
either instructs the build system of the package to put files into their
desired outputs or it moves the files during the fixup phase. Each group of
file types has an <varname>outputFoo</varname> variable specifying the
output name where they should go. If that variable isn't defined by the
derivation writer, it is guessed &ndash; a default output name is defined,
falling back to other possibilities if the output isn't defined.
</para>
<varlistentry><term><varname>
$outputBin</varname></term><listitem><para>
is meant for user-facing binaries, typically residing in bin/. They go to <varname>bin</varname> or <varname>out</varname> by default.
</para></listitem></varlistentry>
<varlistentry><term><varname>
$outputLib</varname></term><listitem><para>
is meant for libraries, typically residing in <filename>lib/</filename> and <filename>libexec/</filename>. They go to <varname>lib</varname> or <varname>out</varname> by default.
</para></listitem></varlistentry>
<varlistentry><term><varname>
$outputDoc</varname></term><listitem><para>
is for user documentation, typically residing in <filename>share/doc/</filename>. It goes to <varname>doc</varname> or <varname>out</varname> by default.
</para></listitem></varlistentry>
<varlistentry><term><varname>
$outputDevdoc</varname></term><listitem><para>
is for <emphasis>developer</emphasis> documentation. Currently we count gtk-doc and devhelp books in there. It goes to <varname>devdoc</varname> or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
</para></listitem></varlistentry>
<varlistentry><term><varname>
$outputMan</varname></term><listitem><para>
is for man pages (except for section 3). They go to <varname>man</varname> or <varname>$outputBin</varname> by default.
</para></listitem></varlistentry>
<varlistentry><term><varname>
$outputDevman</varname></term><listitem><para>
is for section 3 man pages. They go to <varname>devman</varname> or <varname>$outputMan</varname> by default.
</para></listitem></varlistentry>
<varlistentry><term><varname>
$outputInfo</varname></term><listitem><para>
is for info pages. They go to <varname>info</varname> or <varname>$outputBin</varname> by default.
</para></listitem></varlistentry>
</variablelist>
<variablelist>
<varlistentry>
<term>
<varname> $outputDev</varname>
</term>
<listitem>
<para>
is for development-only files. These include C(++) headers, pkg-config,
cmake and aclocal files. They go to <varname>dev</varname> or
<varname>out</varname> by default.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname> $outputBin</varname>
</term>
<listitem>
<para>
is meant for user-facing binaries, typically residing in bin/. They go
to <varname>bin</varname> or <varname>out</varname> by default.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname> $outputLib</varname>
</term>
<listitem>
<para>
is meant for libraries, typically residing in <filename>lib/</filename>
and <filename>libexec/</filename>. They go to <varname>lib</varname> or
<varname>out</varname> by default.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname> $outputDoc</varname>
</term>
<listitem>
<para>
is for user documentation, typically residing in
<filename>share/doc/</filename>. It goes to <varname>doc</varname> or
<varname>out</varname> by default.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname> $outputDevdoc</varname>
</term>
<listitem>
<para>
is for <emphasis>developer</emphasis> documentation. Currently we count
gtk-doc and devhelp books in there. It goes to <varname>devdoc</varname>
or is removed (!) by default. This is because e.g. gtk-doc tends to be
rather large and completely unused by nixpkgs users.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname> $outputMan</varname>
</term>
<listitem>
<para>
is for man pages (except for section 3). They go to
<varname>man</varname> or <varname>$outputBin</varname> by default.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname> $outputDevman</varname>
</term>
<listitem>
<para>
is for section 3 man pages. They go to <varname>devman</varname> or
<varname>$outputMan</varname> by default.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname> $outputInfo</varname>
</term>
<listitem>
<para>
is for info pages. They go to <varname>info</varname> or
<varname>$outputBin</varname> by default.
</para>
</listitem>
</varlistentry>
</variablelist>
</section>
<section><title>Common caveats</title>
<itemizedlist>
<listitem><para>Some configure scripts don't like some of the parameters passed by default by the framework, e.g. <literal>--docdir=/foo/bar</literal>. You can disable this by setting <literal>setOutputFlags = false;</literal>.</para></listitem>
<listitem><para>The outputs of a single derivation can retain references to each other, but note that circular references are not allowed. (And each strongly-connected component would act as a single output anyway.)</para></listitem>
<listitem><para>Most of split packages contain their core functionality in libraries. These libraries tend to refer to various kind of data that typically gets into <varname>out</varname>, e.g. locale strings, so there is often no advantage in separating the libraries into <varname>lib</varname>, as keeping them in <varname>out</varname> is easier.</para></listitem>
<listitem><para>Some packages have hidden assumptions on install paths, which complicates splitting.</para></listitem>
</itemizedlist>
<section>
<title>Common caveats</title>
<itemizedlist>
<listitem>
<para>
Some configure scripts don't like some of the parameters passed by
default by the framework, e.g. <literal>--docdir=/foo/bar</literal>. You
can disable this by setting <literal>setOutputFlags = false;</literal>.
</para>
</listitem>
<listitem>
<para>
The outputs of a single derivation can retain references to each other,
but note that circular references are not allowed. (And each
strongly-connected component would act as a single output anyway.)
</para>
</listitem>
<listitem>
<para>
Most of split packages contain their core functionality in libraries.
These libraries tend to refer to various kind of data that typically gets
into <varname>out</varname>, e.g. locale strings, so there is often no
advantage in separating the libraries into <varname>lib</varname>, as
keeping them in <varname>out</varname> is easier.
</para>
</listitem>
<listitem>
<para>
Some packages have hidden assumptions on install paths, which complicates
splitting.
</para>
</listitem>
</itemizedlist>
</section>
</section><!--Writing a split derivation-->
</section>
<!--Writing a split derivation-->
</chapter>

View File

@@ -1,95 +1,117 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-overlays">
<title>Overlays</title>
<para>This chapter describes how to extend and change Nixpkgs packages using
overlays. Overlays are used to add layers in the fix-point used by Nixpkgs
to compose the set of all packages.</para>
<para>Nixpkgs can be configured with a list of overlays, which are
applied in order. This means that the order of the overlays can be significant
if multiple layers override the same package.</para>
<title>Overlays</title>
<para>
This chapter describes how to extend and change Nixpkgs packages using
overlays. Overlays are used to add layers in the fix-point used by Nixpkgs to
compose the set of all packages.
</para>
<para>
Nixpkgs can be configured with a list of overlays, which are applied in
order. This means that the order of the overlays can be significant if
multiple layers override the same package.
</para>
<!--============================================================-->
<section xml:id="sec-overlays-install">
<title>Installing overlays</title>
<section xml:id="sec-overlays-install">
<title>Installing overlays</title>
<para>
The list of overlays is determined as follows.
</para>
<para>The list of overlays is determined as follows.</para>
<para>
If the <varname>overlays</varname> argument is not provided explicitly, we
look for overlays in a path. The path is determined as follows:
<orderedlist>
<listitem>
<para>
First, if an <varname>overlays</varname> argument to the nixpkgs function
itself is given, then that is used.
</para>
<para>
This can be passed explicitly when importing nipxkgs, for example
<literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ];
}</literal>.
</para>
</listitem>
<listitem>
<para>
Otherwise, if the Nix path entry <literal>&lt;nixpkgs-overlays></literal>
exists, we look for overlays at that path, as described below.
</para>
<para>
See the section on <literal>NIX_PATH</literal> in the Nix manual for more
details on how to set a value for
<literal>&lt;nixpkgs-overlays>.</literal>
</para>
</listitem>
<listitem>
<para>
If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and
<filename>~/.config/nixpkgs/overlays/</filename> exists, then we look for
overlays at that path, as described below. It is an error if both exist.
</para>
</listitem>
</orderedlist>
</para>
<para>If the <varname>overlays</varname> argument is not provided explicitly, we look for overlays in a path. The path
is determined as follows:
<para>
If we are looking for overlays at a path, then there are two cases:
<itemizedlist>
<listitem>
<para>
If the path is a file, then the file is imported as a Nix expression and
used as the list of overlays.
</para>
</listitem>
<listitem>
<para>
If the path is a directory, then we take the content of the directory,
order it lexicographically, and attempt to interpret each as an overlay
by:
<itemizedlist>
<listitem>
<para>
Importing the file, if it is a <literal>.nix</literal> file.
</para>
</listitem>
<listitem>
<para>
Importing a top-level <filename>default.nix</filename> file, if it is
a directory.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</para>
<orderedlist>
<listitem>
<para>First, if an <varname>overlays</varname> argument to the nixpkgs function itself is given,
then that is used.</para>
<para>This can be passed explicitly when importing nipxkgs, for example
<literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ]; }</literal>.</para>
</listitem>
<listitem>
<para>Otherwise, if the Nix path entry <literal>&lt;nixpkgs-overlays></literal> exists, we look for overlays
at that path, as described below.</para>
<para>See the section on <literal>NIX_PATH</literal> in the Nix manual for more details on how to
set a value for <literal>&lt;nixpkgs-overlays>.</literal></para>
</listitem>
<listitem>
<para>If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and
<filename>~/.config/nixpkgs/overlays/</filename> exists, then we look for overlays at that path, as
described below. It is an error if both exist.</para>
</listitem>
</orderedlist>
</para>
<para>If we are looking for overlays at a path, then there are two cases:
<itemizedlist>
<listitem>
<para>If the path is a file, then the file is imported as a Nix expression and used as the list of
overlays.</para>
</listitem>
<listitem>
<para>If the path is a directory, then we take the content of the directory, order it
lexicographically, and attempt to interpret each as an overlay by:
<itemizedlist>
<listitem>
<para>Importing the file, if it is a <literal>.nix</literal> file.</para>
</listitem>
<listitem>
<para>Importing a top-level <filename>default.nix</filename> file, if it is a directory.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</para>
<para>On a NixOS system the value of the <literal>nixpkgs.overlays</literal> option, if present,
is passed to the system Nixpkgs directly as an argument. Note that this does not affect the overlays for
non-NixOS operations (e.g. <literal>nix-env</literal>), which are looked up independently.</para>
<para>The <filename>overlays.nix</filename> option therefore provides a convenient way to use the same
overlays for a NixOS system configuration and user configuration: the same file can be used
as <filename>overlays.nix</filename> and imported as the value of <literal>nixpkgs.overlays</literal>.</para>
</section>
<para>
On a NixOS system the value of the <literal>nixpkgs.overlays</literal>
option, if present, is passed to the system Nixpkgs directly as an argument.
Note that this does not affect the overlays for non-NixOS operations (e.g.
<literal>nix-env</literal>), which are looked up independently.
</para>
<para>
The <filename>overlays.nix</filename> option therefore provides a convenient
way to use the same overlays for a NixOS system configuration and user
configuration: the same file can be used as
<filename>overlays.nix</filename> and imported as the value of
<literal>nixpkgs.overlays</literal>.
</para>
</section>
<!--============================================================-->
<section xml:id="sec-overlays-definition">
<title>Defining overlays</title>
<section xml:id="sec-overlays-definition">
<title>Defining overlays</title>
<para>Overlays are Nix functions which accept two arguments,
conventionally called <varname>self</varname> and <varname>super</varname>,
and return a set of packages. For example, the following is a valid overlay.</para>
<para>
Overlays are Nix functions which accept two arguments, conventionally called
<varname>self</varname> and <varname>super</varname>, and return a set of
packages. For example, the following is a valid overlay.
</para>
<programlisting>
self: super:
@@ -104,31 +126,39 @@ self: super:
}
</programlisting>
<para>The first argument (<varname>self</varname>) corresponds to the final package
set. You should use this set for the dependencies of all packages specified in your
overlay. For example, all the dependencies of <varname>rr</varname> in the example above come
from <varname>self</varname>, as well as the overridden dependencies used in the
<varname>boost</varname> override.</para>
<para>
The first argument (<varname>self</varname>) corresponds to the final
package set. You should use this set for the dependencies of all packages
specified in your overlay. For example, all the dependencies of
<varname>rr</varname> in the example above come from
<varname>self</varname>, as well as the overridden dependencies used in the
<varname>boost</varname> override.
</para>
<para>The second argument (<varname>super</varname>)
corresponds to the result of the evaluation of the previous stages of
Nixpkgs. It does not contain any of the packages added by the current
overlay, nor any of the following overlays. This set should be used either
to refer to packages you wish to override, or to access functions defined
in Nixpkgs. For example, the original recipe of <varname>boost</varname>
in the above example, comes from <varname>super</varname>, as well as the
<varname>callPackage</varname> function.</para>
<para>
The second argument (<varname>super</varname>) corresponds to the result of
the evaluation of the previous stages of Nixpkgs. It does not contain any of
the packages added by the current overlay, nor any of the following
overlays. This set should be used either to refer to packages you wish to
override, or to access functions defined in Nixpkgs. For example, the
original recipe of <varname>boost</varname> in the above example, comes from
<varname>super</varname>, as well as the <varname>callPackage</varname>
function.
</para>
<para>The value returned by this function should be a set similar to
<filename>pkgs/top-level/all-packages.nix</filename>, containing
overridden and/or new packages.</para>
<para>Overlays are similar to other methods for customizing Nixpkgs, in particular
the <literal>packageOverrides</literal> attribute described in <xref linkend="sec-modify-via-packageOverrides"/>.
Indeed, <literal>packageOverrides</literal> acts as an overlay with only the
<varname>super</varname> argument. It is therefore appropriate for basic use,
but overlays are more powerful and easier to distribute.</para>
</section>
<para>
The value returned by this function should be a set similar to
<filename>pkgs/top-level/all-packages.nix</filename>, containing overridden
and/or new packages.
</para>
<para>
Overlays are similar to other methods for customizing Nixpkgs, in particular
the <literal>packageOverrides</literal> attribute described in
<xref linkend="sec-modify-via-packageOverrides"/>. Indeed,
<literal>packageOverrides</literal> acts as an overlay with only the
<varname>super</varname> argument. It is therefore appropriate for basic
use, but overlays are more powerful and easier to distribute.
</para>
</section>
</chapter>

9
doc/overrides.css Normal file
View File

@@ -0,0 +1,9 @@
.docbook .xref img[src^=images\/callouts\/],
.screen img,
.programlisting img {
width: 1em;
}
.calloutlist img {
width: 1.5em;
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,27 +1,25 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-platform-nodes">
<title>Platform Notes</title>
<section xml:id="sec-darwin">
<title>Darwin (macOS)</title>
<title>Platform Notes</title>
<para>
Some common issues when packaging software for darwin:
</para>
<section xml:id="sec-darwin">
<title>Darwin (macOS)</title>
<para>Some common issues when packaging software for darwin:</para>
<itemizedlist>
<listitem>
<itemizedlist>
<listitem>
<para>
The darwin <literal>stdenv</literal> uses clang instead of gcc.
When referring to the compiler <varname>$CC</varname> or <command>cc</command>
will work in both cases. Some builds hardcode gcc/g++ in their
build scripts, that can usually be fixed with using something
like <literal>makeFlags = [ "CC=cc" ];</literal> or by patching
the build scripts.
The darwin <literal>stdenv</literal> uses clang instead of gcc. When
referring to the compiler <varname>$CC</varname> or <command>cc</command>
will work in both cases. Some builds hardcode gcc/g++ in their build
scripts, that can usually be fixed with using something like
<literal>makeFlags = [ "CC=cc" ];</literal> or by patching the build
scripts.
</para>
<programlisting>
<programlisting>
stdenv.mkDerivation {
name = "libfoo-1.2.3";
# ...
@@ -30,36 +28,33 @@
'';
}
</programlisting>
</listitem>
<listitem>
</listitem>
<listitem>
<para>
On darwin libraries are linked using absolute paths, libraries
are resolved by their <literal>install_name</literal> at link
time. Sometimes packages won't set this correctly causing the
library lookups to fail at runtime. This can be fixed by adding
extra linker flags or by running <command>install_name_tool -id</command>
during the <function>fixupPhase</function>.
On darwin libraries are linked using absolute paths, libraries are
resolved by their <literal>install_name</literal> at link time. Sometimes
packages won't set this correctly causing the library lookups to fail at
runtime. This can be fixed by adding extra linker flags or by running
<command>install_name_tool -id</command> during the
<function>fixupPhase</function>.
</para>
<programlisting>
<programlisting>
stdenv.mkDerivation {
name = "libfoo-1.2.3";
# ...
makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib";
}
</programlisting>
</listitem>
<listitem>
</listitem>
<listitem>
<para>
Some packages assume xcode is available and use <command>xcrun</command>
to resolve build tools like <command>clang</command>, etc.
This causes errors like <code>xcode-select: error: no developer tools were found at '/Applications/Xcode.app'</code>
while the build doesn't actually depend on xcode.
Some packages assume xcode is available and use <command>xcrun</command>
to resolve build tools like <command>clang</command>, etc. This causes
errors like <code>xcode-select: error: no developer tools were found at
'/Applications/Xcode.app'</code> while the build doesn't actually depend
on xcode.
</para>
<programlisting>
<programlisting>
stdenv.mkDerivation {
name = "libfoo-1.2.3";
# ...
@@ -69,15 +64,12 @@
'';
}
</programlisting>
<para>
The package <literal>xcbuild</literal> can be used to build projects
that really depend on Xcode, however projects that build some kind of
graphical interface won't work without using Xcode in an impure way.
The package <literal>xcbuild</literal> can be used to build projects that
really depend on Xcode, however projects that build some kind of graphical
interface won't work without using Xcode in an impure way.
</para>
</listitem>
</itemizedlist>
</section>
</listitem>
</itemizedlist>
</section>
</chapter>

View File

@@ -1,223 +1,219 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-quick-start">
<title>Quick Start to Adding a Package</title>
<para>To add a package to Nixpkgs:
<orderedlist>
<listitem>
<para>Checkout the Nixpkgs source tree:
<title>Quick Start to Adding a Package</title>
<para>
To add a package to Nixpkgs:
<orderedlist>
<listitem>
<para>
Checkout the Nixpkgs source tree:
<screen>
$ git clone git://github.com/NixOS/nixpkgs.git
$ cd nixpkgs</screen>
</para>
</listitem>
<listitem>
<para>Find a good place in the Nixpkgs tree to add the Nix
expression for your package. For instance, a library package
typically goes into
<filename>pkgs/development/libraries/<replaceable>pkgname</replaceable></filename>,
while a web browser goes into
<filename>pkgs/applications/networking/browsers/<replaceable>pkgname</replaceable></filename>.
See <xref linkend="sec-organisation" /> for some hints on the tree
organisation. Create a directory for your package, e.g.
</listitem>
<listitem>
<para>
Find a good place in the Nixpkgs tree to add the Nix expression for your
package. For instance, a library package typically goes into
<filename>pkgs/development/libraries/<replaceable>pkgname</replaceable></filename>,
while a web browser goes into
<filename>pkgs/applications/networking/browsers/<replaceable>pkgname</replaceable></filename>.
See <xref linkend="sec-organisation" /> for some hints on the tree
organisation. Create a directory for your package, e.g.
<screen>
$ mkdir pkgs/development/libraries/libfoo</screen>
</para>
</listitem>
<listitem>
<para>In the package directory, create a Nix expression — a piece
of code that describes how to build the package. In this case, it
should be a <emphasis>function</emphasis> that is called with the
package dependencies as arguments, and returns a build of the
package in the Nix store. The expression should usually be called
<filename>default.nix</filename>.
</listitem>
<listitem>
<para>
In the package directory, create a Nix expression — a piece of code that
describes how to build the package. In this case, it should be a
<emphasis>function</emphasis> that is called with the package dependencies
as arguments, and returns a build of the package in the Nix store. The
expression should usually be called <filename>default.nix</filename>.
<screen>
$ emacs pkgs/development/libraries/libfoo/default.nix
$ git add pkgs/development/libraries/libfoo/default.nix</screen>
</para>
<para>You can have a look at the existing Nix expressions under
<filename>pkgs/</filename> to see how its done. Here are some
good ones:
<itemizedlist>
<listitem>
<para>GNU Hello: <link
<para>
You can have a look at the existing Nix expressions under
<filename>pkgs/</filename> to see how its done. Here are some good
ones:
<itemizedlist>
<listitem>
<para>
GNU Hello:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/default.nix"><filename>pkgs/applications/misc/hello/default.nix</filename></link>.
Trivial package, which specifies some <varname>meta</varname>
attributes which is good practice.</para>
</listitem>
<listitem>
<para>GNU cpio: <link
Trivial package, which specifies some <varname>meta</varname>
attributes which is good practice.
</para>
</listitem>
<listitem>
<para>
GNU cpio:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>.
Also a simple package. The generic builder in
<varname>stdenv</varname> does everything for you. It has
no dependencies beyond <varname>stdenv</varname>.</para>
</listitem>
<listitem>
<para>GNU Multiple Precision arithmetic library (GMP): <link
Also a simple package. The generic builder in <varname>stdenv</varname>
does everything for you. It has no dependencies beyond
<varname>stdenv</varname>.
</para>
</listitem>
<listitem>
<para>
GNU Multiple Precision arithmetic library (GMP):
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/5.1.x.nix"><filename>pkgs/development/libraries/gmp/5.1.x.nix</filename></link>.
Also done by the generic builder, but has a dependency on
<varname>m4</varname>.</para>
</listitem>
<listitem>
<para>Pan, a GTK-based newsreader: <link
Also done by the generic builder, but has a dependency on
<varname>m4</varname>.
</para>
</listitem>
<listitem>
<para>
Pan, a GTK-based newsreader:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></link>.
Has an optional dependency on <varname>gtkspell</varname>,
which is only built if <varname>spellCheck</varname> is
<literal>true</literal>.</para>
</listitem>
<listitem>
<para>Apache HTTPD: <link
Has an optional dependency on <varname>gtkspell</varname>, which is
only built if <varname>spellCheck</varname> is <literal>true</literal>.
</para>
</listitem>
<listitem>
<para>
Apache HTTPD:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/2.4.nix"><filename>pkgs/servers/http/apache-httpd/2.4.nix</filename></link>.
A bunch of optional features, variable substitutions in the
configure flags, a post-install hook, and miscellaneous
hackery.</para>
</listitem>
<listitem>
<para>Thunderbird: <link
A bunch of optional features, variable substitutions in the configure
flags, a post-install hook, and miscellaneous hackery.
</para>
</listitem>
<listitem>
<para>
Thunderbird:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/default.nix</filename></link>.
Lots of dependencies.</para>
</listitem>
<listitem>
<para>JDiskReport, a Java utility: <link
Lots of dependencies.
</para>
</listitem>
<listitem>
<para>
JDiskReport, a Java utility:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link>
(and the <link
(and the
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>).
Nixpkgs doesnt have a decent <varname>stdenv</varname> for
Java yet so this is pretty ad-hoc.</para>
</listitem>
<listitem>
<para>XML::Simple, a Perl module: <link
Nixpkgs doesnt have a decent <varname>stdenv</varname> for Java yet
so this is pretty ad-hoc.
</para>
</listitem>
<listitem>
<para>
XML::Simple, a Perl module:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>
(search for the <varname>XMLSimple</varname> attribute).
Most Perl modules are so simple to build that they are
defined directly in <filename>perl-packages.nix</filename>;
no need to make a separate file for them.</para>
</listitem>
<listitem>
<para>Adobe Reader: <link
(search for the <varname>XMLSimple</varname> attribute). Most Perl
modules are so simple to build that they are defined directly in
<filename>perl-packages.nix</filename>; no need to make a separate file
for them.
</para>
</listitem>
<listitem>
<para>
Adobe Reader:
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>.
Shows how binary-only packages can be supported. In
particular the <link
Shows how binary-only packages can be supported. In particular the
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder</link>
uses <command>patchelf</command> to set the RUNPATH and ELF
interpreter of the executables so that the right libraries
are found at runtime.</para>
</listitem>
</itemizedlist>
uses <command>patchelf</command> to set the RUNPATH and ELF interpreter
of the executables so that the right libraries are found at runtime.
</para>
</listitem>
</itemizedlist>
</para>
<para>Some notes:
<itemizedlist>
<listitem>
<para>All <varname linkend="chap-meta">meta</varname>
attributes are optional, but its still a good idea to
provide at least the <varname>description</varname>,
<varname>homepage</varname> and <varname
linkend="sec-meta-license">license</varname>.</para>
</listitem>
<listitem>
<para>You can use <command>nix-prefetch-url</command> (or similar nix-prefetch-git, etc)
<replaceable>url</replaceable> to get the SHA-256 hash of
source distributions. There are similar commands as <command>nix-prefetch-git</command> and
<command>nix-prefetch-hg</command> available in <literal>nix-prefetch-scripts</literal> package.</para>
</listitem>
<listitem>
<para>A list of schemes for <literal>mirror://</literal>
URLs can be found in <link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>.</para>
</listitem>
</itemizedlist>
<para>
Some notes:
<itemizedlist>
<listitem>
<para>
All <varname linkend="chap-meta">meta</varname> attributes are
optional, but its still a good idea to provide at least the
<varname>description</varname>, <varname>homepage</varname> and
<varname
linkend="sec-meta-license">license</varname>.
</para>
</listitem>
<listitem>
<para>
You can use <command>nix-prefetch-url</command> (or similar
nix-prefetch-git, etc) <replaceable>url</replaceable> to get the
SHA-256 hash of source distributions. There are similar commands as
<command>nix-prefetch-git</command> and
<command>nix-prefetch-hg</command> available in
<literal>nix-prefetch-scripts</literal> package.
</para>
</listitem>
<listitem>
<para>
A list of schemes for <literal>mirror://</literal> URLs can be found in
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>.
</para>
</listitem>
</itemizedlist>
</para>
<para>The exact syntax and semantics of the Nix expression
language, including the built-in function, are described in the
Nix manual in the <link
<para>
The exact syntax and semantics of the Nix expression language, including
the built-in function, are described in the Nix manual in the
<link
xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter
on writing Nix expressions</link>.</para>
</listitem>
<listitem>
<para>Add a call to the function defined in the previous step to
<link
on writing Nix expressions</link>.
</para>
</listitem>
<listitem>
<para>
Add a call to the function defined in the previous step to
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></link>
with some descriptive name for the variable,
e.g. <varname>libfoo</varname>.
<screen>
with some descriptive name for the variable, e.g.
<varname>libfoo</varname>.
<screen>
$ emacs pkgs/top-level/all-packages.nix</screen>
</para>
<para>The attributes in that file are sorted by category (like
“Development / Libraries”) that more-or-less correspond to the
directory structure of Nixpkgs, and then by attribute name.</para>
</listitem>
<listitem>
<para>To test whether the package builds, run the following command
from the root of the nixpkgs source tree:
<screen>
<para>
The attributes in that file are sorted by category (like “Development /
Libraries”) that more-or-less correspond to the directory structure of
Nixpkgs, and then by attribute name.
</para>
</listitem>
<listitem>
<para>
To test whether the package builds, run the following command from the
root of the nixpkgs source tree:
<screen>
$ nix-build -A libfoo</screen>
where <varname>libfoo</varname> should be the variable name
defined in the previous step. You may want to add the flag
<option>-K</option> to keep the temporary build directory in case
something fails. If the build succeeds, a symlink
<filename>./result</filename> to the package in the Nix store is
created.</para>
</listitem>
<listitem>
<para>If you want to install the package into your profile
(optional), do
<screen>
$ nix-env -f . -iA libfoo</screen>
where <varname>libfoo</varname> should be the variable name defined in the
previous step. You may want to add the flag <option>-K</option> to keep
the temporary build directory in case something fails. If the build
succeeds, a symlink <filename>./result</filename> to the package in the
Nix store is created.
</para>
</listitem>
<listitem>
<para>Optionally commit the new package and open a pull request, or send a patch to
<literal>https://groups.google.com/forum/#!forum/nix-devel</literal>.</para>
</listitem>
</orderedlist>
</para>
</listitem>
<listitem>
<para>
If you want to install the package into your profile (optional), do
<screen>
$ nix-env -f . -iA libfoo</screen>
</para>
</listitem>
<listitem>
<para>
Optionally commit the new package and open a pull request, or send a patch
to <literal>https://groups.google.com/forum/#!forum/nix-devel</literal>.
</para>
</listitem>
</orderedlist>
</para>
</chapter>

File diff suppressed because it is too large Load Diff

View File

@@ -3,93 +3,153 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-reviewing-contributions">
<title>Reviewing contributions</title>
<warning>
<para>The following section is a draft and reviewing policy is still being
discussed.</para>
</warning>
<para>The nixpkgs projects receives a fairly high number of contributions via
GitHub pull-requests. Reviewing and approving these is an important task and a
way to contribute to the project.</para>
<para>The high change rate of nixpkgs make any pull request that is open for
long enough subject to conflicts that will require extra work from the
submitter or the merger. Reviewing pull requests in a timely manner and being
<title>Reviewing contributions</title>
<warning>
<para>
The following section is a draft, and the policy for reviewing is still
being discussed in issues such as
<link
xlink:href="https://github.com/NixOS/nixpkgs/issues/11166">#11166
</link> and
<link
xlink:href="https://github.com/NixOS/nixpkgs/issues/20836">#20836
</link>.
</para>
</warning>
<para>
The nixpkgs project receives a fairly high number of contributions via GitHub
pull-requests. Reviewing and approving these is an important task and a way
to contribute to the project.
</para>
<para>
The high change rate of nixpkgs makes any pull request that remains open for
too long subject to conflicts that will require extra work from the submitter
or the merger. Reviewing pull requests in a timely manner and being
responsive to the comments is the key to avoid these. GitHub provides sort
filters that can be used to see the <link
filters that can be used to see the
<link
xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most
recently</link> and the <link
recently</link> and the
<link
xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc">least
recently</link> updated pull-requests.</para>
<para>When reviewing a pull request, please always be nice and polite.
recently</link> updated pull-requests.
</para>
<para>
When reviewing a pull request, please always be nice and polite.
Controversial changes can lead to controversial opinions, but it is important
to respect every community members and their work.</para>
<para>GitHub provides reactions, they are a simple and quick way to provide
feedback to pull-requests or any comments. The thumb-down reaction should be
used with care and if possible accompanied with some explanations so the
submitter has directions to improve his contribution.</para>
<para>Pull-requests reviews should include a list of what has been reviewed in a
comment, so other reviewers and mergers can know the state of the
review.</para>
<para>All the review template samples provided in this section are generic and
to respect every community member and their work.
</para>
<para>
GitHub provides reactions as a simple and quick way to provide feedback to
pull-requests or any comments. The thumb-down reaction should be used with
care and if possible accompanied with some explanation so the submitter has
directions to improve their contribution.
</para>
<para>
Pull-request reviews should include a list of what has been reviewed in a
comment, so other reviewers and mergers can know the state of the review.
</para>
<para>
All the review template samples provided in this section are generic and
meant as examples. Their usage is optional and the reviewer is free to adapt
them to his liking.</para>
them to their liking.
</para>
<section>
<title>Package updates</title>
<section><title>Package updates</title>
<para>
A package update is the most trivial and common type of pull-request. These
pull-requests mainly consist of updating the version part of the package
name and the source hash.
</para>
<para>A package update is the most trivial and common type of pull-request.
These pull-requests mainly consist in updating the version part of the package
name and the source hash.</para>
<para>It can happen that non trivial updates include patches or more complex
changes.</para>
<para>
It can happen that non-trivial updates include patches or more complex
changes.
</para>
<para>Reviewing process:</para>
<para>
Reviewing process:
</para>
<itemizedlist>
<listitem><para>Add labels to the pull-request. (Requires commit
rights)</para>
<itemizedlist>
<listitem>
<para>
Add labels to the pull-request. (Requires commit rights)
</para>
<itemizedlist>
<listitem><para><literal>8.has: package (update)</literal> and any topic
label that fit the updated package.</para></listitem>
<listitem>
<para>
<literal>8.has: package (update)</literal> and any topic label that fit
the updated package.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that the package versioning is fitting the
guidelines.</para></listitem>
<listitem><para>Ensure that the commit text is fitting the
guidelines.</para></listitem>
<listitem><para>Ensure that the package maintainers are notified.</para>
</listitem>
<listitem>
<para>
Ensure that the package versioning fits the guidelines.
</para>
</listitem>
<listitem>
<para>
Ensure that the commit text fits the guidelines.
</para>
</listitem>
<listitem>
<para>
Ensure that the package maintainers are notified.
</para>
<itemizedlist>
<listitem><para>mention-bot usually notify GitHub users based on the
submitted changes, but it can happen that it misses some of the
package maintainers.</para></listitem>
<listitem>
<para>
mention-bot usually notifies GitHub users based on the submitted
changes, but it can happen that it misses some of the package
maintainers.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that the meta field contains correct
information.</para>
</listitem>
<listitem>
<para>
Ensure that the meta field information is correct.
</para>
<itemizedlist>
<listitem><para>License can change with version updates, so it should be
checked to be fitting upstream license.</para></listitem>
<listitem><para>If the package has no maintainer, a maintainer must be
set. This can be the update submitter or a community member that
accepts to take maintainership of the package.</para></listitem>
<listitem>
<para>
License can change with version updates, so it should be checked to
match the upstream license.
</para>
</listitem>
<listitem>
<para>
If the package has no maintainer, a maintainer must be set. This can be
the update submitter or a community member that accepts to take
maintainership of the package.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that the code contains no typos.</para></listitem>
<listitem><para>Building the package locally.</para>
</listitem>
<listitem>
<para>
Ensure that the code contains no typos.
</para>
</listitem>
<listitem>
<para>
Building the package locally.
</para>
<itemizedlist>
<listitem><para>Pull-requests are often targeted to the master or staging
branch so building the pull-request locally as it is submitted can
trigger a large amount of source builds.</para>
<para>It is possible to rebase the changes on nixos-unstable or
nixpkgs-unstable for easier review by running the following commands
from a nixpkgs clone.
<listitem>
<para>
Pull-requests are often targeted to the master or staging branch, and
building the pull-request locally when it is submitted can trigger many
source builds.
</para>
<para>
It is possible to rebase the changes on nixos-unstable or
nixpkgs-unstable for easier review by running the following commands
from a nixpkgs clone.
<screen>
$ git remote add channels https://github.com/NixOS/nixpkgs-channels.git <co
xml:id='reviewing-rebase-1' />
@@ -98,43 +158,56 @@ $ git fetch origin pull/PRNUMBER/head <co xml:id='reviewing-rebase-3' />
$ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD <co
xml:id='reviewing-rebase-4' />
</screen>
<calloutlist>
<callout arearefs='reviewing-rebase-1'>
<para>This should be done only once to be able to fetch channel
branches from the nixpkgs-channels repository.</para>
</callout>
<callout arearefs='reviewing-rebase-2'>
<para>Fetching the nixos-unstable branch.</para>
</callout>
<callout arearefs='reviewing-rebase-3'>
<para>Fetching the pull-request changes, <varname>PRNUMBER</varname>
is the number at the end of the pull-request title and
<varname>BASEBRANCH</varname> the base branch of the
pull-request.</para>
</callout>
<callout arearefs='reviewing-rebase-3'>
<para>Rebasing the pull-request changes to the nixos-unstable
branch.</para>
</callout>
</calloutlist>
</para>
</listitem>
<listitem>
<para>The <link xlink:href="https://github.com/madjar/nox">nox</link>
tool can be used to review a pull-request content in a single command.
It doesn't rebase on a channel branch so it might trigger multiple
source builds. <varname>PRNUMBER</varname> should be replaced by the
number at the end of the pull-request title.</para>
<calloutlist>
<callout arearefs='reviewing-rebase-1'>
<para>
This should be done only once to be able to fetch channel branches
from the nixpkgs-channels repository.
</para>
</callout>
<callout arearefs='reviewing-rebase-2'>
<para>
Fetching the nixos-unstable branch.
</para>
</callout>
<callout arearefs='reviewing-rebase-3'>
<para>
Fetching the pull-request changes, <varname>PRNUMBER</varname> is the
number at the end of the pull-request title and
<varname>BASEBRANCH</varname> the base branch of the pull-request.
</para>
</callout>
<callout arearefs='reviewing-rebase-3'>
<para>
Rebasing the pull-request changes to the nixos-unstable branch.
</para>
</callout>
</calloutlist>
</para>
</listitem>
<listitem>
<para>
The <link xlink:href="https://github.com/madjar/nox">nox</link> tool can
be used to review a pull-request content in a single command. It doesn't
rebase on a channel branch so it might trigger multiple source builds.
<varname>PRNUMBER</varname> should be replaced by the number at the end
of the pull-request title.
</para>
<screen>
$ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
</screen>
</listitem>
</listitem>
</itemizedlist>
</listitem>
<listitem><para>Running every binary.</para></listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
Running every binary.
</para>
</listitem>
</itemizedlist>
<example><title>Sample template for a package update review</title>
<example>
<title>Sample template for a package update review</title>
<screen>
##### Reviewed points
@@ -148,55 +221,105 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
##### Comments
</screen></example>
</section>
</screen>
</example>
</section>
<section>
<title>New packages</title>
<section><title>New packages</title>
<para>
New packages are a common type of pull-requests. These pull requests
consists in adding a new nix-expression for a package.
</para>
<para>New packages are a common type of pull-requests. These pull requests
consists in adding a new nix-expression for a package.</para>
<para>
Reviewing process:
</para>
<para>Reviewing process:</para>
<itemizedlist>
<listitem><para>Add labels to the pull-request. (Requires commit
rights)</para>
<itemizedlist>
<listitem>
<para>
Add labels to the pull-request. (Requires commit rights)
</para>
<itemizedlist>
<listitem><para><literal>8.has: package (new)</literal> and any topic
label that fit the new package.</para></listitem>
<listitem>
<para>
<literal>8.has: package (new)</literal> and any topic label that fit the
new package.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that the package versioning is fitting the
guidelines.</para></listitem>
<listitem><para>Ensure that the commit name is fitting the
guidelines.</para></listitem>
<listitem><para>Ensure that the meta field contains correct
information.</para>
</listitem>
<listitem>
<para>
Ensure that the package versioning is fitting the guidelines.
</para>
</listitem>
<listitem>
<para>
Ensure that the commit name is fitting the guidelines.
</para>
</listitem>
<listitem>
<para>
Ensure that the meta field contains correct information.
</para>
<itemizedlist>
<listitem><para>License must be checked to be fitting upstream
license.</para></listitem>
<listitem><para>Platforms should be set or the package will not get binary
substitutes.</para></listitem>
<listitem><para>A maintainer must be set, this can be the package
submitter or a community member that accepts to take maintainership of
the package.</para></listitem>
<listitem>
<para>
License must be checked to be fitting upstream license.
</para>
</listitem>
<listitem>
<para>
Platforms should be set or the package will not get binary substitutes.
</para>
</listitem>
<listitem>
<para>
A maintainer must be set, this can be the package submitter or a
community member that accepts to take maintainership of the package.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that the code contains no typos.</para></listitem>
<listitem><para>Ensure the package source.</para>
</listitem>
<listitem>
<para>
Ensure that the code contains no typos.
</para>
</listitem>
<listitem>
<para>
Ensure the package source.
</para>
<itemizedlist>
<listitem><para>Mirrors urls should be used when
available.</para></listitem>
<listitem><para>The most appropriate function should be used (e.g.
packages from GitHub should use
<literal>fetchFromGitHub</literal>).</para></listitem>
<listitem>
<para>
Mirrors urls should be used when available.
</para>
</listitem>
<listitem>
<para>
The most appropriate function should be used (e.g. packages from GitHub
should use <literal>fetchFromGitHub</literal>).
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem><para>Building the package locally.</para></listitem>
<listitem><para>Running every binary.</para></listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
Building the package locally.
</para>
</listitem>
<listitem>
<para>
Running every binary.
</para>
</listitem>
</itemizedlist>
<example><title>Sample template for a new package review</title>
<example>
<title>Sample template for a new package review</title>
<screen>
##### Reviewed points
@@ -218,58 +341,107 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
##### Comments
</screen></example>
</section>
</screen>
</example>
</section>
<section>
<title>Module updates</title>
<section><title>Module updates</title>
<para>
Module updates are submissions changing modules in some ways. These often
contains changes to the options or introduce new options.
</para>
<para>Module updates are submissions changing modules in some ways. These often
contains changes to the options or introduce new options.</para>
<para>
Reviewing process
</para>
<para>Reviewing process</para>
<itemizedlist>
<listitem><para>Add labels to the pull-request. (Requires commit
rights)</para>
<itemizedlist>
<listitem>
<para>
Add labels to the pull-request. (Requires commit rights)
</para>
<itemizedlist>
<listitem><para><literal>8.has: module (update)</literal> and any topic
label that fit the module.</para></listitem>
<listitem>
<para>
<literal>8.has: module (update)</literal> and any topic label that fit
the module.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that the module maintainers are notified.</para>
</listitem>
<listitem>
<para>
Ensure that the module maintainers are notified.
</para>
<itemizedlist>
<listitem><para>Mention-bot notify GitHub users based on the submitted
changes, but it can happen that it miss some of the package
maintainers.</para></listitem>
<listitem>
<para>
Mention-bot notify GitHub users based on the submitted changes, but it
can happen that it miss some of the package maintainers.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that the module tests, if any, are
succeeding.</para></listitem>
<listitem><para>Ensure that the introduced options are correct.</para>
</listitem>
<listitem>
<para>
Ensure that the module tests, if any, are succeeding.
</para>
</listitem>
<listitem>
<para>
Ensure that the introduced options are correct.
</para>
<itemizedlist>
<listitem><para>Type should be appropriate (string related types differs
in their merging capabilities, <literal>optionSet</literal> and
<literal>string</literal> types are deprecated).</para></listitem>
<listitem><para>Description, default and example should be
provided.</para></listitem>
<listitem>
<para>
Type should be appropriate (string related types differs in their
merging capabilities, <literal>optionSet</literal> and
<literal>string</literal> types are deprecated).
</para>
</listitem>
<listitem>
<para>
Description, default and example should be provided.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that option changes are backward compatible.</para>
</listitem>
<listitem>
<para>
Ensure that option changes are backward compatible.
</para>
<itemizedlist>
<listitem><para><literal>mkRenamedOptionModule</literal> and
<literal>mkAliasOptionModule</literal> functions provide way to make
option changes backward compatible.</para></listitem>
<listitem>
<para>
<literal>mkRenamedOptionModule</literal> and
<literal>mkAliasOptionModule</literal> functions provide way to make
option changes backward compatible.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that removed options are declared with
<literal>mkRemovedOptionModule</literal></para></listitem>
<listitem><para>Ensure that changes that are not backward compatible are
mentioned in release notes.</para></listitem>
<listitem><para>Ensure that documentations affected by the change is
updated.</para></listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
Ensure that removed options are declared with
<literal>mkRemovedOptionModule</literal>
</para>
</listitem>
<listitem>
<para>
Ensure that changes that are not backward compatible are mentioned in
release notes.
</para>
</listitem>
<listitem>
<para>
Ensure that documentations affected by the change is updated.
</para>
</listitem>
</itemizedlist>
<example><title>Sample template for a module update review</title>
<example>
<title>Sample template for a module update review</title>
<screen>
##### Reviewed points
@@ -286,51 +458,89 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
##### Comments
</screen></example>
</section>
</screen>
</example>
</section>
<section>
<title>New modules</title>
<section><title>New modules</title>
<para>
New modules submissions introduce a new module to NixOS.
</para>
<para>New modules submissions introduce a new module to NixOS.</para>
<itemizedlist>
<listitem>
<para>
Add labels to the pull-request. (Requires commit rights)
</para>
<itemizedlist>
<listitem>
<para>
<literal>8.has: module (new)</literal> and any topic label that fit the
module.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
Ensure that the module tests, if any, are succeeding.
</para>
</listitem>
<listitem>
<para>
Ensure that the introduced options are correct.
</para>
<itemizedlist>
<listitem>
<para>
Type should be appropriate (string related types differs in their
merging capabilities, <literal>optionSet</literal> and
<literal>string</literal> types are deprecated).
</para>
</listitem>
<listitem>
<para>
Description, default and example should be provided.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
Ensure that module <literal>meta</literal> field is present
</para>
<itemizedlist>
<listitem>
<para>
Maintainers should be declared in <literal>meta.maintainers</literal>.
</para>
</listitem>
<listitem>
<para>
Module documentation should be declared with
<literal>meta.doc</literal>.
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
Ensure that the module respect other modules functionality.
</para>
<itemizedlist>
<listitem>
<para>
For example, enabling a module should not open firewall ports by
default.
</para>
</listitem>
</itemizedlist>
</listitem>
</itemizedlist>
<itemizedlist>
<listitem><para>Add labels to the pull-request. (Requires commit
rights)</para>
<itemizedlist>
<listitem><para><literal>8.has: module (new)</literal> and any topic label
that fit the module.</para></listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that the module tests, if any, are
succeeding.</para></listitem>
<listitem><para>Ensure that the introduced options are correct.</para>
<itemizedlist>
<listitem><para>Type should be appropriate (string related types differs
in their merging capabilities, <literal>optionSet</literal> and
<literal>string</literal> types are deprecated).</para></listitem>
<listitem><para>Description, default and example should be
provided.</para></listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that module <literal>meta</literal> field is
present</para>
<itemizedlist>
<listitem><para>Maintainers should be declared in
<literal>meta.maintainers</literal>.</para></listitem>
<listitem><para>Module documentation should be declared with
<literal>meta.doc</literal>.</para></listitem>
</itemizedlist>
</listitem>
<listitem><para>Ensure that the module respect other modules
functionality.</para>
<itemizedlist>
<listitem><para>For example, enabling a module should not open firewall
ports by default.</para></listitem>
</itemizedlist>
</listitem>
</itemizedlist>
<example><title>Sample template for a new module review</title>
<example>
<title>Sample template for a new module review</title>
<screen>
##### Reviewed points
@@ -348,32 +558,41 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
##### Comments
</screen></example>
</section>
</screen>
</example>
</section>
<section>
<title>Other submissions</title>
<section><title>Other submissions</title>
<para>
Other type of submissions requires different reviewing steps.
</para>
<para>Other type of submissions requires different reviewing steps.</para>
<para>
If you consider having enough knowledge and experience in a topic and would
like to be a long-term reviewer for related submissions, please contact the
current reviewers for that topic. They will give you information about the
reviewing process. The main reviewers for a topic can be hard to find as
there is no list, but checking past pull-requests to see who reviewed or
git-blaming the code to see who committed to that topic can give some hints.
</para>
<para>If you consider having enough knowledge and experience in a topic and
would like to be a long-term reviewer for related submissions, please contact
the current reviewers for that topic. They will give you information about the
reviewing process.
The main reviewers for a topic can be hard to find as there is no list, but
checking past pull-requests to see who reviewed or git-blaming the code to see
who committed to that topic can give some hints.</para>
<para>
Container system, boot system and library changes are some examples of the
pull requests fitting this category.
</para>
</section>
<section>
<title>Merging pull-requests</title>
<para>Container system, boot system and library changes are some examples of the
pull requests fitting this category.</para>
<para>
It is possible for community members that have enough knowledge and
experience on a special topic to contribute by merging pull requests.
</para>
</section>
<section><title>Merging pull-requests</title>
<para>It is possible for community members that have enough knowledge and
experience on a special topic to contribute by merging pull requests.</para>
<para>TODO: add the procedure to request merging rights.</para>
<para>
TODO: add the procedure to request merging rights.
</para>
<!--
The following paragraph about how to deal with unactive contributors is just a
@@ -384,10 +603,11 @@ policy.
three months will have their commit rights revoked.</para>
-->
<para>In a case a contributor leaves definitively the Nix community, he should
create an issue or notify the mailing list with references of packages and
modules he maintains so the maintainership can be taken over by other
contributors.</para>
</section>
<para>
In a case a contributor leaves definitively the Nix community, he should
create an issue or notify the mailing list with references of packages and
modules he maintains so the maintainership can be taken over by other
contributors.
</para>
</section>
</chapter>

5
doc/shell.nix Normal file
View File

@@ -0,0 +1,5 @@
{ pkgs ? import ../. {} }:
(import ./default.nix).overrideAttrs (x: {
buildInputs = x.buildInputs ++ [ pkgs.xmloscopy pkgs.ruby ];
})

View File

@@ -4,6 +4,8 @@ author: zimbatm
date: 2017-10-30
---
# mkShell
pkgs.mkShell is a special kind of derivation that is only useful when using
it combined with nix-shell. It will in fact fail to instantiate when invoked
with nix-build.

File diff suppressed because it is too large Load Diff

View File

@@ -29,8 +29,8 @@ h2 /* chapters, appendices, subtitle */
}
/* Extra space between chapters, appendices. */
div.chapter > div.titlepage h2, div.appendix > div.titlepage h2
{
div.chapter > div.titlepage h2, div.appendix > div.titlepage h2
{
margin-top: 1.5em;
}
@@ -104,7 +104,7 @@ pre.screen, pre.programlisting
padding: 3px 3px;
margin-left: 1.5em;
margin-right: 1.5em;
color: #600000;
background: #f4f4f8;
font-family: monospace;
border-radius: 0.4em;
@@ -118,7 +118,6 @@ div.example pre.programlisting
margin: 0 0 0 0;
}
/***************************************************************************
Notes, warnings etc:
***************************************************************************/
@@ -172,7 +171,7 @@ div.navfooter *
/***************************************************************************
Links colors and highlighting:
Links colors and highlighting:
***************************************************************************/
a { text-decoration: none; }
@@ -209,7 +208,7 @@ tt, code
.term
{
font-weight: bold;
}
div.variablelist dd p, div.glosslist dd p
@@ -249,7 +248,24 @@ table
box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
}
table.simplelist
{
text-align: left;
color: #005aa0;
border: 0;
padding: 5px;
background: #fffff5;
font-weight: normal;
font-style: italic;
box-shadow: none;
margin-bottom: 1em;
}
div.navheader table, div.navfooter table {
box-shadow: none;
}
div.affiliation
{
font-style: italic;
}
}

View File

@@ -1,447 +1,513 @@
<chapter xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink"
xml:id="chap-submitting-changes">
<title>Submitting changes</title>
<section>
<title>Making patches</title>
<title>Submitting changes</title>
<section>
<title>Making patches</title>
<itemizedlist>
<listitem>
<para>Read <link xlink:href="https://nixos.org/nixpkgs/manual/">Manual (How to write packages for Nix)</link>.</para>
</listitem>
<listitem>
<para>Fork the repository on GitHub.</para>
</listitem>
<listitem>
<para>Create a branch for your future fix.
<itemizedlist>
<listitem>
<para>You can make branch from a commit of your local <command>nixos-version</command>. That will help you to avoid additional local compilations. Because you will receive packages from binary cache.
<itemizedlist>
<listitem>
<para>For example: <command>nixos-version</command> returns <command>15.05.git.0998212 (Dingo)</command>. So you can do:</para>
</listitem>
</itemizedlist>
<itemizedlist>
<listitem>
<para>
Read <link xlink:href="https://nixos.org/nixpkgs/manual/">Manual (How to
write packages for Nix)</link>.
</para>
</listitem>
<listitem>
<para>
Fork the repository on GitHub.
</para>
</listitem>
<listitem>
<para>
Create a branch for your future fix.
<itemizedlist>
<listitem>
<para>
You can make branch from a commit of your local
<command>nixos-version</command>. That will help you to avoid
additional local compilations. Because you will receive packages from
binary cache.
<itemizedlist>
<listitem>
<para>
For example: <command>nixos-version</command> returns
<command>15.05.git.0998212 (Dingo)</command>. So you can do:
</para>
</listitem>
</itemizedlist>
<screen>
$ git checkout 0998212
$ git checkout -b 'fix/pkg-name-update'
</screen>
</para>
</listitem>
<listitem>
<para>Please avoid working directly on the <command>master</command> branch.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>Make commits of logical units.
<itemizedlist>
<listitem>
<para>If you removed pkgs, made some major NixOS changes etc., write about them in <command>nixos/doc/manual/release-notes/rl-unstable.xml</command>.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>Check for unnecessary whitespace with <command>git diff --check</command> before committing.</para>
</listitem>
<listitem>
<para>Format the commit in a following way:</para>
</para>
</listitem>
<listitem>
<para>
Please avoid working directly on the <command>master</command> branch.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
Make commits of logical units.
<itemizedlist>
<listitem>
<para>
If you removed pkgs, made some major NixOS changes etc., write about
them in
<command>nixos/doc/manual/release-notes/rl-unstable.xml</command>.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
Check for unnecessary whitespace with <command>git diff --check</command>
before committing.
</para>
</listitem>
<listitem>
<para>
Format the commit in a following way:
</para>
<programlisting>
(pkg-name | nixos/&lt;module>): (from -> to | init at version | refactor | etc)
Additional information.
</programlisting>
<itemizedlist>
<listitem>
<para>
Examples:
<itemizedlist>
<listitem>
<para>
<command>nginx: init at 2.0.1</command>
</para>
</listitem>
<listitem>
<para>
<command>firefox: 54.0.1 -> 55.0</command>
</para>
</listitem>
<listitem>
<para>
<command>nixos/hydra: add bazBaz option</command>
</para>
</listitem>
<listitem>
<para>
<command>nixos/nginx: refactor config generation</command>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
Test your changes. If you work with
<itemizedlist>
<listitem>
<para>
nixpkgs:
<itemizedlist>
<listitem>
<para>
update pkg ->
<itemizedlist>
<listitem>
<para>
<command>nix-env -i pkg-name -f &lt;path to your local nixpkgs
folder&gt;</command>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
add pkg ->
<itemizedlist>
<listitem>
<para>
Make sure it's in
<command>pkgs/top-level/all-packages.nix</command>
</para>
</listitem>
<listitem>
<para>
<command>nix-env -i pkg-name -f &lt;path to your local nixpkgs
folder&gt;</command>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
<emphasis>If you don't want to install pkg in you
profile</emphasis>.
<itemizedlist>
<listitem>
<para>
<command>nix-build -A pkg-attribute-name &lt;path to your local
nixpkgs folder&gt;/default.nix</command> and check results in the
folder <command>result</command>. It will appear in the same
directory where you did <command>nix-build</command>.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
If you did <command>nix-env -i pkg-name</command> you can do
<command>nix-env -e pkg-name</command> to uninstall it from your
system.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
NixOS and its modules:
<itemizedlist>
<listitem>
<para>
You can add new module to your NixOS configuration file (usually
it's <command>/etc/nixos/configuration.nix</command>). And do
<command>sudo nixos-rebuild test -I nixpkgs=&lt;path to your local
nixpkgs folder&gt; --fast</command>.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
If you have commits <command>pkg-name: oh, forgot to insert
whitespace</command>: squash commits in this case. Use <command>git rebase
-i</command>.
</para>
</listitem>
<listitem>
<para>
Rebase you branch against current <command>master</command>.
</para>
</listitem>
</itemizedlist>
</section>
<section>
<title>Submitting changes</title>
<itemizedlist>
<listitem>
<para>Examples:
<itemizedlist>
<listitem>
<para>
<command>nginx: init at 2.0.1</command>
</para>
</listitem>
<listitem>
<para>
<command>firefox: 54.0.1 -> 55.0</command>
</para>
</listitem>
<listitem>
<para>
<command>nixos/hydra: add bazBaz option</command>
</para>
</listitem>
<listitem>
<para>
<command>nixos/nginx: refactor config generation</command>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>Test your changes. If you work with
<itemizedlist>
<listitem>
<para>nixpkgs:
<itemizedlist>
<listitem>
<para>update pkg ->
<itemizedlist>
<listitem>
<para>
<command>nix-env -i pkg-name -f &lt;path to your local nixpkgs folder&gt;</command>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>add pkg ->
<itemizedlist>
<listitem>
<para>Make sure it's in <command>pkgs/top-level/all-packages.nix</command>
</para>
</listitem>
<listitem>
<para>
<command>nix-env -i pkg-name -f &lt;path to your local nixpkgs folder&gt;</command>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
<emphasis>If you don't want to install pkg in you profile</emphasis>.
<itemizedlist>
<listitem>
<para>
<command>nix-build -A pkg-attribute-name &lt;path to your local nixpkgs folder&gt;/default.nix</command> and check results in the folder <command>result</command>. It will appear in the same directory where you did <command>nix-build</command>.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>If you did <command>nix-env -i pkg-name</command> you can do <command>nix-env -e pkg-name</command> to uninstall it from your system.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>NixOS and its modules:
<itemizedlist>
<listitem>
<para>You can add new module to your NixOS configuration file (usually it's <command>/etc/nixos/configuration.nix</command>).
And do <command>sudo nixos-rebuild test -I nixpkgs=&lt;path to your local nixpkgs folder&gt; --fast</command>.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>If you have commits <command>pkg-name: oh, forgot to insert whitespace</command>: squash commits in this case. Use <command>git rebase -i</command>.</para>
</listitem>
<listitem>
<para>Rebase you branch against current <command>master</command>.</para>
</listitem>
</itemizedlist>
</section>
<section>
<title>Submitting changes</title>
<itemizedlist>
<listitem>
<para>Push your changes to your fork of nixpkgs.</para>
</listitem>
<listitem>
<para>Create pull request:
<itemizedlist>
<listitem>
<para>Write the title in format <command>(pkg-name | nixos/&lt;module>): improvement</command>.
<itemizedlist>
<listitem>
<para>If you update the pkg, write versions <command>from -> to</command>.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>Write in comment if you have tested your patch. Do not rely much on <command>TravisCI</command>.</para>
</listitem>
<listitem>
<para>If you make an improvement, write about your motivation.</para>
</listitem>
<listitem>
<para>Notify maintainers of the package. For example add to the message: <command>cc @jagajaga @domenkozar</command>.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</section>
<section>
<itemizedlist>
<listitem>
<para>
Push your changes to your fork of nixpkgs.
</para>
</listitem>
<listitem>
<para>
Create pull request:
<itemizedlist>
<listitem>
<para>
Write the title in format <command>(pkg-name | nixos/&lt;module>):
improvement</command>.
<itemizedlist>
<listitem>
<para>
If you update the pkg, write versions <command>from -> to</command>.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
<listitem>
<para>
Write in comment if you have tested your patch. Do not rely much on
<command>TravisCI</command>.
</para>
</listitem>
<listitem>
<para>
If you make an improvement, write about your motivation.
</para>
</listitem>
<listitem>
<para>
Notify maintainers of the package. For example add to the message:
<command>cc @jagajaga @domenkozar</command>.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</section>
<section>
<title>Pull Request Template</title>
<para>
The pull request template helps determine what steps have been made for a
contribution so far, and will help guide maintainers on the status of a
change. The motivation section of the PR should include any extra details
the title does not address and link any existing issues related to the pull
request.
The pull request template helps determine what steps have been made for a
contribution so far, and will help guide maintainers on the status of a
change. The motivation section of the PR should include any extra details
the title does not address and link any existing issues related to the pull
request.
</para>
<para>When a PR is created, it will be pre-populated with some checkboxes detailed below:
<para>
When a PR is created, it will be pre-populated with some checkboxes detailed
below:
</para>
<section>
<title>Tested using sandboxing</title>
<para>
When sandbox builds are enabled, Nix will setup an isolated environment
for each build process. It is used to remove further hidden dependencies
set by the build environment to improve reproducibility. This includes
access to the network during the build outside of
<function>fetch*</function> functions and files outside the Nix store.
Depending on the operating system access to other resources are blocked
as well (ex. inter process communication is isolated on Linux); see <link
<title>Tested using sandboxing</title>
<para>
When sandbox builds are enabled, Nix will setup an isolated environment for
each build process. It is used to remove further hidden dependencies set by
the build environment to improve reproducibility. This includes access to
the network during the build outside of <function>fetch*</function>
functions and files outside the Nix store. Depending on the operating
system access to other resources are blocked as well (ex. inter process
communication is isolated on Linux); see
<link
xlink:href="https://nixos.org/nix/manual/#description-45">build-use-sandbox</link>
in Nix manual for details.
</para>
<para>
Sandboxing is not enabled by default in Nix due to a small performance
hit on each build. In pull requests for <link
xlink:href="https://github.com/NixOS/nixpkgs/">nixpkgs</link> people
are asked to test builds with sandboxing enabled (see <literal>Tested
using sandboxing</literal> in the pull request template) because
in<link
in Nix manual for details.
</para>
<para>
Sandboxing is not enabled by default in Nix due to a small performance hit
on each build. In pull requests for
<link
xlink:href="https://github.com/NixOS/nixpkgs/">nixpkgs</link>
people are asked to test builds with sandboxing enabled (see
<literal>Tested using sandboxing</literal> in the pull request template)
because
in<link
xlink:href="https://nixos.org/hydra/">https://nixos.org/hydra/</link>
sandboxing is also used.
</para>
<para>
Depending if you use NixOS or other platforms you can use one of the
following methods to enable sandboxing <emphasis role="bold">before</emphasis> building the package:
<itemizedlist>
<listitem>
<para>
<emphasis role="bold">Globally enable sandboxing on NixOS</emphasis>:
add the following to
<filename>configuration.nix</filename>
<screen>nix.useSandbox = true;</screen>
</para>
</listitem>
<listitem>
<para>
<emphasis role="bold">Globally enable sandboxing on non-NixOS platforms</emphasis>:
add the following to: <filename>/etc/nix/nix.conf</filename>
<screen>build-use-sandbox = true</screen>
</para>
</listitem>
</itemizedlist>
</para>
sandboxing is also used.
</para>
<para>
Depending if you use NixOS or other platforms you can use one of the
following methods to enable sandboxing
<emphasis role="bold">before</emphasis> building the package:
<itemizedlist>
<listitem>
<para>
<emphasis role="bold">Globally enable sandboxing on NixOS</emphasis>:
add the following to <filename>configuration.nix</filename>
<screen>nix.useSandbox = true;</screen>
</para>
</listitem>
<listitem>
<para>
<emphasis role="bold">Globally enable sandboxing on non-NixOS
platforms</emphasis>: add the following to:
<filename>/etc/nix/nix.conf</filename>
<screen>build-use-sandbox = true</screen>
</para>
</listitem>
</itemizedlist>
</para>
</section>
<section>
<title>Built on platform(s)</title>
<para>
Many Nix packages are designed to run on multiple
platforms. As such, it's important to let the maintainer know which
platforms your changes have been tested on. It's not always practical to
test a change on all platforms, and is not required for a pull request to
be merged. Only check the systems you tested the build on in this
section.
</para>
<title>Built on platform(s)</title>
<para>
Many Nix packages are designed to run on multiple platforms. As such, it's
important to let the maintainer know which platforms your changes have been
tested on. It's not always practical to test a change on all platforms, and
is not required for a pull request to be merged. Only check the systems you
tested the build on in this section.
</para>
</section>
<section>
<title>Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)</title>
<para>
Packages with automated tests are much more likely to be merged in a
timely fashion because it doesn't require as much manual testing by the
maintainer to verify the functionality of the package. If there are
existing tests for the package, they should be run to verify your changes
do not break the tests. Tests only apply to packages with NixOS modules
defined and can only be run on Linux. For more details on writing and
running tests, see the <link
<title>Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)</title>
<para>
Packages with automated tests are much more likely to be merged in a timely
fashion because it doesn't require as much manual testing by the maintainer
to verify the functionality of the package. If there are existing tests for
the package, they should be run to verify your changes do not break the
tests. Tests only apply to packages with NixOS modules defined and can only
be run on Linux. For more details on writing and running tests, see the
<link
xlink:href="https://nixos.org/nixos/manual/index.html#sec-nixos-tests">section
in the NixOS manual</link>.
</para>
in the NixOS manual</link>.
</para>
</section>
<section>
<title>Tested compilation of all pkgs that depend on this change using <command>nox-review</command></title>
<para>
If you are updating a package's version, you can use nox to make sure all
packages that depend on the updated package still compile correctly. This
can be done using the nox utility. The <command>nox-review</command>
utility can look for and build all dependencies either based on
uncommited changes with the <literal>wip</literal> option or specifying a
github pull request number.
</para>
<para>
review uncommitted changes:
<screen>nix-shell -p nox --run nox-review wip</screen>
</para>
<para>
review changes from pull request number 12345:
<screen>nix-shell -p nox --run nox-review pr 12345</screen>
</para>
<title>Tested compilation of all pkgs that depend on this change using <command>nox-review</command></title>
<para>
If you are updating a package's version, you can use nox to make sure all
packages that depend on the updated package still compile correctly. This
can be done using the nox utility. The <command>nox-review</command>
utility can look for and build all dependencies either based on uncommited
changes with the <literal>wip</literal> option or specifying a github pull
request number.
</para>
<para>
review uncommitted changes:
<screen>nix-shell -p nox --run nox-review wip</screen>
</para>
<para>
review changes from pull request number 12345:
<screen>nix-shell -p nox --run nox-review pr 12345</screen>
</para>
</section>
<section>
<title>Tested execution of all binary files (usually in <filename>./result/bin/</filename>)</title>
<para>
It's important to test any executables generated by a build when you
change or create a package in nixpkgs. This can be done by looking in
<filename>./result/bin</filename> and running any files in there, or at a
minimum, the main executable for the package. For example, if you make a change
to <package>texlive</package>, you probably would only check the binaries
associated with the change you made rather than testing all of them.
</para>
<title>Tested execution of all binary files (usually in <filename>./result/bin/</filename>)</title>
<para>
It's important to test any executables generated by a build when you change
or create a package in nixpkgs. This can be done by looking in
<filename>./result/bin</filename> and running any files in there, or at a
minimum, the main executable for the package. For example, if you make a
change to <package>texlive</package>, you probably would only check the
binaries associated with the change you made rather than testing all of
them.
</para>
</section>
<section>
<title>Meets nixpkgs contribution standards</title>
<para>
The last checkbox is fits <link
<title>Meets nixpkgs contribution standards</title>
<para>
The last checkbox is fits
<link
xlink:href="https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md">CONTRIBUTING.md</link>.
The contributing document has detailed information on standards the Nix
community has for commit messages, reviews, licensing of contributions
you make to the project, etc... Everyone should read and understand the
standards the community has for contributing before submitting a pull
request.
</para>
The contributing document has detailed information on standards the Nix
community has for commit messages, reviews, licensing of contributions you
make to the project, etc... Everyone should read and understand the
standards the community has for contributing before submitting a pull
request.
</para>
</section>
</section>
<section>
<title>Hotfixing pull requests</title>
<itemizedlist>
<listitem>
<para>Make the appropriate changes in you branch.</para>
</listitem>
<listitem>
<para>Don't create additional commits, do
<itemizedlist>
<listitem>
<para><command>git rebase -i</command></para>
</listitem>
<listitem>
<para>
<command>git push --force</command> to your branch.</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</section>
<section>
<title>Commit policy</title>
<itemizedlist>
<listitem>
<para>Commits must be sufficiently tested before being merged, both for the master and staging branches.</para>
</listitem>
<listitem>
<para>Hydra builds for master and staging should not be used as testing platform, it's a build farm for changes that have been already tested.</para>
</listitem>
<listitem>
<para>When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people's installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra.</para>
</listitem>
</itemizedlist>
<section>
<title>Master branch</title>
</section>
<section>
<title>Hotfixing pull requests</title>
<itemizedlist>
<listitem>
<para>
It should only see non-breaking commits that do not cause mass rebuilds.
</para>
</listitem>
<listitem>
<para>
Make the appropriate changes in you branch.
</para>
</listitem>
<listitem>
<para>
Don't create additional commits, do
<itemizedlist>
<listitem>
<para>
<command>git rebase -i</command>
</para>
</listitem>
<listitem>
<para>
<command>git push --force</command> to your branch.
</para>
</listitem>
</itemizedlist>
</para>
</listitem>
</itemizedlist>
</section>
<section>
<title>Staging branch</title>
</section>
<section>
<title>Commit policy</title>
<itemizedlist>
<listitem>
<para>
It's only for non-breaking mass-rebuild commits. That means it's not to
be used for testing, and changes must have been well tested already.
<link xlink:href="http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read policy here</link>.
</para>
</listitem>
<listitem>
<para>
If the branch is already in a broken state, please refrain from adding
extra new breakages. Stabilize it for a few days, merge into master,
then resume development on staging.
<link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep an eye on the staging evaluations here</link>.
If any fixes for staging happen to be already in master, then master can
be merged into staging.
</para>
</listitem>
<listitem>
<para>
Commits must be sufficiently tested before being merged, both for the
master and staging branches.
</para>
</listitem>
<listitem>
<para>
Hydra builds for master and staging should not be used as testing
platform, it's a build farm for changes that have been already tested.
</para>
</listitem>
<listitem>
<para>
When changing the bootloader installation process, extra care must be
taken. Grub installations cannot be rolled back, hence changes may break
people's installations forever. For any non-trivial change to the
bootloader please file a PR asking for review, especially from @edolstra.
</para>
</listitem>
</itemizedlist>
</section>
<section>
<title>Stable release branches</title>
<section>
<title>Master branch</title>
<itemizedlist>
<itemizedlist>
<listitem>
<para>
If you're cherry-picking a commit to a stable release branch, always use
<command>git cherry-pick -xe</command> and ensure the message contains a
clear description about why this needs to be included in the stable
branch.
</para>
<para>An example of a cherry-picked commit would look like this:</para>
<screen>
<para>
It should only see non-breaking commits that do not cause mass rebuilds.
</para>
</listitem>
</itemizedlist>
</section>
<section>
<title>Staging branch</title>
<itemizedlist>
<listitem>
<para>
It's only for non-breaking mass-rebuild commits. That means it's not to
be used for testing, and changes must have been well tested already.
<link xlink:href="https://web.archive.org/web/20160528180406/http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read
policy here</link>.
</para>
</listitem>
<listitem>
<para>
If the branch is already in a broken state, please refrain from adding
extra new breakages. Stabilize it for a few days, merge into master, then
resume development on staging.
<link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep
an eye on the staging evaluations here</link>. If any fixes for staging
happen to be already in master, then master can be merged into staging.
</para>
</listitem>
</itemizedlist>
</section>
<section>
<title>Stable release branches</title>
<itemizedlist>
<listitem>
<para>
If you're cherry-picking a commit to a stable release branch, always use
<command>git cherry-pick -xe</command> and ensure the message contains a
clear description about why this needs to be included in the stable
branch.
</para>
<para>
An example of a cherry-picked commit would look like this:
</para>
<screen>
nixos: Refactor the world.
The original commit message describing the reason why the world was torn apart.
@@ -451,9 +517,7 @@ Reason: I just had a gut feeling that this would also be wanted by people from
the stone age.
</screen>
</listitem>
</itemizedlist>
</section>
</section>
</itemizedlist>
</section>
</section>
</chapter>

View File

@@ -21,7 +21,7 @@ let
# packaging
customisation = callLibs ./customisation.nix;
maintainers = import ./maintainers-list.nix;
maintainers = import ../maintainers/maintainer-list.nix;
meta = callLibs ./meta.nix;
sources = callLibs ./sources.nix;
versions = callLibs ./versions.nix;

View File

@@ -660,7 +660,7 @@ rec {
doRename = { from, to, visible, warn, use }:
let
toOf = attrByPath to
(abort "Renaming error: option `${showOption to}' does not exists.");
(abort "Renaming error: option `${showOption to}' does not exist.");
in
{ config, options, ... }:
{ options = setAttrByPath from (mkOption {

View File

@@ -4,8 +4,8 @@ let
inherit (lib.systems.inspect) patterns;
in rec {
inherit (lib.systems.doubles) all mesaPlatforms;
none = [];
all = [ {} ]; # `{}` matches anything
none = [];
arm = [ patterns.isAarch32 ];
aarch64 = [ patterns.isAarch64 ];
@@ -24,4 +24,7 @@ in rec {
netbsd = [ patterns.isNetBSD ];
openbsd = [ patterns.isOpenBSD ];
unix = patterns.isUnix; # Actually a list
windows = [ patterns.isWindows ];
inherit (lib.systems.doubles) mesaPlatforms;
}

View File

@@ -138,6 +138,12 @@ checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix
checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix
checkConfigError 'The option value .* in .* is not.*string or signed integer.*' config.value ./declare-coerced-value.nix ./define-value-list.nix
# Check loaOf with long list.
checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.nix
# Check loaOf with many merges of lists.
checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix
cat <<EOF
====== module tests ======
$pass Pass

View File

@@ -0,0 +1,19 @@
{ config, lib, ... }:
{
options = {
loaOfInt = lib.mkOption {
type = lib.types.loaOf lib.types.int;
};
result = lib.mkOption {
type = lib.types.str;
};
};
config = {
loaOfInt = [ 1 2 3 4 5 6 7 8 9 10 ];
result = toString (lib.attrValues config.loaOfInt);
};
}

View File

@@ -0,0 +1,19 @@
{ config, lib, ... }:
{
options = {
loaOfInt = lib.mkOption {
type = lib.types.loaOf lib.types.int;
};
result = lib.mkOption {
type = lib.types.str;
};
};
config = {
loaOfInt = lib.mkMerge (map lib.singleton [ 1 2 3 4 5 6 7 8 9 10 ]);
result = toString (lib.attrValues config.loaOfInt);
};
}

View File

@@ -280,15 +280,26 @@ rec {
# List or attribute set of ...
loaOf = elemType:
let
convertIfList = defIdx: def:
convertAllLists = defs:
let
padWidth = stringLength (toString (length defs));
unnamedPrefix = i: "unnamed-" + fixedWidthNumber padWidth i + ".";
in
imap1 (i: convertIfList (unnamedPrefix i)) defs;
convertIfList = unnamedPrefix: def:
if isList def.value then
{ inherit (def) file;
value = listToAttrs (
imap1 (elemIdx: elem:
{ name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}";
value = elem;
}) def.value);
}
let
padWidth = stringLength (toString (length def.value));
unnamed = i: unnamedPrefix + fixedWidthNumber padWidth i;
in
{ inherit (def) file;
value = listToAttrs (
imap1 (elemIdx: elem:
{ name = elem.name or (unnamed elemIdx);
value = elem;
}) def.value);
}
else
def;
listOnly = listOf elemType;
@@ -297,7 +308,7 @@ rec {
name = "loaOf";
description = "list or attribute set of ${elemType.description}s";
check = x: isList x || isAttrs x;
merge = loc: defs: attrOnly.merge loc (imap1 convertIfList defs);
merge = loc: defs: attrOnly.merge loc (convertAllLists defs);
getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]);
getSubModules = elemType.getSubModules;
substSubModules = m: loaOf (elemType.substSubModules m);

View File

@@ -18,6 +18,11 @@
for an example on how to work with this data.
*/
{
"1000101" = {
email = "jan.hrnko@satoshilabs.com";
github = "1000101";
name = "Jan Hrnko";
};
Adjective-Object = {
email = "mhuan13@gmail.com";
github = "Adjective-Object";
@@ -68,6 +73,11 @@
github = "FireyFly";
name = "Jonas Höglund";
};
Fresheyeball = {
email = "fresheyeball@gmail.com";
github = "fresheyeball";
name = "Isaac Shapira";
};
Gonzih = {
email = "gonzih@gmail.com";
github = "Gonzih";
@@ -176,6 +186,11 @@
github = "abigailbuccaneer";
name = "Abigail Bunyan";
};
aborsu = {
email = "a.borsu@gmail.com";
github = "aborsu";
name = "Augustin Borsu";
};
aboseley = {
email = "adam.boseley@gmail.com";
github = "aboseley";
@@ -314,6 +329,11 @@
github = "amiloradovsky";
name = "Andrew Miloradovsky";
};
aminechikhaoui = {
email = "amine.chikhaoui91@gmail.com";
github = "AmineChikhaoui";
name = "Amine Chikhaoui";
};
amorsillo = {
email = "andrew.morsillo@gmail.com";
github = "AndrewMorsillo";
@@ -543,6 +563,11 @@
github = "bergey";
name = "Daniel Bergey";
};
bfortz = {
email = "bernard.fortz@gmail.com";
github = "bfortz";
name = "Bernard Fortz";
};
bhipple = {
email = "bhipple@protonmail.com";
github = "bhipple";
@@ -555,7 +580,6 @@
};
bjg = {
email = "bjg@gnu.org";
github = "civodul";
name = "Brian Gough";
};
bjornfor = {
@@ -632,11 +656,6 @@
github = "calbrecht";
name = "Christian Albrecht";
};
calrama = {
email = "moritz@ucworks.org";
github = "MoritzMaxeiner";
name = "Moritz Maxeiner";
};
calvertvl = {
email = "calvertvl@gmail.com";
github = "calvertvl";
@@ -1524,6 +1543,11 @@
github = "hrdinka";
name = "Christoph Hrdinka";
};
hschaeidt = {
email = "he.schaeidt@gmail.com";
github = "hschaeidt";
name = "Hendrik Schaeidt";
};
htr = {
email = "hugo@linux.com";
github = "htr";
@@ -1628,6 +1652,11 @@
github = "jbedo";
name = "Justin Bedő";
};
jbgi = {
email = "jb@giraudeau.info";
github = "jbgi";
name = "Jean-Baptiste Giraudeau";
};
jcumming = {
email = "jack@mudshark.org";
name = "Jack Cummings";
@@ -1663,7 +1692,7 @@
name = "Johannes Frankenau";
};
jgeerds = {
email = "jascha@jgeerds.name";
email = "jascha@geerds.org";
github = "jgeerds";
name = "Jascha Geerds";
};
@@ -2013,6 +2042,11 @@
github = "lo1tuma";
name = "Mathias Schreck";
};
lopsided98 = {
email = "benwolsieffer@gmail.com";
github = "lopsided98";
name = "Ben Wolsieffer";
};
loskutov = {
email = "ignat.loskutov@gmail.com";
github = "loskutov";
@@ -2230,6 +2264,11 @@
github = "meisternu";
name = "Matt Miemiec";
};
melsigl = {
email = "melanie.bianca.sigl@gmail.com";
github = "melsigl";
name = "Melanie B. Sigl";
};
metabar = {
email = "softs@metabarcoding.org";
name = "Celine Mercier";
@@ -3155,6 +3194,11 @@
github = "sellout";
name = "Greg Pfeil";
};
sengaya = {
email = "tlo@sengaya.de";
github = "sengaya";
name = "Thilo Uttendorfer";
};
sepi = {
email = "raffael@mancini.lu";
github = "sepi";
@@ -3418,6 +3462,11 @@
github = "tavyc";
name = "Octavian Cerna";
};
tazjin = {
email = "mail@tazj.in";
github = "tazjin";
name = "Vincent Ambo";
};
teh = {
email = "tehunger@gmail.com";
github = "teh";

View File

@@ -1,5 +1,5 @@
#! /usr/bin/env nix-shell
#! nix-shell -i python3 -p 'python3.withPackages(ps: with ps; [ packaging requests toolz ])' -p git
#! nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ packaging requests toolz ])" -p git
"""
Update a Python package expression by passing in the `.nix` file, or the directory containing it.
@@ -358,4 +358,4 @@ def main():
if __name__ == '__main__':
main()
main()

2
nixos/doc/manual/.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
generated
manual-combined.xml

29
nixos/doc/manual/Makefile Normal file
View File

@@ -0,0 +1,29 @@
.PHONY: all
all: manual-combined.xml format
.PHONY: debug
debug: generated manual-combined.xml
manual-combined.xml: generated *.xml
rm -f ./manual-combined.xml
nix-shell --packages xmloscopy \
--run "xmloscopy --docbook5 ./manual.xml ./manual-combined.xml"
.PHONY: format
format:
find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
xmlformat --config-file "../xmlformat.conf" -i {}
.PHONY: fix-misc-xml
fix-misc-xml:
find . -iname '*.xml' -type f \
-exec ../varlistentry-fixer.rb {} ';'
.PHONY: clean
clean:
rm -f manual-combined.xml generated
generated: ./options-to-docbook.xsl
nix-build ../../release.nix \
--attr manualGeneratedSources.x86_64-linux \
--out-link ./generated

View File

@@ -3,63 +3,88 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-boot-problems">
<title>Boot Problems</title>
<title>Boot Problems</title>
<para>
If NixOS fails to boot, there are a number of kernel command line parameters
that may help you to identify or fix the issue. You can add these parameters
in the GRUB boot menu by pressing “e” to modify the selected boot entry
and editing the line starting with <literal>linux</literal>. The following
are some useful kernel command line parameters that are recognised by the
NixOS boot scripts or by systemd:
<variablelist>
<varlistentry>
<term>
<literal>boot.shell_on_fail</literal>
</term>
<listitem>
<para>
Start a root shell if something goes wrong in stage 1 of the boot process
(the initial ramdisk). This is disabled by default because there is no
authentication for the root shell.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>boot.debug1</literal>
</term>
<listitem>
<para>
Start an interactive shell in stage 1 before anything useful has been
done. That is, no modules have been loaded and no file systems have been
mounted, except for <filename>/proc</filename> and
<filename>/sys</filename>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>boot.trace</literal>
</term>
<listitem>
<para>
Print every shell command executed by the stage 1 and 2 boot scripts.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>single</literal>
</term>
<listitem>
<para>
Boot into rescue mode (a.k.a. single user mode). This will cause systemd
to start nothing but the unit <literal>rescue.target</literal>, which
runs <command>sulogin</command> to prompt for the root password and start
a root login shell. Exiting the shell causes the system to continue with
the normal boot process.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<literal>systemd.log_level=debug systemd.log_target=console</literal>
</term>
<listitem>
<para>
Make systemd very verbose and send log messages to the console instead of
the journal.
</para>
</listitem>
</varlistentry>
</variablelist>
For more parameters recognised by systemd, see <citerefentry>
<refentrytitle>systemd</refentrytitle>
<manvolnum>1</manvolnum></citerefentry>.
</para>
<para>If NixOS fails to boot, there are a number of kernel command
line parameters that may help you to identify or fix the issue. You
can add these parameters in the GRUB boot menu by pressing “e” to
modify the selected boot entry and editing the line starting with
<literal>linux</literal>. The following are some useful kernel command
line parameters that are recognised by the NixOS boot scripts or by
systemd:
<variablelist>
<varlistentry><term><literal>boot.shell_on_fail</literal></term>
<listitem><para>Start a root shell if something goes wrong in
stage 1 of the boot process (the initial ramdisk). This is
disabled by default because there is no authentication for the
root shell.</para></listitem>
</varlistentry>
<varlistentry><term><literal>boot.debug1</literal></term>
<listitem><para>Start an interactive shell in stage 1 before
anything useful has been done. That is, no modules have been
loaded and no file systems have been mounted, except for
<filename>/proc</filename> and
<filename>/sys</filename>.</para></listitem>
</varlistentry>
<varlistentry><term><literal>boot.trace</literal></term>
<listitem><para>Print every shell command executed by the stage 1
and 2 boot scripts.</para></listitem>
</varlistentry>
<varlistentry><term><literal>single</literal></term>
<listitem><para>Boot into rescue mode (a.k.a. single user mode).
This will cause systemd to start nothing but the unit
<literal>rescue.target</literal>, which runs
<command>sulogin</command> to prompt for the root password and
start a root login shell. Exiting the shell causes the system to
continue with the normal boot process.</para></listitem>
</varlistentry>
<varlistentry><term><literal>systemd.log_level=debug systemd.log_target=console</literal></term>
<listitem><para>Make systemd very verbose and send log messages to
the console instead of the journal.</para></listitem>
</varlistentry>
</variablelist>
For more parameters recognised by systemd, see
<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
<para>If no login prompts or X11 login screens appear (e.g. due to
hanging dependencies), you can press Alt+ArrowUp. If youre lucky,
this will start rescue mode (described above). (Also note that since
most units have a 90-second timeout before systemd gives up on them,
the <command>agetty</command> login prompts should appear eventually
unless something is very wrong.)</para>
</section>
<para>
If no login prompts or X11 login screens appear (e.g. due to hanging
dependencies), you can press Alt+ArrowUp. If youre lucky, this will start
rescue mode (described above). (Also note that since most units have a
90-second timeout before systemd gives up on them, the
<command>agetty</command> login prompts should appear eventually unless
something is very wrong.)
</para>
</section>

View File

@@ -3,60 +3,51 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-nix-gc">
<title>Cleaning the Nix Store</title>
<para>Nix has a purely functional model, meaning that packages are
never upgraded in place. Instead new versions of packages end up in a
different location in the Nix store (<filename>/nix/store</filename>).
You should periodically run Nixs <emphasis>garbage
collector</emphasis> to remove old, unreferenced packages. This is
easy:
<title>Cleaning the Nix Store</title>
<para>
Nix has a purely functional model, meaning that packages are never upgraded
in place. Instead new versions of packages end up in a different location in
the Nix store (<filename>/nix/store</filename>). You should periodically run
Nixs <emphasis>garbage collector</emphasis> to remove old, unreferenced
packages. This is easy:
<screen>
$ nix-collect-garbage
</screen>
Alternatively, you can use a systemd unit that does the same in the
background:
Alternatively, you can use a systemd unit that does the same in the
background:
<screen>
# systemctl start nix-gc.service
</screen>
You can tell NixOS in <filename>configuration.nix</filename> to run
this unit automatically at certain points in time, for instance, every
night at 03:15:
You can tell NixOS in <filename>configuration.nix</filename> to run this unit
automatically at certain points in time, for instance, every night at 03:15:
<programlisting>
nix.gc.automatic = true;
nix.gc.dates = "03:15";
</programlisting>
</para>
<para>The commands above do not remove garbage collector roots, such
as old system configurations. Thus they do not remove the ability to
roll back to previous configurations. The following command deletes
old roots, removing the ability to roll back to them:
</para>
<para>
The commands above do not remove garbage collector roots, such as old system
configurations. Thus they do not remove the ability to roll back to previous
configurations. The following command deletes old roots, removing the ability
to roll back to them:
<screen>
$ nix-collect-garbage -d
</screen>
You can also do this for specific profiles, e.g.
You can also do this for specific profiles, e.g.
<screen>
$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old
</screen>
Note that NixOS system configurations are stored in the profile
<filename>/nix/var/nix/profiles/system</filename>.</para>
<para>Another way to reclaim disk space (often as much as 40% of the
size of the Nix store) is to run Nixs store optimiser, which seeks
out identical files in the store and replaces them with hard links to
a single copy.
Note that NixOS system configurations are stored in the profile
<filename>/nix/var/nix/profiles/system</filename>.
</para>
<para>
Another way to reclaim disk space (often as much as 40% of the size of the
Nix store) is to run Nixs store optimiser, which seeks out identical files
in the store and replaces them with hard links to a single copy.
<screen>
$ nix-store --optimise
</screen>
Since this command needs to read the entire Nix store, it can take
quite a while to finish.</para>
Since this command needs to read the entire Nix store, it can take quite a
while to finish.
</para>
</chapter>

View File

@@ -3,15 +3,13 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-container-networking">
<title>Container Networking</title>
<title>Container Networking</title>
<para>When you create a container using <literal>nixos-container
create</literal>, it gets it own private IPv4 address in the range
<literal>10.233.0.0/16</literal>. You can get the containers IPv4
address as follows:
<para>
When you create a container using <literal>nixos-container create</literal>,
it gets it own private IPv4 address in the range
<literal>10.233.0.0/16</literal>. You can get the containers IPv4 address
as follows:
<screen>
# nixos-container show-ip foo
10.233.4.2
@@ -19,40 +17,39 @@ address as follows:
$ ping -c1 10.233.4.2
64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms
</screen>
</para>
</para>
<para>Networking is implemented using a pair of virtual Ethernet
devices. The network interface in the container is called
<literal>eth0</literal>, while the matching interface in the host is
called <literal>ve-<replaceable>container-name</replaceable></literal>
(e.g., <literal>ve-foo</literal>). The container has its own network
namespace and the <literal>CAP_NET_ADMIN</literal> capability, so it
can perform arbitrary network configuration such as setting up
firewall rules, without affecting or having access to the hosts
network.</para>
<para>By default, containers cannot talk to the outside network. If
you want that, you should set up Network Address Translation (NAT)
rules on the host to rewrite container traffic to use your external
IP address. This can be accomplished using the following configuration
on the host:
<para>
Networking is implemented using a pair of virtual Ethernet devices. The
network interface in the container is called <literal>eth0</literal>, while
the matching interface in the host is called
<literal>ve-<replaceable>container-name</replaceable></literal> (e.g.,
<literal>ve-foo</literal>). The container has its own network namespace and
the <literal>CAP_NET_ADMIN</literal> capability, so it can perform arbitrary
network configuration such as setting up firewall rules, without affecting or
having access to the hosts network.
</para>
<para>
By default, containers cannot talk to the outside network. If you want that,
you should set up Network Address Translation (NAT) rules on the host to
rewrite container traffic to use your external IP address. This can be
accomplished using the following configuration on the host:
<programlisting>
networking.nat.enable = true;
networking.nat.internalInterfaces = ["ve-+"];
networking.nat.externalInterface = "eth0";
</programlisting>
where <literal>eth0</literal> should be replaced with the desired
external interface. Note that <literal>ve-+</literal> is a wildcard
that matches all container interfaces.</para>
<para>If you are using Network Manager, you need to explicitly prevent
it from managing container interfaces:
where <literal>eth0</literal> should be replaced with the desired external
interface. Note that <literal>ve-+</literal> is a wildcard that matches all
container interfaces.
</para>
<para>
If you are using Network Manager, you need to explicitly prevent it from
managing container interfaces:
<programlisting>
networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
</programlisting>
</para>
</para>
</section>

View File

@@ -3,32 +3,32 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="ch-containers">
<title>Container Management</title>
<para>NixOS allows you to easily run other NixOS instances as
<emphasis>containers</emphasis>. Containers are a light-weight
approach to virtualisation that runs software in the container at the
same speed as in the host system. NixOS containers share the Nix store
of the host, making container creation very efficient.</para>
<warning><para>Currently, NixOS containers are not perfectly isolated
from the host system. This means that a user with root access to the
container can do things that affect the host. So you should not give
container root access to untrusted users.</para></warning>
<para>NixOS containers can be created in two ways: imperatively, using
the command <command>nixos-container</command>, and declaratively, by
specifying them in your <filename>configuration.nix</filename>. The
declarative approach implies that containers get upgraded along with
your host system when you run <command>nixos-rebuild</command>, which
is often not what you want. By contrast, in the imperative approach,
containers are configured and updated independently from the host
system.</para>
<xi:include href="imperative-containers.xml" />
<xi:include href="declarative-containers.xml" />
<xi:include href="container-networking.xml" />
<title>Container Management</title>
<para>
NixOS allows you to easily run other NixOS instances as
<emphasis>containers</emphasis>. Containers are a light-weight approach to
virtualisation that runs software in the container at the same speed as in
the host system. NixOS containers share the Nix store of the host, making
container creation very efficient.
</para>
<warning>
<para>
Currently, NixOS containers are not perfectly isolated from the host system.
This means that a user with root access to the container can do things that
affect the host. So you should not give container root access to untrusted
users.
</para>
</warning>
<para>
NixOS containers can be created in two ways: imperatively, using the command
<command>nixos-container</command>, and declaratively, by specifying them in
your <filename>configuration.nix</filename>. The declarative approach implies
that containers get upgraded along with your host system when you run
<command>nixos-rebuild</command>, which is often not what you want. By
contrast, in the imperative approach, containers are configured and updated
independently from the host system.
</para>
<xi:include href="imperative-containers.xml" />
<xi:include href="declarative-containers.xml" />
<xi:include href="container-networking.xml" />
</chapter>

View File

@@ -3,20 +3,18 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-cgroups">
<title>Control Groups</title>
<para>To keep track of the processes in a running system, systemd uses
<emphasis>control groups</emphasis> (cgroups). A control group is a
set of processes used to allocate resources such as CPU, memory or I/O
bandwidth. There can be multiple control group hierarchies, allowing
each kind of resource to be managed independently.</para>
<para>The command <command>systemd-cgls</command> lists all control
groups in the <literal>systemd</literal> hierarchy, which is what
systemd uses to keep track of the processes belonging to each service
or user session:
<title>Control Groups</title>
<para>
To keep track of the processes in a running system, systemd uses
<emphasis>control groups</emphasis> (cgroups). A control group is a set of
processes used to allocate resources such as CPU, memory or I/O bandwidth.
There can be multiple control group hierarchies, allowing each kind of
resource to be managed independently.
</para>
<para>
The command <command>systemd-cgls</command> lists all control groups in the
<literal>systemd</literal> hierarchy, which is what systemd uses to keep
track of the processes belonging to each service or user session:
<screen>
$ systemd-cgls
├─user
@@ -34,40 +32,34 @@ $ systemd-cgls
│ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf
└─ <replaceable>...</replaceable>
</screen>
Similarly, <command>systemd-cgls cpu</command> shows the cgroups in
the CPU hierarchy, which allows per-cgroup CPU scheduling priorities.
By default, every systemd service gets its own CPU cgroup, while all
user sessions are in the top-level CPU cgroup. This ensures, for
instance, that a thousand run-away processes in the
<literal>httpd.service</literal> cgroup cannot starve the CPU for one
process in the <literal>postgresql.service</literal> cgroup. (By
contrast, it they were in the same cgroup, then the PostgreSQL process
would get 1/1001 of the cgroups CPU time.) You can limit a services
CPU share in <filename>configuration.nix</filename>:
Similarly, <command>systemd-cgls cpu</command> shows the cgroups in the CPU
hierarchy, which allows per-cgroup CPU scheduling priorities. By default,
every systemd service gets its own CPU cgroup, while all user sessions are in
the top-level CPU cgroup. This ensures, for instance, that a thousand
run-away processes in the <literal>httpd.service</literal> cgroup cannot
starve the CPU for one process in the <literal>postgresql.service</literal>
cgroup. (By contrast, it they were in the same cgroup, then the PostgreSQL
process would get 1/1001 of the cgroups CPU time.) You can limit a
services CPU share in <filename>configuration.nix</filename>:
<programlisting>
systemd.services.httpd.serviceConfig.CPUShares = 512;
</programlisting>
By default, every cgroup has 1024 CPU shares, so this will halve the
CPU allocation of the <literal>httpd.service</literal> cgroup.</para>
<para>There also is a <literal>memory</literal> hierarchy that
controls memory allocation limits; by default, all processes are in
the top-level cgroup, so any service or session can exhaust all
available memory. Per-cgroup memory limits can be specified in
<filename>configuration.nix</filename>; for instance, to limit
<literal>httpd.service</literal> to 512 MiB of RAM (excluding swap):
By default, every cgroup has 1024 CPU shares, so this will halve the CPU
allocation of the <literal>httpd.service</literal> cgroup.
</para>
<para>
There also is a <literal>memory</literal> hierarchy that controls memory
allocation limits; by default, all processes are in the top-level cgroup, so
any service or session can exhaust all available memory. Per-cgroup memory
limits can be specified in <filename>configuration.nix</filename>; for
instance, to limit <literal>httpd.service</literal> to 512 MiB of RAM
(excluding swap):
<programlisting>
systemd.services.httpd.serviceConfig.MemoryLimit = "512M";
</programlisting>
</para>
<para>The command <command>systemd-cgtop</command> shows a
continuously updated list of all cgroups with their CPU and memory
usage.</para>
</para>
<para>
The command <command>systemd-cgtop</command> shows a continuously updated
list of all cgroups with their CPU and memory usage.
</para>
</chapter>

View File

@@ -3,14 +3,13 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-declarative-containers">
<title>Declarative Container Specification</title>
<title>Declarative Container Specification</title>
<para>You can also specify containers and their configuration in the
hosts <filename>configuration.nix</filename>. For example, the
following specifies that there shall be a container named
<literal>database</literal> running PostgreSQL:
<para>
You can also specify containers and their configuration in the hosts
<filename>configuration.nix</filename>. For example, the following specifies
that there shall be a container named <literal>database</literal> running
PostgreSQL:
<programlisting>
containers.database =
{ config =
@@ -20,18 +19,18 @@ containers.database =
};
};
</programlisting>
If you run <literal>nixos-rebuild switch</literal>, the container will be
built. If the container was already running, it will be updated in place,
without rebooting. The container can be configured to start automatically by
setting <literal>containers.database.autoStart = true</literal> in its
configuration.
</para>
If you run <literal>nixos-rebuild switch</literal>, the container will
be built. If the container was already running, it will be
updated in place, without rebooting. The container can be configured to
start automatically by setting <literal>containers.database.autoStart = true</literal>
in its configuration.</para>
<para>By default, declarative containers share the network namespace
of the host, meaning that they can listen on (privileged)
ports. However, they cannot change the network configuration. You can
give a container its own network as follows:
<para>
By default, declarative containers share the network namespace of the host,
meaning that they can listen on (privileged) ports. However, they cannot
change the network configuration. You can give a container its own network as
follows:
<programlisting>
containers.database =
{ privateNetwork = true;
@@ -39,22 +38,23 @@ containers.database =
localAddress = "192.168.100.11";
};
</programlisting>
This gives the container a private virtual Ethernet interface with IP address
<literal>192.168.100.11</literal>, which is hooked up to a virtual Ethernet
interface on the host with IP address <literal>192.168.100.10</literal>. (See
the next section for details on container networking.)
</para>
This gives the container a private virtual Ethernet interface with IP
address <literal>192.168.100.11</literal>, which is hooked up to a
virtual Ethernet interface on the host with IP address
<literal>192.168.100.10</literal>. (See the next section for details
on container networking.)</para>
<para>To disable the container, just remove it from
<filename>configuration.nix</filename> and run <literal>nixos-rebuild
switch</literal>. Note that this will not delete the root directory of
the container in <literal>/var/lib/containers</literal>. Containers can be
destroyed using the imperative method: <literal>nixos-container destroy
foo</literal>.</para>
<para>Declarative containers can be started and stopped using the
corresponding systemd service, e.g. <literal>systemctl start
container@database</literal>.</para>
<para>
To disable the container, just remove it from
<filename>configuration.nix</filename> and run <literal>nixos-rebuild
switch</literal>. Note that this will not delete the root directory of the
container in <literal>/var/lib/containers</literal>. Containers can be
destroyed using the imperative method: <literal>nixos-container destroy
foo</literal>.
</para>
<para>
Declarative containers can be started and stopped using the corresponding
systemd service, e.g. <literal>systemctl start container@database</literal>.
</para>
</section>

View File

@@ -3,101 +3,85 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-imperative-containers">
<title>Imperative Container Management</title>
<title>Imperative Container Management</title>
<para>Well cover imperative container management using
<command>nixos-container</command> first.
Be aware that container management is currently only possible
as <literal>root</literal>.</para>
<para>You create a container with
identifier <literal>foo</literal> as follows:
<para>
Well cover imperative container management using
<command>nixos-container</command> first. Be aware that container management
is currently only possible as <literal>root</literal>.
</para>
<para>
You create a container with identifier <literal>foo</literal> as follows:
<screen>
# nixos-container create foo
</screen>
This creates the containers root directory in
<filename>/var/lib/containers/foo</filename> and a small configuration
file in <filename>/etc/containers/foo.conf</filename>. It also builds
the containers initial system configuration and stores it in
<filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You
can modify the initial configuration of the container on the command
line. For instance, to create a container that has
<command>sshd</command> running, with the given public key for
<literal>root</literal>:
This creates the containers root directory in
<filename>/var/lib/containers/foo</filename> and a small configuration file
in <filename>/etc/containers/foo.conf</filename>. It also builds the
containers initial system configuration and stores it in
<filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You can
modify the initial configuration of the container on the command line. For
instance, to create a container that has <command>sshd</command> running,
with the given public key for <literal>root</literal>:
<screen>
# nixos-container create foo --config '
services.openssh.enable = true;
users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];
users.users.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];
'
</screen>
</para>
</para>
<para>Creating a container does not start it. To start the container,
run:
<para>
Creating a container does not start it. To start the container, run:
<screen>
# nixos-container start foo
</screen>
This command will return as soon as the container has booted and has
reached <literal>multi-user.target</literal>. On the host, the
container runs within a systemd unit called
<literal>container@<replaceable>container-name</replaceable>.service</literal>.
Thus, if something went wrong, you can get status info using
<command>systemctl</command>:
This command will return as soon as the container has booted and has reached
<literal>multi-user.target</literal>. On the host, the container runs within
a systemd unit called
<literal>container@<replaceable>container-name</replaceable>.service</literal>.
Thus, if something went wrong, you can get status info using
<command>systemctl</command>:
<screen>
# systemctl status container@foo
</screen>
</para>
</para>
<para>If the container has started successfully, you can log in as
root using the <command>root-login</command> operation:
<para>
If the container has started successfully, you can log in as root using the
<command>root-login</command> operation:
<screen>
# nixos-container root-login foo
[root@foo:~]#
</screen>
Note that only root on the host can do this (since there is no
authentication). You can also get a regular login prompt using the
<command>login</command> operation, which is available to all users on
the host:
Note that only root on the host can do this (since there is no
authentication). You can also get a regular login prompt using the
<command>login</command> operation, which is available to all users on the
host:
<screen>
# nixos-container login foo
foo login: alice
Password: ***
</screen>
With <command>nixos-container run</command>, you can execute arbitrary
commands in the container:
With <command>nixos-container run</command>, you can execute arbitrary
commands in the container:
<screen>
# nixos-container run foo -- uname -a
Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
</screen>
</para>
</para>
<para>There are several ways to change the configuration of the
container. First, on the host, you can edit
<literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
and run
<para>
There are several ways to change the configuration of the container. First,
on the host, you can edit
<literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
and run
<screen>
# nixos-container update foo
</screen>
This will build and activate the new configuration. You can also
specify a new configuration on the command line:
This will build and activate the new configuration. You can also specify a
new configuration on the command line:
<screen>
# nixos-container update foo --config '
services.httpd.enable = true;
@@ -108,26 +92,25 @@ specify a new configuration on the command line:
# curl http://$(nixos-container show-ip foo)/
&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
</screen>
However, note that this will overwrite the containers
<filename>/etc/nixos/configuration.nix</filename>.
</para>
However, note that this will overwrite the containers
<filename>/etc/nixos/configuration.nix</filename>.</para>
<para>Alternatively, you can change the configuration from within the
container itself by running <command>nixos-rebuild switch</command>
inside the container. Note that the container by default does not have
a copy of the NixOS channel, so you should run <command>nix-channel
--update</command> first.</para>
<para>Containers can be stopped and started using
<literal>nixos-container stop</literal> and <literal>nixos-container
start</literal>, respectively, or by using
<command>systemctl</command> on the containers service unit. To
destroy a container, including its file system, do
<para>
Alternatively, you can change the configuration from within the container
itself by running <command>nixos-rebuild switch</command> inside the
container. Note that the container by default does not have a copy of the
NixOS channel, so you should run <command>nix-channel --update</command>
first.
</para>
<para>
Containers can be stopped and started using <literal>nixos-container
stop</literal> and <literal>nixos-container start</literal>, respectively, or
by using <command>systemctl</command> on the containers service unit. To
destroy a container, including its file system, do
<screen>
# nixos-container destroy foo
</screen>
</para>
</para>
</section>

View File

@@ -3,26 +3,20 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-logging">
<title>Logging</title>
<para>System-wide logging is provided by systemds
<emphasis>journal</emphasis>, which subsumes traditional logging
daemons such as syslogd and klogd. Log entries are kept in binary
files in <filename>/var/log/journal/</filename>. The command
<literal>journalctl</literal> allows you to see the contents of the
journal. For example,
<title>Logging</title>
<para>
System-wide logging is provided by systemds <emphasis>journal</emphasis>,
which subsumes traditional logging daemons such as syslogd and klogd. Log
entries are kept in binary files in <filename>/var/log/journal/</filename>.
The command <literal>journalctl</literal> allows you to see the contents of
the journal. For example,
<screen>
$ journalctl -b
</screen>
shows all journal entries since the last reboot. (The output of
<command>journalctl</command> is piped into <command>less</command> by
default.) You can use various options and match operators to restrict
output to messages of interest. For instance, to get all messages
from PostgreSQL:
shows all journal entries since the last reboot. (The output of
<command>journalctl</command> is piped into <command>less</command> by
default.) You can use various options and match operators to restrict output
to messages of interest. For instance, to get all messages from PostgreSQL:
<screen>
$ journalctl -u postgresql.service
-- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. --
@@ -32,21 +26,18 @@ Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down
Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET
Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections
</screen>
Or to get all messages since the last reboot that have at least a
“critical” severity level:
Or to get all messages since the last reboot that have at least a
“critical” severity level:
<screen>
$ journalctl -b -p crit
Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice]
Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1)
</screen>
</para>
<para>The system journal is readable by root and by users in the
<literal>wheel</literal> and <literal>systemd-journal</literal>
groups. All users have a private journal that can be read using
<command>journalctl</command>.</para>
</chapter>
</para>
<para>
The system journal is readable by root and by users in the
<literal>wheel</literal> and <literal>systemd-journal</literal> groups. All
users have a private journal that can be read using
<command>journalctl</command>.
</para>
</chapter>

View File

@@ -3,16 +3,14 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-maintenance-mode">
<title>Maintenance Mode</title>
<title>Maintenance Mode</title>
<para>You can enter rescue mode by running:
<para>
You can enter rescue mode by running:
<screen>
# systemctl rescue</screen>
This will eventually give you a single-user root shell. Systemd will
stop (almost) all system services. To get out of maintenance mode,
just exit from the rescue shell.</para>
This will eventually give you a single-user root shell. Systemd will stop
(almost) all system services. To get out of maintenance mode, just exit from
the rescue shell.
</para>
</section>

View File

@@ -3,31 +3,25 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-nix-network-issues">
<title>Network Problems</title>
<title>Network Problems</title>
<para>Nix uses a so-called <emphasis>binary cache</emphasis> to
optimise building a package from source into downloading it as a
pre-built binary. That is, whenever a command like
<command>nixos-rebuild</command> needs a path in the Nix store, Nix
will try to download that path from the Internet rather than build it
from source. The default binary cache is
<uri>https://cache.nixos.org/</uri>. If this cache is unreachable,
Nix operations may take a long time due to HTTP connection timeouts.
You can disable the use of the binary cache by adding <option>--option
use-binary-caches false</option>, e.g.
<para>
Nix uses a so-called <emphasis>binary cache</emphasis> to optimise building a
package from source into downloading it as a pre-built binary. That is,
whenever a command like <command>nixos-rebuild</command> needs a path in the
Nix store, Nix will try to download that path from the Internet rather than
build it from source. The default binary cache is
<uri>https://cache.nixos.org/</uri>. If this cache is unreachable, Nix
operations may take a long time due to HTTP connection timeouts. You can
disable the use of the binary cache by adding <option>--option
use-binary-caches false</option>, e.g.
<screen>
# nixos-rebuild switch --option use-binary-caches false
</screen>
If you have an alternative binary cache at your disposal, you can use
it instead:
If you have an alternative binary cache at your disposal, you can use it
instead:
<screen>
# nixos-rebuild switch --option binary-caches http://my-cache.example.org/
</screen>
</para>
</para>
</section>

View File

@@ -3,42 +3,33 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-rebooting">
<title>Rebooting and Shutting Down</title>
<para>The system can be shut down (and automatically powered off) by
doing:
<title>Rebooting and Shutting Down</title>
<para>
The system can be shut down (and automatically powered off) by doing:
<screen>
# shutdown
</screen>
This is equivalent to running <command>systemctl
poweroff</command>.</para>
<para>To reboot the system, run
This is equivalent to running <command>systemctl poweroff</command>.
</para>
<para>
To reboot the system, run
<screen>
# reboot
</screen>
which is equivalent to <command>systemctl reboot</command>.
Alternatively, you can quickly reboot the system using
<literal>kexec</literal>, which bypasses the BIOS by directly loading
the new kernel into memory:
which is equivalent to <command>systemctl reboot</command>. Alternatively,
you can quickly reboot the system using <literal>kexec</literal>, which
bypasses the BIOS by directly loading the new kernel into memory:
<screen>
# systemctl kexec
</screen>
</para>
<para>The machine can be suspended to RAM (if supported) using
<command>systemctl suspend</command>, and suspended to disk using
<command>systemctl hibernate</command>.</para>
<para>These commands can be run by any user who is logged in locally,
i.e. on a virtual console or in X11; otherwise, the user is asked for
authentication.</para>
</para>
<para>
The machine can be suspended to RAM (if supported) using <command>systemctl
suspend</command>, and suspended to disk using <command>systemctl
hibernate</command>.
</para>
<para>
These commands can be run by any user who is logged in locally, i.e. on a
virtual console or in X11; otherwise, the user is asked for authentication.
</para>
</chapter>

View File

@@ -3,46 +3,39 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-rollback">
<title>Rolling Back Configuration Changes</title>
<title>Rolling Back Configuration Changes</title>
<para>After running <command>nixos-rebuild</command> to switch to a
new configuration, you may find that the new configuration doesnt
work very well. In that case, there are several ways to return to a
previous configuration.</para>
<para>First, the GRUB boot manager allows you to boot into any
previous configuration that hasnt been garbage-collected. These
configurations can be found under the GRUB submenu “NixOS - All
configurations”. This is especially useful if the new configuration
fails to boot. After the system has booted, you can make the selected
configuration the default for subsequent boots:
<para>
After running <command>nixos-rebuild</command> to switch to a new
configuration, you may find that the new configuration doesnt work very
well. In that case, there are several ways to return to a previous
configuration.
</para>
<para>
First, the GRUB boot manager allows you to boot into any previous
configuration that hasnt been garbage-collected. These configurations can
be found under the GRUB submenu “NixOS - All configurations”. This is
especially useful if the new configuration fails to boot. After the system
has booted, you can make the selected configuration the default for
subsequent boots:
<screen>
# /run/current-system/bin/switch-to-configuration boot</screen>
</para>
</para>
<para>Second, you can switch to the previous configuration in a running
system:
<para>
Second, you can switch to the previous configuration in a running system:
<screen>
# nixos-rebuild switch --rollback</screen>
This is equivalent to running:
This is equivalent to running:
<screen>
# /nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen>
where <replaceable>N</replaceable> is the number of the NixOS system
configuration. To get a list of the available configurations, do:
where <replaceable>N</replaceable> is the number of the NixOS system
configuration. To get a list of the available configurations, do:
<screen>
$ ls -l /nix/var/nix/profiles/system-*-link
<replaceable>...</replaceable>
lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055
</screen>
</para>
</para>
</section>

View File

@@ -3,22 +3,19 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="ch-running">
<title>Administration</title>
<partintro>
<para>This chapter describes various aspects of managing a running
NixOS system, such as how to use the <command>systemd</command>
service manager.</para>
</partintro>
<xi:include href="service-mgmt.xml" />
<xi:include href="rebooting.xml" />
<xi:include href="user-sessions.xml" />
<xi:include href="control-groups.xml" />
<xi:include href="logging.xml" />
<xi:include href="cleaning-store.xml" />
<xi:include href="containers.xml" />
<xi:include href="troubleshooting.xml" />
<title>Administration</title>
<partintro>
<para>
This chapter describes various aspects of managing a running NixOS system,
such as how to use the <command>systemd</command> service manager.
</para>
</partintro>
<xi:include href="service-mgmt.xml" />
<xi:include href="rebooting.xml" />
<xi:include href="user-sessions.xml" />
<xi:include href="control-groups.xml" />
<xi:include href="logging.xml" />
<xi:include href="cleaning-store.xml" />
<xi:include href="containers.xml" />
<xi:include href="troubleshooting.xml" />
</part>

View File

@@ -3,26 +3,23 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-systemctl">
<title>Service Management</title>
<para>In NixOS, all system services are started and monitored using
the systemd program. Systemd is the “init” process of the system
(i.e. PID 1), the parent of all other processes. It manages a set of
so-called “units”, which can be things like system services
(programs), but also mount points, swap files, devices, targets
(groups of units) and more. Units can have complex dependencies; for
instance, one unit can require that another unit must be successfully
started before the first unit can be started. When the system boots,
it starts a unit named <literal>default.target</literal>; the
dependencies of this unit cause all system services to be started,
file systems to be mounted, swap files to be activated, and so
on.</para>
<para>The command <command>systemctl</command> is the main way to
interact with <command>systemd</command>. Without any arguments, it
shows the status of active units:
<title>Service Management</title>
<para>
In NixOS, all system services are started and monitored using the systemd
program. Systemd is the “init” process of the system (i.e. PID 1), the
parent of all other processes. It manages a set of so-called “units”,
which can be things like system services (programs), but also mount points,
swap files, devices, targets (groups of units) and more. Units can have
complex dependencies; for instance, one unit can require that another unit
must be successfully started before the first unit can be started. When the
system boots, it starts a unit named <literal>default.target</literal>; the
dependencies of this unit cause all system services to be started, file
systems to be mounted, swap files to be activated, and so on.
</para>
<para>
The command <command>systemctl</command> is the main way to interact with
<command>systemd</command>. Without any arguments, it shows the status of
active units:
<screen>
$ systemctl
-.mount loaded active mounted /
@@ -31,12 +28,10 @@ sshd.service loaded active running SSH Daemon
graphical.target loaded active active Graphical Interface
<replaceable>...</replaceable>
</screen>
</para>
<para>You can ask for detailed status information about a unit, for
instance, the PostgreSQL database service:
</para>
<para>
You can ask for detailed status information about a unit, for instance, the
PostgreSQL database service:
<screen>
$ systemctl status postgresql.service
postgresql.service - PostgreSQL Server
@@ -56,28 +51,22 @@ Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to
Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started
Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server.
</screen>
Note that this shows the status of the unit (active and running), all
the processes belonging to the service, as well as the most recent log
messages from the service.
</para>
<para>Units can be stopped, started or restarted:
Note that this shows the status of the unit (active and running), all the
processes belonging to the service, as well as the most recent log messages
from the service.
</para>
<para>
Units can be stopped, started or restarted:
<screen>
# systemctl stop postgresql.service
# systemctl start postgresql.service
# systemctl restart postgresql.service
</screen>
These operations are synchronous: they wait until the service has
finished starting or stopping (or has failed). Starting a unit will
cause the dependencies of that unit to be started as well (if
necessary).</para>
These operations are synchronous: they wait until the service has finished
starting or stopping (or has failed). Starting a unit will cause the
dependencies of that unit to be started as well (if necessary).
</para>
<!-- - cgroups: each service and user session is a cgroup
- cgroup resource management -->
</chapter>

View File

@@ -3,35 +3,34 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-nix-store-corruption">
<title>Nix Store Corruption</title>
<title>Nix Store Corruption</title>
<para>After a system crash, its possible for files in the Nix store
to become corrupted. (For instance, the Ext4 file system has the
tendency to replace un-synced files with zero bytes.) NixOS tries
hard to prevent this from happening: it performs a
<command>sync</command> before switching to a new configuration, and
Nixs database is fully transactional. If corruption still occurs,
you may be able to fix it automatically.</para>
<para>If the corruption is in a path in the closure of the NixOS
system configuration, you can fix it by doing
<para>
After a system crash, its possible for files in the Nix store to become
corrupted. (For instance, the Ext4 file system has the tendency to replace
un-synced files with zero bytes.) NixOS tries hard to prevent this from
happening: it performs a <command>sync</command> before switching to a new
configuration, and Nixs database is fully transactional. If corruption
still occurs, you may be able to fix it automatically.
</para>
<para>
If the corruption is in a path in the closure of the NixOS system
configuration, you can fix it by doing
<screen>
# nixos-rebuild switch --repair
</screen>
This will cause Nix to check every path in the closure, and if its
cryptographic hash differs from the hash recorded in Nixs database, the
path is rebuilt or redownloaded.
</para>
This will cause Nix to check every path in the closure, and if its
cryptographic hash differs from the hash recorded in Nixs database,
the path is rebuilt or redownloaded.</para>
<para>You can also scan the entire Nix store for corrupt paths:
<para>
You can also scan the entire Nix store for corrupt paths:
<screen>
# nix-store --verify --check-contents --repair
</screen>
Any corrupt paths will be redownloaded if theyre available in a
binary cache; otherwise, they cannot be repaired.</para>
Any corrupt paths will be redownloaded if theyre available in a binary
cache; otherwise, they cannot be repaired.
</para>
</section>

View File

@@ -3,16 +3,14 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="ch-troubleshooting">
<title>Troubleshooting</title>
<para>This chapter describes solutions to common problems you might
encounter when you manage your NixOS system.</para>
<xi:include href="boot-problems.xml" />
<xi:include href="maintenance-mode.xml" />
<xi:include href="rollback.xml" />
<xi:include href="store-corruption.xml" />
<xi:include href="network-problems.xml" />
<title>Troubleshooting</title>
<para>
This chapter describes solutions to common problems you might encounter when
you manage your NixOS system.
</para>
<xi:include href="boot-problems.xml" />
<xi:include href="maintenance-mode.xml" />
<xi:include href="rollback.xml" />
<xi:include href="store-corruption.xml" />
<xi:include href="network-problems.xml" />
</chapter>

View File

@@ -3,14 +3,12 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-user-sessions">
<title>User Sessions</title>
<para>Systemd keeps track of all users who are logged into the system
(e.g. on a virtual console or remotely via SSH). The command
<command>loginctl</command> allows querying and manipulating user
sessions. For instance, to list all user sessions:
<title>User Sessions</title>
<para>
Systemd keeps track of all users who are logged into the system (e.g. on a
virtual console or remotely via SSH). The command <command>loginctl</command>
allows querying and manipulating user sessions. For instance, to list all
user sessions:
<screen>
$ loginctl
SESSION UID USER SEAT
@@ -18,12 +16,10 @@ $ loginctl
c3 0 root seat0
c4 500 alice
</screen>
This shows that two users are logged in locally, while another is
logged in remotely. (“Seats” are essentially the combinations of
displays and input devices attached to the system; usually, there is
only one seat.) To get information about a session:
This shows that two users are logged in locally, while another is logged in
remotely. (“Seats” are essentially the combinations of displays and input
devices attached to the system; usually, there is only one seat.) To get
information about a session:
<screen>
$ loginctl session-status c3
c3 - root (0)
@@ -38,16 +34,12 @@ c3 - root (0)
├─10339 -bash
└─10355 w3m nixos.org
</screen>
This shows that the user is logged in on virtual console 3. It also
lists the processes belonging to this session. Since systemd keeps
track of this, you can terminate a session in a way that ensures that
all the sessions processes are gone:
This shows that the user is logged in on virtual console 3. It also lists the
processes belonging to this session. Since systemd keeps track of this, you
can terminate a session in a way that ensures that all the sessions
processes are gone:
<screen>
# loginctl terminate-session c3
</screen>
</para>
</para>
</chapter>

View File

@@ -3,12 +3,11 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-module-abstractions">
<title>Abstractions</title>
<title>Abstractions</title>
<para>If you find yourself repeating yourself over and over, its time
to abstract. Take, for instance, this Apache HTTP Server configuration:
<para>
If you find yourself repeating yourself over and over, its time to
abstract. Take, for instance, this Apache HTTP Server configuration:
<programlisting>
{
services.httpd.virtualHosts =
@@ -28,11 +27,9 @@ to abstract. Take, for instance, this Apache HTTP Server configuration:
];
}
</programlisting>
It defines two virtual hosts with nearly identical configuration; the
only difference is that the second one has SSL enabled. To prevent
this duplication, we can use a <literal>let</literal>:
It defines two virtual hosts with nearly identical configuration; the only
difference is that the second one has SSL enabled. To prevent this
duplication, we can use a <literal>let</literal>:
<programlisting>
let
exampleOrgCommon =
@@ -53,17 +50,16 @@ in
];
}
</programlisting>
The <literal>let exampleOrgCommon = <replaceable>...</replaceable></literal>
defines a variable named <literal>exampleOrgCommon</literal>. The
<literal>//</literal> operator merges two attribute sets, so the
configuration of the second virtual host is the set
<literal>exampleOrgCommon</literal> extended with the SSL options.
</para>
The <literal>let exampleOrgCommon =
<replaceable>...</replaceable></literal> defines a variable named
<literal>exampleOrgCommon</literal>. The <literal>//</literal>
operator merges two attribute sets, so the configuration of the second
virtual host is the set <literal>exampleOrgCommon</literal> extended
with the SSL options.</para>
<para>You can write a <literal>let</literal> wherever an expression is
allowed. Thus, you also could have written:
<para>
You can write a <literal>let</literal> wherever an expression is allowed.
Thus, you also could have written:
<programlisting>
{
services.httpd.virtualHosts =
@@ -73,17 +69,16 @@ allowed. Thus, you also could have written:
];
}
</programlisting>
but not <literal>{ let exampleOrgCommon = <replaceable>...</replaceable>; in
<replaceable>...</replaceable>; }</literal> since attributes (as opposed to
attribute values) are not expressions.
</para>
but not <literal>{ let exampleOrgCommon =
<replaceable>...</replaceable>; in <replaceable>...</replaceable>;
}</literal> since attributes (as opposed to attribute values) are not
expressions.</para>
<para><emphasis>Functions</emphasis> provide another method of
abstraction. For instance, suppose that we want to generate lots of
different virtual hosts, all with identical configuration except for
the host name. This can be done as follows:
<para>
<emphasis>Functions</emphasis> provide another method of abstraction. For
instance, suppose that we want to generate lots of different virtual hosts,
all with identical configuration except for the host name. This can be done
as follows:
<programlisting>
{
services.httpd.virtualHosts =
@@ -101,16 +96,15 @@ the host name. This can be done as follows:
];
}
</programlisting>
Here, <varname>makeVirtualHost</varname> is a function that takes a single
argument <literal>name</literal> and returns the configuration for a virtual
host. That function is then called for several names to produce the list of
virtual host configurations.
</para>
Here, <varname>makeVirtualHost</varname> is a function that takes a
single argument <literal>name</literal> and returns the configuration
for a virtual host. That function is then called for several names to
produce the list of virtual host configurations.</para>
<para>We can further improve on this by using the function
<varname>map</varname>, which applies another function to every
element in a list:
<para>
We can further improve on this by using the function <varname>map</varname>,
which applies another function to every element in a list:
<programlisting>
{
services.httpd.virtualHosts =
@@ -120,16 +114,15 @@ element in a list:
[ "example.org" "example.com" "example.gov" "example.nl" ];
}
</programlisting>
(The function <literal>map</literal> is called a <emphasis>higher-order
function</emphasis> because it takes another function as an argument.)
</para>
(The function <literal>map</literal> is called a
<emphasis>higher-order function</emphasis> because it takes another
function as an argument.)</para>
<para>What if you need more than one argument, for instance, if we
want to use a different <literal>documentRoot</literal> for each
virtual host? Then we can make <varname>makeVirtualHost</varname> a
function that takes a <emphasis>set</emphasis> as its argument, like this:
<para>
What if you need more than one argument, for instance, if we want to use a
different <literal>documentRoot</literal> for each virtual host? Then we can
make <varname>makeVirtualHost</varname> a function that takes a
<emphasis>set</emphasis> as its argument, like this:
<programlisting>
{
services.httpd.virtualHosts =
@@ -147,10 +140,9 @@ function that takes a <emphasis>set</emphasis> as its argument, like this:
];
}
</programlisting>
But in this case (where every root is a subdirectory of
<filename>/sites</filename> named after the virtual host), it would
have been shorter to define <varname>makeVirtualHost</varname> as
But in this case (where every root is a subdirectory of
<filename>/sites</filename> named after the virtual host), it would have been
shorter to define <varname>makeVirtualHost</varname> as
<programlisting>
makeVirtualHost = name:
{ hostName = name;
@@ -158,9 +150,7 @@ makeVirtualHost = name:
adminAddr = "alice@example.org";
};
</programlisting>
Here, the construct
<literal>${<replaceable>...</replaceable>}</literal> allows the result
of an expression to be spliced into a string.</para>
Here, the construct <literal>${<replaceable>...</replaceable>}</literal>
allows the result of an expression to be spliced into a string.
</para>
</section>

View File

@@ -3,22 +3,18 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="ad-hoc-network-config">
<title>Ad-Hoc Configuration</title>
<title>Ad-Hoc Configuration</title>
<para>You can use <option>networking.localCommands</option> to specify
shell commands to be run at the end of
<literal>network-setup.service</literal>. This is useful for doing
network configuration not covered by the existing NixOS modules. For
instance, to statically configure an IPv6 address:
<para>
You can use <option>networking.localCommands</option> to specify shell
commands to be run at the end of <literal>network-setup.service</literal>.
This is useful for doing network configuration not covered by the existing
NixOS modules. For instance, to statically configure an IPv6 address:
<programlisting>
networking.localCommands =
''
ip -6 addr add 2001:610:685:1::1/64 dev eth0
'';
</programlisting>
</para>
</para>
</section>

View File

@@ -3,61 +3,59 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-ad-hoc-packages">
<title>Ad-Hoc Package Management</title>
<title>Ad-Hoc Package Management</title>
<para>With the command <command>nix-env</command>, you can install and
uninstall packages from the command line. For instance, to install
Mozilla Thunderbird:
<para>
With the command <command>nix-env</command>, you can install and uninstall
packages from the command line. For instance, to install Mozilla Thunderbird:
<screen>
$ nix-env -iA nixos.thunderbird</screen>
If you invoke this as root, the package is installed in the Nix profile
<filename>/nix/var/nix/profiles/default</filename> and visible to all users
of the system; otherwise, the package ends up in
<filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename>
and is not visible to other users. The <option>-A</option> flag specifies the
package by its attribute name; without it, the package is installed by
matching against its package name (e.g. <literal>thunderbird</literal>). The
latter is slower because it requires matching against all available Nix
packages, and is ambiguous if there are multiple matching packages.
</para>
If you invoke this as root, the package is installed in the Nix
profile <filename>/nix/var/nix/profiles/default</filename> and visible
to all users of the system; otherwise, the package ends up in
<filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename>
and is not visible to other users. The <option>-A</option> flag
specifies the package by its attribute name; without it, the package
is installed by matching against its package name
(e.g. <literal>thunderbird</literal>). The latter is slower because
it requires matching against all available Nix packages, and is
ambiguous if there are multiple matching packages.</para>
<para>Packages come from the NixOS channel. You typically upgrade a
package by updating to the latest version of the NixOS channel:
<para>
Packages come from the NixOS channel. You typically upgrade a package by
updating to the latest version of the NixOS channel:
<screen>
$ nix-channel --update nixos
</screen>
and then running <literal>nix-env -i</literal> again. Other packages
in the profile are <emphasis>not</emphasis> affected; this is the
crucial difference with the declarative style of package management,
where running <command>nixos-rebuild switch</command> causes all
packages to be updated to their current versions in the NixOS channel.
You can however upgrade all packages for which there is a newer
version by doing:
and then running <literal>nix-env -i</literal> again. Other packages in the
profile are <emphasis>not</emphasis> affected; this is the crucial difference
with the declarative style of package management, where running
<command>nixos-rebuild switch</command> causes all packages to be updated to
their current versions in the NixOS channel. You can however upgrade all
packages for which there is a newer version by doing:
<screen>
$ nix-env -u '*'
</screen>
</para>
</para>
<para>A package can be uninstalled using the <option>-e</option>
flag:
<para>
A package can be uninstalled using the <option>-e</option> flag:
<screen>
$ nix-env -e thunderbird
</screen>
</para>
</para>
<para>Finally, you can roll back an undesirable
<command>nix-env</command> action:
<para>
Finally, you can roll back an undesirable <command>nix-env</command> action:
<screen>
$ nix-env --rollback
</screen>
</para>
<para><command>nix-env</command> has many more flags. For details,
see the
<citerefentry><refentrytitle>nix-env</refentrytitle><manvolnum>1</manvolnum></citerefentry>
manpage or the Nix manual.</para>
</para>
<para>
<command>nix-env</command> has many more flags. For details, see the
<citerefentry>
<refentrytitle>nix-env</refentrytitle>
<manvolnum>1</manvolnum></citerefentry> manpage or the Nix manual.
</para>
</section>

View File

@@ -3,43 +3,36 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-custom-packages">
<title>Adding Custom Packages</title>
<title>Adding Custom Packages</title>
<para>Its possible that a package you need is not available in NixOS.
In that case, you can do two things. First, you can clone the Nixpkgs
repository, add the package to your clone, and (optionally) submit a
patch or pull request to have it accepted into the main Nixpkgs
repository. This is described in detail in the <link
xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual</link>.
In short, you clone Nixpkgs:
<para>
Its possible that a package you need is not available in NixOS. In that
case, you can do two things. First, you can clone the Nixpkgs repository, add
the package to your clone, and (optionally) submit a patch or pull request to
have it accepted into the main Nixpkgs repository. This is described in
detail in the <link
xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs
manual</link>. In short, you clone Nixpkgs:
<screen>
$ git clone git://github.com/NixOS/nixpkgs.git
$ cd nixpkgs
</screen>
Then you write and test the package as described in the Nixpkgs
manual. Finally, you add it to
<literal>environment.systemPackages</literal>, e.g.
Then you write and test the package as described in the Nixpkgs manual.
Finally, you add it to <literal>environment.systemPackages</literal>, e.g.
<programlisting>
environment.systemPackages = [ pkgs.my-package ];
</programlisting>
and you run <command>nixos-rebuild</command>, specifying your own
Nixpkgs tree:
and you run <command>nixos-rebuild</command>, specifying your own Nixpkgs
tree:
<screen>
# nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen>
</para>
</para>
<para>The second possibility is to add the package outside of the
Nixpkgs tree. For instance, here is how you specify a build of the
<link xlink:href="http://www.gnu.org/software/hello/">GNU Hello</link>
package directly in <filename>configuration.nix</filename>:
<para>
The second possibility is to add the package outside of the Nixpkgs tree. For
instance, here is how you specify a build of the
<link xlink:href="http://www.gnu.org/software/hello/">GNU Hello</link>
package directly in <filename>configuration.nix</filename>:
<programlisting>
environment.systemPackages =
let
@@ -53,13 +46,12 @@ environment.systemPackages =
in
[ my-hello ];
</programlisting>
Of course, you can also move the definition of
<literal>my-hello</literal> into a separate Nix expression, e.g.
Of course, you can also move the definition of <literal>my-hello</literal>
into a separate Nix expression, e.g.
<programlisting>
environment.systemPackages = [ (import ./my-hello.nix) ];
</programlisting>
where <filename>my-hello.nix</filename> contains:
where <filename>my-hello.nix</filename> contains:
<programlisting>
with import &lt;nixpkgs> {}; # bring all of Nixpkgs into scope
@@ -71,14 +63,11 @@ stdenv.mkDerivation rec {
};
}
</programlisting>
This allows testing the package easily:
This allows testing the package easily:
<screen>
$ nix-build my-hello.nix
$ ./result/bin/hello
Hello, world!
</screen>
</para>
</para>
</section>

View File

@@ -3,28 +3,25 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-configuration-file">
<title>NixOS Configuration File</title>
<title>NixOS Configuration File</title>
<para>The NixOS configuration file generally looks like this:
<para>
The NixOS configuration file generally looks like this:
<programlisting>
{ config, pkgs, ... }:
{ <replaceable>option definitions</replaceable>
}
</programlisting>
The first line (<literal>{ config, pkgs, ... }:</literal>) denotes
that this is actually a function that takes at least the two arguments
<varname>config</varname> and <varname>pkgs</varname>. (These are
explained later.) The function returns a <emphasis>set</emphasis> of
option definitions (<literal>{ <replaceable>...</replaceable> }</literal>). These definitions have the
form <literal><replaceable>name</replaceable> =
<replaceable>value</replaceable></literal>, where
<replaceable>name</replaceable> is the name of an option and
<replaceable>value</replaceable> is its value. For example,
The first line (<literal>{ config, pkgs, ... }:</literal>) denotes that this
is actually a function that takes at least the two arguments
<varname>config</varname> and <varname>pkgs</varname>. (These are explained
later.) The function returns a <emphasis>set</emphasis> of option definitions
(<literal>{ <replaceable>...</replaceable> }</literal>). These definitions
have the form <literal><replaceable>name</replaceable> =
<replaceable>value</replaceable></literal>, where
<replaceable>name</replaceable> is the name of an option and
<replaceable>value</replaceable> is its value. For example,
<programlisting>
{ config, pkgs, ... }:
@@ -33,19 +30,19 @@ form <literal><replaceable>name</replaceable> =
services.httpd.documentRoot = "/webroot";
}
</programlisting>
defines a configuration with three option definitions that together enable
the Apache HTTP Server with <filename>/webroot</filename> as the document
root.
</para>
defines a configuration with three option definitions that together
enable the Apache HTTP Server with <filename>/webroot</filename> as
the document root.</para>
<para>Sets can be nested, and in fact dots in option names are
shorthand for defining a set containing another set. For instance,
<option>services.httpd.enable</option> defines a set named
<varname>services</varname> that contains a set named
<varname>httpd</varname>, which in turn contains an option definition
named <varname>enable</varname> with value <literal>true</literal>.
This means that the example above can also be written as:
<para>
Sets can be nested, and in fact dots in option names are shorthand for
defining a set containing another set. For instance,
<option>services.httpd.enable</option> defines a set named
<varname>services</varname> that contains a set named
<varname>httpd</varname>, which in turn contains an option definition named
<varname>enable</varname> with value <literal>true</literal>. This means that
the example above can also be written as:
<programlisting>
{ config, pkgs, ... }:
@@ -58,46 +55,46 @@ This means that the example above can also be written as:
};
}
</programlisting>
which may be more convenient if you have lots of option definitions that
share the same prefix (such as <literal>services.httpd</literal>).
</para>
which may be more convenient if you have lots of option definitions
that share the same prefix (such as
<literal>services.httpd</literal>).</para>
<para>NixOS checks your option definitions for correctness. For
instance, if you try to define an option that doesnt exist (that is,
doesnt have a corresponding <emphasis>option declaration</emphasis>),
<command>nixos-rebuild</command> will give an error like:
<para>
NixOS checks your option definitions for correctness. For instance, if you
try to define an option that doesnt exist (that is, doesnt have a
corresponding <emphasis>option declaration</emphasis>),
<command>nixos-rebuild</command> will give an error like:
<screen>
The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist.
</screen>
Likewise, values in option definitions must have a correct type. For
instance, <option>services.httpd.enable</option> must be a Boolean
(<literal>true</literal> or <literal>false</literal>). Trying to give
it a value of another type, such as a string, will cause an error:
Likewise, values in option definitions must have a correct type. For
instance, <option>services.httpd.enable</option> must be a Boolean
(<literal>true</literal> or <literal>false</literal>). Trying to give it a
value of another type, such as a string, will cause an error:
<screen>
The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean.
</screen>
</para>
</para>
<para>Options have various types of values. The most important are:
<variablelist>
<varlistentry>
<term>Strings</term>
<para>
Options have various types of values. The most important are:
<variablelist>
<varlistentry>
<term>
Strings
</term>
<listitem>
<para>Strings are enclosed in double quotes, e.g.
<para>
Strings are enclosed in double quotes, e.g.
<programlisting>
networking.hostName = "dexter";
</programlisting>
Special characters can be escaped by prefixing them with a
backslash (e.g. <literal>\"</literal>).</para>
<para>Multi-line strings can be enclosed in <emphasis>double
single quotes</emphasis>, e.g.
Special characters can be escaped by prefixing them with a backslash
(e.g. <literal>\"</literal>).
</para>
<para>
Multi-line strings can be enclosed in <emphasis>double single
quotes</emphasis>, e.g.
<programlisting>
networking.extraHosts =
''
@@ -105,58 +102,58 @@ networking.extraHosts =
10.0.0.1 server
'';
</programlisting>
The main difference is that it strips from each line
a number of spaces equal to the minimal indentation of
the string as a whole (disregarding the indentation of
empty lines), and that characters like
<literal>"</literal> and <literal>\</literal> are not special
(making it more convenient for including things like shell
code).
See more info about this in the Nix manual <link
xlink:href="https://nixos.org/nix/manual/#ssec-values">here</link>.</para>
The main difference is that it strips from each line a number of spaces
equal to the minimal indentation of the string as a whole (disregarding
the indentation of empty lines), and that characters like
<literal>"</literal> and <literal>\</literal> are not special (making it
more convenient for including things like shell code). See more info
about this in the Nix manual
<link
xlink:href="https://nixos.org/nix/manual/#ssec-values">here</link>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Booleans</term>
</varlistentry>
<varlistentry>
<term>
Booleans
</term>
<listitem>
<para>These can be <literal>true</literal> or
<literal>false</literal>, e.g.
<para>
These can be <literal>true</literal> or <literal>false</literal>, e.g.
<programlisting>
networking.firewall.enable = true;
networking.firewall.allowPing = false;
</programlisting>
</para>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Integers</term>
</varlistentry>
<varlistentry>
<term>
Integers
</term>
<listitem>
<para>For example,
<para>
For example,
<programlisting>
boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60;
</programlisting>
(Note that here the attribute name
<literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in
quotes to prevent it from being interpreted as a set named
<literal>net</literal> containing a set named
<literal>ipv4</literal>, and so on. This is because its not a
NixOS option but the literal name of a Linux kernel
setting.)</para>
<literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in quotes to
prevent it from being interpreted as a set named <literal>net</literal>
containing a set named <literal>ipv4</literal>, and so on. This is
because its not a NixOS option but the literal name of a Linux kernel
setting.)
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Sets</term>
</varlistentry>
<varlistentry>
<term>
Sets
</term>
<listitem>
<para>Sets were introduced above. They are name/value pairs
enclosed in braces, as in the option definition
<para>
Sets were introduced above. They are name/value pairs enclosed in braces,
as in the option definition
<programlisting>
fileSystems."/boot" =
{ device = "/dev/sda1";
@@ -164,36 +161,36 @@ fileSystems."/boot" =
options = [ "rw" "data=ordered" "relatime" ];
};
</programlisting>
</para>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Lists</term>
</varlistentry>
<varlistentry>
<term>
Lists
</term>
<listitem>
<para>The important thing to note about lists is that list
elements are separated by whitespace, like this:
<para>
The important thing to note about lists is that list elements are
separated by whitespace, like this:
<programlisting>
boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
</programlisting>
List elements can be any other type, e.g. sets:
<programlisting>
swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
</programlisting>
</para>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>Packages</term>
</varlistentry>
<varlistentry>
<term>
Packages
</term>
<listitem>
<para>Usually, the packages you need are already part of the Nix
Packages collection, which is a set that can be accessed through
the function argument <varname>pkgs</varname>. Typical uses:
<para>
Usually, the packages you need are already part of the Nix Packages
collection, which is a set that can be accessed through the function
argument <varname>pkgs</varname>. Typical uses:
<programlisting>
environment.systemPackages =
[ pkgs.thunderbird
@@ -202,16 +199,12 @@ environment.systemPackages =
postgresql.package = pkgs.postgresql90;
</programlisting>
The latter option definition changes the default PostgreSQL
package used by NixOSs PostgreSQL service to 9.0. For more
information on packages, including how to add new ones, see
<xref linkend="sec-custom-packages"/>.</para>
The latter option definition changes the default PostgreSQL package used
by NixOSs PostgreSQL service to 9.0. For more information on packages,
including how to add new ones, see <xref linkend="sec-custom-packages"/>.
</para>
</listitem>
</varlistentry>
</variablelist>
</para>
</varlistentry>
</variablelist>
</para>
</section>

View File

@@ -3,25 +3,23 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-configuration-syntax">
<title>Configuration Syntax</title>
<para>The NixOS configuration file
<filename>/etc/nixos/configuration.nix</filename> is actually a
<emphasis>Nix expression</emphasis>, which is the Nix package
managers purely functional language for describing how to build
packages and configurations. This means you have all the expressive
power of that language at your disposal, including the ability to
abstract over common patterns, which is very useful when managing
complex systems. The syntax and semantics of the Nix language are
fully described in the <link
<title>Configuration Syntax</title>
<para>
The NixOS configuration file
<filename>/etc/nixos/configuration.nix</filename> is actually a <emphasis>Nix
expression</emphasis>, which is the Nix package managers purely functional
language for describing how to build packages and configurations. This means
you have all the expressive power of that language at your disposal,
including the ability to abstract over common patterns, which is very useful
when managing complex systems. The syntax and semantics of the Nix language
are fully described in the
<link
xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
manual</link>, but here we give a short overview of the most important
constructs useful in NixOS configuration files.</para>
<xi:include href="config-file.xml" />
<xi:include href="abstractions.xml" />
<xi:include href="modularity.xml" />
<xi:include href="summary.xml" />
manual</link>, but here we give a short overview of the most important
constructs useful in NixOS configuration files.
</para>
<xi:include href="config-file.xml" />
<xi:include href="abstractions.xml" />
<xi:include href="modularity.xml" />
<xi:include href="summary.xml" />
</chapter>

View File

@@ -3,31 +3,24 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="ch-configuration">
<title>Configuration</title>
<partintro>
<para>This chapter describes how to configure various aspects of a
NixOS machine through the configuration file
<filename>/etc/nixos/configuration.nix</filename>. As described in
<xref linkend="sec-changing-config" />, changes to this file only take
effect after you run <command>nixos-rebuild</command>.</para>
</partintro>
<xi:include href="config-syntax.xml" />
<xi:include href="package-mgmt.xml" />
<xi:include href="user-mgmt.xml" />
<xi:include href="file-systems.xml" />
<xi:include href="x-windows.xml" />
<xi:include href="xfce.xml" />
<xi:include href="networking.xml" />
<xi:include href="linux-kernel.xml" />
<xi:include href="modules.xml" xpointer="xpointer(//section[@id='modules']/*)" />
<title>Configuration</title>
<partintro>
<para>
This chapter describes how to configure various aspects of a NixOS machine
through the configuration file
<filename>/etc/nixos/configuration.nix</filename>. As described in
<xref linkend="sec-changing-config" />, changes to this file only take
effect after you run <command>nixos-rebuild</command>.
</para>
</partintro>
<xi:include href="config-syntax.xml" />
<xi:include href="package-mgmt.xml" />
<xi:include href="user-mgmt.xml" />
<xi:include href="file-systems.xml" />
<xi:include href="x-windows.xml" />
<xi:include href="xfce.xml" />
<xi:include href="networking.xml" />
<xi:include href="linux-kernel.xml" />
<xi:include href="../generated/modules.xml" xpointer="xpointer(//section[@id='modules']/*)" />
<!-- Apache; libvirtd virtualisation -->
</part>

View File

@@ -3,53 +3,50 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-customising-packages">
<title>Customising Packages</title>
<title>Customising Packages</title>
<para>
Some packages in Nixpkgs have options to enable or disable optional
functionality or change other aspects of the package. For instance, the
Firefox wrapper package (which provides Firefox with a set of plugins such as
the Adobe Flash player) has an option to enable the Google Talk plugin. It
can be set in <filename>configuration.nix</filename> as follows: <filename>
nixpkgs.config.firefox.enableGoogleTalkPlugin = true; </filename>
</para>
<para>Some packages in Nixpkgs have options to enable or disable
optional functionality or change other aspects of the package. For
instance, the Firefox wrapper package (which provides Firefox with a
set of plugins such as the Adobe Flash player) has an option to enable
the Google Talk plugin. It can be set in
<filename>configuration.nix</filename> as follows:
<filename>
nixpkgs.config.firefox.enableGoogleTalkPlugin = true;
</filename>
</para>
<warning><para>Unfortunately, Nixpkgs currently lacks a way to query
available configuration options.</para></warning>
<para>Apart from high-level options, its possible to tweak a package
in almost arbitrary ways, such as changing or disabling dependencies
of a package. For instance, the Emacs package in Nixpkgs by default
has a dependency on GTK+ 2. If you want to build it against GTK+ 3,
you can specify that as follows:
<warning>
<para>
Unfortunately, Nixpkgs currently lacks a way to query available
configuration options.
</para>
</warning>
<para>
Apart from high-level options, its possible to tweak a package in almost
arbitrary ways, such as changing or disabling dependencies of a package. For
instance, the Emacs package in Nixpkgs by default has a dependency on GTK+ 2.
If you want to build it against GTK+ 3, you can specify that as follows:
<programlisting>
environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];
</programlisting>
The function <varname>override</varname> performs the call to the Nix
function that produces Emacs, with the original arguments amended by the set
of arguments specified by you. So here the function argument
<varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>, causing
Emacs to depend on GTK+ 3. (The parentheses are necessary because in Nix,
function application binds more weakly than list construction, so without
them, <literal>environment.systemPackages</literal> would be a list with two
elements.)
</para>
The function <varname>override</varname> performs the call to the Nix
function that produces Emacs, with the original arguments amended by
the set of arguments specified by you. So here the function argument
<varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>,
causing Emacs to depend on GTK+ 3. (The parentheses are necessary
because in Nix, function application binds more weakly than list
construction, so without them,
<literal>environment.systemPackages</literal> would be a list with two
elements.)</para>
<para>Even greater customisation is possible using the function
<varname>overrideAttrs</varname>. While the
<varname>override</varname> mechanism above overrides the arguments of
a package function, <varname>overrideAttrs</varname> allows
changing the <emphasis>attributes</emphasis> passed to <literal>mkDerivation</literal>.
This permits changing any aspect of the package, such as the source code.
For instance, if you want to override the source code of Emacs, you
can say:
<para>
Even greater customisation is possible using the function
<varname>overrideAttrs</varname>. While the <varname>override</varname>
mechanism above overrides the arguments of a package function,
<varname>overrideAttrs</varname> allows changing the
<emphasis>attributes</emphasis> passed to <literal>mkDerivation</literal>.
This permits changing any aspect of the package, such as the source code. For
instance, if you want to override the source code of Emacs, you can say:
<programlisting>
environment.systemPackages = [
(pkgs.emacs.overrideAttrs (oldAttrs: {
@@ -58,36 +55,32 @@ environment.systemPackages = [
}))
];
</programlisting>
Here, <varname>overrideAttrs</varname> takes the Nix derivation specified by
<varname>pkgs.emacs</varname> and produces a new derivation in which the
originals <literal>name</literal> and <literal>src</literal> attribute
have been replaced by the given values by re-calling
<literal>stdenv.mkDerivation</literal>. The original attributes are
accessible via the function argument, which is conventionally named
<varname>oldAttrs</varname>.
</para>
Here, <varname>overrideAttrs</varname> takes the Nix derivation
specified by <varname>pkgs.emacs</varname> and produces a new
derivation in which the originals <literal>name</literal> and
<literal>src</literal> attribute have been replaced by the given
values by re-calling <literal>stdenv.mkDerivation</literal>.
The original attributes are accessible via the function argument,
which is conventionally named <varname>oldAttrs</varname>.</para>
<para>The overrides shown above are not global. They do not affect
the original package; other packages in Nixpkgs continue to depend on
the original rather than the customised package. This means that if
another package in your system depends on the original package, you
end up with two instances of the package. If you want to have
everything depend on your customised instance, you can apply a
<emphasis>global</emphasis> override as follows:
<para>
The overrides shown above are not global. They do not affect the original
package; other packages in Nixpkgs continue to depend on the original rather
than the customised package. This means that if another package in your
system depends on the original package, you end up with two instances of the
package. If you want to have everything depend on your customised instance,
you can apply a <emphasis>global</emphasis> override as follows:
<screen>
nixpkgs.config.packageOverrides = pkgs:
{ emacs = pkgs.emacs.override { gtk = pkgs.gtk3; };
};
</screen>
The effect of this definition is essentially equivalent to modifying
the <literal>emacs</literal> attribute in the Nixpkgs source tree.
Any package in Nixpkgs that depends on <literal>emacs</literal> will
be passed your customised instance. (However, the value
<literal>pkgs.emacs</literal> in
<varname>nixpkgs.config.packageOverrides</varname> refers to the
original rather than overridden instance, to prevent an infinite
recursion.)</para>
The effect of this definition is essentially equivalent to modifying the
<literal>emacs</literal> attribute in the Nixpkgs source tree. Any package in
Nixpkgs that depends on <literal>emacs</literal> will be passed your
customised instance. (However, the value <literal>pkgs.emacs</literal> in
<varname>nixpkgs.config.packageOverrides</varname> refers to the original
rather than overridden instance, to prevent an infinite recursion.)
</para>
</section>

View File

@@ -3,41 +3,41 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-declarative-package-mgmt">
<title>Declarative Package Management</title>
<title>Declarative Package Management</title>
<para>With declarative package management, you specify which packages
you want on your system by setting the option
<option>environment.systemPackages</option>. For instance, adding the
following line to <filename>configuration.nix</filename> enables the
Mozilla Thunderbird email application:
<para>
With declarative package management, you specify which packages you want on
your system by setting the option
<option>environment.systemPackages</option>. For instance, adding the
following line to <filename>configuration.nix</filename> enables the Mozilla
Thunderbird email application:
<programlisting>
environment.systemPackages = [ pkgs.thunderbird ];
</programlisting>
The effect of this specification is that the Thunderbird package from Nixpkgs
will be built or downloaded as part of the system when you run
<command>nixos-rebuild switch</command>.
</para>
The effect of this specification is that the Thunderbird package from
Nixpkgs will be built or downloaded as part of the system when you run
<command>nixos-rebuild switch</command>.</para>
<para>You can get a list of the available packages as follows:
<para>
You can get a list of the available packages as follows:
<screen>
$ nix-env -qaP '*' --description
nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded
<replaceable>...</replaceable>
</screen>
The first column in the output is the <emphasis>attribute name</emphasis>,
such as <literal>nixos.thunderbird</literal>. (The <literal>nixos</literal>
prefix allows distinguishing between different channels that you might have.)
</para>
The first column in the output is the <emphasis>attribute
name</emphasis>, such as
<literal>nixos.thunderbird</literal>. (The
<literal>nixos</literal> prefix allows distinguishing between
different channels that you might have.)</para>
<para>
To “uninstall” a package, simply remove it from
<option>environment.systemPackages</option> and run <command>nixos-rebuild
switch</command>.
</para>
<para>To “uninstall” a package, simply remove it from
<option>environment.systemPackages</option> and run
<command>nixos-rebuild switch</command>.</para>
<xi:include href="customizing-packages.xml" />
<xi:include href="adding-custom-packages.xml" />
<xi:include href="customizing-packages.xml" />
<xi:include href="adding-custom-packages.xml" />
</section>

View File

@@ -3,44 +3,40 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="ch-file-systems">
<title>File Systems</title>
<para>You can define file systems using the
<option>fileSystems</option> configuration option. For instance, the
following definition causes NixOS to mount the Ext4 file system on
device <filename>/dev/disk/by-label/data</filename> onto the mount
point <filename>/data</filename>:
<title>File Systems</title>
<para>
You can define file systems using the <option>fileSystems</option>
configuration option. For instance, the following definition causes NixOS to
mount the Ext4 file system on device
<filename>/dev/disk/by-label/data</filename> onto the mount point
<filename>/data</filename>:
<programlisting>
fileSystems."/data" =
{ device = "/dev/disk/by-label/data";
fsType = "ext4";
};
</programlisting>
Mount points are created automatically if they dont already exist.
For <option>device</option>, its best to use the topology-independent
device aliases in <filename>/dev/disk/by-label</filename> and
<filename>/dev/disk/by-uuid</filename>, as these dont change if the
topology changes (e.g. if a disk is moved to another IDE
controller).</para>
<para>You can usually omit the file system type
(<option>fsType</option>), since <command>mount</command> can usually
detect the type and load the necessary kernel module automatically.
However, if the file system is needed at early boot (in the initial
ramdisk) and is not <literal>ext2</literal>, <literal>ext3</literal>
or <literal>ext4</literal>, then its best to specify
<option>fsType</option> to ensure that the kernel module is
available.</para>
<note><para>System startup will fail if any of the filesystems fails to mount,
dropping you to the emergency shell.
You can make a mount asynchronous and non-critical by adding
<literal>options = [ "nofail" ];</literal>.
</para></note>
<xi:include href="luks-file-systems.xml" />
Mount points are created automatically if they dont already exist. For
<option>device</option>, its best to use the topology-independent device
aliases in <filename>/dev/disk/by-label</filename> and
<filename>/dev/disk/by-uuid</filename>, as these dont change if the
topology changes (e.g. if a disk is moved to another IDE controller).
</para>
<para>
You can usually omit the file system type (<option>fsType</option>), since
<command>mount</command> can usually detect the type and load the necessary
kernel module automatically. However, if the file system is needed at early
boot (in the initial ramdisk) and is not <literal>ext2</literal>,
<literal>ext3</literal> or <literal>ext4</literal>, then its best to
specify <option>fsType</option> to ensure that the kernel module is
available.
</para>
<note>
<para>
System startup will fail if any of the filesystems fails to mount, dropping
you to the emergency shell. You can make a mount asynchronous and
non-critical by adding <literal>options = [ "nofail" ];</literal>.
</para>
</note>
<xi:include href="luks-file-systems.xml" />
</chapter>

View File

@@ -3,49 +3,43 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-firewall">
<title>Firewall</title>
<title>Firewall</title>
<para>NixOS has a simple stateful firewall that blocks incoming
connections and other unexpected packets. The firewall applies to
both IPv4 and IPv6 traffic. It is enabled by default. It can be
disabled as follows:
<para>
NixOS has a simple stateful firewall that blocks incoming connections and
other unexpected packets. The firewall applies to both IPv4 and IPv6 traffic.
It is enabled by default. It can be disabled as follows:
<programlisting>
networking.firewall.enable = false;
</programlisting>
If the firewall is enabled, you can open specific TCP ports to the
outside world:
If the firewall is enabled, you can open specific TCP ports to the outside
world:
<programlisting>
networking.firewall.allowedTCPPorts = [ 80 443 ];
</programlisting>
Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is
enabled (<option>services.openssh.enable = true</option>). UDP ports can be
opened through <option>networking.firewall.allowedUDPPorts</option>.
</para>
Note that TCP port 22 (ssh) is opened automatically if the SSH daemon
is enabled (<option>services.openssh.enable = true</option>). UDP
ports can be opened through
<option>networking.firewall.allowedUDPPorts</option>.</para>
<para>To open ranges of TCP ports:
<para>
To open ranges of TCP ports:
<programlisting>
networking.firewall.allowedTCPPortRanges = [
{ from = 4000; to = 4007; }
{ from = 8000; to = 8010; }
];
</programlisting>
Similarly, UDP port ranges can be opened through
<option>networking.firewall.allowedUDPPortRanges</option>.
</para>
Similarly, UDP port ranges can be opened through
<option>networking.firewall.allowedUDPPortRanges</option>.</para>
<para>Also of interest is
<para>
Also of interest is
<programlisting>
networking.firewall.allowPing = true;
</programlisting>
to allow the machine to respond to ping requests. (ICMPv6 pings are
always allowed.)</para>
to allow the machine to respond to ping requests. (ICMPv6 pings are always
allowed.)
</para>
</section>

View File

@@ -3,42 +3,38 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-ipv4">
<title>IPv4 Configuration</title>
<title>IPv4 Configuration</title>
<para>By default, NixOS uses DHCP (specifically,
<command>dhcpcd</command>) to automatically configure network
interfaces. However, you can configure an interface manually as
follows:
<para>
By default, NixOS uses DHCP (specifically, <command>dhcpcd</command>) to
automatically configure network interfaces. However, you can configure an
interface manually as follows:
<programlisting>
networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ];
</programlisting>
Typically youll also want to set a default gateway and set of name
servers:
Typically youll also want to set a default gateway and set of name
servers:
<programlisting>
networking.defaultGateway = "192.168.1.1";
networking.nameservers = [ "8.8.8.8" ];
</programlisting>
</para>
</para>
<note><para>Statically configured interfaces are set up by the systemd
service
<replaceable>interface-name</replaceable><literal>-cfg.service</literal>.
The default gateway and name server configuration is performed by
<literal>network-setup.service</literal>.</para></note>
<para>The host name is set using <option>networking.hostName</option>:
<note>
<para>
Statically configured interfaces are set up by the systemd service
<replaceable>interface-name</replaceable><literal>-cfg.service</literal>.
The default gateway and name server configuration is performed by
<literal>network-setup.service</literal>.
</para>
</note>
<para>
The host name is set using <option>networking.hostName</option>:
<programlisting>
networking.hostName = "cartman";
</programlisting>
The default host name is <literal>nixos</literal>. Set it to the
empty string (<literal>""</literal>) to allow the DHCP server to
provide the host name.</para>
The default host name is <literal>nixos</literal>. Set it to the empty string
(<literal>""</literal>) to allow the DHCP server to provide the host name.
</para>
</section>

View File

@@ -3,44 +3,45 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-ipv6">
<title>IPv6 Configuration</title>
<title>IPv6 Configuration</title>
<para>IPv6 is enabled by default. Stateless address autoconfiguration
is used to automatically assign IPv6 addresses to all interfaces. You
can disable IPv6 support globally by setting:
<para>
IPv6 is enabled by default. Stateless address autoconfiguration is used to
automatically assign IPv6 addresses to all interfaces. You can disable IPv6
support globally by setting:
<programlisting>
networking.enableIPv6 = false;
</programlisting></para>
<para>You can disable IPv6 on a single interface using a normal sysctl (in this
example, we use interface <varname>eth0</varname>):
</programlisting>
</para>
<para>
You can disable IPv6 on a single interface using a normal sysctl (in this
example, we use interface <varname>eth0</varname>):
<programlisting>
boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true;
</programlisting>
</para>
<para>As with IPv4 networking interfaces are automatically configured via
DHCPv6. You can configure an interface manually:
</para>
<para>
As with IPv4 networking interfaces are automatically configured via DHCPv6.
You can configure an interface manually:
<programlisting>
networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ];
</programlisting>
</para>
<para>For configuring a gateway, optionally with explicitly specified interface:
</para>
<para>
For configuring a gateway, optionally with explicitly specified interface:
<programlisting>
networking.defaultGateway6 = {
address = "fe00::1";
interface = "enp0s3";
}
</programlisting>
</para>
<para>See <xref linkend='sec-ipv4' /> for similar examples and additional information.
</para>
</para>
<para>
See <xref linkend='sec-ipv4' /> for similar examples and additional
information.
</para>
</section>

View File

@@ -3,29 +3,29 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-kernel-config">
<title>Linux Kernel</title>
<para>You can override the Linux kernel and associated packages using
the option <option>boot.kernelPackages</option>. For instance, this
selects the Linux 3.10 kernel:
<title>Linux Kernel</title>
<para>
You can override the Linux kernel and associated packages using the option
<option>boot.kernelPackages</option>. For instance, this selects the Linux
3.10 kernel:
<programlisting>
boot.kernelPackages = pkgs.linuxPackages_3_10;
</programlisting>
Note that this not only replaces the kernel, but also packages that
are specific to the kernel version, such as the NVIDIA video drivers.
This ensures that driver packages are consistent with the
kernel.</para>
<para>The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command:
Note that this not only replaces the kernel, but also packages that are
specific to the kernel version, such as the NVIDIA video drivers. This
ensures that driver packages are consistent with the kernel.
</para>
<para>
The default Linux kernel configuration should be fine for most users. You can
see the configuration of your current kernel with the following command:
<programlisting>
zcat /proc/config.gz
</programlisting>
If you want to change the kernel configuration, you can use the
<option>packageOverrides</option> feature (see <xref
linkend="sec-customising-packages" />). For instance, to enable
support for the kernel debugger KGDB:
If you want to change the kernel configuration, you can use the
<option>packageOverrides</option> feature (see
<xref
linkend="sec-customising-packages" />). For instance, to enable support
for the kernel debugger KGDB:
<programlisting>
nixpkgs.config.packageOverrides = pkgs:
{ linux_3_4 = pkgs.linux_3_4.override {
@@ -36,47 +36,46 @@ nixpkgs.config.packageOverrides = pkgs:
};
};
</programlisting>
<varname>extraConfig</varname> takes a list of Linux kernel
configuration options, one per line. The name of the option should
not include the prefix <literal>CONFIG_</literal>. The option value
is typically <literal>y</literal>, <literal>n</literal> or
<literal>m</literal> (to build something as a kernel module).</para>
<para>Kernel modules for hardware devices are generally loaded
automatically by <command>udev</command>. You can force a module to
be loaded via <option>boot.kernelModules</option>, e.g.
<varname>extraConfig</varname> takes a list of Linux kernel configuration
options, one per line. The name of the option should not include the prefix
<literal>CONFIG_</literal>. The option value is typically
<literal>y</literal>, <literal>n</literal> or <literal>m</literal> (to build
something as a kernel module).
</para>
<para>
Kernel modules for hardware devices are generally loaded automatically by
<command>udev</command>. You can force a module to be loaded via
<option>boot.kernelModules</option>, e.g.
<programlisting>
boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
</programlisting>
If the module is required early during the boot (e.g. to mount the
root file system), you can use
<option>boot.initrd.extraKernelModules</option>:
If the module is required early during the boot (e.g. to mount the root file
system), you can use <option>boot.initrd.extraKernelModules</option>:
<programlisting>
boot.initrd.extraKernelModules = [ "cifs" ];
</programlisting>
This causes the specified modules and their dependencies to be added
to the initial ramdisk.</para>
<para>Kernel runtime parameters can be set through
<option>boot.kernel.sysctl</option>, e.g.
This causes the specified modules and their dependencies to be added to the
initial ramdisk.
</para>
<para>
Kernel runtime parameters can be set through
<option>boot.kernel.sysctl</option>, e.g.
<programlisting>
boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120;
</programlisting>
sets the kernels TCP keepalive time to 120 seconds. To see the
available parameters, run <command>sysctl -a</command>.</para>
<section>
sets the kernels TCP keepalive time to 120 seconds. To see the available
parameters, run <command>sysctl -a</command>.
</para>
<section>
<title>Developing kernel modules</title>
<para>When developing kernel modules it's often convenient to run
edit-compile-run loop as quickly as possible.
See below snippet as an example of developing <literal>mellanox</literal>
drivers.
<para>
When developing kernel modules it's often convenient to run edit-compile-run
loop as quickly as possible. See below snippet as an example of developing
<literal>mellanox</literal> drivers.
</para>
<screen><![CDATA[
<screen><![CDATA[
$ nix-build '<nixpkgs>' -A linuxPackages.kernel.dev
$ nix-shell '<nixpkgs>' -A linuxPackages.kernel
$ unpackPhase
@@ -84,7 +83,5 @@ $ cd linux-*
$ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules
# insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko
]]></screen>
</section>
</section>
</chapter>

View File

@@ -3,14 +3,13 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-luks-file-systems">
<title>LUKS-Encrypted File Systems</title>
<title>LUKS-Encrypted File Systems</title>
<para>NixOS supports file systems that are encrypted using
<emphasis>LUKS</emphasis> (Linux Unified Key Setup). For example,
here is how you create an encrypted Ext4 file system on the device
<filename>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</filename>:
<para>
NixOS supports file systems that are encrypted using
<emphasis>LUKS</emphasis> (Linux Unified Key Setup). For example, here is how
you create an encrypted Ext4 file system on the device
<filename>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</filename>:
<screen>
# cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d
@@ -27,20 +26,15 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: ***
# mkfs.ext4 /dev/mapper/crypted
</screen>
To ensure that this file system is automatically mounted at boot time
as <filename>/</filename>, add the following to
<filename>configuration.nix</filename>:
To ensure that this file system is automatically mounted at boot time as
<filename>/</filename>, add the following to
<filename>configuration.nix</filename>:
<programlisting>
boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d";
fileSystems."/".device = "/dev/mapper/crypted";
</programlisting>
Should grub be used as bootloader, and <filename>/boot</filename> is located
on an encrypted partition, it is necessary to add the following grub option:
Should grub be used as bootloader, and <filename>/boot</filename> is located
on an encrypted partition, it is necessary to add the following grub option:
<programlisting>boot.loader.grub.enableCryptodisk = true;</programlisting>
</para>
</para>
</section>

View File

@@ -3,21 +3,21 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-modularity">
<title>Modularity</title>
<title>Modularity</title>
<para>The NixOS configuration mechanism is modular. If your
<filename>configuration.nix</filename> becomes too big, you can split
it into multiple files. Likewise, if you have multiple NixOS
configurations (e.g. for different computers) with some commonality,
you can move the common configuration into a shared file.</para>
<para>Modules have exactly the same syntax as
<filename>configuration.nix</filename>. In fact,
<filename>configuration.nix</filename> is itself a module. You can
use other modules by including them from
<filename>configuration.nix</filename>, e.g.:
<para>
The NixOS configuration mechanism is modular. If your
<filename>configuration.nix</filename> becomes too big, you can split it into
multiple files. Likewise, if you have multiple NixOS configurations (e.g. for
different computers) with some commonality, you can move the common
configuration into a shared file.
</para>
<para>
Modules have exactly the same syntax as
<filename>configuration.nix</filename>. In fact,
<filename>configuration.nix</filename> is itself a module. You can use other
modules by including them from <filename>configuration.nix</filename>, e.g.:
<programlisting>
{ config, pkgs, ... }:
@@ -27,11 +27,9 @@ use other modules by including them from
<replaceable>...</replaceable>
}
</programlisting>
Here, we include two modules from the same directory,
<filename>vpn.nix</filename> and <filename>kde.nix</filename>. The
latter might look like this:
Here, we include two modules from the same directory,
<filename>vpn.nix</filename> and <filename>kde.nix</filename>. The latter
might look like this:
<programlisting>
{ config, pkgs, ... }:
@@ -40,59 +38,55 @@ latter might look like this:
services.xserver.desktopManager.plasma5.enable = true;
}
</programlisting>
Note that both <filename>configuration.nix</filename> and
<filename>kde.nix</filename> define the option
<option>environment.systemPackages</option>. When multiple modules
define an option, NixOS will try to <emphasis>merge</emphasis> the
definitions. In the case of
<option>environment.systemPackages</option>, thats easy: the lists of
packages can simply be concatenated. The value in
<filename>configuration.nix</filename> is merged last, so for
list-type options, it will appear at the end of the merged list. If
you want it to appear first, you can use <varname>mkBefore</varname>:
Note that both <filename>configuration.nix</filename> and
<filename>kde.nix</filename> define the option
<option>environment.systemPackages</option>. When multiple modules define an
option, NixOS will try to <emphasis>merge</emphasis> the definitions. In the
case of <option>environment.systemPackages</option>, thats easy: the lists
of packages can simply be concatenated. The value in
<filename>configuration.nix</filename> is merged last, so for list-type
options, it will appear at the end of the merged list. If you want it to
appear first, you can use <varname>mkBefore</varname>:
<programlisting>
boot.kernelModules = mkBefore [ "kvm-intel" ];
</programlisting>
This causes the <literal>kvm-intel</literal> kernel module to be loaded
before any other kernel modules.
</para>
This causes the <literal>kvm-intel</literal> kernel module to be
loaded before any other kernel modules.</para>
<para>For other types of options, a merge may not be possible. For
instance, if two modules define
<option>services.httpd.adminAddr</option>,
<command>nixos-rebuild</command> will give an error:
<para>
For other types of options, a merge may not be possible. For instance, if two
modules define <option>services.httpd.adminAddr</option>,
<command>nixos-rebuild</command> will give an error:
<screen>
The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'.
</screen>
When that happens, its possible to force one definition take
precedence over the others:
When that happens, its possible to force one definition take precedence
over the others:
<programlisting>
services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org";
</programlisting>
</para>
</para>
<para>When using multiple modules, you may need to access
configuration values defined in other modules. This is what the
<varname>config</varname> function argument is for: it contains the
complete, merged system configuration. That is,
<varname>config</varname> is the result of combining the
configurations returned by every module<footnote><para>If youre
wondering how its possible that the (indirect)
<emphasis>result</emphasis> of a function is passed as an
<emphasis>input</emphasis> to that same function: thats because Nix
is a “lazy” language — it only computes values when they are needed.
This works as long as no individual configuration value depends on
itself.</para></footnote>. For example, here is a module that adds
some packages to <option>environment.systemPackages</option> only if
<option>services.xserver.enable</option> is set to
<literal>true</literal> somewhere else:
<para>
When using multiple modules, you may need to access configuration values
defined in other modules. This is what the <varname>config</varname> function
argument is for: it contains the complete, merged system configuration. That
is, <varname>config</varname> is the result of combining the configurations
returned by every module
<footnote>
<para>
If youre wondering how its possible that the (indirect)
<emphasis>result</emphasis> of a function is passed as an
<emphasis>input</emphasis> to that same function: thats because Nix is a
“lazy” language — it only computes values when they are needed. This
works as long as no individual configuration value depends on itself.
</para>
</footnote>
. For example, here is a module that adds some packages to
<option>environment.systemPackages</option> only if
<option>services.xserver.enable</option> is set to <literal>true</literal>
somewhere else:
<programlisting>
{ config, pkgs, ... }:
@@ -105,13 +99,12 @@ some packages to <option>environment.systemPackages</option> only if
[ ];
}
</programlisting>
</para>
</para>
<para>With multiple modules, it may not be obvious what the final
value of a configuration option is. The command
<option>nixos-option</option> allows you to find out:
<para>
With multiple modules, it may not be obvious what the final value of a
configuration option is. The command <option>nixos-option</option> allows you
to find out:
<screen>
$ nixos-option services.xserver.enable
true
@@ -119,14 +112,11 @@ true
$ nixos-option boot.kernelModules
[ "tun" "ipv6" "loop" <replaceable>...</replaceable> ]
</screen>
Interactive exploration of the configuration is possible using
<command
Interactive exploration of the configuration is possible using
<command
xlink:href="https://github.com/edolstra/nix-repl">nix-repl</command>,
a read-eval-print loop for Nix expressions. Its not installed by
default; run <literal>nix-env -i nix-repl</literal> to get it. A
typical use:
a read-eval-print loop for Nix expressions. Its not installed by default;
run <literal>nix-env -i nix-repl</literal> to get it. A typical use:
<screen>
$ nix-repl '&lt;nixpkgs/nixos>'
@@ -136,7 +126,5 @@ nix-repl> config.networking.hostName
nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts
[ "example.org" "example.gov" ]
</screen>
</para>
</para>
</section>

View File

@@ -3,39 +3,42 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-networkmanager">
<title>NetworkManager</title>
<title>NetworkManager</title>
<para>To facilitate network configuration, some desktop environments
use NetworkManager. You can enable NetworkManager by setting:
<para>
To facilitate network configuration, some desktop environments use
NetworkManager. You can enable NetworkManager by setting:
<programlisting>
networking.networkmanager.enable = true;
</programlisting>
some desktop managers (e.g., GNOME) enable NetworkManager automatically for
you.
</para>
some desktop managers (e.g., GNOME) enable NetworkManager
automatically for you.</para>
<para>All users that should have permission to change network settings must
belong to the <code>networkmanager</code> group:
<para>
All users that should have permission to change network settings must belong
to the <code>networkmanager</code> group:
<programlisting>
users.extraUsers.youruser.extraGroups = [ "networkmanager" ];
users.users.alice.extraGroups = [ "networkmanager" ];
</programlisting>
</para>
</para>
<para>NetworkManager is controlled using either <command>nmcli</command> or
<command>nmtui</command> (curses-based terminal user interface). See their
manual pages for details on their usage. Some desktop environments (GNOME, KDE)
have their own configuration tools for NetworkManager. On XFCE, there is no
configuration tool for NetworkManager by default: by adding
<code>networkmanagerapplet</code> to the list of system packages, the graphical
applet will be installed and will launch automatically when XFCE is starting
(and will show in the status tray).</para>
<note><para><code>networking.networkmanager</code> and
<code>networking.wireless</code> (WPA Supplicant) cannot be enabled at the same
time: you can still connect to the wireless networks using
NetworkManager.</para></note>
<para>
NetworkManager is controlled using either <command>nmcli</command> or
<command>nmtui</command> (curses-based terminal user interface). See their
manual pages for details on their usage. Some desktop environments (GNOME,
KDE) have their own configuration tools for NetworkManager. On XFCE, there is
no configuration tool for NetworkManager by default: by adding
<code>networkmanagerapplet</code> to the list of system packages, the
graphical applet will be installed and will launch automatically when XFCE is
starting (and will show in the status tray).
</para>
<note>
<para>
<code>networking.networkmanager</code> and <code>networking.wireless</code>
(WPA Supplicant) cannot be enabled at the same time: you can still connect
to the wireless networks using NetworkManager.
</para>
</note>
</section>

View File

@@ -3,20 +3,17 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-networking">
<title>Networking</title>
<para>This section describes how to configure networking components on
your NixOS machine.</para>
<xi:include href="network-manager.xml" />
<xi:include href="ssh.xml" />
<xi:include href="ipv4-config.xml" />
<xi:include href="ipv6-config.xml" />
<xi:include href="firewall.xml" />
<xi:include href="wireless.xml" />
<xi:include href="ad-hoc-network-config.xml" />
<title>Networking</title>
<para>
This section describes how to configure networking components on your NixOS
machine.
</para>
<xi:include href="network-manager.xml" />
<xi:include href="ssh.xml" />
<xi:include href="ipv4-config.xml" />
<xi:include href="ipv6-config.xml" />
<xi:include href="firewall.xml" />
<xi:include href="wireless.xml" />
<xi:include href="ad-hoc-network-config.xml" />
<!-- TODO: OpenVPN, NAT -->
</chapter>

View File

@@ -3,32 +3,29 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-package-management">
<title>Package Management</title>
<para>This section describes how to add additional packages to your
system. NixOS has two distinct styles of package management:
<itemizedlist>
<listitem><para><emphasis>Declarative</emphasis>, where you declare
what packages you want in your
<filename>configuration.nix</filename>. Every time you run
<command>nixos-rebuild</command>, NixOS will ensure that you get a
consistent set of binaries corresponding to your
specification.</para></listitem>
<listitem><para><emphasis>Ad hoc</emphasis>, where you install,
upgrade and uninstall packages via the <command>nix-env</command>
command. This style allows mixing packages from different Nixpkgs
versions. Its the only choice for non-root
users.</para></listitem>
</itemizedlist>
</para>
<xi:include href="declarative-packages.xml" />
<xi:include href="ad-hoc-packages.xml" />
<title>Package Management</title>
<para>
This section describes how to add additional packages to your system. NixOS
has two distinct styles of package management:
<itemizedlist>
<listitem>
<para>
<emphasis>Declarative</emphasis>, where you declare what packages you want
in your <filename>configuration.nix</filename>. Every time you run
<command>nixos-rebuild</command>, NixOS will ensure that you get a
consistent set of binaries corresponding to your specification.
</para>
</listitem>
<listitem>
<para>
<emphasis>Ad hoc</emphasis>, where you install, upgrade and uninstall
packages via the <command>nix-env</command> command. This style allows
mixing packages from different Nixpkgs versions. Its the only choice
for non-root users.
</para>
</listitem>
</itemizedlist>
</para>
<xi:include href="declarative-packages.xml" />
<xi:include href="ad-hoc-packages.xml" />
</chapter>

View File

@@ -3,30 +3,25 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-ssh">
<title>Secure Shell Access</title>
<title>Secure Shell Access</title>
<para>Secure shell (SSH) access to your machine can be enabled by
setting:
<para>
Secure shell (SSH) access to your machine can be enabled by setting:
<programlisting>
services.openssh.enable = true;
</programlisting>
By default, root logins using a password are disallowed. They can be disabled
entirely by setting <literal>services.openssh.permitRootLogin</literal> to
<literal>"no"</literal>.
</para>
By default, root logins using a password are disallowed. They can be
disabled entirely by setting
<literal>services.openssh.permitRootLogin</literal> to
<literal>"no"</literal>.</para>
<para>You can declaratively specify authorised RSA/DSA public keys for
a user as follows:
<para>
You can declaratively specify authorised RSA/DSA public keys for a user as
follows:
<!-- FIXME: this might not work if the user is unmanaged. -->
<programlisting>
users.extraUsers.alice.openssh.authorizedKeys.keys =
users.users.alice.openssh.authorizedKeys.keys =
[ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
</programlisting>
</para>
</para>
</section>

View File

@@ -3,190 +3,225 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-nix-syntax-summary">
<title>Syntax Summary</title>
<title>Syntax Summary</title>
<para>Below is a summary of the most important syntactic constructs in
the Nix expression language. Its not complete. In particular, there
are many other built-in functions. See the <link
<para>
Below is a summary of the most important syntactic constructs in the Nix
expression language. Its not complete. In particular, there are many other
built-in functions. See the
<link
xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
manual</link> for the rest.</para>
manual</link> for the rest.
</para>
<informaltable frame='none'>
<informaltable frame='none'>
<tgroup cols='2'>
<colspec colname='c1' rowsep='1' colsep='1' />
<colspec colname='c2' rowsep='1' />
<thead>
<row>
<entry>Example</entry>
<entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry namest="c1" nameend="c2"><emphasis>Basic values</emphasis></entry>
</row>
<row>
<entry><literal>"Hello world"</literal></entry>
<entry>A string</entry>
</row>
<row>
<entry><literal>"${pkgs.bash}/bin/sh"</literal></entry>
<entry>A string containing an expression (expands to <literal>"/nix/store/<replaceable>hash</replaceable>-bash-<replaceable>version</replaceable>/bin/sh"</literal>)</entry>
</row>
<row>
<entry><literal>true</literal>, <literal>false</literal></entry>
<entry>Booleans</entry>
</row>
<row>
<entry><literal>123</literal></entry>
<entry>An integer</entry>
</row>
<row>
<entry><literal>./foo.png</literal></entry>
<entry>A path (relative to the containing Nix expression)</entry>
</row>
<row>
<entry namest="c1" nameend="c2"><emphasis>Compound values</emphasis></entry>
</row>
<row>
<entry><literal>{ x = 1; y = 2; }</literal></entry>
<entry>An set with attributes names <literal>x</literal> and <literal>y</literal></entry>
</row>
<row>
<entry><literal>{ foo.bar = 1; }</literal></entry>
<entry>A nested set, equivalent to <literal>{ foo = { bar = 1; }; }</literal></entry>
</row>
<row>
<entry><literal>rec { x = "foo"; y = x + "bar"; }</literal></entry>
<entry>A recursive set, equivalent to <literal>{ x = "foo"; y = "foobar"; }</literal></entry>
</row>
<row>
<entry><literal>[ "foo" "bar" ]</literal></entry>
<entry>A list with two elements</entry>
</row>
<row>
<entry namest="c1" nameend="c2"><emphasis>Operators</emphasis></entry>
</row>
<row>
<entry><literal>"foo" + "bar"</literal></entry>
<entry>String concatenation</entry>
</row>
<row>
<entry><literal>1 + 2</literal></entry>
<entry>Integer addition</entry>
</row>
<row>
<entry><literal>"foo" == "f" + "oo"</literal></entry>
<entry>Equality test (evaluates to <literal>true</literal>)</entry>
</row>
<row>
<entry><literal>"foo" != "bar"</literal></entry>
<entry>Inequality test (evaluates to <literal>true</literal>)</entry>
</row>
<row>
<entry><literal>!true</literal></entry>
<entry>Boolean negation</entry>
</row>
<row>
<entry><literal>{ x = 1; y = 2; }.x</literal></entry>
<entry>Attribute selection (evaluates to <literal>1</literal>)</entry>
</row>
<row>
<entry><literal>{ x = 1; y = 2; }.z or 3</literal></entry>
<entry>Attribute selection with default (evaluates to <literal>3</literal>)</entry>
</row>
<row>
<entry><literal>{ x = 1; y = 2; } // { z = 3; }</literal></entry>
<entry>Merge two sets (attributes in the right-hand set taking precedence)</entry>
</row>
<row>
<entry namest="c1" nameend="c2"><emphasis>Control structures</emphasis></entry>
</row>
<row>
<entry><literal>if 1 + 1 == 2 then "yes!" else "no!"</literal></entry>
<entry>Conditional expression</entry>
</row>
<row>
<entry><literal>assert 1 + 1 == 2; "yes!"</literal></entry>
<entry>Assertion check (evaluates to <literal>"yes!"</literal>). See <xref
<colspec colname='c1' rowsep='1' colsep='1' />
<colspec colname='c2' rowsep='1' />
<thead>
<row>
<entry>Example</entry>
<entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry namest="c1" nameend="c2"><emphasis>Basic values</emphasis>
</entry>
</row>
<row>
<entry><literal>"Hello world"</literal>
</entry>
<entry>A string</entry>
</row>
<row>
<entry><literal>"${pkgs.bash}/bin/sh"</literal>
</entry>
<entry>A string containing an expression (expands to <literal>"/nix/store/<replaceable>hash</replaceable>-bash-<replaceable>version</replaceable>/bin/sh"</literal>)</entry>
</row>
<row>
<entry><literal>true</literal>, <literal>false</literal>
</entry>
<entry>Booleans</entry>
</row>
<row>
<entry><literal>123</literal>
</entry>
<entry>An integer</entry>
</row>
<row>
<entry><literal>./foo.png</literal>
</entry>
<entry>A path (relative to the containing Nix expression)</entry>
</row>
<row>
<entry namest="c1" nameend="c2"><emphasis>Compound values</emphasis>
</entry>
</row>
<row>
<entry><literal>{ x = 1; y = 2; }</literal>
</entry>
<entry>An set with attributes names <literal>x</literal> and <literal>y</literal>
</entry>
</row>
<row>
<entry><literal>{ foo.bar = 1; }</literal>
</entry>
<entry>A nested set, equivalent to <literal>{ foo = { bar = 1; }; }</literal>
</entry>
</row>
<row>
<entry><literal>rec { x = "foo"; y = x + "bar"; }</literal>
</entry>
<entry>A recursive set, equivalent to <literal>{ x = "foo"; y = "foobar"; }</literal>
</entry>
</row>
<row>
<entry><literal>[ "foo" "bar" ]</literal>
</entry>
<entry>A list with two elements</entry>
</row>
<row>
<entry namest="c1" nameend="c2"><emphasis>Operators</emphasis>
</entry>
</row>
<row>
<entry><literal>"foo" + "bar"</literal>
</entry>
<entry>String concatenation</entry>
</row>
<row>
<entry><literal>1 + 2</literal>
</entry>
<entry>Integer addition</entry>
</row>
<row>
<entry><literal>"foo" == "f" + "oo"</literal>
</entry>
<entry>Equality test (evaluates to <literal>true</literal>)</entry>
</row>
<row>
<entry><literal>"foo" != "bar"</literal>
</entry>
<entry>Inequality test (evaluates to <literal>true</literal>)</entry>
</row>
<row>
<entry><literal>!true</literal>
</entry>
<entry>Boolean negation</entry>
</row>
<row>
<entry><literal>{ x = 1; y = 2; }.x</literal>
</entry>
<entry>Attribute selection (evaluates to <literal>1</literal>)</entry>
</row>
<row>
<entry><literal>{ x = 1; y = 2; }.z or 3</literal>
</entry>
<entry>Attribute selection with default (evaluates to <literal>3</literal>)</entry>
</row>
<row>
<entry><literal>{ x = 1; y = 2; } // { z = 3; }</literal>
</entry>
<entry>Merge two sets (attributes in the right-hand set taking precedence)</entry>
</row>
<row>
<entry namest="c1" nameend="c2"><emphasis>Control structures</emphasis>
</entry>
</row>
<row>
<entry><literal>if 1 + 1 == 2 then "yes!" else "no!"</literal>
</entry>
<entry>Conditional expression</entry>
</row>
<row>
<entry><literal>assert 1 + 1 == 2; "yes!"</literal>
</entry>
<entry>Assertion check (evaluates to <literal>"yes!"</literal>). See <xref
linkend="sec-assertions"/> for using assertions in modules</entry>
</row>
<row>
<entry><literal>let x = "foo"; y = "bar"; in x + y</literal></entry>
<entry>Variable definition</entry>
</row>
<row>
<entry><literal>with pkgs.lib; head [ 1 2 3 ]</literal></entry>
<entry>Add all attributes from the given set to the scope
</row>
<row>
<entry><literal>let x = "foo"; y = "bar"; in x + y</literal>
</entry>
<entry>Variable definition</entry>
</row>
<row>
<entry><literal>with pkgs.lib; head [ 1 2 3 ]</literal>
</entry>
<entry>Add all attributes from the given set to the scope
(evaluates to <literal>1</literal>)</entry>
</row>
<row>
<entry namest="c1" nameend="c2"><emphasis>Functions (lambdas)</emphasis></entry>
</row>
<row>
<entry><literal>x: x + 1</literal></entry>
<entry>A function that expects an integer and returns it increased by 1</entry>
</row>
<row>
<entry><literal>(x: x + 1) 100</literal></entry>
<entry>A function call (evaluates to 101)</entry>
</row>
<row>
<entry><literal>let inc = x: x + 1; in inc (inc (inc 100))</literal></entry>
<entry>A function bound to a variable and subsequently called by name (evaluates to 103)</entry>
</row>
<row>
<entry><literal>{ x, y }: x + y</literal></entry>
<entry>A function that expects a set with required attributes
</row>
<row>
<entry namest="c1" nameend="c2"><emphasis>Functions (lambdas)</emphasis>
</entry>
</row>
<row>
<entry><literal>x: x + 1</literal>
</entry>
<entry>A function that expects an integer and returns it increased by 1</entry>
</row>
<row>
<entry><literal>(x: x + 1) 100</literal>
</entry>
<entry>A function call (evaluates to 101)</entry>
</row>
<row>
<entry><literal>let inc = x: x + 1; in inc (inc (inc 100))</literal>
</entry>
<entry>A function bound to a variable and subsequently called by name (evaluates to 103)</entry>
</row>
<row>
<entry><literal>{ x, y }: x + y</literal>
</entry>
<entry>A function that expects a set with required attributes
<literal>x</literal> and <literal>y</literal> and concatenates
them</entry>
</row>
<row>
<entry><literal>{ x, y ? "bar" }: x + y</literal></entry>
<entry>A function that expects a set with required attribute
</row>
<row>
<entry><literal>{ x, y ? "bar" }: x + y</literal>
</entry>
<entry>A function that expects a set with required attribute
<literal>x</literal> and optional <literal>y</literal>, using
<literal>"bar"</literal> as default value for
<literal>y</literal></entry>
</row>
<row>
<entry><literal>{ x, y, ... }: x + y</literal></entry>
<entry>A function that expects a set with required attributes
<literal>y</literal>
</entry>
</row>
<row>
<entry><literal>{ x, y, ... }: x + y</literal>
</entry>
<entry>A function that expects a set with required attributes
<literal>x</literal> and <literal>y</literal> and ignores any
other attributes</entry>
</row>
<row>
<entry><literal>{ x, y } @ args: x + y</literal></entry>
<entry>A function that expects a set with required attributes
</row>
<row>
<entry><literal>{ x, y } @ args: x + y</literal>
</entry>
<entry>A function that expects a set with required attributes
<literal>x</literal> and <literal>y</literal>, and binds the
whole set to <literal>args</literal></entry>
</row>
<row>
<entry namest="c1" nameend="c2"><emphasis>Built-in functions</emphasis></entry>
</row>
<row>
<entry><literal>import ./foo.nix</literal></entry>
<entry>Load and return Nix expression in given file</entry>
</row>
<row>
<entry><literal>map (x: x + x) [ 1 2 3 ]</literal></entry>
<entry>Apply a function to every element of a list (evaluates to <literal>[ 2 4 6 ]</literal>)</entry>
</row>
<!--
whole set to <literal>args</literal>
</entry>
</row>
<row>
<entry namest="c1" nameend="c2"><emphasis>Built-in functions</emphasis>
</entry>
</row>
<row>
<entry><literal>import ./foo.nix</literal>
</entry>
<entry>Load and return Nix expression in given file</entry>
</row>
<row>
<entry><literal>map (x: x + x) [ 1 2 3 ]</literal>
</entry>
<entry>Apply a function to every element of a list (evaluates to <literal>[ 2 4 6 ]</literal>)</entry>
</row>
<!--
<row>
<entry><literal>throw "Urgh"</literal></entry>
<entry>Raise an error condition</entry>
</row>
-->
</tbody>
</tbody>
</tgroup>
</informaltable>
</informaltable>
</section>

View File

@@ -3,14 +3,12 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-user-management">
<title>User Management</title>
<para>NixOS supports both declarative and imperative styles of user
management. In the declarative style, users are specified in
<filename>configuration.nix</filename>. For instance, the following
states that a user account named <literal>alice</literal> shall exist:
<title>User Management</title>
<para>
NixOS supports both declarative and imperative styles of user management. In
the declarative style, users are specified in
<filename>configuration.nix</filename>. For instance, the following states
that a user account named <literal>alice</literal> shall exist:
<programlisting>
users.users.alice =
{ isNormalUser = true;
@@ -20,81 +18,69 @@ users.users.alice =
openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
};
</programlisting>
Note that <literal>alice</literal> is a member of the
<literal>wheel</literal> and <literal>networkmanager</literal> groups,
which allows her to use <command>sudo</command> to execute commands as
<literal>root</literal> and to configure the network, respectively.
Also note the SSH public key that allows remote logins with the
corresponding private key. Users created in this way do not have a
password by default, so they cannot log in via mechanisms that require
a password. However, you can use the <command>passwd</command> program
to set a password, which is retained across invocations of
<command>nixos-rebuild</command>.</para>
<para>If you set users.mutableUsers to false, then the contents of /etc/passwd
and /etc/group will be congruent to your NixOS configuration. For instance,
if you remove a user from users.users and run nixos-rebuild, the user
account will cease to exist. Also, imperative commands for managing users
and groups, such as useradd, are no longer available. Passwords may still be
assigned by setting the user's <literal>hashedPassword</literal> option. A
hashed password can be generated using <command>mkpasswd -m sha-512</command>
after installing the <literal>mkpasswd</literal> package.</para>
<para>A user ID (uid) is assigned automatically. You can also specify
a uid manually by adding
Note that <literal>alice</literal> is a member of the
<literal>wheel</literal> and <literal>networkmanager</literal> groups, which
allows her to use <command>sudo</command> to execute commands as
<literal>root</literal> and to configure the network, respectively. Also note
the SSH public key that allows remote logins with the corresponding private
key. Users created in this way do not have a password by default, so they
cannot log in via mechanisms that require a password. However, you can use
the <command>passwd</command> program to set a password, which is retained
across invocations of <command>nixos-rebuild</command>.
</para>
<para>
If you set users.mutableUsers to false, then the contents of /etc/passwd and
/etc/group will be congruent to your NixOS configuration. For instance, if
you remove a user from users.users and run nixos-rebuild, the user account
will cease to exist. Also, imperative commands for managing users and groups,
such as useradd, are no longer available. Passwords may still be assigned by
setting the user's <literal>hashedPassword</literal> option. A hashed
password can be generated using <command>mkpasswd -m sha-512</command> after
installing the <literal>mkpasswd</literal> package.
</para>
<para>
A user ID (uid) is assigned automatically. You can also specify a uid
manually by adding
<programlisting>
uid = 1000;
</programlisting>
to the user specification.</para>
<para>Groups can be specified similarly. The following states that a
group named <literal>students</literal> shall exist:
to the user specification.
</para>
<para>
Groups can be specified similarly. The following states that a group named
<literal>students</literal> shall exist:
<programlisting>
users.groups.students.gid = 1000;
</programlisting>
As with users, the group ID (gid) is optional and will be assigned
automatically if its missing.</para>
<para>In the imperative style, users and groups are managed by
commands such as <command>useradd</command>,
<command>groupmod</command> and so on. For instance, to create a user
account named <literal>alice</literal>:
As with users, the group ID (gid) is optional and will be assigned
automatically if its missing.
</para>
<para>
In the imperative style, users and groups are managed by commands such as
<command>useradd</command>, <command>groupmod</command> and so on. For
instance, to create a user account named <literal>alice</literal>:
<screen>
# useradd -m alice</screen>
To make all nix tools available to this new user use `su - USER` which
opens a login shell (==shell that loads the profile) for given user.
This will create the ~/.nix-defexpr symlink. So run:
To make all nix tools available to this new user use `su - USER` which opens
a login shell (==shell that loads the profile) for given user. This will
create the ~/.nix-defexpr symlink. So run:
<screen>
# su - alice -c "true"</screen>
The flag <option>-m</option> causes the creation of a home directory
for the new user, which is generally what you want. The user does not
have an initial password and therefore cannot log in. A password can
be set using the <command>passwd</command> utility:
The flag <option>-m</option> causes the creation of a home directory for the
new user, which is generally what you want. The user does not have an initial
password and therefore cannot log in. A password can be set using the
<command>passwd</command> utility:
<screen>
# passwd alice
Enter new UNIX password: ***
Retype new UNIX password: ***
</screen>
A user can be deleted using <command>userdel</command>:
A user can be deleted using <command>userdel</command>:
<screen>
# userdel -r alice</screen>
The flag <option>-r</option> deletes the users home directory.
Accounts can be modified using <command>usermod</command>. Unix
groups can be managed using <command>groupadd</command>,
<command>groupmod</command> and <command>groupdel</command>.</para>
The flag <option>-r</option> deletes the users home directory. Accounts
can be modified using <command>usermod</command>. Unix groups can be managed
using <command>groupadd</command>, <command>groupmod</command> and
<command>groupdel</command>.
</para>
</chapter>

View File

@@ -3,22 +3,20 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-wireless">
<title>Wireless Networks</title>
<title>Wireless Networks</title>
<para>For a desktop installation using NetworkManager (e.g., GNOME),
you just have to make sure the user is in the
<code>networkmanager</code> group and you can skip the rest of this
section on wireless networks.</para>
<para>
NixOS will start wpa_supplicant for you if you enable this setting:
<para>
For a desktop installation using NetworkManager (e.g., GNOME), you just have
to make sure the user is in the <code>networkmanager</code> group and you can
skip the rest of this section on wireless networks.
</para>
<para>
NixOS will start wpa_supplicant for you if you enable this setting:
<programlisting>
networking.wireless.enable = true;
</programlisting>
NixOS lets you specify networks for wpa_supplicant declaratively:
NixOS lets you specify networks for wpa_supplicant declaratively:
<programlisting>
networking.wireless.networks = {
echelon = {
@@ -27,27 +25,21 @@ networking.wireless.networks = {
"free.wifi" = {};
}
</programlisting>
Be aware that keys will be written to the nix store in plaintext! When no
networks are set, it will default to using a configuration file at
<literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
yourself to define wireless networks, WPA keys and so on (see
wpa_supplicant.conf(5)).
</para>
Be aware that keys will be written to the nix store in plaintext!
When no networks are set, it will default to using a configuration file at
<literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
yourself to define wireless networks, WPA keys and so on (see
wpa_supplicant.conf(5)).
</para>
<para>
If you are using WPA2 the <command>wpa_passphrase</command> tool might be useful
to generate the <literal>wpa_supplicant.conf</literal>.
<para>
If you are using WPA2 the <command>wpa_passphrase</command> tool might be
useful to generate the <literal>wpa_supplicant.conf</literal>.
<screen>
# wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf</screen>
After you have edited the <literal>wpa_supplicant.conf</literal>,
you need to restart the wpa_supplicant service.
After you have edited the <literal>wpa_supplicant.conf</literal>, you need to
restart the wpa_supplicant service.
<screen>
# systemctl restart wpa_supplicant.service</screen>
</para>
</para>
</section>

View File

@@ -3,27 +3,25 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-x11">
<title>X Window System</title>
<para>The X Window System (X11) provides the basis of NixOS graphical
user interface. It can be enabled as follows:
<title>X Window System</title>
<para>
The X Window System (X11) provides the basis of NixOS graphical user
interface. It can be enabled as follows:
<programlisting>
services.xserver.enable = true;
</programlisting>
The X server will automatically detect and use the appropriate video
driver from a set of X.org drivers (such as <literal>vesa</literal>
and <literal>intel</literal>). You can also specify a driver
manually, e.g.
The X server will automatically detect and use the appropriate video driver
from a set of X.org drivers (such as <literal>vesa</literal> and
<literal>intel</literal>). You can also specify a driver manually, e.g.
<programlisting>
services.xserver.videoDrivers = [ "r128" ];
</programlisting>
to enable X.orgs <literal>xf86-video-r128</literal> driver.</para>
<para>You also need to enable at least one desktop or window manager.
Otherwise, you can only log into a plain undecorated
<command>xterm</command> window. Thus you should pick one or more of
the following lines:
to enable X.orgs <literal>xf86-video-r128</literal> driver.
</para>
<para>
You also need to enable at least one desktop or window manager. Otherwise,
you can only log into a plain undecorated <command>xterm</command> window.
Thus you should pick one or more of the following lines:
<programlisting>
services.xserver.desktopManager.plasma5.enable = true;
services.xserver.desktopManager.xfce.enable = true;
@@ -33,108 +31,105 @@ services.xserver.windowManager.twm.enable = true;
services.xserver.windowManager.icewm.enable = true;
services.xserver.windowManager.i3.enable = true;
</programlisting>
</para>
<para>NixOSs default <emphasis>display manager</emphasis> (the
program that provides a graphical login prompt and manages the X
server) is SLiM. You can select an alternative one by picking one
of the following lines:
</para>
<para>
NixOSs default <emphasis>display manager</emphasis> (the program that
provides a graphical login prompt and manages the X server) is SLiM. You can
select an alternative one by picking one of the following lines:
<programlisting>
services.xserver.displayManager.sddm.enable = true;
services.xserver.displayManager.lightdm.enable = true;
</programlisting>
</para>
<para>You can set the keyboard layout (and optionally the layout variant):
</para>
<para>
You can set the keyboard layout (and optionally the layout variant):
<programlisting>
services.xserver.layout = "de";
services.xserver.xkbVariant = "neo";
</programlisting>
</para>
<para>The X server is started automatically at boot time. If you
dont want this to happen, you can set:
</para>
<para>
The X server is started automatically at boot time. If you dont want this
to happen, you can set:
<programlisting>
services.xserver.autorun = false;
</programlisting>
The X server can then be started manually:
The X server can then be started manually:
<screen>
# systemctl start display-manager.service
</screen>
</para>
<simplesect><title>NVIDIA Graphics Cards</title>
<para>NVIDIA provides a proprietary driver for its graphics cards that
has better 3D performance than the X.org drivers. It is not enabled
by default because its not free software. You can enable it as follows:
</para>
<simplesect>
<title>NVIDIA Graphics Cards</title>
<para>
NVIDIA provides a proprietary driver for its graphics cards that has better
3D performance than the X.org drivers. It is not enabled by default because
its not free software. You can enable it as follows:
<programlisting>
services.xserver.videoDrivers = [ "nvidia" ];
</programlisting>
Or if you have an older card, you may have to use one of the legacy drivers:
Or if you have an older card, you may have to use one of the legacy drivers:
<programlisting>
services.xserver.videoDrivers = [ "nvidiaLegacy340" ];
services.xserver.videoDrivers = [ "nvidiaLegacy304" ];
services.xserver.videoDrivers = [ "nvidiaLegacy173" ];
</programlisting>
You may need to reboot after enabling this driver to prevent a clash
with other kernel modules.</para>
<para>On 64-bit systems, if you want full acceleration for 32-bit
programs such as Wine, you should also set the following:
You may need to reboot after enabling this driver to prevent a clash with
other kernel modules.
</para>
<para>
On 64-bit systems, if you want full acceleration for 32-bit programs such as
Wine, you should also set the following:
<programlisting>
hardware.opengl.driSupport32Bit = true;
</programlisting>
</para>
</simplesect>
<simplesect><title>AMD Graphics Cards</title>
<para>AMD provides a proprietary driver for its graphics cards that
has better 3D performance than the X.org drivers. It is not enabled
by default because its not free software. You can enable it as follows:
</para>
</simplesect>
<simplesect>
<title>AMD Graphics Cards</title>
<para>
AMD provides a proprietary driver for its graphics cards that has better 3D
performance than the X.org drivers. It is not enabled by default because
its not free software. You can enable it as follows:
<programlisting>
services.xserver.videoDrivers = [ "ati_unfree" ];
</programlisting>
You will need to reboot after enabling this driver to prevent a clash
with other kernel modules.</para>
<para>On 64-bit systems, if you want full acceleration for 32-bit
programs such as Wine, you should also set the following:
You will need to reboot after enabling this driver to prevent a clash with
other kernel modules.
</para>
<para>
On 64-bit systems, if you want full acceleration for 32-bit programs such as
Wine, you should also set the following:
<programlisting>
hardware.opengl.driSupport32Bit = true;
</programlisting>
</para>
</simplesect>
<simplesect><title>Touchpads</title>
<para>Support for Synaptics touchpads (found in many laptops such as
the Dell Latitude series) can be enabled as follows:
</para>
</simplesect>
<simplesect>
<title>Touchpads</title>
<para>
Support for Synaptics touchpads (found in many laptops such as the Dell
Latitude series) can be enabled as follows:
<programlisting>
services.xserver.libinput.enable = true;
</programlisting>
The driver has many options (see <xref linkend="ch-options"/>). For
instance, the following disables tap-to-click behavior:
The driver has many options (see <xref linkend="ch-options"/>). For
instance, the following disables tap-to-click behavior:
<programlisting>
services.xserver.libinput.tapping = false;
</programlisting>
Note: the use of <literal>services.xserver.synaptics</literal> is deprecated since NixOS 17.09.
</para>
</simplesect>
<simplesect><title>GTK/Qt themes</title>
<para>GTK themes can be installed either to user profile or system-wide (via
<literal>environment.systemPackages</literal>). To make Qt 5 applications look similar
to GTK2 ones, you can install <literal>qt5.qtbase.gtk</literal> package into your
system environment. It should work for all Qt 5 library versions.
</para>
</simplesect>
Note: the use of <literal>services.xserver.synaptics</literal> is deprecated
since NixOS 17.09.
</para>
</simplesect>
<simplesect>
<title>GTK/Qt themes</title>
<para>
GTK themes can be installed either to user profile or system-wide (via
<literal>environment.systemPackages</literal>). To make Qt 5 applications
look similar to GTK2 ones, you can install <literal>qt5.qtbase.gtk</literal>
package into your system environment. It should work for all Qt 5 library
versions.
</para>
</simplesect>
</chapter>

View File

@@ -3,23 +3,20 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-xfce">
<title>Xfce Desktop Environment</title>
<para>
To enable the Xfce Desktop Environment, set
<programlisting>
<title>Xfce Desktop Environment</title>
<para>
To enable the Xfce Desktop Environment, set
<programlisting>
services.xserver.desktopManager = {
xfce.enable = true;
default = "xfce";
};
</programlisting>
</para>
<para>
Optionally, <emphasis>compton</emphasis>
can be enabled for nice graphical effects, some example settings:
<programlisting>
</para>
<para>
Optionally, <emphasis>compton</emphasis> can be enabled for nice graphical
effects, some example settings:
<programlisting>
services.compton = {
enable = true;
fade = true;
@@ -28,67 +25,48 @@ services.compton = {
fadeDelta = 4;
};
</programlisting>
</para>
<para>
Some Xfce programs are not installed automatically.
To install them manually (system wide), put them into your
<literal>environment.systemPackages</literal>.
</para>
<simplesect>
<title>Thunar Volume Support</title>
<para>
To enable
<emphasis>Thunar</emphasis>
volume support, put
<programlisting>
</para>
<para>
Some Xfce programs are not installed automatically. To install them manually
(system wide), put them into your
<literal>environment.systemPackages</literal>.
</para>
<simplesect>
<title>Thunar Volume Support</title>
<para>
To enable <emphasis>Thunar</emphasis> volume support, put
<programlisting>
services.xserver.desktopManager.xfce.enable = true;
</programlisting>
into your <emphasis>configuration.nix</emphasis>.
</para>
</simplesect>
<simplesect>
<title>Polkit Authentication Agent</title>
<para>
There is no authentication agent automatically installed alongside
Xfce. To allow mounting of local (non-removable) filesystems, you
will need to install one.
Installing <emphasis>polkit_gnome</emphasis>, a rebuild, logout and
login did the trick.
</para>
</simplesect>
<simplesect>
<title>Troubleshooting</title>
<para>
Even after enabling udisks2, volume management might not work.
Thunar and/or the desktop takes time to show up.
Thunar will spit out this kind of message on start
(look at <command>journalctl --user -b</command>).
<programlisting>
into your <emphasis>configuration.nix</emphasis>.
</para>
</simplesect>
<simplesect>
<title>Polkit Authentication Agent</title>
<para>
There is no authentication agent automatically installed alongside Xfce. To
allow mounting of local (non-removable) filesystems, you will need to
install one. Installing <emphasis>polkit_gnome</emphasis>, a rebuild, logout
and login did the trick.
</para>
</simplesect>
<simplesect>
<title>Troubleshooting</title>
<para>
Even after enabling udisks2, volume management might not work. Thunar and/or
the desktop takes time to show up. Thunar will spit out this kind of message
on start (look at <command>journalctl --user -b</command>).
<programlisting>
Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported
</programlisting>
This is caused by some needed GNOME services not running.
This is all fixed by enabling "Launch GNOME services on startup" in
the Advanced tab of the Session and Startup settings panel.
Alternatively, you can run this command to do the same thing.
<programlisting>
This is caused by some needed GNOME services not running. This is all fixed
by enabling "Launch GNOME services on startup" in the Advanced tab of the
Session and Startup settings panel. Alternatively, you can run this command
to do the same thing.
<programlisting>
$ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true
</programlisting>
A log-out and re-log will be needed for this to take effect.
</para>
</simplesect>
A log-out and re-log will be needed for this to take effect.
</para>
</simplesect>
</chapter>

View File

@@ -102,13 +102,18 @@ let
</section>
'';
generatedSources = runCommand "generated-docbook" {} ''
mkdir $out
ln -s ${modulesDoc} $out/modules.xml
ln -s ${optionsDocBook} $out/options-db.xml
printf "%s" "${version}" > $out/version
'';
copySources =
''
cp -prd $sources/* . # */
ln -s ${generatedSources} ./generated
chmod -R u+w .
ln -s ${modulesDoc} configuration/modules.xml
ln -s ${optionsDocBook} options-db.xml
printf "%s" "${version}" > version
'';
toc = builtins.toFile "toc.xml"
@@ -124,11 +129,12 @@ let
manualXsltprocOptions = toString [
"--param section.autolabel 1"
"--param section.label.includes.component.label 1"
"--stringparam html.stylesheet style.css"
"--stringparam html.stylesheet 'style.css overrides.css highlightjs/mono-blue.css'"
"--stringparam html.script './highlightjs/highlight.pack.js ./highlightjs/loader.js'"
"--param xref.with.number.and.title 1"
"--param toc.section.depth 3"
"--stringparam admon.style ''"
"--stringparam callout.graphics.extension .gif"
"--stringparam callout.graphics.extension .svg"
"--stringparam current.docid manual"
"--param chunk.section.depth 0"
"--param chunk.first.sections 1"
@@ -223,6 +229,7 @@ let
'';
in rec {
inherit generatedSources;
# The NixOS options in JSON format.
optionsJSON = runCommand "options-json"
@@ -260,9 +267,11 @@ in rec {
${manual-combined}/manual-combined.xml
mkdir -p $dst/images/callouts
cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/
cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/images/callouts/
cp ${./style.css} $dst/style.css
cp ${../../../doc/style.css} $dst/style.css
cp ${../../../doc/overrides.css} $dst/overrides.css
cp -r ${pkgs.documentation-highlighter} $dst/highlightjs
mkdir -p $out/nix-support
echo "nix-build out $out" >> $out/nix-support/hydra-build-products
@@ -286,7 +295,7 @@ in rec {
${manual-combined}/manual-combined.xml
mkdir -p $dst/epub/OEBPS/images/callouts
cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/epub/OEBPS/images/callouts # */
cp -r ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.svg $dst/epub/OEBPS/images/callouts # */
echo "application/epub+zip" > mimetype
manual="$dst/nixos-manual.epub"
zip -0Xq "$manual" mimetype

View File

@@ -3,30 +3,29 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-assertions">
<title>Warnings and Assertions</title>
<title>Warnings and Assertions</title>
<para>
When configuration problems are detectable in a module, it is a good idea to
write an assertion or warning. Doing so provides clear feedback to the user
and prevents errors after the build.
</para>
<para>
When configuration problems are detectable in a module, it is a good
idea to write an assertion or warning. Doing so provides clear
feedback to the user and prevents errors after the build.
</para>
<para>
<para>
Although Nix has the <literal>abort</literal> and
<literal>builtins.trace</literal> <link xlink:href="https://nixos.org/nix/manual/#ssec-builtins">functions</link> to perform such tasks,
they are not ideally suited for NixOS modules. Instead of these
functions, you can declare your warnings and assertions using the
<literal>builtins.trace</literal>
<link xlink:href="https://nixos.org/nix/manual/#ssec-builtins">functions</link>
to perform such tasks, they are not ideally suited for NixOS modules. Instead
of these functions, you can declare your warnings and assertions using the
NixOS module system.
</para>
</para>
<section>
<section>
<title>Warnings</title>
<title>Warnings</title>
<para>
This is an example of using <literal>warnings</literal>.
</para>
<para>
This is an example of using <literal>warnings</literal>.
</para>
<programlisting>
<![CDATA[
@@ -43,22 +42,19 @@
}
]]>
</programlisting>
</section>
</section>
<section>
<title>Assertions</title>
<section>
<title>Assertions</title>
<para>
This example, extracted from the
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-17.09/nixos/modules/services/logging/syslogd.nix">
<literal>syslogd</literal> module
</link> shows how to use <literal>assertions</literal>. Since there
can only be one active syslog daemon at a time, an assertion is useful to
prevent such a broken system from being built.
</para>
<para>
This example, extracted from the
<link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-17.09/nixos/modules/services/logging/syslogd.nix">
<literal>syslogd</literal> module </link> shows how to use
<literal>assertions</literal>. Since there can only be one active syslog
daemon at a time, an assertion is useful to prevent such a broken system
from being built.
</para>
<programlisting>
<![CDATA[
@@ -74,7 +70,5 @@
}
]]>
</programlisting>
</section>
</section>
</section>

View File

@@ -3,30 +3,25 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-building-cd">
<title>Building Your Own NixOS CD</title>
<para>Building a NixOS CD is as easy as configuring your own computer. The
idea is to use another module which will replace
your <filename>configuration.nix</filename> to configure the system that
would be installed on the CD.</para>
<para>Default CD/DVD configurations are available
inside <filename>nixos/modules/installer/cd-dvd</filename>.
<title>Building Your Own NixOS CD</title>
<para>
Building a NixOS CD is as easy as configuring your own computer. The idea is
to use another module which will replace your
<filename>configuration.nix</filename> to configure the system that would be
installed on the CD.
</para>
<para>
Default CD/DVD configurations are available inside
<filename>nixos/modules/installer/cd-dvd</filename>.
<screen>
$ git clone https://github.com/NixOS/nixpkgs.git
$ cd nixpkgs/nixos
$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix</screen>
</para>
<para>Before burning your CD/DVD, you can check the content of the image by mounting anywhere like
suggested by the following command:
</para>
<para>
Before burning your CD/DVD, you can check the content of the image by
mounting anywhere like suggested by the following command:
<screen>
# mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
</para>
</para>
</chapter>

View File

@@ -3,111 +3,119 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
version="5.0"
xml:id="sec-building-parts">
<title>Building Specific Parts of NixOS</title>
<para>With the command <command>nix-build</command>, you can build
specific parts of your NixOS configuration. This is done as follows:
<title>Building Specific Parts of NixOS</title>
<para>
With the command <command>nix-build</command>, you can build specific parts
of your NixOS configuration. This is done as follows:
<screen>
$ cd <replaceable>/path/to/nixpkgs/nixos</replaceable>
$ nix-build -A config.<replaceable>option</replaceable></screen>
where <replaceable>option</replaceable> is a NixOS option with type
“derivation” (i.e. something that can be built). Attributes of
interest include:
<variablelist>
<varlistentry>
<term><varname>system.build.toplevel</varname></term>
where <replaceable>option</replaceable> is a NixOS option with type
“derivation” (i.e. something that can be built). Attributes of interest
include:
<variablelist>
<varlistentry>
<term>
<varname>system.build.toplevel</varname>
</term>
<listitem>
<para>The top-level option that builds the entire NixOS system.
Everything else in your configuration is indirectly pulled in by
this option. This is what <command>nixos-rebuild</command>
builds and what <filename>/run/current-system</filename> points
to afterwards.</para>
<para>A shortcut to build this is:
<para>
The top-level option that builds the entire NixOS system. Everything else
in your configuration is indirectly pulled in by this option. This is
what <command>nixos-rebuild</command> builds and what
<filename>/run/current-system</filename> points to afterwards.
</para>
<para>
A shortcut to build this is:
<screen>
$ nix-build -A system</screen>
</para>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>system.build.manual.manual</varname></term>
<listitem><para>The NixOS manual.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>system.build.etc</varname></term>
<listitem><para>A tree of symlinks that form the static parts of
<filename>/etc</filename>.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>system.build.initialRamdisk</varname></term>
<term><varname>system.build.kernel</varname></term>
</varlistentry>
<varlistentry>
<term>
<varname>system.build.manual.manual</varname>
</term>
<listitem>
<para>The initial ramdisk and kernel of the system. This allows
a quick way to test whether the kernel and the initial ramdisk
boot correctly, by using QEMUs <option>-kernel</option> and
<option>-initrd</option> options:
<para>
The NixOS manual.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>system.build.etc</varname>
</term>
<listitem>
<para>
A tree of symlinks that form the static parts of
<filename>/etc</filename>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term>
<varname>system.build.initialRamdisk</varname>
</term>
<term>
<varname>system.build.kernel</varname>
</term>
<listitem>
<para>
The initial ramdisk and kernel of the system. This allows a quick way to
test whether the kernel and the initial ramdisk boot correctly, by using
QEMUs <option>-kernel</option> and <option>-initrd</option> options:
<screen>
$ nix-build -A config.system.build.initialRamdisk -o initrd
$ nix-build -A config.system.build.kernel -o kernel
$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null
</screen>
</para>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>system.build.nixos-rebuild</varname></term>
<term><varname>system.build.nixos-install</varname></term>
<term><varname>system.build.nixos-generate-config</varname></term>
</varlistentry>
<varlistentry>
<term>
<varname>system.build.nixos-rebuild</varname>
</term>
<term>
<varname>system.build.nixos-install</varname>
</term>
<term>
<varname>system.build.nixos-generate-config</varname>
</term>
<listitem>
<para>These build the corresponding NixOS commands.</para>
<para>
These build the corresponding NixOS commands.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>systemd.units.<replaceable>unit-name</replaceable>.unit</varname></term>
</varlistentry>
<varlistentry>
<term>
<varname>systemd.units.<replaceable>unit-name</replaceable>.unit</varname>
</term>
<listitem>
<para>This builds the unit with the specified name. Note that
since unit names contain dots
(e.g. <literal>httpd.service</literal>), you need to put them
between quotes, like this:
<para>
This builds the unit with the specified name. Note that since unit names
contain dots (e.g. <literal>httpd.service</literal>), you need to put
them between quotes, like this:
<screen>
$ nix-build -A 'config.systemd.units."httpd.service".unit'
</screen>
You can also test individual units, without rebuilding the whole
system, by putting them in
<filename>/run/systemd/system</filename>:
You can also test individual units, without rebuilding the whole system,
by putting them in <filename>/run/systemd/system</filename>:
<screen>
$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \
/run/systemd/system/tmp-httpd.service
# systemctl daemon-reload
# systemctl start tmp-httpd.service
</screen>
Note that the unit must not have the same name as any unit in
<filename>/etc/systemd/system</filename> since those take
precedence over <filename>/run/systemd/system</filename>.
Thats why the unit is installed as
<filename>tmp-httpd.service</filename> here.</para>
<filename>/etc/systemd/system</filename> since those take precedence over
<filename>/run/systemd/system</filename>. Thats why the unit is
installed as <filename>tmp-httpd.service</filename> here.
</para>
</listitem>
</varlistentry>
</variablelist>
</para>
</varlistentry>
</variablelist>
</para>
</chapter>

Some files were not shown because too many files have changed in this diff Show More