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: e13c2086659b
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: be3895937636
Choose a head ref
  • 15 commits
  • 18 files changed
  • 7 contributors

Commits on Oct 1, 2018

  1. lz4: 1.8.2 -> 1.8.3 (#47547) 

    (cherry picked from commit 55b6cad)
    @dtzWill @xeji
    dtzWill authored and xeji committed Oct 1, 2018
    Copy the full SHA
    1f1c807 View commit details

  2. Merge branch 'release-18.09' into staging-18.09

    @xeji
    xeji committed Oct 1, 2018
    Copy the full SHA
    f2faf32 View commit details

Commits on Oct 3, 2018

  1. buildRustPackage now correctly installs binaries to bin and libraries… 

    … to lib.
    @et4te
    et4te committed Oct 3, 2018
    Copy the full SHA
    6f37fa7 View commit details

  2. Use regex instead of -name in find with -print0 and xargs -0.

    @et4te
    et4te committed Oct 3, 2018
    Copy the full SHA
    f08cebd View commit details

  3. Shortened rmdir, improved regex to support shared libs with multiple … 

    …integers at the end.
    @et4te
    et4te committed Oct 3, 2018
    Copy the full SHA
    c3f8368 View commit details

  4. Merge pull request #47709 from et4te/rustbuild-fix-staging 

    buildRustPackage: install binaries to bin and libraries to lib correctly
    @Mic92
    Mic92 authored Oct 3, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    46069d4 View commit details

Commits on Oct 4, 2018

  1. doc: installing-usb make macOS note a note. 

    While it seemingly brings more attention to the macOS notes with the
default docbook template, it better represents which parts of the
section are about macOS, and which parts are simply in the flow of the
text; otherwise the last paragraph may be lost into the details for
macOS.

(cherry picked from commit 8192fcd)
    @samueldr @grahamc
    samueldr authored and grahamc committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    59f5dea View commit details

  2. nixos/doc: Adds sub-folder to input files. 

    (cherry picked from commit 2c0d56f)
    @samueldr @grahamc
    samueldr authored and grahamc committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    292d4fc View commit details

  3. doc: Reviews partitioning instructions to use parted. 

    The tests in <nixos/tests/installer.nix> are using `parted`, so they are
bound to be better tested than `fdisk`.

This is brought on by a couple issues, plus reports on IRC that the
`fdisk` instructions didn't work as expected.

 * #39354
 * #46309
 * #39942
 * #45478

Care was taken so that the other documented steps did not need changes.

In all this kerfufle, a slight re-organization of the Chapter has been
made, allowing better deep linking.

(cherry picked from commit 6cfbf40)
    @samueldr @grahamc
    samueldr authored and grahamc committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9da278d View commit details

  4. doc: installing-usb: removes notes about unetbootin. 

    They are known to cause more issues than solving issues; futhermore
using `dd` should work everywhere without fail.

(cherry picked from commit 8467dc8)
    @samueldr @grahamc
    samueldr authored and grahamc committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    91c3bc1 View commit details

  5. linux: 4.9.130 -> 4.9.131 

    (cherry picked from commit e6ff57b328e913ae656e038a819b12926eadd230)
    @NeQuissimus
    NeQuissimus committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: C5629893DE283C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e468090 View commit details

  6. linux: 4.14.73 -> 4.14.74 

    (cherry picked from commit 575c118a6469cd2148ed3092de90f0d8d3aaec53)
    @NeQuissimus
    NeQuissimus committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: C5629893DE283C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a4d4490 View commit details

  7. linux: 4.18.11 -> 4.18.12 

    (cherry picked from commit 21db680d32522ece1cbb3999b8e468f2e8b57906)
    @NeQuissimus
    NeQuissimus committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    NeQuissimus Tim Steinbach
    GPG key ID: C5629893DE283C96
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6cbd1ec View commit details

  8. Merge branch 'staging-18.09' into release-18.09

    @vcunat
    vcunat committed Oct 4, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    11ec1cd View commit details

  9. Merge pull request #47407 from kalbasit/nixpkgs_add-terraform-provide… 

    …r-nixos

terraform: update all providers and move nixos provider under terraform.withPlugins
(cherry picked from commit 5547a8b)
    @Mic92 @zimbatm
    Mic92 authored and zimbatm committed Oct 4, 2018
    Copy the full SHA
    be38959 View commit details
2 changes: 1 addition & 1 deletion nixos/doc/manual/Makefile
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ all: manual-combined.xml format
.PHONY: debug
debug: generated manual-combined.xml

manual-combined.xml: generated *.xml
manual-combined.xml: generated *.xml **/*.xml
rm -f ./manual-combined.xml
nix-shell --packages xmloscopy \
--run "xmloscopy --docbook5 ./manual.xml ./manual-combined.xml"
48 changes: 10 additions & 38 deletions nixos/doc/manual/installation/installing-usb.xml
View file
Original file line number Diff line number Diff line change
@@ -9,13 +9,12 @@
For systems without CD drive, the NixOS live CD can be booted from a USB
stick. You can use the <command>dd</command> utility to write the image:
<command>dd if=<replaceable>path-to-image</replaceable>
of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying
of=<replaceable>/dev/sdX</replaceable></command>. Be careful about specifying
the correct drive; you can use the <command>lsblk</command> command to get a
list of block devices.
</para>

<para>
On macOS:
<note>
<title>On macOS</title>
<para>
<programlisting>
$ diskutil list
[..]
@@ -26,43 +25,16 @@ $ diskutil unmountDisk diskN
Unmount of all volumes on diskN was successful
$ sudo dd bs=1m if=nix.iso of=/dev/rdiskN
</programlisting>
Using the 'raw' <command>rdiskN</command> device instead of
<command>diskN</command> completes in minutes instead of hours. After
<command>dd</command> completes, a GUI dialog "The disk you inserted was not
readable by this computer" will pop up, which can be ignored.
Using the 'raw' <command>rdiskN</command> device instead of
<command>diskN</command> completes in minutes instead of hours. After
<command>dd</command> completes, a GUI dialog "The disk you inserted was
not readable by this computer" will pop up, which can be ignored.
</para>
</note>
</para>

<para>
The <command>dd</command> utility will write the image verbatim to the drive,
making it the recommended option for both UEFI and non-UEFI installations.
For non-UEFI installations, you can alternatively use
<link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>. If
you cannot use <command>dd</command> for a UEFI installation, you can also
mount the ISO, copy its contents verbatim to your drive, then either:
<itemizedlist>
<listitem>
<para>
Change the label of the disk partition to the label of the ISO (visible
with the blkid command), or
</para>
</listitem>
<listitem>
<para>
Edit <filename>loader/entries/nixos-livecd.conf</filename> on the drive
and change the <literal>root=</literal> field in the
<literal>options</literal> line to point to your drive (see the
documentation on <literal>root=</literal> in
<link xlink:href="https://www.kernel.org/doc/Documentation/admin-guide/kernel-parameters.txt">
the kernel documentation</link> for more details).
</para>
</listitem>
<listitem>
<para>
If you want to load the contents of the ISO to ram after bootin (So you
can remove the stick after bootup) you can append the parameter
<literal>copytoram</literal> to the <literal>options</literal> field.
</para>
</listitem>
</itemizedlist>
</para>
</section>
Loading