nixpkgs: bump 2023-12-21

```
• Updated input 'nixpkgs-next-unpatched':
    'github:nixos/nixpkgs/459873d8d6492b492ca7f9b03d5a50117099abfa' (2023-12-21)
  → 'github:nixos/nixpkgs/63fbe1a992e6030fbf444ac9d6b629ec76ab86ad' (2023-12-21)
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/38bbf09b10659db891af01288bd99a5e8e8d7861' (2023-12-21)
  → 'github:nixos/nixpkgs/490828bce1b0cdfe328adc7f6280a519d7e68ed4' (2023-12-21)
```
This commit is contained in:
2023-12-21 20:03:06 +00:00
parent 0f429caaca
commit 12edd60969
3 changed files with 30 additions and 22 deletions

12
flake.lock generated
View File

@@ -19,11 +19,11 @@
}, },
"nixpkgs-next-unpatched": { "nixpkgs-next-unpatched": {
"locked": { "locked": {
"lastModified": 1703138461, "lastModified": 1703181656,
"narHash": "sha256-isnFHLeGr/BYhg/z5ZgxwaDQn0tAVC0OPolhE3M6RR4=", "narHash": "sha256-HoIGQajGPoo43hBKeLN4sQN+NaZMjZvyzEMk3cf0q5k=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "459873d8d6492b492ca7f9b03d5a50117099abfa", "rev": "63fbe1a992e6030fbf444ac9d6b629ec76ab86ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -51,11 +51,11 @@
}, },
"nixpkgs-unpatched": { "nixpkgs-unpatched": {
"locked": { "locked": {
"lastModified": 1703142341, "lastModified": 1703181470,
"narHash": "sha256-UaYtrzAUC7tAsTnhMsFe+pnLxMOWyGykcx2bEIhX/hE=", "narHash": "sha256-DtKV9TAViIKI4hYTbv3/v2bFIQgXDUp7OaiQExjgoZA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "38bbf09b10659db891af01288bd99a5e8e8d7861", "rev": "490828bce1b0cdfe328adc7f6280a519d7e68ed4",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -4,8 +4,8 @@
# sway-config docs: `man 5 sway` # sway-config docs: `man 5 sway`
let let
cfg = config.sane.gui.sway; cfg = config.sane.gui.sway;
defaultPackage = let wrapSway = sway': swayOverrideArgs: let
# `defaultPackage` exists to create a `sway.desktop` file # `wrapSway` exists to create a `sway.desktop` file
# which will launch sway with our desired debugging facilities. # which will launch sway with our desired debugging facilities.
# i.e. redirect output to syslog. # i.e. redirect output to syslog.
scfg = config.programs.sway; scfg = config.programs.sway;
@@ -14,31 +14,36 @@ let
echo "launching sway-session (sway.desktop)..." | ${systemd-cat} --identifier=sway-session echo "launching sway-session (sway.desktop)..." | ${systemd-cat} --identifier=sway-session
sway 2>&1 | ${systemd-cat} --identifier=sway-session sway 2>&1 | ${systemd-cat} --identifier=sway-session
''; '';
origSway = pkgs.sway.override { # this override is what `programs.nixos` would do internally if we left `package` unset.
# this override is what `programs.nixos` would do internally if we left `package` unset. configuredSway = sway'.override swayOverrideArgs;
extraSessionCommands = scfg.extraSessionCommands;
extraOptions = scfg.extraOptions;
withBaseWrapper = scfg.wrapperFeatures.base;
withGtkWrapper = scfg.wrapperFeatures.gtk;
isNixOS = true;
# TODO: `enableXWayland = ...`?
};
desktop-file = pkgs.runCommand "sway-desktop-wrapper" {} '' desktop-file = pkgs.runCommand "sway-desktop-wrapper" {} ''
mkdir -p $out/share/wayland-sessions mkdir -p $out/share/wayland-sessions
substitute ${origSway}/share/wayland-sessions/sway.desktop $out/share/wayland-sessions/sway.desktop \ substitute ${configuredSway}/share/wayland-sessions/sway.desktop $out/share/wayland-sessions/sway.desktop \
--replace 'Exec=sway' 'Exec=${swayWithLogger}/bin/sway-session' --replace 'Exec=sway' 'Exec=${swayWithLogger}/bin/sway-session'
# XXX(2023/09/24) phog greeter (mobile greeter) will crash if DesktopNames is not set # XXX(2023/09/24) phog greeter (mobile greeter) will crash if DesktopNames is not set
echo "DesktopNames=Sway" >> $out/share/wayland-sessions/sway.desktop echo "DesktopNames=Sway" >> $out/share/wayland-sessions/sway.desktop
''; '';
in pkgs.symlinkJoin { in pkgs.symlinkJoin {
inherit (origSway) name meta; inherit (configuredSway) name meta;
# the order of these `paths` is suchs that the desktop-file should claim share/wayland-sessions/sway.deskop, # the order of these `paths` is suchs that the desktop-file should claim share/wayland-sessions/sway.deskop,
# overriding whatever the origSway provides # overriding whatever the configuredSway provides
paths = [ desktop-file origSway ]; paths = [ desktop-file configuredSway ];
passthru = { passthru = {
inherit (origSway.passthru) providedSessions; inherit (configuredSway.passthru) providedSessions;
# nixos/modules/programs/wayland/sway.nix will call `.override` on the package we provide it
override = wrapSway sway';
}; };
}; };
defaultPackage = wrapSway pkgs.sway {
# this is technically optional, in that the nixos sway module will call `override` with these args anyway.
# but that wasn't always the case; it may change again; so don't rely on it.
inherit (config.programs.sway)
extraSessionCommands extraOptions;
withBaseWrapper = config.programs.sway.wrapperFeatures.base;
withGtkWrapper = config.programs.sway.wrapperFeatures.gtk;
isNixOS = true;
# TODO: `enableXWayland = ...`?
};
in in
{ {
options = with lib; { options = with lib; {

View File

@@ -42,18 +42,21 @@ in [
prUrl = "https://github.com/NixOS/nixpkgs/pull/266254"; prUrl = "https://github.com/NixOS/nixpkgs/pull/266254";
hash = "sha256-HOR9oehqs1n3KE4jKZavXYy7pqEq9osJsxupCDnrtHY="; hash = "sha256-HOR9oehqs1n3KE4jKZavXYy7pqEq9osJsxupCDnrtHY=";
merged.staging = "202312062110"; merged.staging = "202312062110";
merged.staging-next = "202312210000";
}) })
(fetchpatch' { (fetchpatch' {
title = "jbig2dec cross fix"; title = "jbig2dec cross fix";
prUrl = "https://github.com/NixOS/nixpkgs/pull/275027"; prUrl = "https://github.com/NixOS/nixpkgs/pull/275027";
hash = "sha256-sGBX1UamML46oS7zPZcuQXURjwADiPvvcEmAphoHvMg="; hash = "sha256-sGBX1UamML46oS7zPZcuQXURjwADiPvvcEmAphoHvMg=";
merged.staging = "202312202300"; merged.staging = "202312202300";
merged.staging-next = "202312210000";
}) })
(fetchpatch' { (fetchpatch' {
title = "vala: look for files in targetOffset"; title = "vala: look for files in targetOffset";
prUrl = "https://github.com/NixOS/nixpkgs/pull/267550"; prUrl = "https://github.com/NixOS/nixpkgs/pull/267550";
hash = "sha256-Dl9ZQazjXjIbw38Q78otQvgVCB/QZAC1IYoFX0Tuyw0="; hash = "sha256-Dl9ZQazjXjIbw38Q78otQvgVCB/QZAC1IYoFX0Tuyw0=";
merged.staging = "202312012359"; merged.staging = "202312012359";
merged.staging-next = "202312210000";
}) })
# (fetchpatch' { # (fetchpatch' {