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.

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

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

Merged
merged 362 commits into from Jun 20, 2020

Conversation

@Profpatsch
Copy link
Member

Profpatsch commented Jun 20, 2020

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.
yegortimoshenko and others added 30 commits Dec 25, 2017
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.
…op-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.
Mic92 and others added 9 commits May 18, 2020
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.
@Profpatsch Profpatsch requested review from Mic92 and yegortimoshenko Jun 20, 2020
@Profpatsch Profpatsch requested a review from edolstra as a code owner Jun 20, 2020
@Profpatsch Profpatsch changed the title Merge nixos-hardware into nixpkgs Merge nixos-hardware into nixpkgs under `/nixos/hardware` Jun 20, 2020
Copy link
Member

yegortimoshenko left a comment

I think this is a great idea.

nixos/hardware/.travis.yml Outdated Show resolved Hide resolved
@@ -0,0 +1,111 @@
Statement of Purpose

This comment has been minimized.

Copy link
@yegortimoshenko

yegortimoshenko Jun 20, 2020

Member

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

This comment has been minimized.

Copy link
@Profpatsch

Profpatsch Jun 20, 2020

Author Member

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
Copy link
Contributor

Mic92 commented Jun 20, 2020

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

@@ -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

This comment has been minimized.

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

This comment has been minimized.

Copy link
@Mic92
@Mic92
Mic92 approved these changes Jun 20, 2020
@Profpatsch Profpatsch merged commit cc0bf76 into NixOS:master Jun 20, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2c282fb"; rev="2c282fb537c6917004d1193e44cedee64790dabe"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2c282fb"; rev="2c282fb537c6917004d1193e44cedee64790dabe"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2c282fb"; rev="2c282fb537c6917004d1193e44cedee64790dabe"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2c282fb"; rev="2c282fb537c6917004d1193e44cedee64790dabe"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2c282fb"; rev="2c282fb537c6917004d1193e44cedee64790dabe"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2c282fb"; rev="2c282fb537c6917004d1193e44cedee64790dabe"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="2c282fb"; rev="2c282fb537c6917004d1193e44cedee64790dabe"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
travis, travis.passthru.tests on aarch64-linux Success
Details
travis, travis.passthru.tests on x86_64-darwin Success
Details
travis, travis.passthru.tests on x86_64-linux Success
Details
@grahamc
Copy link
Member

grahamc commented Jun 20, 2020

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
Copy link
Member

grahamc commented Jun 20, 2020

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

@edolstra
Copy link
Member

edolstra commented Jun 20, 2020

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

You can’t perform that action at this time.