Merge nixos-hardware into nixpkgs under `/nixos/hardware` #91160

Profpatsch · 2020-06-20T11:10:36Z

Merges https://github.com/NixOS/nixos-hardware into nixpkgs.

This will give better discoverability, and considering the low
turnover (less than 100 commits in the last year and only 350 total)
it won’t make any dent on the size of nixpkgs.

We have a monorepo, let’s use it.

cc @Mic92 and @yegortimoshenko as the top contributors to nixos-hardware.

Followup:

Move the few issues on nixos-hardware to the nixpkgs issue tracker
Archive nixos-hardware
Move the stray hardware definitions in nixos/modules/installer/cd-dvd (e.g. the raspberripy definitions) to nixos/hardware
Think about how to integrate the tests
Integrate into nixos-generate-config
Mention in nixos installer configuration.

In my experience, this makes keyboard behavior match letters printed on it both on EU and US keyboards.

Basically a meta profile that combines thinkpad + intel.

…is-drop-sudo

x230: init

I've tested this to work on MacBookAir4,1 and I'm going to deploy it to MacBookAir6,2 today and Lenovo ThinkPad X230 in a week from now. Also, cleaned up Lenovo ThinkPad X230 profile.

This is handled by TLP, so we don't need to set that explicitly.

This setting has been part of NixOS since version 16.09

It is going to be merged into nixpkgs, under `nixos/hardware`. This will give better discoverability, and considering the low turnover (less than 100 commits in the last year and only 350 total) it won’t make any dent on the size of nixpkgs. We have a monorepo, let’s use it.

…merge Merges https://github.com/NixOS/nixos-hardware into nixpkgs. This will give better discoverability, and considering the low turnover (less than 100 commits in the last year and only 350 total) it won’t make any dent on the size of nixpkgs. We have a monorepo, let’s use it

It’s a full subset of the toplevel .gitignore.

lukateras

I think this is a great idea.

nixos/hardware/.travis.yml

lukateras · 2020-06-20T11:15:43Z

nixos/hardware/COPYING

@@ -0,0 +1,111 @@
+Statement of Purpose


This is a public domain license. So, for simplicity's sake, I'd remove it and keep the top-level Nixpkgs MIT license.

I wasn’t sure of that, as IANAL I opted for keeping it safe. I would make that decision in a separate PR.

We are going to have to integrate the tests differently, but it’s fine for now.

Mic92 · 2020-06-20T11:29:01Z

I am also all for it. It also makes it easier to apply changes that depend on specific nixpkgs revisions. Also we can finally integrate this into nixos-generate-config to make specific hardware just work (TM).

Mic92 · 2020-06-20T11:38:51Z

.github/CODEOWNERS

@@ -55,6 +55,15 @@
 # NixOS integration test driver
 /nixos/lib/test-driver  @tfc

+# NixOS hardware descriptions
+/nixos/hardware/beagleboard/pocketbeagle @yegortimoshenko
+/nixos/hardware/dell/xps/13-9370 @moredread


cc @Moredread

Mic92 · 2020-06-20T11:39:01Z

.github/CODEOWNERS

+# NixOS hardware descriptions
+/nixos/hardware/beagleboard/pocketbeagle @yegortimoshenko
+/nixos/hardware/dell/xps/13-9370 @moredread
+/nixos/hardware/dell/xps/13-9380 @kalbasit


grahamc · 2020-06-20T12:18:31Z

