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

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

Merged
merged 1 commit into from Jun 20, 2020

Conversation

@grahamc
Copy link
Member

grahamc commented Jun 20, 2020

Reverts #91160

It isn't cool to merge two separate projects with only one possible hour of discussion. Also, I have questions about license compatibility.

@grahamc
Copy link
Member Author

grahamc commented Jun 20, 2020

I got an OK to revert on IRC.

@yegortimoshenko
Copy link
Member

yegortimoshenko commented Jun 20, 2020

WRT license compatibility, nixos-hardware is CC0-1.0, which is public domain dedication with a fallback public license with no license redistribution condition. It can be safely removed in favor of top-level MIT. https://creativecommons.org/publicdomain/zero/1.0/

Agree it should be discussed more.

Copy link
Contributor

Mic92 left a comment

Now that it is in our git history anyway, we can actually take the time to discuss this

@grahamc grahamc merged commit 740fa4d into master Jun 20, 2020
13 checks passed
13 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="5d0725a"; rev="5d0725a0632ce0ae7daa80755248b3e226392631"; } ./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="5d0725a"; rev="5d0725a0632ce0ae7daa80755248b3e226392631"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d0725a"; rev="5d0725a0632ce0ae7daa80755248b3e226392631"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d0725a"; rev="5d0725a0632ce0ae7daa80755248b3e226392631"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d0725a"; rev="5d0725a0632ce0ae7daa80755248b3e226392631"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d0725a"; rev="5d0725a0632ce0ae7daa80755248b3e226392631"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="5d0725a"; rev="5d0725a0632ce0ae7daa80755248b3e226392631"; } ./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
@grahamc grahamc deleted the revert-91160-nixos-hardware-merge branch Jun 20, 2020
@grahamc
Copy link
Member Author

grahamc commented Jun 20, 2020

Erm, sorry @Mic92 - your update hadn't appeared before I clicked merge. Let's revert the revert? :)

@grahamc
Copy link
Member Author

grahamc commented Jun 20, 2020

and discuss there?

@edolstra
Copy link
Member

edolstra commented Jun 20, 2020

Maybe we should do a force push to revert to the state of the repo before the nixos-hardware merge.

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

4 participants
You can’t perform that action at this time.