diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-06-20 15:55:24 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-20 15:55:24 +0200 |
commit | b3df41c011f2c79f86b73f05eab756ec7d277d0e (patch) | |
tree | 795dc9b06ba6550fa07a014d31da2800631fc68a /nixos | |
parent | 48543cb04cac6a224307cd1ca816244b76858b85 (diff) | |
parent | bd86db18330c613c7ddee027c749580c9c61ec30 (diff) | |
download | nixpkgs-b3df41c011f2c79f86b73f05eab756ec7d277d0e.tar nixpkgs-b3df41c011f2c79f86b73f05eab756ec7d277d0e.tar.gz nixpkgs-b3df41c011f2c79f86b73f05eab756ec7d277d0e.tar.bz2 nixpkgs-b3df41c011f2c79f86b73f05eab756ec7d277d0e.tar.lz nixpkgs-b3df41c011f2c79f86b73f05eab756ec7d277d0e.tar.xz nixpkgs-b3df41c011f2c79f86b73f05eab756ec7d277d0e.tar.zst nixpkgs-b3df41c011f2c79f86b73f05eab756ec7d277d0e.zip |
Merge pull request #177913 from Yarny0/clickshare
{nixos/,}clickshare-csc1: remove (qt4)
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 13 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2211.section.md | 4 | ||||
-rw-r--r-- | nixos/modules/module-list.nix | 1 | ||||
-rw-r--r-- | nixos/modules/programs/clickshare.nix | 21 |
4 files changed, 17 insertions, 22 deletions
diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 83f3c4a03bf..2f5ae9fefe3 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -140,6 +140,19 @@ </listitem> <listitem> <para> + The Barco ClickShare driver/client package + <literal>pkgs.clickshare-csc1</literal> and the option + <literal>programs.clickshare-csc1.enable</literal> have been + removed, as it requires <literal>qt4</literal>, which reached + its end-of-life 2015 and will no longer be supported by + nixpkgs. + <link xlink:href="https://www.barco.com/de/support/knowledge-base/4380-can-i-use-linux-os-with-clickshare-base-units">According + to Barco</link> many of their base unit models can be used + with Google Chrome and the Google Cast extension. + </para> + </listitem> + <listitem> + <para> PHP 7.4 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 22.11 release. </para> diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 2c5cc7c633c..8fd88e79a0f 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -53,6 +53,10 @@ In addition to numerous new and upgraded packages, this release has the followin - The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`. +- The Barco ClickShare driver/client package `pkgs.clickshare-csc1` and the option `programs.clickshare-csc1.enable` have been removed, + as it requires `qt4`, which reached its end-of-life 2015 and will no longer be supported by nixpkgs. + [According to Barco](https://www.barco.com/de/support/knowledge-base/4380-can-i-use-linux-os-with-clickshare-base-units) many of their base unit models can be used with Google Chrome and the Google Cast extension. + - PHP 7.4 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 22.11 release. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2062b833547..40a84730dfc 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -141,7 +141,6 @@ ./programs/cdemu.nix ./programs/cfs-zen-tweaks.nix ./programs/chromium.nix - ./programs/clickshare.nix ./programs/cnping.nix ./programs/command-not-found/command-not-found.nix ./programs/criu.nix diff --git a/nixos/modules/programs/clickshare.nix b/nixos/modules/programs/clickshare.nix deleted file mode 100644 index 9980a7daf52..00000000000 --- a/nixos/modules/programs/clickshare.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - - options.programs.clickshare-csc1.enable = - lib.options.mkEnableOption '' - Barco ClickShare CSC-1 driver/client. - This allows users in the <literal>clickshare</literal> - group to access and use a ClickShare USB dongle - that is connected to the machine - ''; - - config = lib.modules.mkIf config.programs.clickshare-csc1.enable { - environment.systemPackages = [ pkgs.clickshare-csc1 ]; - services.udev.packages = [ pkgs.clickshare-csc1 ]; - users.groups.clickshare = {}; - }; - - meta.maintainers = [ lib.maintainers.yarny ]; - -} |