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

malcontent: 0.7.0 → 0.8.0 #93712

Merged
merged 1 commit into from Jul 26, 2020
Merged

malcontent: 0.7.0 → 0.8.0 #93712

merged 1 commit into from Jul 26, 2020

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Jul 23, 2020

Motivation for this change
  • Update: https://gitlab.freedesktop.org/pwithnall/malcontent/-/releases/0.8.0
    • Fix the separation patch.
    • Add itstool to ui (needed for building localized help).
  • Use pkg-config instead of the pkgconfig alias.
  • Fix some issues related to multiple outputs:
    • Make the module pass specific output to dbus.packages since the dbus NixOS module will not generate configuration with correct interface paths otherwise.
    • Change malcontent-ui package to primarily-a-program type derivation (out+lib instead of bin+out) since there are more and more malcontent-control-specific assets.
      • This also fixes the issue where application data (desktop files, icons…) were installed to out, which is not installed by environment.systemPackages/system-path.nix’s buildEnv by default when
        bin output is also present.
    • Make malcontent package install out output too so that system-path.nix links that too. It contains the AccountsService & Polkit data files.
    • Split the library and PAM module out of malcontent.out so that they are not installed with the data files.
      • This revealed a bug in the gobject-introspection setup hook.
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.

cc @worldofpeace

@jtojnar
Copy link
Contributor Author

jtojnar commented Jul 23, 2020

Testing with nixos-rebuild build-vm -I nixpkgs=$PWD -I nixos-config=../nix-playground/malcontent.nix

{ pkgs, ... }: {
  environment.systemPackages = with pkgs; [
    gdb
  ];

  services.xserver = {
    enable = true;
    layout = "cz";
    xkbVariant = "qwerty";

    displayManager.gdm = {
      enable = true;
      debug = true;
    };

    desktopManager.gnome3 = {
      enable = true;
      debug = true;
    };
  };

  services.openssh.enable = true;
  services.flatpak.enable = true;
  services.malcontent.enable = true;

  users.extraUsers.jtojnar = {
    isNormalUser = true;
    uid = 1000;
    extraGroups = [ "wheel" "networkmanager" ];
    password = "a";
    openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDYbOlZydfRRCGCT08wdtPcpfSrgxMc6weDx3NcWrnMpVgxnMs3HozzkaS/hbcZUocn7XbCOyaxEd1O8Fuaw4JXpUBcMetpPXkQC+bZHQ3YsZZyzVgCXFPRF88QQj0nR7YVE1AeAifjk3TCODstTxit868V1639/TVIi5y5fC0/VbYG2Lt4AadNH67bRv8YiO3iTsHQoZPKD1nxA7yANHCuw38bGTHRhsxeVD+72ThbsYSZeA9dBrzACpEdnwyXclaoyIOnKdN224tu4+4ytgH/vH/uoUfL8SmzzIDvwZ4Ba2yHhZHs5iwsVjTvLe7jjE6I1u8qY7X8ofnanfNcsmz/ jtojnar@kaiser" ];
  };
  users.extraUsers.kodomo = {
    isNormalUser = true;
    uid = 1001;
    password = "b";
  };

  virtualisation.memorySize = 2048;
  virtualisation.diskSize = 8048;
  virtualisation.qemu.options = [ "-soundhw hda" ];

  nixpkgs = {
    overlays = [
      (final: prev: {
        gnome3 = prev.gnome3.overrideScope'
          (gfinal: gprev: {
            gnome-software = gprev.gnome-software.overrideAttrs (attrs: {
              mesonFlags = (attrs.mesonFlags or []) ++ [
                "-Dmalcontent=true"
              ];
              buildInputs = (attrs.buildInputs or []) ++ [
                prev.malcontent
              ];
            });
          });
      })
    ];
  };
}

the malcontent-control app seems to toggle the switches without any errors but I am still able to install flatpak apps to the child used and browse web, even when I disable it. Perhaps we need to add malcontent to Flatpak or Epiphany too. Also gnome-initial-setup.

* Update: https://gitlab.freedesktop.org/pwithnall/malcontent/-/releases/0.8.0
    * Fix the separation patch.
    * Add `itstool` to ui (needed for building localized help).
* Use `pkg-config` instead of the `pkgconfig` alias.
* Fix some issues related to multiple outputs:
    * Make the module pass specific output to `dbus.packages` since the `dbus` NixOS module will not generate configuration with correct interface paths otherwise.
    * Change `malcontent-ui` package to primarily-a-program type derivation (`out`+`lib` instead of `bin`+`out`) since there are more and more `malcontent-control`-specific assets.
        * This also fixes the issue where application data (desktop files, icons…) were installed to `out`, which is not installed by `environment.systemPackages`/`system-path.nix`’s `buildEnv` by default when `bin` output is also present.
    * Make `malcontent` package install `out` output too so that `system-path.nix` links that too. It contains the AccountsService & Polkit data files.
    * Split the library and PAM module out of `malcontent.out` so that they are not installed with the data files.
        * This revealed a bug in the `gobject-introspection` setup hook.
@jtojnar jtojnar marked this pull request as ready for review July 23, 2020 20:00
@@ -22,14 +46,13 @@ index a6c477d..f7b2f0a 100644
+endif
if get_option('ui').enabled()
subdir('malcontent-control')
endif
-subdir('pam')
+ subdir('help')
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This line is possibly upstreamable. There should definitely be no need to install help when ui is not installed.

@jtojnar jtojnar added the 8.has: upstream changes reviewed Reviewer checked the changelogs/commit logs associated with the release and did not find any issues. label Jul 24, 2020
@jtojnar jtojnar merged commit 5d3f240 into NixOS:master Jul 26, 2020
@jtojnar jtojnar deleted the malcontent-0.8 branch July 26, 2020 11:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant