Merge master into staging-next

2021-02-17 00:36:31 +00:00
parent a97c4b69b0 42a33fa59f
commit 79b7a67b55
59 changed files with 2028 additions and 1319 deletions
@@ -1,32 +0,0 @@
-{ buildGoModule, fetchFromGitHub, lib, wl-clipboard, makeWrapper }:
-
-buildGoModule rec {
-  pname = "clipman";
-  version = "1.5.2";
-
-  src = fetchFromGitHub {
-    owner = "yory8";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "1lf5fbzplyc1mpdqgfwbrn8m5568vhjf48580fvvfgbhz6zcil8n";
-  };
-
-  vendorSha256 = "18jw4z0lcrh00yjr3qdkgvlrpfwqbsm0ncz7fp1h72pzkh41byv7";
-
-  doCheck = false;
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  postInstall = ''
-    wrapProgram $out/bin/clipman \
-      --prefix PATH : ${lib.makeBinPath [ wl-clipboard ]}
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/yory8/clipman";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ ma27 ];
-    description = "A simple clipboard manager for Wayland";
-    platforms = platforms.linux;
-  };
-}
@@ -1,33 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc, wayland }:
-
-stdenv.mkDerivation rec {
-  pname = "kanshi";
-  version = "1.1.0";
-
-  src = fetchFromGitHub {
-    owner = "emersion";
-    repo = "kanshi";
-    rev = "v${version}";
-    sha256 = "0nbpgm8qnn7ljsg9vgs35kl8l4rrk542vdcbx8wrn9r909ld3x92";
-  };
-
-  nativeBuildInputs = [ meson ninja pkg-config scdoc ];
-  buildInputs = [ wayland ];
-
-  meta = with lib; {
-    description = "Dynamic display configuration tool";
-    longDescription = ''
-      kanshi allows you to define output profiles that are automatically enabled
-      and disabled on hotplug. For instance, this can be used to turn a laptop's
-      internal screen off when docked.
-
-      kanshi can be used on Wayland compositors supporting the
-      wlr-output-management protocol.
-    '';
-    homepage = "https://github.com/emersion/kanshi";
-    downloadPage = "https://github.com/emersion/kanshi";
-    license = licenses.mit;
-    maintainers = with maintainers; [ balsoft ];
-    platforms = platforms.linux;
-  };
-}
@@ -1,39 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config
-, cairo, libxkbcommon, wayland, wayland-protocols
-, buildDocs ? true, scdoc
-}:
-
-stdenv.mkDerivation rec {
-  pname = "slurp";
-  version = "1.3.1";
-
-  src = fetchFromGitHub {
-    owner = "emersion";
-    repo = "slurp";
-    rev = "v${version}";
-    sha256 = "1fby2v2ylcadgclds05wpkl9xi2r9dfz49dqyqpn20rjv1wnz3jv";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-  ] ++ lib.optional buildDocs scdoc;
-
-  buildInputs = [
-    cairo
-    libxkbcommon
-    wayland
-    wayland-protocols
-  ];
-
-  mesonFlags = lib.optional buildDocs "-Dman-pages=enabled";
-
-  meta = with lib; {
-    description = "Select a region in a Wayland compositor";
-    homepage = "https://github.com/emersion/slurp";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ buffet ];
-  };
-}
@@ -1,31 +0,0 @@
-{ lib, stdenv, fetchurl
-, pkg-config, scdoc, wayland
-, wayland-protocols, libxkbcommon
-}:
-
-stdenv.mkDerivation rec {
-  pname = "wev";
-  version = "1.0.0";
-
-  src = fetchurl {
-    url = "https://git.sr.ht/~sircmpwn/wev/archive/${version}.tar.gz";
-    sha256 = "0vlxdkb59v6nb10j28gh1a56sx8jk7ak7liwzv911kpmygnls03g";
-  };
-
-  nativeBuildInputs = [ pkg-config scdoc wayland ];
-  buildInputs = [ wayland-protocols libxkbcommon ];
-
-  installFlags = [ "PREFIX=$(out)" ];
-
-  meta = with lib; {
-    description = "Wayland event viewer";
-    longDescription = ''
-      This is a tool for debugging events on a Wayland window, analagous to the
-      X11 tool xev.
-    '';
-    homepage = "https://git.sr.ht/~sircmpwn/wev";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ primeos ];
-  };
-}
@@ -1,25 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config
-, wayland, wayland-protocols }:
-
-stdenv.mkDerivation rec {
-  pname = "wl-clipboard";
-  version = "2.0.0";
-
-  src = fetchFromGitHub {
-    owner = "bugaevc";
-    repo = "wl-clipboard";
-    rev = "v${version}";
-    sha256 = "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d";
-  };
-
-  nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ];
-  buildInputs = [ wayland ];
-
-  meta = with lib; {
-    description = "Command-line copy/paste utilities for Wayland";
-    homepage = "https://github.com/bugaevc/wl-clipboard";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ dywedir ];
-    platforms = platforms.linux;
-  };
-}
@@ -1,23 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkg-config, wayland }:
-
-stdenv.mkDerivation rec {
-  pname = "wlr-randr";
-  version = "0.2.0";
-
-  src = fetchFromGitHub {
-    owner = "emersion";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-JeSxFXSFxcTwJz9EaLb18wtD4ZIT+ATeYM5OyDTJhDQ=";
-  };
-
-  nativeBuildInputs = [ meson ninja cmake pkg-config ];
-  buildInputs = [ wayland ];
-
-  meta = with lib; {
-    license = licenses.mit;
-    description = "An xrandr clone for wlroots compositors";
-    homepage = "https://github.com/emersion/wlr-randr";
-    maintainers = with maintainers; [ ma27 ];
-  };
-}
@@ -1,35 +0,0 @@
-{ lib, stdenv, fetchFromGitHub
-, meson, ninja, pkg-config, scdoc, wayland # wayland-scanner
-, wayland-protocols, libseccomp
-}:
-
-stdenv.mkDerivation rec {
-  pname = "wob";
-  version = "0.11";
-
-  src = fetchFromGitHub {
-    owner = "francma";
-    repo = pname;
-    rev = version;
-    sha256 = "13mx6nzab6msp57s9mv9ambz53a4zkafms9v97xv5zvd6xarnrya";
-  };
-
-  nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ];
-  buildInputs = [ wayland-protocols ]
-    ++ lib.optional stdenv.isLinux libseccomp;
-
-  mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled";
-
-  meta = with lib; {
-    description = "A lightweight overlay bar for Wayland";
-    longDescription = ''
-      A lightweight overlay volume/backlight/progress/anything bar for Wayland,
-      inspired by xob.
-    '';
-    inherit (src.meta) homepage;
-    changelog = "https://github.com/francma/wob/releases/tag/${version}";
-    license = licenses.isc;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ primeos ];
-  };
-}