Unverified Commit dcfa91ab authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #320606 from Shawn8901/upgrade_keymapp 

keymapp: Migrate to pkg/by-name, nixfmt-rfc-style and update 1.1.1 -> 1.2.1
parents 2ecf26f5 3f82beef

pkgs/applications/misc/keymapp/default.nix→pkgs/by-name/ke/keymapp/package.nix

+25 −18
Original line number Diff line number Diff line 
{ stdenv

, lib

, fetchurl

, autoPatchelfHook

, wrapGAppsHook3

, libusb1

, webkitgtk

, gtk3

, writeShellScript

, makeDesktopItem

, copyDesktopItems

{

  stdenv,

  lib,

  fetchurl,

  autoPatchelfHook,

  wrapGAppsHook4,

  libusb1,

  libsoup_3,

  webkitgtk_4_1,

  writeShellScript,

  makeDesktopItem,

  copyDesktopItems,

}:

let

  desktopItem = makeDesktopItem {

    name = "keymapp";

    icon = "keymapp";

    desktopName = "Keymapp";

    categories = [ "Settings" "HardwareSettings" ];

    categories = [

      "Settings"

      "HardwareSettings"

    ];

    type = "Application";

    exec = "keymapp";

  };

in

stdenv.mkDerivation rec {

  pname = "keymapp";

  version = "1.1.1";

  version = "1.2.1";



  src = fetchurl {

    url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz";

    hash = "sha256-tbRlJ65hHPBDwoXAXf++OdcW67RcqR1x1vfhbPCo1Ls=";

    hash = "sha256-WiazQD40dG72B9tl4DwcMJgoVEl/Dgq55AHgeqK+sq8=";

  };



  nativeBuildInputs = [

    copyDesktopItems

    autoPatchelfHook

    wrapGAppsHook3

    wrapGAppsHook4

  ];



  buildInputs = [

    libusb1

    webkitgtk

    gtk3

    webkitgtk_4_1

    libsoup_3

  ];



  sourceRoot = ".";
@@ -61,7 +65,10 @@ stdenv.mkDerivation rec { 
  meta = with lib; {

    homepage = "https://www.zsa.io/flash/";

    description = "Application for ZSA keyboards";

    maintainers = with lib.maintainers; [ jankaifer shawn8901 ];

    maintainers = with lib.maintainers; [

      jankaifer

      shawn8901

    ];

    platforms = platforms.linux;

    license = lib.licenses.unfree;

  };

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -9460,8 +9460,6 @@ with pkgs; 














  keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };



























  keymapp = callPackage ../applications/misc/keymapp { };



























  keyscope = callPackage ../tools/security/keyscope {















    inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation IOKit Security;















  };