From 7d1fe6f6bf8417266f20fe9bb801cb38eba3b0db Mon Sep 17 00:00:00 2001 From: Wu Zhenyu Date: Wed, 12 Jul 2023 23:13:04 +0800 Subject: [PATCH] :fire: Remove g3kb-switch https://github.com/NixOS/nixpkgs/pull/243032 --- _sources/generated.nix | 11 ----------- default.nix | 2 -- nvfetcher.toml | 4 ---- pkgs/g3kb-switch/default.nix | 38 ------------------------------------ 4 files changed, 55 deletions(-) delete mode 100644 pkgs/g3kb-switch/default.nix diff --git a/_sources/generated.nix b/_sources/generated.nix index a9de027..cebd80c 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -17,17 +17,6 @@ sha256 = "sha256-ZJaaGUNsLAcDyN/aBlXcYocFGO/EmkOotJ+iJMO2x2I="; }; }; - g3kb-switch = { - pname = "g3kb-switch"; - version = "1.2"; - src = fetchFromGitHub { - owner = "lyokha"; - repo = "g3kb-switch"; - rev = "1.2"; - fetchSubmodules = false; - sha256 = "sha256-Nq2psfy51hZQEm57PUSvs17Pp2z6pe30h9BOLbOYV4k="; - }; - }; help2man = { pname = "help2man"; version = "0.0.9"; diff --git a/default.nix b/default.nix index b2104b6..b37f839 100644 --- a/default.nix +++ b/default.nix @@ -22,8 +22,6 @@ let # https://github.com/NixOS-CN/flakes/pull/51 netease-cloud-music = callPackage ./pkgs/netease-cloud-music { }; - # https://github.com/NixOS/nixpkgs/pull/243032 - g3kb-switch = callPackage ./pkgs/g3kb-switch { }; help2man = callPackage ./pkgs/development/python-modules/help2man { }; setuptools-generate = callPackage ./pkgs/development/python-modules/setuptools-generate { }; diff --git a/nvfetcher.toml b/nvfetcher.toml index 552590c..41f367c 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -53,7 +53,3 @@ fetch.pypi = "xilinx-language-server" [mulimgviewer] src.pypi = "mulimgviewer" fetch.pypi = "mulimgviewer" - -[g3kb-switch] -src.github = "lyokha/g3kb-switch" -fetch.github = "lyokha/g3kb-switch" diff --git a/pkgs/g3kb-switch/default.nix b/pkgs/g3kb-switch/default.nix deleted file mode 100644 index 896b86d..0000000 --- a/pkgs/g3kb-switch/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, stdenv -, cmake -, pkg-config -, glib -, fetchFromGitHub -}: -stdenv.mkDerivation rec { - pname = "g3kb-switch"; - version = "1.3"; - src = fetchFromGitHub { - owner = "lyokha"; - repo = "g3kb-switch"; - rev = version; - sha256 = "sha256-QLTRM2GXSxvvVYOMq6QL44zZvoGkiolTLZ1u7dB7dt4="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = [ - glib - ]; - cmakeFlags = [ - "-DG3KBSWITCH_VIM_XKBSWITCH_LIB_PATH=lib" - "-DBASH_COMPLETION_COMPLETIONSDIR=${placeholder "out"}/share/bash-completions/completions" - "-DZSH_COMPLETION_COMPLETIONSDIR=${placeholder "out"}/share/zsh/site-functions" - ]; - - meta = with lib; { - homepage = "https://github.com/lyokha/g3kb-switch"; - description = "CLI keyboard layout switcher for GNOME Shell"; - license = licenses.bsd2; - maintainers = with maintainers; [ Freed-Wu ]; - platforms = platforms.unix; - }; -}