jahanson/mochi
1
0
Fork 0
Code Issues 1 Pull requests 3 Projects Releases Packages Wiki Activity Actions

update coder to 2.16, added error handling for nvd diff when only one configuration is present.

Browse source
This commit is contained in:
Joseph Hanson 2024-10-07 09:42:17 -05:00
parent 4ce1c332af
commit 3a52632639
Signed by: jahanson
SSH key fingerprint: SHA256:vy6dKBECV522aPAwklFM3ReKAVB086rT3oWwiuiFG7o
3 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/home/jahanson/workstation.nix
View file

@ -1,4 +1,7 @@
{ pkgs, config, inputs, ... }: { pkgs, config, inputs, ... }:
let
coderMainline = pkgs.coder.override { channel = "mainline"; };
in
with config; with config;
{ {
imports = [ imports = [
@ -69,8 +72,7 @@ with config;
unstable.act # run GitHub actions locally unstable.act # run GitHub actions locally
unstable.nodePackages_latest.prettier # code formatter unstable.nodePackages_latest.prettier # code formatter
unstable.tailspin # logfile highlighter unstable.tailspin # logfile highlighter
coder coderMainline # VSCode in the browser -- has overlay
]; ];
}; };
} }

22
nixos/overlays/coder/default.nix
View file

@ -1,5 +1,5 @@
{ lib { lib
, channel ? "mainline" , channel ? "stable"
, fetchurl , fetchurl
, installShellFiles , installShellFiles
, makeBinaryWrapper , makeBinaryWrapper
@ -14,21 +14,21 @@ let
channels = { channels = {
stable = { stable = {
version = "2.14.3"; version = "2.15.1";
hash = { hash = {
x86_64-linux = "sha256-CDQmixywYDLj3ABqTEnaUftITSFGA/wGAfe0IFoU64g="; x86_64-linux = "sha256-DB/3iUkgWzAI+3DEQB8heYkG6apUARDulQ4lKDAPN1I=";
x86_64-darwin = "sha256-TDpoby2lBw8W6zJrHgF/AQFQL+j9dv3d21VLsiSd1sk="; x86_64-darwin = "sha256-62tjAC3WtWC8eIkh9dPi2Exksp2gDHyXEU2tCavKZ4Q=";
aarch64-linux = "sha256-L+2YOMgH1cCl4o1VFZk1dC258/XStgiH9lr9PEQOPSo="; aarch64-linux = "sha256-957GdH5sDjbjxEt8LXKPBM7vht7T6JizVwYYhbitdpw=";
aarch64-darwin = "sha256-hG3HsJ+DIjwB5ehT+Hd3EZduvjNXYTZLYbAYCRWWiQ8="; aarch64-darwin = "sha256-ckcd1u9dgg9LKhr47Yw8dJKkR7hawPie4QNyySH8vyM=";
}; };
}; };
mainline = { mainline = {
version = "2.15.0"; version = "2.16.0";
hash = { hash = {
x86_64-linux = "sha256-zM5l3vkLKuDdZHTgVTYfvfYTGLCpDnA2GZDh5PLQ9rs="; x86_64-linux = "sha256-Uk9oGiLSHBCINAzQg88tlHyMw/OGfdmCw2/NXJs5wbQ=";
x86_64-darwin = "sha256-AbW92RMaPfusve5DxRaT3npeN2zVzrBOBL3XGN8235I="; x86_64-darwin = "sha256-Bbayv00NDJGUA4M4KyG4XCXIiaQSf4JSgy5VvLSVmAM=";
aarch64-linux = "sha256-13FZc1zMmaxfDp0bXBFzf2gcO6wkiA932C5m9oon2GQ="; aarch64-linux = "sha256-nV02uO+UkNNvQDIkh2G+9H8gvk9DOSYyIu4O3nwkYXk=";
aarch64-darwin = "sha256-UP08DncRvM1NjtMOfanDnXGySK1RrCUta5lbIvJ7vto="; aarch64-darwin = "sha256-C9Nm8dW3V25D7J/3ABO5oLGL4wcSCsAXtQNZABwVpWs=";
}; };
}; };
}; };

8
nixos/profiles/global/system.nix
View file

@ -4,7 +4,13 @@
# Enable printing changes on nix build etc with nvd # Enable printing changes on nix build etc with nvd
activationScripts.report-changes = '' activationScripts.report-changes = ''
PATH=$PATH:${lib.makeBinPath [ pkgs.nvd pkgs.nix ]} PATH=$PATH:${lib.makeBinPath [ pkgs.nvd pkgs.nix ]}
nvd diff $(${pkgs.coreutils}/bin/ls -dv /nix/var/nix/profiles/system-*-link | tail -2) profiles=$(${pkgs.coreutils}/bin/ls -dv /nix/var/nix/profiles/system-*-link | tail -2)
profile_count=$(echo "$profiles" | ${pkgs.coreutils}/bin/wc -l)
if [ $profile_count -gt 1 ]; then
nvd diff $profiles
else
echo "Not enough system configurations to compare. Found only $profile_count profile."
fi
''; '';
# Do not change unless you know what you are doing # Do not change unless you know what you are doing