Skip to content

evdi: 1.6.4 -> git-2020-01-16 #77836

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
Merged
merged 1 commit into from
Jan 28, 2020
Merged

evdi: 1.6.4 -> git-2020-01-16 #77836

merged 1 commit into from
Jan 28, 2020
+15 −8

Conversation

sjau
Copy link

@sjau sjau commented Jan 16, 2020

Motivation for this change

EVDI 1.6.4 doesn't compile/work on kernel 5.4.11. A user in the support groups supplied a patch that works on latest git.

It fixes #74698

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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Jan 16, 2020
@sjau sjau requested a review from peterhoeg January 16, 2020 21:06
peterhoeg
peterhoeg reviewed Jan 17, 2020
View reviewed changes
pkgs/os-specific/linux/evdi/default.nix
];

makeFlags = [ "KVER=${kernel.modDirVersion}" "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];

hardeningDisable = [ "format" "pic" "fortify" ];
Copy link
Member

Choose a reason for hiding this comment

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

Are you sure these are still needed? Would be great if we could one (or all) of them

Copy link
Author

Choose a reason for hiding this comment

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

Not sure what you mean by "these" but then I have no idea... I just modified current to get it working with git and the patch.

@Legogris Legogris mentioned this pull request Jan 24, 2020
Closed
@Legogris
Copy link

@sjau I tried this locally and it works fine on nixpkgs linux latest (with setting xrandr provider, documented it here: https://nixos.wiki/wiki/Displaylink).

Maybe to ease merging this sooner, squash the commits to make the commit history nicer?

@sjau
Copy link
Author

sjau commented Jan 24, 2020

@sjau I tried this locally and it works fine on nixpkgs linux latest (with setting xrandr provider, documented it here: https://nixos.wiki/wiki/Displaylink).

I had to run that xrandr command once and KDE remmebers it. Didn't need to alter any files.

Maybe to ease merging this sooner, squash the commits to make the commit history nicer?

No idea how to do that. I'm just a basic git user.

@Legogris
Copy link

Maybe to ease merging this sooner, squash the commits to make the commit history nicer?

No idea how to do that. I'm just a basic git user.

You can do an interactive rebase: $ git rebase -i origin/master (or replace origin with whatever you named the upstream remote), pick the top commit and squash or fixup the rest, and it should combine all your changes in a single commit. After the fact you can also git commit --amend if you want to change the commit message of the latest commit.

@sjau
Copy link
Author

sjau commented Jan 28, 2020

@peterhoeg ping

@peterhoeg
Copy link
Member

All good!

@peterhoeg peterhoeg merged commit c3c9f32 into NixOS:master Jan 28, 2020
@dasJ
Copy link
Member

dasJ commented Feb 5, 2020

@sjau Does this build for you? Because the broken meta attribute is still set to 4.19

@sjau
Copy link
Author

sjau commented Feb 5, 2020

@dasJ

the broken attribute is set to 4.9 or older.

https://github.com/sjau/nixpkgs/blob/edd636f7cd25826efc70a99962db4d1c7c824b3f/pkgs/os-specific/linux/evdi/default.nix#L42

@dasJ
Copy link
Member

dasJ commented Feb 5, 2020

oh…

@sjau sjau deleted the evdi-2020-01-16 branch April 11, 2020 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@peterhoeg peterhoeg

@Legogris Legogris

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
4 participants
@sjau @Legogris @peterhoeg @dasJ