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

os-prober: init at 1.65 #21385

Merged
merged 3 commits into from Dec 25, 2016
Merged

os-prober: init at 1.65 #21385

merged 3 commits into from Dec 25, 2016

Conversation

symphorien
Copy link
Member

Motivation for this change

Make os-prober available on nixos, and eventually solve #7406
With this package, I can use os-prober this way :

  boot.loader.grub = {
    enable = true;
    version = 2;
    device = "/dev/sda";
    extraPrepareConfig = "PATH=$PATH:${pkgs.os-prober}/bin:${pkgs.busybox}/bin pkgdatadir=${pkgs.grub2}/share/grub ${pkgs.grub2}/etc/grub.d/30_os-prober > /boot/grub/grub-os-prober.cfg";
    extraEntries = ''
      menuentry 'Other OS' {
        configfile $prefix/grub-os-prober.cfg
      }
    '';
  };

Still not perfect, but at least it works.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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.

Mic92
Mic92 reviewed Dec 24, 2016
View reviewed changes
pkgs/tools/misc/os-prober/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
version = "1.65";
name = "os-prober-${version}";
src = fetchurl {
url = "mirror://debian/debian/pool/main/o/os-prober_${version}.tar.xz";
url = "mirror://debian/pool/main/o/os-prober/os-prober_${version}.tar.xz";
md5 = "a7e833555f54387a4798ffea8c2bf0d4";
Copy link
Member

Choose a reason for hiding this comment

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

please use sha256 instead of md5 as checksum.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done

Mic92
Mic92 reviewed Dec 24, 2016
View reviewed changes
pkgs/tools/misc/os-prober/default.nix
meta = {
description = "Utility to detect other OSs on a set of drives";
homepage = http://packages.debian.org/source/sid/os-prober;
license = stdenv.lib.licenses.gpl2Plus;
Copy link
Member

Choose a reason for hiding this comment

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

Do you want to maintain this package?

Copy link
Member Author

Choose a reason for hiding this comment

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

No.

@Mic92
Copy link
Member

Mic92 commented Dec 24, 2016

I do not use grub myself, but this sound likes a useful addition to the existing grub module.

@Mic92 Mic92 merged commit a6df4d4 into NixOS:release-16.09 Dec 25, 2016
@Mic92 Mic92 mentioned this pull request Dec 25, 2016
Merged
@Mic92
Copy link
Member

Mic92 commented Dec 25, 2016 •
edited

Oh. I noticed too late, that you opened the pull request against release. Please open it towards master again.

@symphorien symphorien mentioned this pull request Dec 25, 2016
Merged
7 tasks
@symphorien
Copy link
Member Author

Ah, sorry. I reopened a new PR on master since it doesn't seem possible to reopen this one.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees
No one assigned
Labels
12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@symphorien @Mic92 @Janik-Haag