Skip to content

Commit 2c7d612

Browse files
TheArcaneBronyTheArcaneBrony
committed
Make dependabot update nix hashes
1 parent a5e875c commit 2c7d612

File tree

4 files changed

+101
-67
lines changed

4 files changed

+101
-67
lines changed

‎.github/workflows/dependabot-nix-update.yml

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Dependabot-nix-update
2+
3+
on:
4+
push:
5+
branches:
6+
- "dependabot/npm_and_yarn/*"
7+
8+
jobs:
9+
update_npm_deps_hash:
10+
name: Update NPM dependencies hash
11+
runs-on: ubuntu-latest
12+
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
13+
permissions:
14+
contents: write
15+
steps:
16+
- name: Check Out Code
17+
uses: actions/checkout@v3
18+
19+
- name: Install Nix
20+
uses: DeterminateSystems/nix-installer-action@main
21+
22+
- name: Configure Cache
23+
uses: DeterminateSystems/magic-nix-cache-action@main
24+
25+
- name: Update Hash
26+
run: nix run .#update-nix
27+
28+
- name: Set up Git Config
29+
run: |
30+
# Configure author metadata to look like commits are made by Dependabot
31+
git config user.name "${GITHUB_ACTOR}"
32+
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
33+
34+
- name: Commit changes
35+
run: |
36+
git add .
37+
# Skip committing or pushing if there are no changes
38+
if [[ $(git status -s) ]]; then
39+
git commit -m "build(deps): update npm dependencies hash [dependabot skip]" --no-verify
40+
git push
41+
echo "Pushed an update to npm dependencies hash"
42+
else
43+
echo "Npm dependencies hash was not changed"
44+
fi

‎.husky/pre-commit

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if [ -x "$(/usr/bin/env which nix-shell 2>/dev/null)" ]; then
1818
elif [ ! -n "$(git status --porcelain=v1 2>/dev/null | grep -E '^M package-lock.json')" ]; then
1919
echo "package-lock.json has no changes. Skipping update of nix dependencies."
2020
else
21-
./nix-update.sh || exit $?
21+
nix run .#nix-update || exit $?
2222
fi
2323
fi
2424
else

‎flake.nix

+56-56
Original file line numberDiff line numberDiff line change
@@ -21,69 +21,69 @@
2121
hashesFile = builtins.fromJSON (builtins.readFile ./hashes.json);
2222
lib = pkgs.lib;
2323
in
24-
rec {
25-
packages.default = pkgs.buildNpmPackage {
26-
pname = "spacebar-server-ts";
27-
name = "spacebar-server-ts";
24+
{
25+
packages = {
26+
default = pkgs.buildNpmPackage {
27+
pname = "spacebar-server-ts";
28+
name = "spacebar-server-ts";
2829

29-
meta = with lib; {
30-
description = "Spacebar server, a FOSS reimplementation of the Discord backend.";
31-
homepage = "https://github.com/spacebarchat/server";
32-
license = licenses.agpl3Plus;
33-
platforms = platforms.all;
34-
mainProgram = "start-bundle";
35-
};
30+
meta = with lib; {
31+
description = "Spacebar server, a FOSS reimplementation of the Discord backend.";
32+
homepage = "https://github.com/spacebarchat/server";
33+
license = licenses.agpl3Plus;
34+
platforms = platforms.all;
35+
mainProgram = "start-bundle";
36+
};
3637

37-
src = ./.;
38-
nativeBuildInputs = with pkgs; [ python3 ];
39-
npmDepsHash = hashesFile.npmDepsHash;
40-
makeCacheWritable = true;
41-
postPatch = ''
42-
substituteInPlace package.json --replace 'npx patch-package' '${pkgs.nodePackages.patch-package}/bin/patch-package'
43-
'';
44-
installPhase = ''
45-
runHook preInstall
46-
set -x
47-
#remove packages not needed for production, or at least try to...
48-
npm prune --omit dev --no-save $npmInstallFlags "''${npmInstallFlagsArray[@]}" $npmFlags "''${npmFlagsArray[@]}"
49-
find node_modules -maxdepth 1 -type d -empty -delete
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
5051
52+
mkdir -p $out
53+
cp -r assets dist node_modules package.json $out/
54+
for i in dist/**/start.js
55+
do
56+
makeWrapper ${pkgs.nodejs}/bin/node $out/bin/start-`dirname ''${i/dist\//}` --prefix NODE_PATH : $out/node_modules --add-flags $out/$i
57+
done
5158
52-
#mkdir -p $out/node_modules/
53-
#cp -r node_modules/* $out/node_modules/
54-
#cp -r dist/ $out/node_modules/@spacebar
55-
#for i in dist/**/start.js
56-
#do
57-
# makeWrapper ${pkgs.nodejs-slim}/bin/node $out/bin/start-`dirname ''${i/dist\//}` --prefix NODE_PATH : $out/node_modules --add-flags $out/node_modules/@spacebar`dirname ''${i/dist/}`/start.js
58-
#done
59-
#set +x
60-
#substituteInPlace package.json --replace 'dist/' 'node_modules/@spacebar/'
61-
#find $out/node_modules/@spacebar/ -type f -name "*.js" | while read srcFile; do
62-
# echo Patching imports in ''${srcFile/$out\/node_modules\/@spacebar//}...
63-
# substituteInPlace $srcFile --replace 'require("./' 'require(__dirname + "/'
64-
# substituteInPlace $srcFile --replace 'require("../' 'require(__dirname + "/../'
65-
# substituteInPlace $srcFile --replace ', "assets"' ', "..", "assets"'
66-
# #substituteInPlace $srcFile --replace 'require("@spacebar/' 'require("
67-
#done
68-
#set -x
69-
#cp -r assets/ $out/
70-
#cp package.json $out/
71-
#rm -v $out/assets/openapi.json
72-
##rm -v $out/assets/schemas.json
59+
set +x
60+
runHook postInstall
61+
'';
62+
};
7363

74-
mkdir -p $out
75-
cp -r assets dist node_modules package.json $out/
76-
for i in dist/**/start.js
77-
do
78-
makeWrapper ${pkgs.nodejs-slim}/bin/node $out/bin/start-`dirname ''${i/dist\//}` --prefix NODE_PATH : $out/node_modules --add-flags $out/$i
79-
done
64+
update-nix = pkgs.writeShellApplication {
65+
name = "update-nix";
66+
runtimeInputs = with pkgs; [
67+
prefetch-npm-deps
68+
nix
69+
bash
70+
jq
71+
git
72+
nix-output-monitor
73+
];
74+
text = ''
75+
nix flake update --extra-experimental-features 'nix-command flakes'
76+
DEPS_HASH=$(prefetch-npm-deps package-lock.json)
77+
TMPFILE=$(mktemp)
78+
jq '.npmDepsHash = "'"$DEPS_HASH"'"' hashes.json > "$TMPFILE"
79+
mv -- "$TMPFILE" hashes.json
8080
81-
#debug utils:
82-
#cp $out/node_modules/@spacebar/ $out/build_output -r
83-
set +x
84-
runHook postInstall
85-
'';
81+
nom build .# --extra-experimental-features 'nix-command flakes' || exit $?
82+
git add hashes.json flake.lock flake.nix
83+
'';
84+
};
8685
};
86+
8787
devShell = pkgs.mkShell {
8888
buildInputs = with pkgs; [
8989
nodejs

‎nix-update.sh

-10
This file was deleted.

0 commit comments

Comments
 (0)