Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9ed32341c7b7
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1be338cd48f9
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 21, 2019

  1. nixos/qt5: use correct qtstyleplugins attribute 

    (cherry picked from commit 61cd421)
    @worldofpeace
    IDF31 authored and worldofpeace committed Nov 21, 2019
    Copy the full SHA
    bef194f View commit details

  2. nixpart0: is not broken

    @domenkozar
    domenkozar committed Nov 21, 2019
    Copy the full SHA
    1be338c View commit details
Showing with 1 addition and 2 deletions.
  1. +1 −1 nixos/modules/config/qt5.nix
  2. +0 −1 pkgs/tools/filesystems/nixpart/0.4/default.nix
2 changes: 1 addition & 1 deletion nixos/modules/config/qt5.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ let
isQtStyle = cfg.platformTheme == "gtk2" && cfg.style != "adwaita";

packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ]
else if isQtStyle then [ pkgs.qtstyleplugins ]
else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ]
else throw "`qt5.platformTheme` ${cfg.platformTheme} and `qt5.style` ${cfg.style} are not compatible.";

in
1 change: 0 additions & 1 deletion pkgs/tools/filesystems/nixpart/0.4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -73,6 +73,5 @@ in buildPythonApplication rec {
license = licenses.gpl2Plus;
maintainers = [ maintainers.aszlig ];
platforms = platforms.linux;
broken = true;
};
}