Skip to content

Commit a1744af

Browse files
Maintenance: Update dependencies, drop hashes.json
1 parent dabf660 commit a1744af

File tree

5 files changed

+87
-90
lines changed

5 files changed

+87
-90
lines changed

flake.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
description = "Spacebar server, written in Typescript.";
2+
description = "A macro to host element call on a Cisco WebEx device.";
33

44
inputs = {
5-
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
5+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
66
flake-utils.url = "github:numtide/flake-utils";
77
};
88

@@ -18,61 +18,62 @@
1818
pkgs = import nixpkgs {
1919
inherit system;
2020
};
21-
hashesFile = builtins.fromJSON (builtins.readFile ./hashes.json);
2221
lib = pkgs.lib;
2322
in
2423
{
2524
packages = {
26-
default = pkgs.buildNpmPackage {
27-
pname = "cisco-element-call";
28-
name = "cisco-element-call";
25+
default =
26+
let
27+
filteredSrc = lib.fileset.toSource {
28+
root = ./.;
29+
fileset = (
30+
lib.fileset.intersection ./. (
31+
lib.fileset.unions [
32+
./src
33+
./package.json
34+
./package-lock.json
35+
./tsconfig.json
36+
]
37+
)
38+
);
39+
};
40+
in
41+
pkgs.buildNpmPackage {
42+
pname = "cisco-element-call";
43+
name = "cisco-element-call";
2944

30-
meta = with lib; {
31-
description = "A call to host element call on a Cisco WebEx device.";
32-
homepage = "https://github.com/TheArcaneBrony/cisco-element-call";
33-
#license = licenses.agpl3Plus;
34-
platforms = platforms.all;
35-
mainProgram = "start-macro";
36-
};
45+
meta = with lib; {
46+
description = "A maco to host element call on a Cisco WebEx device.";
47+
homepage = "https://github.com/TheArcaneBrony/cisco-element-call";
48+
#license = licenses.agpl3Plus;
49+
platforms = platforms.all;
50+
mainProgram = "start-macro";
51+
};
3752

38-
src = ./.;
39-
nativeBuildInputs = with pkgs; [ python3 ];
40-
npmDepsHash = hashesFile.npmDepsHash;
41-
makeCacheWritable = true;
42-
postPatch = ''
43-
substituteInPlace package.json --replace 'npx patch-package' '${pkgs.nodePackages.patch-package}/bin/patch-package'
44-
'';
45-
installPhase = ''
46-
runHook preInstall
47-
set -x
48-
#remove packages not needed for production, or at least try to...
49-
npm prune --omit dev --no-save $npmInstallFlags "''${npmInstallFlagsArray[@]}" $npmFlags "''${npmFlagsArray[@]}"
50-
find node_modules -maxdepth 1 -type d -empty -delete
53+
src = filteredSrc;
54+
nativeBuildInputs = with pkgs; [ python3 ];
55+
npmDeps = pkgs.importNpmLock { npmRoot = filteredSrc; };
56+
npmConfigHook = pkgs.importNpmLock.npmConfigHook;
5157

52-
mkdir -p $out
53-
cp -r dist node_modules package.json $out/
54-
makeWrapper ${pkgs.nodejs}/bin/node $out/bin/start-macro --prefix NODE_PATH : $out/node_modules --add-flags $out/dist/index.js
58+
makeCacheWritable = true;
59+
postPatch = ''
60+
substituteInPlace package.json --replace 'npx patch-package' '${pkgs.nodePackages.patch-package}/bin/patch-package'
61+
'';
62+
installPhase = ''
63+
runHook preInstall
64+
set -x
65+
#remove packages not needed for production, or at least try to...
66+
npm prune --omit dev --no-save $npmInstallFlags "''${npmInstallFlagsArray[@]}" $npmFlags "''${npmFlagsArray[@]}"
67+
find node_modules -maxdepth 1 -type d -empty -delete
5568
56-
set +x
57-
runHook postInstall
58-
'';
59-
};
69+
mkdir -p $out
70+
cp -r dist node_modules package.json $out/
71+
makeWrapper ${pkgs.nodejs}/bin/node $out/bin/start-macro --prefix NODE_PATH : $out/node_modules --add-flags $out/dist/index.js
6072
61-
update-nix = pkgs.writeShellApplication {
62-
name = "update-nix";
63-
runtimeInputs = with pkgs; [
64-
prefetch-npm-deps
65-
nix
66-
jq
67-
];
68-
text = ''
69-
nix flake update --extra-experimental-features 'nix-command flakes'
70-
DEPS_HASH=$(prefetch-npm-deps package-lock.json)
71-
TMPFILE=$(mktemp)
72-
jq '.npmDepsHash = "'"$DEPS_HASH"'"' hashes.json > "$TMPFILE"
73-
mv -- "$TMPFILE" hashes.json
74-
'';
75-
};
73+
set +x
74+
runHook postInstall
75+
'';
76+
};
7677
};
7778

7879
devShell = pkgs.mkShell {

hashes.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

package-lock.json

Lines changed: 29 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
"license": "ISC",
1313
"description": "",
1414
"dependencies": {
15-
"jsxapi": "^5.1.1",
16-
"dotenv": "^16.4.7"
15+
"dotenv": "^16.6.1",
16+
"jsxapi": "^5.1.1"
1717
},
1818
"devDependencies": {
19-
"@types/node": "^22.12.0",
20-
"typescript": "^5.7.3"
19+
"@types/node": "^22.19.7",
20+
"typescript": "^5.9.3"
2121
}
2222
}

0 commit comments

Comments
 (0)