pyrox.dev
Merge pull request #266455 from 06kellyjac/authelia_update_fixes
authelia: fix update script
authored by Mario Rodas and committed by GitHub 3da53eb0 596e6a54
-13
pkgs/servers/authelia/change-web-out-dir.patch
-13
pkgs/servers/authelia/change-web-out-dir.patch
···
1
-
diff --git a/vite.config.ts b/vite.config.ts
2
-
index 659ba3e1..1f0afa5c 100644
3
-
--- a/vite.config.ts
4
-
+++ b/vite.config.ts
5
-
@@ -37,7 +37,7 @@ export default defineConfig(({ mode }) => {
6
-
base: "./",
7
-
build: {
8
-
sourcemap,
9
-
- outDir: "../internal/server/public_html",
10
-
+ outDir: "dist",
11
-
emptyOutDir: true,
12
-
assetsDir: "static",
13
-
rollupOptions: {
···
+18
-12
pkgs/servers/authelia/update.sh
+18
-12
pkgs/servers/authelia/update.sh
···
10
instantiateClean() {
11
nix-instantiate --eval --strict -E "with import ./. {}; $1" | cut -d\" -f2
12
}
13
-
fetchNewSha() {
14
set +eo pipefail
15
-
nix-build -A "$1" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g'
16
set -eo pipefail
17
}
18
replace() {
19
sed -i "s@$1@$2@g" "$3"
···
49
OLD_SRC_HASH="$(instantiateClean authelia.src.outputHash)"
50
echo "Old src hash $OLD_SRC_HASH"
51
replace "$OLD_SRC_HASH" "$TMP_HASH" "$DRV_DIR/sources.nix"
52
-
NEW_SRC_HASH="$(fetchNewSha authelia.src)"
53
echo "New src hash $NEW_SRC_HASH"
54
replace "$TMP_HASH" "$NEW_SRC_HASH" "$DRV_DIR/sources.nix"
55
···
61
}
62
trap clean_up EXIT
63
64
-
# OLD_PWD=$PWD
65
-
# cd $WEB_DIR
66
-
# OUT=$(nix-build -E "with import $NIXPKGS_ROOT {}; authelia.src" --no-out-link)
67
-
# cp -r $OUT/web/package.json .
68
-
# npm install --package-lock-only --legacy-peer-deps --ignore-scripts
69
-
# mv package-lock.json "$DRV_DIR/"
70
71
-
# cd $OLD_PWD
72
OLD_NPM_DEPS_HASH="$(instantiateClean authelia.web.npmDepsHash)"
73
echo "Old npm deps hash $OLD_NPM_DEPS_HASH"
74
replace "$OLD_NPM_DEPS_HASH" "$TMP_HASH" "$DRV_DIR/sources.nix"
75
-
NEW_NPM_DEPS_HASH="$(fetchNewSha authelia.web)"
76
echo "New npm deps hash $NEW_NPM_DEPS_HASH"
77
replace "$TMP_HASH" "$NEW_NPM_DEPS_HASH" "$DRV_DIR/sources.nix"
78
clean_up
···
80
OLD_GO_VENDOR_HASH="$(instantiateClean authelia.vendorHash)"
81
echo "Old go vendor hash $OLD_GO_VENDOR_HASH"
82
replace "$OLD_GO_VENDOR_HASH" "$TMP_HASH" "$DRV_DIR/sources.nix"
83
-
NEW_GO_VENDOR_HASH="$(fetchNewSha authelia.goModules)"
84
echo "New go vendor hash $NEW_GO_VENDOR_HASH"
85
replace "$TMP_HASH" "$NEW_GO_VENDOR_HASH" "$DRV_DIR/sources.nix"
···
10
instantiateClean() {
11
nix-instantiate --eval --strict -E "with import ./. {}; $1" | cut -d\" -f2
12
}
13
+
fetchNewHash() {
14
set +eo pipefail
15
+
HASH="$(nix-build -A "$1" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')"
16
set -eo pipefail
17
+
if [ -z "$HASH" ]; then
18
+
echo "Could not generate hash" >&2
19
+
exit 1
20
+
else
21
+
echo "$HASH"
22
+
fi
23
}
24
replace() {
25
sed -i "s@$1@$2@g" "$3"
···
55
OLD_SRC_HASH="$(instantiateClean authelia.src.outputHash)"
56
echo "Old src hash $OLD_SRC_HASH"
57
replace "$OLD_SRC_HASH" "$TMP_HASH" "$DRV_DIR/sources.nix"
58
+
NEW_SRC_HASH="$(fetchNewHash authelia.src)"
59
echo "New src hash $NEW_SRC_HASH"
60
replace "$TMP_HASH" "$NEW_SRC_HASH" "$DRV_DIR/sources.nix"
61
···
67
}
68
trap clean_up EXIT
69
70
+
OLD_PWD=$PWD
71
+
cd $WEB_DIR
72
+
OUT=$(nix-build -E "with import $NIXPKGS_ROOT {}; authelia.src" --no-out-link)
73
+
cp -r $OUT/web/package.json .
74
+
npm install --package-lock-only --legacy-peer-deps --ignore-scripts
75
+
mv package-lock.json "$DRV_DIR/"
76
+
cd $OLD_PWD
77
78
OLD_NPM_DEPS_HASH="$(instantiateClean authelia.web.npmDepsHash)"
79
echo "Old npm deps hash $OLD_NPM_DEPS_HASH"
80
replace "$OLD_NPM_DEPS_HASH" "$TMP_HASH" "$DRV_DIR/sources.nix"
81
+
NEW_NPM_DEPS_HASH="$(fetchNewHash authelia.web)"
82
echo "New npm deps hash $NEW_NPM_DEPS_HASH"
83
replace "$TMP_HASH" "$NEW_NPM_DEPS_HASH" "$DRV_DIR/sources.nix"
84
clean_up
···
86
OLD_GO_VENDOR_HASH="$(instantiateClean authelia.vendorHash)"
87
echo "Old go vendor hash $OLD_GO_VENDOR_HASH"
88
replace "$OLD_GO_VENDOR_HASH" "$TMP_HASH" "$DRV_DIR/sources.nix"
89
+
NEW_GO_VENDOR_HASH="$(fetchNewHash authelia.goModules)"
90
echo "New go vendor hash $NEW_GO_VENDOR_HASH"
91
replace "$TMP_HASH" "$NEW_GO_VENDOR_HASH" "$DRV_DIR/sources.nix"
+2
-4
pkgs/servers/authelia/web.nix
+2
-4
pkgs/servers/authelia/web.nix