Skip to content

alsa-firmware: 1.2.1 -> 1.2.4#126413

Merged
happysalada merged 1 commit intomasterfrom
unknown repository
Jun 10, 2021
Merged

alsa-firmware: 1.2.1 -> 1.2.4#126413
happysalada merged 1 commit intomasterfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Jun 9, 2021

The patch was applied upstream:
alsa-project/alsa-firmware@c9e5b36

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • 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: 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. labels Jun 9, 2021
Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

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

Diff LGTM

@r-rmcgibbo
Copy link

r-rmcgibbo commented Jun 10, 2021

Result of nixpkgs-review pr 126413 at c6f681f run on aarch64-linux 1

1 package failed to build:
1 suggestion:
  • warning: maintainers-missing

    Package does not have a maintainer. Consider adding yourself?

    Near pkgs/os-specific/linux/alsa-firmware/default.nix:30:3:

       |
    30 |   meta = {
       |   ^
    

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement. Does something look off? Please file an issue or reach out on IRC.


Result of nixpkgs-review pr 126413 at c6f681f run on x86_64-linux 1

1 package built successfully:
  • alsa-firmware

@happysalada
Copy link
Contributor

Result of nixpkgs-review pr 126413 run on x86_64-darwin 1

1 similar comment
@happysalada
Copy link
Contributor

Result of nixpkgs-review pr 126413 run on x86_64-darwin 1

@happysalada
Copy link
Contributor

Oh, didn't see that it was only working on linux.

@happysalada happysalada merged commit 728ea2b into NixOS:master Jun 10, 2021
@vcunat
Copy link
Member

vcunat commented Jun 10, 2021

As the CI and r-rmcgibbo indicated, this broke build on aarch64-linux 😦 and is now blocking the nixos-unstable channel.

@vcunat
Copy link
Member

vcunat commented Jun 10, 2021

When I'm at it, the detailed log says

[...]
configure:4376: checking whether aarch64-unknown-linux-gnu-gcc understands -c and -o together
configure:4399: aarch64-unknown-linux-gnu-gcc -c conftest.c -o conftest2.
configure:4402: $? = 0
configure:4399: aarch64-unknown-linux-gnu-gcc -c conftest.c -o conftest2.
configure:4402: $? = 0
configure:4414: result: yes

configure:4447: checking whether the C compiler works
configure:4469: aarch64-unknown-linux-gnu-gcc -g -O2   conftest.c  >&5
/nix/store/vlhkqnrml6gcl2f5yndgwpcqwxa177px-binutils-2.35.1/bin/ld: cannot find crt1.o: No such file or directory
/nix/store/vlhkqnrml6gcl2f5yndgwpcqwxa177px-binutils-2.35.1/bin/ld: cannot find crti.o: No such file or directory
collect2: error: ld returned 1 exit status
configure:4473: $? = 1
configure:4513: result: no
configure: failed program was:
| /* confdefs.h */
| #define PACKAGE_NAME "alsa-firmware"
| #define PACKAGE_TARNAME "alsa-firmware"
| #define PACKAGE_VERSION "1.2.4"
| #define PACKAGE_STRING "alsa-firmware 1.2.4"
| #define PACKAGE_BUGREPORT ""
| #define PACKAGE_URL ""
| /* end confdefs.h.  */
| 
| int
| main (void)
| {
| 
|   ;
|   return 0;
| }
configure:4518: error: in `/build/alsa-firmware-1.2.4':
configure:4520: error: C compiler cannot create executables

@happysalada
Copy link
Contributor

My bad, I thought the AArch64 failure was unrelated.

@happysalada
Copy link
Contributor

crt1.o being part of libc, could it be just a matter of

            # The path to the Libc binaries such as `crti.o'.
            libc_libdir="$(< "${!curBintools}/nix-support/orig-libc")/lib"

@happysalada
Copy link
Contributor

reverting the change
#126462

@collares
Copy link
Member

I think I found a possible explanation for the aarch64 failures; I've written more about it at #21751 (comment), but I don't know of an idiomatic fix for the problem. Would be happy if someone could take a look :)

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: 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants