From 479d59e0fa13ef2229968e2b443aa288755a80b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 25 Jul 2025 13:33:34 +0000 Subject: [PATCH 1/9] ngtcp2-gnutls: 1.13.0 -> 1.14.0 --- pkgs/development/libraries/ngtcp2/gnutls.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix index f8cc5a4031de..66d343bac07d 100644 --- a/pkgs/development/libraries/ngtcp2/gnutls.nix +++ b/pkgs/development/libraries/ngtcp2/gnutls.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = "ngtcp2"; rev = "v${version}"; - hash = "sha256-SvxGZoV4N9wNAsI5pOjjGECgk2vV0FifzHi1gbGjqnc="; + hash = "sha256-TpfCfVhguFbTqQiY+zl6Kn7fsIQHR1tvNC4YLkxmBis="; }; outputs = [ From 966957b5d26957849fd8dc3f6a52bf17d4920484 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Fri, 25 Jul 2025 09:33:22 -0700 Subject: [PATCH 2/9] python3Packages.openai: 1.97.0 -> 1.97.1 Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.97.0...refs/tags/v1.97.1 Changelog: https://github.com/openai/openai-python/blob/v1.97.1/CHANGELOG.md --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index faeae18bc9c6..6a12d443ffc1 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -51,14 +51,14 @@ buildPythonPackage rec { pname = "openai"; - version = "1.97.0"; + version = "1.97.1"; pyproject = true; src = fetchFromGitHub { owner = "openai"; repo = "openai-python"; tag = "v${version}"; - hash = "sha256-q+GUEHducm71Zqh7ZfRF217awFKQIsOSEWoe04M3DFM="; + hash = "sha256-ANY74P3tM8VVPh9m6hOdZSkMhcQphi72bKNcLrsLEq8="; }; postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"''; From 45f261041539785076258319a62216737f6c44e6 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 27 Jul 2025 14:17:09 -0400 Subject: [PATCH 3/9] nixos/lemurs: Fix test > machine.wait_until_succeeds("pgrep -f 'lemurs.*tty1'") This was guaranteed to succeed whether the desired process existed or not, because it was matching the 'bach -c ...' command the test driver uses to run the command. Let's wait for evidence on screen instead. --- nixos/tests/lemurs/lemurs.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/lemurs/lemurs.nix b/nixos/tests/lemurs/lemurs.nix index 803f74bfc681..e1b4ef40f983 100644 --- a/nixos/tests/lemurs/lemurs.nix +++ b/nixos/tests/lemurs/lemurs.nix @@ -11,6 +11,8 @@ ]; }; + enableOCR = true; + nodes.machine = _: { imports = [ ../common/user-account.nix ]; services.displayManager.lemurs.enable = true; @@ -20,7 +22,7 @@ machine.start() machine.wait_for_unit("multi-user.target") - machine.wait_until_succeeds("pgrep -f 'lemurs.*tty1'") + machine.wait_for_text("Login") machine.screenshot("postboot") with subtest("Log in as alice on a virtual console"): From 599f47fc1e47995d841338f927d98d4b3a760cfc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 28 Jul 2025 18:11:46 +0000 Subject: [PATCH 4/9] thunderbird-latest-unwrapped: 140.0.1 -> 141.0 --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index de69fec16b69..466cb3f2e694 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -94,8 +94,8 @@ rec { thunderbird = thunderbird-latest; thunderbird-latest = common { - version = "140.0.1"; - sha512 = "fbef1d0228c49fc9c11425b6be03bb7e44e6abc6f2027ee23317270ca2c6b0a935bb41b38667acf014bd9e1166cbe62754f1e919e04f2355dc4c833e015c78b8"; + version = "141.0"; + sha512 = "cd747c0831532f90685975567102d1bdb90a780e21209fe4b7bddf2d84ac88576766706e95e22043a30a8a89b6d3daffb56a68c3ccc4a300b8236b20d4fca675"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-latest"; From 570ae8423df2865a8c7a4c0af3a37daf27c7dd56 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 24 Jul 2025 19:26:02 -0400 Subject: [PATCH 5/9] nixos/autovt: Pull in autovt@tty1 in Nix, not generateUnits --- nixos/lib/systemd-lib.nix | 3 --- nixos/modules/services/ttys/getty.nix | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index 3b68d56d4541..97a797b47b0f 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -526,9 +526,6 @@ rec { ln -s ${cfg.ctrlAltDelUnit} $out/ctrl-alt-del.target ln -s rescue.target $out/kbrequest.target - mkdir -p $out/getty.target.wants/ - ln -s ../autovt@tty1.service $out/getty.target.wants/ - ln -s ../remote-fs.target $out/multi-user.target.wants/ ''} ''; # */ diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix index 709bbff233d6..8fed34e73932 100644 --- a/nixos/modules/services/ttys/getty.nix +++ b/nixos/modules/services/ttys/getty.nix @@ -148,6 +148,8 @@ in "container-getty@.service" ]; + systemd.targets.getty.wants = [ "autovt@tty1.service" ]; + systemd.services."getty@" = { serviceConfig.ExecStart = [ # override upstream default with an empty ExecStart From 878c68dad3494190e4b1d56f73f829100087e4ca Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 24 Jul 2025 21:52:43 -0400 Subject: [PATCH 6/9] nixos/xserver: Remove tty option Note about sddm: The MinimumVT option has been documented as unavailable since v0.20. --- nixos/modules/services/display-managers/gdm.nix | 1 - nixos/modules/services/display-managers/lemurs.nix | 3 +-- nixos/modules/services/display-managers/ly.nix | 3 +-- nixos/modules/services/display-managers/sddm.nix | 4 +--- .../services/x11/display-managers/lightdm.nix | 1 - nixos/modules/services/x11/xserver.nix | 12 +++++------- 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix index 11675e914286..5e18c42889da 100644 --- a/nixos/modules/services/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -190,7 +190,6 @@ in users.groups.gdm.gid = config.ids.gids.gdm; # GDM needs different xserverArgs, presumable because using wayland by default. - services.xserver.tty = null; services.xserver.display = null; services.xserver.verbose = null; diff --git a/nixos/modules/services/display-managers/lemurs.nix b/nixos/modules/services/display-managers/lemurs.nix index d395c946983b..bae768ab95a2 100644 --- a/nixos/modules/services/display-managers/lemurs.nix +++ b/nixos/modules/services/display-managers/lemurs.nix @@ -70,8 +70,7 @@ in # Required for wayland with setLoginUid = false; seatd.enable = true; xserver = { - # To enable user switching, allow lemurs to allocate TTYs/displays dynamically. - tty = null; + # To enable user switching, allow lemurs to allocate displays dynamically. display = null; }; displayManager = { diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index 76047c3942a7..16d5a952e8a0 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -118,8 +118,7 @@ in }; xserver = { - # To enable user switching, allow ly to allocate TTYs/displays dynamically. - tty = null; + # To enable user switching, allow ly to allocate displays dynamically. display = null; }; }; diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix index d8ce1e231b3c..bbadb0573553 100644 --- a/nixos/modules/services/display-managers/sddm.nix +++ b/nixos/modules/services/display-managers/sddm.nix @@ -93,7 +93,6 @@ let } // optionalAttrs xcfg.enable { X11 = { - MinimumVT = if xcfg.tty != null then xcfg.tty else 7; ServerPath = toString xserverWrapper; XephyrPath = "${pkgs.xorg.xorgserver.out}/bin/Xephyr"; SessionCommand = toString dmcfg.sessionData.wrapper; @@ -419,8 +418,7 @@ in services = { dbus.packages = [ sddm ]; xserver = { - # To enable user switching, allow sddm to allocate TTYs/displays dynamically. - tty = null; + # To enable user switching, allow sddm to allocate displays dynamically. display = null; }; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 8034e779f5b8..8549b32988c9 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -336,7 +336,6 @@ in ]; users.groups.lightdm.gid = config.ids.gids.lightdm; - services.xserver.tty = null; # We might start multiple X servers so let the tty increment themselves.. services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there }; } diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 8df96f40106d..e90d51b19ffe 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -277,6 +277,11 @@ in "dir" ]; }) + (lib.mkRemovedOptionModule [ + "services" + "xserver" + "tty" + ] "'services.xserver.tty' was removed because it was ineffective.") ]; ###### interface @@ -675,12 +680,6 @@ in ''; }; - tty = mkOption { - type = types.nullOr types.int; - default = 7; - description = "Virtual console for the X server."; - }; - display = mkOption { type = types.nullOr types.int; default = 0; @@ -886,7 +885,6 @@ in "${cfg.xkb.dir}" ] ++ optional (cfg.display != null) ":${toString cfg.display}" - ++ optional (cfg.tty != null) "vt${toString cfg.tty}" ++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}" ++ optional (cfg.logFile != null) "-logfile ${toString cfg.logFile}" ++ optional (cfg.verbose != null) "-verbose ${toString cfg.verbose}" From f8929b7381d3cf07257882cdee12ca927ce70241 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 24 Jul 2025 21:52:43 -0400 Subject: [PATCH 7/9] nixos/lemurs: TTYVTDisallocate to clear VT Otherwise, when on VT1, the systemd status is still visible. --- nixos/modules/services/display-managers/lemurs.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/display-managers/lemurs.nix b/nixos/modules/services/display-managers/lemurs.nix index bae768ab95a2..f4d418161f39 100644 --- a/nixos/modules/services/display-managers/lemurs.nix +++ b/nixos/modules/services/display-managers/lemurs.nix @@ -113,6 +113,8 @@ in TTYPath = "/dev/tty${toString cfg.vt}"; TTYReset = "yes"; TTYVHangup = "yes"; + # Clear the console before starting + TTYVTDisallocate = true; }; # Don't kill a user session when using nixos-rebuild restartIfChanged = false; From 431a9761829604e71130790ff6f95e71d4013174 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 24 Jul 2025 21:52:43 -0400 Subject: [PATCH 8/9] nixos/display-managers: tty1 everywhere --- doc/release-notes/rl-2511.section.md | 2 ++ .../services/display-managers/default.nix | 10 ++++++++ .../modules/services/display-managers/gdm.nix | 2 -- .../services/display-managers/greetd.nix | 20 ++++++++-------- .../services/display-managers/lemurs.nix | 23 +++++++++---------- .../modules/services/display-managers/ly.nix | 8 +++---- .../services/display-managers/sddm.nix | 4 ---- .../services/x11/display-managers/lightdm.nix | 9 +------- .../display-managers/sddm/unwrapped.nix | 4 +--- pkgs/by-name/gd/gdm/package.nix | 5 +--- 10 files changed, 40 insertions(+), 47 deletions(-) diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index c7cfe224b1a5..8802d4b733f6 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -54,6 +54,8 @@ - `go-mockery` has been updated to v3. For migration instructions see the [upstream documentation](https://vektra.github.io/mockery/latest/v3/). If v2 is still required `go-mockery_v2` has been added but will be removed on or before 2029-12-31 in-line with it's [upstream support lifecycle](https://vektra.github.io/mockery/ +- NixOS display manager modules now strictly use tty1, where many of them previously used tty7. Options to configure display managers' VT have been dropped. A configuration with a display manager enabled will not start `getty@tty1.service`, even if the system is forced to boot into `multi-user.target` instead of `graphical.target`. + ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes} diff --git a/nixos/modules/services/display-managers/default.nix b/nixos/modules/services/display-managers/default.nix index d6ab8cbef811..7d518cb501fa 100644 --- a/nixos/modules/services/display-managers/default.nix +++ b/nixos/modules/services/display-managers/default.nix @@ -267,12 +267,22 @@ in in lib.mkIf noDmUsed (lib.mkDefault false); + # We can't just rely on 'Conflicts=autovt@tty1.service' because + # 'switch-to-configuration switch' will start 'autovt@tty1.service' + # and kill us. + systemd.services."autovt@tty1".enable = + lib.mkIf config.systemd.services.display-manager.enable false; + systemd.services.display-manager = { description = "Display Manager"; after = [ "acpid.service" "systemd-logind.service" "systemd-user-sessions.service" + "autovt@tty1.service" + ]; + conflicts = [ + "autovt@tty1.service" ]; restartIfChanged = false; diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix index 5e18c42889da..583fdae1aad9 100644 --- a/nixos/modules/services/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -259,12 +259,10 @@ in "rc-local.service" "systemd-machined.service" "systemd-user-sessions.service" - "getty@tty${gdm.initialVT}.service" "plymouth-quit.service" "plymouth-start.service" ]; systemd.services.display-manager.conflicts = [ - "getty@tty${gdm.initialVT}.service" "plymouth-quit.service" ]; systemd.services.display-manager.onFailure = [ diff --git a/nixos/modules/services/display-managers/greetd.nix b/nixos/modules/services/display-managers/greetd.nix index bb1e45c8adfe..8d0580187d0e 100644 --- a/nixos/modules/services/display-managers/greetd.nix +++ b/nixos/modules/services/display-managers/greetd.nix @@ -6,10 +6,18 @@ }: let cfg = config.services.greetd; - tty = "tty${toString cfg.vt}"; + tty = "tty1"; settingsFormat = pkgs.formats.toml { }; in { + imports = [ + (lib.mkRemovedOptionModule [ + "services" + "greetd" + "vt" + ] "The VT is now fixed to VT1.") + ]; + options.services.greetd = { enable = lib.mkEnableOption "greetd, a minimal and flexible login manager daemon"; @@ -41,14 +49,6 @@ in ''; }; - vt = lib.mkOption { - type = lib.types.int; - default = 1; - description = '' - The virtual console (tty) that greetd should use. This option also disables getty on that tty. - ''; - }; - restart = lib.mkOption { type = lib.types.bool; default = !(cfg.settings ? initial_session); @@ -62,7 +62,7 @@ in }; config = lib.mkIf cfg.enable { - services.greetd.settings.terminal.vt = lib.mkDefault cfg.vt; + services.greetd.settings.terminal.vt = 1; services.greetd.settings.default_session.user = lib.mkDefault "greeter"; security.pam.services.greetd = { diff --git a/nixos/modules/services/display-managers/lemurs.nix b/nixos/modules/services/display-managers/lemurs.nix index f4d418161f39..fdf9458b6d5c 100644 --- a/nixos/modules/services/display-managers/lemurs.nix +++ b/nixos/modules/services/display-managers/lemurs.nix @@ -9,6 +9,15 @@ let settingsFormat = pkgs.formats.toml { }; in { + imports = [ + (lib.mkRemovedOptionModule [ + "services" + "displayManager" + "lemurs" + "vt" + ] "The VT is now fixed to VT1.") + ]; + options.services.displayManager.lemurs = { enable = lib.mkEnableOption "" // { description = '' @@ -36,14 +45,6 @@ in See [lemurs configuration documentation](https://github.com/coastalwhite/lemurs/blob/main/extra/config.toml) for available options. ''; }; - - vt = lib.mkOption { - type = lib.types.ints.positive; - default = 2; - description = '' - The virtual console (tty) that lemurs should use. - ''; - }; }; config = lib.mkIf cfg.enable { assertions = [ @@ -82,7 +83,7 @@ in desktops = config.services.displayManager.sessionData.desktops; in { - tty = lib.mkDefault cfg.vt; + tty = 1; system_shell = lib.mkDefault "${pkgs.bash}/bin/bash"; initial_path = lib.mkDefault "/run/current-system/sw/bin"; x11 = { @@ -101,16 +102,14 @@ in Wants = [ "systemd-user-sessions.service" ]; After = [ "systemd-user-sessions.service" - "getty@tty${toString cfg.vt}.service" "plymouth-quit-wait.service" ]; - Conflicts = [ "getty@tty${toString cfg.vt}.service" ]; }; serviceConfig = { Type = "idle"; # Defaults from lemurs upstream configuration StandardInput = "tty"; - TTYPath = "/dev/tty${toString cfg.vt}"; + TTYPath = "/dev/tty1"; TTYReset = "yes"; TTYVHangup = "yes"; # Clear the console before starting diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index 16d5a952e8a0..3dded8ed0624 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -36,7 +36,6 @@ let defaultConfig = { shutdown_cmd = "/run/current-system/systemd/bin/systemctl poweroff"; restart_cmd = "/run/current-system/systemd/bin/systemctl reboot"; - tty = 2; service_name = "ly"; path = "/run/current-system/sw/bin"; term_reset_cmd = "${pkgs.ncurses}/bin/tput reset"; @@ -115,6 +114,10 @@ in displayManager = { enable = true; execCmd = "exec /run/current-system/sw/bin/ly"; + + # Set this here instead of 'defaultConfig' so users get eval + # errors when they change it. + ly.settings.tty = 1; }; xserver = { @@ -130,11 +133,8 @@ in after = [ "systemd-user-sessions.service" "plymouth-quit-wait.service" - "getty@tty${toString finalConfig.tty}.service" ]; - conflicts = [ "getty@tty7.service" ]; - serviceConfig = { Type = "idle"; StandardInput = "tty"; diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix index bbadb0573553..06516fb76b7a 100644 --- a/nixos/modules/services/display-managers/sddm.nix +++ b/nixos/modules/services/display-managers/sddm.nix @@ -430,13 +430,9 @@ in services.display-manager = { after = [ "systemd-user-sessions.service" - "getty@tty7.service" "plymouth-quit.service" "systemd-logind.service" ]; - conflicts = [ - "getty@tty7.service" - ]; }; }; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 8549b32988c9..8226f2cf0be5 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -42,6 +42,7 @@ let lightdmConf = writeText "lightdm.conf" '' [LightDM] + minimum-vt = 1 ${optionalString cfg.greeter.enable '' greeter-user = ${config.users.users.lightdm.name} greeters-directory = ${cfg.greeter.package} @@ -234,19 +235,11 @@ in exec ${lightdm}/sbin/lightdm ''; - # Replaces getty - systemd.services.display-manager.conflicts = [ - "getty@tty7.service" - # TODO: Add "plymouth-quit.service" so LightDM can control when plymouth - # quits. Currently this breaks switching to configurations with plymouth. - ]; - # Pull in dependencies of services we replace. systemd.services.display-manager.after = [ "rc-local.service" "systemd-machined.service" "systemd-user-sessions.service" - "getty@tty7.service" "user.slice" ]; diff --git a/pkgs/applications/display-managers/sddm/unwrapped.nix b/pkgs/applications/display-managers/sddm/unwrapped.nix index 517cfddd881d..2e2bb8710280 100644 --- a/pkgs/applications/display-managers/sddm/unwrapped.nix +++ b/pkgs/applications/display-managers/sddm/unwrapped.nix @@ -72,9 +72,7 @@ stdenv.mkDerivation (finalAttrs: { "-DUID_MIN=1000" "-DUID_MAX=29999" - # we still want to run the DM on VT 7 for the time being, as 1-6 are - # occupied by getties by default - "-DSDDM_INITIAL_VT=7" + "-DSDDM_INITIAL_VT=1" "-DQT_IMPORTS_DIR=${placeholder "out"}/${qtbase.qtQmlPrefix}" "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index 92a9a025f234..75ecc584896e 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dgdm-xsession=true" # TODO: Setup a default-path? https://gitlab.gnome.org/GNOME/gdm/-/blob/6fc40ac6aa37c8ad87c32f0b1a5d813d34bf7770/meson_options.txt#L6 - "-Dinitial-vt=${finalAttrs.passthru.initialVT}" + "-Dinitial-vt=1" "-Dudev-dir=${placeholder "out"}/lib/udev/rules.d" "-Dsystemdsystemunitdir=${placeholder "out"}/lib/systemd/system" "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" @@ -185,9 +185,6 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = gnome.updateScript { packageName = "gdm"; }; - # Used in GDM NixOS module - # Don't remove. - initialVT = "7"; dconfDb = "${finalAttrs.finalPackage}/share/gdm/greeter-dconf-defaults"; dconfProfile = "user-db:user\nfile-db:${finalAttrs.passthru.dconfDb}"; From 8dad559f943a699961efd895eb29fc1f159c260a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 29 Jul 2025 04:37:46 +0000 Subject: [PATCH 9/9] makejinja: 2.8.0 -> 2.8.1 --- pkgs/by-name/ma/makejinja/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/makejinja/package.nix b/pkgs/by-name/ma/makejinja/package.nix index 3f4dab4e7dcb..94ef333a4ddb 100644 --- a/pkgs/by-name/ma/makejinja/package.nix +++ b/pkgs/by-name/ma/makejinja/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "makejinja"; - version = "2.8.0"; + version = "2.8.1"; pyproject = true; src = fetchFromGitHub { owner = "mirkolenz"; repo = "makejinja"; tag = "v${version}"; - hash = "sha256-Y6R+nVwIuviYhvLp5Aqb+BUCaAD6fF+GH8zmJrWNxFc="; + hash = "sha256-vK5MJb4n3/NmkohpJ1shEexvjHlEAfwZJWy2oL+rzRk="; }; build-system = with python3Packages; [ setuptools ];