colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2022-03-17 18:02:05 +00:00 committed by GitHub
commit 739cf04cb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
32 changed files with 111 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View File

@ -1330,10 +1330,10 @@
</listitem>
<listitem>
<para>
A new option
<literal>boot.initrd.extraModprobeConfig</literal> has been
added which can be used to configure kernel modules that are
loaded in the initrd.
The options <literal>boot.extraModprobeConfig</literal> and
<literal>boot.blacklistedKernelModules</literal> now also take
effect in the initrd by copying the file
<literal>/etc/modprobe.d/nixos.conf</literal> into the initrd.
</para>
</listitem>
<listitem>

2
nixos/doc/manual/release-notes/rl-2205.section.md
View File

@ -495,7 +495,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- The option `services.duplicati.dataDir` has been added to allow changing the location of duplicati's files.
- A new option `boot.initrd.extraModprobeConfig` has been added which can be used to configure kernel modules that are loaded in the initrd.
- The options `boot.extraModprobeConfig` and `boot.blacklistedKernelModules` now also take effect in the initrd by copying the file `/etc/modprobe.d/nixos.conf` into the initrd.
- `nixos-generate-config` now puts the dhcp configuration in `hardware-configuration.nix` instead of `configuration.nix`.

20
nixos/modules/system/boot/modprobe.nix
View File

@ -34,23 +34,6 @@ with lib;
type = types.lines;
};
boot.initrd.extraModprobeConfig = mkOption {
default = "";
example =
''
options zfs zfs_arc_max=1073741824
'';
description = ''
Does exactly the same thing as
<option>boot.extraModprobeConfig</option>, except
that the generated <filename>modprobe.conf</filename>
file is also included in the initrd.
This is useful for setting module options for kernel
modules that are loaded during early boot in the initrd.
'';
type = types.lines;
};
};
@ -67,9 +50,6 @@ with lib;
'')}
${config.boot.extraModprobeConfig}
'';
environment.etc."modprobe.d/nixos-initrd.conf".text = ''
${config.boot.initrd.extraModprobeConfig}
'';
environment.etc."modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
environment.etc."modprobe.d/systemd.conf".source = "${pkgs.systemd}/lib/modprobe.d/systemd.conf";

3
nixos/modules/system/boot/stage-1.nix
View File

@ -358,9 +358,6 @@ let
{ object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf;
symlink = "/etc/mdadm.conf";
}
{ object = config.environment.etc."modprobe.d/nixos-initrd.conf".source;
symlink = "/etc/modprobe.d/nixos-initrd.conf";
}
{ object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" {
src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";
preferLocalBuild = true;

1
pkgs/applications/misc/moonlight-qt/default.nix
View File

@ -57,5 +57,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ luc65r ];
platforms = platforms.all;
mainProgram = "moonlight";
};
}

4
pkgs/applications/networking/cluster/kn/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "kn";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "knative";
repo = "client";
rev = "knative-v${version}";
sha256 = "sha256-PxiYxDHcA95MinNpEcXul2cYrV/VB6gThhYCZANqAGY=";
sha256 = "sha256-xpSnirdEZ/Cua/wicu62HzeDm0E8Xo/Jt2eMfUS7mDo=";
};
vendorSha256 = null;

4
pkgs/applications/networking/cluster/velero/default.nix
View File

