Skip to content

arm-trusted-firmware: remove version parameter#185004

Merged
SuperSandro2000 merged 1 commit intomasterfrom
unknown repository
Aug 13, 2022
Merged

arm-trusted-firmware: remove version parameter#185004
SuperSandro2000 merged 1 commit intomasterfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Aug 3, 2022

Description of changes

The arm-trusted-firmware/default.nix expression exposes buildArmTrustedFirmware and its version?"2.7" field to top-level/all-packages.nix.` Unfortunately it doesn't work. Changing the version field doesn't change what version of the ATF source code is used. Attempting to "lock" an installation to a specific version by overriding this field (e.g. version="2.7") won't work either; when nixpkgs bumps the version to 2.8 the user will end
up building the 2.8 source code but the resulting expression will be labeled misleadingly in the store:

/nix/store/eeee...-arm-trusted-firmware-2.7/

using the 2.8 source code. So not only does version not lock
the version, it will actually conceal the fact that the underlying
source code has been upgraded!

Let's just remove the version field. It doesn't work and never did.

Things done
  • Built on platform(s)
    • aarch64-linux (cross from x86_64-linux)
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Aug 3, 2022
@ofborg ofborg bot requested a review from lopsided98 August 4, 2022 01:31
@ofborg ofborg bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. and removed 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Aug 4, 2022
Copy link
Copy Markdown
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

squash merge

@ghost ghost requested a review from SuperSandro2000 August 4, 2022 22:06
@ghost

This comment was marked as outdated.

@ofborg ofborg bot added 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Aug 5, 2022
@ghost ghost marked this pull request as draft August 6, 2022 20:33
@ghost ghost marked this pull request as ready for review August 6, 2022 20:33
@ghost ghost changed the title arm-trusted-firmware: prevent dangerous version mixups arm-trusted-firmware: remove version parameter Aug 7, 2022
@ghost ghost requested a review from SuperSandro2000 August 7, 2022 02:04
@ghost ghost requested a review from SuperSandro2000 August 7, 2022 22:36
@ghost
Copy link
Copy Markdown
Author

ghost commented Aug 13, 2022

Squashed.

The arm-trusted-firmware/default.nix expression exposes
`buildArmTrustedFirmware` and its `version?"2.7"` field to
`top-level/all-packages.nix`.  Unfortunately it doesn't work.
Changing the version field doesn't change what version of the ATF
source code is used.  Attempting to "lock" an installation to a
specific version by overriding this field (e.g. version="2.7") won't
work either; when nixpkgs bumps the version to 2.8 the user will end
up building the 2.8 source code but the resulting expression will be
labeled misleadingly in the store:

```
  /nix/store/eeee...-arm-trusted-firmware-2.7/
```

**using the 2.8 source code**.  So not only does `version` not lock
the version, it will actually *conceal* the fact that the underlying
source code has been upgraded!

Let's just remove the `version` field.  It doesn't work and never did.

#185004 (comment)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
@SuperSandro2000 SuperSandro2000 merged commit d54c213 into NixOS:master Aug 13, 2022
@ghost ghost deleted the pr/atf/prevent-version-mixup branch August 13, 2022 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant