Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

firmwareLinuxNonfree: 2018-01-04 -> 2018-03-20 #37930

Merged
merged 2 commits into from Mar 28, 2018
Merged

firmwareLinuxNonfree: 2018-01-04 -> 2018-03-20 #37930

merged 2 commits into from Mar 28, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Mar 27, 2018 •
edited

Looking to use newer ath10k_pci firmware for my XPS 9560 laptop,
the newer firmware seems to resolve long-standing problems with
disconnects / firmeware crashing, although may require significant
testing (days, weeks) before and after to confirm.

Commit log for linux-firmware from updated revision: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/?id=44476f2465dac9c22bce90da66e86b2b56ba34f0

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Not sure what our usual policy is re:testing these firmware updates,
suggestions welcome on that front.

Probably should get at least one iwlwifi user to check things out?

@dtzWill dtzWill requested a review from fpletz March 27, 2018 19:38
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: firmwareLinuxNonfree

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: firmwareLinuxNonfree

Partial log (click to expand)

build flags: SHELL=/nix/store/q1g0rl8zfmz7r371fp5p42p4acmv297d-bash-4.4-p19/bin/bash
make: Nothing to be done for 'all'.
installing
install flags: install SHELL=/nix/store/q1g0rl8zfmz7r371fp5p42p4acmv297d-bash-4.4-p19/bin/bash DESTDIR=\$\(out\)
mkdir -p /nix/store/knbj62h9cd3vbdq3kacy3532vjz8sd82-firmware-linux-nonfree-2018-03-20-iwlwifi-fw-2018-03-02/lib/firmware
cp -r * /nix/store/knbj62h9cd3vbdq3kacy3532vjz8sd82-firmware-linux-nonfree-2018-03-20-iwlwifi-fw-2018-03-02/lib/firmware
rm -rf /nix/store/knbj62h9cd3vbdq3kacy3532vjz8sd82-firmware-linux-nonfree-2018-03-20-iwlwifi-fw-2018-03-02/lib/firmware/usbdux
find /nix/store/knbj62h9cd3vbdq3kacy3532vjz8sd82-firmware-linux-nonfree-2018-03-20-iwlwifi-fw-2018-03-02/lib/firmware \( -name 'WHENCE' -or -name 'LICENSE.*' -or \
        -name 'LICENCE.*' \) -exec rm -- {} \;
/nix/store/knbj62h9cd3vbdq3kacy3532vjz8sd82-firmware-linux-nonfree-2018-03-20-iwlwifi-fw-2018-03-02

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: firmwareLinuxNonfree

Partial log (click to expand)

build flags: SHELL=/nix/store/3gg2p6n4kv2f0lsxd41f5iz1ivkbzyzr-bash-4.4-p19/bin/bash
make: Nothing to be done for 'all'.
installing
install flags: install SHELL=/nix/store/3gg2p6n4kv2f0lsxd41f5iz1ivkbzyzr-bash-4.4-p19/bin/bash DESTDIR=\$\(out\)
mkdir -p /nix/store/vbkpdyyryya4z8may50m45fqmh85kfnx-firmware-linux-nonfree-2018-03-20-iwlwifi-fw-2018-03-02/lib/firmware
cp -r * /nix/store/vbkpdyyryya4z8may50m45fqmh85kfnx-firmware-linux-nonfree-2018-03-20-iwlwifi-fw-2018-03-02/lib/firmware
rm -rf /nix/store/vbkpdyyryya4z8may50m45fqmh85kfnx-firmware-linux-nonfree-2018-03-20-iwlwifi-fw-2018-03-02/lib/firmware/usbdux
find /nix/store/vbkpdyyryya4z8may50m45fqmh85kfnx-firmware-linux-nonfree-2018-03-20-iwlwifi-fw-2018-03-02/lib/firmware \( -name 'WHENCE' -or -name 'LICENSE.*' -or \
        -name 'LICENCE.*' \) -exec rm -- {} \;
/nix/store/vbkpdyyryya4z8may50m45fqmh85kfnx-firmware-linux-nonfree-2018-03-20-iwlwifi-fw-2018-03-02

@fpletz
Copy link
Member

fpletz commented Mar 27, 2018

It looks as if the iwlwifi firmware has also been merged into the main firmware repository: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=f0e78fc60ae351ccfa18edf817bc09a38a8ac2e8

Maybe we can remove our hack to merge both repos.

@fpletz
Copy link
Member

fpletz commented Mar 27, 2018

