colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs: 2024-07-01 -> 2024-07-02

Browse Source
This commit is contained in:
Colin
2024-07-03 09:08:53 +00:00
parent a75a8f8425
commit a234e57d89
12 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hosts/by-name/crappy/default.nix
View File

@@ -16,7 +16,7 @@
sane.programs.calls.enableFor.user.colin = false;
sane.programs.consoleMediaUtils.enableFor.user.colin = true;
sane.programs.epiphany.enableFor.user.colin = true;
sane.programs."gnome.geary".enableFor.user.colin = false;
sane.programs.geary.enableFor.user.colin = false;
# sane.programs.firefox.enableFor.user.colin = true;
sane.programs.portfolio-filemanager.enableFor.user.colin = true;
sane.programs.signal-desktop.enableFor.user.colin = false;

2
hosts/by-name/desko/default.nix
View File

@@ -32,7 +32,7 @@
sane.programs.iphoneUtils.enableFor.user.colin = true;
sane.programs.steam.enableFor.user.colin = true;
sane.programs."gnome.geary".config.autostart = true;
sane.programs.geary.config.autostart = true;
sane.programs.signal-desktop.config.autostart = true;
sane.programs.nwg-panel.config = {

2
hosts/by-name/lappy/default.nix
View File

@@ -18,7 +18,7 @@
sane.programs.stepmania.enableFor.user.colin = true;
sane.programs.sway.enableFor.user.colin = true;
sane.programs."gnome.geary".config.autostart = true;
sane.programs.geary.config.autostart = true;
sane.programs.signal-desktop.config.autostart = true;
sops.secrets.colin-passwd.neededForUsers = true;

2
hosts/by-name/moby/default.nix
View File

@@ -41,7 +41,7 @@
# sane.programs.ntfy-sh.config.autostart = true;
sane.programs.dino.config.autostart = true;
# sane.programs.signal-desktop.config.autostart = true; # TODO: enable once electron stops derping.
# sane.programs."gnome.geary".config.autostart = true;
# sane.programs.geary.config.autostart = true;
# sane.programs.calls.config.autostart = true;
sane.programs.pipewire.config = {

44
hosts/common/programs/assorted.nix
View File

@@ -280,16 +280,16 @@ in
# "gnome.cheese"
# "gnome-feeds" # RSS reader (with claimed mobile support)
# "gnome.file-roller"
"gnome.geary" # adaptive e-mail client; uses webkitgtk 4.1
"gnome.gnome-calculator"
"gnome.gnome-calendar"
"geary" # adaptive e-mail client; uses webkitgtk 4.1
"gnome-calculator"
"gnome-calendar"
"gnome.gnome-clocks"
"gnome.gnome-maps"
# "gnome-podcasts"
# "gnome.gnome-system-monitor"
# "gnome.gnome-terminal" # works on phosh
"gnome.gnome-weather"
# "gnome.seahorse" # keyring/secret manager
# "seahorse" # keyring/secret manager
"gnome-frog" # OCR/QR decoder
"gpodder"
"gst-device-monitor" # for debugging audio/video
@@ -360,8 +360,8 @@ in
"gimp" # broken on phosh
# "gnome.dconf-editor"
# "gnome.file-roller"
"gnome.gnome-disk-utility"
"gnome.nautilus" # file browser
"gnome-disk-utility"
"nautilus" # file browser
# "gnome.totem" # video player, supposedly supports UPnP
# "handbrake" #< TODO: fix build
"inkscape"
@@ -605,32 +605,32 @@ in
"/tmp" # "Cannot open display:" if it can't mount /tmp 👀
];
"gnome.gnome-calculator".buildCost = 1;
"gnome.gnome-calculator".sandbox.method = "bwrap";
"gnome.gnome-calculator".sandbox.whitelistWayland = true;
gnome-calculator.buildCost = 1;
gnome-calculator.sandbox.method = "bwrap";
gnome-calculator.sandbox.whitelistWayland = true;
"gnome.gnome-calendar".buildCost = 1;
gnome-calendar.buildCost = 1;
# gnome-calendar surely has data to persist, but i use it strictly to do date math, not track events.
"gnome.gnome-calendar".sandbox.method = "bwrap";
"gnome.gnome-calendar".sandbox.whitelistWayland = true;
gnome-calendar.sandbox.method = "bwrap";
gnome-calendar.sandbox.whitelistWayland = true;
# gnome-disks
"gnome.gnome-disk-utility".buildCost = 1;
"gnome.gnome-disk-utility".sandbox.method = "bwrap";
"gnome.gnome-disk-utility".sandbox.whitelistDbus = [ "system" ];
"gnome.gnome-disk-utility".sandbox.whitelistWayland = true;
"gnome.gnome-disk-utility".sandbox.extraHomePaths = [
gnome-disk-utility.buildCost = 1;
gnome-disk-utility.sandbox.method = "bwrap";
gnome-disk-utility.sandbox.whitelistDbus = [ "system" ];
gnome-disk-utility.sandbox.whitelistWayland = true;
gnome-disk-utility.sandbox.extraHomePaths = [
"tmp"
"use/iso"
# TODO: probably need /dev and such
];
# seahorse: dump gnome-keyring secrets.
"gnome.seahorse".buildCost = 1;
# N.B.: it can also manage ~/.ssh keys, but i explicitly don't add those to the sandbox for now.
"gnome.seahorse".sandbox.method = "bwrap";
"gnome.seahorse".sandbox.whitelistDbus = [ "user" ];
"gnome.seahorse".sandbox.whitelistWayland = true;
seahorse.buildCost = 1;
# N.B. it can lso manage ~/.ssh keys, but i explicitly don't add those to the sandbox for now.
seahorse.sandbox.method = "bwrap";
seahorse.sandbox.whitelistDbus = [ "user" ];
seahorse.sandbox.whitelistWayland = true;
gnome-2048.buildCost = 1;
gnome-2048.sandbox.method = "bwrap";

4
hosts/common/programs/geary.nix
View File

@@ -5,10 +5,10 @@
# <https://gitlab.gnome.org/GNOME/geary/-/issues/1212>
{ config, lib, ... }:
let
cfg = config.sane.programs."gnome.geary";
cfg = config.sane.programs."geary";
in
{
sane.programs."gnome.geary" = {
sane.programs."geary" = {
configOption = with lib; mkOption {
default = {};
type = types.submodule {

2
hosts/common/programs/gnome-keyring/default.nix
View File

@@ -1,7 +1,7 @@
{ lib, pkgs, ... }:
{
sane.programs.gnome-keyring = {
packageUnwrapped = pkgs.rmDbusServices pkgs.gnome.gnome-keyring;
packageUnwrapped = pkgs.rmDbusServices pkgs.gnome-keyring;
sandbox.method = "bwrap";
sandbox.whitelistDbus = [ "user" ];
sandbox.extraRuntimePaths = [

4
hosts/common/programs/nautilus.nix
View File

@@ -1,8 +1,8 @@
{ pkgs, ... }:
{
sane.programs."gnome.nautilus" = {
sane.programs."nautilus" = {
# some of its dbus services don't even refer to real paths
packageUnwrapped = pkgs.rmDbusServicesInPlace (pkgs.gnome.nautilus.overrideAttrs (orig: {
packageUnwrapped = pkgs.rmDbusServicesInPlace (pkgs.nautilus.overrideAttrs (orig: {
# enable the "Audio and Video Properties" pane. see: <https://nixos.wiki/wiki/Nautilus>
buildInputs = orig.buildInputs ++ (with pkgs.gst_all_1; [
gst-plugins-good

14
hosts/common/programs/sane-theme.nix
View File

@@ -106,7 +106,7 @@ let
yaru-theme
zuki-themes
;
inherit (pkgs.gnome)
inherit (pkgs)
adwaita-icon-theme
gnome-themes-extra
;
@@ -120,11 +120,11 @@ let
Dracula-cursors = dracula-theme;
};
cursor-theme = {
Adwaita = gnome.adwaita-icon-theme;
Adwaita = adwaita-icon-theme;
};
gtk-theme = {
Adwaita = gnome.gnome-themes-extra; # gtk-3.0
Adwaita-dark = gnome.gnome-themes-extra; # gtk-3.0
Adwaita = gnome-themes-extra; # gtk-3.0
Adwaita-dark = gnome-themes-extra; # gtk-3.0
Arc = arc-theme; # gtk-4.0
Arc-Dark = arc-theme; # gtk-4.0
Arc-Darker = arc-theme; # gtk-4.0
@@ -137,7 +137,7 @@ let
Fluent-Dark-compact = fluent-gtk-theme; # gtk-4.0
Fluent-Light = fluent-gtk-theme; # gtk-4.0
Fluent-Light-compact = fluent-gtk-theme; # gtk-4.0, NICE!
HighContrast = gnome.gnome-themes-extra; # gtk-3.0
HighContrast = gnome-themes-extra; # gtk-3.0
Matcha-light-azul = matcha-gtk-theme; # gtk-4.0, NICE!
Matcha-light-sea = matcha-gtk-theme; # gtk-4.0, NICE!
# additional Matcha-* omitted
@@ -182,13 +182,13 @@ let
# - that's probably why so many themes here also symlink Adwaita
# my accounting of "adwaita coverage" seems to be overoptimistic somehow
# maybe some apps bundle adwaita themselves
Adwaita = gnome.adwaita-icon-theme;
Adwaita = adwaita-icon-theme;
Arc = arc-icon-theme; # 4.5/5, meh icon for "vertical ellipsis". 3/5 adwaita coverage
elementary-xfce = elementary-xfce-icon-theme; # does not cross compile (2023/10/03)
elementary-xfce-dark = elementary-xfce-icon-theme;
elementary-xfce-darker = elementary-xfce-icon-theme;
elementary-xfce-darkest = elementary-xfce-icon-theme;
HighContrast = gnome.gnome-themes-extra; # 5/5. 5/5 adwaita coverage (4/5 cross)
HighContrast = gnome-themes-extra; # 5/5. 5/5 adwaita coverage (4/5 cross)
Humanity = humanity-icon-theme; # 5/5. 5/5 adwaita coverage (3.5/5 cross, unique in which icons work)
Humanity-Dark = humanity-icon-theme;
kora = kora-icon-theme;

2
hosts/common/programs/swaynotificationcenter/default.nix
View File

@@ -200,7 +200,7 @@ in
buttons.dissent
] ++ lib.optionals config.sane.programs.signal-desktop.enabled [
buttons.signal-desktop
] ++ lib.optionals config.sane.programs."gnome.geary".enabled [
] ++ lib.optionals config.sane.programs.geary.enabled [
buttons.geary
];
};

84
overlays/cross.nix
View File

@@ -259,6 +259,39 @@ in with final; {
# # <https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Runtime.html>
# };
evolution-data-server = prev.evolution-data-server.overrideAttrs (upstream: {
# 2024/05/31: upstreaming is blocked by appstream (out for PR), libgweather (out for PR)
cmakeFlags = upstream.cmakeFlags ++ [
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
"-DENABLE_TESTS=no"
"-DGETTEXT_MSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt"
"-DGETTEXT_MSGMERGE_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgmerge"
"-DGETTEXT_XGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext"
"-DGLIB_COMPILE_RESOURCES=${lib.getDev buildPackages.glib}/bin/glib-compile-resources"
"-DGLIB_COMPILE_SCHEMAS=${lib.getDev buildPackages.glib}/bin/glib-compile-schemas"
];
postPatch = (upstream.postPatch or "") + ''
substituteInPlace src/addressbook/libebook-contacts/CMakeLists.txt --replace-fail \
'COMMAND ''${CMAKE_CURRENT_BINARY_DIR}/gen-western-table' \
'COMMAND ${stdenv.hostPlatform.emulator buildPackages} ''${CMAKE_CURRENT_BINARY_DIR}/gen-western-table'
substituteInPlace src/camel/CMakeLists.txt --replace-fail \
'COMMAND ''${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables' \
'COMMAND ${stdenv.hostPlatform.emulator buildPackages} ''${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables'
'';
# N.B.: the deps are funky even without cross compiling.
# upstream probably wants to replace pcre with pcre2, and maybe provide perl
# nativeBuildInputs = upstream.nativeBuildInputs ++ [
# perl # fixes "The 'perl' not found, not installing csv2vcard"
# # glib
# # libiconv
# # iconv
# ];
# buildInputs = upstream.buildInputs ++ [
# pcre2 # fixes: "Package 'libpcre2-8', required by 'glib-2.0', not found"
# mount # fails to fix: "Package 'mount', required by 'gio-2.0', not found"
# ];
});
# 2024/05/31: upstreaming is unblocked
# firejail = prev.firejail.overrideAttrs (upstream: {
# # firejail executes its build outputs to produce the default filter list.
@@ -366,6 +399,15 @@ in with final; {
];
});
# 2024/05/31: upstreaming is blocked by qtsvg, appstream (out for review), libgweather (out for review)
geary = prev.geary.overrideAttrs (upstream: {
buildInputs = upstream.buildInputs ++ [
# glib
appstream-glib
libxml2
];
});
# 2024/05/31: upstreaming is unblocked
glycin-loaders = prev.glycin-loaders.overrideAttrs (upstream: {
nativeBuildInputs = upstream.nativeBuildInputs ++ [
@@ -412,52 +454,10 @@ in with final; {
gnome-online-accounts = mvToBuildInputs [ dbus ] prev.gnome-online-accounts;
gnome = prev.gnome.overrideScope (self: super: {
evolution-data-server = super.evolution-data-server.overrideAttrs (upstream: {
# 2024/05/31: upstreaming is blocked by appstream (out for PR), libgweather (out for PR)
cmakeFlags = upstream.cmakeFlags ++ [
"-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
"-DENABLE_TESTS=no"
"-DGETTEXT_MSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt"
"-DGETTEXT_MSGMERGE_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgmerge"
"-DGETTEXT_XGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext"
"-DGLIB_COMPILE_RESOURCES=${lib.getDev buildPackages.glib}/bin/glib-compile-resources"
"-DGLIB_COMPILE_SCHEMAS=${lib.getDev buildPackages.glib}/bin/glib-compile-schemas"
];
postPatch = (upstream.postPatch or "") + ''
substituteInPlace src/addressbook/libebook-contacts/CMakeLists.txt --replace-fail \
'COMMAND ''${CMAKE_CURRENT_BINARY_DIR}/gen-western-table' \
'COMMAND ${stdenv.hostPlatform.emulator buildPackages} ''${CMAKE_CURRENT_BINARY_DIR}/gen-western-table'
substituteInPlace src/camel/CMakeLists.txt --replace-fail \
'COMMAND ''${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables' \
'COMMAND ${stdenv.hostPlatform.emulator buildPackages} ''${CMAKE_CURRENT_BINARY_DIR}/camel-gen-tables'
'';
# N.B.: the deps are funky even without cross compiling.
# upstream probably wants to replace pcre with pcre2, and maybe provide perl
# nativeBuildInputs = upstream.nativeBuildInputs ++ [
# perl # fixes "The 'perl' not found, not installing csv2vcard"
# # glib
# # libiconv
# # iconv
# ];
# buildInputs = upstream.buildInputs ++ [
# pcre2 # fixes: "Package 'libpcre2-8', required by 'glib-2.0', not found"
# mount # fails to fix: "Package 'mount', required by 'gio-2.0', not found"
# ];
});
# 2024/05/31: upstreaming is blocked on appstream (out for review), gnome-user-share (apache-httpd, webp-pixbuf-loader), qtsvg
# fixes: "src/meson.build:106:0: ERROR: Program 'glib-compile-resources' not found or not executable"
# file-roller = mvToNativeInputs [ glib ] super.file-roller;
# 2024/05/31: upstreaming is blocked by qtsvg, appstream (out for review), libgweather (out for review)
geary = super.geary.overrideAttrs (upstream: {
buildInputs = upstream.buildInputs ++ [
# glib
appstream-glib
libxml2
];
});
# 2024/05/31: upstreaming is blocked by a LOT: qtbase, qtsvg, webp-pixbuf-loader, libgweather, gnome-color-manager, appstream, apache-httpd, ibus
# fixes "subprojects/gvc/meson.build:30:0: ERROR: Program 'glib-mkenums mkenums' not found or not executable"
# gnome-control-center = mvToNativeInputs [ glib ] super.gnome-control-center;

14
pkgs/additional/nixpkgs/default.nix
View File

@@ -27,12 +27,12 @@
}:
let
lock = {
master.rev = "c08bd9add4732d87fde747e15b8fc053dfd1234b";
master.sha256 = "sha256-M6Vr7LbYeesXrG3hjAExzIfYFxrncrs1dpnp7zdeUN4=";
staging.rev = "c08bd9add4732d87fde747e15b8fc053dfd1234b";
staging.sha256 = "sha256-M6Vr7LbYeesXrG3hjAExzIfYFxrncrs1dpnp7zdeUN4=";
staging-next.rev = "c08bd9add4732d87fde747e15b8fc053dfd1234b";
staging-next.sha256 = "sha256-M6Vr7LbYeesXrG3hjAExzIfYFxrncrs1dpnp7zdeUN4=";
master.rev = "1efee2bb34d5f0db946c7292de1d4392c3601d37";
master.sha256 = "sha256-InEKcwWZoNKakuPqGqo3skypFO7DJOvCsRIoJ9DhJt8=";
staging.rev = "1efee2bb34d5f0db946c7292de1d4392c3601d37";
staging.sha256 = "sha256-InEKcwWZoNKakuPqGqo3skypFO7DJOvCsRIoJ9DhJt8=";
staging-next.rev = "1efee2bb34d5f0db946c7292de1d4392c3601d37";
staging-next.sha256 = "sha256-InEKcwWZoNKakuPqGqo3skypFO7DJOvCsRIoJ9DhJt8=";
};
lock' = lock."${variant}";
unpatchedSrc = fetchzip {
@@ -81,7 +81,7 @@ in
src.overrideAttrs (base: {
# attributes needed for update scripts
pname = "nixpkgs";
version = "24.05-unstable-2024-07-01";
version = "24.05-unstable-2024-07-02";
passthru = (base.passthru or {}) // nixpkgs // {
src = unpatchedSrc // {
inherit (lock') rev;