diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-25 20:36:08 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-25 20:36:08 +0200 |
| commit | fe9a096f469b5ec5582c50f183f810a02e97d410 (patch) | |
| tree | 4a0d897fa56687d9b875e5a9fcfc74b561c4d25e /pkgs/misc | |
| parent | 6f72f0b0df954e904d9fd1ef8a69fa3cc60059a9 (diff) | |
| parent | b4a880427e4ac548ad009fda472a4b308de090ae (diff) | |
| download | nixpkgs-fe9a096f469b5ec5582c50f183f810a02e97d410.tar nixpkgs-fe9a096f469b5ec5582c50f183f810a02e97d410.tar.gz nixpkgs-fe9a096f469b5ec5582c50f183f810a02e97d410.tar.bz2 nixpkgs-fe9a096f469b5ec5582c50f183f810a02e97d410.tar.lz nixpkgs-fe9a096f469b5ec5582c50f183f810a02e97d410.tar.xz nixpkgs-fe9a096f469b5ec5582c50f183f810a02e97d410.tar.zst nixpkgs-fe9a096f469b5ec5582c50f183f810a02e97d410.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/ccemux/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/dosbox/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/emulators/vice/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/misc/tmux-plugins/default.nix | 13 |
4 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index fc5d4c81388..2313a63dc69 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -29,7 +29,7 @@ let comment = "A modular ComputerCraft emulator"; desktopName = "CCEmuX"; genericName = "ComputerCraft Emulator"; - categories = "Application;Emulator;"; + categories = "Emulator;"; }; in diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index b70f0e058c0..160c8733ff5 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { comment = "x86 emulator with internal DOS"; desktopName = "DOSBox"; genericName = "DOS emulator"; - categories = "Application;Emulator;"; + categories = "Emulator;"; }; postInstall = '' diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index ca3149785a4..c80d820059f 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { comment = "Commodore 64 emulator"; desktopName = "VICE"; genericName = "Commodore 64 emulator"; - categories = "Application;Emulator;"; + categories = "Emulator;"; }; preBuild = '' diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 23c513ea175..74bbe189182 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -109,6 +109,19 @@ in rec { }; }; + fingers = mkDerivation rec { + pluginName = "fingers"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "Morantron"; + repo = "tmux-fingers"; + rev = version; + sha256 = "0gp37m3d0irrsih96qv2yalvr1wmf1n64589d4qzyzq16lzyjcr0"; + fetchSubmodules = true; + }; + dependencies = [ pkgs.gawk ]; + }; + fpp = mkDerivation { pluginName = "fpp"; version = "unstable-2016-03-08"; |