Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c5668bd18356
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0f1911eea206
Choose a head ref
  • 20 commits
  • 50 files changed
  • 9 contributors

Commits on Sep 29, 2018

  1. doc: Update section about imperative containers 

    Nix commands inside the container have been broken since 18.03,
and no fix is yet in sight.  Lets remove from the documentation
that this is a usecase that we support, as it doesn't seem
likely that this will be fixed before 18.09 either.

See #40355

(cherry picked from commit f309440)
    @arianvp @Mic92
    arianvp authored and Mic92 committed Sep 29, 2018
    Copy the full SHA
    b72abcf View commit details

  2. gitkraken: 4.0.2 -> 4.0.5 (#47512) 

    Fixes #47498. Note that the releases have moved to a new URL; I'm not sure they still host the earlier versions.

(cherry picked from commit 9d727e0)

backported because previous source url returns 404.
    @KiaraGrouwstra @xeji
    KiaraGrouwstra authored and xeji committed Sep 29, 2018
    Copy the full SHA
    1d5b7a7 View commit details

  3. linux: 4.4.158 -> 4.4.159 

    (cherry picked from commit 7769fd6)
    @NeQuissimus
    NeQuissimus committed Sep 29, 2018
    Copy the full SHA
    c2e605e View commit details

  4. linux: 4.9.129 -> 4.9.130 

    (cherry picked from commit 74f56e1)
    @NeQuissimus
    NeQuissimus committed Sep 29, 2018
    Copy the full SHA
    9bd9306 View commit details

  5. linux: 4.14.72 -> 4.14.73 

    (cherry picked from commit 00e5778)
    @NeQuissimus
    NeQuissimus committed Sep 29, 2018
    Copy the full SHA
    99b6969 View commit details

  6. linux: 4.18.10 -> 4.18.11 

    (cherry picked from commit 5eefdeb)
    @NeQuissimus
    NeQuissimus committed Sep 29, 2018
    Copy the full SHA
    b7cab85 View commit details

  7. Revert "doc: Update section about imperative containers" 

    This reverts commit b72abcf.

Breaks manual build:

https://nix-cache.s3.amazonaws.com/log/wnjcy6n5f871bpyy9nd06smiz1ggv99c-nixos-manual-combined.drv
    @dezgeg
    dezgeg committed Sep 29, 2018
    Copy the full SHA
    29624f6 View commit details

  8. systemd: Replace meta.available checks 

    This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.

(cherry picked from commit fe7919f)
    @dezgeg
    dezgeg committed Sep 29, 2018
    Copy the full SHA
    6b1ebeb View commit details

  9. nix: Replace meta.available checks 

    This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.

(cherry picked from commit cdeafe7)

Conflicts:
	pkgs/tools/package-management/nix/default.nix
    @dezgeg
    dezgeg committed Sep 29, 2018
    Copy the full SHA
    50da319 View commit details

  10. apparmor: Replace meta.available checks 

    This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.

(cherry picked from commit 50d0360)
    @dezgeg
    dezgeg committed Sep 29, 2018
    Copy the full SHA
    2c3443e View commit details

  11. treewide: Replace meta.available checks in shouldUsePackages copypasta 

    This reverts commit 79d8353.

This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.

(cherry picked from commit 5e84926)
    @dezgeg
    dezgeg committed Sep 29, 2018
    Copy the full SHA
    ae63055 View commit details

  12. ghc: Replace meta.available checks for enableIntegerSimple 

    This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.

(cherry picked from commit f4dd2fe)
    @dezgeg
    dezgeg committed Sep 29, 2018
    Copy the full SHA
    5330aba View commit details

Commits on Sep 30, 2018

  1. nixos/kexec: Replace meta.available checks 

    This sort of code breaks config.{allowBroken, allowUnsupportedSystem} =
true by making them do unpredictable things.

[dezgeg: Also squash in the bugfix commit "nixos/kexec: Fix typo in meta.platforms" by aszlig]

(cherry picked from commit 599c4df)
(cherry picked from commit fd8bca4)
    @dezgeg
    dezgeg committed Sep 30, 2018
    Copy the full SHA
    aa0c7bd View commit details

  2. nix-daemon: only add channels dir to NIX_PATH if exists 

    Per reviewer comment (thanks!).

(cherry picked from commit 243e28b)
    @dtzWill @grahamc
    dtzWill authored and grahamc committed Sep 30, 2018
    Copy the full SHA
    4c3a0ae View commit details

  3. Revert "Revert "doc: Update section about imperative containers"" 

    I fixed the problem.

This reverts commit 29624f6.
    @grahamc
    grahamc committed Sep 30, 2018
    Copy the full SHA
    4867086 View commit details

  4. docs: format

    @grahamc
    grahamc committed Sep 30, 2018
    Copy the full SHA
    26537f5 View commit details

  5. mapnik: 3.0.13 -> 3.0.20 

    (cherry picked from commit b1857da)
    @knedlsepp @xeji
    knedlsepp authored and xeji committed Sep 30, 2018
    Copy the full SHA
    8b3bff1 View commit details

  6. pythonPackages.python-mapnik: Fix build 

    There were two things to fix:
- Boost started shipping libboost_python.so as libboost_python{Major}{Minor}
- Make sure that mapnik and boost link to the correct version of python.

(cherry picked from commit be6451e)
    @knedlsepp @xeji
    knedlsepp authored and xeji committed Sep 30, 2018
    Copy the full SHA
    f2a1d99 View commit details

  7. language_subtag_registry: fix hash (#47555) 

    (cherry picked from commit 61007c0)
    @xeji
    volth authored and xeji committed Sep 30, 2018
    Copy the full SHA
    a3e5e6e View commit details

  8. pythonPackages.py-cpuinfo: Fix darwin build (#47558) 

    (cherry picked from commit 49dcf7b)
    @knedlsepp @xeji
    knedlsepp authored and xeji committed Sep 30, 2018
    Copy the full SHA
    0f1911e View commit details
Showing with 1,963 additions and 1,681 deletions.
  1. +9 −9 nixos/doc/manual/administration/imperative-containers.xml
  2. +9 −10 nixos/doc/manual/configuration/linux-kernel.xml
  3. +4 −3 nixos/doc/manual/development/debugging-nixos-tests.xml
  4. +24 −23 nixos/doc/manual/installation/installing-behind-a-proxy.xml
  5. +2 −2 nixos/doc/manual/installation/installing.xml
  6. +2 −2 nixos/doc/manual/manual.xml
  7. +5 −5 nixos/doc/manual/release-notes/rl-1509.xml
  8. +148 −118 nixos/doc/manual/release-notes/rl-1809.xml
  9. +204 −115 nixos/modules/i18n/input-method/default.xml
  10. +43 −54 nixos/modules/programs/digitalbitbox/doc.xml
  11. +21 −16 nixos/modules/programs/plotinus.xml
  12. +106 −76 nixos/modules/programs/zsh/oh-my-zsh.xml
  13. +55 −49 nixos/modules/security/acme.xml
  14. +16 −21 nixos/modules/security/hidepid.xml
  15. +355 −266 nixos/modules/services/databases/foundationdb.xml
  16. +47 −47 nixos/modules/services/databases/postgresql.xml
  17. +37 −34 nixos/modules/services/desktops/flatpak.xml
  18. +394 −427 nixos/modules/services/editors/emacs.xml
  19. +65 −59 nixos/modules/services/misc/gitlab.xml
  20. +3 −1 nixos/modules/services/misc/nix-daemon.nix
  21. +100 −109 nixos/modules/services/misc/taskserver/doc.xml
  22. +39 −34 nixos/modules/services/misc/weechat.xml
  23. +100 −48 nixos/modules/services/monitoring/prometheus/exporters.xml
  24. +33 −36 nixos/modules/services/networking/dnscrypt-proxy.xml
  25. +63 −68 nixos/modules/services/web-apps/matomo-doc.xml
  26. +1 −1 nixos/modules/system/boot/kexec.nix
  27. +3 −3 pkgs/applications/version-management/gitkraken/default.nix
  28. +1 −1 pkgs/development/compilers/ghc/7.10.3.nix
  29. +1 −1 pkgs/development/compilers/ghc/8.0.2.nix
  30. +1 −1 pkgs/development/compilers/ghc/8.2.2.nix
  31. +1 −1 pkgs/development/compilers/ghc/8.4.3.nix
  32. +1 −1 pkgs/development/compilers/ghc/8.6.1.nix
  33. +1 −1 pkgs/development/compilers/ghc/head.nix
  34. +2 −2 pkgs/development/libraries/liblangtag/default.nix
  35. +5 −11 pkgs/development/libraries/mapnik/default.nix
  36. +1 −1 pkgs/development/libraries/wiredtiger/default.nix
  37. +11 −0 pkgs/development/python-modules/py-cpuinfo/default.nix
  38. +1 −1 pkgs/misc/jackaudio/default.nix
  39. +1 −1 pkgs/misc/jackaudio/jack1.nix
  40. +3 −3 pkgs/os-specific/linux/apparmor/default.nix
  41. +1 −1 pkgs/os-specific/linux/ffado/default.nix
  42. +2 −2 pkgs/os-specific/linux/kernel/linux-4.14.nix
  43. +2 −2 pkgs/os-specific/linux/kernel/linux-4.18.nix
  44. +2 −2 pkgs/os-specific/linux/kernel/linux-4.4.nix
  45. +2 −2 pkgs/os-specific/linux/kernel/linux-4.9.nix
  46. +3 −3 pkgs/os-specific/linux/systemd/default.nix
  47. +1 −1 pkgs/servers/shishi/default.nix
  48. +2 −1 pkgs/tools/filesystems/ceph/generic.nix
  49. +2 −2 pkgs/tools/package-management/nix/default.nix
  50. +28 −4 pkgs/top-level/python-packages.nix
18 changes: 9 additions & 9 deletions nixos/doc/manual/administration/imperative-containers.xml
View file
Original file line number Diff line number Diff line change
@@ -73,8 +73,7 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
</para>

<para>
There are several ways to change the configuration of the container. First,
on the host, you can edit
To change the configuration of the container, you can edit
<literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
and run
<screen>
@@ -87,8 +86,7 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
<xref linkend="opt-services.httpd.enable"/> = true;
<xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org";
<xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ];
'

'
# curl http://$(nixos-container show-ip foo)/
&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
</screen>
@@ -97,11 +95,13 @@ Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
</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.
Note that in previous versions of NixOS (17.09 and earlier) one could also
use all nix-related commands (like <command>nixos-rebuild switch</command>)
from inside the container. However, since the release of Nix 2.0 this is not
supported anymore. Supporting Nix commands inside the container might be
possible again in future versions. See
<link xlink:href="https://github.com/NixOS/nixpkgs/issues/40355">the github
issue</link> for tracking progress on this issue.
</para>

<para>
19 changes: 9 additions & 10 deletions nixos/doc/manual/configuration/linux-kernel.xml
View file
Original file line number Diff line number Diff line change
@@ -84,18 +84,17 @@ nixpkgs.config.packageOverrides = pkgs:
allowImportFromDerivation = true;
};
]]></screen>

