From 3d9f7e0ca0accf52101ab3b48bab629f4dbc2e3f Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 3 Jun 2024 16:45:21 +0200 Subject: [PATCH 01/78] i3status-rust: add optional support for pipewire driver i3status-rust has recently introduced a privacy block feature that can optionally use PipeWire to indicate if the microphone or webcam is currently in use. This functionality is enabled by setting a feature flag. --- pkgs/applications/window-managers/i3/status-rust.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index b9ced38b5fe4..672287d4aec1 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -11,7 +11,9 @@ , lm_sensors , iw , iproute2 +, pipewire , withICUCalendar ? false +, withPipewire ? true }: rustPlatform.buildRustPackage rec { @@ -27,15 +29,18 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-yeijJl94v+yKMVnU/Fjzapab/nExlvoznrx8Ydz/RvM="; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ] + ++ (lib.optionals withPipewire [ rustPlatform.bindgenHook ]); - buildInputs = [ dbus libpulseaudio notmuch openssl lm_sensors ]; + buildInputs = [ dbus libpulseaudio notmuch openssl lm_sensors ] + ++ (lib.optionals withPipewire [ pipewire ]); buildFeatures = [ "notmuch" "maildir" "pulseaudio" - ] ++ (lib.optionals withICUCalendar [ "icu_calendar" ]); + ] ++ (lib.optionals withICUCalendar [ "icu_calendar" ]) + ++ (lib.optionals withPipewire [ "pipewire" ]); prePatch = '' substituteInPlace src/util.rs \ From 118327ee921198191db5681115aab67d35bf47fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 19:22:50 +0000 Subject: [PATCH 02/78] python312Packages.influxdb-client: 1.47.0 -> 1.48.0 --- pkgs/development/python-modules/influxdb-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 712be1f3410a..7c47b11985b4 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.47.0"; + version = "1.48.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-1QWy+mdVttowdbIBmtW6gYwkJ4p9sL0D+DxsHk3xgvc="; + hash = "sha256-MKTfRsqizZDXPMqJAypUDQBm+a2s6FaEG3TM30wucrI="; }; build-system = [ setuptools ]; From f3e7653291e02f35d42b4fe7fd9be15877ac6590 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 19:59:26 +0000 Subject: [PATCH 03/78] python312Packages.zope-testrunner: 6.4 -> 6.6 --- pkgs/development/python-modules/zope-testrunner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope-testrunner/default.nix b/pkgs/development/python-modules/zope-testrunner/default.nix index cc9c00fd8d24..fbc82b59f7bd 100644 --- a/pkgs/development/python-modules/zope-testrunner/default.nix +++ b/pkgs/development/python-modules/zope-testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "6.4"; + version = "6.6"; src = fetchPypi { inherit pname version; - hash = "sha256-C4Wfx01vK2xd2K353uTsdAX3PykOyrJXCsY2+DYSKMg="; + hash = "sha256-sReX6XWocHseM7ZUTKz5A3KHiG7leA7P7UvxiZ1CFe8="; }; propagatedBuildInputs = [ From e7d285032a4cd5a3fa7c9c2b497b1f60d97672e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 2 Dec 2024 20:14:15 +0000 Subject: [PATCH 04/78] python312Packages.roombapy: 1.8.1 -> 1.8.2 --- pkgs/development/python-modules/roombapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/roombapy/default.nix b/pkgs/development/python-modules/roombapy/default.nix index e2196301166a..192880df1051 100644 --- a/pkgs/development/python-modules/roombapy/default.nix +++ b/pkgs/development/python-modules/roombapy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "roombapy"; - version = "1.8.1"; + version = "1.8.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pschmitt"; repo = "roombapy"; rev = "refs/tags/${version}"; - hash = "sha256-1yfmaTzZ7cZW2+Yb3Zbo8+5TfD+H1sA0+SzC1c9MdsQ="; + hash = "sha256-plmdGVfrkdz7pyyAztzZKlDpUjKxBIRtDVeBXoqaB5s="; }; nativeBuildInputs = [ From b393f7cd617dba07d547b4abf453a09d570c51d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 04:39:32 +0000 Subject: [PATCH 05/78] python312Packages.pymssql: 2.3.1 -> 2.3.2 --- pkgs/development/python-modules/pymssql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix index 02e3f670f1c9..3f9214832cab 100644 --- a/pkgs/development/python-modules/pymssql/default.nix +++ b/pkgs/development/python-modules/pymssql/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "pymssql"; - version = "2.3.1"; + version = "2.3.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-3e4VxMGT4UyS/izXIMqb4duh4PQXgkA4C49fbwDaBMY="; + hash = "sha256-GAiWQbaHvh69D2Tw0f+XdHijl/+hrzcr3xDb7CnPbS4="; }; build-system = [ From d5a0ed5e016a142ec3e071d57595ac2c1e7ce4be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 08:17:10 +0000 Subject: [PATCH 06/78] python312Packages.sopel: 8.0.0 -> 8.0.1 --- pkgs/development/python-modules/sopel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 45f0469ea0ff..744c4550d9eb 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "sopel"; - version = "8.0.0"; + version = "8.0.1"; pyproject = true; disabled = isPyPy || pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-juLJp0Et5qMZwBZzw0e4tKg1cBYqAsH8KUzqNoIP70U="; + hash = "sha256-Z9Tcn2lb5a7c6aVbhPjuO6trrZQwSBA1iaMiDzpe+DA="; }; build-system = [ setuptools ]; From 915fdc4ca710bce29aa6eea30a0466bf59232826 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 08:54:05 +0000 Subject: [PATCH 07/78] python312Packages.pyvcd: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/pyvcd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index 3904923d53b4..e37c7989dc29 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "0.4.0"; + version = "0.4.1"; format = "setuptools"; pname = "pyvcd"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Mb4/UBRBqbjF3HJmD/e5z++bQ7ISGiPZb1htKGMnApA="; + hash = "sha256-3GJ16Vp5SbgjYIarLm0Dr+3nNEEkPsUQnJ6okHfz1pY="; }; buildInputs = [ setuptools-scm ]; From 85af71061185bd0b4570eec2ff2ab1772ecd9f52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Dec 2024 11:00:29 +0000 Subject: [PATCH 08/78] python312Packages.gnureadline: 8.2.10 -> 8.2.13 --- pkgs/development/python-modules/gnureadline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index f0db91f45cc0..0770f6264304 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec { - version = "8.2.10"; + version = "8.2.13"; format = "setuptools"; pname = "gnureadline"; disabled = isPyPy; src = fetchPypi { inherit pname version; - hash = "sha256-p0a6mNTeN7B55C2Um3BMM8FoswvR+QcaHSXJ2ppEmZc="; + hash = "sha256-ybnh57qZqAu1DBICfWzmkldPd6Zb9XvJcEHPgcD0m9E="; }; buildInputs = [ pkgs.ncurses ]; From 58d5f8eee7c054589b581912506da057f3f16166 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Dec 2024 12:14:29 +0000 Subject: [PATCH 09/78] python312Packages.pyinstaller: 6.11.0 -> 6.11.1 --- pkgs/development/python-modules/pyinstaller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinstaller/default.nix b/pkgs/development/python-modules/pyinstaller/default.nix index b76b5bc2440a..6bafe0a9b46e 100644 --- a/pkgs/development/python-modules/pyinstaller/default.nix +++ b/pkgs/development/python-modules/pyinstaller/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "pyinstaller"; - version = "6.11.0"; + version = "6.11.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-y01DOj2zDZ0Xz18s97tN+Ap4jUk8HWfdgi3FeR2YZK8="; + hash = "sha256-SR37TZ1dHZZQ2VB9rsH/aClSeiVNjjlrrdYKCv/Lcu8="; }; build-system = [ setuptools ]; From 9e21c00cf1dfbe33371864b5d7d573088d1fada0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 02:35:46 +0000 Subject: [PATCH 10/78] duo-unix: 2.0.2 -> 2.0.4 --- pkgs/by-name/du/duo-unix/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/du/duo-unix/package.nix b/pkgs/by-name/du/duo-unix/package.nix index 1d04cfef3544..8e60613ba5d3 100644 --- a/pkgs/by-name/du/duo-unix/package.nix +++ b/pkgs/by-name/du/duo-unix/package.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "duo-unix"; - version = "2.0.2"; + version = "2.0.4"; src = fetchurl { url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz"; - sha256 = "sha256-7huWd71SdnTe1ef8OoHgQKjYQKVpE8k/oNT7bA+OJR0="; + sha256 = "sha256-P7IVX4RyMER2BX99FJUgv2JZx7KddktiJ101rTJJwmQ="; }; buildInputs = [ pam openssl zlib ]; From 8f2613724084a3d843db76ebced1941946215f19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Dec 2024 09:29:52 +0000 Subject: [PATCH 11/78] python312Packages.reportlab: 4.2.4 -> 4.2.5 --- pkgs/development/python-modules/reportlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 4a1991adefdf..9e35dff784b3 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -18,7 +18,7 @@ let in buildPythonPackage rec { pname = "reportlab"; - version = "4.2.4"; + version = "4.2.5"; pyproject = true; # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-oAtXKS4VanvahO3zHWDCVXgVMHbI+5YzHQxZ7d2gUsg="; + hash = "sha256-XPNbj9YJtoCArHu7CuHjdhBPfV97LTkUx63GPyWTlB8="; }; postPatch = '' From fb04c1e4b029560ec7233398cfc1df5d90cd9e4a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Dec 2024 20:05:15 +0000 Subject: [PATCH 12/78] parsedmarc: 8.15.4 -> 8.16.0 --- pkgs/development/python-modules/parsedmarc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parsedmarc/default.nix b/pkgs/development/python-modules/parsedmarc/default.nix index dc118008ef9b..8459bb02335f 100644 --- a/pkgs/development/python-modules/parsedmarc/default.nix +++ b/pkgs/development/python-modules/parsedmarc/default.nix @@ -42,14 +42,14 @@ let in buildPythonPackage rec { pname = "parsedmarc"; - version = "8.15.4"; + version = "8.16.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lxW92jlSWgGVxOO+CwIZi5sKHqoZuR5VQCnDVORXmXU="; + hash = "sha256-yoDvEja9UIubfWfpfEE/LhPa085QM3B5TmiwOPRBDDA="; }; nativeBuildInputs = [ From 0bcffe70b7d7b5662f8e8b748cfcafd054c2758f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 19:26:36 +0000 Subject: [PATCH 13/78] apk-tools: 2.14.5 -> 2.14.7 --- pkgs/tools/package-management/apk-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/apk-tools/default.nix b/pkgs/tools/package-management/apk-tools/default.nix index f289ff36f7a0..1384f1ed9ace 100644 --- a/pkgs/tools/package-management/apk-tools/default.nix +++ b/pkgs/tools/package-management/apk-tools/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "apk-tools"; - version = "2.14.5"; + version = "2.14.7"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "apk-tools"; rev = "v${version}"; - sha256 = "sha256-GtWwLQoN0106uErEDjPrwlz8pmOKdV3OrtfisFhGqoY="; + sha256 = "sha256-4MA+wP8G1Qbv8mbzx1R0eFG7gbwUAfSAFJZ6ulrBHUY="; }; nativeBuildInputs = [ pkg-config scdoc ] From b20ab0c38e043b8590e973582cad1c9c086082f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 23:16:40 +0000 Subject: [PATCH 14/78] gi-crystal: 0.22.2 -> 0.24.0 --- pkgs/by-name/gi/gi-crystal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gi/gi-crystal/package.nix b/pkgs/by-name/gi/gi-crystal/package.nix index 0b17b733833b..a783ece5d4ad 100644 --- a/pkgs/by-name/gi/gi-crystal/package.nix +++ b/pkgs/by-name/gi/gi-crystal/package.nix @@ -7,13 +7,13 @@ }: crystal.buildCrystalPackage rec { pname = "gi-crystal"; - version = "0.22.2"; + version = "0.24.0"; src = fetchFromGitHub { owner = "hugopl"; repo = "gi-crystal"; rev = "v${version}"; - hash = "sha256-JfBbKqobikpTGMryeO86zZ46EbOHybem+Cc5FZEL6i4="; + hash = "sha256-0LsYREn4zWLQYUTpNWJhLLHWmg7UQzxOoQiAMmw3ZXQ="; }; # Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path From 2ab54fcb48c044c8238225a02505b93c22835601 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 11:04:26 +0000 Subject: [PATCH 15/78] marimo: 0.9.27 -> 0.10.5 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 02755b8ed342..7958d63eb9ee 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -30,13 +30,13 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.9.27"; + version = "0.10.5"; pyproject = true; # The github archive does not include the static assets src = fetchPypi { inherit pname version; - hash = "sha256-vs1miLjM/xRrnFYpHte65CfDt4ZRoCKjFMClWukIWZY="; + hash = "sha256-KJKnGVOM0ahZOWDXHyS5meRS1xXypKzgo3X9RvD1tJs="; }; build-system = [ hatchling ]; From f1262d559522a2dd91185c85036a230127706eb1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 14:48:50 +0000 Subject: [PATCH 16/78] carapace: 1.1.0 -> 1.1.1 --- pkgs/shells/carapace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index c2107abb3fc0..fb90bfb8ffa4 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "carapace"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bin"; rev = "v${version}"; - hash = "sha256-UUWZ/ZI8GTwvS8811Uzc8CjBsM/9ALxJLSFnzEE5pi4="; + hash = "sha256-4tsqzXQwLTJ3icoCFJAmUWEXvv/RwzBnOXJd4vXOE7s="; }; - vendorHash = "sha256-Fd1tbeBfbGnhOfowas2lF90TwjoRwOuk5xx9GhYEiRc="; + vendorHash = "sha256-8EuPHhTNK+7OnjYKAdkSmIS/iZR2AYrDw4nfY5ixYIo="; ldflags = [ "-s" From 2c640658308eda0bf18a9cfebb0b79ba58d4cbe8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 15:10:40 +0000 Subject: [PATCH 17/78] taproot-assets: 0.4.1 -> 0.5.0 --- pkgs/by-name/ta/taproot-assets/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/taproot-assets/package.nix b/pkgs/by-name/ta/taproot-assets/package.nix index 04618d79b098..a91bf5c2aa7b 100644 --- a/pkgs/by-name/ta/taproot-assets/package.nix +++ b/pkgs/by-name/ta/taproot-assets/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "taproot-assets"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "taproot-assets"; rev = "v${version}"; - hash = "sha256-aQYVPSDudLK4ZBcBN/wNjVoF/9inOaJRbcyTP6VMdA0="; + hash = "sha256-XOEbrz0kFJKoYG91VUeSAuMVJRfGRNTQ8jucMtnvxJo="; }; - vendorHash = "sha256-IFzYW5vAtBoUC2ebFYnxS/TojQR4kXxQACNbyn2ZkCs="; + vendorHash = "sha256-hDmRyWSf4jokomfJQBLlIbm9I3v2/sg/xD52BW3Wvy4="; subPackages = [ "cmd/tapcli" From cf37a496573ba6590f580702580e8d17b7531c43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 20:40:30 +0000 Subject: [PATCH 18/78] zoekt: 3.7.2-2-unstable-2024-12-09 -> 3.7.2-2-unstable-2024-12-18 --- pkgs/by-name/zo/zoekt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix index fd7bcbc06d78..eb5430d3742d 100644 --- a/pkgs/by-name/zo/zoekt/package.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "zoekt"; - version = "3.7.2-2-unstable-2024-12-09"; + version = "3.7.2-2-unstable-2024-12-18"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "zoekt"; - rev = "37c4df87f75cb0de7b71181301e0f6df6aa9ade6"; - hash = "sha256-pH21Kz/qMs7Cy1nKoaWOzUt6W9jBYtmgIiF6GIcdwsg="; + rev = "dc1b23bb0da9a0fa91056ad6d5fcf9b8e641f67d"; + hash = "sha256-sMYGFA6zazY64IGELbp4H1xNfKeH72pJ7bJ0Vy9YYFk="; }; vendorHash = "sha256-Dvs8XMOxZEE9moA8aCxuxg947+x/6C8cKtgdcByL4Eo="; From 39a3cf0bab47848e7d70dbf7ae68e36c97a86f22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Dec 2024 23:26:51 +0000 Subject: [PATCH 19/78] weaviate: 1.28.0 -> 1.28.2 --- pkgs/by-name/we/weaviate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix index f3d72dd53b6e..2eee886bc729 100644 --- a/pkgs/by-name/we/weaviate/package.nix +++ b/pkgs/by-name/we/weaviate/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.28.0"; + version = "1.28.2"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-HSBgsnjkkWie1hjo3WlZmh3InLnUz+8f7FhRMfRFpeU="; + hash = "sha256-yIa8AHyoT1z/M/tyPtlNtSMgOhU3XyWtw9OsqrDjO7A="; }; - vendorHash = "sha256-A6Ikxy+zrAgy617ldtj4BkIFN/KiiEgjMb0ZNG6mVrs="; + vendorHash = "sha256-u1pfPsc1NuzONyuXPVNO5UcA6vekChnBkLT3MHa2xcc="; subPackages = [ "cmd/weaviate-server" ]; From 6314893899dea79c294fe312c94867ed265a1170 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 22 Dec 2024 23:39:13 +0000 Subject: [PATCH 20/78] clusterctl: 1.9.0 -> 1.9.2 --- pkgs/by-name/cl/clusterctl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix index 0e51c630ad7c..9b6604c8c52c 100644 --- a/pkgs/by-name/cl/clusterctl/package.nix +++ b/pkgs/by-name/cl/clusterctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-ENbNgstu+YsNESJ2RsJri3B4zO8UI3Dt60/8AFgsxn8="; + hash = "sha256-H86EkdGmzvQDGC/a+J6ISB0aYkJabBjE2P6Ab5FRlv4="; }; - vendorHash = "sha256-rjo8fwUAnVDM7XvY31I5z6RMRSrNSur6wH7NfGTIdcc="; + vendorHash = "sha256-JSWk6FgjWnDcVmp/9+M0x7QsiX08QtIOn5RRifjs2mI="; subPackages = [ "cmd/clusterctl" ]; From b7c1e20c24f27e228cf283c92460285cfd6276cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Dec 2024 12:33:20 +0000 Subject: [PATCH 21/78] bookstack: 24.10.3 -> 24.12 --- pkgs/servers/web-apps/bookstack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/bookstack/default.nix b/pkgs/servers/web-apps/bookstack/default.nix index 65807d3f0ac6..a5eaa9dbc521 100644 --- a/pkgs/servers/web-apps/bookstack/default.nix +++ b/pkgs/servers/web-apps/bookstack/default.nix @@ -27,13 +27,13 @@ let in package.override rec { pname = "bookstack"; - version = "24.10.3"; + version = "24.12"; src = fetchFromGitHub { owner = "bookstackapp"; repo = pname; rev = "v${version}"; - sha256 = "11gbzx5qb79vknrs2ci5g21jxz7sxm3b69m0xhqpkbpdfnrgp4pl"; + sha256 = "sha256-7ZC4C84XNGAR8efwQsupbAQbRGA8LUixuDoirCHPkiQ="; }; meta = with lib; { From d0c1c2885b980cec2fb4f1e66e258949b39c1a22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Dec 2024 13:16:24 +0000 Subject: [PATCH 22/78] gotrue-supabase: 2.165.1 -> 2.166.0 --- pkgs/tools/security/gotrue/supabase.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index 48da315e59cd..cf37dbabfb41 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "auth"; - version = "2.165.1"; + version = "2.166.0"; src = fetchFromGitHub { owner = "supabase"; repo = "auth"; rev = "v${version}"; - hash = "sha256-Tp8h20GM2YULlElFtHS41rFyWSIT3EGGXKtExkuO5P8="; + hash = "sha256-e4PLop+enPt0IkPYRNH0UyZwiBhQKsk0mTFXokGcLug="; }; - vendorHash = "sha256-w6qbqHHdXdDYHO5Asa0fkf0UBI7Wr2Voc2K4Ss1zDCE="; + vendorHash = "sha256-em1dBnNHsVPI7owd2gjERcJnrQbiVtZGtIqnFyker6M="; ldflags = [ "-s" From 57ed908d011454a845340df81cde77027fd02bf0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Dec 2024 14:50:20 +0000 Subject: [PATCH 23/78] treesheets: 0-unstable-2024-12-11 -> 0-unstable-2024-12-22 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 1d71eec0f26e..354a7c8b5d48 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2024-12-11"; + version = "0-unstable-2024-12-22"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "81e74a0f3f325ada0abe35211e90b74132f91470"; - hash = "sha256-6Ao1dl0tRLAZZxx0xV7uaojuCO9i3bUIdccsZ37Jm/g="; + rev = "b3bf8f2763aa9efaac428107d62194582839df1b"; + hash = "sha256-qY5DSFW6jnngvHCBgz9Go9Xsfo2nd7xDyZWuKSpyMMM="; }; nativeBuildInputs = [ From 5c5fab76c211ed71132cd71657cc69f260e8b0c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Dec 2024 15:04:53 +0000 Subject: [PATCH 24/78] qbittorrent-enhanced-nox: 5.0.2.10 -> 5.0.3.10 --- pkgs/by-name/qb/qbittorrent-enhanced/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix index 82fd6dcc9527..b1aff2a81540 100644 --- a/pkgs/by-name/qb/qbittorrent-enhanced/package.nix +++ b/pkgs/by-name/qb/qbittorrent-enhanced/package.nix @@ -7,13 +7,13 @@ (qbittorrent.override { inherit guiSupport; }).overrideAttrs (old: rec { pname = "qbittorrent-enhanced" + lib.optionalString (!guiSupport) "-nox"; - version = "5.0.2.10"; + version = "5.0.3.10"; src = fetchFromGitHub { owner = "c0re100"; repo = "qBittorrent-Enhanced-Edition"; rev = "release-${version}"; - hash = "sha256-9RCG530zWQ+qzP0Y+y69NFlBWVA8GT29dY8aC1cvq7o="; + hash = "sha256-efQFjdJeVMrPvCQ5aYtUb65hozKc73MnP0/Kheti9BI="; }; meta = old.meta // { From baaca5ddd85ad58c04322364a2be0ac532f47667 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Dec 2024 21:29:48 +0000 Subject: [PATCH 25/78] kube-bench: 0.9.3 -> 0.9.4 --- pkgs/by-name/ku/kube-bench/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix index 10c6b4b8f3ec..deb2e879f5c8 100644 --- a/pkgs/by-name/ku/kube-bench/package.nix +++ b/pkgs/by-name/ku/kube-bench/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kube-bench"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-i0iSIK3nJ83bCuxIVxLBjJbBCpTU5TavmX2DTEJzG+Q="; + hash = "sha256-SkXf8zZif1l+yOSUjYpW474gYOmxifaLtj/DNK+ZNfg="; }; - vendorHash = "sha256-c4+ruUR52TcjI+Xvuv9Xt8GAyjpbEvJhqDqWSRgVGWI="; + vendorHash = "sha256-6ApPEt9SkPI5yu3ejzR1AU1ZCHmltp8Cxso6j//pEAk="; nativeBuildInputs = [ installShellFiles ]; From 09332bf97c98e1da7f9e1313b8739257934df701 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 23 Dec 2024 21:38:55 +0000 Subject: [PATCH 26/78] spring-boot-cli: 3.4.0 -> 3.4.1 --- pkgs/by-name/sp/spring-boot-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spring-boot-cli/package.nix b/pkgs/by-name/sp/spring-boot-cli/package.nix index dd6708bdee9c..b741dab8889a 100644 --- a/pkgs/by-name/sp/spring-boot-cli/package.nix +++ b/pkgs/by-name/sp/spring-boot-cli/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.4.0"; + version = "3.4.1"; src = fetchzip { url = "mirror://maven/org/springframework/boot/spring-boot-cli/${finalAttrs.version}/spring-boot-cli-${finalAttrs.version}-bin.zip"; - hash = "sha256-jmqmWlp40DE/CWzPEMfApb3OTDDb0upcePCHj1+yTs4="; + hash = "sha256-XJGopVQclKVfVXNlHj9LXu8Kt3hcfsajH5p63k6nQ94="; }; nativeBuildInputs = [ From 3517b02dcef6a2c6912b3f10948759740d28dfaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 03:43:38 +0000 Subject: [PATCH 27/78] ltex-ls-plus: 18.3.0 -> 18.4.0 --- pkgs/by-name/lt/ltex-ls-plus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lt/ltex-ls-plus/package.nix b/pkgs/by-name/lt/ltex-ls-plus/package.nix index e48bd3d4b136..08b74fc4b9da 100644 --- a/pkgs/by-name/lt/ltex-ls-plus/package.nix +++ b/pkgs/by-name/lt/ltex-ls-plus/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "ltex-ls-plus"; - version = "18.3.0"; + version = "18.4.0"; src = fetchurl { url = "https://github.com/ltex-plus/ltex-ls-plus/releases/download/${version}/ltex-ls-plus-${version}.tar.gz"; - sha256 = "sha256-TV8z8nYz2lFsL86yxpIWDh3hDEZn/7P0kax498oicls="; + sha256 = "sha256-BkVPLtyF62keDDEnET8zF7g0FqDz6UkDWI6BM8W2qMQ="; }; nativeBuildInputs = [ makeBinaryWrapper ]; From 8cd53510161e46a0c15e1352013c3263fcda1164 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 04:01:52 +0000 Subject: [PATCH 28/78] pluto: 5.20.3 -> 5.21.0 --- pkgs/by-name/pl/pluto/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix index 4ce48aceaf4f..53f70bc1f52a 100644 --- a/pkgs/by-name/pl/pluto/package.nix +++ b/pkgs/by-name/pl/pluto/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "pluto"; - version = "5.20.3"; + version = "5.21.0"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - hash = "sha256-WbXIg453VewOejX/hyGi1DEi0cSwcQ+hKUFG8Ne4cPE="; + hash = "sha256-jz1hne6Lwow1a2Ckfp4C1/gD57V2kYFdik9DQ/EkjLI="; }; vendorHash = "sha256-VkaFANSzKOpmHWUwFp7YjwvsJegcJOrvJOBNNAIxOak="; From 2390145ef5177b24d65d1afa32c52b18265d593a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 04:05:56 +0000 Subject: [PATCH 29/78] xq-xml: 1.2.5 -> 1.3.0 --- pkgs/by-name/xq/xq-xml/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/xq/xq-xml/package.nix b/pkgs/by-name/xq/xq-xml/package.nix index 4759aa760700..94571f41c3f8 100644 --- a/pkgs/by-name/xq/xq-xml/package.nix +++ b/pkgs/by-name/xq/xq-xml/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "xq"; - version = "1.2.5"; + version = "1.3.0"; src = fetchFromGitHub { owner = "sibprogrammer"; repo = "xq"; rev = "v${version}"; - hash = "sha256-Xr5k7YBx8GjrBapmThpLnPPvzEP6mcQG4mKXxZaEan4="; + hash = "sha256-KLpf4db3D+SQzbitc9ROO+k/VHggWpwZmwwhV3QVNiE="; }; - vendorHash = "sha256-UV6Z4GyeFPkiyhUll7hCFkt+iBdWAl02QdzYYX0N2e4="; + vendorHash = "sha256-LKkYA0wZ+MQ67Gox2e+iuWSgbxF0daJj7RWLA6C+v+I="; ldflags = [ "-s" From c1eba5edbbc7d4044b04b6090efa85b76d58453e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 07:03:42 +0000 Subject: [PATCH 30/78] trunk: 0.21.4 -> 0.21.5 --- pkgs/by-name/tr/trunk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tr/trunk/package.nix b/pkgs/by-name/tr/trunk/package.nix index 47a2e63112e1..abda881970ae 100644 --- a/pkgs/by-name/tr/trunk/package.nix +++ b/pkgs/by-name/tr/trunk/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.21.4"; + version = "0.21.5"; src = fetchFromGitHub { owner = "trunk-rs"; repo = "trunk"; rev = "v${version}"; - hash = "sha256-tU0Xob0dS1+rrfRVitwOe0K1AG05LHlGPHhFL0yOjxM="; + hash = "sha256-AHW686xPGCMLISrOLLfDR5g+2XpMJ+zfmWGn3fMfKbA="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoHash = "sha256-iuxACtr91qWzojKWaieAd6kk/q9j5JSD1Fa50oCKogA="; + cargoHash = "sha256-m09ZV0Z4bNyAfO6XNiDKyqMeqv2/tx4vpQnWlesCW2A="; meta = with lib; { homepage = "https://github.com/trunk-rs/trunk"; From 67bfb72264075930841bfe7c7060659a81bf5daa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 08:07:25 +0000 Subject: [PATCH 31/78] terraform-ls: 0.36.2 -> 0.36.3 --- pkgs/by-name/te/terraform-ls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/terraform-ls/package.nix b/pkgs/by-name/te/terraform-ls/package.nix index 4a1995df9445..ca0531e334f1 100644 --- a/pkgs/by-name/te/terraform-ls/package.nix +++ b/pkgs/by-name/te/terraform-ls/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.36.2"; + version = "0.36.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - hash = "sha256-XihFvQZQ+cJrFd9ly9mDVcXUDBXwndd796bterxaaAQ="; + hash = "sha256-bn4eDAR3fYioT2kB7Hp0zP1190FMFAJ1L5lYFUUwhWk="; }; - vendorHash = "sha256-/ZlWx8/6eJfoiCl6yOtotoju2LVPP6YHqjk+5WE7jzQ="; + vendorHash = "sha256-Qx18IisnEt0xr6Mb0nxjRp+ORu5xbmSJKrRCgRJFlbc="; ldflags = [ "-s" From a9db27f07c8e6c2222009aacbe047a18dc5d4b09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 09:28:06 +0000 Subject: [PATCH 32/78] prometheus-mongodb-exporter: 0.43.0 -> 0.43.1 --- pkgs/servers/monitoring/prometheus/mongodb-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix index 0b481422db39..c22a8e8dcda4 100644 --- a/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mongodb-exporter.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "mongodb_exporter"; - version = "0.43.0"; + version = "0.43.1"; src = fetchFromGitHub { owner = "percona"; repo = "mongodb_exporter"; rev = "v${version}"; - hash = "sha256-MmevWy5RJaSC1ocuuxqFYpagyjIaHBbd5PQ8HfCF0R0="; + hash = "sha256-lf5sh9ADz1L5thNsjj1EdGJGuNmlcFOMUxwOUZUf8Xo="; }; - vendorHash = "sha256-VHQdmEOCHTwszUUOF5JTbBWacgLM6MyuxAC6FNFD5PI="; + vendorHash = "sha256-c5PET4xGR2RzgOW9gUxo2JB/P1XO1JgWr2hQ/vGfk6E="; ldflags = [ "-s" From 540870a4d0b9d4ded6109d85d20a727170cecd70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 13:27:55 +0000 Subject: [PATCH 33/78] linuxkit: 1.5.2 -> 1.5.3 --- pkgs/development/tools/misc/linuxkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index bad149ffeed6..d646d96ea9ef 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -13,13 +13,13 @@ buildGoModule rec { pname = "linuxkit"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "linuxkit"; repo = "linuxkit"; rev = "v${version}"; - sha256 = "sha256-M/M4m/vsvvtSDnNNy8p6x+xpv1QmVzyfPRf/BNBX7zA="; + sha256 = "sha256-dCRTBy2Nbl5KP8dxXt+1ww1BF/gWm3PfLtSBAaVcBvw="; }; vendorHash = null; From e24aa49b5d5feffbf6946b523a7e63594d852d74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 14:15:02 +0000 Subject: [PATCH 34/78] iosevka-bin: 32.2.1 -> 32.3.0 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 180 +++++++++++++-------------- 2 files changed, 91 insertions(+), 91 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index cf1b9602799d..057e40799bcc 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "32.2.1"; + version = "32.3.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 1be9c1b82968..1f2f4aec7ae1 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,93 +1,93 @@ # This file was autogenerated. DO NOT EDIT! { - Iosevka = "0y1gsyjj0931rfhimszjcbmwkffznbhjdnjiqszg6g9wiqd3q8kv"; - IosevkaAile = "04qynqhpzcz45plpdrik4y5x2h2pz2l2jzymdb1smp3dm4f6sk5p"; - IosevkaCurly = "02qrd3j6xiz69a932cn6qdnz4bab7ycsg48dzxdwkakyympmhh7c"; - IosevkaCurlySlab = "0sc4hylp72x84f6y3sjrc0jkw5nx0hynr0swram8fs4yvddqgrq8"; - IosevkaEtoile = "0qkjivzjm3h2cwydxy5rhrk37qb5ci2bsrdmggmlv6v1syyn46kn"; - IosevkaSlab = "1bg43x2baifa3y44bwsjav5lhbn7i0g5fhvwz0c55j16sqb4rizi"; - IosevkaSS01 = "10pzgi0vhkmlnwsyc9jqjkzi4id5gmspyd1x467x3wrdjhm9zihv"; - IosevkaSS02 = "1kyciyfdlvxvi4gbn5x8921mz71nxkhpyb48mwcmqjri6h7a4hkb"; - IosevkaSS03 = "15f0khxancql140bivimg3mgn0kmzcykarrgqd0lmjqdv3iyng9a"; - IosevkaSS04 = "1ym8pynzgsm16fr2myh2z9z6dn38lny736jbn8q92ngcl6mca0bl"; - IosevkaSS05 = "0a3dkc2by23qls050ahri14sdgqclfagjhsxhhzv9cc66qvmr3xr"; - IosevkaSS06 = "09d2ir6hrzpr5vq85j4jkhqkpghjid1zp0dxinps4digbix9ylc0"; - IosevkaSS07 = "1m4mmr4px56b4fhpn77s0gf46as153c23gslhhbldj1jiyzfd1q8"; - IosevkaSS08 = "01iv4sx21f2mkg6cspkpxcq9a1pp7b897jcwnf1gx6y4r9s04zj7"; - IosevkaSS09 = "15v6y640qadq27rh5vx35ay6qj2xgyirza8182m7ypjrvnb96rip"; - IosevkaSS10 = "1b35zy0rv5kgaiwm8wqak7drq3mncbvdgqbkwrk1hrfpf9j0hxch"; - IosevkaSS11 = "0qdz0x9rbwycddq4yhmzf8daihqkpgpbn8kk0781vcfc38jayfbd"; - IosevkaSS12 = "0lq23n4n9pyrb4z2zgp8y45asb36yl2r2s80y2p5l7anjndpwczs"; - IosevkaSS13 = "13csq6ka9mhs5y2dl6l2imgldw5dm9ivjckx9ap1h90aq73ld3m1"; - IosevkaSS14 = "1hv5y0z123a3a28wxargpkw9yvrciyvb48z29viwrlm3laf14f78"; - IosevkaSS15 = "1pxh0nqnw8901d964hjiddzgaxnhhgbjsc4dv2gbs1nvfp4wz613"; - IosevkaSS16 = "1bja13nxf5iqy6kzwqjpwxrv74kdaydamk3325km1lgaca6b13a9"; - IosevkaSS17 = "00c4807ligsx29ipm75g7a3siqi4lfaf5dqjqrll5x2f5l04q4c1"; - IosevkaSS18 = "1bk0p24h0vizjrlx4dzyz4yyi1b6s9ymakckprx4gxa97jln71z9"; - SGr-Iosevka = "1vrxg8kbrm767mzrzlainfqv2prqmkwgip0ab4wd875x8lv3mq1w"; - SGr-IosevkaCurly = "0mm0bmdr9ca29096bcb4z583ivyz7qf8h6bin74dd9vvvi3rlkla"; - SGr-IosevkaCurlySlab = "0f45a6p3kgjqgyci5m7gj1bnlsdv2cif2yx8yp1npgqdyyaiq8ah"; - SGr-IosevkaFixed = "1jfwj3w2rmhf00l628c9813yrx65cvjbl2q74xmwxwp4m7gjh7m6"; - SGr-IosevkaFixedCurly = "05230lnw2p7hz77bgch20fibb2kvn1jqp0zl92vdim3f13n7yfv4"; - SGr-IosevkaFixedCurlySlab = "1xqv070hfzng7bdi7dwhypi8vx4b7nlkz2d65gsvfxj1vk229c5l"; - SGr-IosevkaFixedSlab = "14v3fawjijzzn94zgybkjkgz6bw2g4hqwxjz0rwflvr1w5m3fh1z"; - SGr-IosevkaFixedSS01 = "1n221fd0ln91q2p506c2rgfc46xhgxksaajnbwan5hlll618y90v"; - SGr-IosevkaFixedSS02 = "1zm8kzn2layp17glbs7l6243kmvmfz1cngbrgj3iwgraman6ac62"; - SGr-IosevkaFixedSS03 = "0bgmgdipk1xysc658ngdhqyy6plfkcb4vbmq2vk8cjz8ixk12mh6"; - SGr-IosevkaFixedSS04 = "046yjmmir4cxyl8mk3wyp3zy6rnm85mzxcpy8gmd9yb4qnbq9nm1"; - SGr-IosevkaFixedSS05 = "106ii42m4wpffpynd35r97ks5q6a8py3g1h8k8q5919kxqakrfnh"; - SGr-IosevkaFixedSS06 = "1g0d5jhb76g1x50z8qg934s5j97c60fg1aqga1n1dmqvmm0zmdwv"; - SGr-IosevkaFixedSS07 = "13z7f78p01v0225rq49zv8wq7p4g303rj17zh8y96ggyajbhfn6y"; - SGr-IosevkaFixedSS08 = "1sbkhmzdlh9z3zfmy1mdag4nccb2ndvz0lnli2hsk72iszjsk325"; - SGr-IosevkaFixedSS09 = "1fkg5qhdx19v9k56kbrf69sfg87skc0h57mpz7jdiwzwpzlqv79v"; - SGr-IosevkaFixedSS10 = "0smg99rxh27b8i7p07r0gmywpxlhn75ln8ccf18jlzv4baa12pn7"; - SGr-IosevkaFixedSS11 = "07winxlw5di447j0yjxg7fxyj7vl1iwa766rx44xj9vz34s62v9l"; - SGr-IosevkaFixedSS12 = "1l23f8d0gbddcawx2sdk2zcz8pqkj03gi9l0bw05pig72i3ipls6"; - SGr-IosevkaFixedSS13 = "1b7yvrmfnspxa14kwb6rinqx9h712iadii4yf8v6z14iss6vrk87"; - SGr-IosevkaFixedSS14 = "0fxwsss5mrizrg426gn1g0aj4imnr0ghkfbyx081hjbgn9569mid"; - SGr-IosevkaFixedSS15 = "18xr3100ixq6p5s80ixlrdxna21cy9hqw1x6vypyvbqz9fc3nakx"; - SGr-IosevkaFixedSS16 = "05j75njl8pi54kdp0hbaww4hm9mpyswl4msk0vma1v1jjasvggxp"; - SGr-IosevkaFixedSS17 = "0xqp0dy1srqlzf92fvg45msay8r42k0bcfv04hsii87h6xq28q6i"; - SGr-IosevkaFixedSS18 = "0rs2vwr3v6wy471cd604rm5qc5m35gg1pyna2l3kch1vrcjcvfas"; - SGr-IosevkaSlab = "1g7aidcc43ibc7jwwmrlbwj2v0yq34cb5rs3q76bhyl498hizvn4"; - SGr-IosevkaSS01 = "0wjsjv9g2xmvw1338lah688lj7hw8dlfn2y6x0pafffach2a42cs"; - SGr-IosevkaSS02 = "1l7l4gpi0vk4d1rx8j2fysfwfdq8ifkx88qh610z3lqd9lia25ik"; - SGr-IosevkaSS03 = "1pal6kg3dd4rq5vyr22ngziqrbs48prvz40jaynb78nd4v5hfm96"; - SGr-IosevkaSS04 = "0381kgbx3l26wqi9i9fvsprqjxlvj2jfczni4qsiw4vczdiclkg8"; - SGr-IosevkaSS05 = "0fzgncaln6il7zp5bxx47kygawkpaibvcchznpfr1kmb6i8mcy4a"; - SGr-IosevkaSS06 = "0yh9gpzddwi8j752h7d9k4xmqp2092xhjpfd6qwzs98g180czqyx"; - SGr-IosevkaSS07 = "1i6rnbddc7r69133y1pn44hng461hcdanl2xksjws49wcyhrdclz"; - SGr-IosevkaSS08 = "0d4j6x79nlsrb1fpg52bscxdl8bsfzp2qjr3lmn1kph5n12g91an"; - SGr-IosevkaSS09 = "1lmqi80hqb3nx5nl5w0fdbakkqp0w261zh19m48yii2wq8bl48sj"; - SGr-IosevkaSS10 = "083g92r66mlklsh4xn6v650p1czcg0vszl758861jmsqrj1irknp"; - SGr-IosevkaSS11 = "006fybldx9iz48yc1ndwnhxjdqjy9k1raxibcdgdm73n0y1fiwg6"; - SGr-IosevkaSS12 = "0r2w6wk82yws1qnvipia5srxrvxcp17hvy1zzbs7756h9xq2qyjv"; - SGr-IosevkaSS13 = "0q7z5a8z9dwvi3ax6f2zix020icx78wz8xq6i7mb1p9v5mr7vh22"; - SGr-IosevkaSS14 = "16ii7aynq3q1k1h22q0hz5jxxhrwx9w06c7jfyqcmc4166xmz1bc"; - SGr-IosevkaSS15 = "1lbi138qxpwbasl10447ql23j26ib0rsmvb3db54rdd458yhc99b"; - SGr-IosevkaSS16 = "0xq8fnmlz7v6jamsqfvdg81vry8ccc0164nzl93rfj7i6ri0jvg0"; - SGr-IosevkaSS17 = "0j3gzn6mghyjndzkxyrjbgpr5284hpwr9b9aifq0m4ri1pmsbwnn"; - SGr-IosevkaSS18 = "0b3hgfl4r5s1f5i7n401yp22glbjghkh2wcx7k4mn8qrci7lhvwv"; - SGr-IosevkaTerm = "0ijcrzh91pinf83wdqdk42z3raas2mjw2p872xgkkx0wpzy01vbn"; - SGr-IosevkaTermCurly = "0s2g9dpnc1nw7f9cpgnw6yjfm71c4q63qvmf5ld35sp4h21qgc3w"; - SGr-IosevkaTermCurlySlab = "1kndi5p6w7pm64621v9bjkmk80r1wq5p8ihxmnzv7va84r43sjdy"; - SGr-IosevkaTermSlab = "0ah7vn8ycrwxvarpmxjf07spky9r3fa3qvjy38nvagwh3ppx0xxd"; - SGr-IosevkaTermSS01 = "1c36199qjdvcs0h237xy0pvcbk6rjkrrsnq35k432y7b1jp9nyy2"; - SGr-IosevkaTermSS02 = "0b16096xihjy1ny5k35rg2nm73fpkk9yb05gf2i8b34nwmysif8m"; - SGr-IosevkaTermSS03 = "17kq2cylrgccqkmzjg03m3apib4z0zjs25sp9sdx2wahjh07bw6d"; - SGr-IosevkaTermSS04 = "12qsqpp3jlw6961mdal8ihx07x4lb8c8ckiwaks00y53shrknq6s"; - SGr-IosevkaTermSS05 = "0yy8ls7vvsj5h411cg1x7ys1va1qp1dkza8zrr562r04q671748m"; - SGr-IosevkaTermSS06 = "01dd1pbfj0ga4h1bvzk8z16hw5syc41appbdc6ysr3rcr982p8as"; - SGr-IosevkaTermSS07 = "1181rabk0abiny2ifs3v0431s8i9zm8ins7pdfk1qlgjfx0axkwb"; - SGr-IosevkaTermSS08 = "07az3bnr0l7igybcm4a0mhh6l0disvrih61zdvm2c2nx8308bl4l"; - SGr-IosevkaTermSS09 = "0fssz0j9nlph94hqzwgiqs1hdbw8qkr5f442hw0f1j1fmkbr8h41"; - SGr-IosevkaTermSS10 = "0847d38s6dpkagymna374wqnw7bg05idj370bgjnk7l6xqbwh096"; - SGr-IosevkaTermSS11 = "1d5in68yzllcq6bkmdyws4amysh7fi8i9mvphdd4sdw26abwpyw6"; - SGr-IosevkaTermSS12 = "0wdax0f8w1qrczaa9dyg9b2jkl37vnm0ms4bwa7gzifg1v6rkl83"; - SGr-IosevkaTermSS13 = "1vh13gc5dddjkb4qmdr1dpq2vqwbf2xggpn6mdj6s2my1irgqhv1"; - SGr-IosevkaTermSS14 = "1bcjhxpdl0m2nc895rg4ha90mpakz4l8xdhhlm88fvdakjp3wa53"; - SGr-IosevkaTermSS15 = "0mwxzjdrrnl85q3y97hlsb63n2rl6ysvcpi2yf0828f81x9xgldj"; - SGr-IosevkaTermSS16 = "1cglchggcb49p6v6irapkx9dwdic0qalrpk447p6lg2vhv0ka676"; - SGr-IosevkaTermSS17 = "00d0cydhjxplyavp47bsaijrxb06hnriqili5mq8p0g01r1fzxqb"; - SGr-IosevkaTermSS18 = "1n6mc2hfkgyb0rqffnc65i07p94p61sf0yf9vr8k6ir7m7fb30n9"; + Iosevka = "0x9h41jhhxgafad7zc39jb4la30sxkqcz1m4l2har9zfakc3jhnm"; + IosevkaAile = "1rf70nsqkza1zwzpl2i015rhxs2wqq9msvkjhghg6scfir2bmpky"; + IosevkaCurly = "0hqn94k9vh9ds077m4gmdhdhcg1x8libb6cp1c2iqgy7nyc9qywd"; + IosevkaCurlySlab = "18ya3c8fw0hwifxdkyyfrnqybpwhf21ir3lhajs0x772ifs7xs22"; + IosevkaEtoile = "1ycwyfyg1dk47mxgnc729liqnffyk2f5f0vzavdamydfdqnd9wrq"; + IosevkaSlab = "1dfgbx0clsz7dxy32n7gzza8bx63gfq2j77vyfqwi9201qbmsyqr"; + IosevkaSS01 = "1x4fayq749lcn857v5kls4kizdn2nm7sv3n5r9ac3x1vhnjp03c9"; + IosevkaSS02 = "0ghwab6cx958kk5znc8d59bkjw1pfif3cz583j99n2jyd524y6bf"; + IosevkaSS03 = "04g41ds76nkva8ai23xbq62szfdvrn659hrn0bjn1f754aq921h8"; + IosevkaSS04 = "1c34cbmnmfnss9sncrkh92n054q8lhdpn7qvvi0p3kq1xbg17iny"; + IosevkaSS05 = "03ii0w908k9xvgal7ja6sw3bmc3gnvhkgd6j023whrcjis77ryi9"; + IosevkaSS06 = "1hv41jn17zacmfck1r6kc905i0aikz51xwx4zdnmmqq0xyyxdkrn"; + IosevkaSS07 = "0vfys80wc4rznynvv8zck8h41nfz5ig01by03f6m8qd5fnjdbhw1"; + IosevkaSS08 = "0ramm4jd6wfkfnwymfqpcgapbrqcsq1irfh33mkzamj35racnkgm"; + IosevkaSS09 = "0f0y536nfmbkz5b57wm978ywrn5qc3f1wzfmwpdc7h3jqygakbdc"; + IosevkaSS10 = "030blnwf75psiiqi5haypwvp9f9jnh5h24fz9x6swxx23x6pl6gn"; + IosevkaSS11 = "06c9ka1ca57srnn81ahbmnvimcyb090izw22yrkkyd6nnf59ma34"; + IosevkaSS12 = "11jv4xy9xva97v1lhz7w8c1qj9yb69a7l17aycdq1ma3mx73dpk0"; + IosevkaSS13 = "07l3adjiz9i7hqfs8174db1283m2ly6nn0c91njx84fm541sizfn"; + IosevkaSS14 = "1862fcq9zxdm5dh2032bvs2l2wg3ryrcsyjz0addgih7arp4gzfd"; + IosevkaSS15 = "111pj1l1vmfcpj1jcb1cpdl1xbm2pjvmlvpmxbn8qh3ms2cvdgra"; + IosevkaSS16 = "14dk6j8dw8scd0kn7hazld41731fgf5ym6ylljdq4jcgi6kygsiz"; + IosevkaSS17 = "0ci8l5i2iwb8yjdxdzs41204x3zypsbcdn7a4sgjwc0fcg6ln89m"; + IosevkaSS18 = "1wkwfdlz0kxymiii4i1wg1kiwbksnqkdpd5xjlg5abixj9dg2kcf"; + SGr-Iosevka = "1q3x9b9h7daxfhz56mnlgsbcl3a4sr3h87f04dl3cxqxwmf1c65q"; + SGr-IosevkaCurly = "0xplpj2na2427znwphrifyh5firc2z1pdq6sf7rc5apfizydspxc"; + SGr-IosevkaCurlySlab = "1jbsq475fg0bmjjbrl0ylxzpi59cn9wm00693y3f2n900lrbbd6x"; + SGr-IosevkaFixed = "1kw90cqj9fkjhhgjpi2pmjjxljhirfk68jz2k07b213qvg1ca1ab"; + SGr-IosevkaFixedCurly = "1kpvimfga2harfb13i1gp4h5nl8qffa6a4dg9fcjwi56j9p1r0hq"; + SGr-IosevkaFixedCurlySlab = "03r9h4gh7g7b80pwddm9vvldps9b32wfzd4bysmgn918wqiqkcwh"; + SGr-IosevkaFixedSlab = "0q9l1djgsg15qhwl11kxdckrds05pkr6w34048r2hdxgvzr7f6gm"; + SGr-IosevkaFixedSS01 = "1acc8cv14vv21p60iv0ldpmkd7a0hzpi6s1mw5z1zilnrm8swbfk"; + SGr-IosevkaFixedSS02 = "1kp2b891wna0k4y8k40hdmm34a0p7788ja2ip9h7xvc2n1g64yl8"; + SGr-IosevkaFixedSS03 = "1vgb6vdwc2kmh0219rpzqhg27zamka801zv7gm9ic24hfizy713x"; + SGr-IosevkaFixedSS04 = "1g49bqkzsjdb5bli3pxh1rbmr8n6c0dxn2vdxjachxcz5mf4ja9z"; + SGr-IosevkaFixedSS05 = "1sni2mxlwsbpvgh0rpjmr3ifjq4awgsc44s3yjiqw0y8wmd90qmg"; + SGr-IosevkaFixedSS06 = "0nsv3bxjbm2r6dnva74d67f9r3k42jdvcjfrdgxkpwgydrcrkar7"; + SGr-IosevkaFixedSS07 = "0qxx9mmg5i7rgqwl7zy3m11bhrqr6akv4jqlns4119clfq1bh1ip"; + SGr-IosevkaFixedSS08 = "0w9v8slpp9q2ywn5absc97zqmg3f55vfd52rrv6rcc7jkd7zsz72"; + SGr-IosevkaFixedSS09 = "19js1wah54mbkpf3vjqrxwk6lf2y7nq86dc5xxrj015yimkzsbsw"; + SGr-IosevkaFixedSS10 = "03vvjfm69mvm0873b1ws93vkjbqjzd7f3kg65h7zwxg6r9l20ikc"; + SGr-IosevkaFixedSS11 = "0jcwgblwx0bhvfibnlizsgwqryjqhyj80cz4dqhhrjlviirm17v3"; + SGr-IosevkaFixedSS12 = "1pm1kmlmpaz5nnkbk4s0n12am134kb5mh2b6rhs104dkngf1zfkf"; + SGr-IosevkaFixedSS13 = "1h3v8c7qsf7iyypvbhn7qsmm0a7mfyyh7i0p4f3pvkfdpb1sd509"; + SGr-IosevkaFixedSS14 = "1fpwrck8dhha5rkrbz7dykyqrlg46fgih3sn1c36s7j737j69vch"; + SGr-IosevkaFixedSS15 = "16iwab1gpc3xzgxld8km43n9dm6jxv0z39zgyxknw7xdxkwy247z"; + SGr-IosevkaFixedSS16 = "0di6sr995gjadky3nd6k68i88cl745i2awq69cnv6akvcyy53fhd"; + SGr-IosevkaFixedSS17 = "1p7qm49ww201yaddc0m18vjgp5xjn69cpmg3lsxav4bapf3yq01q"; + SGr-IosevkaFixedSS18 = "08858lgilwqhrvpzciagh95a2cqc4bfipdyidl9bj718z67vwmgq"; + SGr-IosevkaSlab = "10y6ykq3aaki5m4j4kmsv5y79li3l9bqisrwbvzw6vcs4895z6qw"; + SGr-IosevkaSS01 = "0mdkm5fb6srxd9bmw41a1rglnap0fmfv78anzff6w0g4azvxlwxj"; + SGr-IosevkaSS02 = "1z6bf14qcx5qkhfd99g0p26flin8wqmvlkqmxl32r0697a1yhaqm"; + SGr-IosevkaSS03 = "1jvf58qnx89f90h1gwlm8nzfb4ab1wv6z39p9fzawcrsk70fj29q"; + SGr-IosevkaSS04 = "11akqjhjc1nnmc1b0x05v78b3pr2mq4x1w9ldq07mq088cp9n1v8"; + SGr-IosevkaSS05 = "0dn1d4gkgfqars6nj84lbic3ybld3h0h321kkrbl4s5wplli264k"; + SGr-IosevkaSS06 = "1lxjvgipr4w7865xvcrx5vl5w40c9bz91rb7wm6lnxs9fljg9nim"; + SGr-IosevkaSS07 = "0kyb0qyvq7z0m1z8561w6bkz73hfhnxp4hshx68pcbvyh3ah25hs"; + SGr-IosevkaSS08 = "07f1qy450v6k9dn2l15b8xfdhkx2ri773lnld2jv482wm8nqn54z"; + SGr-IosevkaSS09 = "1gkxlaip18fnxkcdf6iqh7in0qgjk4kvjqky3qjwhww3nbkww5cl"; + SGr-IosevkaSS10 = "0g25n440ad8n2xxc4m9mrjfi5lf77jhjg9hld26w9ir5fhbg5gd9"; + SGr-IosevkaSS11 = "06xgh13qsmfjzk925s30qwrvdhaxk3f04qrsyb12fyns7r8q39k2"; + SGr-IosevkaSS12 = "05s9x6h609mrmq9dn1ca25crbb2nkf4v3av0mb7phc9narp2nl9d"; + SGr-IosevkaSS13 = "1yz26cgb1mcbqhn2x85yh3hhivkdmrxpnkkqh28kqhp6yajb7cma"; + SGr-IosevkaSS14 = "0ql72ic7m28p1k5c2zbrgpdllsciggcm26iylxxqvirsvrxpa4gg"; + SGr-IosevkaSS15 = "1j3xib3szygxjx658jj1kzn8sn5qyyw14w7ayz9zi5dr2l86cnzy"; + SGr-IosevkaSS16 = "0m48y236m5incc8p45mq7rryqyisjfrpihym7fsv10hylvfmjfp4"; + SGr-IosevkaSS17 = "1c7hwxjzjcdil0vl44pndsa89rlp4i9p254zsr7qb23frjrd1jn5"; + SGr-IosevkaSS18 = "0m09ilj16p2fl6mcf6hx2v3v2zshr1fwm49jvhcc1l72niafm2wm"; + SGr-IosevkaTerm = "0n91a4icwxxbg3nhr4jc0ssjxf70wh7r5k7rhacha80kbb3n5yai"; + SGr-IosevkaTermCurly = "0fbkad52yi2svh309klhr36pf79avp62nnh0sgh3pi5ss0fs1msr"; + SGr-IosevkaTermCurlySlab = "0pzffbjjb8rm1cbc8v6qpl0xavgq0hdfipi3fafw5grl79hiz266"; + SGr-IosevkaTermSlab = "01sif6fvszbsjq35gpydiy450n3l9s6zcgv16yg0yl7qpkcdjnyj"; + SGr-IosevkaTermSS01 = "06x65513mr1xjqhvq72l28ki341v9zy51006pjm7q47gryvj9z9g"; + SGr-IosevkaTermSS02 = "1wxryjk65idhkjbzamxr82zbqhh5vzc6kfi8f4zjsqi5mvd3x1fc"; + SGr-IosevkaTermSS03 = "08vdzxy4rvpsdn2q1014ma4v9sk7f75i4633x2d3cysj08yq62qg"; + SGr-IosevkaTermSS04 = "143wf50dfwn734zmq69d9nm98ynhicv0685d8s86kdn9lwrviz6a"; + SGr-IosevkaTermSS05 = "1myql01syc1d9i61jrfdkk6j515dj6v01dkn8fcn1rcqkavz0r6j"; + SGr-IosevkaTermSS06 = "1sha89llc72n4jf76yqh87pa2dx0rqwz1pq2v2gcljlmimmvknki"; + SGr-IosevkaTermSS07 = "1ksd28c7i047ms01jih3xfkq39l1dvfmrr8zb994363qrxa8ycp8"; + SGr-IosevkaTermSS08 = "02f35fkr31zm5z7zd081v2slv65f584lymbf5a6hjdpvf5bl42br"; + SGr-IosevkaTermSS09 = "130xq18wwkbfr8myvga9zrpwf3y57ca5943ff1j88prmsq4m2gpx"; + SGr-IosevkaTermSS10 = "0wj8k7a0ddgysrdfwqvcr615ch4d55rd22cr96jwmindx0k86az3"; + SGr-IosevkaTermSS11 = "0bv4jxpq43gp8y6wbml06zbdzwb7zzk3l593c1zq41vs28lk6qb0"; + SGr-IosevkaTermSS12 = "0nijgws4mlv6sp34l9fqlrk78krrbc2zxzkbbn7a0yalpnzddilz"; + SGr-IosevkaTermSS13 = "04i434zafahf1wkdj87zd8fdvpi7nc83h00d844afcx8rdamm3fq"; + SGr-IosevkaTermSS14 = "0qsb5jdq4b0p749fksqvj6givkn8ba5lqpm93rjrf2xxqv1bacy4"; + SGr-IosevkaTermSS15 = "1j9jcr1823vw8bfvvvlw1v1sar14csmmwwcam4m69p9f3yxp8l2c"; + SGr-IosevkaTermSS16 = "02v6qb7j0rnzm87mx4mvhkfj2888752a850sflsfv97fk5g4dnxs"; + SGr-IosevkaTermSS17 = "1d1b5h8z21yqqzppnfwx22q3938a9r5gdkr5183608jrqhwnjlzr"; + SGr-IosevkaTermSS18 = "1jzihaabkj33bxp2wxi6mndkxwfiv153i3941hmh5p6gmbm386a7"; } From ac5b74c44f2d26ec6b27f6ef429833d83b81a9ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 14:59:52 +0000 Subject: [PATCH 35/78] bkcrack: 1.7.0 -> 1.7.1 --- pkgs/by-name/bk/bkcrack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bk/bkcrack/package.nix b/pkgs/by-name/bk/bkcrack/package.nix index 3dd3bb22d926..720808a2342f 100644 --- a/pkgs/by-name/bk/bkcrack/package.nix +++ b/pkgs/by-name/bk/bkcrack/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bkcrack"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "kimci86"; repo = "bkcrack"; rev = "v${finalAttrs.version}"; - hash = "sha256-smDmnqmYuFT3ip3ULQfiiF5YxkwzPwPYBujqq9GUyMs="; + hash = "sha256-88zAR1XE+C5UNmvY/ph1I1tL2nVGbywqh6zHRGbImXU="; }; passthru.updateScript = nix-update-script { }; From b3eb30da65321a835af823ddfea46bae9bb72b7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 15:27:26 +0000 Subject: [PATCH 36/78] wgcf: 2.2.23 -> 2.2.24 --- pkgs/by-name/wg/wgcf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wg/wgcf/package.nix b/pkgs/by-name/wg/wgcf/package.nix index 361083c5bfb3..58aefaed241f 100644 --- a/pkgs/by-name/wg/wgcf/package.nix +++ b/pkgs/by-name/wg/wgcf/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "wgcf"; - version = "2.2.23"; + version = "2.2.24"; src = fetchFromGitHub { owner = "ViRb3"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-zASb21C3GX4wQGf5V5Y+rKwq28S3CDi0gh696lspVnM="; + hash = "sha256-BtZvR+dZzauByQR5+VWzh6tOgAQV1sXfr0ThOy05uRo="; }; subPackages = "."; - vendorHash = "sha256-ihcIEoVNSPJzJGeH2bRot4fldIhZ0r/yuYU6Jp9F1Eo="; + vendorHash = "sha256-txE00e8n9JJ89G1Exp/k8LTv36+MkGduCjqL7mHXuoQ="; meta = with lib; { description = "Cross-platform, unofficial CLI for Cloudflare Warp"; From c4ca3376f4d6b855444459cde218e79edbafa063 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 16:43:56 +0000 Subject: [PATCH 37/78] sendme: 0.20.0 -> 0.21.0 --- pkgs/by-name/se/sendme/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix index 13760d2ff62d..a86f9527e44d 100644 --- a/pkgs/by-name/se/sendme/package.nix +++ b/pkgs/by-name/se/sendme/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "sendme"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-wnQ2NO+s6HumdxpO/qS/UeVdHgk9MvE6jpiSiBO0EIg="; + hash = "sha256-t6861ct4zGqm4MuQGVIyGUlRY+ZhojKpbCYbip6Uoec="; }; - cargoHash = "sha256-5H/AQBPNSE5J+NQsSFn0z9dfG0ssxungpFJR220scgY="; + cargoHash = "sha256-nYdJbuBwW66uZs3gK05cRlQni0vT3BNlohaysYmddhQ="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; From a9baae6151da9503b3ab0425107374714066be4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 16:49:58 +0000 Subject: [PATCH 38/78] dumbpipe: 0.21.0 -> 0.22.0 --- pkgs/by-name/du/dumbpipe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index b9ee61768ef0..91e2e870081b 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "dumbpipe"; - version = "0.21.0"; + version = "0.22.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = pname; rev = "v${version}"; - hash = "sha256-WJwjxVtv022Qm1NUnibh2jq1g0P/hi0HjeA9l7fMdRw="; + hash = "sha256-NNSR8qAikwXC0bJ4jGQQ2gZZmgPin5M6xAaY2YhuBvw="; }; - cargoHash = "sha256-oq8jWRFVEB9sMZ7ufke5D1BMpGms8WJWVL/LGV+g/GI="; + cargoHash = "sha256-yAz/VjdS4FeKKM9vjOPcASGByNQp2StvrFHwJnk2YUg="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( with darwin.apple_sdk.frameworks; From c62f9479d92e717e4eab0e35e8f67c6fc01b1049 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 18:05:50 +0000 Subject: [PATCH 39/78] discordo: 0-unstable-2024-12-12 -> 0-unstable-2024-12-22 --- pkgs/applications/networking/discordo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/discordo/default.nix b/pkgs/applications/networking/discordo/default.nix index 8162ba9e60f1..e798685a1ab1 100644 --- a/pkgs/applications/networking/discordo/default.nix +++ b/pkgs/applications/networking/discordo/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "discordo"; - version = "0-unstable-2024-12-12"; + version = "0-unstable-2024-12-22"; src = fetchFromGitHub { owner = "ayn2op"; repo = pname; - rev = "c97307d5425ba0fef24f0bdd5b9d63f660e11b20"; - hash = "sha256-I2rO0PKtxQUiyaAt4BmE4zvOmqShbydGwWbPmnzUjHY="; + rev = "9f15a6342413f68531402b8aeb5ed272159fc370"; + hash = "sha256-8VBw7DsX/xnNkfiIe8jiG2oXjIp1tNT6wy6eTDBZxUg="; }; vendorHash = "sha256-UTZIx4zXIMdQBQXfzk3+j43yx7vlitw4Mwmon8oYjd8="; From 20fbe9ecfdbdef1648bc3e9ba0b80aea0ea0b882 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 20:48:21 +0000 Subject: [PATCH 40/78] bitwuzla: 0.6.1 -> 0.7.0 --- pkgs/by-name/bi/bitwuzla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bi/bitwuzla/package.nix b/pkgs/by-name/bi/bitwuzla/package.nix index 2f797610eae6..4c3a3b718727 100644 --- a/pkgs/by-name/bi/bitwuzla/package.nix +++ b/pkgs/by-name/bi/bitwuzla/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bitwuzla"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "bitwuzla"; repo = "bitwuzla"; rev = finalAttrs.version; - hash = "sha256-auW+YeUCpl7SzVAMTyHxrWh6ShwElq6wTEP7Qf2M7jk="; + hash = "sha256-S8CtK8WEehUdOoqOmu5KnoqHFpCGrYWjZKv1st4M7bo="; }; strictDeps = true; From 1c5316a00d6a62dbdca0d34e81abf90a6db15d7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 21:48:31 +0000 Subject: [PATCH 41/78] micronaut: 4.7.2 -> 4.7.3 --- pkgs/by-name/mi/micronaut/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/micronaut/package.nix b/pkgs/by-name/mi/micronaut/package.nix index 8341e2ada417..74392e4a4db2 100644 --- a/pkgs/by-name/mi/micronaut/package.nix +++ b/pkgs/by-name/mi/micronaut/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.7.2"; + version = "4.7.3"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-oyLJ3PGXT7/PDtXiPl0vX/jhaaYavwtoxuFPRLdGV8w="; + sha256 = "sha256-rCGJnZ+WD0chYVa6XqkhHJqJUQKw2K+AebzYSftAsOk="; }; nativeBuildInputs = [ From 83c72c7305c29d6ea6d023568484e8a51d77ecdf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 21:48:59 +0000 Subject: [PATCH 42/78] nsc: 2.10.1 -> 2.10.2 --- pkgs/by-name/ns/nsc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ns/nsc/package.nix b/pkgs/by-name/ns/nsc/package.nix index a9fd24309c11..c699118ca75e 100644 --- a/pkgs/by-name/ns/nsc/package.nix +++ b/pkgs/by-name/ns/nsc/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "nsc"; - version = "2.10.1"; + version = "2.10.2"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-8HFlWrkDgekW/0IV9LQdn68vygFq0QtR6p4xyJZwAw4="; + hash = "sha256-F/9yAF1vXG4eWMmS6l/qWqlEV8YkS7nihHN2vK3JFbE="; }; ldflags = [ @@ -47,7 +47,7 @@ buildGoModule rec { # the test strips table formatting from the command output in a naive way # that removes all the table characters, including '-'. # The nix build directory looks something like: - # /private/tmp/nix-build-nsc-2.10.1.drv-0/nsc_test2000598938/keys + # /private/tmp/nix-build-nsc-2.10.2.drv-0/nsc_test2000598938/keys # Then the `-` are removed from the path unintentionally and the test fails. # This should be fixed upstream to avoid mangling the path when # removing the table decorations from the command output. From 247d47909ab1e7790a613a66712a654d0cc55aaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 24 Dec 2024 22:59:22 +0000 Subject: [PATCH 43/78] grml-zsh-config: 0.19.8 -> 0.19.11 --- pkgs/by-name/gr/grml-zsh-config/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gr/grml-zsh-config/package.nix b/pkgs/by-name/gr/grml-zsh-config/package.nix index a8ec04dfc939..fb15cd901012 100644 --- a/pkgs/by-name/gr/grml-zsh-config/package.nix +++ b/pkgs/by-name/gr/grml-zsh-config/package.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, lib, zsh, coreutils, inetutils, procps, txt2tags }: stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.19.8"; + version = "0.19.11"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "sha256-Tx9u0mH3hFYmyKGAmI5lLxrau/tmE9/BaU43gSr7iFw="; + sha256 = "sha256-plVyzuVFw7wxFlhfCCjZe2QqkytTgUvsxrIdB7nv66g="; }; strictDeps = true; From 89e79d58769436a8cfd0d80ae28012d51134f2f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Dec 2024 00:34:55 +0000 Subject: [PATCH 44/78] bazarr: 1.4.5 -> 1.5.0 --- pkgs/by-name/ba/bazarr/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix index d08dfe0e14a9..0e4cc9c4e9c0 100644 --- a/pkgs/by-name/ba/bazarr/package.nix +++ b/pkgs/by-name/ba/bazarr/package.nix @@ -17,11 +17,11 @@ let in stdenv.mkDerivation rec { pname = "bazarr"; - version = "1.4.5"; + version = "1.5.0"; src = fetchzip { url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - hash = "sha256-BV+ON+SavPc0ZUlIk6tlsvmWub8TiYSSJSRutZb1q+g="; + hash = "sha256-Q/KlqvVWhegSxkxHls0WwCClaQwkmLAfuzfi3X4xgAY="; stripRoot = false; }; From 73a527ae79c8450aa9b29b7235874d672837590d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Dec 2024 00:49:51 +0000 Subject: [PATCH 45/78] eclint: 0.5.0 -> 0.5.1 --- pkgs/by-name/ec/eclint/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ec/eclint/package.nix b/pkgs/by-name/ec/eclint/package.nix index 6480efde0136..3928cb5ef5b9 100644 --- a/pkgs/by-name/ec/eclint/package.nix +++ b/pkgs/by-name/ec/eclint/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "eclint"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitLab { owner = "greut"; repo = pname; rev = "v${version}"; - hash = "sha256-x0dBiRHaDxKrTCR2RfP2/bpBo6xewu8FX7Bv4ugaUAY="; + hash = "sha256-XY+D0bRIgWTm2VH+uDVodYeyGeu+8Xyyq4xDvTDLii4="; }; - vendorHash = "sha256-aNQuALDe37lsmTGpClIBOQJlL0NFSAZCgcmTjx0kP+U="; + vendorHash = "sha256-4bka3GRl75aUYpZrWuCIvKNwPY8ykp25e+kn+G6JQ/I="; ldflags = [ "-X main.version=${version}" ]; From 429a95e3c5071f11487d59048945276b54ce3425 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Dec 2024 01:44:07 +0000 Subject: [PATCH 46/78] plumber: 2.8.0 -> 2.9.0 --- pkgs/by-name/pl/plumber/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pl/plumber/package.nix b/pkgs/by-name/pl/plumber/package.nix index febd8ca76fb4..1c838f2456db 100644 --- a/pkgs/by-name/pl/plumber/package.nix +++ b/pkgs/by-name/pl/plumber/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "plumber"; - version = "2.8.0"; + version = "2.9.0"; src = fetchFromGitHub { owner = "streamdal"; repo = pname; rev = "v${version}"; - hash = "sha256-38tLlFeQtXIiHuQa9c/IfIYbyf+GrOsERAdWQnHSeck="; + hash = "sha256-0pyeCTkmS7gG51Xm4Gc62p+I5DRUA2F9tPHaZjO+/WE="; }; vendorHash = null; From bd7512fd1bbc355c3fd71c6c3160371b694926b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 25 Dec 2024 15:12:38 +0000 Subject: [PATCH 47/78] todo-txt-cli: 2.12.0 -> 2.13.0 --- pkgs/by-name/to/todo-txt-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/to/todo-txt-cli/package.nix b/pkgs/by-name/to/todo-txt-cli/package.nix index 926264480beb..29c2d2487f6e 100644 --- a/pkgs/by-name/to/todo-txt-cli/package.nix +++ b/pkgs/by-name/to/todo-txt-cli/package.nix @@ -4,7 +4,7 @@ fetchurl, }: let - version = "2.12.0"; + version = "2.13.0"; in stdenv.mkDerivation { pname = "todo.txt-cli"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz"; - sha256 = "0gni8nj3wwdf7nl98d1bpx064bz5xari65hb998qqr92h0n9pnp6"; + sha256 = "sha256-07klQ0ApqsISITwQP7ZXOk+WDHTdRno++sm9mv6J0V8="; }; installPhase = '' From ee6835bf5995e7f23a3f7370dcbd3cb4aa617282 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 26 Dec 2024 03:13:36 +0000 Subject: [PATCH 48/78] mani: 0.25.0 -> 0.30.0 --- pkgs/by-name/ma/mani/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/mani/package.nix b/pkgs/by-name/ma/mani/package.nix index 44be4bc8c34f..395328e94834 100644 --- a/pkgs/by-name/ma/mani/package.nix +++ b/pkgs/by-name/ma/mani/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "mani"; - version = "0.25.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "alajmo"; repo = "mani"; rev = "v${version}"; - sha256 = "sha256-TqxoU2g4ZegJGHrnNO+ivPu209NDFcLnxpHGj8pOA4E="; + sha256 = "sha256-LxW9LPK4cXIXhBWPhOYWLeV5PIf+o710SWX8JVpZhPI="; }; - vendorHash = "sha256-mFan09oJ+BPVJHAxoROj282WJ+4e7TD0ZqeQH1kDabQ="; + vendorHash = "sha256-8ckflry+KsEu+QgqjocXg6yyfS9R7fCfCMXwUqUSlhE="; nativeBuildInputs = [ installShellFiles From eb46f107af50a54d18a9dcc6c8f9327e05507941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Dec 2024 17:33:05 +0100 Subject: [PATCH 49/78] nixos/hydra: fix hydra-compress-logs choking up on quoting when using zstd --- .../services/continuous-integration/hydra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 45d6b2428a46..456bd136d1d9 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -515,12 +515,12 @@ in '' set -eou pipefail compression=$(sed -nr 's/compress_build_logs_compression = ()/\1/p' ${baseDir}/hydra.conf) - if [[ $compression == "" ]]; then - compression="bzip2" + if [[ $compression == "" || $compression == bzip2 ]]; then + compressionCmd=(bzip2) elif [[ $compression == zstd ]]; then - compression="zstd --rm" + compressionCmd=(zstd --rm) fi - find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c -print0 | xargs -0 -r "$compression" --force --quiet + find ${baseDir}/build-logs -type f -name "*.drv" -mtime +3 -size +0c -print0 | xargs -0 -r "''${compressionCmd[@]}" --force --quiet ''; startAt = "Sun 01:45"; serviceConfig.Slice = "system-hydra.slice"; From a2b3275ee15e2176d7ad792975274e2f9762068b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 28 Dec 2024 22:46:06 +0000 Subject: [PATCH 50/78] atlantis: 0.30.0 -> 0.32.0 --- pkgs/by-name/at/atlantis/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix index 8ad81295734b..735d5871b6d0 100644 --- a/pkgs/by-name/at/atlantis/package.nix +++ b/pkgs/by-name/at/atlantis/package.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "atlantis"; - version = "0.30.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - hash = "sha256-hM4IycRE3/jiwFLqkU/jz9sPP9KTfeu8ouIJlqgPxmk="; + hash = "sha256-7D7msKDnHym3uiMJur2kCRf6MurwkMEKI+aYcwqOVX0="; }; ldflags = [ "-X=main.version=${version}" "-X=main.date=1970-01-01T00:00:00Z" ]; - vendorHash = "sha256-uH+Q5NXBL1+LFa6tw3x2CE1B5QElqK9KuFeYQpCFAW0="; + vendorHash = "sha256-wPsEE6sR1GDD3Npdcf/JmeZc451+x9UBE8+DwXkj/qE="; subPackages = [ "." ]; From f5e3bb7954391c7255ca9757b09dc7b71b485c2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Dec 2024 00:10:06 +0000 Subject: [PATCH 51/78] deck: 1.40.3 -> 1.42.1 --- pkgs/by-name/de/deck/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix index 567db1610467..29d1c94b8308 100644 --- a/pkgs/by-name/de/deck/package.nix +++ b/pkgs/by-name/de/deck/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "deck"; - version = "1.40.3"; + version = "1.42.1"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "refs/tags/v${version}"; - hash = "sha256-n6WASCtDwBX4FASSWI17JpU7rDXIeSidPWhj/MB2tUs="; + hash = "sha256-+HXTBTE8oEvyEwzwJbM0snVV0sKcKFHFnHB1iJ+4LJc="; }; nativeBuildInputs = [ installShellFiles ]; @@ -27,7 +27,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-csoSvu7uce1diB4EsQCRRt08mX+rJoxfZqAtaoo0x4M="; + vendorHash = "sha256-YFEiv+mbU8ZE9u1lL4cZUo+7sVSu9P1UEkuKyAGwlkg="; postInstall = '' installShellCompletion --cmd deck \ From 091abbd4c2fabcd78e1e511036b7a54be21797fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Dec 2024 00:21:36 +0000 Subject: [PATCH 52/78] babashka-unwrapped: 1.12.195 -> 1.12.196 --- pkgs/development/interpreters/babashka/clojure-tools.nix | 4 ++-- pkgs/development/interpreters/babashka/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/babashka/clojure-tools.nix b/pkgs/development/interpreters/babashka/clojure-tools.nix index 916748365ce5..adfdd5ffdfff 100644 --- a/pkgs/development/interpreters/babashka/clojure-tools.nix +++ b/pkgs/development/interpreters/babashka/clojure-tools.nix @@ -7,10 +7,10 @@ }: clojure.overrideAttrs (previousAttrs: { pname = "babashka-clojure-tools"; - version = "1.12.0.1479"; + version = "1.12.0.1488"; src = fetchurl { url = previousAttrs.src.url; - hash = "sha256-KlFcRXVd8e3zeP36+zgCUcdzbeLbFffb5V7XKV8NKWw="; + hash = "sha256-vBm+ABC+8EIcJv077HvDvKCMGSgo1ZoVGEVCLcRCB0I="; }; }) diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix index 6b4bf1d04eb2..77cc9975ec10 100644 --- a/pkgs/development/interpreters/babashka/default.nix +++ b/pkgs/development/interpreters/babashka/default.nix @@ -9,11 +9,11 @@ let babashka-unwrapped = buildGraalvmNativeImage rec { pname = "babashka-unwrapped"; - version = "1.12.195"; + version = "1.12.196"; src = fetchurl { url = "https://github.com/babashka/babashka/releases/download/v${version}/babashka-${version}-standalone.jar"; - sha256 = "sha256-1bZaWg1AtStF1uuoY8Z0V4s0fMSchSTR/pTSWdEzcuw="; + sha256 = "sha256-11HrLQi/BYX+LqqUAN3mZx13775dzXCDFxpJP33bKQY="; }; graalvmDrv = graalvmPackages.graalvm-ce; From 4d4744639fa3f48b54d5ef22bb56a0efdfd6ca16 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sun, 29 Dec 2024 04:51:48 +0100 Subject: [PATCH 53/78] simple64: 2024.11.1 -> 2024.12.1 --- pkgs/by-name/si/simple64/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simple64/package.nix b/pkgs/by-name/si/simple64/package.nix index c430277fbfb5..a844560167bb 100644 --- a/pkgs/by-name/si/simple64/package.nix +++ b/pkgs/by-name/si/simple64/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "simple64"; - version = "2024.11.1"; + version = "2024.12.1"; src = fetchFromGitHub { owner = "simple64"; repo = "simple64"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-wWBW+iYPY+5C3pvyyFYb4iIK8GlAyCbaAzr2Q5RL+n8="; + hash = "sha256-rvoUyvhpbibXbAreu6twTeeVRTCbhJiJuyKaJz0uT5k="; }; patches = [ From 0ca77fdadf357739b53f4ccba52a80057a7cca52 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sun, 29 Dec 2024 04:52:03 +0100 Subject: [PATCH 54/78] simple64-netplay-server: 2024.10.1 -> 2024.12.2 --- pkgs/by-name/si/simple64-netplay-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/si/simple64-netplay-server/package.nix b/pkgs/by-name/si/simple64-netplay-server/package.nix index 079997fca19b..2e11c69e54a7 100644 --- a/pkgs/by-name/si/simple64-netplay-server/package.nix +++ b/pkgs/by-name/si/simple64-netplay-server/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "simple64-netplay-server"; - version = "2024.10.1"; + version = "2024.12.2"; src = fetchFromGitHub { owner = "simple64"; repo = "simple64-netplay-server"; rev = "refs/tags/v${version}"; - hash = "sha256-p9hHVf1LD95w280ScUkxHKmBJLJ9eiH3WEYV+kaALgQ="; + hash = "sha256-B0elTjklyXGpBAoqPN1HHeC9FIXsggKNKiDVvl8xgeU="; }; - vendorHash = "sha256-HeYA/nR0NuP/fPMJXGGuN2eP6vB4yj1yWFfFDyp34QE="; + vendorHash = "sha256-1gySXbp1N0lnWToVQU3N9zQxl9Z0e9ICCeAIKwSoxaY="; meta = { description = "Dedicated server for simple64 netplay"; From 0382b1ef9fba16f4006d6035d26adf43e0ca66df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 29 Dec 2024 05:24:02 +0000 Subject: [PATCH 55/78] quarkus: 3.17.3 -> 3.17.5 --- pkgs/by-name/qu/quarkus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index da50bae84d08..fff7e8a56536 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.17.3"; + version = "3.17.5"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-Nm0tu4YYjD1NH4n0qV1YZl7ZXfN5jccFV6EPn5mPu+8="; + hash = "sha256-EFSL1FDbpZ7uue+MHeeKp+2+Hp4Hi7lCOIBww4/k9yE="; }; nativeBuildInputs = [ makeWrapper ]; From 3a69b9fa0dbc0254f6e342957bc02f02b8c8a1a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 11:02:01 +0000 Subject: [PATCH 56/78] dolt: 1.44.0 -> 1.45.1 --- pkgs/by-name/do/dolt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix index da061e9bd60d..0c68cc60bb73 100644 --- a/pkgs/by-name/do/dolt/package.nix +++ b/pkgs/by-name/do/dolt/package.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "1.44.0"; + version = "1.45.1"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-sumd663G9Tztkuo21w7AE7ylzH2GnwNIL+/cGQz1SX8="; + sha256 = "sha256-O5y3AdFOtxNwpt8uGkTC7XHY1M/6Cv3vTyeHyVlTRGw="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-bHLudlThXd4ttgmDyVwGD+SI9KJxIMo2iZARREZUSxk="; + vendorHash = "sha256-h9HE90mOaDid2/uZcDBKZdbi6K1P2o27LZDnLAm+XSE="; proxyVendor = true; doCheck = false; From 46858a2be45002b872ca8d04f95eb28afd77a805 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 22:01:45 +0000 Subject: [PATCH 57/78] codeium: 1.30.2 -> 1.30.18 --- pkgs/by-name/co/codeium/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 26ba1b6f8c1d..9fbcada3199e 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -23,10 +23,10 @@ let hash = { - x86_64-linux = "sha256-xbMiPmFGte4I6p+Zt4HaLL4MuHoMs++gf5iVPl7+h70="; - aarch64-linux = "sha256-2bu8cI0u8Q3mCxZFoM0W/gQ4BipLUIoVe2e0a16ZQco="; - x86_64-darwin = "sha256-lGRqxZxIpioTA5I9lsWIQ8S7AN8AXR7NGgSMCNN3cQI="; - aarch64-darwin = "sha256-MGqT4Jhq81rvnMhQtg+N0C4ElOfUvLpVBq7EtwKztOE="; + x86_64-linux = "sha256-/VkobDCai9+Lac0TCzm9gg/pNFDA1T2OJiad3qdz/2o="; + aarch64-linux = "sha256-glJRQIFSs5D7b3BVblaL0o8Rndh3QuCup45AfRWymG0="; + x86_64-darwin = "sha256-TBCgbaJ5Yyp+I8VCljYf3tlNnVaLkfwusJMlfY+Rggo="; + aarch64-darwin = "sha256-MfJ/zIfmKJN4Fe6a50NwAqvetxB/W+BriQ+5mEIhWMg="; } .${system} or throwSystem; @@ -35,7 +35,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "codeium"; - version = "1.30.2"; + version = "1.30.18"; src = fetchurl { name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz"; From 64d92223837995405512693b43c46fb5e3235806 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 01:31:44 +0000 Subject: [PATCH 58/78] coroot-node-agent: 1.22.2 -> 1.23.1 --- pkgs/by-name/co/coroot-node-agent/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix index 2cad39afda69..fd2b3631417a 100644 --- a/pkgs/by-name/co/coroot-node-agent/package.nix +++ b/pkgs/by-name/co/coroot-node-agent/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "coroot-node-agent"; - version = "1.22.2"; + version = "1.23.1"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot-node-agent"; rev = "v${version}"; - hash = "sha256-b9JI0q6CF4D+sdfuwTkouAwJF/ghJByzsQBehwXttoU="; + hash = "sha256-kisYm0bM+IZJ9qRx1lDlcFtZIdjsNfu6Ao75q84ruDM="; }; - vendorHash = "sha256-OZj3t8eFDbk2zZ+zGlgV8o9VC4/vYalIEm2dhD2JwK8="; + vendorHash = "sha256-EXI4xpo4j/EzugW8zyu0Dvk2i6bYFBIF+SsL6GZ+J2Q="; buildInputs = [ systemdLibs ]; From 5ed1ffa763c554bc48ec1625d2a56c70749ef04a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 13:44:12 +0000 Subject: [PATCH 59/78] intentrace: 0.4.1 -> 0.4.2 --- pkgs/by-name/in/intentrace/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/in/intentrace/package.nix b/pkgs/by-name/in/intentrace/package.nix index 8297f930b66a..1a8b19a2dccc 100644 --- a/pkgs/by-name/in/intentrace/package.nix +++ b/pkgs/by-name/in/intentrace/package.nix @@ -5,7 +5,7 @@ }: let - version = "0.4.1"; + version = "0.4.2"; in rustPlatform.buildRustPackage { inherit version; @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage { owner = "sectordistrict"; repo = "intentrace"; rev = "refs/tags/v${version}"; - hash = "sha256-9BlCDtWnBDJuo6ovDi347jAQSOG8LizJAyQ/xN+HJ0w="; + hash = "sha256-ZcGZK4GX78ls3nHb7SBKszmZXMAbCxS4osW3MLqgnHQ="; }; - cargoHash = "sha256-eJlAQpkI+RgfpDJGP9evWH28nU891PF4jeRpf2Os4Ts="; + cargoHash = "sha256-LkLSPFCfQxBb5DJZ67I7xPxzIYqTzKccyLW0S65/MLU="; meta = { description = "Prettified Linux syscall tracing tool (like strace)"; From b24078ce1d0a8cef251bfe1d23f92f1ba9aa0372 Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Tue, 31 Dec 2024 15:28:56 +0100 Subject: [PATCH 60/78] mplayer: 1.5-unstable-2024-07-03 -> 1.5-unstable-2024-12-21 --- pkgs/applications/video/mplayer/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index f84c8e5c18ef..bf94c7c1d9f1 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -120,12 +120,12 @@ in stdenv.mkDerivation rec { pname = "mplayer"; - version = "1.5-unstable-2024-07-03"; + version = "1.5-unstable-2024-12-21"; src = fetchsvn { url = "svn://svn.mplayerhq.hu/mplayer/trunk"; - rev = "38637"; - hash = "sha256-9KQOB6QIs1VZhazJqW8dY4ASiMgoxV6davfpKgLPbmE="; + rev = "38668"; + hash = "sha256-ezWYBkhiSBgf/SeTrO6sKGbL/IrX+82KXCIlqYMEtgY="; }; prePatch = '' @@ -276,7 +276,8 @@ stdenv.mkDerivation rec { description = "Movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; license = licenses.gpl2Only; - maintainers = [ ]; + # Picking it up: no idea about the origin of some choices (but seems fine) + maintainers = [ maintainers.raskin ]; platforms = [ "i686-linux" "x86_64-linux" From 675ae46d5d0b2ecf9416b46ba7bc5477edcb0ff3 Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Tue, 31 Dec 2024 15:28:56 +0100 Subject: [PATCH 61/78] mplayer: 1.5-unstable-2024-07-03 -> 1.5-unstable-2024-12-21 --- pkgs/applications/video/mplayer/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index f84c8e5c18ef..bf94c7c1d9f1 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -120,12 +120,12 @@ in stdenv.mkDerivation rec { pname = "mplayer"; - version = "1.5-unstable-2024-07-03"; + version = "1.5-unstable-2024-12-21"; src = fetchsvn { url = "svn://svn.mplayerhq.hu/mplayer/trunk"; - rev = "38637"; - hash = "sha256-9KQOB6QIs1VZhazJqW8dY4ASiMgoxV6davfpKgLPbmE="; + rev = "38668"; + hash = "sha256-ezWYBkhiSBgf/SeTrO6sKGbL/IrX+82KXCIlqYMEtgY="; }; prePatch = '' @@ -276,7 +276,8 @@ stdenv.mkDerivation rec { description = "Movie player that supports many video formats"; homepage = "http://mplayerhq.hu"; license = licenses.gpl2Only; - maintainers = [ ]; + # Picking it up: no idea about the origin of some choices (but seems fine) + maintainers = [ maintainers.raskin ]; platforms = [ "i686-linux" "x86_64-linux" From 3a8ff68623f62859026343669e65a3002d22b6ba Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Tue, 31 Dec 2024 14:31:32 +0100 Subject: [PATCH 62/78] xpilot-ng: fix build --- pkgs/games/xpilot/default.nix | 3 + pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch | 168 +++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index bdc41a27de8a..8e011af62f29 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { zlib libXxf86misc ]; + + patches = [ ./xpilot-ng-gcc-14-fix.patch ]; + meta = with lib; { description = "Multiplayer X11 space combat game"; homepage = "http://xpilot.sf.net/"; diff --git a/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch b/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch new file mode 100644 index 000000000000..e66ed96971fe --- /dev/null +++ b/pkgs/games/xpilot/xpilot-ng-gcc-14-fix.patch @@ -0,0 +1,168 @@ +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/mapedit/proto.h xpilot-ng-4.7.3-fixed/src/mapedit/proto.h +--- xpilot-ng-4.7.3/src/mapedit/proto.h 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/mapedit/proto.h 2024-12-31 14:25:55.790083767 +0100 +@@ -73,15 +73,15 @@ + int ResizeWidth(HandlerInfo_t info); + int ResizeHeight(HandlerInfo_t info); + int OpenPreferencesPopup(HandlerInfo_t info); +-int OpenMapInfoPopup(void); +-int OpenRobotsPopup(void); +-int OpenVisibilityPopup(void); +-int OpenCannonsPopup(void); +-int OpenRoundsPopup(void); +-int OpenInitItemsPopup(void); +-int OpenMaxItemsPopup(void); +-int OpenProbsPopup(void); +-int OpenScoringPopup(void); ++int OpenMapInfoPopup(HandlerInfo_t info); ++int OpenRobotsPopup(HandlerInfo_t info); ++int OpenVisibilityPopup(HandlerInfo_t info); ++int OpenCannonsPopup(HandlerInfo_t info); ++int OpenRoundsPopup(HandlerInfo_t info); ++int OpenInitItemsPopup(HandlerInfo_t info); ++int OpenMaxItemsPopup(HandlerInfo_t info); ++int OpenProbsPopup(HandlerInfo_t info); ++int OpenScoringPopup(HandlerInfo_t info); + int ValidateCoordHandler(HandlerInfo_t info); + int ShowHoles(HandlerInfo_t info); + char MapData(int x, int y); +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/mapedit/tools.c xpilot-ng-4.7.3-fixed/src/mapedit/tools.c +--- xpilot-ng-4.7.3/src/mapedit/tools.c 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/mapedit/tools.c 2024-12-31 14:26:29.168082279 +0100 +@@ -747,7 +747,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenMapInfoPopup() ++int OpenMapInfoPopup(HandlerInfo_t info) + { + Window *temp; + +@@ -790,7 +790,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenRobotsPopup() ++int OpenRobotsPopup(HandlerInfo_t info) + { + XMapWindow(display, robots); + return 0; +@@ -801,7 +801,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenVisibilityPopup() ++int OpenVisibilityPopup(HandlerInfo_t info) + { + XMapWindow(display, visibility); + return 0; +@@ -812,7 +812,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenCannonsPopup() ++int OpenCannonsPopup(HandlerInfo_t info) + { + XMapWindow(display, cannons); + return 0; +@@ -823,7 +823,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenRoundsPopup() ++int OpenRoundsPopup(HandlerInfo_t info) + { + XMapWindow(display, rounds); + return 0; +@@ -834,7 +834,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenInitItemsPopup() ++int OpenInitItemsPopup(HandlerInfo_t info) + { + XMapWindow(display, inititems); + return 0; +@@ -845,7 +845,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenMaxItemsPopup() ++int OpenMaxItemsPopup(HandlerInfo_t info) + { + XMapWindow(display, maxitems); + return 0; +@@ -856,7 +856,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenProbsPopup() ++int OpenProbsPopup(HandlerInfo_t info) + { + XMapWindow(display, probs); + return 0; +@@ -867,7 +867,7 @@ + /* Arguments : */ + /* Purpose : */ + /***************************************************************************/ +-int OpenScoringPopup() ++int OpenScoringPopup(HandlerInfo_t info) + { + XMapWindow(display, scoring); + return 0; +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/suibotdef.c xpilot-ng-4.7.3-fixed/src/server/suibotdef.c +--- xpilot-ng-4.7.3/src/server/suibotdef.c 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/server/suibotdef.c 2024-12-31 14:07:28.316133143 +0100 +@@ -338,12 +338,6 @@ + + /* } */ + +-struct collans { +- int line; +- int point; +- clvec_t moved; +-}; +- + static bool Wall_in_between_points(int cx1, int cy1, int cx2, int cy2); + static bool Wall_in_between_points(int cx1, int cy1, int cx2, int cy2){ /* Wall between two given points?*/ + +@@ -405,7 +399,7 @@ + /* ignore if there is enough time to deal with this object later */ + if((time_until_closest < 0) || (time_until_closest > maxtime)) + /*option instead of fixed value: options.dodgetime))*/ +- return; ++ return false; + + /* get the square of the distance */ + sqdistance = +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/walls.c xpilot-ng-4.7.3-fixed/src/server/walls.c +--- xpilot-ng-4.7.3/src/server/walls.c 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/server/walls.c 2024-12-31 14:09:46.086127001 +0100 +@@ -54,12 +54,6 @@ + #error "This code assumes that negative numbers round upwards." + #endif + +-struct collans { +- int line; +- int point; +- clvec_t moved; +-}; +- + struct tl2 { + int base; + int x; +diff -r -U3 -x '.*.sw?' xpilot-ng-4.7.3/src/server/walls.h xpilot-ng-4.7.3-fixed/src/server/walls.h +--- xpilot-ng-4.7.3/src/server/walls.h 2010-03-05 02:03:49.000000000 +0100 ++++ xpilot-ng-4.7.3-fixed/src/server/walls.h 2024-12-31 14:04:50.198140193 +0100 +@@ -187,4 +187,11 @@ + + extern int num_polys, num_pstyles, num_estyles, num_bstyles; + ++struct collans { ++ int line; ++ int point; ++ clvec_t moved; ++}; ++ ++extern void Move_point(const move_t *move, struct collans *answer); + #endif From 88bf350b1d3de0f3d674b699b372f4366b95dcbf Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Tue, 31 Dec 2024 17:31:26 +0100 Subject: [PATCH 63/78] tftp-hpa: 5.2 -> 5.2-untagged-2024-06-10 --- pkgs/by-name/tf/tftp-hpa/package.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/tf/tftp-hpa/package.nix b/pkgs/by-name/tf/tftp-hpa/package.nix index f9946be7423a..8a41255c8398 100644 --- a/pkgs/by-name/tf/tftp-hpa/package.nix +++ b/pkgs/by-name/tf/tftp-hpa/package.nix @@ -1,15 +1,18 @@ { lib, stdenv, - fetchurl, + fetchgit, + autoconf, + automake, }: stdenv.mkDerivation rec { pname = "tftp-hpa"; - version = "5.2"; - src = fetchurl { - url = "mirror://kernel/software/network/tftp/tftp-hpa/${pname}-${version}.tar.xz"; - sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg"; + version = "5.2-untagged-2024-06-10"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git"; + hash = "sha256-lTMldYO/cZdLj0UjOPPBHfYf2GBG0O+5lhP9ikqn3tY="; + rev = "2c86ff58dcc003107b47f2d35aa0fdc4a3fd95e1"; }; # Workaround build failure on -fno-common toolchains like upstream @@ -18,6 +21,15 @@ stdenv.mkDerivation rec { # `toplevel'; tftp.o:/build/tftp-hpa-5.2/tftp/tftp.c:51: first defined here env.NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' + ./autogen.sh + ''; + + nativeBuildInputs = [ + autoconf + automake + ]; + meta = with lib; { description = "TFTP tools - a lot of fixes on top of BSD TFTP"; maintainers = with maintainers; [ raskin ]; From bef289e3d0bf103d7ebd21ce3f8f5c45ebd346c8 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Tue, 31 Dec 2024 10:48:36 -0800 Subject: [PATCH 64/78] nixos/xfce: fix after #369419 removed with lib --- nixos/modules/services/x11/desktop-managers/xfce.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index e5d23ab2259b..32c41449a248 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -127,22 +127,22 @@ in xfce.xfce4-taskmanager xfce.xfce4-terminal ] # TODO: NetworkManager doesn't belong here - ++ optional config.networking.networkmanager.enable networkmanagerapplet - ++ optional config.powerManagement.enable xfce.xfce4-power-manager - ++ optionals (config.services.pulseaudio.enable || config.services.pipewire.pulse.enable) [ + ++ lib.optional config.networking.networkmanager.enable networkmanagerapplet + ++ lib.optional config.powerManagement.enable xfce.xfce4-power-manager + ++ lib.optionals (config.services.pulseaudio.enable || config.services.pipewire.pulse.enable) [ pavucontrol # volume up/down keys support: # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse # but can only be used with xfce4-panel, so for no-desktop usage we still include # xfce4-volumed-pulse (if cfg.noDesktop then xfce.xfce4-volumed-pulse else xfce.xfce4-pulseaudio-plugin) - ] ++ optionals cfg.enableXfwm [ + ] ++ lib.optionals cfg.enableXfwm [ xfce.xfwm4 xfce.xfwm4-themes - ] ++ optionals (!cfg.noDesktop) [ + ] ++ lib.optionals (!cfg.noDesktop) [ xfce.xfce4-panel xfce.xfdesktop - ] ++ optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages; + ] ++ lib.optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages; programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gtk2; programs.xfconf.enable = true; From bf28e24140352e2e8cb952097febff0e94ea6a1e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 30 Dec 2024 04:18:29 +0100 Subject: [PATCH 65/78] python3.pkgs.pydrive2: Mark as broken It does not currently work due to pyopenssl incompatibility. --- pkgs/development/python-modules/pydrive2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pydrive2/default.nix b/pkgs/development/python-modules/pydrive2/default.nix index a8e300cf5747..a03c4a2c51a3 100644 --- a/pkgs/development/python-modules/pydrive2/default.nix +++ b/pkgs/development/python-modules/pydrive2/default.nix @@ -57,6 +57,10 @@ buildPythonPackage rec { description = "Google Drive API Python wrapper library"; homepage = "https://github.com/iterative/PyDrive2"; changelog = "https://github.com/iterative/PyDrive2/releases/tag/${version}"; + # Not compatible with pyopenssl 24.3.0 + # https://github.com/iterative/PyDrive2/issues/361 + # TODO: re-enable it in `duplicity` when fixed + broken = true; license = licenses.asl20; maintainers = with maintainers; [ sei40kr ]; }; From ea6117d6c3c64ea522473a6b7915c67ff7ae36c9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 30 Dec 2024 04:15:22 +0100 Subject: [PATCH 66/78] duplicity: Disable pydrive2 support It does not currently work due to pyopenssl incompatibility. --- pkgs/by-name/du/duplicity/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/du/duplicity/package.nix b/pkgs/by-name/du/duplicity/package.nix index 6417b0b8f1db..1b2e9ed23c2b 100644 --- a/pkgs/by-name/du/duplicity/package.nix +++ b/pkgs/by-name/du/duplicity/package.nix @@ -88,7 +88,8 @@ let paramiko pyasn1 pycrypto - pydrive2 + # Currently marked as broken. + # pydrive2 future ] ++ paramiko.optional-dependencies.invoke; From 4fafd05b75c6f2accbe347c7708834c3c7b01209 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 22 Dec 2024 03:15:09 +0100 Subject: [PATCH 67/78] glib: Format the expression - Format with `nixfmt-rfc-style`. - Move `outputs` and `setupHook` to top. - Move `strictDeps` above `inputs`. - Move `nativeCheckInputs` next to the rest of the inputs. - Move `env` above phases. - Expand `env.NIX_CFLAGS_COMPILE` to a nested attribute set. --- pkgs/development/libraries/glib/default.nix | 435 ++++++++++++-------- 1 file changed, 254 insertions(+), 181 deletions(-) diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index e8a44bde7edb..53cb4efe2f13 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,34 +1,47 @@ -{ config -, lib -, stdenv -, fetchurl -, gettext -, meson -, ninja -, pkg-config -, perl -, python3 -, python3Packages -, libiconv, zlib, libffi, pcre2, elfutils, gnome, libselinux, bash, gnum4, libxslt -, docutils, gi-docgen -# use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) -, util-linuxMinimal ? null -, buildPackages +{ + config, + lib, + stdenv, + fetchurl, + gettext, + meson, + ninja, + pkg-config, + perl, + python3, + python3Packages, + libiconv, + zlib, + libffi, + pcre2, + elfutils, + gnome, + libselinux, + bash, + gnum4, + libxslt, + docutils, + gi-docgen, + # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) + util-linuxMinimal ? null, + buildPackages, -# this is just for tests (not in the closure of any regular package) -, dbus, tzdata -, desktop-file-utils, shared-mime-info -, darwin -, makeHardcodeGsettingsPatch -, testers -, gobject-introspection -, libsystemtap -, libsysprof-capture -, mesonEmulatorHook -, withIntrospection ? - stdenv.hostPlatform.emulatorAvailable buildPackages && - lib.meta.availableOn stdenv.hostPlatform gobject-introspection && - stdenv.hostPlatform.isLittleEndian == stdenv.buildPlatform.isLittleEndian + # this is just for tests (not in the closure of any regular package) + dbus, + tzdata, + desktop-file-utils, + shared-mime-info, + darwin, + makeHardcodeGsettingsPatch, + testers, + gobject-introspection, + libsystemtap, + libsysprof-capture, + mesonEmulatorHook, + withIntrospection ? + stdenv.hostPlatform.emulatorAvailable buildPackages + && lib.meta.availableOn stdenv.hostPlatform gobject-introspection + && stdenv.hostPlatform.isLittleEndian == stdenv.buildPlatform.isLittleEndian, }: assert stdenv.hostPlatform.isLinux -> util-linuxMinimal != null; @@ -40,183 +53,238 @@ let x11Support = false; }; - librarySuffix = if (stdenv.hostPlatform.extensions.library == ".so") then "2.0.so.0" - else if (stdenv.hostPlatform.extensions.library == ".dylib") then "2.0.0.dylib" - else if (stdenv.hostPlatform.extensions.library == ".a") then "2.0.a" - else if (stdenv.hostPlatform.extensions.library == ".dll") then "2.0-0.dll" - else "2.0-0.lib"; + librarySuffix = + if (stdenv.hostPlatform.extensions.library == ".so") then + "2.0.so.0" + else if (stdenv.hostPlatform.extensions.library == ".dylib") then + "2.0.0.dylib" + else if (stdenv.hostPlatform.extensions.library == ".a") then + "2.0.a" + else if (stdenv.hostPlatform.extensions.library == ".dll") then + "2.0-0.dll" + else + "2.0-0.lib"; systemtap' = buildPackages.linuxPackages.systemtap.override { withStap = false; }; + withDtrace = - lib.meta.availableOn stdenv.buildPlatform systemtap' && - # dtrace support requires sys/sdt.h header - lib.meta.availableOn stdenv.hostPlatform libsystemtap; + lib.meta.availableOn stdenv.buildPlatform systemtap' + && + # dtrace support requires sys/sdt.h header + lib.meta.availableOn stdenv.hostPlatform libsystemtap; in stdenv.mkDerivation (finalAttrs: { pname = "glib"; version = "2.82.1"; + outputs = [ + "bin" + "out" + "dev" + "devdoc" + ]; + + setupHook = ./setup-hook.sh; + src = fetchurl { url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz"; hash = "sha256-R4Y0RAv1LuTsRCjVWHhzmMC+awQ8UhvrMIM0s9tEiaY="; }; - patches = lib.optionals stdenv.hostPlatform.isDarwin [ - ./darwin-compilation.patch - ] ++ lib.optionals stdenv.hostPlatform.isMusl [ - ./quark_init_on_demand.patch - ./gobject_init_on_demand.patch - ] ++ [ - # This patch lets GLib's GDesktopAppInfo API watch and notice changes - # to the Nix user and system profiles. That way, the list of available - # applications shown by the desktop environment is immediately updated - # when the user installs or removes any - # (see ). + patches = + lib.optionals stdenv.hostPlatform.isDarwin [ + ./darwin-compilation.patch + ] + ++ lib.optionals stdenv.hostPlatform.isMusl [ + ./quark_init_on_demand.patch + ./gobject_init_on_demand.patch + ] + ++ [ + # This patch lets GLib's GDesktopAppInfo API watch and notice changes + # to the Nix user and system profiles. That way, the list of available + # applications shown by the desktop environment is immediately updated + # when the user installs or removes any + # (see ). - # It does so by monitoring /nix/var/nix/profiles (for changes to the system - # profile) and /nix/var/nix/profiles/per-user/USER (for changes to the user - # profile) as well as /etc/profiles/per-user (for chanes to the user - # environment profile) and crawling their share/applications sub-directory when - # changes happen. - ./glib-appinfo-watch.patch + # It does so by monitoring /nix/var/nix/profiles (for changes to the system + # profile) and /nix/var/nix/profiles/per-user/USER (for changes to the user + # profile) as well as /etc/profiles/per-user (for chanes to the user + # environment profile) and crawling their share/applications sub-directory when + # changes happen. + ./glib-appinfo-watch.patch - ./schema-override-variable.patch + ./schema-override-variable.patch - # Add support for Pantheon’s terminal emulator. - ./elementary-terminal-support.patch + # Add support for Pantheon’s terminal emulator. + ./elementary-terminal-support.patch - # GLib contains many binaries used for different purposes; - # we will install them to different outputs: - # 1. Tools for desktop environment and introspection ($bin) - # * gapplication (non-darwin) - # * gdbus - # * gi-compile-repository - # * gi-decompile-typelib - # * gi-inspect-typelib - # * gio - # * gio-launch-desktop (symlink to $out) - # * gsettings - # 2. Development/build tools ($dev) - # * gdbus-codegen - # * gio-querymodules - # * glib-compile-resources - # * glib-compile-schemas - # * glib-genmarshal - # * glib-gettextize - # * glib-mkenums - # * gobject-query - # * gresource - # * gtester - # * gtester-report - # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out) - # * gio-launch-desktop - ./split-dev-programs.patch + # GLib contains many binaries used for different purposes; + # we will install them to different outputs: + # 1. Tools for desktop environment and introspection ($bin) + # * gapplication (non-darwin) + # * gdbus + # * gi-compile-repository + # * gi-decompile-typelib + # * gi-inspect-typelib + # * gio + # * gio-launch-desktop (symlink to $out) + # * gsettings + # 2. Development/build tools ($dev) + # * gdbus-codegen + # * gio-querymodules + # * glib-compile-resources + # * glib-compile-schemas + # * glib-genmarshal + # * glib-gettextize + # * glib-mkenums + # * gobject-query + # * gresource + # * gtester + # * gtester-report + # 3. Tools for desktop environment that cannot go to $bin due to $out depending on them ($out) + # * gio-launch-desktop + ./split-dev-programs.patch - # Tell Meson to install gdb scripts next to the lib - # GDB only looks there and in ${gdb}/share/gdb/auto-load, - # and by default meson installs in to $out/share/gdb/auto-load - # which does not help - ./gdb_script.patch - ]; - - outputs = [ "bin" "out" "dev" "devdoc" ]; - - setupHook = ./setup-hook.sh; - - buildInputs = [ - finalAttrs.setupHook - ] ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ - libsysprof-capture - ] ++ [ - pcre2 - ] ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ - bash gnum4 # install glib-gettextize and m4 macros for other apps to use - ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ - elfutils - ] ++ lib.optionals withDtrace [ - libsystemtap - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - libselinux - util-linuxMinimal # for libmount - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - AppKit Carbon Cocoa CoreFoundation CoreServices Foundation - ]); + # Tell Meson to install gdb scripts next to the lib + # GDB only looks there and in ${gdb}/share/gdb/auto-load, + # and by default meson installs in to $out/share/gdb/auto-load + # which does not help + ./gdb_script.patch + ]; strictDeps = true; + buildInputs = + [ + finalAttrs.setupHook + ] + ++ lib.optionals (!stdenv.hostPlatform.isFreeBSD) [ + libsysprof-capture + ] + ++ [ + pcre2 + ] + ++ lib.optionals (!stdenv.hostPlatform.isWindows) [ + bash + gnum4 # install glib-gettextize and m4 macros for other apps to use + ] + ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ + elfutils + ] + ++ lib.optionals withDtrace [ + libsystemtap + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + libselinux + util-linuxMinimal # for libmount + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AppKit + Carbon + Cocoa + CoreFoundation + CoreServices + Foundation + ] + ); + depsBuildBuild = [ pkg-config # required to find native gi-docgen ]; - nativeBuildInputs = [ - docutils # for rst2man, rst2html5 - meson - ninja - pkg-config - perl - python3 - python3Packages.packaging # mostly used to make meson happy - python3Packages.wrapPython # for patchPythonScript + nativeBuildInputs = + [ + docutils # for rst2man, rst2html5 + meson + ninja + pkg-config + perl + python3 + python3Packages.packaging # mostly used to make meson happy + python3Packages.wrapPython # for patchPythonScript + gettext + libxslt + ] + ++ lib.optionals withIntrospection [ + gi-docgen + gobject-introspection' + ] + ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook + ] + ++ lib.optionals withDtrace [ + systemtap' # for dtrace + ]; + + propagatedBuildInputs = [ + zlib + libffi gettext - libxslt - ] ++ lib.optionals withIntrospection [ - gi-docgen - gobject-introspection' - ] ++ lib.optionals (withIntrospection && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ] ++ lib.optionals withDtrace [ - systemtap' # for dtrace + libiconv ]; - propagatedBuildInputs = [ zlib libffi gettext libiconv ]; - - mesonFlags = [ - "-Dglib_debug=disabled" # https://gitlab.gnome.org/GNOME/glib/-/issues/3421#note_2206315 - "-Ddocumentation=true" # gvariant specification can be built without gi-docgen - (lib.mesonEnable "dtrace" withDtrace) - (lib.mesonEnable "systemtap" withDtrace) # requires dtrace option to be enabled - "-Dnls=enabled" - "-Ddevbindir=${placeholder "dev"}/bin" - (lib.mesonEnable "introspection" withIntrospection) - # FIXME: Fails when linking target glib/tests/libconstructor-helper.so - # relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object - "-Dtests=${lib.boolToString (!stdenv.hostPlatform.isStatic)}" - ] ++ lib.optionals (!lib.meta.availableOn stdenv.hostPlatform elfutils) [ - "-Dlibelf=disabled" - ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ - "-Db_lundef=false" - "-Dxattr=false" - "-Dsysprof=disabled" # sysprof-capture does not build on FreeBSD + nativeCheckInputs = [ + tzdata + desktop-file-utils + shared-mime-info ]; - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=nonnull" - # Default for release buildtype but passed manually because - # we're using plain - "-DG_DISABLE_CAST_CHECKS" - ]; + mesonFlags = + [ + "-Dglib_debug=disabled" # https://gitlab.gnome.org/GNOME/glib/-/issues/3421#note_2206315 + "-Ddocumentation=true" # gvariant specification can be built without gi-docgen + (lib.mesonEnable "dtrace" withDtrace) + (lib.mesonEnable "systemtap" withDtrace) # requires dtrace option to be enabled + "-Dnls=enabled" + "-Ddevbindir=${placeholder "dev"}/bin" + (lib.mesonEnable "introspection" withIntrospection) + # FIXME: Fails when linking target glib/tests/libconstructor-helper.so + # relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object + "-Dtests=${lib.boolToString (!stdenv.hostPlatform.isStatic)}" + ] + ++ lib.optionals (!lib.meta.availableOn stdenv.hostPlatform elfutils) [ + "-Dlibelf=disabled" + ] + ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ + "-Db_lundef=false" + "-Dxattr=false" + "-Dsysprof=disabled" # sysprof-capture does not build on FreeBSD + ]; - postPatch = '' - patchShebangs glib/gen-unicode-tables.pl - patchShebangs glib/tests/gen-casefold-txt.py - patchShebangs glib/tests/gen-casemap-txt.py - patchShebangs tools/gen-visibility-macros.py - patchShebangs tests + env = { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=nonnull" + # Default for release buildtype but passed manually because + # we're using plain + "-DG_DISABLE_CAST_CHECKS" + ]; + }; - # Needs machine-id, comment the test - sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c - sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-address-get-session.c - # All gschemas fail to pass the test, upstream bug? - sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c - # Cannot reproduce the failing test_associations on hydra - sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c - # Needed because of libtool wrappers - sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c - '' + lib.optionalString stdenv.hostPlatform.isWindows '' - substituteInPlace gio/win32/meson.build \ - --replace "libintl, " "" - ''; + postPatch = + '' + patchShebangs glib/gen-unicode-tables.pl + patchShebangs glib/tests/gen-casefold-txt.py + patchShebangs glib/tests/gen-casemap-txt.py + patchShebangs tools/gen-visibility-macros.py + patchShebangs tests + + # Needs machine-id, comment the test + sed -e '/\/gdbus\/codegen-peer-to-peer/ s/^\/*/\/\//' -i gio/tests/gdbus-peer.c + sed -e '/g_test_add_func/ s/^\/*/\/\//' -i gio/tests/gdbus-address-get-session.c + # All gschemas fail to pass the test, upstream bug? + sed -e '/g_test_add_data_func/ s/^\/*/\/\//' -i gio/tests/gschema-compile.c + # Cannot reproduce the failing test_associations on hydra + sed -e '/\/appinfo\/associations/d' -i gio/tests/appinfo.c + # Needed because of libtool wrappers + sed -e '/g_subprocess_launcher_set_environ (launcher, envp);/a g_subprocess_launcher_setenv (launcher, "PATH", g_getenv("PATH"), TRUE);' -i gio/tests/gsubprocess.c + '' + + lib.optionalString stdenv.hostPlatform.isWindows '' + substituteInPlace gio/win32/meson.build \ + --replace "libintl, " "" + ''; postConfigure = '' patchShebangs gio/gdbus-2.0/codegen/gdbus-codegen gobject/glib-{genmarshal,mkenums} @@ -258,8 +326,6 @@ stdenv.mkDerivation (finalAttrs: { moveToOutput "share/doc" "$devdoc" ''; - nativeCheckInputs = [ tzdata desktop-file-utils shared-mime-info ]; - # Conditional necessary to break infinite recursion with passthru.tests preCheck = lib.optionalString finalAttrs.finalPackage.doCheck or config.doCheckByDefault or false '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/glib-${finalAttrs.version}/glib/.libs''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" @@ -302,7 +368,9 @@ stdenv.mkDerivation (finalAttrs: { getSchemaDataDirPath = pkg: makeSchemaDataDirPath pkg pkg.name; tests = { - withChecks = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + withChecks = finalAttrs.finalPackage.overrideAttrs (_: { + doCheck = true; + }); pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; @@ -326,15 +394,20 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "C library of programming buildings blocks"; - homepage = "https://gitlab.gnome.org/GNOME/glib"; - license = licenses.lgpl21Plus; - maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]); + homepage = "https://gitlab.gnome.org/GNOME/glib"; + license = licenses.lgpl21Plus; + maintainers = + teams.gnome.members + ++ (with maintainers; [ + lovek323 + raskin + ]); pkgConfigModules = [ "gio-2.0" "gobject-2.0" "gthread-2.0" ]; - platforms = platforms.unix ++ platforms.windows; + platforms = platforms.unix ++ platforms.windows; longDescription = '' GLib provides the core application building blocks for libraries From 34f5f7e1ba7b1591ada85bc61aec28f7aa06442a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 22 Dec 2024 03:17:16 +0100 Subject: [PATCH 68/78] glib: move to by-name --- .../libraries => by-name/gl}/glib/darwin-compilation.patch | 0 .../gl}/glib/elementary-terminal-support.patch | 0 .../{development/libraries => by-name/gl}/glib/gdb_script.patch | 0 .../libraries => by-name/gl}/glib/glib-appinfo-watch.patch | 0 .../libraries => by-name/gl}/glib/gobject_init_on_demand.patch | 0 .../libraries/glib/default.nix => by-name/gl/glib/package.nix} | 0 .../libraries => by-name/gl}/glib/quark_init_on_demand.patch | 0 .../gl}/glib/schema-override-variable.patch | 0 pkgs/{development/libraries => by-name/gl}/glib/setup-hook.sh | 0 .../libraries => by-name/gl}/glib/split-dev-programs.patch | 0 pkgs/top-level/all-packages.nix | 2 +- 11 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{development/libraries => by-name/gl}/glib/darwin-compilation.patch (100%) rename pkgs/{development/libraries => by-name/gl}/glib/elementary-terminal-support.patch (100%) rename pkgs/{development/libraries => by-name/gl}/glib/gdb_script.patch (100%) rename pkgs/{development/libraries => by-name/gl}/glib/glib-appinfo-watch.patch (100%) rename pkgs/{development/libraries => by-name/gl}/glib/gobject_init_on_demand.patch (100%) rename pkgs/{development/libraries/glib/default.nix => by-name/gl/glib/package.nix} (100%) rename pkgs/{development/libraries => by-name/gl}/glib/quark_init_on_demand.patch (100%) rename pkgs/{development/libraries => by-name/gl}/glib/schema-override-variable.patch (100%) rename pkgs/{development/libraries => by-name/gl}/glib/setup-hook.sh (100%) rename pkgs/{development/libraries => by-name/gl}/glib/split-dev-programs.patch (100%) diff --git a/pkgs/development/libraries/glib/darwin-compilation.patch b/pkgs/by-name/gl/glib/darwin-compilation.patch similarity index 100% rename from pkgs/development/libraries/glib/darwin-compilation.patch rename to pkgs/by-name/gl/glib/darwin-compilation.patch diff --git a/pkgs/development/libraries/glib/elementary-terminal-support.patch b/pkgs/by-name/gl/glib/elementary-terminal-support.patch similarity index 100% rename from pkgs/development/libraries/glib/elementary-terminal-support.patch rename to pkgs/by-name/gl/glib/elementary-terminal-support.patch diff --git a/pkgs/development/libraries/glib/gdb_script.patch b/pkgs/by-name/gl/glib/gdb_script.patch similarity index 100% rename from pkgs/development/libraries/glib/gdb_script.patch rename to pkgs/by-name/gl/glib/gdb_script.patch diff --git a/pkgs/development/libraries/glib/glib-appinfo-watch.patch b/pkgs/by-name/gl/glib/glib-appinfo-watch.patch similarity index 100% rename from pkgs/development/libraries/glib/glib-appinfo-watch.patch rename to pkgs/by-name/gl/glib/glib-appinfo-watch.patch diff --git a/pkgs/development/libraries/glib/gobject_init_on_demand.patch b/pkgs/by-name/gl/glib/gobject_init_on_demand.patch similarity index 100% rename from pkgs/development/libraries/glib/gobject_init_on_demand.patch rename to pkgs/by-name/gl/glib/gobject_init_on_demand.patch diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/by-name/gl/glib/package.nix similarity index 100% rename from pkgs/development/libraries/glib/default.nix rename to pkgs/by-name/gl/glib/package.nix diff --git a/pkgs/development/libraries/glib/quark_init_on_demand.patch b/pkgs/by-name/gl/glib/quark_init_on_demand.patch similarity index 100% rename from pkgs/development/libraries/glib/quark_init_on_demand.patch rename to pkgs/by-name/gl/glib/quark_init_on_demand.patch diff --git a/pkgs/development/libraries/glib/schema-override-variable.patch b/pkgs/by-name/gl/glib/schema-override-variable.patch similarity index 100% rename from pkgs/development/libraries/glib/schema-override-variable.patch rename to pkgs/by-name/gl/glib/schema-override-variable.patch diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/by-name/gl/glib/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/glib/setup-hook.sh rename to pkgs/by-name/gl/glib/setup-hook.sh diff --git a/pkgs/development/libraries/glib/split-dev-programs.patch b/pkgs/by-name/gl/glib/split-dev-programs.patch similarity index 100% rename from pkgs/development/libraries/glib/split-dev-programs.patch rename to pkgs/by-name/gl/glib/split-dev-programs.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 679e0a50c3a8..c69e89c67938 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9252,7 +9252,7 @@ with pkgs; grantlee = libsForQt5.callPackage ../development/libraries/grantlee { }; - glib = callPackage ../development/libraries/glib (let + glib = callPackage ../by-name/gl/glib/package.nix (let glib-untested = glib.overrideAttrs { doCheck = false; }; in { # break dependency cycles From 18bcb1ef6e5397826e4bfae8ae95f1f88bf59f4f Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Wed, 1 Jan 2025 03:47:18 +0800 Subject: [PATCH 69/78] waveterm: 0.10.1 -> 0.10.4 (#367119) --- pkgs/by-name/wa/waveterm/package.nix | 101 ++++++++++----------------- pkgs/by-name/wa/waveterm/update.sh | 12 ++-- 2 files changed, 41 insertions(+), 72 deletions(-) diff --git a/pkgs/by-name/wa/waveterm/package.nix b/pkgs/by-name/wa/waveterm/package.nix index 8d70107b3a77..f5d131b67dfb 100644 --- a/pkgs/by-name/wa/waveterm/package.nix +++ b/pkgs/by-name/wa/waveterm/package.nix @@ -2,8 +2,7 @@ lib, stdenv, fetchurl, - makeDesktopItem, - copyDesktopItems, + dpkg, autoPatchelfHook, atk, at-spi2-atk, @@ -28,44 +27,19 @@ wrapGAppsHook3, udev, libGL, - fetchzip, unzip, + makeWrapper, }: let selectSystem = attrs: attrs.${stdenv.hostPlatform.system}; pname = "waveterm"; - version = "0.10.1"; + version = "0.10.4"; + passthru.updateScript = ./update.sh; - desktopItems = [ - (makeDesktopItem { - name = "waveterm"; - exec = "waveterm --no-sandbox %U"; - icon = fetchurl { - url = "https://raw.githubusercontent.com/wavetermdev/waveterm/refs/tags/v${version}/build/appicon.png"; - hash = "sha256-qob27/64C9XPBtXghxg5/g0qRaiOUOpuFYL1n7/aEB0="; - }; - startupWMClass = "Wave"; - comment = "Open-Source AI-Native Terminal Built for Seamless Workflows"; - desktopName = "Wave"; - genericName = "Terminal Emulator"; - categories = [ - "Development" - "Utility" - "TerminalEmulator" - ]; - keywords = [ - "developer" - "terminal" - "emulator" - ]; - }) - ]; - - meta = { + metaCommon = { description = "Open-source, cross-platform terminal for seamless workflows"; homepage = "https://www.waveterm.dev"; - mainProgram = "waveterm"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.asl20; platforms = [ @@ -78,35 +52,28 @@ let }; linux = stdenv.mkDerivation { - inherit - pname - version - desktopItems - meta - passthru - ; + inherit pname version passthru; src = let arch = selectSystem { - x86_64-linux = "x64"; + x86_64-linux = "amd64"; aarch64-linux = "arm64"; }; - hash = selectSystem { - x86_64-linux = "sha256-zv8ndwMt4VqsdJEEdfXzK4rnyslxF/gwnFdUu5OavNY="; - aarch64-linux = "sha256-6EFk1CDPeYc1KWeIxBQEsMLA9tYpnSxjG+yRg5CkGZA="; - }; in - fetchzip { - url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.zip"; - inherit hash; - stripRoot = false; + fetchurl { + url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/waveterm-linux-${arch}-${version}.deb"; + hash = selectSystem { + x86_64-linux = "sha256-dwBnRuskajMpfaBQ5zr19+CQ3A/qen2RtxmV7GnXx0E="; + aarch64-linux = "sha256-HfzvbAV8RkmuwvuBtgvHgzAslbejlPJJJO7juGSMm1o="; + }; }; nativeBuildInputs = [ - copyDesktopItems + dpkg autoPatchelfHook wrapGAppsHook3 + makeWrapper ]; buildInputs = [ @@ -139,30 +106,31 @@ let installPhase = '' runHook preInstall - mkdir $out - cp -r . $out/waveterm + cp -r opt $out + cp -r usr/share $out/share + substituteInPlace $out/share/applications/waveterm.desktop \ + --replace-fail "/opt/Wave/" "" runHook postInstall ''; preFixup = '' mkdir $out/bin - makeWrapper $out/waveterm/waveterm $out/bin/waveterm \ + makeWrapper $out/Wave/waveterm $out/bin/waveterm \ --prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath [ libGL ] }" ''; + + meta = metaCommon // { + mainProgram = "waveterm"; + }; }; - darwin = stdenv.mkDerivation rec { - inherit - pname - version - meta - passthru - ; + darwin = stdenv.mkDerivation { + inherit pname version passthru; src = let @@ -170,30 +138,31 @@ let x86_64-darwin = "x64"; aarch64-darwin = "arm64"; }; - hash = selectSystem { - x86_64-darwin = "sha256-7TCDg0TU0Bx9WLwLiQRcyzrFTlmkXYQIpya2SUiEXoc="; - aarch64-darwin = "sha256-pVxPmTz1bCKREUOvA3Jrf7kiOI5iLzqgnutblEqc4IA="; - }; in fetchurl { url = "https://github.com/wavetermdev/waveterm/releases/download/v${version}/Wave-darwin-${arch}-${version}.zip"; - inherit hash; + hash = selectSystem { + x86_64-darwin = "sha256-iQimmHhpojimZvJtPgOExLaEu/io6BrWWkTsx/1avjY="; + aarch64-darwin = "sha256-4txsd3aKIcsjSvx+XeDm7a6M9YRkZNLUuvv5adLOVx8="; + }; }; nativeBuildInputs = [ unzip ]; - sourceRoot = "Wave.app"; - installPhase = '' runHook preInstall mkdir -p $out/Applications - cp -r . $out/Applications/Wave.app + cp -r . "$out/Applications/Wave.app" runHook postInstall ''; + + meta = metaCommon // { + mainProgram = "Wave"; + }; }; in if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/wa/waveterm/update.sh b/pkgs/by-name/wa/waveterm/update.sh index 37eadc1edee6..e04f4c805dbd 100755 --- a/pkgs/by-name/wa/waveterm/update.sh +++ b/pkgs/by-name/wa/waveterm/update.sh @@ -16,19 +16,19 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then fi for i in \ - "x86_64-linux waveterm-linux-x64" \ - "aarch64-linux waveterm-linux-arm64"; do + "x86_64-linux amd64" \ + "aarch64-linux arm64"; do set -- $i - prefetch=$(nix-prefetch-url --unpack "https://github.com/wavetermdev/waveterm/releases/download/v$latestVersion/$2-$latestVersion.zip") + prefetch=$(nix-prefetch-url "https://github.com/wavetermdev/waveterm/releases/download/v$latestVersion/waveterm-linux-$2-$latestVersion.deb") hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch) update-source-version waveterm $latestVersion $hash --system=$1 --ignore-same-version done for i in \ - "x86_64-darwin Wave-darwin-x64" \ - "aarch64-darwin Wave-darwin-arm64"; do + "x86_64-darwin x64" \ + "aarch64-darwin arm64"; do set -- $i - prefetch=$(nix-prefetch-url "https://github.com/wavetermdev/waveterm/releases/download/v$latestVersion/$2-$latestVersion.zip") + prefetch=$(nix-prefetch-url "https://github.com/wavetermdev/waveterm/releases/download/v$latestVersion/Wave-darwin-$2-$latestVersion.zip") hash=$(nix hash convert --hash-algo sha256 --to sri $prefetch) update-source-version waveterm $latestVersion $hash --system=$1 --ignore-same-version done From 325d741a06f08db843d44fb376ab39d457d5309a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 19:55:58 +0000 Subject: [PATCH 70/78] hyprutils: 0.2.6 -> 0.3.0 --- pkgs/by-name/hy/hyprutils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index de29c5adcf52..fec3042b5a4d 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.2.6"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk="; + hash = "sha256-5Wvsn+0/Hu6eUUToK9hBWwRlbg1i++lc9or4yPYBUuk="; }; nativeBuildInputs = [ From 860472df032c79678cd3dcb1109f6ea33aa1e634 Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle Date: Mon, 30 Dec 2024 19:40:11 +0100 Subject: [PATCH 71/78] qownnotes: move package to by-name directory Signed-off-by: Patrizio Bekerle --- .../qo/qownnotes/package.nix} | 24 +++++++------------ pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 9 insertions(+), 19 deletions(-) rename pkgs/{applications/office/qownnotes/default.nix => by-name/qo/qownnotes/package.nix} (89%) diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/by-name/qo/qownnotes/package.nix similarity index 89% rename from pkgs/applications/office/qownnotes/default.nix rename to pkgs/by-name/qo/qownnotes/package.nix index 12da21cfd6fe..f3b8d8fc3e08 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -1,15 +1,9 @@ { lib , stdenv , fetchurl +, qt6Packages , cmake -, qttools -, qtbase -, qtdeclarative -, qtsvg -, qtwayland -, qtwebsockets , makeWrapper -, wrapQtAppsHook , botan2 , pkg-config , nixosTests @@ -22,7 +16,7 @@ let appname = "QOwnNotes"; version = "24.12.7"; in -stdenv.mkDerivation { +qt6Packages.stdenv.mkDerivation { inherit pname version; src = fetchurl { @@ -32,19 +26,19 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - qttools - wrapQtAppsHook + qt6Packages.qttools + qt6Packages.wrapQtAppsHook pkg-config installShellFiles ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; buildInputs = [ - qtbase - qtdeclarative - qtsvg - qtwebsockets + qt6Packages.qtbase + qt6Packages.qtdeclarative + qt6Packages.qtsvg + qt6Packages.qtwebsockets botan2 - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]; + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ]; cmakeFlags = [ "-DQON_QT6_BUILD=ON" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2036862232f..0ab8656290ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4951,10 +4951,6 @@ with pkgs; qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; - qownnotes = qt6Packages.callPackage ../applications/office/qownnotes { - stdenv = if stdenv.hostPlatform.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; - }; - qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { }; From 37c70872d669f87bcf50e4dbb740573f333f1f7b Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle Date: Mon, 30 Dec 2024 20:00:20 +0100 Subject: [PATCH 72/78] qownnotes: format with nixfmt Signed-off-by: Patrizio Bekerle --- pkgs/by-name/qo/qownnotes/package.nix | 76 +++++++++++++++------------ 1 file changed, 42 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix index f3b8d8fc3e08..78608b0b53e0 100644 --- a/pkgs/by-name/qo/qownnotes/package.nix +++ b/pkgs/by-name/qo/qownnotes/package.nix @@ -1,14 +1,15 @@ -{ lib -, stdenv -, fetchurl -, qt6Packages -, cmake -, makeWrapper -, botan2 -, pkg-config -, nixosTests -, installShellFiles -, xvfb-run +{ + lib, + stdenv, + fetchurl, + qt6Packages, + cmake, + makeWrapper, + botan2, + pkg-config, + nixosTests, + installShellFiles, + xvfb-run, }: let @@ -24,13 +25,16 @@ qt6Packages.stdenv.mkDerivation { hash = "sha256-48puEyScG6EIrsXZpFc62dl4a23p+TO2buzuwq9m3Sw="; }; - nativeBuildInputs = [ - cmake - qt6Packages.qttools - qt6Packages.wrapQtAppsHook - pkg-config - installShellFiles - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; + nativeBuildInputs = + [ + cmake + qt6Packages.qttools + qt6Packages.wrapQtAppsHook + pkg-config + installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; buildInputs = [ qt6Packages.qtbase @@ -46,30 +50,31 @@ qt6Packages.stdenv.mkDerivation { ]; # Install shell completion on Linux (with xvfb-run) - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' installShellCompletion --cmd ${appname} \ --bash <(xvfb-run $out/bin/${appname} --completion bash) \ --fish <(xvfb-run $out/bin/${appname} --completion fish) installShellCompletion --cmd ${pname} \ --bash <(xvfb-run $out/bin/${appname} --completion bash) \ --fish <(xvfb-run $out/bin/${appname} --completion fish) - '' - # Install shell completion on macOS - + lib.optionalString stdenv.isDarwin '' + '' + # Install shell completion on macOS + + lib.optionalString stdenv.isDarwin '' installShellCompletion --cmd ${pname} \ --bash <($out/bin/${appname} --completion bash) \ --fish <($out/bin/${appname} --completion fish) - '' - # Create a lowercase symlink for Linux - + lib.optionalString stdenv.hostPlatform.isLinux '' - ln -s $out/bin/${appname} $out/bin/${pname} - '' - # Rename application for macOS as lowercase binary - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Prevent "same file" error - mv $out/bin/${appname} $out/bin/${pname}.bin - mv $out/bin/${pname}.bin $out/bin/${pname} - ''; + '' + # Create a lowercase symlink for Linux + + lib.optionalString stdenv.hostPlatform.isLinux '' + ln -s $out/bin/${appname} $out/bin/${pname} + '' + # Rename application for macOS as lowercase binary + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Prevent "same file" error + mv $out/bin/${appname} $out/bin/${pname}.bin + mv $out/bin/${pname}.bin $out/bin/${pname} + ''; # Tests QOwnNotes using the NixOS module by launching xterm: passthru.tests.basic-nixos-module-functionality = nixosTests.qownnotes; @@ -80,7 +85,10 @@ qt6Packages.stdenv.mkDerivation { changelog = "https://www.qownnotes.org/changelog.html"; downloadPage = "https://github.com/pbek/QOwnNotes/releases/tag/v${version}"; license = licenses.gpl2Only; - maintainers = with maintainers; [ pbek totoroot ]; + maintainers = with maintainers; [ + pbek + totoroot + ]; platforms = platforms.unix; }; } From 354b423fcc3e4076f52a061c3f7376384ab551ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 21 Dec 2024 14:22:50 +0000 Subject: [PATCH 73/78] libportal: 0.8.1 -> 0.9.0 --- pkgs/by-name/li/libportal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libportal/package.nix b/pkgs/by-name/li/libportal/package.nix index 832146707d16..5b76dc8ccdcd 100644 --- a/pkgs/by-name/li/libportal/package.nix +++ b/pkgs/by-name/li/libportal/package.nix @@ -21,7 +21,7 @@ assert stdenv.mkDerivation rec { pname = "libportal" + lib.optionalString (variant != null) "-${variant}"; - version = "0.8.1"; + version = "0.9.0"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = "libportal"; rev = version; - sha256 = "sha256-NAkD5pAQpmAtVxsFZt74PwURv+RbGBfqENIwyxEEUSc="; + sha256 = "sha256-uKblVaJB3s01En/T3ofT8uZHHarPKAO1qyLidLZ/b/g="; }; depsBuildBuild = [ From f5e32616832f9b056e4588334cf880091bc25c50 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 31 Dec 2024 22:15:09 +0100 Subject: [PATCH 74/78] workflows: remove 24.05 merges --- .github/workflows/periodic-merge-24h.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 813d6a988efd..08570d60e1d4 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -35,10 +35,6 @@ jobs: pairs: - from: master into: haskell-updates - - from: release-24.05 - into: staging-next-24.05 - - from: staging-next-24.05 - into: staging-24.05 - from: release-24.11 into: staging-next-24.11 - from: staging-next-24.11 From 2927d4b6babe4876b50bfe1036ea1b37552124a4 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 31 Dec 2024 22:15:23 +0100 Subject: [PATCH 75/78] lib/trivial: update oldestSupportedRelease --- lib/trivial.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/trivial.nix b/lib/trivial.nix index 0e196018961c..d3ed7d9eda9e 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -416,7 +416,7 @@ in { */ oldestSupportedRelease = # Update on master only. Do not backport. - 2405; + 2411; /** Whether a feature is supported in all supported releases (at the time of From bef31a9d8f384907167220de0a22b985415d9c39 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 31 Dec 2024 16:23:43 -0500 Subject: [PATCH 76/78] Revert "ghostty: rename `package.nix` to `linux.nix`" This reverts commit 0bc91a7b06dfdfca1c033d25f718b120d5a572e6. --- pkgs/by-name/gh/ghostty/linux.nix | 178 -------------------------- pkgs/by-name/gh/ghostty/package.nix | 190 ++++++++++++++++++++++++---- 2 files changed, 167 insertions(+), 201 deletions(-) delete mode 100644 pkgs/by-name/gh/ghostty/linux.nix diff --git a/pkgs/by-name/gh/ghostty/linux.nix b/pkgs/by-name/gh/ghostty/linux.nix deleted file mode 100644 index ce2d6010f2b0..000000000000 --- a/pkgs/by-name/gh/ghostty/linux.nix +++ /dev/null @@ -1,178 +0,0 @@ -{ - pname, - version, - outputs, - meta, - lib, - stdenv, - bzip2, - callPackage, - fetchFromGitHub, - fontconfig, - freetype, - glib, - glslang, - harfbuzz, - libGL, - libX11, - libadwaita, - ncurses, - nixosTests, - oniguruma, - pandoc, - pkg-config, - removeReferencesTo, - versionCheckHook, - wrapGAppsHook4, - zig_0_13, - # Usually you would override `zig.hook` with this, but we do that internally - # since upstream recommends a non-default level - # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/PACKAGING.md#build-options - optimizeLevel ? "ReleaseFast", - # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/build.zig#L106 - withAdwaita ? true, -}: - -let - zig_hook = zig_0_13.hook.overrideAttrs { - zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off"; - }; - - # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/apprt.zig#L72-L76 - appRuntime = if stdenv.hostPlatform.isLinux then "gtk" else "none"; - # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/font/main.zig#L94 - fontBackend = if stdenv.hostPlatform.isDarwin then "coretext" else "fontconfig_freetype"; - # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/renderer.zig#L51-L52 - renderer = if stdenv.hostPlatform.isDarwin then "metal" else "opengl"; -in - -stdenv.mkDerivation (finalAttrs: { - inherit - pname - version - outputs - meta - ; - - src = fetchFromGitHub { - owner = "ghostty-org"; - repo = "ghostty"; - tag = "v${finalAttrs.version}"; - hash = "sha256-AHI1Z4mfgXkNwQA8xYq4tS0/BARbHL7gQUT41vCxQTM="; - }; - - # Avoid using runtime hacks to help find X11 - postPatch = lib.optionalString (appRuntime == "gtk") '' - substituteInPlace src/apprt/gtk/x11.zig \ - --replace-warn 'std.DynLib.open("libX11.so");' 'std.DynLib.open("${lib.getLib libX11}/lib/libX11.so");' - ''; - - deps = callPackage ./deps.nix { - name = "${finalAttrs.pname}-cache-${finalAttrs.version}"; - }; - - strictDeps = true; - - nativeBuildInputs = - [ - ncurses - pandoc - pkg-config - removeReferencesTo - zig_hook - ] - ++ lib.optionals (appRuntime == "gtk") [ - glib # Required for `glib-compile-schemas` - wrapGAppsHook4 - ]; - - buildInputs = - [ - glslang - oniguruma - ] - ++ lib.optional (appRuntime == "gtk" && withAdwaita) libadwaita - ++ lib.optional (appRuntime == "gtk") libX11 - ++ lib.optional (renderer == "opengl") libGL - ++ lib.optionals (fontBackend == "fontconfig_freetype") [ - bzip2 - fontconfig - freetype - harfbuzz - ]; - - zigBuildFlags = - [ - "--system" - "${finalAttrs.deps}" - "-Dversion-string=${finalAttrs.version}" - - "-Dapp-runtime=${appRuntime}" - "-Dfont-backend=${fontBackend}" - "-Dgtk-adwaita=${lib.boolToString withAdwaita}" - "-Drenderer=${renderer}" - ] - ++ lib.mapAttrsToList (name: package: "-fsys=${name} --search-prefix ${lib.getLib package}") { - inherit glslang; - }; - - zigCheckFlags = finalAttrs.zigBuildFlags; - - # Unit tests currently fail inside the sandbox - doCheck = false; - - /** - Ghostty really likes all of it's resources to be in the same directory, so link them back after we split them - - - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/os/resourcesdir.zig#L11-L52 - - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/termio/Exec.zig#L745-L750 - - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/termio/Exec.zig#L818-L834 - - terminfo and shell integration should also be installable on remote machines - - ```nix - { pkgs, ... }: { - environment.systemPackages = [ pkgs.ghostty.terminfo ]; - - programs.bash = { - interactiveShellInit = '' - if [[ "$TERM" == "xterm-ghostty" ]]; then - builtin source ${pkgs.ghostty.shell_integration}/bash/ghostty.bash - fi - ''; - }; - } - ``` - */ - postFixup = '' - ln -s $man/share/man $out/share/man - - moveToOutput share/terminfo $terminfo - ln -s $terminfo/share/terminfo $out/share/terminfo - - mv $out/share/ghostty/shell-integration $shell_integration - ln -s $shell_integration $out/share/ghostty/shell-integration - - mv $out/share/vim/vimfiles $vim - rmdir $out/share/vim - ln -s $vim $out/share/vim-plugins - - remove-references-to -t ${finalAttrs.deps} $out/bin/.ghostty-wrapped - ''; - - nativeInstallCheckInputs = [ - versionCheckHook - ]; - - doInstallCheck = true; - - versionCheckProgramArg = [ "--version" ]; - - passthru = { - tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { - inherit (nixosTests) allTerminfo; - nixos = nixosTests.terminal-emulators.ghostty; - }; - }; - -}) diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix index faa55c552978..7242ba82c9da 100644 --- a/pkgs/by-name/gh/ghostty/package.nix +++ b/pkgs/by-name/gh/ghostty/package.nix @@ -1,12 +1,51 @@ { - stdenvNoCC, - callPackage, lib, + stdenv, + bzip2, + callPackage, + fetchFromGitHub, + fontconfig, + freetype, + glib, + glslang, + harfbuzz, + libGL, + libX11, + libadwaita, + ncurses, + nixosTests, + oniguruma, + pandoc, + pkg-config, + removeReferencesTo, + versionCheckHook, + wrapGAppsHook4, + zig_0_13, + # Usually you would override `zig.hook` with this, but we do that internally + # since upstream recommends a non-default level + # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/PACKAGING.md#build-options + optimizeLevel ? "ReleaseFast", + # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/build.zig#L106 + withAdwaita ? true, }: let + zig_hook = zig_0_13.hook.overrideAttrs { + zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off"; + }; + + # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/apprt.zig#L72-L76 + appRuntime = if stdenv.hostPlatform.isLinux then "gtk" else "none"; + # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/font/main.zig#L94 + fontBackend = if stdenv.hostPlatform.isDarwin then "coretext" else "fontconfig_freetype"; + # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/renderer.zig#L51-L52 + renderer = if stdenv.hostPlatform.isDarwin then "metal" else "opengl"; +in + +stdenv.mkDerivation (finalAttrs: { pname = "ghostty"; version = "1.0.0"; + outputs = [ "out" "man" @@ -14,6 +53,129 @@ let "terminfo" "vim" ]; + + src = fetchFromGitHub { + owner = "ghostty-org"; + repo = "ghostty"; + tag = "v${finalAttrs.version}"; + hash = "sha256-AHI1Z4mfgXkNwQA8xYq4tS0/BARbHL7gQUT41vCxQTM="; + }; + + # Avoid using runtime hacks to help find X11 + postPatch = lib.optionalString (appRuntime == "gtk") '' + substituteInPlace src/apprt/gtk/x11.zig \ + --replace-warn 'std.DynLib.open("libX11.so");' 'std.DynLib.open("${lib.getLib libX11}/lib/libX11.so");' + ''; + + deps = callPackage ./deps.nix { + name = "${finalAttrs.pname}-cache-${finalAttrs.version}"; + }; + + strictDeps = true; + + nativeBuildInputs = + [ + ncurses + pandoc + pkg-config + removeReferencesTo + zig_hook + ] + ++ lib.optionals (appRuntime == "gtk") [ + glib # Required for `glib-compile-schemas` + wrapGAppsHook4 + ]; + + buildInputs = + [ + glslang + oniguruma + ] + ++ lib.optional (appRuntime == "gtk" && withAdwaita) libadwaita + ++ lib.optional (appRuntime == "gtk") libX11 + ++ lib.optional (renderer == "opengl") libGL + ++ lib.optionals (fontBackend == "fontconfig_freetype") [ + bzip2 + fontconfig + freetype + harfbuzz + ]; + + zigBuildFlags = + [ + "--system" + "${finalAttrs.deps}" + "-Dversion-string=${finalAttrs.version}" + + "-Dapp-runtime=${appRuntime}" + "-Dfont-backend=${fontBackend}" + "-Dgtk-adwaita=${lib.boolToString withAdwaita}" + "-Drenderer=${renderer}" + ] + ++ lib.mapAttrsToList (name: package: "-fsys=${name} --search-prefix ${lib.getLib package}") { + inherit glslang; + }; + + zigCheckFlags = finalAttrs.zigBuildFlags; + + # Unit tests currently fail inside the sandbox + doCheck = false; + + /** + Ghostty really likes all of it's resources to be in the same directory, so link them back after we split them + + - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/os/resourcesdir.zig#L11-L52 + - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/termio/Exec.zig#L745-L750 + - https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/src/termio/Exec.zig#L818-L834 + + terminfo and shell integration should also be installable on remote machines + + ```nix + { pkgs, ... }: { + environment.systemPackages = [ pkgs.ghostty.terminfo ]; + + programs.bash = { + interactiveShellInit = '' + if [[ "$TERM" == "xterm-ghostty" ]]; then + builtin source ${pkgs.ghostty.shell_integration}/bash/ghostty.bash + fi + ''; + }; + } + ``` + */ + postFixup = '' + ln -s $man/share/man $out/share/man + + moveToOutput share/terminfo $terminfo + ln -s $terminfo/share/terminfo $out/share/terminfo + + mv $out/share/ghostty/shell-integration $shell_integration + ln -s $shell_integration $out/share/ghostty/shell-integration + + mv $out/share/vim/vimfiles $vim + rmdir $out/share/vim + ln -s $vim $out/share/vim-plugins + + + remove-references-to -t ${finalAttrs.deps} $out/bin/.ghostty-wrapped + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + doInstallCheck = true; + + versionCheckProgramArg = [ "--version" ]; + + passthru = { + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { + inherit (nixosTests) allTerminfo; + nixos = nixosTests.terminal-emulators.ghostty; + }; + }; + meta = { description = "Fast, native, feature-rich terminal emulator pushing modern features"; longDescription = '' @@ -31,7 +193,6 @@ let jcollie pluiedev getchoo - DimitarNestorov ]; outputsToInstall = [ "out" @@ -40,24 +201,7 @@ let "terminfo" ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; + # Issues finding the SDK in the sandbox + broken = stdenv.hostPlatform.isDarwin; }; -in - -if stdenvNoCC.hostPlatform.isDarwin then - callPackage ./darwin.nix { - inherit - pname - version - outputs - meta - ; - } -else - callPackage ./linux.nix { - inherit - pname - version - outputs - meta - ; - } +}) From 41551596d7865c478bd6251f4316544bc87dfe71 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 31 Dec 2024 16:24:34 -0500 Subject: [PATCH 77/78] Revert "ghostty: add darwin package" This reverts commit 67fff2ff2f1c42380793d1ac544479aa5a57179c. --- pkgs/by-name/gh/ghostty/darwin.nix | 62 ------------------------------ 1 file changed, 62 deletions(-) delete mode 100644 pkgs/by-name/gh/ghostty/darwin.nix diff --git a/pkgs/by-name/gh/ghostty/darwin.nix b/pkgs/by-name/gh/ghostty/darwin.nix deleted file mode 100644 index adb3ec14988e..000000000000 --- a/pkgs/by-name/gh/ghostty/darwin.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - pname, - version, - outputs, - meta, - lib, - stdenvNoCC, - fetchurl, - _7zz, - makeWrapper, -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - inherit pname version outputs; - - src = fetchurl { - url = "https://release.files.ghostty.org/${finalAttrs.version}/Ghostty.dmg"; - sha256 = "sha256-CR96Kz9BYKFtfVKygiEku51XFJk4FfYqfXACeYQ3JlI="; - }; - - nativeBuildInputs = [ - _7zz - makeWrapper - ]; - - sourceRoot = "."; - installPhase = '' - runHook preInstall - - mkdir -p $out/Applications - mv Ghostty.app $out/Applications/ - makeWrapper $out/Applications/Ghostty.app/Contents/MacOS/ghostty $out/bin/ghostty - - runHook postInstall - ''; - - postFixup = - let - resources = "$out/Applications/Ghostty.app/Contents/Resources"; - in - '' - mkdir -p $man/share - ln -s ${resources}/man $man/share/man - - mkdir -p $terminfo/share - ln -s ${resources}/terminfo $terminfo/share/terminfo - - mkdir -p $shell_integration - for folder in "${resources}/ghostty/shell-integration"/*; do - ln -s $folder $shell_integration/$(basename "$folder") - done - - mkdir -p $vim - for folder in "${resources}/vim/vimfiles"/*; do - ln -s $folder $vim/$(basename "$folder") - done - ''; - - meta = meta // { - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - }; -}) From b6b551fe22e2ba24ccfab50f2c8b3c95ef732c8d Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Tue, 31 Dec 2024 14:04:42 -0800 Subject: [PATCH 78/78] Revert "treewide/nixos: remove `with lib;` part 12" --- nixos/modules/services/x11/colord.nix | 7 +- .../services/x11/desktop-managers/cde.nix | 13 +- .../x11/desktop-managers/cinnamon.nix | 89 ++++++------ .../services/x11/desktop-managers/deepin.nix | 57 ++++---- .../x11/desktop-managers/enlightenment.nix | 15 +- .../services/x11/desktop-managers/kodi.nix | 11 +- .../services/x11/desktop-managers/lumina.nix | 11 +- .../services/x11/desktop-managers/lxqt.nix | 27 ++-- .../services/x11/desktop-managers/mate.nix | 47 ++++--- .../services/x11/desktop-managers/none.nix | 11 +- .../x11/desktop-managers/pantheon.nix | 103 +++++++------- .../x11/desktop-managers/retroarch.nix | 17 ++- .../x11/desktop-managers/surf-display.nix | 33 +++-- .../services/x11/desktop-managers/xfce.nix | 65 ++++----- .../services/x11/desktop-managers/xterm.nix | 15 +- .../lightdm-greeters/enso-os.nix | 54 ++++---- .../display-managers/lightdm-greeters/gtk.nix | 65 ++++----- .../lightdm-greeters/mini.nix | 19 +-- .../lightdm-greeters/mobile.nix | 8 +- .../lightdm-greeters/pantheon.nix | 11 +- .../lightdm-greeters/slick.nix | 61 ++++---- .../lightdm-greeters/tiny.nix | 25 ++-- .../services/x11/display-managers/lightdm.nix | 59 ++++---- .../services/x11/display-managers/slim.nix | 5 +- .../services/x11/display-managers/startx.nix | 11 +- .../services/x11/display-managers/xpra.nix | 41 +++--- nixos/modules/services/x11/extra-layouts.nix | 39 +++--- nixos/modules/services/x11/fractalart.nix | 19 +-- nixos/modules/services/x11/hardware/cmt.nix | 13 +- .../services/x11/hardware/digimend.nix | 7 +- .../services/x11/hardware/synaptics.nix | 109 ++++++++------- nixos/modules/services/x11/hardware/wacom.nix | 9 +- nixos/modules/services/x11/imwheel.nix | 19 +-- nixos/modules/services/x11/picom.nix | 131 +++++++++--------- nixos/modules/services/x11/redshift.nix | 45 +++--- nixos/modules/services/x11/touchegg.nix | 11 +- .../modules/services/x11/unclutter-xfixes.nix | 25 ++-- nixos/modules/services/x11/unclutter.nix | 39 +++--- nixos/modules/services/x11/urxvtd.nix | 12 +- .../services/x11/window-managers/2bwm.nix | 9 +- .../x11/window-managers/afterstep.nix | 9 +- .../services/x11/window-managers/awesome.nix | 21 +-- .../services/x11/window-managers/berry.nix | 9 +- .../services/x11/window-managers/bspwm.nix | 35 ++--- .../services/x11/window-managers/clfswm.nix | 11 +- .../services/x11/window-managers/cwm.nix | 9 +- .../services/x11/window-managers/dwm.nix | 11 +- .../services/x11/window-managers/e16.nix | 9 +- 48 files changed, 807 insertions(+), 674 deletions(-) diff --git a/nixos/modules/services/x11/colord.nix b/nixos/modules/services/x11/colord.nix index 7b8b1bb48c66..1a9ade712739 100644 --- a/nixos/modules/services/x11/colord.nix +++ b/nixos/modules/services/x11/colord.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.colord; @@ -14,12 +17,12 @@ in options = { services.colord = { - enable = lib.mkEnableOption "colord, the color management daemon"; + enable = mkEnableOption "colord, the color management daemon"; }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { environment.systemPackages = [ pkgs.colord ]; diff --git a/nixos/modules/services/x11/desktop-managers/cde.nix b/nixos/modules/services/x11/desktop-managers/cde.nix index 908431f329ef..8dae3ce0d886 100644 --- a/nixos/modules/services/x11/desktop-managers/cde.nix +++ b/nixos/modules/services/x11/desktop-managers/cde.nix @@ -4,16 +4,19 @@ pkgs, ... }: + +with lib; + let xcfg = config.services.xserver; cfg = xcfg.desktopManager.cde; in { options.services.xserver.desktopManager.cde = { - enable = lib.mkEnableOption "Common Desktop Environment"; + enable = mkEnableOption "Common Desktop Environment"; - extraPackages = lib.mkOption { - type = with lib.types; listOf package; + extraPackages = mkOption { + type = with types; listOf package; default = with pkgs.xorg; [ xclock bitmap @@ -26,7 +29,7 @@ in xwd xwud ]; - defaultText = lib.literalExpression '' + defaultText = literalExpression '' with pkgs.xorg; [ xclock bitmap xlsfonts xfd xrefresh xload xwininfo xdpyinfo xwd xwud ] @@ -37,7 +40,7 @@ in }; }; - config = lib.mkIf (xcfg.enable && cfg.enable) { + config = mkIf (xcfg.enable && cfg.enable) { environment.systemPackages = cfg.extraPackages; services.rpcbind.enable = true; diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 43103a663092..c64c2293a439 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -1,4 +1,7 @@ { config, lib, pkgs, utils, ... }: + +with lib; + let cfg = config.services.xserver.desktopManager.cinnamon; @@ -15,16 +18,16 @@ in { options = { services.cinnamon = { - apps.enable = lib.mkEnableOption "Cinnamon default applications"; + apps.enable = mkEnableOption "Cinnamon default applications"; }; services.xserver.desktopManager.cinnamon = { - enable = lib.mkEnableOption "the cinnamon desktop manager"; + enable = mkEnableOption "the cinnamon desktop manager"; - sessionPath = lib.mkOption { + sessionPath = mkOption { default = []; - type = lib.types.listOf lib.types.package; - example = lib.literalExpression "[ pkgs.gpaste ]"; + type = types.listOf types.package; + example = literalExpression "[ pkgs.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. @@ -33,53 +36,53 @@ in ''; }; - extraGSettingsOverrides = lib.mkOption { + extraGSettingsOverrides = mkOption { default = ""; - type = lib.types.lines; + type = types.lines; description = "Additional gsettings overrides."; }; - extraGSettingsOverridePackages = lib.mkOption { + extraGSettingsOverridePackages = mkOption { default = []; - type = lib.types.listOf lib.types.path; + type = types.listOf types.path; description = "List of packages for which gsettings are overridden."; }; }; - environment.cinnamon.excludePackages = lib.mkOption { + environment.cinnamon.excludePackages = mkOption { default = []; - example = lib.literalExpression "[ pkgs.blueman ]"; - type = lib.types.listOf lib.types.package; + example = literalExpression "[ pkgs.blueman ]"; + type = types.listOf types.package; description = "Which packages cinnamon should exclude from the default environment"; }; }; - config = lib.mkMerge [ - (lib.mkIf cfg.enable { + config = mkMerge [ + (mkIf cfg.enable { services.displayManager.sessionPackages = [ pkgs.cinnamon-common ]; services.xserver.displayManager.lightdm.greeters.slick = { - enable = lib.mkDefault true; + enable = mkDefault true; # Taken from mint-artwork.gschema.override - theme = lib.mkIf (notExcluded pkgs.mint-themes) { - name = lib.mkDefault "Mint-Y-Aqua"; - package = lib.mkDefault pkgs.mint-themes; + theme = mkIf (notExcluded pkgs.mint-themes) { + name = mkDefault "Mint-Y-Aqua"; + package = mkDefault pkgs.mint-themes; }; - iconTheme = lib.mkIf (notExcluded pkgs.mint-y-icons) { - name = lib.mkDefault "Mint-Y-Sand"; - package = lib.mkDefault pkgs.mint-y-icons; + iconTheme = mkIf (notExcluded pkgs.mint-y-icons) { + name = mkDefault "Mint-Y-Sand"; + package = mkDefault pkgs.mint-y-icons; }; - cursorTheme = lib.mkIf (notExcluded pkgs.mint-cursor-themes) { - name = lib.mkDefault "Bibata-Modern-Classic"; - package = lib.mkDefault pkgs.mint-cursor-themes; + cursorTheme = mkIf (notExcluded pkgs.mint-cursor-themes) { + name = mkDefault "Bibata-Modern-Classic"; + package = mkDefault pkgs.mint-cursor-themes; }; }; # Have to take care of GDM + Cinnamon on Wayland users environment.extraInit = '' - ${lib.concatMapStrings (p: '' + ${concatMapStrings (p: '' if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} fi @@ -92,30 +95,30 @@ in ''; # Default services - services.blueman.enable = lib.mkDefault (notExcluded pkgs.blueman); - hardware.bluetooth.enable = lib.mkDefault true; + services.blueman.enable = mkDefault (notExcluded pkgs.blueman); + hardware.bluetooth.enable = mkDefault true; security.polkit.enable = true; services.accounts-daemon.enable = true; - services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true)); + services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.dbus.packages = with pkgs; [ cinnamon-common cinnamon-screensaver nemo-with-extensions xapp ]; - services.cinnamon.apps.enable = lib.mkDefault true; + services.cinnamon.apps.enable = mkDefault true; services.gnome.evolution-data-server.enable = true; services.gnome.glib-networking.enable = true; services.gnome.gnome-keyring.enable = true; services.gvfs.enable = true; - services.power-profiles-daemon.enable = lib.mkDefault true; - services.switcherooControl.enable = lib.mkDefault true; # xapp-gpu-offload-helper - services.touchegg.enable = lib.mkDefault true; + services.power-profiles-daemon.enable = mkDefault true; + services.switcherooControl.enable = mkDefault true; # xapp-gpu-offload-helper + services.touchegg.enable = mkDefault true; services.udisks2.enable = true; - services.upower.enable = lib.mkDefault config.powerManagement.enable; - services.libinput.enable = lib.mkDefault true; + services.upower.enable = mkDefault config.powerManagement.enable; + services.libinput.enable = mkDefault true; services.xserver.updateDbusEnvironment = true; - networking.networkmanager.enable = lib.mkDefault true; + networking.networkmanager.enable = mkDefault true; # Enable colord server services.colord.enable = true; @@ -201,9 +204,9 @@ in pkgs.xdg-desktop-portal-gtk ]; - services.orca.enable = lib.mkDefault (notExcluded pkgs.orca); + services.orca.enable = mkDefault (notExcluded pkgs.orca); - xdg.portal.configPackages = lib.mkDefault [ pkgs.cinnamon-common ]; + xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ]; # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; @@ -214,8 +217,8 @@ in ]; # Shell integration for VTE terminals - programs.bash.vteIntegration = lib.mkDefault true; - programs.zsh.vteIntegration = lib.mkDefault true; + programs.bash.vteIntegration = mkDefault true; + programs.zsh.vteIntegration = mkDefault true; # Default Fonts fonts.packages = with pkgs; [ @@ -224,10 +227,10 @@ in ]; }) - (lib.mkIf serviceCfg.apps.enable { - programs.gnome-disks.enable = lib.mkDefault (notExcluded pkgs.gnome-disk-utility); - programs.gnome-terminal.enable = lib.mkDefault (notExcluded pkgs.gnome-terminal); - programs.file-roller.enable = lib.mkDefault (notExcluded pkgs.file-roller); + (mkIf serviceCfg.apps.enable { + programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome-disk-utility); + programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal); + programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller); environment.systemPackages = with pkgs; utils.removePackagesByName [ # cinnamon team apps diff --git a/nixos/modules/services/x11/desktop-managers/deepin.nix b/nixos/modules/services/x11/desktop-managers/deepin.nix index 76ffb71bb2a4..ca9fb229df97 100644 --- a/nixos/modules/services/x11/desktop-managers/deepin.nix +++ b/nixos/modules/services/x11/desktop-managers/deepin.nix @@ -5,6 +5,9 @@ utils, ... }: + +with lib; + let xcfg = config.services.xserver; cfg = xcfg.desktopManager.deepin; @@ -18,68 +21,68 @@ in options = { services.xserver.desktopManager.deepin = { - enable = lib.mkEnableOption "Deepin desktop manager"; - extraGSettingsOverrides = lib.mkOption { + enable = mkEnableOption "Deepin desktop manager"; + extraGSettingsOverrides = mkOption { default = ""; - type = lib.types.lines; + type = types.lines; description = "Additional gsettings overrides."; }; - extraGSettingsOverridePackages = lib.mkOption { + extraGSettingsOverridePackages = mkOption { default = [ ]; - type = lib.types.listOf lib.types.path; + type = types.listOf types.path; description = "List of packages for which gsettings are overridden."; }; }; - environment.deepin.excludePackages = lib.mkOption { + environment.deepin.excludePackages = mkOption { default = [ ]; - type = lib.types.listOf lib.types.package; + type = types.listOf types.package; description = "List of default packages to exclude from the configuration"; }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { services.displayManager.sessionPackages = [ pkgs.deepin.dde-session ]; - services.displayManager.defaultSession = lib.mkDefault "dde-x11"; + services.displayManager.defaultSession = mkDefault "dde-x11"; # Update the DBus activation environment after launching the desktop manager. services.xserver.displayManager.sessionCommands = '' ${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd --all ''; - hardware.bluetooth.enable = lib.mkDefault true; + hardware.bluetooth.enable = mkDefault true; security.polkit.enable = true; - services.deepin.dde-daemon.enable = lib.mkForce true; - services.deepin.dde-api.enable = lib.mkForce true; - services.deepin.app-services.enable = lib.mkForce true; + services.deepin.dde-daemon.enable = mkForce true; + services.deepin.dde-api.enable = mkForce true; + services.deepin.app-services.enable = mkForce true; - services.colord.enable = lib.mkDefault true; - services.accounts-daemon.enable = lib.mkDefault true; - services.gvfs.enable = lib.mkDefault true; - services.gnome.glib-networking.enable = lib.mkDefault true; - services.gnome.gnome-keyring.enable = lib.mkDefault true; - services.bamf.enable = lib.mkDefault true; + services.colord.enable = mkDefault true; + services.accounts-daemon.enable = mkDefault true; + services.gvfs.enable = mkDefault true; + services.gnome.glib-networking.enable = mkDefault true; + services.gnome.gnome-keyring.enable = mkDefault true; + services.bamf.enable = mkDefault true; - services.libinput.enable = lib.mkDefault true; + services.libinput.enable = mkDefault true; services.udisks2.enable = true; - services.upower.enable = lib.mkDefault config.powerManagement.enable; - networking.networkmanager.enable = lib.mkDefault true; - programs.dconf.enable = lib.mkDefault true; - programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-qt; + services.upower.enable = mkDefault config.powerManagement.enable; + networking.networkmanager.enable = mkDefault true; + programs.dconf.enable = mkDefault true; + programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt; fonts.packages = with pkgs; [ noto-fonts ]; xdg.mime.enable = true; xdg.menus.enable = true; xdg.icons.enable = true; - xdg.portal.enable = lib.mkDefault true; - xdg.portal.extraPortals = lib.mkDefault [ + xdg.portal.enable = mkDefault true; + xdg.portal.extraPortals = mkDefault [ pkgs.xdg-desktop-portal-gtk ]; # https://github.com/NixOS/nixpkgs/pull/247766#issuecomment-1722839259 - xdg.portal.config.deepin.default = lib.mkDefault [ "gtk" ]; + xdg.portal.config.deepin.default = mkDefault [ "gtk" ]; environment.sessionVariables = { NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 8acd66a1bcdc..05ed81e57992 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -4,6 +4,9 @@ lib, ... }: + +with lib; + let e = pkgs.enlightenment; @@ -20,11 +23,11 @@ in { meta = { - maintainers = lib.teams.enlightenment.members; + maintainers = teams.enlightenment.members; }; imports = [ - (lib.mkRenamedOptionModule + (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "e19" "enable" ] [ "services" "xserver" "desktopManager" "enlightenment" "enable" ] ) @@ -32,15 +35,15 @@ in options = { - services.xserver.desktopManager.enlightenment.enable = lib.mkOption { - type = lib.types.bool; + services.xserver.desktopManager.enlightenment.enable = mkOption { + type = types.bool; default = false; description = "Enable the Enlightenment desktop environment."; }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ enlightenment.econnman @@ -102,7 +105,7 @@ in services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - services.libinput.enable = lib.mkDefault true; + services.libinput.enable = mkDefault true; services.dbus.packages = [ e.efl ]; diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix index 0330c5b353e1..0dd2f8ffb829 100644 --- a/nixos/modules/services/x11/desktop-managers/kodi.nix +++ b/nixos/modules/services/x11/desktop-managers/kodi.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.desktopManager.kodi; in @@ -11,19 +14,19 @@ in { options = { services.xserver.desktopManager.kodi = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = "Enable the kodi multimedia center."; }; - package = lib.mkPackageOption pkgs "kodi" { + package = mkPackageOption pkgs "kodi" { example = "kodi.withPackages (p: with p; [ jellyfin pvr-iptvsimple vfs-sftp ])"; }; }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { services.xserver.desktopManager.session = [ { name = "kodi"; diff --git a/nixos/modules/services/x11/desktop-managers/lumina.nix b/nixos/modules/services/x11/desktop-managers/lumina.nix index 9931ecffddcb..74fabced3af3 100644 --- a/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let xcfg = config.services.xserver; @@ -13,20 +16,20 @@ in { meta = { - maintainers = lib.teams.lumina.members; + maintainers = teams.lumina.members; }; options = { - services.xserver.desktopManager.lumina.enable = lib.mkOption { - type = lib.types.bool; + services.xserver.desktopManager.lumina.enable = mkOption { + type = types.bool; default = false; description = "Enable the Lumina desktop manager"; }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { services.displayManager.sessionPackages = [ pkgs.lumina.lumina diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index a5af6fa57930..ac86c385bcc8 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -1,4 +1,7 @@ { config, lib, pkgs, utils, ... }: + +with lib; + let xcfg = config.services.xserver; cfg = xcfg.desktopManager.lxqt; @@ -7,29 +10,29 @@ in { meta = { - maintainers = lib.teams.lxqt.members; + maintainers = teams.lxqt.members; }; options = { - services.xserver.desktopManager.lxqt.enable = lib.mkOption { - type = lib.types.bool; + services.xserver.desktopManager.lxqt.enable = mkOption { + type = types.bool; default = false; description = "Enable the LXQt desktop manager"; }; - environment.lxqt.excludePackages = lib.mkOption { + environment.lxqt.excludePackages = mkOption { default = []; - example = lib.literalExpression "[ pkgs.lxqt.qterminal ]"; - type = lib.types.listOf lib.types.package; + example = literalExpression "[ pkgs.lxqt.qterminal ]"; + type = types.listOf types.package; description = "Which LXQt packages to exclude from the default environment"; }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { - services.xserver.desktopManager.session = lib.singleton { + services.xserver.desktopManager.session = singleton { name = "lxqt"; bgSupport = true; start = '' @@ -59,19 +62,19 @@ in # Link some extra directories in /run/current-system/software/share environment.pathsToLink = [ "/share" ]; - programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-qt; + programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-qt; # virtual file systems support for PCManFM-QT services.gvfs.enable = true; services.upower.enable = config.powerManagement.enable; - services.libinput.enable = lib.mkDefault true; + services.libinput.enable = mkDefault true; - xdg.portal.lxqt.enable = lib.mkDefault true; + xdg.portal.lxqt.enable = mkDefault true; # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050804 - xdg.portal.config.lxqt.default = lib.mkDefault [ "lxqt" "gtk" ]; + xdg.portal.config.lxqt.default = mkDefault [ "lxqt" "gtk" ]; }; } diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 1f908bbf512a..e5144bc9d102 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -5,6 +5,9 @@ utils, ... }: + +with lib; + let xcfg = config.services.xserver; @@ -16,48 +19,48 @@ in options = { services.xserver.desktopManager.mate = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = "Enable the MATE desktop environment"; }; - debug = lib.mkEnableOption "mate-session debug messages"; + debug = mkEnableOption "mate-session debug messages"; - extraPanelApplets = lib.mkOption { + extraPanelApplets = mkOption { default = [ ]; - example = lib.literalExpression "with pkgs.mate; [ mate-applets ]"; - type = lib.types.listOf lib.types.package; + example = literalExpression "with pkgs.mate; [ mate-applets ]"; + type = types.listOf types.package; description = "Extra applets to add to mate-panel."; }; - extraCajaExtensions = lib.mkOption { + extraCajaExtensions = mkOption { default = [ ]; example = lib.literalExpression "with pkgs.mate; [ caja-extensions ]"; - type = lib.types.listOf lib.types.package; + type = types.listOf types.package; description = "Extra extensions to add to caja."; }; - enableWaylandSession = lib.mkEnableOption "MATE Wayland session"; + enableWaylandSession = mkEnableOption "MATE Wayland session"; }; - environment.mate.excludePackages = lib.mkOption { + environment.mate.excludePackages = mkOption { default = [ ]; - example = lib.literalExpression "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]"; - type = lib.types.listOf lib.types.package; + example = literalExpression "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]"; + type = types.listOf types.package; description = "Which MATE packages to exclude from the default environment"; }; }; - config = lib.mkMerge [ - (lib.mkIf (cfg.enable || cfg.enableWaylandSession) { + config = mkMerge [ + (mkIf (cfg.enable || cfg.enableWaylandSession) { services.displayManager.sessionPackages = [ pkgs.mate.mate-session-manager ]; # Debugging - environment.sessionVariables.MATE_SESSION_DEBUG = lib.mkIf cfg.debug "1"; + environment.sessionVariables.MATE_SESSION_DEBUG = mkIf cfg.debug "1"; environment.systemPackages = utils.removePackagesByName ( pkgs.mate.basePackages @@ -80,13 +83,11 @@ in programs.dconf.enable = true; # Shell integration for VTE terminals - programs.bash.vteIntegration = lib.mkDefault true; - programs.zsh.vteIntegration = lib.mkDefault true; + programs.bash.vteIntegration = mkDefault true; + programs.zsh.vteIntegration = mkDefault true; # Mate uses this for printing - programs.system-config-printer.enable = ( - lib.mkIf config.services.printing.enable (lib.mkDefault true) - ); + programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.gnome.at-spi2-core.enable = true; services.gnome.glib-networking.enable = true; @@ -94,15 +95,15 @@ in services.udev.packages = [ pkgs.mate.mate-settings-daemon ]; services.gvfs.enable = true; services.upower.enable = config.powerManagement.enable; - services.libinput.enable = lib.mkDefault true; + services.libinput.enable = mkDefault true; security.pam.services.mate-screensaver.unixAuth = true; - xdg.portal.configPackages = lib.mkDefault [ pkgs.mate.mate-desktop ]; + xdg.portal.configPackages = mkDefault [ pkgs.mate.mate-desktop ]; environment.pathsToLink = [ "/share" ]; }) - (lib.mkIf cfg.enableWaylandSession { + (mkIf cfg.enableWaylandSession { programs.wayfire.enable = true; programs.wayfire.plugins = [ pkgs.wayfirePlugins.firedecor ]; diff --git a/nixos/modules/services/x11/desktop-managers/none.nix b/nixos/modules/services/x11/desktop-managers/none.nix index 0e5caf37300a..d4b7e3b392da 100644 --- a/nixos/modules/services/x11/desktop-managers/none.nix +++ b/nixos/modules/services/x11/desktop-managers/none.nix @@ -4,13 +4,14 @@ pkgs, ... }: +with lib; let runXdgAutostart = config.services.xserver.desktopManager.runXdgAutostartIfNone; in { options = { - services.xserver.desktopManager.runXdgAutostartIfNone = lib.mkOption { - type = lib.types.bool; + services.xserver.desktopManager.runXdgAutostartIfNone = mkOption { + type = types.bool; default = false; description = '' Whether to run XDG autostart files for sessions without a desktop manager @@ -26,18 +27,18 @@ in }; }; - config = lib.mkMerge [ + config = mkMerge [ { services.xserver.desktopManager.session = [ { name = "none"; - start = lib.optionalString runXdgAutostart '' + start = optionalString runXdgAutostart '' /run/current-system/systemd/bin/systemctl --user start xdg-autostart-if-no-desktop-manager.target ''; } ]; } - (lib.mkIf runXdgAutostart { + (mkIf runXdgAutostart { systemd.user.targets.xdg-autostart-if-no-desktop-manager = { description = "Run XDG autostart files"; # From `plasma-workspace`, `share/systemd/user/plasma-workspace@.target`. diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index ebb6f25c6db6..14e7e25252de 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -1,4 +1,7 @@ { config, lib, utils, pkgs, ... }: + +with lib; + let cfg = config.services.xserver.desktopManager.pantheon; @@ -16,7 +19,7 @@ in meta = { doc = ./pantheon.md; - maintainers = lib.teams.pantheon.members; + maintainers = teams.pantheon.members; }; options = { @@ -24,24 +27,24 @@ in services.pantheon = { contractor = { - enable = lib.mkEnableOption "contractor, a desktop-wide extension service used by Pantheon"; + enable = mkEnableOption "contractor, a desktop-wide extension service used by Pantheon"; }; - apps.enable = lib.mkEnableOption "Pantheon default applications"; + apps.enable = mkEnableOption "Pantheon default applications"; }; services.xserver.desktopManager.pantheon = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = "Enable the pantheon desktop manager"; }; - sessionPath = lib.mkOption { + sessionPath = mkOption { default = []; - type = lib.types.listOf lib.types.package; - example = lib.literalExpression "[ pkgs.gpaste ]"; + type = types.listOf types.package; + example = literalExpression "[ pkgs.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. @@ -50,46 +53,46 @@ in ''; }; - extraWingpanelIndicators = lib.mkOption { + extraWingpanelIndicators = mkOption { default = null; - type = with lib.types; nullOr (listOf package); + type = with types; nullOr (listOf package); description = "Indicators to add to Wingpanel."; }; - extraSwitchboardPlugs = lib.mkOption { + extraSwitchboardPlugs = mkOption { default = null; - type = with lib.types; nullOr (listOf package); + type = with types; nullOr (listOf package); description = "Plugs to add to Switchboard."; }; - extraGSettingsOverrides = lib.mkOption { + extraGSettingsOverrides = mkOption { default = ""; - type = lib.types.lines; + type = types.lines; description = "Additional gsettings overrides."; }; - extraGSettingsOverridePackages = lib.mkOption { + extraGSettingsOverridePackages = mkOption { default = []; - type = lib.types.listOf lib.types.path; + type = types.listOf types.path; description = "List of packages for which gsettings are overridden."; }; - debug = lib.mkEnableOption "gnome-session debug messages"; + debug = mkEnableOption "gnome-session debug messages"; }; - environment.pantheon.excludePackages = lib.mkOption { + environment.pantheon.excludePackages = mkOption { default = []; - example = lib.literalExpression "[ pkgs.pantheon.elementary-camera ]"; - type = lib.types.listOf lib.types.package; + example = literalExpression "[ pkgs.pantheon.elementary-camera ]"; + type = types.listOf types.package; description = "Which packages pantheon should exclude from the default environment"; }; }; - config = lib.mkMerge [ - (lib.mkIf cfg.enable { + config = mkMerge [ + (mkIf cfg.enable { services.xserver.desktopManager.pantheon.sessionPath = utils.removePackagesByName [ pkgs.pantheon.pantheon-agent-geoclue2 ] config.environment.pantheon.excludePackages; @@ -98,21 +101,21 @@ in # Ensure lightdm is used when Pantheon is enabled # Without it screen locking will be nonfunctional because of the use of lightlocker - warnings = lib.optional (config.services.xserver.displayManager.lightdm.enable != true) + warnings = optional (config.services.xserver.displayManager.lightdm.enable != true) '' Using Pantheon without LightDM as a displayManager will break screenlocking from the UI. ''; - services.xserver.displayManager.lightdm.greeters.pantheon.enable = lib.mkDefault true; + services.xserver.displayManager.lightdm.greeters.pantheon.enable = mkDefault true; # Without this, elementary LightDM greeter will pre-select non-existent `default` session # https://github.com/elementary/greeter/issues/368 - services.displayManager.defaultSession = lib.mkDefault "pantheon"; + services.displayManager.defaultSession = mkDefault "pantheon"; services.xserver.displayManager.sessionCommands = '' if test "$XDG_CURRENT_DESKTOP" = "Pantheon"; then true - ${lib.concatMapStrings (p: '' + ${concatMapStrings (p: '' if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name} fi @@ -126,38 +129,38 @@ in ''; # Default services - hardware.bluetooth.enable = lib.mkDefault true; + hardware.bluetooth.enable = mkDefault true; security.polkit.enable = true; services.accounts-daemon.enable = true; services.bamf.enable = true; - services.colord.enable = lib.mkDefault true; - services.fwupd.enable = lib.mkDefault true; + services.colord.enable = mkDefault true; + services.fwupd.enable = mkDefault true; # TODO: Enable once #177946 is resolved # services.packagekit.enable = mkDefault true; - services.power-profiles-daemon.enable = lib.mkDefault true; - services.touchegg.enable = lib.mkDefault true; + services.power-profiles-daemon.enable = mkDefault true; + services.touchegg.enable = mkDefault true; services.touchegg.package = pkgs.pantheon.touchegg; - services.tumbler.enable = lib.mkDefault true; - services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true)); + services.tumbler.enable = mkDefault true; + services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.dbus.packages = with pkgs.pantheon; [ switchboard-plug-power elementary-default-settings # accountsservice extensions ]; - services.pantheon.apps.enable = lib.mkDefault true; - services.pantheon.contractor.enable = lib.mkDefault true; + services.pantheon.apps.enable = mkDefault true; + services.pantheon.contractor.enable = mkDefault true; services.gnome.at-spi2-core.enable = true; services.gnome.evolution-data-server.enable = true; services.gnome.glib-networking.enable = true; services.gnome.gnome-keyring.enable = true; services.gvfs.enable = true; - services.gnome.rygel.enable = lib.mkDefault true; + services.gnome.rygel.enable = mkDefault true; services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - services.libinput.enable = lib.mkDefault true; - services.switcherooControl.enable = lib.mkDefault true; + services.libinput.enable = mkDefault true; + services.switcherooControl.enable = mkDefault true; services.xserver.updateDbusEnvironment = true; - services.zeitgeist.enable = lib.mkDefault true; - services.geoclue2.enable = lib.mkDefault true; + services.zeitgeist.enable = mkDefault true; + services.geoclue2.enable = mkDefault true; # pantheon has pantheon-agent-geoclue2 services.geoclue2.enableDemoAgent = false; services.geoclue2.appConfig."io.elementary.desktop.agent-geoclue2" = { @@ -170,7 +173,7 @@ in # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 pkgs.pantheon.mutter ]; - services.orca.enable = lib.mkDefault (notExcluded pkgs.orca); + services.orca.enable = mkDefault (notExcluded pkgs.orca); systemd.packages = with pkgs; [ gnome-session pantheon.gala @@ -178,7 +181,7 @@ in pantheon.elementary-session-settings ]; programs.dconf.enable = true; - networking.networkmanager.enable = lib.mkDefault true; + networking.networkmanager.enable = mkDefault true; systemd.user.targets."gnome-session-x11-services".wants = [ "org.gnome.SettingsDaemon.XSettings.service" @@ -243,12 +246,12 @@ in xdg-desktop-portal-pantheon ]); - xdg.portal.configPackages = lib.mkDefault [ pkgs.pantheon.elementary-default-settings ]; + xdg.portal.configPackages = mkDefault [ pkgs.pantheon.elementary-default-settings ]; # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; - environment.sessionVariables.GNOME_SESSION_DEBUG = lib.mkIf cfg.debug "1"; + environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1"; environment.pathsToLink = [ # FIXME: modules should link subdirs of `/share` rather than relying on this @@ -262,8 +265,8 @@ in programs.nm-applet.indicator = false; # Shell integration for VTE terminals - programs.bash.vteIntegration = lib.mkDefault true; - programs.zsh.vteIntegration = lib.mkDefault true; + programs.bash.vteIntegration = mkDefault true; + programs.zsh.vteIntegration = mkDefault true; # Default Fonts fonts.packages = with pkgs; [ @@ -279,9 +282,9 @@ in }; }) - (lib.mkIf serviceCfg.apps.enable { - programs.evince.enable = lib.mkDefault (notExcluded pkgs.evince); - programs.file-roller.enable = lib.mkDefault (notExcluded pkgs.file-roller); + (mkIf serviceCfg.apps.enable { + programs.evince.enable = mkDefault (notExcluded pkgs.evince); + programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller); environment.systemPackages = utils.removePackagesByName ([ pkgs.gnome-font-viewer @@ -312,7 +315,7 @@ in ]; }) - (lib.mkIf serviceCfg.contractor.enable { + (mkIf serviceCfg.contractor.enable { environment.systemPackages = with pkgs.pantheon; [ contractor file-roller-contract diff --git a/nixos/modules/services/x11/desktop-managers/retroarch.nix b/nixos/modules/services/x11/desktop-managers/retroarch.nix index 9f292087a073..445de823e03f 100644 --- a/nixos/modules/services/x11/desktop-managers/retroarch.nix +++ b/nixos/modules/services/x11/desktop-managers/retroarch.nix @@ -4,20 +4,23 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.desktopManager.retroarch; in { options.services.xserver.desktopManager.retroarch = { - enable = lib.mkEnableOption "RetroArch"; + enable = mkEnableOption "RetroArch"; - package = lib.mkPackageOption pkgs "retroarch" { + package = mkPackageOption pkgs "retroarch" { example = "retroarch-full"; }; - extraArgs = lib.mkOption { - type = lib.types.listOf lib.types.str; + extraArgs = mkOption { + type = types.listOf types.str; default = [ ]; example = [ "--verbose" @@ -27,12 +30,12 @@ in }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { services.xserver.desktopManager.session = [ { name = "RetroArch"; start = '' - ${cfg.package}/bin/retroarch -f ${lib.escapeShellArgs cfg.extraArgs} & + ${cfg.package}/bin/retroarch -f ${escapeShellArgs cfg.extraArgs} & waitPID=$! ''; } @@ -41,5 +44,5 @@ in environment.systemPackages = [ cfg.package ]; }; - meta.maintainers = with lib.maintainers; [ j0hax ]; + meta.maintainers = with maintainers; [ j0hax ]; } diff --git a/nixos/modules/services/x11/desktop-managers/surf-display.nix b/nixos/modules/services/x11/desktop-managers/surf-display.nix index 7eb088cce11e..519388cf11a5 100644 --- a/nixos/modules/services/x11/desktop-managers/surf-display.nix +++ b/nixos/modules/services/x11/desktop-managers/surf-display.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.desktopManager.surf-display; @@ -48,18 +51,18 @@ in { options = { services.xserver.desktopManager.surf-display = { - enable = lib.mkEnableOption "surf-display as a kiosk browser session"; + enable = mkEnableOption "surf-display as a kiosk browser session"; - defaultWwwUri = lib.mkOption { - type = lib.types.str; + defaultWwwUri = mkOption { + type = types.str; default = "${pkgs.surf-display}/share/surf-display/empty-page.html"; - defaultText = lib.literalExpression ''"''${pkgs.surf-display}/share/surf-display/empty-page.html"''; + defaultText = literalExpression ''"''${pkgs.surf-display}/share/surf-display/empty-page.html"''; example = "https://www.example.com/"; description = "Default URI to display."; }; - inactivityInterval = lib.mkOption { - type = lib.types.int; + inactivityInterval = mkOption { + type = types.int; default = 300; example = 0; description = '' @@ -72,16 +75,16 @@ in ''; }; - screensaverSettings = lib.mkOption { - type = lib.types.separatedString " "; + screensaverSettings = mkOption { + type = types.separatedString " "; default = ""; description = '' Screensaver settings, see `man 1 xset` for possible options. ''; }; - pointerButtonMap = lib.mkOption { - type = lib.types.str; + pointerButtonMap = mkOption { + type = types.str; default = "1 0 0 4 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0"; description = '' Disable right and middle pointer device click in browser sessions @@ -90,15 +93,15 @@ in ''; }; - hideIdlePointer = lib.mkOption { - type = lib.types.str; + hideIdlePointer = mkOption { + type = types.str; default = "yes"; example = "no"; description = "Hide idle mouse pointer."; }; - extraConfig = lib.mkOption { - type = lib.types.lines; + extraConfig = mkOption { + type = types.lines; default = ""; example = '' # Enforce fixed resolution for all displays (default: not set): @@ -121,7 +124,7 @@ in }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { services.displayManager.sessionPackages = [ pkgs.surf-display ]; diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 32c41449a248..e1273aa7b7d1 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -1,4 +1,7 @@ { config, lib, pkgs, utils, ... }: + +with lib; + let cfg = config.services.xserver.desktopManager.xfce; excludePackages = config.environment.xfce.excludePackages; @@ -6,70 +9,70 @@ let in { meta = { - maintainers = lib.teams.xfce.members; + maintainers = teams.xfce.members; }; imports = [ # added 2019-08-18 # needed to preserve some semblance of UI familarity # with original XFCE module - (lib.mkRenamedOptionModule + (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xfce4-14" "extraSessionCommands" ] [ "services" "xserver" "displayManager" "sessionCommands" ]) # added 2019-11-04 # xfce4-14 module removed and promoted to xfce. # Needed for configs that used xfce4-14 module to migrate to this one. - (lib.mkRenamedOptionModule + (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xfce4-14" "enable" ] [ "services" "xserver" "desktopManager" "xfce" "enable" ]) - (lib.mkRenamedOptionModule + (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xfce4-14" "noDesktop" ] [ "services" "xserver" "desktopManager" "xfce" "noDesktop" ]) - (lib.mkRenamedOptionModule + (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xfce4-14" "enableXfwm" ] [ "services" "xserver" "desktopManager" "xfce" "enableXfwm" ]) - (lib.mkRenamedOptionModule + (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xfce" "extraSessionCommands" ] [ "services" "xserver" "displayManager" "sessionCommands" ]) - (lib.mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "") + (mkRemovedOptionModule [ "services" "xserver" "desktopManager" "xfce" "screenLock" ] "") # added 2022-06-26 # thunar has its own module - (lib.mkRenamedOptionModule + (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "xfce" "thunarPlugins" ] [ "programs" "thunar" "plugins" ]) ]; options = { services.xserver.desktopManager.xfce = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = "Enable the Xfce desktop environment."; }; - noDesktop = lib.mkOption { - type = lib.types.bool; + noDesktop = mkOption { + type = types.bool; default = false; description = "Don't install XFCE desktop components (xfdesktop and panel)."; }; - enableXfwm = lib.mkOption { - type = lib.types.bool; + enableXfwm = mkOption { + type = types.bool; default = true; description = "Enable the XFWM (default) window manager."; }; - enableScreensaver = lib.mkOption { - type = lib.types.bool; + enableScreensaver = mkOption { + type = types.bool; default = true; description = "Enable the XFCE screensaver."; }; - enableWaylandSession = lib.mkEnableOption "the experimental Xfce Wayland session"; + enableWaylandSession = mkEnableOption "the experimental Xfce Wayland session"; - waylandSessionCompositor = lib.mkOption { + waylandSessionCompositor = mkOption { type = lib.types.str; default = ""; example = "wayfire"; @@ -84,15 +87,15 @@ in }; }; - environment.xfce.excludePackages = lib.mkOption { + environment.xfce.excludePackages = mkOption { default = []; - example = lib.literalExpression "[ pkgs.xfce.xfce4-volumed-pulse ]"; - type = lib.types.listOf lib.types.package; + example = literalExpression "[ pkgs.xfce.xfce4-volumed-pulse ]"; + type = types.listOf types.package; description = "Which packages XFCE should exclude from the default environment"; }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { environment.systemPackages = utils.removePackagesByName (with pkgs; [ glib # for gsettings gtk3.out # gtk-update-icon-cache @@ -144,10 +147,10 @@ in xfce.xfdesktop ] ++ lib.optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages; - programs.gnupg.agent.pinentryPackage = lib.mkDefault pkgs.pinentry-gtk2; + programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2; programs.xfconf.enable = true; programs.thunar.enable = true; - programs.labwc.enable = lib.mkDefault (cfg.enableWaylandSession && ( + programs.labwc.enable = mkDefault (cfg.enableWaylandSession && ( cfg.waylandSessionCompositor == "" || lib.substring 0 5 cfg.waylandSessionCompositor == "labwc")); environment.pathsToLink = [ @@ -170,7 +173,7 @@ in # Copied from https://gitlab.xfce.org/xfce/xfce4-session/-/blob/xfce4-session-4.19.2/xfce-wayland.desktop.in # to maintain consistent l10n state with X11 session file and to support the waylandSessionCompositor option. - services.displayManager.sessionPackages = lib.optionals cfg.enableWaylandSession [ + services.displayManager.sessionPackages = optionals cfg.enableWaylandSession [ ((pkgs.writeTextDir "share/wayland-sessions/xfce-wayland.desktop" '' [Desktop Entry] Version=1.0 @@ -195,16 +198,16 @@ in services.gnome.glib-networking.enable = true; services.gvfs.enable = true; services.tumbler.enable = true; - services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (lib.mkDefault true)); - services.libinput.enable = lib.mkDefault true; # used in xfce4-settings-manager - services.colord.enable = lib.mkDefault true; + services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); + services.libinput.enable = mkDefault true; # used in xfce4-settings-manager + services.colord.enable = mkDefault true; # Enable default programs programs.dconf.enable = true; # Shell integration for VTE terminals - programs.bash.vteIntegration = lib.mkDefault true; - programs.zsh.vteIntegration = lib.mkDefault true; + programs.bash.vteIntegration = mkDefault true; + programs.zsh.vteIntegration = mkDefault true; # Systemd services systemd.packages = utils.removePackagesByName (with pkgs.xfce; [ @@ -213,6 +216,6 @@ in security.pam.services.xfce4-screensaver.unixAuth = cfg.enableScreensaver; - xdg.portal.configPackages = lib.mkDefault [ pkgs.xfce.xfce4-session ]; + xdg.portal.configPackages = mkDefault [ pkgs.xfce.xfce4-session ]; }; } diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix index 562401c9d057..c4db014db796 100644 --- a/nixos/modules/services/x11/desktop-managers/xterm.nix +++ b/nixos/modules/services/x11/desktop-managers/xterm.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.desktopManager.xterm; @@ -14,18 +17,18 @@ in { options = { - services.xserver.desktopManager.xterm.enable = lib.mkOption { - type = lib.types.bool; - default = lib.versionOlder config.system.stateVersion "19.09" && xSessionEnabled; - defaultText = lib.literalExpression ''versionOlder config.system.stateVersion "19.09" && config.services.xserver.enable;''; + services.xserver.desktopManager.xterm.enable = mkOption { + type = types.bool; + default = versionOlder config.system.stateVersion "19.09" && xSessionEnabled; + defaultText = literalExpression ''versionOlder config.system.stateVersion "19.09" && config.services.xserver.enable;''; description = "Enable a xterm terminal as a desktop manager."; }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { - services.xserver.desktopManager.session = lib.singleton { + services.xserver.desktopManager.session = singleton { name = "xterm"; start = '' ${pkgs.xterm}/bin/xterm -ls & diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix index 797294397447..85de2ce62849 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix @@ -4,6 +4,8 @@ pkgs, ... }: + +with lib; let dmcfg = config.services.xserver.displayManager; ldmcfg = dmcfg.lightdm; @@ -27,8 +29,8 @@ in { options = { services.xserver.displayManager.lightdm.greeters.enso = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable enso-os-greeter as the lightdm greeter @@ -36,17 +38,17 @@ in }; theme = { - package = lib.mkOption { - type = lib.types.package; + package = mkOption { + type = types.package; default = pkgs.gnome-themes-extra; - defaultText = lib.literalExpression "pkgs.gnome-themes-extra"; + defaultText = literalExpression "pkgs.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; }; - name = lib.mkOption { - type = lib.types.str; + name = mkOption { + type = types.str; default = "Adwaita"; description = '' Name of the theme to use for the lightdm-enso-os-greeter @@ -55,17 +57,17 @@ in }; iconTheme = { - package = lib.mkOption { - type = lib.types.package; + package = mkOption { + type = types.package; default = pkgs.papirus-icon-theme; - defaultText = lib.literalExpression "pkgs.papirus-icon-theme"; + defaultText = literalExpression "pkgs.papirus-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; }; - name = lib.mkOption { - type = lib.types.str; + name = mkOption { + type = types.str; default = "ePapirus"; description = '' Name of the icon theme to use for the lightdm-enso-os-greeter @@ -74,17 +76,17 @@ in }; cursorTheme = { - package = lib.mkOption { - type = lib.types.package; + package = mkOption { + type = types.package; default = pkgs.capitaine-cursors; - defaultText = lib.literalExpression "pkgs.capitaine-cursors"; + defaultText = literalExpression "pkgs.capitaine-cursors"; description = '' The package path that contains the cursor theme given in the name option. ''; }; - name = lib.mkOption { - type = lib.types.str; + name = mkOption { + type = types.str; default = "capitane-cursors"; description = '' Name of the cursor theme to use for the lightdm-enso-os-greeter @@ -92,24 +94,24 @@ in }; }; - blur = lib.mkOption { - type = lib.types.bool; + blur = mkOption { + type = types.bool; default = false; description = '' Whether or not to enable blur ''; }; - brightness = lib.mkOption { - type = lib.types.int; + brightness = mkOption { + type = types.int; default = 7; description = '' Brightness ''; }; - extraConfig = lib.mkOption { - type = lib.types.lines; + extraConfig = mkOption { + type = types.lines; default = ""; description = '' Extra configuration that should be put in the greeter.conf @@ -119,7 +121,7 @@ in }; }; - config = lib.mkIf (ldmcfg.enable && cfg.enable) { + config = mkIf (ldmcfg.enable && cfg.enable) { environment.etc."lightdm/greeter.conf".source = ensoGreeterConf; environment.systemPackages = [ @@ -129,14 +131,14 @@ in ]; services.xserver.displayManager.lightdm = { - greeter = lib.mkDefault { + greeter = mkDefault { package = pkgs.lightdm-enso-os-greeter.xgreeters; name = "pantheon-greeter"; }; greeters = { gtk = { - enable = lib.mkDefault false; + enable = mkDefault false; }; }; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index e903efea28d8..468ab09c66a5 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let dmcfg = config.services.xserver.displayManager; @@ -24,11 +27,9 @@ let cursor-theme-name = ${cfg.cursorTheme.name} cursor-theme-size = ${toString cfg.cursorTheme.size} background = ${ldmcfg.background} - ${lib.optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"} - ${lib.optionalString ( - cfg.indicators != null - ) "indicators = ${lib.concatStringsSep ";" cfg.indicators}"} - ${lib.optionalString (xcfg.dpi != null) "xft-dpi=${toString xcfg.dpi}"} + ${optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"} + ${optionalString (cfg.indicators != null) "indicators = ${concatStringsSep ";" cfg.indicators}"} + ${optionalString (xcfg.dpi != null) "xft-dpi=${toString xcfg.dpi}"} ${cfg.extraConfig} ''; @@ -38,8 +39,8 @@ in services.xserver.displayManager.lightdm.greeters.gtk = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = true; description = '' Whether to enable lightdm-gtk-greeter as the lightdm greeter. @@ -48,17 +49,17 @@ in theme = { - package = lib.mkOption { - type = lib.types.package; + package = mkOption { + type = types.package; default = pkgs.gnome-themes-extra; - defaultText = lib.literalExpression "pkgs.gnome-themes-extra"; + defaultText = literalExpression "pkgs.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; }; - name = lib.mkOption { - type = lib.types.str; + name = mkOption { + type = types.str; default = "Adwaita"; description = '' Name of the theme to use for the lightdm-gtk-greeter. @@ -69,17 +70,17 @@ in iconTheme = { - package = lib.mkOption { - type = lib.types.package; + package = mkOption { + type = types.package; default = pkgs.adwaita-icon-theme; - defaultText = lib.literalExpression "pkgs.adwaita-icon-theme"; + defaultText = literalExpression "pkgs.adwaita-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; }; - name = lib.mkOption { - type = lib.types.str; + name = mkOption { + type = types.str; default = "Adwaita"; description = '' Name of the icon theme to use for the lightdm-gtk-greeter. @@ -90,25 +91,25 @@ in cursorTheme = { - package = lib.mkOption { - type = lib.types.package; + package = mkOption { + type = types.package; default = pkgs.adwaita-icon-theme; - defaultText = lib.literalExpression "pkgs.adwaita-icon-theme"; + defaultText = literalExpression "pkgs.adwaita-icon-theme"; description = '' The package path that contains the cursor theme given in the name option. ''; }; - name = lib.mkOption { - type = lib.types.str; + name = mkOption { + type = types.str; default = "Adwaita"; description = '' Name of the cursor theme to use for the lightdm-gtk-greeter. ''; }; - size = lib.mkOption { - type = lib.types.int; + size = mkOption { + type = types.int; default = 16; description = '' Size of the cursor theme to use for the lightdm-gtk-greeter. @@ -116,8 +117,8 @@ in }; }; - clock-format = lib.mkOption { - type = lib.types.nullOr lib.types.str; + clock-format = mkOption { + type = types.nullOr types.str; default = null; example = "%F"; description = '' @@ -128,8 +129,8 @@ in ''; }; - indicators = lib.mkOption { - type = lib.types.nullOr (lib.types.listOf lib.types.str); + indicators = mkOption { + type = types.nullOr (types.listOf types.str); default = null; example = [ "~host" @@ -154,8 +155,8 @@ in ''; }; - extraConfig = lib.mkOption { - type = lib.types.lines; + extraConfig = mkOption { + type = types.lines; default = ""; description = '' Extra configuration that should be put in the lightdm-gtk-greeter.conf @@ -167,9 +168,9 @@ in }; - config = lib.mkIf (ldmcfg.enable && cfg.enable) { + config = mkIf (ldmcfg.enable && cfg.enable) { - services.xserver.displayManager.lightdm.greeter = lib.mkDefault { + services.xserver.displayManager.lightdm.greeter = mkDefault { package = pkgs.lightdm-gtk-greeter.xgreeters; name = "lightdm-gtk-greeter"; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix index f81b711179e6..a3fca737a2b2 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let dmcfg = config.services.xserver.displayManager; @@ -53,8 +56,8 @@ in services.xserver.displayManager.lightdm.greeters.mini = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable lightdm-mini-greeter as the lightdm greeter. @@ -65,16 +68,16 @@ in ''; }; - user = lib.mkOption { - type = lib.types.str; + user = mkOption { + type = types.str; default = "root"; description = '' The user to login as. ''; }; - extraConfig = lib.mkOption { - type = lib.types.lines; + extraConfig = mkOption { + type = types.lines; default = ""; description = '' Extra configuration that should be put in the lightdm-mini-greeter.conf @@ -86,11 +89,11 @@ in }; - config = lib.mkIf (ldmcfg.enable && cfg.enable) { + config = mkIf (ldmcfg.enable && cfg.enable) { services.xserver.displayManager.lightdm.greeters.gtk.enable = false; - services.xserver.displayManager.lightdm.greeter = lib.mkDefault { + services.xserver.displayManager.lightdm.greeter = mkDefault { package = pkgs.lightdm-mini-greeter.xgreeters; name = "lightdm-mini-greeter"; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix index b7c6a9b4ae68..5d8edbe7c59e 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/mobile.nix @@ -4,6 +4,8 @@ pkgs, ... }: + +with lib; let dmcfg = config.services.xserver.displayManager; ldmcfg = dmcfg.lightdm; @@ -12,14 +14,14 @@ in { options = { services.xserver.displayManager.lightdm.greeters.mobile = { - enable = lib.mkEnableOption "lightdm-mobile-greeter as the lightdm greeter"; + enable = mkEnableOption "lightdm-mobile-greeter as the lightdm greeter"; }; }; - config = lib.mkIf (ldmcfg.enable && cfg.enable) { + config = mkIf (ldmcfg.enable && cfg.enable) { services.xserver.displayManager.lightdm.greeters.gtk.enable = false; - services.xserver.displayManager.lightdm.greeter = lib.mkDefault { + services.xserver.displayManager.lightdm.greeter = mkDefault { package = pkgs.lightdm-mobile-greeter.xgreeters; name = "lightdm-mobile-greeter"; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index 8ad6a108dddf..f598fd1171a2 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let dmcfg = config.services.xserver.displayManager; @@ -20,8 +23,8 @@ in services.xserver.displayManager.lightdm.greeters.pantheon = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable elementary-greeter as the lightdm greeter. @@ -32,11 +35,11 @@ in }; - config = lib.mkIf (ldmcfg.enable && cfg.enable) { + config = mkIf (ldmcfg.enable && cfg.enable) { services.xserver.displayManager.lightdm.greeters.gtk.enable = false; - services.xserver.displayManager.lightdm.greeter = lib.mkDefault { + services.xserver.displayManager.lightdm.greeter = mkDefault { package = pkgs.pantheon.elementary-greeter.xgreeters; name = "io.elementary.greeter"; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix index f90363d58ac2..e2d83ce5dcb4 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/slick.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let ldmcfg = config.services.xserver.displayManager.lightdm; cfg = ldmcfg.greeters.slick; @@ -23,27 +26,27 @@ let font-name=${cfg.font.name} cursor-theme-name=${cfg.cursorTheme.name} cursor-theme-size=${toString cfg.cursorTheme.size} - draw-user-backgrounds=${lib.boolToString cfg.draw-user-backgrounds} + draw-user-backgrounds=${boolToString cfg.draw-user-backgrounds} ${cfg.extraConfig} ''; in { options = { services.xserver.displayManager.lightdm.greeters.slick = { - enable = lib.mkEnableOption "lightdm-slick-greeter as the lightdm greeter"; + enable = mkEnableOption "lightdm-slick-greeter as the lightdm greeter"; theme = { - package = lib.mkOption { - type = lib.types.package; + package = mkOption { + type = types.package; default = pkgs.gnome-themes-extra; - defaultText = lib.literalExpression "pkgs.gnome-themes-extra"; + defaultText = literalExpression "pkgs.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; }; - name = lib.mkOption { - type = lib.types.str; + name = mkOption { + type = types.str; default = "Adwaita"; description = '' Name of the theme to use for the lightdm-slick-greeter. @@ -52,17 +55,17 @@ in }; iconTheme = { - package = lib.mkOption { - type = lib.types.package; + package = mkOption { + type = types.package; default = pkgs.adwaita-icon-theme; - defaultText = lib.literalExpression "pkgs.adwaita-icon-theme"; + defaultText = literalExpression "pkgs.adwaita-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; }; - name = lib.mkOption { - type = lib.types.str; + name = mkOption { + type = types.str; default = "Adwaita"; description = '' Name of the icon theme to use for the lightdm-slick-greeter. @@ -71,17 +74,17 @@ in }; font = { - package = lib.mkOption { - type = lib.types.package; + package = mkOption { + type = types.package; default = pkgs.ubuntu-classic; - defaultText = lib.literalExpression "pkgs.ubuntu-classic"; + defaultText = literalExpression "pkgs.ubuntu-classic"; description = '' The package path that contains the font given in the name option. ''; }; - name = lib.mkOption { - type = lib.types.str; + name = mkOption { + type = types.str; default = "Ubuntu 11"; description = '' Name of the font to use. @@ -90,25 +93,25 @@ in }; cursorTheme = { - package = lib.mkOption { - type = lib.types.package; + package = mkOption { + type = types.package; default = pkgs.adwaita-icon-theme; - defaultText = lib.literalExpression "pkgs.adwaita-icon-theme"; + defaultText = literalExpression "pkgs.adwaita-icon-theme"; description = '' The package path that contains the cursor theme given in the name option. ''; }; - name = lib.mkOption { - type = lib.types.str; + name = mkOption { + type = types.str; default = "Adwaita"; description = '' Name of the cursor theme to use for the lightdm-slick-greeter. ''; }; - size = lib.mkOption { - type = lib.types.int; + size = mkOption { + type = types.int; default = 24; description = '' Size of the cursor theme to use for the lightdm-slick-greeter. @@ -116,10 +119,10 @@ in }; }; - draw-user-backgrounds = lib.mkEnableOption "draw user backgrounds"; + draw-user-backgrounds = mkEnableOption "draw user backgrounds"; - extraConfig = lib.mkOption { - type = lib.types.lines; + extraConfig = mkOption { + type = types.lines; default = ""; description = '' Extra configuration that should be put in the lightdm-slick-greeter.conf @@ -129,10 +132,10 @@ in }; }; - config = lib.mkIf (ldmcfg.enable && cfg.enable) { + config = mkIf (ldmcfg.enable && cfg.enable) { services.xserver.displayManager.lightdm = { greeters.gtk.enable = false; - greeter = lib.mkDefault { + greeter = mkDefault { package = pkgs.lightdm-slick-greeter.xgreeters; name = "lightdm-slick-greeter"; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix index 73e144ddccf9..4780468533de 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let dmcfg = config.services.xserver.displayManager; @@ -16,8 +19,8 @@ in services.xserver.displayManager.lightdm.greeters.tiny = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable lightdm-tiny-greeter as the lightdm greeter. @@ -29,16 +32,16 @@ in }; label = { - user = lib.mkOption { - type = lib.types.str; + user = mkOption { + type = types.str; default = "Username"; description = '' The string to represent the user_text label. ''; }; - pass = lib.mkOption { - type = lib.types.str; + pass = mkOption { + type = types.str; default = "Password"; description = '' The string to represent the pass_text label. @@ -46,8 +49,8 @@ in }; }; - extraConfig = lib.mkOption { - type = lib.types.lines; + extraConfig = mkOption { + type = types.lines; default = ""; description = '' Section to describe style and ui. @@ -58,7 +61,7 @@ in }; - config = lib.mkIf (ldmcfg.enable && cfg.enable) { + config = mkIf (ldmcfg.enable && cfg.enable) { services.xserver.displayManager.lightdm.greeters.gtk.enable = false; @@ -70,10 +73,10 @@ in static const char *pass_text = "${cfg.label.pass}"; static const char *session = "${dmcfg.defaultSession}"; ''; - config = lib.optionalString (cfg.extraConfig != "") (configHeader + cfg.extraConfig); + config = optionalString (cfg.extraConfig != "") (configHeader + cfg.extraConfig); package = pkgs.lightdm-tiny-greeter.override { conf = config; }; in - lib.mkDefault { + mkDefault { package = package.xgreeters; name = "lightdm-tiny-greeter"; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 3ac91f860f6d..3e964ef53266 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let xcfg = config.services.xserver; @@ -19,7 +22,7 @@ let # lightdm runs with clearenv(), but we need a few things in the environment for X to startup xserverWrapper = writeScript "xserver-wrapper" '' #! ${pkgs.bash}/bin/bash - ${lib.concatMapStrings (n: "export ${n}=\"${lib.getAttr n xEnv}\"\n") (lib.attrNames xEnv)} + ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} display=$(echo "$@" | xargs -n 1 | grep -P ^:\\d\$ | head -n 1 | sed s/^://) if [ -z "$display" ] @@ -33,13 +36,13 @@ let usersConf = writeText "users.conf" '' [UserList] minimum-uid=1000 - hidden-users=${lib.concatStringsSep " " dmcfg.hiddenUsers} + hidden-users=${concatStringsSep " " dmcfg.hiddenUsers} hidden-shells=/run/current-system/sw/bin/nologin ''; lightdmConf = writeText "lightdm.conf" '' [LightDM] - ${lib.optionalString cfg.greeter.enable '' + ${optionalString cfg.greeter.enable '' greeter-user = ${config.users.users.lightdm.name} greeters-directory = ${cfg.greeter.package} ''} @@ -49,15 +52,15 @@ let [Seat:*] xserver-command = ${xserverWrapper} session-wrapper = ${dmcfg.sessionData.wrapper} - ${lib.optionalString cfg.greeter.enable '' + ${optionalString cfg.greeter.enable '' greeter-session = ${cfg.greeter.name} ''} - ${lib.optionalString dmcfg.autoLogin.enable '' + ${optionalString dmcfg.autoLogin.enable '' autologin-user = ${dmcfg.autoLogin.user} autologin-user-timeout = ${toString cfg.autoLogin.timeout} autologin-session = ${sessionData.autologinSession} ''} - ${lib.optionalString (xcfg.displayManager.setupCommands != "") '' + ${optionalString (xcfg.displayManager.setupCommands != "") '' display-setup-script=${pkgs.writeScript "lightdm-display-setup" '' #!${pkgs.bash}/bin/bash ${xcfg.displayManager.setupCommands} @@ -84,7 +87,7 @@ in ./lightdm-greeters/tiny.nix ./lightdm-greeters/slick.nix ./lightdm-greeters/mobile.nix - (lib.mkRenamedOptionModule + (mkRenamedOptionModule [ "services" "xserver" "displayManager" "lightdm" "autoLogin" "enable" ] [ "services" @@ -93,7 +96,7 @@ in "enable" ] ) - (lib.mkRenamedOptionModule + (mkRenamedOptionModule [ "services" "xserver" "displayManager" "lightdm" "autoLogin" "user" ] [ "services" @@ -108,8 +111,8 @@ in services.xserver.displayManager.lightdm = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable lightdm as the display manager. @@ -117,24 +120,24 @@ in }; greeter = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = true; description = '' If set to false, run lightdm in greeterless mode. This only works if autologin is enabled and autoLogin.timeout is zero. ''; }; - package = lib.mkOption { - type = lib.types.package; + package = mkOption { + type = types.package; description = '' The LightDM greeter to login via. The package should be a directory containing a .desktop file matching the name in the 'name' option. ''; }; - name = lib.mkOption { - type = lib.types.str; + name = mkOption { + type = types.str; description = '' The name of a .desktop file in the directory specified in the 'package' option. @@ -142,8 +145,8 @@ in }; }; - extraConfig = lib.mkOption { - type = lib.types.lines; + extraConfig = mkOption { + type = types.lines; default = ""; example = '' user-authority-in-system-dir = true @@ -151,17 +154,17 @@ in description = "Extra lines to append to LightDM section."; }; - background = lib.mkOption { - type = lib.types.either lib.types.path (lib.types.strMatching "^#[0-9]\{6\}$"); + background = mkOption { + type = types.either types.path (types.strMatching "^#[0-9]\{6\}$"); # Manual cannot depend on packages, we are actually setting the default in config below. - defaultText = lib.literalExpression "pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath"; + defaultText = literalExpression "pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath"; description = '' The background image or color to use. ''; }; - extraSeatDefaults = lib.mkOption { - type = lib.types.lines; + extraSeatDefaults = mkOption { + type = types.lines; default = ""; example = '' greeter-show-manual-login=true @@ -170,8 +173,8 @@ in }; # Configuration for automatic login specific to LightDM - autoLogin.timeout = lib.mkOption { - type = lib.types.int; + autoLogin.timeout = mkOption { + type = types.int; default = 0; description = '' Show the greeter for this many seconds before automatic login occurs. @@ -181,7 +184,7 @@ in }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { assertions = [ { @@ -207,12 +210,12 @@ in # Keep in sync with the defaultText value from the option definition. services.xserver.displayManager.lightdm.background = - lib.mkDefault pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath; + mkDefault pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom.gnomeFilePath; # Set default session in session chooser to a specified values – basically ignore session history. # Auto-login is already covered by a config value. services.displayManager.preStart = - lib.optionalString (!dmcfg.autoLogin.enable && dmcfg.defaultSession != null) + optionalString (!dmcfg.autoLogin.enable && dmcfg.defaultSession != null) '' ${setSessionScript}/bin/set-session ${dmcfg.defaultSession} ''; diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index 8c522d4a9e93..c5963b0be7ec 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -4,10 +4,13 @@ pkgs, ... }: + +with lib; + { # added 2019-11-11 imports = [ - (lib.mkRemovedOptionModule [ "services" "xserver" "displayManager" "slim" ] '' + (mkRemovedOptionModule [ "services" "xserver" "displayManager" "slim" ] '' The SLIM project is abandoned and their last release was in 2013. Because of this it poses a security risk to your system. Other issues include it not fully supporting systemd and logind sessions. diff --git a/nixos/modules/services/x11/display-managers/startx.nix b/nixos/modules/services/x11/display-managers/startx.nix index e6e61318c19f..a990c9ed5ea5 100644 --- a/nixos/modules/services/x11/display-managers/startx.nix +++ b/nixos/modules/services/x11/display-managers/startx.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.displayManager.startx; @@ -16,8 +19,8 @@ in options = { services.xserver.displayManager.startx = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable the dummy "startx" pseudo-display manager, @@ -33,7 +36,7 @@ in ###### implementation - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { services.xserver = { exportConfiguration = true; }; @@ -43,7 +46,7 @@ in # # To send log to Xorg's default log location ($XDG_DATA_HOME/xorg/), we do # not specify a log file when running X - services.xserver.logFile = lib.mkDefault null; + services.xserver.logFile = mkDefault null; # Implement xserverArgs via xinit's system-wide xserverrc environment.etc."X11/xinit/xserverrc".source = pkgs.writeShellScript "xserverrc" '' diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix index c75a293b3654..67b1751ba8ec 100644 --- a/nixos/modules/services/x11/display-managers/xpra.nix +++ b/nixos/modules/services/x11/display-managers/xpra.nix @@ -1,4 +1,7 @@ { config, lib, pkgs, ... }: + +with lib; + let cfg = config.services.xserver.displayManager.xpra; dmcfg = config.services.xserver.displayManager; @@ -10,46 +13,46 @@ in options = { services.xserver.displayManager.xpra = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = "Whether to enable xpra as display manager."; }; - bindTcp = lib.mkOption { + bindTcp = mkOption { default = "127.0.0.1:10000"; example = "0.0.0.0:10000"; - type = lib.types.nullOr lib.types.str; + type = types.nullOr types.str; description = "Bind xpra to TCP"; }; - desktop = lib.mkOption { - type = lib.types.nullOr lib.types.str; + desktop = mkOption { + type = types.nullOr types.str; default = null; example = "gnome-shell"; description = "Start a desktop environment instead of seamless mode"; }; - auth = lib.mkOption { - type = lib.types.str; + auth = mkOption { + type = types.str; default = "pam"; example = "password:value=mysecret"; description = "Authentication to use when connecting to xpra"; }; - pulseaudio = lib.mkEnableOption "pulseaudio audio streaming"; + pulseaudio = mkEnableOption "pulseaudio audio streaming"; - extraOptions = lib.mkOption { + extraOptions = mkOption { description = "Extra xpra options"; default = []; - type = lib.types.listOf lib.types.str; + type = types.listOf types.str; }; }; }; ###### implementation - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { services.xserver.videoDrivers = ["dummy"]; services.xserver.monitorSection = '' @@ -224,7 +227,7 @@ in ''; services.displayManager.execCmd = '' - ${lib.optionalString (cfg.pulseaudio) + ${optionalString (cfg.pulseaudio) "export PULSE_COOKIE=/run/pulse/.config/pulse/cookie"} exec ${pkgs.xpra}/bin/xpra ${if cfg.desktop == null then "start" else "start-desktop --start=${cfg.desktop}"} \ --daemon=off \ @@ -236,20 +239,20 @@ in --speaker=yes \ --mdns=no \ --pulseaudio=no \ - ${lib.optionalString (cfg.pulseaudio) "--sound-source=pulse"} \ + ${optionalString (cfg.pulseaudio) "--sound-source=pulse"} \ --socket-dirs=/run/xpra \ - --xvfb="xpra_Xdummy ${lib.concatStringsSep " " dmcfg.xserverArgs}" \ - ${lib.optionalString (cfg.bindTcp != null) "--bind-tcp=${cfg.bindTcp}"} \ + --xvfb="xpra_Xdummy ${concatStringsSep " " dmcfg.xserverArgs}" \ + ${optionalString (cfg.bindTcp != null) "--bind-tcp=${cfg.bindTcp}"} \ --auth=${cfg.auth} \ - ${lib.concatStringsSep " " cfg.extraOptions} + ${concatStringsSep " " cfg.extraOptions} ''; services.xserver.terminateOnReset = false; environment.systemPackages = [pkgs.xpra]; - services.pulseaudio.enable = lib.mkDefault cfg.pulseaudio; - services.pulseaudio.systemWide = lib.mkDefault cfg.pulseaudio; + services.pulseaudio.enable = mkDefault cfg.pulseaudio; + services.pulseaudio.systemWide = mkDefault cfg.pulseaudio; }; } diff --git a/nixos/modules/services/x11/extra-layouts.nix b/nixos/modules/services/x11/extra-layouts.nix index e5e294a5c175..0327609c25cd 100644 --- a/nixos/modules/services/x11/extra-layouts.nix +++ b/nixos/modules/services/x11/extra-layouts.nix @@ -4,26 +4,29 @@ pkgs, ... }: + +with lib; + let layouts = config.services.xserver.xkb.extraLayouts; layoutOpts = { options = { - description = lib.mkOption { - type = lib.types.str; + description = mkOption { + type = types.str; description = "A short description of the layout."; }; - languages = lib.mkOption { - type = lib.types.listOf lib.types.str; + languages = mkOption { + type = types.listOf types.str; description = '' A list of languages provided by the layout. (Use ISO 639-2 codes, for example: "eng" for english) ''; }; - compatFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; + compatFile = mkOption { + type = types.nullOr types.path; default = null; description = '' The path to the xkb compat file. @@ -33,8 +36,8 @@ let ''; }; - geometryFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; + geometryFile = mkOption { + type = types.nullOr types.path; default = null; description = '' The path to the xkb geometry file. @@ -44,8 +47,8 @@ let ''; }; - keycodesFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; + keycodesFile = mkOption { + type = types.nullOr types.path; default = null; description = '' The path to the xkb keycodes file. @@ -55,8 +58,8 @@ let ''; }; - symbolsFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; + symbolsFile = mkOption { + type = types.nullOr types.path; default = null; description = '' The path to the xkb symbols file. @@ -66,8 +69,8 @@ let ''; }; - typesFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; + typesFile = mkOption { + type = types.nullOr types.path; default = null; description = '' The path to the xkb types file. @@ -108,10 +111,10 @@ in ###### interface options.services.xserver.xkb = { - extraLayouts = lib.mkOption { - type = lib.types.attrsOf (lib.types.submodule layoutOpts); + extraLayouts = mkOption { + type = types.attrsOf (types.submodule layoutOpts); default = { }; - example = lib.literalExpression '' + example = literalExpression '' { mine = { description = "My custom xkb layout."; @@ -133,7 +136,7 @@ in ###### implementation - config = lib.mkIf (layouts != { }) { + config = mkIf (layouts != { }) { environment.sessionVariables = { # runtime override supported by multiple libraries e. g. libxkbcommon diff --git a/nixos/modules/services/x11/fractalart.nix b/nixos/modules/services/x11/fractalart.nix index 1f6f7d9eaccb..9ec64abc9049 100644 --- a/nixos/modules/services/x11/fractalart.nix +++ b/nixos/modules/services/x11/fractalart.nix @@ -4,38 +4,39 @@ pkgs, ... }: +with lib; let cfg = config.services.fractalart; in { options.services.fractalart = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; example = true; description = "Enable FractalArt for generating colorful wallpapers on login"; }; - width = lib.mkOption { - type = lib.types.nullOr lib.types.int; + width = mkOption { + type = types.nullOr types.int; default = null; example = 1920; description = "Screen width"; }; - height = lib.mkOption { - type = lib.types.nullOr lib.types.int; + height = mkOption { + type = types.nullOr types.int; default = null; example = 1080; description = "Screen height"; }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { environment.systemPackages = [ pkgs.haskellPackages.FractalArt ]; services.xserver.displayManager.sessionCommands = "${pkgs.haskellPackages.FractalArt}/bin/FractalArt --no-bg -f .background-image" - + lib.optionalString (cfg.width != null) " -w ${toString cfg.width}" - + lib.optionalString (cfg.height != null) " -h ${toString cfg.height}"; + + optionalString (cfg.width != null) " -w ${toString cfg.width}" + + optionalString (cfg.height != null) " -h ${toString cfg.height}"; }; } diff --git a/nixos/modules/services/x11/hardware/cmt.nix b/nixos/modules/services/x11/hardware/cmt.nix index 8d037f038625..23f07e5de06e 100644 --- a/nixos/modules/services/x11/hardware/cmt.nix +++ b/nixos/modules/services/x11/hardware/cmt.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.cmt; @@ -15,13 +18,13 @@ in options = { services.xserver.cmt = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = "Enable chrome multitouch input (cmt). Touchpad drivers that are configured for chromebooks."; }; - models = lib.mkOption { - type = lib.types.enum [ + models = mkOption { + type = types.enum [ "atlas" "banjo" "candy" @@ -80,7 +83,7 @@ in }; # closes services }; # closes options - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { services.xserver.modules = [ pkgs.xf86_input_cmt ]; diff --git a/nixos/modules/services/x11/hardware/digimend.nix b/nixos/modules/services/x11/hardware/digimend.nix index a8cc2a7f9937..693db5e90720 100644 --- a/nixos/modules/services/x11/hardware/digimend.nix +++ b/nixos/modules/services/x11/hardware/digimend.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.digimend; @@ -18,13 +21,13 @@ in services.xserver.digimend = { - enable = lib.mkEnableOption "the digimend drivers for Huion/XP-Pen/etc. tablets"; + enable = mkEnableOption "the digimend drivers for Huion/XP-Pen/etc. tablets"; }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { # digimend drivers use xsetwacom and wacom X11 drivers services.xserver.wacom.enable = true; diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix index 914f80d2da1f..f943242f7bae 100644 --- a/nixos/modules/services/x11/hardware/synaptics.nix +++ b/nixos/modules/services/x11/hardware/synaptics.nix @@ -5,6 +5,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.synaptics; opt = options.services.xserver.synaptics; @@ -32,14 +35,14 @@ in services.xserver.synaptics = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = "Whether to enable touchpad support. Deprecated: Consider services.libinput.enable."; }; - dev = lib.mkOption { - type = lib.types.nullOr lib.types.str; + dev = mkOption { + type = types.nullOr types.str; default = null; example = "/dev/input/event0"; description = '' @@ -48,73 +51,73 @@ in ''; }; - accelFactor = lib.mkOption { - type = lib.types.nullOr lib.types.str; + accelFactor = mkOption { + type = types.nullOr types.str; default = "0.001"; description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed)."; }; - minSpeed = lib.mkOption { - type = lib.types.nullOr lib.types.str; + minSpeed = mkOption { + type = types.nullOr types.str; default = "0.6"; description = "Cursor speed factor for precision finger motion."; }; - maxSpeed = lib.mkOption { - type = lib.types.nullOr lib.types.str; + maxSpeed = mkOption { + type = types.nullOr types.str; default = "1.0"; description = "Cursor speed factor for highest-speed finger motion."; }; - scrollDelta = lib.mkOption { - type = lib.types.nullOr lib.types.int; + scrollDelta = mkOption { + type = types.nullOr types.int; default = null; example = 75; description = "Move distance of the finger for a scroll event."; }; - twoFingerScroll = lib.mkOption { - type = lib.types.bool; + twoFingerScroll = mkOption { + type = types.bool; default = false; description = "Whether to enable two-finger drag-scrolling. Overridden by horizTwoFingerScroll and vertTwoFingerScroll."; }; - horizTwoFingerScroll = lib.mkOption { - type = lib.types.bool; + horizTwoFingerScroll = mkOption { + type = types.bool; default = cfg.twoFingerScroll; - defaultText = lib.literalExpression "config.${opt.twoFingerScroll}"; + defaultText = literalExpression "config.${opt.twoFingerScroll}"; description = "Whether to enable horizontal two-finger drag-scrolling."; }; - vertTwoFingerScroll = lib.mkOption { - type = lib.types.bool; + vertTwoFingerScroll = mkOption { + type = types.bool; default = cfg.twoFingerScroll; - defaultText = lib.literalExpression "config.${opt.twoFingerScroll}"; + defaultText = literalExpression "config.${opt.twoFingerScroll}"; description = "Whether to enable vertical two-finger drag-scrolling."; }; - horizEdgeScroll = lib.mkOption { - type = lib.types.bool; + horizEdgeScroll = mkOption { + type = types.bool; default = !cfg.horizTwoFingerScroll; - defaultText = lib.literalExpression "! config.${opt.horizTwoFingerScroll}"; + defaultText = literalExpression "! config.${opt.horizTwoFingerScroll}"; description = "Whether to enable horizontal edge drag-scrolling."; }; - vertEdgeScroll = lib.mkOption { - type = lib.types.bool; + vertEdgeScroll = mkOption { + type = types.bool; default = !cfg.vertTwoFingerScroll; - defaultText = lib.literalExpression "! config.${opt.vertTwoFingerScroll}"; + defaultText = literalExpression "! config.${opt.vertTwoFingerScroll}"; description = "Whether to enable vertical edge drag-scrolling."; }; - tapButtons = lib.mkOption { - type = lib.types.bool; + tapButtons = mkOption { + type = types.bool; default = true; description = "Whether to enable tap buttons."; }; - buttonsMap = lib.mkOption { - type = lib.types.listOf lib.types.int; + buttonsMap = mkOption { + type = types.listOf types.int; default = [ 1 2 @@ -129,8 +132,8 @@ in apply = map toString; }; - fingersMap = lib.mkOption { - type = lib.types.listOf lib.types.int; + fingersMap = mkOption { + type = types.listOf types.int; default = [ 1 2 @@ -145,34 +148,34 @@ in apply = map toString; }; - palmDetect = lib.mkOption { - type = lib.types.bool; + palmDetect = mkOption { + type = types.bool; default = false; description = "Whether to enable palm detection (hardware support required)"; }; - palmMinWidth = lib.mkOption { - type = lib.types.nullOr lib.types.int; + palmMinWidth = mkOption { + type = types.nullOr types.int; default = null; example = 5; description = "Minimum finger width at which touch is considered a palm"; }; - palmMinZ = lib.mkOption { - type = lib.types.nullOr lib.types.int; + palmMinZ = mkOption { + type = types.nullOr types.int; default = null; example = 20; description = "Minimum finger pressure at which touch is considered a palm"; }; - horizontalScroll = lib.mkOption { - type = lib.types.bool; + horizontalScroll = mkOption { + type = types.bool; default = true; description = "Whether to enable horizontal scrolling (on touchpad)"; }; - additionalOptions = lib.mkOption { - type = lib.types.str; + additionalOptions = mkOption { + type = types.str; default = ""; example = '' Option "RTCornerButton" "2" @@ -187,7 +190,7 @@ in }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { services.xserver.modules = [ pkg.out ]; @@ -200,12 +203,12 @@ in Section "InputClass" Identifier "synaptics touchpad catchall" MatchIsTouchpad "on" - ${lib.optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''} + ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''} Driver "synaptics" - ${lib.optionalString (cfg.minSpeed != null) ''Option "MinSpeed" "${cfg.minSpeed}"''} - ${lib.optionalString (cfg.maxSpeed != null) ''Option "MaxSpeed" "${cfg.maxSpeed}"''} - ${lib.optionalString (cfg.accelFactor != null) ''Option "AccelFactor" "${cfg.accelFactor}"''} - ${lib.optionalString cfg.tapButtons tapConfig} + ${optionalString (cfg.minSpeed != null) ''Option "MinSpeed" "${cfg.minSpeed}"''} + ${optionalString (cfg.maxSpeed != null) ''Option "MaxSpeed" "${cfg.maxSpeed}"''} + ${optionalString (cfg.accelFactor != null) ''Option "AccelFactor" "${cfg.accelFactor}"''} + ${optionalString cfg.tapButtons tapConfig} Option "ClickFinger1" "${builtins.elemAt cfg.buttonsMap 0}" Option "ClickFinger2" "${builtins.elemAt cfg.buttonsMap 1}" Option "ClickFinger3" "${builtins.elemAt cfg.buttonsMap 2}" @@ -213,19 +216,19 @@ in Option "HorizTwoFingerScroll" "${if cfg.horizTwoFingerScroll then "1" else "0"}" Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}" Option "HorizEdgeScroll" "${if cfg.horizEdgeScroll then "1" else "0"}" - ${lib.optionalString cfg.palmDetect ''Option "PalmDetect" "1"''} - ${lib.optionalString ( + ${optionalString cfg.palmDetect ''Option "PalmDetect" "1"''} + ${optionalString ( cfg.palmMinWidth != null ) ''Option "PalmMinWidth" "${toString cfg.palmMinWidth}"''} - ${lib.optionalString (cfg.palmMinZ != null) ''Option "PalmMinZ" "${toString cfg.palmMinZ}"''} - ${lib.optionalString ( + ${optionalString (cfg.palmMinZ != null) ''Option "PalmMinZ" "${toString cfg.palmMinZ}"''} + ${optionalString ( cfg.scrollDelta != null ) ''Option "VertScrollDelta" "${toString cfg.scrollDelta}"''} ${ if !cfg.horizontalScroll then ''Option "HorizScrollDelta" "0"'' else - (lib.optionalString ( + (optionalString ( cfg.scrollDelta != null ) ''Option "HorizScrollDelta" "${toString cfg.scrollDelta}"'') } diff --git a/nixos/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix index c4e6ed941583..3707b7f41575 100644 --- a/nixos/modules/services/x11/hardware/wacom.nix +++ b/nixos/modules/services/x11/hardware/wacom.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.wacom; @@ -16,8 +19,8 @@ in services.xserver.wacom = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable the Wacom touchscreen/digitizer/tablet. @@ -34,7 +37,7 @@ in }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { environment.systemPackages = [ pkgs.xf86_input_wacom ]; # provides xsetwacom diff --git a/nixos/modules/services/x11/imwheel.nix b/nixos/modules/services/x11/imwheel.nix index c674555a60f3..2898af201a7e 100644 --- a/nixos/modules/services/x11/imwheel.nix +++ b/nixos/modules/services/x11/imwheel.nix @@ -4,16 +4,17 @@ pkgs, ... }: +with lib; let cfg = config.services.xserver.imwheel; in { options = { services.xserver.imwheel = { - enable = lib.mkEnableOption "IMWheel service"; + enable = mkEnableOption "IMWheel service"; - extraOptions = lib.mkOption { - type = lib.types.listOf lib.types.str; + extraOptions = mkOption { + type = types.listOf types.str; default = [ "--buttons=45" ]; example = [ "--debug" ]; description = '' @@ -22,10 +23,10 @@ in ''; }; - rules = lib.mkOption { - type = lib.types.attrsOf lib.types.str; + rules = mkOption { + type = types.attrsOf types.str; default = { }; - example = lib.literalExpression '' + example = literalExpression '' { ".*" = ''' None, Up, Button4, 8 @@ -48,11 +49,11 @@ in }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { environment.systemPackages = [ pkgs.imwheel ]; environment.etc."X11/imwheel/imwheelrc".source = pkgs.writeText "imwheelrc" ( - lib.concatStringsSep "\n\n" (lib.mapAttrsToList (rule: conf: "\"${rule}\"\n${conf}") cfg.rules) + concatStringsSep "\n\n" (mapAttrsToList (rule: conf: "\"${rule}\"\n${conf}") cfg.rules) ); systemd.user.services.imwheel = { @@ -62,7 +63,7 @@ in serviceConfig = { ExecStart = "${pkgs.imwheel}/bin/imwheel " - + lib.escapeShellArgs ( + + escapeShellArgs ( [ "--detach" "--kill" diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index 41d2acda063d..237d78484286 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -5,6 +5,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.picom; @@ -12,46 +15,46 @@ let pairOf = x: - with lib.types; + with types; addCheck (listOf x) (y: length y == 2) // { description = "pair of ${x.description}"; }; - mkDefaultAttrs = lib.mapAttrs (n: v: lib.mkDefault v); + mkDefaultAttrs = mapAttrs (n: v: mkDefault v); # Basically a tinkered lib.generators.mkKeyValueDefault # It either serializes a top-level definition "key: { values };" # or an expression "key = { values };" mkAttrsString = top: - lib.mapAttrsToList ( + mapAttrsToList ( k: v: let - sep = if (top && lib.isAttrs v) then ":" else "="; + sep = if (top && isAttrs v) then ":" else "="; in - "${lib.escape [ sep ] k}${sep}${mkValueString v};" + "${escape [ sep ] k}${sep}${mkValueString v};" ); # This serializes a Nix expression to the libconfig format. mkValueString = v: - if lib.types.bool.check v then - lib.boolToString v - else if lib.types.int.check v then + if types.bool.check v then + boolToString v + else if types.int.check v then toString v - else if lib.types.float.check v then + else if types.float.check v then toString v - else if lib.types.str.check v then - "\"${lib.escape [ "\"" ] v}\"" + else if types.str.check v then + "\"${escape [ "\"" ] v}\"" else if builtins.isList v then - "[ ${lib.concatMapStringsSep " , " mkValueString v} ]" - else if lib.types.attrs.check v then - "{ ${lib.concatStringsSep " " (mkAttrsString false v)} }" + "[ ${concatMapStringsSep " , " mkValueString v} ]" + else if types.attrs.check v then + "{ ${concatStringsSep " " (mkAttrsString false v)} }" else throw '' invalid expression used in option services.picom.settings: ${v} ''; - toConf = attrs: lib.concatStringsSep "\n" (mkAttrsString true cfg.settings); + toConf = attrs: concatStringsSep "\n" (mkAttrsString true cfg.settings); configFile = pkgs.writeText "picom.conf" (toConf cfg.settings); @@ -59,38 +62,38 @@ in { imports = [ - (lib.mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ]) - (lib.mkRemovedOptionModule [ "services" "picom" "refreshRate" ] '' + (mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ]) + (mkRemovedOptionModule [ "services" "picom" "refreshRate" ] '' This option corresponds to `refresh-rate`, which has been unused since picom v6 and was subsequently removed by upstream. See https://github.com/yshui/picom/commit/bcbc410 '') - (lib.mkRemovedOptionModule [ "services" "picom" "experimentalBackends" ] '' + (mkRemovedOptionModule [ "services" "picom" "experimentalBackends" ] '' This option was removed by upstream since picom v10. '') ]; options.services.picom = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = '' Whether or not to enable Picom as the X.org composite manager. ''; }; - package = lib.mkPackageOption pkgs "picom" { }; + package = mkPackageOption pkgs "picom" { }; - fade = lib.mkOption { - type = lib.types.bool; + fade = mkOption { + type = types.bool; default = false; description = '' Fade windows in and out. ''; }; - fadeDelta = lib.mkOption { - type = lib.types.ints.positive; + fadeDelta = mkOption { + type = types.ints.positive; default = 10; example = 5; description = '' @@ -98,8 +101,8 @@ in ''; }; - fadeSteps = lib.mkOption { - type = pairOf (lib.types.numbers.between 0.01 1); + fadeSteps = mkOption { + type = pairOf (types.numbers.between 0.01 1); default = [ 0.028 0.03 @@ -113,8 +116,8 @@ in ''; }; - fadeExclude = lib.mkOption { - type = lib.types.listOf lib.types.str; + fadeExclude = mkOption { + type = types.listOf types.str; default = [ ]; example = [ "window_type *= 'menu'" @@ -127,16 +130,16 @@ in ''; }; - shadow = lib.mkOption { - type = lib.types.bool; + shadow = mkOption { + type = types.bool; default = false; description = '' Draw window shadows. ''; }; - shadowOffsets = lib.mkOption { - type = pairOf lib.types.int; + shadowOffsets = mkOption { + type = pairOf types.int; default = [ (-15) (-15) @@ -150,8 +153,8 @@ in ''; }; - shadowOpacity = lib.mkOption { - type = lib.types.numbers.between 0 1; + shadowOpacity = mkOption { + type = types.numbers.between 0 1; default = 0.75; example = 0.8; description = '' @@ -159,8 +162,8 @@ in ''; }; - shadowExclude = lib.mkOption { - type = lib.types.listOf lib.types.str; + shadowExclude = mkOption { + type = types.listOf types.str; default = [ ]; example = [ "window_type *= 'menu'" @@ -173,8 +176,8 @@ in ''; }; - activeOpacity = lib.mkOption { - type = lib.types.numbers.between 0 1; + activeOpacity = mkOption { + type = types.numbers.between 0 1; default = 1.0; example = 0.8; description = '' @@ -182,8 +185,8 @@ in ''; }; - inactiveOpacity = lib.mkOption { - type = lib.types.numbers.between 0.1 1; + inactiveOpacity = mkOption { + type = types.numbers.between 0.1 1; default = 1.0; example = 0.8; description = '' @@ -191,8 +194,8 @@ in ''; }; - menuOpacity = lib.mkOption { - type = lib.types.numbers.between 0 1; + menuOpacity = mkOption { + type = types.numbers.between 0 1; default = 1.0; example = 0.8; description = '' @@ -200,8 +203,8 @@ in ''; }; - wintypes = lib.mkOption { - type = lib.types.attrs; + wintypes = mkOption { + type = types.attrs; default = { popup_menu = { opacity = cfg.menuOpacity; @@ -210,7 +213,7 @@ in opacity = cfg.menuOpacity; }; }; - defaultText = lib.literalExpression '' + defaultText = literalExpression '' { popup_menu = { opacity = config.${opt.menuOpacity}; }; dropdown_menu = { opacity = config.${opt.menuOpacity}; }; @@ -222,8 +225,8 @@ in ''; }; - opacityRules = lib.mkOption { - type = lib.types.listOf lib.types.str; + opacityRules = mkOption { + type = types.listOf types.str; default = [ ]; example = [ "95:class_g = 'URxvt' && !_NET_WM_STATE@:32a" @@ -234,8 +237,8 @@ in ''; }; - backend = lib.mkOption { - type = lib.types.enum [ + backend = mkOption { + type = types.enum [ "egl" "glx" "xrender" @@ -247,9 +250,9 @@ in ''; }; - vSync = lib.mkOption { + vSync = mkOption { type = - with lib.types; + with types; either bool (enum [ "none" "drm" @@ -265,9 +268,9 @@ in res = x != "none"; msg = "The type of services.picom.vSync has changed to bool:" - + " interpreting ${x} as ${lib.boolToString res}"; + + " interpreting ${x} as ${boolToString res}"; in - if lib.isBool x then x else lib.warn msg res; + if isBool x then x else warn msg res; description = '' Enable vertical synchronization. Chooses the best method @@ -277,7 +280,7 @@ in }; settings = - with lib.types; + with types; let scalar = oneOf [ @@ -310,10 +313,10 @@ in }; in - lib.mkOption { + mkOption { type = topLevel; default = { }; - example = lib.literalExpression '' + example = literalExpression '' blur = { method = "gaussian"; size = 10; @@ -328,19 +331,19 @@ in }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { services.picom.settings = mkDefaultAttrs { # fading fading = cfg.fade; fade-delta = cfg.fadeDelta; - fade-in-step = lib.elemAt cfg.fadeSteps 0; - fade-out-step = lib.elemAt cfg.fadeSteps 1; + fade-in-step = elemAt cfg.fadeSteps 0; + fade-out-step = elemAt cfg.fadeSteps 1; fade-exclude = cfg.fadeExclude; # shadows shadow = cfg.shadow; - shadow-offset-x = lib.elemAt cfg.shadowOffsets 0; - shadow-offset-y = lib.elemAt cfg.shadowOffsets 1; + shadow-offset-x = elemAt cfg.shadowOffsets 0; + shadow-offset-y = elemAt cfg.shadowOffsets 1; shadow-opacity = cfg.shadowOpacity; shadow-exclude = cfg.shadowExclude; @@ -363,12 +366,12 @@ in partOf = [ "graphical-session.target" ]; # Temporarily fixes corrupt colours with Mesa 18 - environment = lib.mkIf (cfg.backend == "glx") { + environment = mkIf (cfg.backend == "glx") { allow_rgb10_configs = "false"; }; serviceConfig = { - ExecStart = "${lib.getExe cfg.package} --config ${configFile}"; + ExecStart = "${getExe cfg.package} --config ${configFile}"; RestartSec = 3; Restart = "always"; }; diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 849780b53a77..661053c20016 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.redshift; @@ -13,32 +16,32 @@ in { imports = [ - (lib.mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ] ( + (mkChangedOptionModule [ "services" "redshift" "latitude" ] [ "location" "latitude" ] ( config: let - value = lib.getAttrFromPath [ "services" "redshift" "latitude" ] config; + value = getAttrFromPath [ "services" "redshift" "latitude" ] config; in if value == null then throw "services.redshift.latitude is set to null, you can remove this" else builtins.fromJSON value )) - (lib.mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ] ( + (mkChangedOptionModule [ "services" "redshift" "longitude" ] [ "location" "longitude" ] ( config: let - value = lib.getAttrFromPath [ "services" "redshift" "longitude" ] config; + value = getAttrFromPath [ "services" "redshift" "longitude" ] config; in if value == null then throw "services.redshift.longitude is set to null, you can remove this" else builtins.fromJSON value )) - (lib.mkRenamedOptionModule [ "services" "redshift" "provider" ] [ "location" "provider" ]) + (mkRenamedOptionModule [ "services" "redshift" "provider" ] [ "location" "provider" ]) ]; options.services.redshift = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = '' Enable Redshift to change your screen's colour temperature depending on @@ -47,16 +50,16 @@ in }; temperature = { - day = lib.mkOption { - type = lib.types.int; + day = mkOption { + type = types.int; default = 5500; description = '' Colour temperature to use during the day, between `1000` and `25000` K. ''; }; - night = lib.mkOption { - type = lib.types.int; + night = mkOption { + type = types.int; default = 3700; description = '' Colour temperature to use at night, between @@ -66,16 +69,16 @@ in }; brightness = { - day = lib.mkOption { - type = lib.types.str; + day = mkOption { + type = types.str; default = "1"; description = '' Screen brightness to apply during the day, between `0.1` and `1.0`. ''; }; - night = lib.mkOption { - type = lib.types.str; + night = mkOption { + type = types.str; default = "1"; description = '' Screen brightness to apply during the night, @@ -84,10 +87,10 @@ in }; }; - package = lib.mkPackageOption pkgs "redshift" { }; + package = mkPackageOption pkgs "redshift" { }; - executable = lib.mkOption { - type = lib.types.str; + executable = mkOption { + type = types.str; default = "/bin/redshift"; example = "/bin/redshift-gtk"; description = '' @@ -95,8 +98,8 @@ in ''; }; - extraOptions = lib.mkOption { - type = lib.types.listOf lib.types.str; + extraOptions = mkOption { + type = types.listOf types.str; default = [ ]; example = [ "-v" @@ -109,7 +112,7 @@ in }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { # needed so that .desktop files are installed, which geoclue cares about environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/services/x11/touchegg.nix b/nixos/modules/services/x11/touchegg.nix index e641e5cf4727..def3dac738e0 100644 --- a/nixos/modules/services/x11/touchegg.nix +++ b/nixos/modules/services/x11/touchegg.nix @@ -4,24 +4,27 @@ pkgs, ... }: + +with lib; + let cfg = config.services.touchegg; in { meta = { - maintainers = lib.teams.pantheon.members; + maintainers = teams.pantheon.members; }; ###### interface options.services.touchegg = { - enable = lib.mkEnableOption "touchegg, a multi-touch gesture recognizer"; + enable = mkEnableOption "touchegg, a multi-touch gesture recognizer"; - package = lib.mkPackageOption pkgs "touchegg" { }; + package = mkPackageOption pkgs "touchegg" { }; }; ###### implementation - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { systemd.services.touchegg = { description = "Touchegg Daemon"; serviceConfig = { diff --git a/nixos/modules/services/x11/unclutter-xfixes.nix b/nixos/modules/services/x11/unclutter-xfixes.nix index 32ff1577d5a5..48adb3665f38 100644 --- a/nixos/modules/services/x11/unclutter-xfixes.nix +++ b/nixos/modules/services/x11/unclutter-xfixes.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.unclutter-xfixes; @@ -11,29 +14,29 @@ in { options.services.unclutter-xfixes = { - enable = lib.mkOption { + enable = mkOption { description = "Enable unclutter-xfixes to hide your mouse cursor when inactive."; - type = lib.types.bool; + type = types.bool; default = false; }; - package = lib.mkPackageOption pkgs "unclutter-xfixes" { }; + package = mkPackageOption pkgs "unclutter-xfixes" { }; - timeout = lib.mkOption { + timeout = mkOption { description = "Number of seconds before the cursor is marked inactive."; - type = lib.types.int; + type = types.int; default = 1; }; - threshold = lib.mkOption { + threshold = mkOption { description = "Minimum number of pixels considered cursor movement."; - type = lib.types.int; + type = types.int; default = 1; }; - extraOptions = lib.mkOption { + extraOptions = mkOption { description = "More arguments to pass to the unclutter-xfixes command."; - type = lib.types.listOf lib.types.str; + type = types.listOf types.str; default = [ ]; example = [ "exclude-root" @@ -43,7 +46,7 @@ in }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { systemd.user.services.unclutter-xfixes = { description = "unclutter-xfixes"; wantedBy = [ "graphical-session.target" ]; @@ -52,7 +55,7 @@ in ${cfg.package}/bin/unclutter \ --timeout ${toString cfg.timeout} \ --jitter ${toString (cfg.threshold - 1)} \ - ${lib.concatMapStrings (x: " --" + x) cfg.extraOptions} \ + ${concatMapStrings (x: " --" + x) cfg.extraOptions} \ ''; serviceConfig.RestartSec = 3; serviceConfig.Restart = "always"; diff --git a/nixos/modules/services/x11/unclutter.nix b/nixos/modules/services/x11/unclutter.nix index 7da1f611373a..bb11c8639783 100644 --- a/nixos/modules/services/x11/unclutter.nix +++ b/nixos/modules/services/x11/unclutter.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.unclutter; @@ -11,42 +14,42 @@ in { options.services.unclutter = { - enable = lib.mkOption { + enable = mkOption { description = "Enable unclutter to hide your mouse cursor when inactive"; - type = lib.types.bool; + type = types.bool; default = false; }; - package = lib.mkPackageOption pkgs "unclutter" { }; + package = mkPackageOption pkgs "unclutter" { }; - keystroke = lib.mkOption { + keystroke = mkOption { description = "Wait for a keystroke before hiding the cursor"; - type = lib.types.bool; + type = types.bool; default = false; }; - timeout = lib.mkOption { + timeout = mkOption { description = "Number of seconds before the cursor is marked inactive"; - type = lib.types.int; + type = types.int; default = 1; }; - threshold = lib.mkOption { + threshold = mkOption { description = "Minimum number of pixels considered cursor movement"; - type = lib.types.int; + type = types.int; default = 1; }; - excluded = lib.mkOption { + excluded = mkOption { description = "Names of windows where unclutter should not apply"; - type = lib.types.listOf lib.types.str; + type = types.listOf types.str; default = [ ]; example = [ "" ]; }; - extraOptions = lib.mkOption { + extraOptions = mkOption { description = "More arguments to pass to the unclutter command"; - type = lib.types.listOf lib.types.str; + type = types.listOf types.str; default = [ ]; example = [ "noevent" @@ -55,7 +58,7 @@ in }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { systemd.user.services.unclutter = { description = "unclutter"; wantedBy = [ "graphical-session.target" ]; @@ -64,9 +67,9 @@ in ${cfg.package}/bin/unclutter \ -idle ${toString cfg.timeout} \ -jitter ${toString (cfg.threshold - 1)} \ - ${lib.optionalString cfg.keystroke "-keystroke"} \ - ${lib.concatMapStrings (x: " -" + x) cfg.extraOptions} \ - -not ${lib.concatStringsSep " " cfg.excluded} \ + ${optionalString cfg.keystroke "-keystroke"} \ + ${concatMapStrings (x: " -" + x) cfg.extraOptions} \ + -not ${concatStringsSep " " cfg.excluded} \ ''; serviceConfig.PassEnvironment = "DISPLAY"; serviceConfig.RestartSec = 3; @@ -75,7 +78,7 @@ in }; imports = [ - (lib.mkRenamedOptionModule + (mkRenamedOptionModule [ "services" "unclutter" "threeshold" ] [ "services" "unclutter" "threshold" ] ) diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix index b015374bfd28..5f8212a3c9ce 100644 --- a/nixos/modules/services/x11/urxvtd.nix +++ b/nixos/modules/services/x11/urxvtd.nix @@ -4,14 +4,18 @@ pkgs, ... }: + # maintainer: siddharthist + +with lib; + let cfg = config.services.urxvtd; in { options.services.urxvtd = { - enable = lib.mkOption { - type = lib.types.bool; + enable = mkOption { + type = types.bool; default = false; description = '' Enable urxvtd, the urxvt terminal daemon. To use urxvtd, run @@ -19,10 +23,10 @@ in ''; }; - package = lib.mkPackageOption pkgs "rxvt-unicode" { }; + package = mkPackageOption pkgs "rxvt-unicode" { }; }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { systemd.user.services.urxvtd = { description = "urxvt terminal daemon"; wantedBy = [ "graphical-session.target" ]; diff --git a/nixos/modules/services/x11/window-managers/2bwm.nix b/nixos/modules/services/x11/window-managers/2bwm.nix index 0bafdfee3e7b..ce01fcb17a10 100644 --- a/nixos/modules/services/x11/window-managers/2bwm.nix +++ b/nixos/modules/services/x11/window-managers/2bwm.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.windowManager."2bwm"; @@ -15,14 +18,14 @@ in ###### interface options = { - services.xserver.windowManager."2bwm".enable = lib.mkEnableOption "2bwm"; + services.xserver.windowManager."2bwm".enable = mkEnableOption "2bwm"; }; ###### implementation - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { - services.xserver.windowManager.session = lib.singleton { + services.xserver.windowManager.session = singleton { name = "2bwm"; start = '' ${pkgs._2bwm}/bin/2bwm & diff --git a/nixos/modules/services/x11/window-managers/afterstep.nix b/nixos/modules/services/x11/window-managers/afterstep.nix index 7ea546442d6f..d88be7db3757 100644 --- a/nixos/modules/services/x11/window-managers/afterstep.nix +++ b/nixos/modules/services/x11/window-managers/afterstep.nix @@ -4,18 +4,21 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.windowManager.afterstep; in { ###### interface options = { - services.xserver.windowManager.afterstep.enable = lib.mkEnableOption "afterstep"; + services.xserver.windowManager.afterstep.enable = mkEnableOption "afterstep"; }; ###### implementation - config = lib.mkIf cfg.enable { - services.xserver.windowManager.session = lib.singleton { + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { name = "afterstep"; start = '' ${pkgs.afterstep}/bin/afterstep & diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix index ee9e0cbf816e..8b3d781c4c21 100644 --- a/nixos/modules/services/x11/window-managers/awesome.nix +++ b/nixos/modules/services/x11/window-managers/awesome.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.windowManager.awesome; @@ -22,20 +25,20 @@ in services.xserver.windowManager.awesome = { - enable = lib.mkEnableOption "Awesome window manager"; + enable = mkEnableOption "Awesome window manager"; - luaModules = lib.mkOption { + luaModules = mkOption { default = [ ]; - type = lib.types.listOf lib.types.package; + type = types.listOf types.package; description = "List of lua packages available for being used in the Awesome configuration."; - example = lib.literalExpression "[ pkgs.luaPackages.vicious ]"; + example = literalExpression "[ pkgs.luaPackages.vicious ]"; }; - package = lib.mkPackageOption pkgs "awesome" { }; + package = mkPackageOption pkgs "awesome" { }; - noArgb = lib.mkOption { + noArgb = mkOption { default = false; - type = lib.types.bool; + type = types.bool; description = "Disable client transparency support, which can be greatly detrimental to performance in some setups"; }; }; @@ -44,9 +47,9 @@ in ###### implementation - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { - services.xserver.windowManager.session = lib.singleton { + services.xserver.windowManager.session = singleton { name = "awesome"; start = '' ${awesome}/bin/awesome ${lib.optionalString cfg.noArgb "--no-argb"} ${makeSearchPath cfg.luaModules} & diff --git a/nixos/modules/services/x11/window-managers/berry.nix b/nixos/modules/services/x11/window-managers/berry.nix index 8fdd4e0f79a8..ba094d0e3efc 100644 --- a/nixos/modules/services/x11/window-managers/berry.nix +++ b/nixos/modules/services/x11/window-managers/berry.nix @@ -4,18 +4,21 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.windowManager.berry; in { ###### interface options = { - services.xserver.windowManager.berry.enable = lib.mkEnableOption "berry"; + services.xserver.windowManager.berry.enable = mkEnableOption "berry"; }; ###### implementation - config = lib.mkIf cfg.enable { - services.xserver.windowManager.session = lib.singleton { + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { name = "berry"; start = '' ${pkgs.berry}/bin/berry & diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix index 5a173da6b23b..46201036f05a 100644 --- a/nixos/modules/services/x11/window-managers/bspwm.nix +++ b/nixos/modules/services/x11/window-managers/bspwm.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.windowManager.bspwm; in @@ -11,14 +14,14 @@ in { options = { services.xserver.windowManager.bspwm = { - enable = lib.mkEnableOption "bspwm"; + enable = mkEnableOption "bspwm"; - package = lib.mkPackageOption pkgs "bspwm" { + package = mkPackageOption pkgs "bspwm" { example = "bspwm-unstable"; }; - configFile = lib.mkOption { - type = with lib.types; nullOr path; - example = lib.literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"''; + configFile = mkOption { + type = with types; nullOr path; + example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"''; default = null; description = '' Path to the bspwm configuration file. @@ -27,12 +30,12 @@ in }; sxhkd = { - package = lib.mkPackageOption pkgs "sxhkd" { + package = mkPackageOption pkgs "sxhkd" { example = "sxhkd-unstable"; }; - configFile = lib.mkOption { - type = with lib.types; nullOr path; - example = lib.literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"''; + configFile = mkOption { + type = with types; nullOr path; + example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"''; default = null; description = '' Path to the sxhkd configuration file. @@ -43,15 +46,15 @@ in }; }; - config = lib.mkIf cfg.enable { - services.xserver.windowManager.session = lib.singleton { + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { name = "bspwm"; start = '' export _JAVA_AWT_WM_NONREPARENTING=1 SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${ - lib.optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\"" + optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\"" } & - ${cfg.package}/bin/bspwm ${lib.optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} & + ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} & waitPID=$! ''; }; @@ -59,17 +62,17 @@ in }; imports = [ - (lib.mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ] + (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ] "Use services.xserver.windowManager.bspwm.enable and set services.xserver.windowManager.bspwm.package to pkgs.bspwm-unstable to use the unstable version of bspwm." ) - (lib.mkRemovedOptionModule [ + (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm" "startThroughSession" ] "bspwm package does not provide bspwm-session anymore.") - (lib.mkRemovedOptionModule [ + (mkRemovedOptionModule [ "services" "xserver" "windowManager" diff --git a/nixos/modules/services/x11/window-managers/clfswm.nix b/nixos/modules/services/x11/window-managers/clfswm.nix index 03eaf6e4911e..b50b60849495 100644 --- a/nixos/modules/services/x11/window-managers/clfswm.nix +++ b/nixos/modules/services/x11/window-managers/clfswm.nix @@ -4,6 +4,9 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.windowManager.clfswm; in @@ -11,13 +14,13 @@ in { options = { services.xserver.windowManager.clfswm = { - enable = lib.mkEnableOption "clfswm"; - package = lib.mkPackageOption pkgs [ "sbclPackages" "clfswm" ] { }; + enable = mkEnableOption "clfswm"; + package = mkPackageOption pkgs [ "sbclPackages" "clfswm" ] { }; }; }; - config = lib.mkIf cfg.enable { - services.xserver.windowManager.session = lib.singleton { + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { name = "clfswm"; start = '' ${cfg.package}/bin/clfswm & diff --git a/nixos/modules/services/x11/window-managers/cwm.nix b/nixos/modules/services/x11/window-managers/cwm.nix index 2f32cc4e7449..d2be487b0d4c 100644 --- a/nixos/modules/services/x11/window-managers/cwm.nix +++ b/nixos/modules/services/x11/window-managers/cwm.nix @@ -4,15 +4,18 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.windowManager.cwm; in { options = { - services.xserver.windowManager.cwm.enable = lib.mkEnableOption "cwm"; + services.xserver.windowManager.cwm.enable = mkEnableOption "cwm"; }; - config = lib.mkIf cfg.enable { - services.xserver.windowManager.session = lib.singleton { + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { name = "cwm"; start = '' cwm & diff --git a/nixos/modules/services/x11/window-managers/dwm.nix b/nixos/modules/services/x11/window-managers/dwm.nix index 1ee79a94016d..c81a834a0679 100644 --- a/nixos/modules/services/x11/window-managers/dwm.nix +++ b/nixos/modules/services/x11/window-managers/dwm.nix @@ -1,4 +1,7 @@ { config, lib, pkgs, ... }: + +with lib; + let cfg = config.services.xserver.windowManager.dwm; @@ -11,8 +14,8 @@ in options = { services.xserver.windowManager.dwm = { - enable = lib.mkEnableOption "dwm"; - package = lib.mkPackageOption pkgs "dwm" { + enable = mkEnableOption "dwm"; + package = mkPackageOption pkgs "dwm" { example = '' pkgs.dwm.overrideAttrs (oldAttrs: rec { patches = [ @@ -30,9 +33,9 @@ in ###### implementation - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { - services.xserver.windowManager.session = lib.singleton + services.xserver.windowManager.session = singleton { name = "dwm"; start = '' diff --git a/nixos/modules/services/x11/window-managers/e16.nix b/nixos/modules/services/x11/window-managers/e16.nix index e7f2f61f3885..b1ed3ea66417 100644 --- a/nixos/modules/services/x11/window-managers/e16.nix +++ b/nixos/modules/services/x11/window-managers/e16.nix @@ -4,18 +4,21 @@ pkgs, ... }: + +with lib; + let cfg = config.services.xserver.windowManager.e16; in { ###### interface options = { - services.xserver.windowManager.e16.enable = lib.mkEnableOption "e16"; + services.xserver.windowManager.e16.enable = mkEnableOption "e16"; }; ###### implementation - config = lib.mkIf cfg.enable { - services.xserver.windowManager.session = lib.singleton { + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { name = "E16"; start = '' ${pkgs.e16}/bin/e16 &