···

       
25
       
25
       
 
       
    </group>

     

       
26
       
26
       
 
       
   </arg>

     

       
27
       
27
       
 
       
   <arg>

     

       
28
       
28
       
-
       
    <group choice='req'>

     

       
29
       
29
       
-
       
     <arg choice='plain'>

     

       
30
       
30
       
-
       
      <option>--print-build-logs</option>

     

       
31
       
31
       
-
       
     </arg>

     

       
32
       
32
       
-
       
     <arg choice='plain'>

     

       
33
       
33
       
-
       
      <option>-L</option>

     

       
34
       
34
       
-
       
     </arg>

     

       
35
       
35
       
-
       
    </group>

     

       
36
       
36
       
-
       
   </arg>

     

       
37
       
37
       
-
       
   <arg>

     

       
38
       
28
       
 
       
    <arg choice='plain'>

     

       
39
       
29
       
 
       
     <option>-I</option>

     

       
40
       
30
       
 
       
    </arg>

     
···

       
176
       
166
       
 
       
     information is printed on standard error, never on standard

     

       
177
       
167
       
 
       
     output.</para>

     

       
178
       
168
       
 
       
     <para>Please note that this option may be specified repeatedly.</para>

     

       
179
       
179
       
-
       
    </listitem>

     

       
180
       
180
       
-
       
   </varlistentry>

     

       
181
       
181
       
-
       
   <varlistentry>

     

       
182
       
182
       
-
       
    <term><option>--print-build-logs</option> / <option>-L</option></term>

     

       
183
       
183
       
-
       
    <listitem>

     

       
184
       
184
       
-
       
     <para>Print the full build logs of <command>nix build</command> to stderr.</para>

     

       
185
       
169
       
 
       
    </listitem>

     

       
186
       
170
       
 
       
   </varlistentry>

     

       
187
       
171
       
 
       
   <varlistentry>

     

···

       
143
       
143
       
 
       
        self.logfile = os.environ.get("LOGFILE", "/dev/null")

     

       
144
       
144
       
 
       
        self.logfile_handle = codecs.open(self.logfile, "wb")

     

       
145
       
145
       
 
       
        self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8")

     

       
146
       
146
       
-
       
        self.queue: "Queue[Dict[str, str]]" = Queue(1000)

     

       
146
       
146
       
+
       
        self.queue: "Queue[Dict[str, str]]" = Queue()

     

       
147
       
147
       
 
       


     

       
148
       
148
       
 
       
        self.xml.startDocument()

     

       
149
       
149
       
 
       
        self.xml.startElement("logfile", attrs={})

     
···

       
391
       
391
       
 
       
    def execute(self, command: str) -> Tuple[int, str]:

     

       
392
       
392
       
 
       
        self.connect()

     

       
393
       
393
       
 
       


     

       
394
       
394
       
-
       
        out_command = "( {} ); echo '|!EOF' $?\n".format(command)

     

       
394
       
394
       
+
       
        out_command = "( {} ); echo '|!=EOF' $?\n".format(command)

     

       
395
       
395
       
 
       
        self.shell.send(out_command.encode())

     

       
396
       
396
       
 
       


     

       
397
       
397
       
 
       
        output = ""

     

       
398
       
398
       
-
       
        status_code_pattern = re.compile(r"(.*)\|\!EOF\s+(\d+)")

     

       
398
       
398
       
+
       
        status_code_pattern = re.compile(r"(.*)\|\!=EOF\s+(\d+)")

     

       
399
       
399
       
 
       


     

       
400
       
400
       
 
       
        while True:

     

       
401
       
401
       
 
       
            chunk = self.shell.recv(4096).decode(errors="ignore")

     

···

       
15
       
15
       
 
       
channelPath=

     

       
16
       
16
       
 
       
system=

     

       
17
       
17
       
 
       
verbosity=()

     

       
18
       
18
       
-
       
buildLogs=

     

       
19
       
18
       
 
       


     

       
20
       
19
       
 
       
while [ "$#" -gt 0 ]; do

     

       
21
       
20
       
 
       
    i="$1"; shift 1

     
···

       
60
       
59
       
 
       
        -v*|--verbose)

     

       
61
       
60
       
 
       
            verbosity+=("$i")

     

       
62
       
61
       
 
       
            ;;

     

       
63
       
63
       
-
       
        -L|--print-build-logs)

     

       
64
       
64
       
-
       
            buildLogs="$i"

     

       
65
       
65
       
-
       
            ;;

     

       
66
       
62
       
 
       
        *)

     

       
67
       
63
       
 
       
            echo "$0: unknown option \`$i'"

     

       
68
       
64
       
 
       
            exit 1

     
···

       
100
       
96
       
 
       
if [[ -z $system ]]; then

     

       
101
       
97
       
 
       
    echo "building the configuration in $NIXOS_CONFIG..."

     

       
102
       
98
       
 
       
    outLink="$tmpdir/system"

     

       
103
       
103
       
-
       
    nix build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \

     

       
99
       
99
       
+
       
    nix-build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \

     

       
104
       
100
       
 
       
        --extra-substituters "$sub" \

     

       
105
       
105
       
-
       
        -f '<nixpkgs/nixos>' system -I "nixos-config=$NIXOS_CONFIG" ${verbosity[@]} ${buildLogs}

     

       
101
       
101
       
+
       
        '<nixpkgs/nixos>' -A system -I "nixos-config=$NIXOS_CONFIG" ${verbosity[@]}

     

       
106
       
102
       
 
       
    system=$(readlink -f $outLink)

     

       
107
       
103
       
 
       
fi

     

       
108
       
104
       
 
       


     

···

       
510
       
510
       
 
       


     

       
511
       
511
       
 
       
    system.activationScripts.nix = stringAfter [ "etc" "users" ]

     

       
512
       
512
       
 
       
      ''

     

       
513
       
513
       
-
       
        # Create directories in /nix.

     

       
514
       
514
       
-
       
        ${nix}/bin/nix ping-store --no-net

     

       
513
       
513
       
+
       
        install -m 0755 -d /nix/var/nix/{gcroots,profiles}/per-user

     

       
515
       
514
       
 
       


     

       
516
       
515
       
 
       
        # Subscribe the root user to the NixOS channel by default.

     

       
517
       
516
       
 
       
        if [ ! -e "/root/.nix-channels" ]; then