b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
527440 commits 2 branches 0 tags 3.3 GiB
Commit graph

527440 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maximilian Bosch 11376df6d4
nixos/rust-motd: allow ordering sections by priority 
Closes #234802

The problem here is that with e.g.

    {
      uptime.prefix = "Up";
      banner.command = "hostname | figlet -f slant";
    }

`banner` still appears before `uptime` in the final motd text because
Nix sorts attribute names alphabetically internally.

To work around this without breaking compatibility or losing the
property to override individual sections in other modules - e.g.

    {
      banner.color = mkForce "blue";
    }

I decided to introduce an option `priority` here, similar to the
priority field for `nginx`[1] and with the same semantics (i.e. higher
value means lower priority).

Internally a bunch of env vars are generated, i.e. `env0` to `envN` for
`N` sections with each of them containing a declaration for the TOML,
i.e. `env0` contains `{ uptime.prefix = "Up"; }` and `env1` contains
`{ banner.command = "hostname | figlet -f slant"; }` if `uptime.priority`
is set to a value below 1000.

In this order, the declarations are concatenated together by `jq(1)`
which doesn't sort keys alphabetically which results in a JSON
representation with `uptime` before `banner`. This is finally piped to
`json2toml` which converts this into TOML for rust-motd.

[1] https://nixos.org/manual/nixos/unstable/options#opt-services.nginx.virtualHosts._name_.locations._name_.priority
 2023-09-21 13:17:13 +02:00
Maximilian Bosch 0a71cf07a8
nixos/rust-motd: run once on bootup 
That way e.g. the last login and uptime isn't completely bogus when
accessing a machine for the first time after a reboot.
 2023-09-20 22:16:03 +02:00
Nick Cao 86bb247433
Merge pull request #256286 from GaetanLepage/hyperpyyaml 
python310Packages.hyperpyyaml: fix
 2023-09-20 13:04:46 -04:00
Robert Schütz 01636cef2b
Merge pull request #255806 from equirosa/lf-31 
lf: 30 -> 31
 2023-09-20 16:46:41 +00:00
Weijia Wang 7d1229a1a1
Merge pull request #255315 from r-ryantm/auto-update/argocd-autopilot 
argocd-autopilot: 0.4.15 -> 0.4.16
 2023-09-20 18:30:53 +02:00
Weijia Wang 9448ee6fa1
Merge pull request #255407 from r-ryantm/auto-update/mongodb-tools 
mongodb-tools: 100.7.3 -> 100.7.5
 2023-09-20 18:30:27 +02:00
Weijia Wang 90f54ba99f
Merge pull request #255423 from r-ryantm/auto-update/unit 
unit: 1.30.0 -> 1.31.0
 2023-09-20 18:30:06 +02:00
Weijia Wang fe97767924
Merge pull request #256208 from r-ryantm/auto-update/moon 
moon: 1.13.3 -> 1.13.4
 2023-09-20 18:29:35 +02:00
Maximilian Bosch 479646999c
Merge pull request #256239 from Mic92/deno 
deno: set mainProgram
 2023-09-20 17:38:37 +02:00
Nick Cao 468f01a522
Merge pull request #256305 from wietsedv/patch-1 
mautrix-telegram: 0.14.1 -> 0.14.2
 2023-09-20 11:33:17 -04:00
Doron Behar 82c27782ac
Merge pull request #256211 from r-ryantm/auto-update/mympd 
mympd: 11.0.5 -> 12.0.1
 2023-09-20 18:21:48 +03:00
WilliButz e2899f33c9
Merge pull request #256185 from mayflower/jira-confluence-update 
atlassian-confluence: 7.19.12 -> 7.19.14 (CVE-2023-22512), atlassian-jira: 9.6.0 -> 9.11.1
 2023-09-20 16:56:18 +02:00
K900 f101c60a41
Merge pull request #256121 from K900/linux-firmware-20230919 
linux-firmware: 20230809 -> 20230919
 2023-09-20 17:48:07 +03:00
Weijia Wang 5bd09d53f6
Merge pull request #255243 from tricktron/f-refactor-buildMavenPackage 
buildMavenPackage: add offline build feature flag
 2023-09-20 16:46:42 +02:00
figsoda 6706ab69cd
Merge pull request #256106 from figsoda/fx 
fx: 30.0.0 -> 30.0.2
 2023-09-20 10:15:48 -04:00
Nick Cao dcdf600235
Merge pull request #256300 from wietsedv/auto-update/mautrix-discord 
mautrix-discord: 0.6.1 -> 0.6.2
 2023-09-20 10:13:52 -04:00
Weijia Wang 8f050244fd
Merge pull request #246700 from r-ryantm/auto-update/libkiwix 
libkiwix: 12.0.0 -> 12.1.1
 2023-09-20 16:12:56 +02:00
Gaetan Lepage 9dcf79c244 python310Packages.hyperpyyaml: fix 2023-09-20 16:11:50 +02:00
Weijia Wang ad79d7a5fc
Merge pull request #256192 from wegank/pyngrok-bump 
python310Packages.pyngrok: 6.0.0 -> 6.1.2
 2023-09-20 16:00:00 +02:00
Weijia Wang e953cd6f15
Merge pull request #256193 from wegank/pyvista-bump 
python310Packages.pyvista: 0.42.1 -> 0.42.2
 2023-09-20 15:55:00 +02:00
Weijia Wang affbaefb51
Merge pull request #256194 from wegank/ueberzugpp-bump 
ueberzugpp: 2.9.1 -> 2.9.2
 2023-09-20 15:54:25 +02:00
