chore: update flake.lock
All checks were successful
Discord / discord commits (push) Has been skipped

Flake Inputs:
• Updated input 'agsV2':
    'github:Aylur/ags/a93f0ac' (2024-10-16)
  → 'github:Aylur/ags/b7f3896' (2024-10-19)

• Updated input 'astal':
    'github:Aylur/astal/f763c44' (2024-10-18)
  → 'github:Aylur/astal/bfb7e27' (2024-10-20)

• Updated input 'custom-sidebar-src':
    'github:elchininet/custom-sidebar/fcada91' (2024-10-15)
  → 'github:elchininet/custom-sidebar/80942f5' (2024-10-21)

• Updated input 'home-manager':
    'github:nix-community/home-manager/09a0c0c' (2024-10-18)
  → 'github:nix-community/home-manager/1e27f21' (2024-10-20)

• Updated input 'hyprland':
    'github:hyprwm/Hyprland/0e630e9' (2024-10-17)
  → 'github:hyprwm/Hyprland/62ee5cc' (2024-10-19)

• Updated input 'nix-gaming':
    'github:fufexan/nix-gaming/79f0e31' (2024-10-18)
  → 'github:fufexan/nix-gaming/177e270' (2024-10-20)

• Updated input 'nix-index-db':
    'github:Mic92/nix-index-database/5c54c33' (2024-10-13)
  → 'github:Mic92/nix-index-database/04f8a11' (2024-10-20)

• Updated input 'nixd':
    'github:nix-community/nixd/c38702b' (2024-10-01)
  → 'github:nix-community/nixd/d3c7e56' (2024-10-20)

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5785b6b' (2024-10-16)
  → 'github:NixOS/nixpkgs/4c2fcb0' (2024-10-18)

• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/2535bdd' (2024-10-18)
  → 'github:nix-community/nixpkgs-wayland/7c64c3c' (2024-10-20)

• Updated input 'pokemon-colorscripts-src':
    'gitlab:phoneybadger/pokemon-colorscripts/0483c85' (2022-10-28)
  → 'gitlab:phoneybadger/pokemon-colorscripts/5802ff6' (2024-10-19)

• Updated input 'sops-nix':
    'github:Mic92/sops-nix/06535d0' (2024-10-08)
  → 'github:Mic92/sops-nix/c504fd7' (2024-10-20)

• Updated input 'spotifywebapi-src':
    'github:thlucas1/SpotifyWebApiPython/4bb0658' (2024-10-14)
  → 'github:thlucas1/SpotifyWebApiPython/8c6aff1' (2024-10-19)

• Updated input 'tuya-local-src':
    'github:make-all/tuya-local/587d622' (2024-10-18)
  → 'github:make-all/tuya-local/38744c0' (2024-10-21)

Docker Images:
• rssbridge/rss-bridge latest:
   sha256:da785b43f43e4f718c525d71453d6b7011db98c68434f02315cb7ee1ecc88889
 → sha256:42b4d1d1e3fb2c361a3a2fe2921a847bbdcd0d6d14a4d411482665fc4560a58d
This commit is contained in:
matt1432 2024-10-20 21:42:54 -04:00
parent 0570f5ad70
commit 2e3612b7fb
12 changed files with 62 additions and 17 deletions

View file

