Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sqlpage : 0.20.0 -> 0.22.0 #317280

Merged
merged 4 commits into from
Jun 5, 2024
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions pkgs/servers/sqlpage/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

let
apexcharts = fetchurl {
url = "https://cdn.jsdelivr.net/npm/apexcharts@3.47.0/dist/apexcharts.min.js";
sha256 = "sha256-StFDdV+DR9yItbCXAGTK6EUcu613N3vM0i5ngrYZlz4=";
url = "https://cdn.jsdelivr.net/npm/apexcharts@3.49.1/dist/apexcharts.min.js";
sha256 = "sha256-74AuGLJETu9PiPQ69d/gxD3Wy3j10udgC7FQYPQjhyU=";
guiguid marked this conversation as resolved.
Show resolved Hide resolved
};
tablerCss = fetchurl {
url = "https://cdn.jsdelivr.net/npm/@tabler/[email protected]/dist/css/tabler.min.css";
Expand All @@ -31,25 +31,29 @@ let
sha256 = "sha256-sYy7qNJW7RTuaNA0jq6Yrtfs57ypYrItZ3f8T7kqfPM=";
};
tablerIcons = fetchurl {
url = "https://cdn.jsdelivr.net/npm/@tabler/[email protected]/tabler-sprite.svg";
sha256 = "sha256-dphCRqfQZmC7finy/HU9QnJQESwgWoUxRHkz7On877I=";
url = "https://cdn.jsdelivr.net/npm/@tabler/[email protected]/dist/tabler-sprite.svg";
sha256 = "sha256-iYxplXfIhVNBOmEEURN7/53A8Mi0hWCbWWo92BzncUA=";
guiguid marked this conversation as resolved.
Show resolved Hide resolved
};
tomselect = fetchurl {
url = "https://cdn.jsdelivr.net/npm/[email protected]/dist/js/tom-select.popular.min.js";
sha256 = "sha256-51NcdIM8GseVFFmg8mUWDxfhjLCA+n8kw/Ojyo+6Hjk=";
guiguid marked this conversation as resolved.
Show resolved Hide resolved
};
in

rustPlatform.buildRustPackage rec {
pname = "sqlpage";
version = "0.20.0";
version = "0.22.0";

src = fetchFromGitHub {
owner = "lovasoa";
repo = "SQLpage";
rev = "v${version}";
sha256 = "sha256-zmAnlsYL36qqO2cLSVdsnUG47xHslOvDzcGICNxG/5c=";
};
sha256 = "sha256-FSMf1B/2ZyOikkwmt3YLtKYs7NCf3N91SKQK73kWieQ=";
guiguid marked this conversation as resolved.
Show resolved Hide resolved
};
guiguid marked this conversation as resolved.
Show resolved Hide resolved

postPatch = ''
substituteInPlace sqlpage/apexcharts.js \
--replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.47.0/dist/apexcharts.min.js */' \
--replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.49.1/dist/apexcharts.min.js */' \
guiguid marked this conversation as resolved.
Show resolved Hide resolved
"$(cat ${apexcharts})"
substituteInPlace sqlpage/sqlpage.css \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/[email protected]/dist/css/tabler.min.css */' \
Expand All @@ -64,11 +68,14 @@ rustPlatform.buildRustPackage rec {
--replace '/* !include https://cdn.jsdelivr.net/npm/[email protected]/dist/list.min.js */' \
"$(cat ${listJsFixed})"
substituteInPlace sqlpage/tabler-icons.svg \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.47.0/tabler-sprite.svg */' \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons[email protected]/dist/tabler-sprite.svg */' \
"$(cat ${tablerIcons})"
'';
substituteInPlace sqlpage/tomselect.js \
--replace '/* !include https://cdn.jsdelivr.net/npm/[email protected]/dist/js/tom-select.popular.min.js */' \
"$(cat ${tomselect})"
'';

cargoHash = "sha256-dPqO+yychyOybdTvdhWkcXyDlxIXO39KUZ80v+7Syqg=";
cargoHash = "sha256-uDeQ6/hKJFD747sUeQbpQIIzbpcvQfsTbbx68m1GAKY=";

nativeBuildInputs = [
pkg-config
Expand Down