You can edit the config with this snippet (by default <command>make menuconfig</command> won't work
out of the box on nixos):
<screen><![CDATA[
You can edit the config with this snippet (by default <command>make
menuconfig</command> won't work out of the box on nixos):
<screen><![CDATA[
nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkgconfig ncurses ];})'
]]></screen>


or you can let nixpkgs generate the configuration.
Nixpkgs generates it via answering the interactive kernel utility <command>make config</command>.
The answers depend on parameters passed to <filename>pkgs/os-specific/linux/kernel/generic.nix</filename>
(which you can influence by overriding <literal>extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig</literal>).
or you can let nixpkgs generate the configuration. Nixpkgs generates it via
answering the interactive kernel utility <command>make config</command>. The
answers depend on parameters passed to
<filename>pkgs/os-specific/linux/kernel/generic.nix</filename> (which you
can influence by overriding <literal>extraConfig, autoModules,
modDirVersion, preferBuiltin, extraConfig</literal>).
<screen><![CDATA[
mptcp93.override ({
7 changes: 4 additions & 3 deletions nixos/doc/manual/development/debugging-nixos-tests.xml
View file
Original file line number Diff line number Diff line change
@@ -26,11 +26,12 @@ nix-shell -p socat --run "socat STDIO,raw,echo=0,escape=0x11 UNIX:/tmp/nix-build
</programlisting>

<para>
You may need to find the correct path, replacing <literal>/tmp</literal>, <literal>*</literal> or <literal>machine</literal>.
You may need to find the correct path, replacing <literal>/tmp</literal>,
<literal>*</literal> or <literal>machine</literal>.
</para>

<para>
Press "enter" to open up console and login as "root". After you're done, press "ctrl-q" to exit the console.
Press "enter" to open up console and login as "root". After you're done,
press "ctrl-q" to exit the console.
</para>

</section>
47 changes: 24 additions & 23 deletions nixos/doc/manual/installation/installing-behind-a-proxy.xml
View file
Original file line number Diff line number Diff line change
@@ -5,43 +5,44 @@
xml:id="sec-installing-behind-proxy">
<title>Installing behind a proxy</title>

<para>
<para>
To install NixOS behind a proxy, do the following before running
<literal>nixos-install</literal>.
</para>
<orderedlist numeration="arabic">
</para>

<orderedlist numeration="arabic">
<listitem>
<para>
Update proxy configuration in
<literal>/mnt/etc/nixos/configuration.nix</literal> to keep the
internet accessible after reboot.
</para>
<programlisting>
<para>
Update proxy configuration in
<literal>/mnt/etc/nixos/configuration.nix</literal> to keep the internet
accessible after reboot.
</para>
<programlisting>
networking.proxy.default = &quot;http://user:password@proxy:port/&quot;;
networking.proxy.noProxy = &quot;127.0.0.1,localhost,internal.domain&quot;;
</programlisting>
</listitem>
<listitem>
<para>
Setup the proxy environment variables in the shell where you are
running <literal>nixos-install</literal>.
</para>
<programlisting>
<para>
Setup the proxy environment variables in the shell where you are running
<literal>nixos-install</literal>.
</para>
<programlisting>
# proxy_url=&quot;http://user:password@proxy:port/&quot;
# export http_proxy=&quot;$proxy_url&quot;
# export HTTP_PROXY=&quot;$proxy_url&quot;
# export https_proxy=&quot;$proxy_url&quot;
# export HTTPS_PROXY=&quot;$proxy_url&quot;
</programlisting>
</listitem>
</orderedlist>
</orderedlist>

<note>
<para>
If you are switching networks with different proxy configurations, use the
<literal>nesting.clone</literal> option in
<literal>configuration.nix</literal> to switch proxies at runtime.
Refer to <xref linkend="ch-options" /> for more information.
</para>
</note>
<note>
<para>
If you are switching networks with different proxy configurations, use the
<literal>nesting.clone</literal> option in
<literal>configuration.nix</literal> to switch proxies at runtime. Refer to
<xref linkend="ch-options" /> for more information.
</para>
</note>
</section>
4 changes: 2 additions & 2 deletions nixos/doc/manual/installation/installing.xml
View file
Original file line number Diff line number Diff line change
@@ -327,8 +327,8 @@ Retype new UNIX password: ***
<note>
<para>
For unattended installations, it is possible to use
<command>nixos-install --no-root-passwd</command>
in order to disable the password prompt entirely.
<command>nixos-install --no-root-passwd</command> in order to disable the
password prompt entirely.
</para>
</note>
</para>
4 changes: 2 additions & 2 deletions nixos/doc/manual/manual.xml
View file
Original file line number Diff line number Diff line change
@@ -17,8 +17,8 @@
<para>
If you encounter problems, please report them on the
<literal
xlink:href="https://discourse.nixos.org">Discourse</literal>
or on the <link
xlink:href="https://discourse.nixos.org">Discourse</literal> or
on the <link
xlink:href="irc://irc.freenode.net/#nixos">
<literal>#nixos</literal> channel on Freenode</link>. Bugs should be
reported in
10 changes: 5 additions & 5 deletions nixos/doc/manual/release-notes/rl-1509.xml
View file
Original file line number Diff line number Diff line change
@@ -435,11 +435,11 @@ system.autoUpgrade.enable = true;
<programlisting>
system.stateVersion = "14.12";
</programlisting>
The new option <option>system.stateVersion</option> ensures that
certain configuration changes that could break existing systems (such as
the <command>sshd</command> host key setting) will maintain compatibility
with the specified NixOS release. NixOps sets the state version of
existing deployments automatically.
The new option <option>system.stateVersion</option> ensures that certain
configuration changes that could break existing systems (such as the
<command>sshd</command> host key setting) will maintain compatibility with
the specified NixOS release. NixOps sets the state version of existing
deployments automatically.
</para>
</listitem>
<listitem>
Loading