Nick Cao 97d231c76c
Merge pull request #256246 from GaetanLepage/ml-dtypes 
python310Packages.ml-dtypes: 0.2.0 -> 0.3.0
 2023-09-20 09:41:48 -04:00
Nick Cao 96c357e5b3
Merge pull request #256101 from GaetanLepage/svgelements 
python310Packages.svgelements: init at 1.9.6
 2023-09-20 09:39:38 -04:00
Nick Cao 3d1b83f8f8
Merge pull request #255872 from GaetanLepage/intake 
python310Packages.intake: unstable-2023-08-24 -> 0.7.0
 2023-09-20 09:32:35 -04:00
Wietse de Vries 14990cb51c
mautrix-telegram: 0.14.1 -> 0.14.2 2023-09-20 15:29:31 +02:00
Nick Cao a5283f1038
Merge pull request #256274 from paveloom/cppcheck 
cppcheck: 2.12.0 -> 2.12.1 + refactor
 2023-09-20 09:29:01 -04:00
Nick Cao 076ea42fe4
Merge pull request #256297 from r-ryantm/auto-update/python310Packages.django-reversion 
python310Packages.django-reversion: 5.0.4 -> 5.0.5
 2023-09-20 09:26:02 -04:00
Nick Cao b9208f09c7
Merge pull request #256301 from r-ryantm/auto-update/patchelfUnstable 
patchelfUnstable: unstable-2023-07-20 -> unstable-2023-09-19
 2023-09-20 09:23:16 -04:00
Nick Cao 2f51117fe3
Merge pull request #256278 from GaetanLepage/coffea 
python310Packages.coffea: 2023.6.0.rc1 -> 2023.7.0.rc0
 2023-09-20 09:21:27 -04:00
Doron Behar dd730dbc7a mympd: use finalAttrs in mkDerivation 2023-09-20 16:21:15 +03:00
Nick Cao 4d66d894e5
Merge pull request #253385 from fomichevmi/patch-8 
tempita: change owner for fetching sources
 2023-09-20 09:17:51 -04:00
Nick Cao ec8078433c
Merge pull request #256221 from r-ryantm/auto-update/kubeseal 
kubeseal: 0.23.1 -> 0.24.0
 2023-09-20 09:17:24 -04:00
Nick Cao ff71d13538
Merge pull request #256236 from r-ryantm/auto-update/spruce 
spruce: 1.30.2 -> 1.31.0
 2023-09-20 09:13:39 -04:00
Nick Cao bebbd27a97
Merge pull request #256238 from r-ryantm/auto-update/ocm 
ocm: 0.1.67 -> 0.1.68
 2023-09-20 09:13:00 -04:00
Nick Cao 3e090b64f7
Merge pull request #256242 from r-ryantm/auto-update/mount-zip 
mount-zip: 1.0.9 -> 1.0.10
 2023-09-20 09:12:12 -04:00
Nick Cao 470ae0aaa4
Merge pull request #256215 from figsoda/sws 
static-web-server: 2.22.0 -> 2.22.1
 2023-09-20 09:09:44 -04:00
Nick Cao 20dd5a0d37
Merge pull request #256168 from ereslibre/bump-viceroy-0.8.1 
viceroy: 0.8.0 -> 0.8.1
 2023-09-20 09:07:14 -04:00
Nick Cao bc11769f5e
Merge pull request #256131 from kashw2/pscale 
pscale: 0.154.0 -> 0.155.0
 2023-09-20 09:06:00 -04:00
Martin Weinelt 71f609cd67
Merge pull request #256299 from r-ryantm/auto-update/python310Packages.python-rtmidi 
python310Packages.python-rtmidi: 1.5.5 -> 1.5.6
 2023-09-20 15:05:43 +02:00
Nick Cao 98fe4bf45b
Merge pull request #256130 from NickCao/v2ray-domain-list-community 
v2ray-domain-list-community: 20230905081311 -> 20230913074035
 2023-09-20 09:03:08 -04:00
Wietse 9b7ac46eb6 mautrix-discord: 0.6.1 -> 0.6.2 2023-09-20 14:53:50 +02:00
R. Ryantm f85032a92b patchelfUnstable: unstable-2023-07-20 -> unstable-2023-09-19 2023-09-20 12:50:50 +00:00
R. Ryantm 70f6f0bb46 python310Packages.python-rtmidi: 1.5.5 -> 1.5.6 2023-09-20 12:43:04 +00:00
R. Ryantm eb85d9ebc6 python310Packages.django-reversion: 5.0.4 -> 5.0.5 2023-09-20 12:26:10 +00:00
Alexis Hildebrandt b570cc35e4 nawk: update homepage 2023-09-20 09:21:59 -03:00
Maciej Krüger 63ae6fa5c6
Merge pull request #256294 from mkg20001/mkg/sudo-rs 2023-09-20 14:00:18 +02:00
Maciej Krüger 61536e7a1f
nixosTests.sudo-rs: fix syntax 2023-09-20 13:58:08 +02:00
Maciej Krüger 922926cfbc
Merge pull request #253876 from nbraud/nixos/sudo-rs 2023-09-20 13:55:33 +02:00
Robert Hensing 18c2786859
Merge pull request #256129 from helsinki-systems/fix/testmetapkgconf-warning 
testers.testMetaPkgConfig: fix warning
 2023-09-20 13:13:39 +02:00
Florian Klink 90a8d5ad19
Merge pull request #256245 from r-ryantm/auto-update/google-guest-oslogin 
google-guest-oslogin: 20230821.01 -> 20230831.00
 2023-09-20 13:57:39 +03:00