Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 34a71a80b8fb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c94a1e6158ec
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 4, 2018

  1. yubikey-personalization-gui: port to qt5 

    Uses QT5's `qmake` hook (http://doc.qt.io/qt-5/qmake-manual.html) to
build `yubikey-personalization-gui` with a non-90s interface.

See #33248
    @Ma27
    Ma27 committed May 4, 2018
    Copy the full SHA
    a050280 View commit details

Commits on May 5, 2018

  1. Merge pull request #39987 from Ma27/yubikey-personalization-gui/qt5-port 

    yubikey-personalization-gui: port to qt5
    @xeji
    xeji authored May 5, 2018
    Copy the full SHA
    c94a1e6 View commit details
Showing with 4 additions and 4 deletions.
  1. +3 −3 pkgs/tools/misc/yubikey-personalization-gui/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
6 changes: 3 additions & 3 deletions pkgs/tools/misc/yubikey-personalization-gui/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qt4, qmake4Hook, libyubikey }:
{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }:

stdenv.mkDerivation rec {
name = "yubikey-personalization-gui-3.1.25";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8";
};

nativeBuildInputs = [ pkgconfig qmake4Hook ];
buildInputs = [ yubikey-personalization qt4 libyubikey ];
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [ yubikey-personalization qtbase libyubikey ];

installPhase = ''
mkdir -p $out/bin
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -12002,7 +12002,7 @@ with pkgs;
libusb = libusb1;
};

yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { };
yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { };

zeitgeist = callPackage ../development/libraries/zeitgeist { };