Regarding the question about bumping linux-firmware in general: It is generally safe and rarely causes problems - testing is rarely significant because there's just too much firmware/hardware revision combinations to test.

@fpletz
firmwareLinuxNonfree: simplify source fetching
ecf5caf 
The iwlwifi repo has been merged into linux-firmware.
@fpletz
Copy link
Member

fpletz commented Mar 28, 2018

Verified that our old way to merge both repos and the referenced commit of linux-firmware yields exactly the same output content. Finally this ugly hack is gone! 🎉

@fpletz
Copy link
Member

fpletz commented Mar 28, 2018

@GrahamcOfBorg build firmwareLinuxNonfree

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: firmwareLinuxNonfree

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: firmwareLinuxNonfree

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: firmwareLinuxNonfree

Partial log (click to expand)

build flags: SHELL=/nix/store/3gg2p6n4kv2f0lsxd41f5iz1ivkbzyzr-bash-4.4-p19/bin/bash
make: Nothing to be done for 'all'.
installing
install flags: install SHELL=/nix/store/3gg2p6n4kv2f0lsxd41f5iz1ivkbzyzr-bash-4.4-p19/bin/bash DESTDIR=\$\(out\)
mkdir -p /nix/store/8i1r92pmjz9gg8wn8ik1fb092sml5qml-firmware-linux-nonfree-2018-03-20/lib/firmware
cp -r * /nix/store/8i1r92pmjz9gg8wn8ik1fb092sml5qml-firmware-linux-nonfree-2018-03-20/lib/firmware
rm -rf /nix/store/8i1r92pmjz9gg8wn8ik1fb092sml5qml-firmware-linux-nonfree-2018-03-20/lib/firmware/usbdux
find /nix/store/8i1r92pmjz9gg8wn8ik1fb092sml5qml-firmware-linux-nonfree-2018-03-20/lib/firmware \( -name 'WHENCE' -or -name 'LICENSE.*' -or \
        -name 'LICENCE.*' \) -exec rm -- {} \;
/nix/store/8i1r92pmjz9gg8wn8ik1fb092sml5qml-firmware-linux-nonfree-2018-03-20

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: firmwareLinuxNonfree

Partial log (click to expand)

these derivations will be built:
  /nix/store/p759s1gkfkvbrpcz4h1di6smvdd86mr1-openssh-7.6p1.drv
  /nix/store/05vdk0p61d9dzdp7zbai3a5qhyxa0sp3-git-2.16.2.drv
  /nix/store/7knd05rl6dprllh1yg530ngz5chx13qk-linux-firmware.drv
  /nix/store/l6kn78944gz5a1cmj8fcp292rc5y8c79-firmware-linux-nonfree-2018-03-20.drv
waiting for locks or build slots...
/nix/store/8i1r92pmjz9gg8wn8ik1fb092sml5qml-firmware-linux-nonfree-2018-03-20

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: firmwareLinuxNonfree

Partial log (click to expand)

build flags: SHELL=/nix/store/q1g0rl8zfmz7r371fp5p42p4acmv297d-bash-4.4-p19/bin/bash
make: Nothing to be done for 'all'.
installing
install flags: install SHELL=/nix/store/q1g0rl8zfmz7r371fp5p42p4acmv297d-bash-4.4-p19/bin/bash DESTDIR=\$\(out\)
mkdir -p /nix/store/viiqpcb1p86ga71f6w91i8pddjnsklji-firmware-linux-nonfree-2018-03-20/lib/firmware
cp -r * /nix/store/viiqpcb1p86ga71f6w91i8pddjnsklji-firmware-linux-nonfree-2018-03-20/lib/firmware
rm -rf /nix/store/viiqpcb1p86ga71f6w91i8pddjnsklji-firmware-linux-nonfree-2018-03-20/lib/firmware/usbdux
find /nix/store/viiqpcb1p86ga71f6w91i8pddjnsklji-firmware-linux-nonfree-2018-03-20/lib/firmware \( -name 'WHENCE' -or -name 'LICENSE.*' -or \
	-name 'LICENCE.*' \) -exec rm -- {} \;
/nix/store/viiqpcb1p86ga71f6w91i8pddjnsklji-firmware-linux-nonfree-2018-03-20

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: firmwareLinuxNonfree

Partial log (click to expand)

/nix/store/viiqpcb1p86ga71f6w91i8pddjnsklji-firmware-linux-nonfree-2018-03-20

@fpletz fpletz merged commit 5e4c376 into NixOS:master Mar 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz fpletz approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dtzWill @GrahamcOfBorg @fpletz