Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

i3status-rust: satisfy new 0.31 TOML output requirements (#3938)

Browse source
This commit is contained in:
amesgen 2023-05-01 23:46:41 +02:00 committed by GitHub
parent 3144311f31
commit 0e4c33d760
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/programs/i3status-rust.nix
View file

@ -6,7 +6,18 @@ let
cfg = config.programs.i3status-rust;
settingsFormat = pkgs.formats.toml { };
settingsFormat = pkgs.formats.toml { } // {
# Since 0.31, the "block" key has to be first in the TOML output.
generate = name: value:
pkgs.runCommand name {
nativeBuildInputs = [ pkgs.jq pkgs.remarshal ];
value = builtins.toJSON value;
passAsFile = [ "value" ];
} ''
jq '.block |= map({block: .block} + del(.block))' "$valuePath" \
| json2toml --preserve-key-order > "$out"
'';
};
in {
meta.maintainers = with lib.maintainers; [ farlion thiagokokada ];

4
tests/modules/programs/i3status-rust/with-custom.nix
View file

@ -105,12 +105,12 @@
${
pkgs.writeText "i3status-rust-expected-config" ''
[[block]]
alert = 10.0
block = "disk_space"
alert = 10
info_type = "available"
interval = 60
path = "/"
warning = 20.0
warning = 20
[[block]]
block = "memory"

4
tests/modules/programs/i3status-rust/with-default.nix
View file

@ -12,12 +12,12 @@
${
pkgs.writeText "i3status-rust-expected-config" ''
[[block]]
alert = 10.0
block = "disk_space"
alert = 10
info_type = "available"
interval = 60
path = "/"
warning = 20.0
warning = 20
[[block]]
block = "memory"

4
tests/modules/programs/i3status-rust/with-extra-settings.nix
View file

@ -115,12 +115,12 @@
${
pkgs.writeText "i3status-rust-expected-config" ''
[[block]]
alert = 10.0
block = "disk_space"
alert = 10
info_type = "available"
interval = 60
path = "/"
warning = 20.0
warning = 20
[[block]]
block = "memory"

4
tests/modules/programs/i3status-rust/with-multiple-bars.nix
View file

@ -54,11 +54,11 @@
${
pkgs.writeText "i3status-rust-expected-config" ''
[[block]]
alert = 10.0
block = "disk_space"
alert = 10
info_type = "available"
interval = 60
warning = 20.0
warning = 20
[[block]]
block = "memory"

4
tests/modules/programs/i3status-rust/with-version-02xx.nix
View file

@ -14,12 +14,12 @@
icons = "none"
theme = "plain"
[[block]]
alert = 10.0
block = "disk_space"
alert = 10
info_type = "available"
interval = 60
path = "/"
warning = 20.0
warning = 20
[[block]]
block = "memory"