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: 383c97dfd01b
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c7e0e9ed5abd
Choose a head ref
  • 3 commits
  • 6 files changed
  • 1 contributor

Commits on Apr 10, 2020

  1. Revert "Revert "iso-image: normalize volumeID"" 

    This reverts commit 21b50e6.
    @worldofpeace
    worldofpeace committed Apr 10, 2020
    Copy the full SHA
    a775961 View commit details
    Browse the repository at this point in the history

  2. 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"
```
    @worldofpeace
    worldofpeace committed Apr 10, 2020
    Copy the full SHA
    df8c30f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #84865 from worldofpeace/fixup-iso-image-volumeid-… 

    …again

Revert "Revert "iso-image: normalize volumeID"", iso-image: make $ARCH shorter
    @worldofpeace
    worldofpeace committed Apr 10, 2020
    Copy the full SHA
    c7e0e9e View commit details
    Browse the repository at this point in the history