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

linuxPackages.vhba: 20211218 -> 20240202 #305046

Merged
merged 1 commit into from
Apr 22, 2024

Conversation

bendlas
Copy link
Contributor

@bendlas bendlas commented Apr 18, 2024

(cherry picked from commit 4084ca6)

Description of changes

backport #285972
fix #295717

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@bendlas
Copy link
Contributor Author

bendlas commented Apr 18, 2024

cc @romatthe would you mind testing this on 23.11?

Jayman2000 added a commit to Jayman2000/jasons-nixos-config that referenced this pull request Apr 21, 2024
This reverts commit 26f42b7.

The commit probably breaks building Jason-Desktop-Linux’s configuration.
A future commit will make src/modules/cdemu.nix use the version of
linuxPackages.vhba that’s in this pull request:
<NixOS/nixpkgs#305046>. Hopefully, that will
make CDEmu work properly.
@Jayman2000
Copy link
Contributor

I tested out this pull request on NixOS 23.11, and it worked. Here’s my configuration.nix:

# 🅭🄍1.0 This file is dedicated to the public domain using the CC0 1.0 Universal Public Domain Dedication <https://creativecommons.org/publicdomain/zero/1.0/>.
{ pkgs, config, ... }:
{
  imports = [ ./hardware-configuration.nix ];
  boot.loader = {
    systemd-boot.enable = true;
    efi.canTouchEfiVariables = true;
  };
  services.openssh = {
    enable = true;
    settings = {
      PasswordAuthentication = false;
      PermitRootLogin = "no";
    };
  };
  services.xserver = {
    enable = true;
    desktopManager.plasma5.enable = true;
    displayManager.sddm.enable = true;
  };
  users.users.jayman = {
    isNormalUser = true;
    extraGroups = [
      config.programs.cdemu.group
      "wheel"
    ];
    openssh.authorizedKeys.keys = [
      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILWQkgb4A4mvzHeXAm6ghxfknl15cttipb56qP0IpBlj Jason-Desktop-Linux"
    ];
  };
  system.stateVersion = "23.11";

  boot.kernelPackages = pkgs.linuxPackages_latest;
  programs.cdemu = {
    enable = true;
    gui = true;
  };
}

After building that configuration, I was able to successfully mount and browse an ISO using gCDEmu.

@bendlas bendlas merged commit d4df7c2 into NixOS:release-23.11 Apr 22, 2024
24 checks passed
Jayman2000 added a commit to Jayman2000/jasons-nixos-config that referenced this pull request May 2, 2024
This reverts commit 1fc5188.

Now that this PR [1] has made it to Nixpkgs’s nixos-23.11 branch [2],
there’s no need to grab code from that PR.

At the moment, the config for Jason-Desktop-Linux doesn’t build. This
change fixes that issue.

[1]: <NixOS/nixpkgs#305046>
[2]: <https://nixpk.gs/pr-tracker.html?pr=305046>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants