gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-nixos

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-04-16 08:34:01 +00:00
committed by GitHub
parent e0f5956351 162dfd3253
commit f300ddee71
39 changed files with 145 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/hardware/rasdaemon.nix
+4
View File
@@ -10,6 +10,10 @@ let
in
{
meta = {
inherit (pkgs.rasdaemon.meta) maintainers;
};
options.hardware.rasdaemon = {
enable = lib.mkEnableOption "RAS logging daemon";
nixos/tests/alps.nix
+41 -32
View File
@@ -10,40 +10,49 @@ in
};
nodes = {
server = {
imports = [ ./common/user-account.nix ];
security.pki.certificateFiles = [
certs.ca.cert
];
networking.extraHosts = ''
127.0.0.1 ${domain}
'';
networking.firewall.allowedTCPPorts = [
25
465
993
];
services.postfix = {
enable = true;
enableSubmission = true;
enableSubmissions = true;
server =
{ config, ... }:
{
imports = [ ./common/user-account.nix ];
security.pki.certificateFiles = [
certs.ca.cert
];
networking.extraHosts = ''
127.0.0.1 ${domain}
'';
networking.firewall.allowedTCPPorts = [
25
465
993
];
services.postfix = {
enable = true;
enableSubmission = true;
enableSubmissions = true;
settings.main = {
smtp_tls_CAfile = "${certs.ca.cert}";
smtpd_tls_chain_files = [
"${certs.${domain}.key}"
"${certs.${domain}.cert}"
];
settings.main = {
smtp_tls_CAfile = "${certs.ca.cert}";
smtpd_tls_chain_files = [
"${certs.${domain}.key}"
"${certs.${domain}.cert}"
];
};
};
services.dovecot2 = {
enable = true;
enablePAM = true;
settings = {
dovecot_config_version = "2.4.3";
dovecot_storage_version = config.services.dovecot2.package.version;
mail_driver = "maildir";
mail_path = "~/mail";
protocols.imap = true;
ssl_server_ca_file = "${certs.ca.cert}";
ssl_server_cert_file = "${certs.${domain}.cert}";
ssl_server_key_file = "${certs.${domain}.key}";
};
};
};
services.dovecot2 = {
enable = true;
enableImap = true;
sslCACert = "${certs.ca.cert}";
sslServerCert = "${certs.${domain}.cert}";
sslServerKey = "${certs.${domain}.key}";
};
};
client =
{ nodes, config, ... }:
@@ -110,7 +119,7 @@ in
''
server.start()
server.wait_for_unit("postfix.service")
server.wait_for_unit("dovecot2.service")
server.wait_for_unit("dovecot.service")
server.wait_for_open_port(465)
server.wait_for_open_port(993)
nixos/tests/discourse.nix
+9 -2
View File
@@ -85,7 +85,7 @@ in
};
nodes.client =
{ nodes, ... }:
{ config, nodes, ... }:
{
imports = [ common/user-account.nix ];
@@ -100,7 +100,14 @@ in
services.dovecot2 = {
enable = true;
protocols = [ "imap" ];
enablePAM = true;
settings = {
dovecot_config_version = "2.4.3";
dovecot_storage_version = config.services.dovecot2.package.version;
protocols.imap = true;
mail_driver = "maildir";
mail_path = "${config.services.postfix.settings.main.mail_spool_directory}/%{user}";
};
};
services.postfix = {
nixos/tests/opensmtpd.nix
+11 -5
View File
@@ -48,7 +48,7 @@ import ./make-test-python.nix {
};
smtp2 =
{ pkgs, ... }:
{ config, pkgs, ... }:
{
imports = [ common/user-account.nix ];
networking = {
@@ -71,15 +71,21 @@ import ./make-test-python.nix {
serverConfiguration = ''
listen on 0.0.0.0
action dovecot_deliver mda \
"${pkgs.dovecot}/libexec/dovecot/deliver -d %{user.username}"
"${config.services.dovecot2.package}/libexec/dovecot/deliver -d %{user.username}"
match from any for local action dovecot_deliver
'';
};
services.dovecot2 = {
enable = true;
enableImap = true;
mailLocation = "maildir:~/mail";
protocols = [ "imap" ];
enablePAM = true;
settings = {
dovecot_config_version = "2.4.3";
dovecot_storage_version = config.services.dovecot2.package.version;
mail_driver = "maildir";
mail_path = "~/mail";
protocols.imap = true;
auth_allow_cleartext = true;
};
};
};
nixos/tests/rasdaemon.nix
+2 -3
View File
@@ -1,9 +1,8 @@
{ ... }:
{ pkgs, ... }:
{
name = "rasdaemon";
meta = {
maintainers = [ ];
broken = true; # test timed out
inherit (pkgs.rasdaemon.meta) maintainers;
};
nodes.machine =
nixos/tests/rss2email.nix
+10 -5
View File
@@ -3,7 +3,7 @@ import ./make-test-python.nix {
nodes = {
server =
{ pkgs, ... }:
{ config, pkgs, ... }:
{
imports = [ common/user-account.nix ];
services.nginx = {
@@ -33,9 +33,14 @@ import ./make-test-python.nix {
};
services.dovecot2 = {
enable = true;
enableImap = true;
mailLocation = "maildir:~/mail";
protocols = [ "imap" ];
enablePAM = true;
settings = {
dovecot_config_version = "2.4.3";
dovecot_storage_version = config.services.dovecot2.package.version;
mail_driver = "maildir";
mail_path = "~/mail";
protocols.imap = true;
};
};
environment.systemPackages =
let
@@ -67,7 +72,7 @@ import ./make-test-python.nix {
server.systemctl("start network-online.target")
server.wait_for_unit("network-online.target")
server.wait_for_unit("opensmtpd")
server.wait_for_unit("dovecot2")
server.wait_for_unit("dovecot")
server.wait_for_unit("nginx")
server.wait_for_unit("rss2email")
pkgs/applications/editors/vim/common.nix
+2 -2
View File
@@ -4,7 +4,7 @@
stdenv,
}:
rec {
version = "9.2.0106";
version = "9.2.0340";
outputs = [
"out"
@@ -15,7 +15,7 @@ rec {
owner = "vim";
repo = "vim";
rev = "v${version}";
hash = "sha256-byOf2Gr1vA7xQw3YHV454te1QrVxRy3sXrLdFUp2XRg=";
hash = "sha256-jCnOVIafx+0o1nlHv7QJQrmxs1IAxh9BBshDOFdZdCM=";
};
enableParallelBuilding = true;
pkgs/applications/misc/qtbitcointrader/default.nix
+1 -1
View File
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
qmake $qmakeFlags \
PREFIX=$out \
DESKTOPDIR=$out/share/applications \
ICONDIR=$out/share/icons/hicolor/1024x1024/apps \
ICONDIR=$out/share/icons \
QtBitcoinTrader_Desktop.pro
runHook postConfigure
pkgs/by-name/ai/airgorah/package.nix
+1 -1
View File
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
];
postInstall = ''
install -Dm644 icons/app_icon.png $out/share/icons/hicolor/1024x1024/apps/airgorah.png
install -Dm644 icons/app_icon.png $out/share/icons/airgorah.png
'';
desktopItems = [
pkgs/by-name/al/alisthelper/package.nix
+1 -4
View File
@@ -7,7 +7,6 @@
makeDesktopItem,
runCommand,
yq-go,
imagemagick,
_experimental-update-script-combinators,
nix-update-script,
}:
@@ -26,7 +25,6 @@ flutter341.buildFlutterApplication (finalAttrs: {
pubspecLock = lib.importJSON ./pubspec.lock.json;
nativeBuildInputs = [
imagemagick
copyDesktopItems
];
@@ -47,8 +45,7 @@ flutter341.buildFlutterApplication (finalAttrs: {
];
postInstall = ''
mkdir -p $out/share/icons/hicolor/1024x1024/apps
magick assets/alisthelper.png -resize 1024x1024 $out/share/icons/hicolor/1024x1024/apps/alisthelper.png
install -D assets/alisthelper.png $out/share/icons/alisthelper.png
'';
passthru = {
pkgs/by-name/az/azuredatastudio/package.nix
+1 -1
View File
@@ -129,7 +129,7 @@ stdenv.mkDerivation rec {
installPhase = ''
runHook preInstall
install -D ${targetPath}/resources/app/resources/linux/code.png $out/share/icons/hicolor/1024x1024/apps/azuredatastudio.png
install -D ${targetPath}/resources/app/resources/linux/code.png $out/share/icons/azuredatastudio.png
runHook postInstall
'';
pkgs/by-name/ba/badlion-client/package.nix
+1 -1
View File
@@ -23,7 +23,7 @@ appimageTools.wrapAppImage rec {
extraInstallCommands = ''
install -Dm444 ${src}/BadlionClient.desktop $out/share/applications/BadlionClient.desktop
install -Dm444 ${src}/BadlionClient.png -t $out/share/icons/hicolor/1024x1024/apps
install -Dm444 ${src}/BadlionClient.png -t $out/share/icons
substituteInPlace $out/share/applications/BadlionClient.desktop \
--replace-fail "Exec=AppRun --no-sandbox %U" "Exec=badlion-client"
wrapProgram $out/bin/badlion-client \
pkgs/by-name/bl/blackvoxel/package.nix
+1 -1
View File
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
];
postInstall = ''
install -Dm644 blackvoxel.png $out/share/icons/hicolor/1024x1024/apps/blackvoxel.png
install -Dm644 blackvoxel.png $out/share/icons/blackvoxel.png
'';
desktopItems = [
pkgs/by-name/bl/bluemail/package.nix
+2 -2
View File
@@ -92,8 +92,8 @@ stdenv.mkDerivation rec {
mv * $out/opt/bluemail
ln -s $out/opt/bluemail/bluemail $out/bin/bluemail
mkdir -p $out/share/icons/hicolor/1024x1024/apps
ln -s $out/opt/bluemail/resources/assets/icons/bluemailx-icon.png $out/share/icons/hicolor/1024x1024/apps/bluemail.png
mkdir -p $out/share/icons
ln -s $out/opt/bluemail/resources/assets/icons/bluemailx-icon.png $out/share/icons/bluemail.png
runHook postInstall
'';
pkgs/by-name/bo/bombsquad/package.nix
+1 -1
View File
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
--add-flags ${lib.escapeShellArg commandLineArgs} \
--add-flags "-d $out/share/bombsquad"
install -Dm755 ${bombsquadIcon} $out/share/icons/hicolor/1024x1024/apps/bombsquad.png
install -Dm755 ${bombsquadIcon} $out/share/icons/bombsquad.png
runHook postInstall
'';
pkgs/by-name/ca/cargo-machete/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-machete";
version = "0.9.1";
version = "0.9.2";
src = fetchFromGitHub {
owner = "bnjbvr";
repo = "cargo-machete";
rev = "v${finalAttrs.version}";
hash = "sha256-4tzffZeHdhAq6/K1BGkThqT+CBa3rUw+kR7aLwnqZjc=";
hash = "sha256-vC7Oj42GU7YlNtP+TUp+4LH2gxGk55RZ5cOLRaiEQ3w=";
};
cargoHash = "sha256-ahTvfxYYo3prPKDTalw2f2FPJLsPzGkE/2LCcyuniFY=";
cargoHash = "sha256-cmOMWJOSJxhjXVdwVdDnTORJRSZcQ8kdDUTJaIy8dbk=";
# tests require internet access
doCheck = false;
pkgs/by-name/ch/cherry-studio/package.nix
+1 -1
View File
@@ -139,7 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
else
"cp -r dist/linux-unpacked/{resources,LICENSE*} $out/opt/cherry-studio"
}
install -Dm644 build/icon.png $out/share/icons/hicolor/1024x1024/apps/cherry-studio.png
install -Dm644 build/icon.png $out/share/icons/cherry-studio.png
makeWrapper ${lib.getExe electron} $out/bin/cherry-studio \
--inherit-argv0 \
--add-flags $out/opt/cherry-studio/resources/app.asar \
pkgs/by-name/cl/clockify/package.nix
+1 -1
View File
@@ -19,7 +19,7 @@ appimageTools.wrapType2 rec {
in
''
install -Dm 444 ${appimageContents}/clockify.desktop -t $out/share/applications
install -Dm 444 ${appimageContents}/clockify.png -t $out/share/icons/hicolor/1024x1024/apps
install -Dm 444 ${appimageContents}/clockify.png -t $out/share/icons
substituteInPlace $out/share/applications/clockify.desktop \
--replace-fail 'Exec=AppRun' 'Exec=${pname}'
pkgs/by-name/gr/graphest/package.nix
+1 -1
View File
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
--inherit-argv0
install -Dm444 build/icon.png $out/share/icons/hicolor/1024x1024/apps/graphest.png
install -Dm444 build/icon.png $out/share/icons/graphest.png
install -Dm444 ${./mime.xml} $out/share/mime/packages/graphest.xml
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
pkgs/by-name/mc/mcp-grafana/package.nix
+3 -3
View File
@@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "mcp-grafana";
version = "0.11.4";
version = "0.11.6";
src = fetchFromGitHub {
owner = "grafana";
repo = "mcp-grafana";
tag = "v${finalAttrs.version}";
hash = "sha256-sOT4rS9lEKJmQM9roLJbbs/8Y7thEr3KvwChXrsRKr4=";
hash = "sha256-cJjapd2phI4NgMAPzsKrs74+sEK7ykfKHQx24FVpHoQ=";
};
vendorHash = "sha256-EXjZjXwyeH7zTgYvtMbtWh1j6xk2ybbeqvbxLz5yA+I=";
vendorHash = "sha256-a9VgfzJmbTudYSLqhBBnkpq37xghtxWTzpcd7rMlZmA=";
ldflags = [
"-s"
pkgs/by-name/no/notable/package.nix
+4 -2
View File
@@ -36,8 +36,10 @@ appimageTools.wrapType2 rec {
extraInstallCommands = ''
install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \
$out/share/icons/hicolor/1024x1024/apps/notable.png
for size in 16 32 48 64 128 256 512 1024; do
install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/notable.png \
$out/share/icons/hicolor/''${size}x''${size}/apps/notable.png
done
substituteInPlace $out/share/applications/notable.desktop \
--replace 'Exec=AppRun' 'Exec=${pname}'
wrapProgram "$out/bin/${pname}" \
pkgs/by-name/pa/panache/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "panache";
version = "2.31.0";
version = "2.34.0";
src = fetchFromGitHub {
owner = "jolars";
repo = "panache";
tag = "v${finalAttrs.version}";
hash = "sha256-/GOHWjIP8DsyLxxnIh0Lbh6qogFFe4+2QpF+uWhXBMU=";
hash = "sha256-/DgmAN89X7QqLssp3u1lV8AeWJ1LCWrtBp8QJMjtpzE=";
};
cargoHash = "sha256-eaWmchae+HLI/oox1tgHZoRjrTt00XgQCIi9RVfTs4I=";
cargoHash = "sha256-1vjx4OAKsSuru0kzuQ9IlG4G99CKQndmM7hLRKH3sOo=";
nativeBuildInputs = [
installShellFiles
pkgs/by-name/pe/perplexity-mcp/package.nix
+3 -3
View File
@@ -7,13 +7,13 @@
buildNpmPackage (finalAttrs: {
pname = "perplexity-mcp";
version = "0-unstable-2026-03-23";
version = "0-unstable-2026-04-14";
src = fetchFromGitHub {
owner = "perplexityai";
repo = "modelcontextprotocol";
rev = "79ce21c5798f6993af7cac81da8067a6dc81e20d";
hash = "sha256-URatUVDEOmcwkIsSZ+DepeBuKS2HDu8V5niYxwtUBLE=";
rev = "dd5e0785520833ebc95d5e97c8fa68971dcae07b";
hash = "sha256-hMIPsUsI1e8bOdPQ9t6m4/vGv07NCuC8wnYLUKolNOo=";
};
npmDepsHash = "sha256-UWxUjneYQeM9GlbIr/zW2TrZuPJ2QOTKwbXKNuVazFg=";
pkgs/by-name/ra/rasdaemon/package.nix
+6 -1
View File
@@ -26,6 +26,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-rk4CZrWQRe2wsx8/eXP0BIeaU/Gxmcb+Kry5F8t4YKQ=";
};
patches = [
# https://github.com/mchehab/rasdaemon/pull/246
./ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch
];
strictDeps = true;
enableParallelBuilding = true;
@@ -122,6 +127,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.gpl2Plus;
platforms = lib.platforms.linux;
changelog = "${finalAttrs.meta.homepage}/releases/tag/v${finalAttrs.version}";
maintainers = [ ];
maintainers = [ lib.maintainers.zowoq ];
};
})
pkgs/by-name/ra/rasdaemon/ras-mc-ctl_fix_invalid_column_in_signal_events_query.patch
+13
View File
@@ -0,0 +1,13 @@
diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
index b00c9c1..e56402b 100755
--- a/util/ras-mc-ctl.in
+++ b/util/ras-mc-ctl.in
@@ -2497,7 +2497,7 @@ sub errors
# SIGNAL event
if ($has_signal == 1) {
- $query = "select id, timestamp, signal, errorno, code, comm, pid, grp, res from signal_event$conf{opt}{since} order by id";
+ $query = "select id, timestamp, sig, errorno, code, comm, pid, grp, res from signal_event$conf{opt}{since} order by id";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($id, $timestamp, $signal, $errorno, $code, $comm, $pid, $grp, $res));
pkgs/by-name/sh/show-midi/package.nix
+1 -1
View File
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
install -Dt $out/share/ShowMIDI/themes Themes/*
install -D Design/icon.png $out/share/icons/hicolor/1024x1024/apps/show-midi.png
install -D Design/icon.png $out/share/icons/show-midi.png
mkdir -p $out/bin $out/lib/lv2 $out/lib/vst3
cd Builds/LinuxMakefile/build/
pkgs/by-name/si/simple-live-app/package.nix
+1 -1
View File
@@ -44,7 +44,7 @@ flutter332.buildFlutterApplication rec {
];
postInstall = ''
install -Dm644 assets/logo.png $out/share/icons/hicolor/1024x1024/apps/simple-live-app.png
install -Dm644 assets/logo.png $out/share/icons/simple-live-app.png
'';
extraWrapProgramArgs = ''
pkgs/by-name/sn/snowemu/package.nix
+1 -1
View File
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
postInstall = ''
mv $out/bin/snow_frontend_egui $out/bin/snowemu
install -Dm644 assets/snow_icon.png $out/share/icons/hicolor/1024x1024/apps/snowemu.png
install -Dm644 assets/snow_icon.png $out/share/icons/snowemu.png
wrapProgram $out/bin/snowemu \
--prefix LD_LIBRARY_PATH : ${
pkgs/by-name/th/thorium-reader/package.nix
+1 -1
View File
@@ -31,7 +31,7 @@ buildNpmPackage (finalAttrs: {
];
postInstall = ''
install -Dpm644 resources/icon.png $out/share/icons/hicolor/1024x1024/apps/thorium-reader.png
install -Dpm644 resources/icon.png $out/share/icons/thorium-reader.png
cp -r dist/* $out/lib/node_modules/EDRLab.ThoriumReader/
pkgs/by-name/tk/tk-safe/package.nix
+2 -2
View File
@@ -80,8 +80,8 @@ stdenv.mkDerivation rec {
mv * $out/opt/tk-safe
ln -s $out/opt/tk-safe/app/tk-safe $out/bin/tk-safe
mkdir -p $out/share/icons/hicolor/1024x1024/apps
ln -s $out/opt/tk-safe/meta/gui/icon.png $out/share/icons/hicolor/1024x1024/apps/tk-safe.png
mkdir -p $out/share/icons
ln -s $out/opt/tk-safe/meta/gui/icon.png $out/share/icons/tk-safe.png
runHook postInstall
'';
pkgs/by-name/tt/tts-mod-vault/package.nix
+1 -1
View File
@@ -42,7 +42,7 @@ flutter341.buildFlutterApplication (finalAttrs: {
'';
postInstall = ''
install -m 444 -D assets/icon/tts_mod_vault_icon.png $out/share/icons/hicolor/1024x1024/apps/tts_mod_vault.png
install -m 444 -D assets/icon/tts_mod_vault_icon.png $out/share/icons/tts_mod_vault.png
'';
passthru = {
pkgs/by-name/ve/venera/package.nix
+1 -1
View File
@@ -50,7 +50,7 @@ flutter341.buildFlutterApplication (finalAttrs: {
];
postInstall = ''
install -D --mode=0644 debian/gui/venera.png $out/share/icons/hicolor/1024x1024/apps/venera.png
install -D --mode=0644 debian/gui/venera.png $out/share/icons/venera.png
'';
extraWrapProgramArgs = ''
pkgs/by-name/vo/volanta/package.nix
+1 -1
View File
@@ -26,7 +26,7 @@ appimageTools.wrapType2 {
extraInstallCommands = ''
install -m 444 -D ${appImageContents}/volanta.desktop $out/share/applications/volanta.desktop
install -m 444 -D ${appImageContents}/volanta.png \
$out/share/icons/hicolor/1024x1024/apps/volanta.png
$out/share/icons/volanta.png
substituteInPlace $out/share/applications/volanta.desktop \
--replace-fail 'Exec=AppRun' 'Exec=env APPIMAGE=true volanta'
wrapProgram $out/bin/volanta \
pkgs/by-name/wi/winbox4/build-from-zip.nix
+1 -1
View File
@@ -61,7 +61,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
installPhase = ''
runHook preInstall
install -Dm644 "assets/img/winbox.png" -t "$out/share/icons/hicolor/1024x1024/apps"
install -Dm644 "assets/img/winbox.png" -t "$out/share/icons"
install -Dm755 "WinBox" "$out/bin/WinBox"
wrapProgram "$out/bin/WinBox" --run "${lib.getExe finalAttrs.migrationScript}"
pkgs/by-name/wi/windterm/package.nix
+1 -1
View File
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
${builtins.toJSON profiles}
EOF
install -Dm644 $out/app/windterm/license.txt $out/share/licenses/windterm/license.txt
install -Dm644 $out/app/windterm/windterm.png -t $out/share/icons/hicolor/1024x1024/apps
install -Dm644 $out/app/windterm/windterm.png -t $out/share/icons
substituteInPlace $out/app/windterm/windterm.desktop \
--replace-fail "/usr/bin/" ""
install -Dm644 $out/app/windterm/windterm.desktop $out/share/applications/windterm.desktop
pkgs/by-name/wo/wootility/package.nix
+1 -1
View File
@@ -28,7 +28,7 @@ appimageTools.wrapType2 {
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
install -Dm444 ${contents}/wootility.desktop -t $out/share/applications
install -Dm444 ${contents}/wootility.png -t $out/share/icons/hicolor/1024x1024/apps
install -Dm444 ${contents}/wootility.png -t $out/share/icons
substituteInPlace $out/share/applications/wootility.desktop \
--replace-fail 'Exec=AppRun --no-sandbox' 'Exec=wootility'
'';
pkgs/by-name/wo/wox/package.nix
+1 -1
View File
@@ -217,7 +217,7 @@ buildGoModule {
];
postInstall = ''
install -Dm644 ../assets/app.png $out/share/icons/hicolor/1024x1024/apps/wox.png
install -Dm644 ../assets/app.png $out/share/icons/wox.png
'';
meta = metaCommon // {
pkgs/by-name/zo/zoho-mail-desktop/package.nix
+4 -2
View File
@@ -25,8 +25,10 @@ appimageTools.wrapType2 {
install -Dm444 ${appimageContents}/zoho-mail-desktop.desktop \
$out/share/applications/zoho-mail-desktop.desktop
install -Dm444 ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/zoho-mail-desktop.png \
$out/share/icons/hicolor/1024x1024/apps/zoho-mail-desktop.png
for size in 16 32 48 64 128 256 512 1024; do
install -Dm444 ${appimageContents}/usr/share/icons/hicolor/''${size}x''${size}/apps/zoho-mail-desktop.png \
$out/share/icons/hicolor/''${size}x''${size}/apps/zoho-mail-desktop.png
done
substituteInPlace $out/share/applications/zoho-mail-desktop.desktop \
--replace-fail 'Exec=AppRun' 'Exec=${pname}'
pkgs/development/libraries/mesa/common.nix
+2 -2
View File
@@ -5,14 +5,14 @@
# nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
rec {
pname = "mesa";
version = "26.0.4";
version = "26.0.5";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "mesa";
repo = "mesa";
rev = "mesa-${version}";
hash = "sha256-gsrqhFCxZRrTbA5MMWARrN6lFVp4Q3D5Jz7MDYbXznY=";
hash = "sha256-fhe3mHZQmZ3lm0XMKWWL8MKBbK5aAJCFFvDPyiI9K/A=";
};
meta = {