···11+{ config, lib, pkgs, ... }:
22+33+with lib;
44+let
55+ cfg = config.hardware.keyboard.uhk;
66+in
77+{
88+ options.hardware.keyboard.uhk = {
99+ enable = mkEnableOption ''
1010+ non-root access to the firmware of UHK keyboards.
1111+ You need it when you want to flash a new firmware on the keyboard.
1212+ Access to the keyboard is granted to users in the "input" group.
1313+ You may want to install the uhk-agent package.
1414+ '';
1515+1616+ };
1717+1818+ config = mkIf cfg.enable {
1919+ services.udev.packages = [ pkgs.uhk-udev-rules ];
2020+ };
2121+}
+4-1
nixos/modules/installer/tools/tools.nix
···177177 # users.users.jane = {
178178 # isNormalUser = true;
179179 # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
180180+ # packages = with pkgs; [
181181+ # firefox
182182+ # thunderbird
183183+ # ];
180184 # };
181185182186 # List packages installed in system profile. To search, run:
···184188 # environment.systemPackages = with pkgs; [
185189 # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
186190 # wget
187187- # firefox
188191 # ];
189192190193 # Some programs need SUID wrappers, can be configured further or are
···383383 };
384384 preStart = ''
385385 mkdir -p /etc/tinc/${network}/hosts
386386- chown tinc:${network} /etc/tinc/${network}/hosts
386386+ chown tinc.${network} /etc/tinc/${network}/hosts
387387 mkdir -p /etc/tinc/${network}/invitations
388388- chown tinc:${network} /etc/tinc/${network}/invitations
388388+ chown tinc.${network} /etc/tinc/${network}/invitations
389389390390 # Determine how we should generate our keys
391391 if type tinc >/dev/null 2>&1; then
+17-4
pkgs/applications/audio/monkeys-audio/default.nix
···11-{lib, stdenv, fetchurl}:
11+{lib, gcc10Stdenv, fetchurl}:
2233-stdenv.mkDerivation rec {
33+gcc10Stdenv.mkDerivation rec {
44 version = "3.99-u4-b5";
55- pname = "monkeys-audio";
55+ pname = "monkeys-audio-old";
6677 patches = [ ./buildfix.diff ];
8899 src = fetchurl {
1010+ /*
1111+ The real homepage is <https://monkeysaudio.com/>, but in fact we are
1212+ getting an old, ported to Linux version of the sources, made by (quoting
1313+ from the AUTHORS file found in the source):
1414+1515+ Frank Klemm : First port to linux (with makefile)
1616+1717+ SuperMMX <SuperMMX AT GMail DOT com> : Package the source, include the frontend and shared lib,
1818+ porting to Big Endian platform and adding other non-win32 enhancement.
1919+ */
1020 url = "https://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz";
1121 sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz";
1222 };
···1424 meta = with lib; {
1525 description = "Lossless audio codec";
1626 platforms = platforms.linux;
1717- license = licenses.lgpl2;
2727+ # This is not considered a GPL license, but it seems rather free although
2828+ # it's not standard, see a quote of it:
2929+ # https://github.com/NixOS/nixpkgs/pull/171682#issuecomment-1120260551
3030+ license = licenses.free;
1831 maintainers = [ ];
1932 };
2033}
···2525 install -m 644 -D usbrelayd $out/bin/usbrelayd
2626 install -m 644 -D usbrelayd.service $out/lib/systemd/system/usbrelayd.service
2727 install -m 644 -D 50-usbrelay.rules $out/lib/udev/rules.d/50-usbrelay.rules
2828+ install -m 644 -D usbrelayd.conf $out/etc/usbrelayd.conf # include this as an example
2829 runHook postInstall
2930 '';
3030- # TODO for later releases: install -D usbrelayd.conf $out/etc/usbrelayd.conf # include this as an example
31313232 meta = {
3333 description = "USB Relay MQTT service";
···179179 extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs);
180180181181 # Don't forget to run parse-requirements.py after updating
182182- hassVersion = "2022.5.2";
182182+ hassVersion = "2022.5.3";
183183184184in python.pkgs.buildPythonApplication rec {
185185 pname = "homeassistant";
···197197 owner = "home-assistant";
198198 repo = "core";
199199 rev = version;
200200- hash = "sha256-n8lM1Z5fkZRW0E9J7nPRYntoaUuug9XPoRAKl+5XC6Y=";
200200+ hash = "sha256-g15bMS6xOz6w7JLSVP/tqlKBGWkFsG093GF7fcoHvlg=";
201201 };
202202203203 # leave this in, so users don't have to constantly update their downstream patch handling
+2-2
pkgs/servers/home-assistant/frontend.nix
···44 # the frontend version corresponding to a specific home-assistant version can be found here
55 # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
66 pname = "home-assistant-frontend";
77- version = "20220504.0";
77+ version = "20220504.1";
88 format = "wheel";
991010 src = fetchPypi {
···1212 pname = "home_assistant_frontend";
1313 dist = "py3";
1414 python = "py3";
1515- sha256 = "sha256-CYhUId5SGfPX9beAZH0ZemwciVDxchbDcTvQcRhJwog=";
1515+ sha256 = "sha256-EU9I/0+EmcNr7eYq3Z5J5/KiWu+Qz0+wn7UZMJFBxp0=";
1616 };
17171818 # there is nothing to strip in this package
···149149 });
150150151151152152- /* Return a modified stdenv that builds packages with GCC's coverage
153153- instrumentation. The coverage note files (*.gcno) are stored in
154154- $out/.build, along with the source code of the package, to enable
155155- programs like lcov to produce pretty-printed reports.
156156- */
152152+ # remove after 22.05 and before 22.11
157153 addCoverageInstrumentation = stdenv:
154154+ builtins.trace "'addCoverageInstrumentation' adapter is deprecated and will be removed before 22.11"
158155 overrideInStdenv stdenv [ pkgs.enableGCOVInstrumentation pkgs.keepBuildTree ];
159156160157161161- /* Replace the meta.maintainers field of a derivation. This is useful
162162- when you want to fork to update some packages without disturbing other
163163- developers.
164164-165165- e.g.: in all-packages.nix:
166166-167167- # remove all maintainers.
168168- defaultStdenv = replaceMaintainersField allStdenvs.stdenv pkgs [];
169169- */
158158+ # remove after 22.05 and before 22.11
170159 replaceMaintainersField = stdenv: pkgs: maintainers:
160160+ builtins.trace "'replaceMaintainersField' adapter is deprecated and will be removed before 22.11"
171161 stdenv.override (old: {
172162 mkDerivationFromStdenv = overrideMkDerivationResult (pkg:
173163 lib.recursiveUpdate pkg { meta.maintainers = maintainers; });
···193183 });
194184195185196196- /* Abort if the license predicate is not verified for a derivation
197197- declared with mkDerivation.
198198-199199- One possible predicate to avoid all non-free packages can be achieved
200200- with the following function:
201201-202202- isFree = license: with builtins;
203203- if license == null then true
204204- else if isList license then lib.all isFree license
205205- else license != "non-free" && license != "unfree";
206206-207207- This adapter can be defined on the defaultStdenv definition. You can
208208- use it by patching the all-packages.nix file or by using the override
209209- feature of ~/.config/nixpkgs/config.nix .
210210- */
186186+ # remove after 22.05 and before 22.11
211187 validateLicenses = licensePred: stdenv:
188188+ builtins.trace "'validateLicenses' adapter is deprecated and will be removed before 22.11"
212189 stdenv.override (old: {
213190 mkDerivationFromStdenv = overrideMkDerivationResult (pkg:
214191 let
+1-1
pkgs/stdenv/generic/make-derivation.nix
···8383# * https://nixos.org/nixpkgs/manual/#sec-using-stdenv
8484# Details on how to use this mkDerivation function
8585#
8686-# * https://nixos.org/nix/manual/#ssec-derivation
8686+# * https://nixos.org/manual/nix/stable/expressions/derivations.html#derivations
8787# Explanation about derivations in general
8888{
8989
···850850 navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07
851851 ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22
852852 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12
853853- netcat-openbsd = throw "'netcat-openbsd' has been renamed to/replaced by 'libressl.nc'"; # Converted to throw 2022-02-22
854853 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31
855854 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22
856855 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22