Skip to content
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
base: a74e7092b076
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 9e50a36859d0
Choose a head ref
  • 5 commits
  • 6 files changed
  • 1 contributor

Commits on Apr 9, 2020

  1. make-iso9660-image.sh: enable joliet extension 

    This is per the advice of the osinfo-db maintainers https://gitlab.com/libosinfo/osinfo-db/-/merge_requests/107#note_313094852

(cherry picked from commit f59aa66)
    @worldofpeace
    worldofpeace committed Apr 9, 2020
    Copy the full SHA
    84b906d View commit details
    Browse the repository at this point in the history

  2. iso-image: normalize volumeID 

    The volumeID will now be in the format of:
nixos-$EDITON-$RELEASE-$ARCH

an example for the minimal image would look like:
nixos-minimal-20.09-x86-64-linux

(cherry picked from commit 70a8e9a)
    @worldofpeace
    worldofpeace committed Apr 9, 2020
    Copy the full SHA
    519ace8 View commit details
    Browse the repository at this point in the history

  3. iso-image: make sure volumeID is less than 32 chars 

    (cherry picked from commit 591e8d5)
    @worldofpeace
    worldofpeace committed Apr 9, 2020
    Copy the full SHA
    0a63410 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2020

  1. iso-image: make $ARCH shorter 

    we use stdenv.hostPlatform.uname.processor, which I believe is just like
`uname -p`.

Example values:
```
(import <nixpkgs> { system = "x86_64-linux"; }).stdenv.hostPlatform.uname.processor
"x86_64"

(import <nixpkgs> { system = "aarch64-linux"; }).stdenv.hostPlatform.uname.processor
aarch64

(import <nixpkgs> { system = "armv7l-linux"; }).stdenv.hostPlatform.uname.processor
"armv7l"
```

(cherry picked from commit df8c30f)
    @worldofpeace
    worldofpeace committed Apr 10, 2020
    Copy the full SHA
    17d67c0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #84863 from worldofpeace/backport-83551 

    [20.03] iso-image: normalize volumeID
    @worldofpeace
    worldofpeace committed Apr 10, 2020
    Copy the full SHA
    9e50a36 View commit details
    Browse the repository at this point in the history