Commit 64a7be7f authored by Kirill's avatar Kirill Committed by GitHub
Browse files

Merge branch 'master' into aria2.service

parents 31c4498a 2cbe3674

lib/maintainers.nix

+2 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ 
  heel = "Sergii Paryzhskyi <parizhskiy@gmail.com>";

  henrytill = "Henry Till <henrytill@gmail.com>";

  hinton = "Tom Hinton <t@larkery.com>";

  hodapp = "Chris Hodapp <hodapp87@gmail.com>";

  hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";

  iand675 = "Ian Duncan <ian@iankduncan.com>";

  ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
@@ -388,6 +389,7 @@ 
  paholg = "Paho Lurie-Gregg <paho@paholg.com>";

  pakhfn = "Fedor Pakhomov <pakhfn@gmail.com>";

  palo = "Ingolf Wanger <palipalo9@googlemail.com>";

  panaeon = "Vitalii Voloshyn <vitalii.voloshyn@gmail.com";

  paperdigits = "Mica Semrick <mica@silentumbrella.com>";

  pashev = "Igor Pashev <pashev.igor@gmail.com>";

  patternspandemic = "Brad Christensen <patternspandemic@live.com>";

lib/systems/parse.nix

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ rec { 
    msvc = {};

    eabi = {};

    androideabi = {};

    gnueabi = {};

    gnueabihf = {};

    unknown = {};

  };

lib/trivial.nix

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ rec { 
  /* Merge two attribute sets shallowly, right side trumps left



     Example:

       mergeAttrs { a = 1; b = 2; } // { b = 3; c = 4; }

       mergeAttrs { a = 1; b = 2; } { b = 3; c = 4; }

       => { a = 1; b = 3; c = 4; }

  */

  mergeAttrs = x: y: x // y;

nixos/doc/manual/administration/imperative-containers.xml

+9 −4
Original line number Diff line number Diff line
@@ -29,8 +29,10 @@ line. For instance, to create a container that has 
<literal>root</literal>:



<screen>

# nixos-container create foo --config 'services.openssh.enable = true; \

  users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];'

# nixos-container create foo --config '

  services.openssh.enable = true;

  users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];

'

</screen>



</para>
@@ -97,8 +99,11 @@ 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; \

  services.httpd.adminAddr = "foo@example.org";'

# nixos-container update foo --config '

  services.httpd.enable = true;

  services.httpd.adminAddr = "foo@example.org";

  networking.firewall.allowedTCPPorts = [ 80 ];

'



# curl http://$(nixos-container show-ip foo)/

&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…

nixos/modules/installer/tools/nix-fallback-paths.nix

+3 −3
Original line number Diff line number Diff line 
{

  x86_64-linux = "/nix/store/j6q3pb75q1sbk0xsa5x6a629ph98ycdl-nix-1.11.8";

  i686-linux = "/nix/store/4m6ps568l988bbr1p2k3w9raq3rblppi-nix-1.11.8";

  x86_64-darwin = "/nix/store/cc5q944yn3j2hrs8k0kxx9r2mk9mni8a-nix-1.11.8";

  x86_64-linux = "/nix/store/71im965h634iy99zsmlncw6qhx5jcclx-nix-1.11.9";

  i686-linux = "/nix/store/cgvavixkayc36l6kl92i8mxr6k0p2yhy-nix-1.11.9";

  x86_64-darwin = "/nix/store/w1c96v5yxvdmq4nvqlxjvg6kp7xa2lag-nix-1.11.9";

}