@ -7,16 +7,15 @@
... ...
}: let }: let
inherit (lib) concatMapStringsSep getBin; inherit (lib) concatMapStringsSep getBin;
inherit (builtins) readFile fromJSON;
packageJSON = fromJSON (readFile ./package.json); packageJSON = builtins.fromJSON (builtins.readFile ./package.json);
in in
buildNpmPackage rec { buildNpmPackage rec {
pname = packageJSON.name; pname = packageJSON.name;
inherit (packageJSON) version; inherit (packageJSON) version;
src = ./.; src = ./.;
npmDepsHash = "sha256-cg+U7MSeeSDrzSWfXAd69FBLN3R8n4+aCSggrdThZHw="; npmDepsHash = "sha256-hNXuZi3kgst0wBzoOwNAthEXW5MrafDD6D3Zwzp0S78=";
runtimeInputs = [ runtimeInputs = [
(callPackage ../../nixosModules/docker/updateImage.nix {}) (callPackage ../../nixosModules/docker/updateImage.nix {})

Binary file not shown.

View file

@ -7,15 +7,15 @@
"build": "node_ver=$(node -v); esbuild src/app.ts --bundle --platform=node --target=\"node${node_ver:1:2}\" --outfile=out/bin/app.cjs" "build": "node_ver=$(node -v); esbuild src/app.ts --bundle --platform=node --target=\"node${node_ver:1:2}\" --outfile=out/bin/app.cjs"
}, },
"dependencies": { "dependencies": {
"@eslint/js": "9.12.0", "@eslint/js": "9.13.0",
"@stylistic/eslint-plugin": "2.9.0", "@stylistic/eslint-plugin": "2.9.0",
"@types/eslint__js": "8.42.3", "@types/eslint__js": "8.42.3",
"@types/node": "22.7.5", "@types/node": "22.7.7",
"esbuild": "0.24.0", "esbuild": "0.24.0",
"eslint": "9.12.0", "eslint": "9.13.0",
"eslint-plugin-jsdoc": "50.3.2", "eslint-plugin-jsdoc": "50.4.3",
"jiti": "2.3.3", "jiti": "2.3.3",
"typescript": "5.6.3", "typescript": "5.6.3",
"typescript-eslint": "8.8.1" "typescript-eslint": "8.10.0"
} }
} }

View file

