From a65d5339c50e79227b16b985d9c9a7a9a06f68f1 Mon Sep 17 00:00:00 2001 From: Chuang Zhu Date: Sun, 30 Oct 2022 00:28:45 +0800 Subject: [PATCH 01/23] gotktrix: 0.1.4 -> unstable-2022-09-29 --- .../instant-messengers/gotktrix/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix index d0f9f3d9e52..edcac906284 100644 --- a/pkgs/applications/networking/instant-messengers/gotktrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/gotktrix/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gotktrix"; - version = "0.1.4"; + version = "unstable-2022-09-29"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-ZaE7L43fA9L5WbTAsBiIxlwYgjl1hMrtfrraAROz+7k="; + rev = "3d9e8ac4810f7cb9d9ead7b4b13ffa6f5da8927f"; # compound + sha256 = "sha256-VIV4vSntu3oCIE23f5fiYj8cxcKY1n4M4Xkf0MGhvxI="; }; - vendorSha256 = "sha256-k6T44aH1NogyrbUnflfEHkp0zpOOH1YFly/X2kwbMzs="; + vendorSha256 = "sha256-R55tfTJL/bgNWTgmuBFRxIQleKS9zeDqvfez2VyzqjI="; buildInputs = [ gtk4 @@ -32,8 +32,12 @@ buildGoModule rec { # Checking requires a working display doCheck = false; - postInstall = '' + postPatch = '' + sed -i '/DBusActivatable/d' .nix/com.github.diamondburned.gotktrix.desktop echo 'X-Purism-FormFactor=Workstation;Mobile;' >> .nix/com.github.diamondburned.gotktrix.desktop + ''; + + postInstall = '' install -Dm444 .nix/com.github.diamondburned.gotktrix.desktop -t $out/share/applications/ install -Dm444 .github/logo-256.png -T $out/share/icons/hicolor/256x256/apps/gotktrix.png ''; From cf354582c4e4398ebb1a2bdc738bc431d4868da5 Mon Sep 17 00:00:00 2001 From: linsui Date: Tue, 1 Nov 2022 14:53:09 +0800 Subject: [PATCH 02/23] safeeyes: move to all-packages --- pkgs/applications/misc/safeeyes/default.nix | 11 +++-------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index d3d875a5b40..51ae6888b2a 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -1,6 +1,5 @@ { lib -, buildPythonApplication -, fetchPypi +, python3 , alsa-utils , gobject-introspection , libappindicator-gtk3 @@ -10,14 +9,10 @@ , xprintidle , xprop , wrapGAppsHook -, babel -, psutil -, xlib -, pygobject3 -, dbus-python -, croniter }: +with python3.pkgs; + buildPythonApplication rec { pname = "safeeyes"; version = "2.1.3"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d08b09c37e3..61d834f5241 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11116,7 +11116,7 @@ with pkgs; safe-rm = callPackage ../tools/system/safe-rm { }; - safeeyes = with python3.pkgs; toPythonApplication safeeyes; + safeeyes = callPackage ../applications/misc/safeeyes { }; sagoin = callPackage ../tools/misc/sagoin { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 112bd45d1b6..9b47ee9d1b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9875,8 +9875,6 @@ self: super: with self; { safe = callPackage ../development/python-modules/safe { }; - safeeyes = callPackage ../applications/misc/safeeyes { }; - safeio = callPackage ../development/python-modules/safeio { }; safety = callPackage ../development/python-modules/safety { }; From c5df8359dffe616b2d151a5514c4f4821911a002 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Thu, 3 Nov 2022 12:00:00 +0000 Subject: [PATCH 03/23] nixos/wireguard: start new peers when they are added when a new peer is added, it does not modify any active units, because the interface unit remains the same. therefore the new peer is not added until next reboot or manual action. --- .../modules/services/networking/wireguard.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 3f6fa3c8640..e3c3d3ba3c9 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -391,6 +391,19 @@ let ''; }; + # the target is required to start new peer units when they are added + generateInterfaceTarget = name: values: + let + mkPeerUnit = peer: (peerUnitServiceName name peer.publicKey (peer.dynamicEndpointRefreshSeconds != 0)) + ".service"; + in + nameValuePair "wireguard-${name}" + rec { + description = "WireGuard Tunnel - ${name}"; + wantedBy = [ "multi-user.target" ]; + wants = [ "wireguard-${name}.service" ] ++ map mkPeerUnit values.peers; + after = wants; + }; + generateInterfaceUnit = name: values: # exactly one way to specify the private key must be set #assert (values.privateKey != null) != (values.privateKeyFile != null); @@ -409,7 +422,6 @@ let after = [ "network-pre.target" ]; wants = [ "network.target" ]; before = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; environment.DEVICE = name; path = with pkgs; [ kmod iproute2 wireguard-tools ]; @@ -540,6 +552,8 @@ in // (mapAttrs' generateKeyServiceUnit (filterAttrs (name: value: value.generatePrivateKeyFile) cfg.interfaces)); - }); + systemd.targets = mapAttrs' generateInterfaceTarget cfg.interfaces; + } + ); } From 8017d9e2da429f5fa326ecdc4599c28a17e8b00f Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 4 Nov 2022 19:41:36 +0100 Subject: [PATCH 04/23] nixos/nix-daemon: don't give daemon by default high io priority According to https://www.freedesktop.org/software/systemd/man/systemd.exec.html#IOSchedulingClass= the default is 4 --- nixos/modules/services/misc/nix-daemon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index e8a21c352bd..26e7cbfca73 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -206,7 +206,7 @@ in daemonIOSchedPriority = mkOption { type = types.int; - default = 0; + default = 4; example = 1; description = lib.mdDoc '' Nix daemon process I/O scheduling priority. This priority propagates From 86aeb9fc2326690fe8b3fa01d4f3232f964a03b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Nov 2022 11:15:08 +0000 Subject: [PATCH 05/23] python310Packages.gsd: 2.6.0 -> 2.6.1 --- pkgs/development/python-modules/gsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index c8647794e2c..8ff7ceef046 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - version = "2.6.0"; + version = "2.6.1"; pname = "gsd"; disabled = isPy27; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-GVb05uy5HKIn+fARFBN+mK54y2CtFBM8At21VUFr7tc="; + sha256 = "sha256-vQutfkSilfgRHuu/THWMG6bmkT1eKlAAniQM4DP8mqI="; }; nativeBuildInputs = [ cython ]; From a8899fabffe6a798d14f3633b206a30228bef166 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Nov 2022 18:55:48 +0100 Subject: [PATCH 06/23] python310Packages.gsd: disable on older Python releases - add pythonImportsCheck --- .../python-modules/gsd/default.nix | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 8ff7ceef046..ab64a78c103 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -1,27 +1,47 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 -, cython, numpy +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, numpy , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - version = "2.6.1"; pname = "gsd"; - disabled = isPy27; + version = "2.6.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "glotzerlab"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-vQutfkSilfgRHuu/THWMG6bmkT1eKlAAniQM4DP8mqI="; + hash = "sha256-vQutfkSilfgRHuu/THWMG6bmkT1eKlAAniQM4DP8mqI="; }; - nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ numpy ]; + nativeBuildInputs = [ + cython + ]; + + propagatedBuildInputs = [ + numpy + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "gsd" + ]; + - checkInputs = [ pytestCheckHook ]; preCheck = '' pushd gsd/test ''; + postCheck = '' popd ''; @@ -30,6 +50,6 @@ buildPythonPackage rec { description = "General simulation data file format"; homepage = "https://github.com/glotzerlab/gsd"; license = licenses.bsd2; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } From 910ab0bda82b41458ed9e6a4d617b71aa43e006a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Nov 2022 20:29:10 +0000 Subject: [PATCH 07/23] mutt: 2.2.7 -> 2.2.8 --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index f8a47d1023b..a2dc7955934 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { pname = "mutt"; - version = "2.2.7"; + version = "2.2.8"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "6xOFj1i7Np9He/ZS2Q6baq3dDWEKy+o0VQSeXvrTbfE="; + sha256 = "A/PSN6LuKh0WM2QXyaXxe0nPcEXu/qYCHwggu/hdClM="; }; patches = lib.optional smimeSupport (fetchpatch { From c94492f30a952e3a72dbef3c7a1621e296b19044 Mon Sep 17 00:00:00 2001 From: AtilaSaraiva Date: Sun, 6 Nov 2022 19:07:07 -0700 Subject: [PATCH 08/23] linuxPackages.rtw88: 2022-06-03 to 2022-11-05 --- pkgs/os-specific/linux/rtw88/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix index bbff4f6e4a7..abe98927613 100644 --- a/pkgs/os-specific/linux/rtw88/default.nix +++ b/pkgs/os-specific/linux/rtw88/default.nix @@ -5,13 +5,13 @@ let in stdenv.mkDerivation { pname = "rtw88"; - version = "unstable-2022-06-03"; + version = "unstable-2022-11-05"; src = fetchFromGitHub { owner = "lwfinger"; repo = "rtw88"; - rev = "03da251c76ea1005b42625825c39181e12d75693"; - sha256 = "0l5ysp4x5wzrn48sfjv3rciqhq5ldcmk86b9x6j9775zjj7yw8hw"; + rev = "c0dfe571fd7b307e036f186ef5711b4c0d9f3f08"; + sha256 = "1gc5nv5pyrfag826z36vsrbirg6iww99yx45pcgpp7rmrpbwamvg"; }; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -35,7 +35,7 @@ stdenv.mkDerivation { license = with licenses; [ bsd3 gpl2Only ]; maintainers = with maintainers; [ tvorog atila ]; platforms = platforms.linux; - broken = kernel.kernelOlder "4.14"; + broken = kernel.kernelOlder "4.20"; priority = -1; }; } From 34c4365854efb3bd47e4be041e2b5b235990524e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Nov 2022 00:06:43 +0000 Subject: [PATCH 09/23] kronometer: 2.2.3 -> 2.3.0 --- pkgs/tools/misc/kronometer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix index 632001f6329..51548f5822a 100644 --- a/pkgs/tools/misc/kronometer/default.nix +++ b/pkgs/tools/misc/kronometer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "kronometer"; - version = "2.2.3"; + version = "2.3.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "05hs8729a3aqjpwmn2xdf2sriacrll4sj4ax3lm4s1ravj09n9bm"; + sha256 = "sha256-dbnhom8PRo0Bay3DzS2P0xQSrJaMXD51UadQL3z6xHY="; }; meta = with lib; { From 8c60992ea9ce55bd280200cbaa2a95f7cd6d34bf Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Mon, 7 Nov 2022 19:18:24 +1100 Subject: [PATCH 10/23] webkitgtk: unset separateDebugInfo for 32 bit platforms --- pkgs/development/libraries/webkitgtk/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index de61ae59a5b..d226270c795 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -73,7 +73,9 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "dev" "devdoc" ]; - separateDebugInfo = stdenv.isLinux; + # https://github.com/NixOS/nixpkgs/issues/153528 + # Can't be linked within a 4GB address space. + separateDebugInfo = stdenv.isLinux && !stdenv.is32bit; src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; From 9998ec71ccea8f6f794c9484412b90010fd9959d Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sun, 6 Nov 2022 19:35:05 -0500 Subject: [PATCH 11/23] pkgsStatic.cmark: fix build Pass configuration flag to prevent build system from attempting to build .so shared library during pkgsStatic build. Upstream build system is not capable of figuring on its own that it is impossible. --- pkgs/development/libraries/cmark/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index ad4804febbc..f2945116e7e 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -13,10 +13,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - # Link the executable with the shared library - "-DCMARK_STATIC=OFF" - ]; + cmakeFlags = + # Link the executable with the shared library on system with shared libraries. + lib.optional (!stdenv.hostPlatform.isStatic) "-DCMARK_STATIC=OFF" + # Do not attempt to build .so library on static platform. + ++ lib.optional stdenv.hostPlatform.isStatic "-DCMARK_SHARED=OFF"; doCheck = true; From 9b7725ff8a1169c4c55602a078acd079ff47c5c5 Mon Sep 17 00:00:00 2001 From: Michal S Date: Sun, 6 Nov 2022 23:07:56 +0000 Subject: [PATCH 12/23] sshs: 3.3.0 -> 3.4.0 --- pkgs/development/tools/sshs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sshs/default.nix b/pkgs/development/tools/sshs/default.nix index cd999ed39a9..c3fa7ce5cbd 100644 --- a/pkgs/development/tools/sshs/default.nix +++ b/pkgs/development/tools/sshs/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sshs"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "quantumsheep"; repo = pname; rev = version; - sha256 = "OTyk3EGlpr5k6QSwGmHFoF3cAJKQEEkWJuV53Wi8ook="; + sha256 = "KD971dGm1oQt9GbiUGZm2k4SJrBAA9rnHj7Gu0t3SJw="; }; - vendorSha256 = "wClgX08UbItCpWOkWLgmsy7Ad5LlpvXrStN3JHujVww="; + vendorSha256 = "OCh37wjSs40Q0VQmoc1nXQ4nWddnoUCrI5xgxpxR/Ec="; ldflags = [ "-s" "-w" "-X github.com/quantumsheep/sshs/cmd.Version=${version}" ]; From 4488784f4924c8d696c9bc1d6b04646be0c1db3f Mon Sep 17 00:00:00 2001 From: FC Stegerman Date: Sun, 6 Nov 2022 23:44:15 +0000 Subject: [PATCH 13/23] maintainers: fix name for obfusk --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bf772cb9f71..860ac22872e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10172,7 +10172,7 @@ matrix = "@obfusk:matrix.org"; github = "obfusk"; githubId = 1260687; - name = "Felix C. Stegerman"; + name = "FC Stegerman"; keys = [{ fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D"; }]; From 667e5581d16745bcda791300ae7e2d73f49fff25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 4 Nov 2022 13:27:35 +0100 Subject: [PATCH 14/23] bazarr: update expr * Add runtime program dependencies to buildInputs, instead of setting that up as part of the install phase. This allows hacking on bazarr straight from `nix-shell -A bazarr`. * Add missing preInstall/postInstall hooks. * Quote shell variables. * Simplify install path: $out/share/${pname}-${version} -> $out/share/${pname}. (There's no point in having the version there, and without proper deep overrides it can also create some problems.) --- pkgs/servers/bazarr/default.nix | 34 ++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 2c58a0fdb32..ce9b0318922 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -1,5 +1,11 @@ { stdenv, lib, fetchurl, makeWrapper, unzip, python3, unrar, ffmpeg, nixosTests }: +let + runtimeProgDeps = [ + ffmpeg + unrar + ]; +in stdenv.mkDerivation rec { pname = "bazarr"; version = "1.1.2"; @@ -13,16 +19,26 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip makeWrapper ]; + buildInputs = [ + (python3.withPackages (ps: [ ps.lxml ps.numpy ps.gevent ps.gevent-websocket ])) + ] ++ runtimeProgDeps; + installPhase = '' - mkdir -p $out/{bin,share/${pname}-${version}} - cp -r * $out/share/${pname}-${version} - makeWrapper "${ - (python3.withPackages - (ps: [ ps.lxml ps.numpy ps.gevent ps.gevent-websocket ])).interpreter - }" \ - $out/bin/bazarr \ - --add-flags "$out/share/${pname}-${version}/bazarr.py" \ - --suffix PATH : ${lib.makeBinPath [ unrar ffmpeg ]} + runHook preInstall + + mkdir -p "$out"/{bin,share/${pname}} + cp -r * "$out/share/${pname}" + + # Add missing shebang and execute perms so that patchShebangs can do its + # thing. + sed -i "1i #!/usr/bin/env python3" "$out/share/${pname}/bazarr.py" + chmod +x "$out/share/${pname}/bazarr.py" + + makeWrapper "$out/share/${pname}/bazarr.py" \ + "$out/bin/bazarr" \ + --suffix PATH : ${lib.makeBinPath runtimeProgDeps} + + runHook postInstall ''; passthru.tests = { From ea396831fa5d6bc6ad5ded7447d5e2d17a79c4c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Mon, 7 Nov 2022 09:40:53 +0100 Subject: [PATCH 15/23] mdevctl: init at 1.2.0 --- pkgs/os-specific/linux/mdevctl/default.nix | 30 ++ pkgs/os-specific/linux/mdevctl/lock.patch | 446 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 478 insertions(+) create mode 100644 pkgs/os-specific/linux/mdevctl/default.nix create mode 100644 pkgs/os-specific/linux/mdevctl/lock.patch diff --git a/pkgs/os-specific/linux/mdevctl/default.nix b/pkgs/os-specific/linux/mdevctl/default.nix new file mode 100644 index 00000000000..9762011b7a3 --- /dev/null +++ b/pkgs/os-specific/linux/mdevctl/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchFromGitHub +, rustPackages, pkg-config, docutils +}: + +rustPackages.rustPlatform.buildRustPackage rec { + + pname = "mdevctl"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v" + version; + hash = "sha256-Hgl+HsWAYIdabHJdPbCaBNnhY49vpuIjR3l6z2CAmx0="; + }; + + cargoPatches = [ ./lock.patch ]; + + cargoHash = "sha256-PXVc7KUMPze06gCnD2gqzlySwPumOw/z31CTd0UHp9w="; + + nativeBuildInputs = [ pkg-config docutils ]; + + meta = with lib; { + homepage = "https://github.com/mdevctl/mdevctl"; + description = "A mediated device management utility for linux"; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/mdevctl/lock.patch b/pkgs/os-specific/linux/mdevctl/lock.patch new file mode 100644 index 00000000000..bb176771eff --- /dev/null +++ b/pkgs/os-specific/linux/mdevctl/lock.patch @@ -0,0 +1,446 @@ +--- + Cargo.lock | 432 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 432 insertions(+) + create mode 100644 Cargo.lock + +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..b91a26d +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,432 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.66" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "clap" ++version = "3.2.23" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" ++dependencies = [ ++ "atty", ++ "bitflags", ++ "clap_derive", ++ "clap_lex", ++ "indexmap", ++ "once_cell", ++ "strsim", ++ "termcolor", ++ "textwrap", ++] ++ ++[[package]] ++name = "clap_complete" ++version = "3.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" ++dependencies = [ ++ "clap", ++] ++ ++[[package]] ++name = "clap_derive" ++version = "3.2.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" ++dependencies = [ ++ "heck", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "clap_lex" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" ++dependencies = [ ++ "os_str_bytes", ++] ++ ++[[package]] ++name = "env_logger" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" ++dependencies = [ ++ "atty", ++ "humantime", ++ "log", ++ "regex", ++ "termcolor", ++] ++ ++[[package]] ++name = "fastrand" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" ++dependencies = [ ++ "instant", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.2.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" ++dependencies = [ ++ "cfg-if", ++ "libc", ++ "wasi", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.12.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" ++ ++[[package]] ++name = "heck" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "humantime" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" ++ ++[[package]] ++name = "indexmap" ++version = "1.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" ++dependencies = [ ++ "autocfg", ++ "hashbrown", ++] ++ ++[[package]] ++name = "instant" ++version = "0.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "itoa" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" ++ ++[[package]] ++name = "libc" ++version = "0.2.136" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "55edcf6c0bb319052dea84732cf99db461780fd5e8d3eb46ab6ff312ab31f197" ++ ++[[package]] ++name = "log" ++version = "0.4.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "mdevctl" ++version = "1.2.0" ++dependencies = [ ++ "anyhow", ++ "clap", ++ "clap_complete", ++ "env_logger", ++ "log", ++ "serde_json", ++ "tempfile", ++ "uuid", ++] ++ ++[[package]] ++name = "memchr" ++version = "2.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" ++ ++[[package]] ++name = "once_cell" ++version = "1.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1" ++ ++[[package]] ++name = "os_str_bytes" ++version = "6.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" ++ ++[[package]] ++name = "proc-macro-error" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" ++dependencies = [ ++ "proc-macro-error-attr", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro-error-attr" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "version_check", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.47" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "regex" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" ++ ++[[package]] ++name = "serde" ++version = "1.0.147" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" ++ ++[[package]] ++name = "serde_json" ++version = "1.0.87" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45" ++dependencies = [ ++ "indexmap", ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "strsim" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" ++ ++[[package]] ++name = "syn" ++version = "1.0.103" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" ++dependencies = [ ++ "cfg-if", ++ "fastrand", ++ "libc", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi", ++] ++ ++[[package]] ++name = "termcolor" ++version = "1.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.16.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" ++ ++[[package]] ++name = "uuid" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" ++dependencies = [ ++ "getrandom", ++] ++ ++[[package]] ++name = "version_check" ++version = "0.9.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" ++ ++[[package]] ++name = "wasi" ++version = "0.11.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +-- +2.37.2 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2b5555d773..e3851d28e36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25330,6 +25330,8 @@ with pkgs; mdadm = mdadm4; mdadm4 = callPackage ../os-specific/linux/mdadm { }; + mdevctl = callPackage ../os-specific/linux/mdevctl { }; + metastore = callPackage ../os-specific/linux/metastore { }; mingetty = callPackage ../os-specific/linux/mingetty { }; From 83ecc90d1012eeb3dc379c737edc42974ddb41b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Mon, 7 Nov 2022 09:40:54 +0100 Subject: [PATCH 16/23] nixos/mdevctl: init module --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/mdevctl.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 nixos/modules/programs/mdevctl.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index cffd73cd8b1..90825aa3401 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -186,6 +186,7 @@ ./programs/less.nix ./programs/liboping.nix ./programs/light.nix + ./programs/mdevctl.nix ./programs/mosh.nix ./programs/mininet.nix ./programs/msmtp.nix diff --git a/nixos/modules/programs/mdevctl.nix b/nixos/modules/programs/mdevctl.nix new file mode 100644 index 00000000000..2b728523335 --- /dev/null +++ b/nixos/modules/programs/mdevctl.nix @@ -0,0 +1,18 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.programs.mdevctl; +in { + options.programs.mdevctl = { + enable = mkEnableOption (lib.mdDoc "Mediated Device Management"); + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ mdevctl ]; + + environment.etc."mdevctl.d/scripts.d/notifiers/.keep".text = ""; + environment.etc."mdevctl.d/scripts.d/callouts/.keep".text = ""; + + }; +} From 3138f960513761cf938824a1716e87726d7d9f99 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 6 Nov 2022 14:08:35 +0100 Subject: [PATCH 17/23] tor-browser-bundle-bin: 11.5.6 -> 11.5.7 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index e1705efc8dd..df10fc47425 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.5.6"; + version = "11.5.7"; lang = "en-US"; @@ -99,7 +99,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "sha256-DTMY6n7GXokOz6WSrvFUkC64Siuo1Zy80A4UDolmIME="; + sha256 = "sha256-K50T9Fe6tMuP1J5gfwK9f/25ZeakQ9vsJi4IOPa6fMk="; }; i686-linux = fetchurl { @@ -109,7 +109,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "sha256-2/fGt+m/EDoeaSune32zmktHVHt8zH2wCr8+stewKCs="; + sha256 = "sha256-tbL/iTI3vR0gdMcLwOoWlfIDZNefIKA2hfvWKNNM9vE="; }; }; in From e0f93084f7d45421a91a6bd2d2f92ff51d9c61cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Nov 2022 14:24:06 +0000 Subject: [PATCH 18/23] ccache: 4.7.2 -> 4.7.3 --- pkgs/development/tools/misc/ccache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index f1d01c9d03f..eaccf4badf2 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -15,13 +15,13 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.7.2"; + version = "4.7.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-djqqXw6SSxH0ki1905hvRrCa1vYKDRFIsCvZ2vat/CM="; + sha256 = "sha256-i5VOKBNAzu65Ha3Lj3Hh6k+EMGPRAo5/qnwnJipDnMI="; }; outputs = [ "out" "man" ]; From 762fcbb80b5ec8746d4c0f9c41b90e0556905870 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 6 Nov 2022 21:09:54 -0800 Subject: [PATCH 19/23] python310Packages.rpi-gpio: only build on Linux --- pkgs/development/python-modules/rpi-gpio/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/rpi-gpio/default.nix b/pkgs/development/python-modules/rpi-gpio/default.nix index 2618f9f0ea9..56384a12e4a 100644 --- a/pkgs/development/python-modules/rpi-gpio/default.nix +++ b/pkgs/development/python-modules/rpi-gpio/default.nix @@ -18,6 +18,7 @@ buildPythonPackage rec { homepage = "https://sourceforge.net/p/raspberry-gpio-python"; description = "Python module to control the GPIO on a Raspberry Pi"; license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ onny ]; }; } From 9519670e6f3441c54dbdf85339632ef8c3a7abcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 6 Nov 2022 08:25:47 +0000 Subject: [PATCH 20/23] pyinfra: 2.5.1 -> 2.5.2 --- pkgs/development/python-modules/pyinfra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index ff6041c948d..9410d5edbc5 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "2.5.1"; + version = "2.5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Fizzadar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cN7nyjdnU/ls3HNhC2m1sunRrmZFT5pFZr+kEBcwHkU="; + hash = "sha256-35qM6u3I8yH1E8mrlaeFjhliOVTkMXH13b8S6e9ROig="; }; propagatedBuildInputs = [ From ad83bff0088bcefd621fcf16b0db5d34f0cebf1c Mon Sep 17 00:00:00 2001 From: Majiir Paktu Date: Sat, 5 Nov 2022 22:11:02 -0400 Subject: [PATCH 21/23] nixos/binfmt: restart systemd-binfmt when registrations change --- nixos/modules/system/boot/binfmt.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index 260638ceed5..87e66f73be0 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -321,5 +321,6 @@ in { "proc-sys-fs-binfmt_misc.mount" "systemd-binfmt.service" ]; + systemd.services.systemd-binfmt.restartTriggers = [ (builtins.toJSON config.boot.binfmt.registrations) ]; }; } From ab0ae8f5e11bacdf249c27c49f1fe30a3bf8b77f Mon Sep 17 00:00:00 2001 From: ocfox Date: Mon, 7 Nov 2022 19:16:35 +0800 Subject: [PATCH 22/23] nixos/pam: add option failDelay Co-authored-by: Bobby Rong --- nixos/modules/security/pam.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 9a1acba00d0..3980ffab7c1 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -383,6 +383,24 @@ let ''; }; + failDelay = { + enable = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + If enabled, this will replace the `FAIL_DELAY` setting from `login.defs`. + Change the delay on failure per-application. + ''; + }; + + delay = mkOption { + default = 3000000; + type = types.int; + example = 1000000; + description = lib.mdDoc "The delay time (in microseconds) on failure."; + }; + }; + gnupg = { enable = mkOption { type = types.bool; @@ -513,6 +531,7 @@ let || cfg.enableGnomeKeyring || cfg.googleAuthenticator.enable || cfg.gnupg.enable + || cfg.failDelay.enable || cfg.duoSecurity.enable)) ( '' @@ -533,6 +552,9 @@ let optionalString cfg.gnupg.enable '' auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so ${optionalString cfg.gnupg.storeOnly " store-only"} '' + + optionalString cfg.failDelay.enable '' + auth optional ${pkgs.pam}/lib/security/pam_faildelay.so delay=${toString cfg.failDelay.delay} + '' + optionalString cfg.googleAuthenticator.enable '' auth required ${pkgs.google-authenticator}/lib/security/pam_google_authenticator.so no_increment_hotp '' + From 590a40e13423cf7f575fc140a54cebeaff9819cd Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Fri, 4 Nov 2022 14:58:24 +1100 Subject: [PATCH 23/23] android-studio: 2021.3.1.16 -> 2021.3.1.17 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 976cfb95fd0..70d146db321 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,8 +10,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2021.3.1.16"; # "Android Studio Dolphin (2021.3.1)" - sha256Hash = "GnJbWFeG9DuUQzbK9wM2BEbj9LXm4jQFf/Eh5Q75HZo="; + version = "2021.3.1.17"; # "Android Studio Dolphin (2021.3.1)" + sha256Hash = "sha256-ia2wzg/6RreJTnv+2xQrH11SxDwXHmpsualaSfd3Vso="; }; betaVersion = { version = "2022.1.1.12"; # "Android Studio Electric Eel (2022.1.1) Beta 2"