mirror of
https://git.pvv.ntnu.no/Drift/pvv-nixos-config.git
synced 2026-02-04 09:10:01 +01:00
update and fix `packages.out-of-your-element
This commit is contained in:
@@ -275,7 +275,7 @@
|
||||
|
||||
bluemap = pkgs.callPackage ./packages/bluemap.nix { };
|
||||
|
||||
out-of-your-element = pkgs.callPackage ./packages/out-of-your-element.nix { };
|
||||
out-of-your-element = pkgs.callPackage ./packages/ooye/package.nix { };
|
||||
}
|
||||
//
|
||||
# Mediawiki extensions
|
||||
|
||||
2221
packages/ooye/fix-lockfile.patch
Normal file
2221
packages/ooye/fix-lockfile.patch
Normal file
File diff suppressed because it is too large
Load Diff
40
packages/ooye/generate-lock-patch.sh
Executable file
40
packages/ooye/generate-lock-patch.sh
Executable file
@@ -0,0 +1,40 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p bash git gnugrep gnused nodejs_24
|
||||
|
||||
GIT_TOPLEVEL=$(git rev-parse --show-toplevel)
|
||||
PACKAGE_NIX="$GIT_TOPLEVEL/packages/ooye/package.nix"
|
||||
REV="$(grep -oP '(?<=rev = ")[a-z0-9]+(?=")' "$PACKAGE_NIX")"
|
||||
|
||||
TMPDIR="$(mktemp -d)"
|
||||
|
||||
cleaning() {
|
||||
rm -rf "$TMPDIR"
|
||||
}
|
||||
|
||||
trap 'cleaning' SIGINT
|
||||
|
||||
git clone --depth 1 --revision="$REV" https://git.pvv.ntnu.no/Drift/delete-your-element.git "$TMPDIR/ooye"
|
||||
pushd "$TMPDIR/ooye" || exit
|
||||
sed -i 's/\s*"glob@<11.1": "^12"//' package.json
|
||||
git diff --quiet --exit-code package.json && {
|
||||
echo "Sed did't do it's job, please fix" >&2
|
||||
cleaning
|
||||
exit 1
|
||||
}
|
||||
|
||||
rm -rf package-lock.json
|
||||
npm install --package-lock-only
|
||||
|
||||
export GIT_AUTHOR_NAME='Lockinator 9000'
|
||||
export GIT_AUTHOR_EMAIL='locksmith@lockal.local'
|
||||
export GIT_AUTHOR_DATE='Sun, 01 Jan 1984 00:00:00 +0000'
|
||||
export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"
|
||||
export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"
|
||||
export GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
|
||||
|
||||
git commit -am "package-lock.json: bomp" --no-gpg-sign
|
||||
git format-patch HEAD~
|
||||
mv 0001-package-lock.json-bomp.patch "$GIT_TOPLEVEL/packages/ooye/fix-lockfile.patch"
|
||||
git reset --hard HEAD~
|
||||
popd || exit
|
||||
cleaning
|
||||
@@ -2,31 +2,28 @@
|
||||
lib,
|
||||
fetchFromGitea,
|
||||
makeWrapper,
|
||||
nodejs,
|
||||
nodejs_24,
|
||||
buildNpmPackage,
|
||||
fetchpatch,
|
||||
}:
|
||||
let
|
||||
nodejs = nodejs_24;
|
||||
in
|
||||
buildNpmPackage {
|
||||
pname = "delete-your-element";
|
||||
version = "3.3-unstable-2025-12-09";
|
||||
version = "3.3-unstable-2026-01-21";
|
||||
src = fetchFromGitea {
|
||||
domain = "git.pvv.ntnu.no";
|
||||
owner = "Drift";
|
||||
repo = "delete-your-element";
|
||||
rev = "1c0c545a024ef7215a1a3483c10acce853f79765";
|
||||
hash = "sha256-ow/PdlHfU7PCwsjJUEzoETzONs1KoKTRMRQ9ADN0tGk=";
|
||||
rev = "d8fdb27feefa07ede43c24e6d17c2c111cf1dde1";
|
||||
hash = "sha256-C2J8N8q2bcNAd4rVD4hONkU0x4iIS2b3MevTgs09/iM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "ooye-fix-package-lock-0001.patch";
|
||||
url = "https://cgit.rory.gay/nix/OOYE-module.git/plain/pl.patch?h=ee126389d997ba14be3fe3ef360ba37b3617a9b2";
|
||||
hash = "sha256-dP6WEHb0KksDraYML+jcR5DftH9BiXvwevUg38ALOrc=";
|
||||
})
|
||||
];
|
||||
inherit nodejs;
|
||||
|
||||
npmDepsHash = "sha256-OXOyO6LxK/WYYVysSxkol0ilMUZB+osLYUE5DpJlbps=";
|
||||
# npmDepsHash = "sha256-Y+vgp7+7pIDm64AYSs8ltoAiON0EPpJInbmgn3/LkVA=";
|
||||
patches = [ ./fix-lockfile.patch ];
|
||||
|
||||
npmDepsHash = "sha256-tiGXr86x9QNAwhZcxSOox6sP9allyz9QSH3XOZOb3z8=";
|
||||
dontNpmBuild = true;
|
||||
makeCacheWritable = true;
|
||||
|
||||
Reference in New Issue
Block a user