@ -3,7 +3,13 @@ import { writeFileSync } from 'node:fs';
import { parseArgs } from './lib.ts'; import { parseArgs } from './lib.ts';
import { updateFirefoxAddons } from '././firefox.ts'; import { updateFirefoxAddons } from '././firefox.ts';
import { updateDocker, updateFlakeInputs, updateVuetorrent } from './misc.ts';
import {
updateCustomSidebarDeps,
updateDocker,
updateFlakeInputs,
updateVuetorrent,
} from './misc.ts';
/* Constants */ /* Constants */
@ -32,6 +38,10 @@ if (args['v'] || args['vuetorrent']) {
console.log(updateVuetorrent()); console.log(updateVuetorrent());
} }
if (args['c'] || args['custom-sidebar']) {
console.log(updateCustomSidebarDeps());
}
if (args['a'] || args['all']) { if (args['a'] || args['all']) {
// Update this first because of nix run cmd // Update this first because of nix run cmd
const firefoxOutput = updateFirefoxAddons(); const firefoxOutput = updateFirefoxAddons();
@ -53,6 +63,9 @@ if (args['a'] || args['all']) {
console.log(vuetorrentOutput); console.log(vuetorrentOutput);
// This doesn't need to be added to commit msgs
console.log(updateCustomSidebarDeps());
spawnSync('nix-fast-build', ['-f', `${FLAKE}#nixFastChecks`], { spawnSync('nix-fast-build', ['-f', `${FLAKE}#nixFastChecks`], {
shell: true, shell: true,

View file

@ -10,7 +10,7 @@ const FLAKE = process.env.FLAKE;
export const updateFlakeInputs = () => { export const updateFlakeInputs = () => {
const output = spawnSync( const output = spawnSync(
`git restore flake.lock &> /dev/null; nix flake update --flake ${FLAKE}` + `git restore flake.lock &> /dev/null; nix flake update --flake ${FLAKE}` +
' |& grep -v "warning: updating lock file"', ' |& grep -v "warning: updating lock file" |& grep -v "unpacking"',
[], [],
{ shell: true }, { shell: true },
).stdout ).stdout
@ -56,8 +56,11 @@ export const updateDocker = () => {
return updates; return updates;
}; };
const genVueText = (version: string, hash: string, url: string) => const genVueText = (
`# This file was autogenerated. DO NOT EDIT! version: string,
hash: string,
url: string,
) => `# This file was autogenerated. DO NOT EDIT!
{ {
version = "${version}"; version = "${version}";
url = "${url}"; url = "${url}";
@ -85,3 +88,9 @@ export const updateVuetorrent = () => {
return OLD_VERSION !== VERSION ? `Vuetorrent: ${OLD_VERSION} -> ${VERSION}` : ''; return OLD_VERSION !== VERSION ? `Vuetorrent: ${OLD_VERSION} -> ${VERSION}` : '';
}; };
export const updateCustomSidebarDeps = () => spawnSync(
`nix run ${FLAKE}#legacyPackages.x86_64-linux.lovelace-components.custom-sidebar.update`,
[],
{ shell: true },
).stderr.toString();

View file

@ -1,8 +1,8 @@
pkgs: pkgs:
pkgs.dockerTools.pullImage rec { pkgs.dockerTools.pullImage rec {
imageName = "rssbridge/rss-bridge"; imageName = "rssbridge/rss-bridge";
imageDigest = "sha256:da785b43f43e4f718c525d71453d6b7011db98c68434f02315cb7ee1ecc88889"; imageDigest = "sha256:42b4d1d1e3fb2c361a3a2fe2921a847bbdcd0d6d14a4d411482665fc4560a58d";
sha256 = "0zd27m1gwiw2n2dslv1mxvi54p5gbgfilib99i7f8vh3sf0z7dcd"; sha256 = "0f0d0710k99gq4dvayjl4n0aby8gly04jp9bn6qab0j3zy0wdb0y";
finalImageName = imageName; finalImageName = imageName;
finalImageTag = "latest"; finalImageTag = "latest";
} }

Binary file not shown.

BIN
flake.nix

Binary file not shown.

View file

@ -113,6 +113,9 @@ let
hyprland = mkDep { hyprland = mkDep {
owner = "hyprwm"; owner = "hyprwm";
repo = "Hyprland"; repo = "Hyprland";
# FIXME: wait for hyprgrass and hyprland-plugins to chase hyprland
rev = "62ee5cc2739d70570dbe143c9bd75d00a51db942";
}; };
hyprland-plugins = mkHyprDep { hyprland-plugins = mkHyprDep {

View file

@ -1,4 +1,5 @@
{ {
concatTextFile,
custom-sidebar-src, custom-sidebar-src,
nodejs, nodejs,
pnpm, pnpm,
@ -29,6 +30,13 @@ in
pnpmDeps = pnpm.fetchDeps { pnpmDeps = pnpm.fetchDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
hash = "sha256-oERAaN/0uyImDRlxJIdKutFh3jYFJQh2KAeM1LXBpjU="; hash = "sha256-Lk2zRcF4ysAeo0fYKDfCoORyOrViKaK1TLUo0atZdr4=";
};
passthru.update = concatTextFile {
name = "update";
files = [./update.sh];
executable = true;
destination = "/bin/update";
}; };
}) })

View file

@ -0,0 +1,13 @@
#!/usr/bin/env bash
file="$FLAKE/legacyPackages/lovelace-components/custom-sidebar/default.nix"
old_hash="$(sed -n 's/.*hash = "\(.*\)";/\1/p' "$file")"
sed -i "s/hash = .*/hash = \"\";/" "$file"
npm_hash="$(nix build "$FLAKE#legacyPackages.x86_64-linux.lovelace-components.custom-sidebar" |& sed -n 's/.*got: *//p')"
if [[ "$npm_hash" != "$old_hash" ]]; then
sed -i "s/hash = .*/hash = \"$npm_hash\";/" "$FLAKE/legacyPackages/lovelace-components/custom-sidebar/default.nix"
else
sed -i "s/hash = .*/hash = \"$old_hash\";/" "$FLAKE/legacyPackages/lovelace-components/custom-sidebar/default.nix"
fi

View file

@ -174,7 +174,7 @@
}) })
++ [ ++ [
(pkgs.writeShellApplication { (pkgs.writeShellApplication {
name = "updateNpmDeps"; name = "bumpNpmDeps";
runtimeInputs = builtins.attrValues { runtimeInputs = builtins.attrValues {
inherit inherit
(pkgs) (pkgs)