@ -2,14 +2,14 @@
buildGoModule rec {
pname = "velero";
version = "1.8.0";
version = "1.8.1";
src = fetchFromGitHub {
owner = "vmware-tanzu";
repo = "velero";
rev = "v${version}";
sha256 = "sha256-tQGAzQFrpCUAEzdd5vr4j2oIb6TKeN9DQm96TdP0n40=";
sha256 = "sha256-oiYr9JQlJVxjZxGhZyOIUy934KedBmDhzK+71qmaD58=";
};
ldflags = [

2
pkgs/desktops/arcan/arcan/clone-sources.nix
View File

@ -11,7 +11,7 @@
rev = "94cb3a2eb96b3f17a1a3bd0e6f7da97c0e1d8f57";
sha256 = "sha256-LzjqunX/T8khF2UjPlPYiQOwMGem8MqPYneR2LdZ5Fg=";
};
libuvc-src = fetchgit {
libuvc-src = fetchFromGitHub {
owner = "libuvc";
repo = "libuvc";
rev = "b2b01ae6a2875d05c99eb256bb15815018d6e837";

10
pkgs/desktops/arcan/durden/default.nix
View File

@ -5,15 +5,19 @@
stdenv.mkDerivation rec {
pname = "durden";
version = "0.6.1+date=2021-10-17";
version = "0.6.1+date=2022-03-11";
src = fetchFromGitHub {
owner = "letoram";
repo = pname;
rev = "5fb8b0f9bc2952ed9cf7dc20a1c5c0cc44c02ff1";
hash = "sha256-+EIsrCkMe9MrUQOCh0R+rsDg/Rqs3iQWO0GZCgZQ+No=";
rev = "fec2a1051500df28becce188d932645743091efa";
hash = "sha256-uZ7oTnkWG3P/4ETgn6MQ9v47mRAJnvyzglQS7jlabPA=";
};
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall

10
pkgs/desktops/arcan/pipeworld/default.nix
View File

@ -5,15 +5,19 @@
stdenv.mkDerivation rec {
pname = "pipeworld";
version = "0.pre+date=2021-11-26";
version = "0.pre+date=2021-12-03";
src = fetchFromGitHub {
owner = "letoram";
repo = pname;
rev = "9f816db154ca5c54af952ad11c2186ccac5bdd2d";
hash = "sha256-uwnrRsMP0RLEGr2mEVQ6kEtV/c6t5qSCHY0ynywPzkw=";
rev = "c653414670cafb0c73a57492aa3d9510460b16a9";
hash = "sha256-XuAsuTC+P6yoNlDnsT2fiWoqKW+1JKc9NF+Vn/ta0pk=";
};
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall

6
pkgs/desktops/arcan/prio/default.nix
View File

@ -5,7 +5,7 @@
stdenv.mkDerivation rec {
pname = "prio";
version = "0.pre+unstable=2018-09-13";
version = "0.pre+date=2018-09-13";
src = fetchFromGitHub {
owner = "letoram";
@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
hash = "sha256-Idv/duEYmDk/rO+TI8n+FY3VFDtUEh8C292jh12BJuM=";
};
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall

16
pkgs/desktops/arcan/xarcan/default.nix
View File

@ -38,23 +38,15 @@
stdenv.mkDerivation rec {
pname = "xarcan";
version = "0.6.0+unstable=2021-06-14";
version = "0.6.0+date=2021-08-26";
src = fetchFromGitHub {
owner = "letoram";
repo = pname;
rev = "98d28a5f2c6860bb191fbc1c9e577c18e4c9a9b7";
hash = "sha256-UTIVDKnYD/q0K6G7NJUKh1tHcqnsuiJ/cQxWuPMJ2G4=";
rev = "e40f0176e495ffdad6e7405c58378df6532eb70d";
hash = "sha256-T+1oL7P5MTDkeSfW6OXc1OgfZ8E6e/4YRonf1eXcfIA=";
};
patches = [
# fix build with meson 0.60
(fetchpatch {
url = "https://github.com/letoram/xarcan/commit/b67e514dbb59bffc23b75d47ca7f24e96c4aeb05.patch";
sha256 = "sha256-tSQmNy1Id6nDIN+03dc1+rEEF8fMq0yJBiscNM60xic=";
})
];
nativeBuildInputs = [
meson
ninja
@ -122,6 +114,6 @@ stdenv.mkDerivation rec {
'';
license = licenses.mit;
maintainers = with maintainers; [ AndersonTorres ];
platforms = platforms.all;
platforms = platforms.unix;
};
}

11
pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix
View File

@ -1,4 +1,5 @@
{ lib, stdenv
{ stdenv
, lib
, fetchpatch
, substituteAll
, fetchurl
@ -70,6 +71,14 @@ stdenv.mkDerivation rec {
})
# Fix build with new meson
# plugins/power/meson.build:78:7: ERROR: Function does not take positional arguments.
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/283
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/afa7e4bb9c519e2daf500a6079088669500768c0.patch";
sha256 = "8wxJIKPoZyfs1t0zAsb5SVCdt297NUiGmXIBNI6hbCQ=";
})
# meson.build:86:3: ERROR: The `==` operator of str does not accept objects of type bool (True)
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/249
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/commit/28e28e9e598342c897ae5ca350d0da6f4aea057b.diff";
sha256 = "U+suR7wYjLWPqmkJpHm6pPOWL7sjL6GhIFX8MHrBRAY=";

1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

@ -3703,7 +3703,6 @@ broken-packages:
- persistent-discover
- persistent-documentation
- persistent-equivalence
- persistent-migration
- persistent-mongoDB
- persistent-mysql-haskell
- persistent-odbc

1
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -163,6 +163,7 @@ self: super: builtins.intersectAttrs super {
network-transport-tcp = dontCheck super.network-transport-tcp;
network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30
oidc-client = dontCheck super.oidc-client; # the spec runs openid against google.com
persistent-migration = dontCheck super.persistent-migration; # spec requires pg_ctl binary
pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw
pixiv = dontCheck super.pixiv;
raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw

2
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -211081,8 +211081,6 @@ self: {
];
description = "Manual migrations for the persistent library";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
broken = true;
}) {};
"persistent-mongoDB" = callPackage

36
pkgs/development/libraries/audio/lv2/default.nix
View File

@ -1,24 +1,50 @@
{ lib, stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }:
{ stdenv
, lib
, fetchurl
, libsndfile
, pkg-config
, python3
, wafHook
, pipewire
}:
stdenv.mkDerivation rec {
pname = "lv2";
version = "1.18.2";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "https://lv2plug.in/spec/${pname}-${version}.tar.bz2";
sha256 = "sha256-TokfvHRMBYVb6136gugisUkX3Wbpj4K4Iw29HHqy4F4=";
};
nativeBuildInputs = [ pkg-config wafHook ];
buildInputs = [ gtk2 libsndfile python3 ];
nativeBuildInputs = [
pkg-config
wafHook
];
wafConfigureFlags = lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ];
buildInputs = [
libsndfile
python3
];
wafConfigureFlags = [
"--includedir=${placeholder "dev"}/include"
"--bindir=${placeholder "dev"}/bin"
] ++ lib.optionals stdenv.isDarwin [
"--lv2dir=${placeholder "out"}/lib/lv2"
];
passthru.tests = {
inherit pipewire;
};
meta = with lib; {
homepage = "https://lv2plug.in";
description = "A plugin standard for audio systems";
license = licenses.mit;
maintainers = [ maintainers.goibhniu ];
maintainers = with maintainers; [ goibhniu ];
platforms = platforms.unix;
};
}

4
pkgs/development/python-modules/gaphas/default.nix
View File

@ -12,14 +12,14 @@
buildPythonPackage rec {
pname = "gaphas";
version = "3.5.0";
version = "3.5.1";
disabled = pythonOlder "3.7";
format = "pyproject";
src = fetchPypi {
inherit pname version;
sha256 = "526f1943dd54efe91fbf45db38049103611fbac5939c42ad172ba9d2dce71fe1";
sha256 = "sha256-71oYuLhqJ7bst0W7v9tQSoaisjONZSa9zEWzYWtGl2E=";
};
nativeBuildInputs = [

4
pkgs/development/python-modules/protonvpn-nm-lib/default.nix
View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "protonvpn-nm-lib";
version = "3.7.0";
version = "3.8.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "ProtonVPN";
repo = pname;
rev = version;
sha256 = "sha256-RZ10p/Lg9GQj0CohW2v+THch5EaD236rEHETGjNStdY=";
sha256 = "sha256-fAaP9c66LcbZgezadGPUt400YRnrnFoBvpzlc1zxuc4=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/pywlroots/default.nix
View File

@ -18,11 +18,11 @@
buildPythonPackage rec {
pname = "pywlroots";
version = "0.15.10";
version = "0.15.11";
src = fetchPypi {
inherit pname version;
sha256 = "VWfcDhMAuUkYObRiaXRfcB7dI75SM7zVwWWvnlrxV0k=";
sha256 = "sha256-L+59uf3/wqWnmWpqm8RAyIEarbj2Sdwf1Pbweh/z9C8=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/development/python-modules/stups-pierone/default.nix
View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "stups-pierone";
version = "1.1.50";
version = "1.1.51";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "zalando-stups";
repo = "pierone-cli";
rev = version;
hash = "sha256-YAoj+Ou0Q64QRN5R0CQSxQGP7xDQQNISS6VT5txV0sw=";
hash = "sha256-OypGYHfiFUfcUndylM2N2WfPnfXXJ4gvWypUbltYAYE=";
};
propagatedBuildInputs = [

4
pkgs/development/python-modules/thinc/default.nix
View File

@ -30,14 +30,14 @@
buildPythonPackage rec {
pname = "thinc";
version = "8.0.14";
version = "8.0.15";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-3MC8ao6BTiDyaCXj/X+DNCTpMYcTWVJFSl0X+sCc5J0=";
sha256 = "sha256-LjFQINqFw3keGR+/N8SiQz9XzzIuJzgNoM1N6Z2WBTs=";
};
postPatch = ''

4
pkgs/development/python-modules/timetagger/default.nix
View File

@ -9,13 +9,13 @@
python3Packages.buildPythonPackage rec {
pname = "timetagger";
version = "22.2.3";
version = "22.3.1";
src = fetchFromGitHub {
owner = "almarklein";
repo = pname;
rev = "v${version}";
sha256 = "sha256-tQel+IVqP+MngAvFgr7Yh+XCSIPWpzCBXHOj9b0Os98=";
sha256 = "sha256-pHogDjqXuoQp5afSnPvMPaKoBtPE6u3kMi87SzY5yoU=";
};
propagatedBuildInputs = with python3Packages; [

4
pkgs/development/python-modules/trimesh/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "trimesh";
version = "3.10.2";
version = "3.10.3";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-PcR84la6ZJjtpjg4WGVUkyZJqVT8Ge7vjk90X6gStAo=";
sha256 = "sha256-K2zBEGzagQ6lOWIPkop1YYqB2/KZIj2beUJUu2Garno=";
};
propagatedBuildInputs = [ numpy ];

4
pkgs/development/python-modules/txtorcon/default.nix
View File

@ -4,7 +4,7 @@
buildPythonPackage rec {
pname = "txtorcon";
version = "21.1.0";
version = "22.0.0";
checkInputs = [ pytest mock lsof GeoIP ];
propagatedBuildInputs = [
@ -15,7 +15,7 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6";
sha256 = "sha256-iaG2XjKks2nWfmwWY4f7xGjMXQUidEjSOaXn6XGKoFM=";
};
# Based on what txtorcon tox.ini will automatically test, allow back as far

4
pkgs/development/python-modules/types-dateutil/default.nix
View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-python-dateutil";
version = "2.8.9";
version = "2.8.10";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-kPlaa21Pq6NZKH8XosrlEczJ1KvImwGWm9rBGFgVwF0=";
sha256 = "sha256-a886rnJC5Xk7r9eyvPtOJV63srMUSs0N8OGC3OWMytM=";
};
pythonImportsCheck = [ "dateutil-stubs" ];

4
pkgs/development/python-modules/types-freezegun/default.nix
View File

@ -5,12 +5,12 @@
buildPythonPackage rec {
pname = "types-freezegun";
version = "1.1.6";
version = "1.1.7";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-XHCkt0RLjH3SgA4AY9b+chqxEgk5kmT6D3evJT3YsU8=";
hash = "sha256-6dEyfpjGyqj2XeABje0nQ0fo40GY1ZqppcJK2SZdXl4=";
};
# Module doesn't have tests

4
pkgs/development/python-modules/types-paramiko/default.nix
View File

@ -6,11 +6,11 @@
buildPythonPackage rec {
pname = "types-paramiko";
version = "2.8.16";
version = "2.8.17";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-HWkCWoa5509G2OHyPFijb5RVORAvE1tQEgL7myxP0SI=";
sha256 = "sha256-1toFPkau9cYpvE6lvatWZwhlNerg/P2N6EBpQ7g00uY=";
};
pythonImportsCheck = [

6
pkgs/tools/backup/bupstash/default.nix
View File

@ -1,16 +1,16 @@
{ lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }:
rustPlatform.buildRustPackage rec {
pname = "bupstash";
version = "0.10.3";
version = "0.11.0";
src = fetchFromGitHub {
owner = "andrewchambers";
repo = pname;
rev = "v${version}";
sha256 = "sha256-YN5pIXJRTQXqFGuXvyoSlYJEjAZ4wIYEKjEeF8qIJCI=";
sha256 = "sha256-9yWQQ8uzDkN3Pi2OiEn+oEazc3nH53dF2GswBCu8d3c=";
};
cargoSha256 = "sha256-Erpg+Sktx+L2X9k6g1ngOyM8MNoucGcScOSPMB7vld8=";
cargoSha256 = "sha256-JAclSUFuQk768cgDEvG1rxux2xBGHl1d/NAoxw161YU=";
nativeBuildInputs = [ ronn pkg-config installShellFiles ];
buildInputs = [ libsodium ];

6
pkgs/tools/wayland/swayr/default.nix
View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "swayr";
version = "0.13.0";
version = "0.15.0";
src = fetchFromSourcehut {
owner = "~tsdh";
repo = "swayr";
rev = "v${version}";
sha256 = "sha256-V4ETsraJo9X10fPMGSuiokPiSlZGYHncOdfheGom1go=";
sha256 = "sha256-GLOJjGr29v4oVNCWgjPWluIiSeLoIYeOw2HwmSfxA8Y=";
};
cargoSha256 = "sha256-3ErzkS8u+4Ve26jpDbsYr4BVDm/XEgydYdZ2ErtVuVA=";
cargoSha256 = "sha256-gg/IHrgfDZT+3FNM/se5X1YMcHX127jMNI/WDEpMzy4=";
patches = [
./icon-paths.patch

29
pkgs/tools/wayland/ydotool/default.nix
View File

@ -1,41 +1,26 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, boost, libevdevplus, libuinputplus, iodash, cxxopts}:
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, scdoc }:
stdenv.mkDerivation rec {
pname = "ydotool";
version = "unstable-2021-01-20";
version = "1.0.1";
src = fetchFromGitHub {
owner = "ReimuNotMoe";
repo = "ydotool";
rev = "b1d041f52f7bac364d6539b1251d29c3b77c0f37";
sha256 = "1gzdbx6fv0dbcyia3yyzhv93az2gf90aszb9kcj5cnxywfpv9w9g";
rev = "v${version}";
sha256 = "sha256-maXXGCqB8dkGO8956hsKSwM4HQdYn6z1jBFENQ9sKcA=";
};
# upstream decided to use a cpp package manager called cpm.
# we need to disable that because it wants networking, furthermore,
# it does some system folder creating which also needs to be disabled.
# Both changes are to respect the sandbox.
patches = [ ./fixup-cmakelists.patch ];
# cxxopts is a header only library.
# See pull request: https://github.com/ReimuNotMoe/ydotool/pull/105
postPatch = ''
substituteInPlace CMakeLists.txt --replace \
"PUBLIC cxxopts" \
"PUBLIC"
'';
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
boost libevdevplus libuinputplus iodash cxxopts
scdoc
];
meta = with lib; {
inherit (src.meta) homepage;
description = "Generic Linux command-line automation tool";
license = licenses.mit;
maintainers = with maintainers; [ willibutz ];
license = licenses.agpl3Plus;
maintainers = with maintainers; [ willibutz kraem ];
platforms = with platforms; linux;
};
}

58
pkgs/tools/wayland/ydotool/fixup-cmakelists.patch
View File

@ -1,58 +0,0 @@
From bb8bc44d22060cd1215712117cf30eae09f4f6ba Mon Sep 17 00:00:00 2001
From: Jappie Klooster <jappieklooster@hotmail.com>
Date: Fri, 2 Apr 2021 14:04:14 -0400
Subject: [PATCH] Fixup cmaklists
We remove cpm, which is a package manager for c++,
which requires networking, so it's better just deleted.
Furthermore we delete the adddirectory statements.
These want to modify directories outside of the sandbox.
---
CMakeLists.txt | 26 --------------------------
1 file changed, 26 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5e8789..b797538 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,30 +13,6 @@ endif()
include(${CPM_DOWNLOAD_LOCATION})
-CPMAddPackage(
- NAME IODash
- GITHUB_REPOSITORY YukiWorkshop/IODash
- VERSION 0.1.0
-)
-
-CPMAddPackage(
- NAME libevdevPlus
- GITHUB_REPOSITORY YukiWorkshop/libevdevPlus
- VERSION 0.2.1
-)
-
-CPMAddPackage(
- NAME libuInputPlus
- GITHUB_REPOSITORY YukiWorkshop/libuInputPlus
- VERSION 0.2.1
-)
-
-CPMAddPackage(
- NAME cxxopts
- GITHUB_REPOSITORY jarro2783/cxxopts
- VERSION 3.0.0
- GIT_TAG 2d8e17c4f88efce80e274cb03eeb902e055a91d3
-)
set(SOURCE_FILES_LIBRARY
CommonIncludes.hpp
@@ -74,5 +50,3 @@ add_executable(ydotool ${SOURCE_FILES_CLIENT})
target_link_libraries(ydotool ydotool_library dl pthread uInputPlus evdevPlus)
install(TARGETS ydotool DESTINATION ${CMAKE_INSTALL_BINDIR})
-add_subdirectory(Daemon)
-add_subdirectory(manpage)
--
2.29.2