I don't think this is a good idea. These profiles aren't tested regularly, and merging them in to nixpkgs means there should be a quality standard IMO. They're also fairly opinionated in ways that our users may not want. I don't this is a healthy move for Nixpkgs or for the nixos-hardware project.`

grahamc · 2020-06-20T12:21:09Z

I'm also not sure about the license. Nixpkgs' expressions are all MIT. I think this should be reverted for more consideration.

edolstra · 2020-06-20T15:26:46Z

Indeed, changes to the scope of Nixpkgs require an RFC.

cleverca22 · 2020-11-06T17:51:55Z

seems this can also sometimes confuse git bisect:

[clever@amd-nixos:~/apps/nixpkgs]$ git bisect bad
Bisecting: 284 revisions left to test after this (roughly 8 steps)
[c3b2ac63ff06e5dd4fa66f75bfab7892b3edfdc5] Add deepsleep to avoid wakeups during sleep mode (#136)

[clever@amd-nixos:~/apps/nixpkgs]$ nix-build -A platformio && ls -l result/
attribute 'platformio' in selection path 'platformio' not found

[clever@amd-nixos:~/apps/nixpkgs]$ nix repl .
Welcome to Nix version 3.0pre20200829_f156513. Type :? for help.

Loading '.'...
Added 0 variables.

nix-repl> :q

[clever@amd-nixos:~/apps/nixpkgs]$ cat default.nix
# This file is necessary so nix-env -qa does not break,
# when nixos-hardware is used as a channel
{}

[clever@amd-nixos:~/apps/nixpkgs]$

bisect randomly switched over to commits from nixos-hardware, and then nix-build fails due to an empty set

lukateras and others added 30 commits December 25, 2017 01:28

apple: enable facetimehd if allowUnfree = true

5a1a527

apple: wrap hardware.facetimehd option

9b3e42b

raspberry-pi/2: format README

a5df615

apple: add hid_apple.iso_layout=0 kernel param

e228c78

In my experience, this makes keyboard behavior match letters printed on it both on EU and US keyboards.

apple/macbook-air/4: add

88bd126

common/pc/laptop: disable cpuFreqGovernor

f9a1ac6

apple/macbook-air/4: resolve tearing

2227f2c

add lenovo x250 (NixOS#38)

a2c6590

Basically a meta profile that combines thinkpad + intel.

README: add apple/macbook-air/{4,6}

e6091de

README: add links to docs

008eb39

CODEWONERS: init

571bea1

add Travis CI to the repo

8389074

tests/eval-test: clean up

459ac00

Merge pull request NixOS#40 from NixOS/travis-ci

7dbceec

tests/eval-test: Add --show-trace from NixOS#44

f1952ea

tests: drop -test prefix to match naming style used by NixOS tests

8d578a5

travis: fixup after 8d578a5

0939f0c

travis: drop sudo

26d3f54

Merge pull request NixOS#45 from yegortimoshenko/20171225.193307/trav…

4ac0a93

…is-drop-sudo

thinkpad: do not enable thinkfan by default

554629a

treewide: mark things that have to be done

d1d99eb

thinkpad/x230: init

1cb3a1c

README: add x230

2251a66

CODEOWNERS: add makefu for x230

8552afe

Merge pull request NixOS#46 from makefu/master

8a05dc9

x230: init

CODEOWNERS: add yegortimoshenko to Lenovo ThinkPad X230

ed3ba5c

common/cpu/intel: add vaapi/vdpau drivers

b130496

I've tested this to work on MacBookAir4,1 and I'm going to deploy it to MacBookAir6,2 today and Lenovo ThinkPad X230 in a week from now. Also, cleaned up Lenovo ThinkPad X230 profile.

common/pc/laptop: drop explicit vm.laptop_mode

5a00ea4

This is handled by TLP, so we don't need to set that explicitly.

LICENSE: license under CC0-1.0

52e84ef

apple/macbook-air/4: enable RC6p, RC6pp GPU sleep states

19c0c04

erikarvstedt and others added 7 commits May 20, 2020 16:29

pc/laptop: remove redundant cpuFreqGovernor setting

90868c6

This setting has been part of NixOS since version 16.09

Merge pull request NixOS#168 from Mic92/tests

385c5ba

Merge pull request NixOS#169 from erikarvstedt/improve-laptop-preset

2f2c2d9

nixos/hardware: move CODEOWNERS to toplevel

ba2dcbc

nixos/hardware: remove .gitignore

b89f6ad

It’s a full subset of the toplevel .gitignore.

Profpatsch requested review from Mic92 and lukateras June 20, 2020 11:10

Profpatsch requested a review from edolstra as a code owner June 20, 2020 11:10

Profpatsch changed the title ~~Merge nixos-hardware into nixpkgs~~ Merge nixos-hardware into nixpkgs under /nixos/hardware Jun 20, 2020

ofborg bot added 6.topic: nixos 6.topic: policy discussion labels Jun 20, 2020

lukateras approved these changes Jun 20, 2020

View reviewed changes

ofborg bot added 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Jun 20, 2020

nixos/hardware: remove .travis.yml

2c282fb

We are going to have to integrate the tests differently, but it’s fine for now.

Mic92 reviewed Jun 20, 2020

View reviewed changes

Mic92 approved these changes Jun 20, 2020

View reviewed changes

Profpatsch merged commit cc0bf76 into NixOS:master Jun 20, 2020

grahamc mentioned this pull request Jun 20, 2020

Revert "Merge nixos-hardware into nixpkgs under /nixos/hardware" #91165

Merged

Profpatsch mentioned this pull request Jun 22, 2020

[RFC 0070] Merge nixos-hardware in to nixpkgs (#70) NixOS/rfcs#70

Closed

flokli mentioned this pull request Apr 12, 2022

nixos/doc: add notes on additional drivers or firmware #168306

Merged

13 tasks

RaitoBezarius mentioned this pull request Apr 4, 2024

[Tracking Issue] Hardware enablement policies in nixpkgs #301541

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge nixos-hardware into nixpkgs under `/nixos/hardware` #91160

Merge nixos-hardware into nixpkgs under `/nixos/hardware` #91160

Profpatsch commented Jun 20, 2020 •

edited by Mic92

lukateras left a comment

lukateras Jun 20, 2020 •

edited

Profpatsch Jun 20, 2020

Mic92 commented Jun 20, 2020 •

edited

Mic92 Jun 20, 2020

Mic92 Jun 20, 2020

grahamc commented Jun 20, 2020

grahamc commented Jun 20, 2020

edolstra commented Jun 20, 2020

cleverca22 commented Nov 6, 2020

Merge nixos-hardware into nixpkgs under /nixos/hardware #91160

Merge nixos-hardware into nixpkgs under /nixos/hardware #91160

Conversation

Profpatsch commented Jun 20, 2020 • edited by Mic92

lukateras left a comment

Choose a reason for hiding this comment

lukateras Jun 20, 2020 • edited

Choose a reason for hiding this comment

Profpatsch Jun 20, 2020

Choose a reason for hiding this comment

Mic92 commented Jun 20, 2020 • edited

Mic92 Jun 20, 2020

Choose a reason for hiding this comment

Mic92 Jun 20, 2020

Choose a reason for hiding this comment

grahamc commented Jun 20, 2020

grahamc commented Jun 20, 2020

edolstra commented Jun 20, 2020

cleverca22 commented Nov 6, 2020

Merge nixos-hardware into nixpkgs under `/nixos/hardware` #91160

Merge nixos-hardware into nixpkgs under `/nixos/hardware` #91160

Profpatsch commented Jun 20, 2020 •

edited by Mic92

lukateras Jun 20, 2020 •

edited

Mic92 commented Jun 20, 2020 •

edited