Merge pull request #266728 from MikaelFangel/update-sqlpage

sqlpage: 0.9.5 -> 0.15.1
This commit is contained in:
Robert Scott 2023-11-12 12:32:50 +00:00 committed by GitHub
commit 34d3eec95e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -11,64 +11,64 @@
let let
apexcharts = fetchurl { apexcharts = fetchurl {
url = "https://cdn.jsdelivr.net/npm/apexcharts@3.41.0/dist/apexcharts.min.js"; url = "https://cdn.jsdelivr.net/npm/apexcharts@3.43.2-0/dist/apexcharts.min.js";
sha256 = "sha256-JvfrbG0Jkj1XzwMu28wweq4DTzHgRAQHmC5f0stdU5Q="; sha256 = "sha256-7al9VaQHu7u5jfx1HZf+T8k27kbIhgHvRwaeIeYEjVI=";
}; };
tablerCss = fetchurl { tablerCss = fetchurl {
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler.min.css"; url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css";
sha256 = "sha256-vvqPe3OoUsri+/z6/s3a9LZ/u0tM07VNmVWopaXS3Uk="; sha256 = "sha256-lS3nKxMMZiKIRJG7UgUonOHYuvHgW5eckEjvHMYxb9Q=";
}; };
tablerVendorsCss = fetchurl { tablerVendorsCss = fetchurl {
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler-vendors.min.css"; url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler-vendors.min.css";
sha256 = "sha256-Pxz9YzwGJIUlHDNZMU9h7Lz/7qA/t0ehlRfC1P8wzxE="; sha256 = "sha256-Aa7AUOaz6hJLiUzQStZTy2VPOZyg0ViSo2MCzpDU1tY=";
}; };
tablerJs = fetchurl { tablerJs = fetchurl {
url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/js/tabler.min.js"; url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js";
sha256 = "sha256-xnY4FSLoAEy0TVjo/xv488tAXOrI+hvXGvEVVQdMDk8="; sha256 = "sha256-ygO5OTRUtYxDDkERRwBCfq+fmakhM6ybwfl6gCCPlAQ=";
}; };
listJsFixed = fetchurl { listJsFixed = fetchurl {
url = "https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.2/dist/list.min.js"; url = "https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js";
sha256 = "sha256-mwE8YX5fgYlI9M7zCNDlPxT7pb7NJPkOyo1Y+4At85s="; sha256 = "sha256-sYy7qNJW7RTuaNA0jq6Yrtfs57ypYrItZ3f8T7kqfPM=";
}; };
tablerIcons = fetchurl { tablerIcons = fetchurl {
url = "https://cdn.jsdelivr.net/npm/@tabler/icons@2.30.0/tabler-sprite.svg"; url = "https://cdn.jsdelivr.net/npm/@tabler/icons@2.39.0/tabler-sprite.svg";
sha256 = "sha256-xRHWlHNQraZpiRlgVswkfgN1qMrjQOtRYAq1N/DccgQ="; sha256 = "sha256-8C9PPhDyVnym0q/RkQlTyfjKbAMRsYBlRtsMbNAepvY=";
}; };
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "sqlpage"; pname = "sqlpage";
version = "0.9.5"; version = "0.15.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lovasoa"; owner = "lovasoa";
repo = "SQLpage"; repo = "SQLpage";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-6KJ3phhOf10S0EMdolUw3sdXm1G7yuF+Ii/AjdgBE+s="; hash = "sha256-0CPWMVdX0HGPMfIiDfC6TJ2t07O6eZcS7yEDVAvjLUc=";
}; };
postPatch = '' postPatch = ''
substituteInPlace sqlpage/apexcharts.js \ substituteInPlace sqlpage/apexcharts.js \
--replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.41.0/dist/apexcharts.min.js */' \ --replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.43.2-0/dist/apexcharts.min.js */' \
"$(cat ${apexcharts})" "$(cat ${apexcharts})"
substituteInPlace sqlpage/sqlpage.css \ substituteInPlace sqlpage/sqlpage.css \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler.min.css */' \ --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler.min.css */' \
"$(cat ${tablerCss})" "$(cat ${tablerCss})"
substituteInPlace sqlpage/sqlpage.css \ substituteInPlace sqlpage/sqlpage.css \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler-vendors.min.css */' \ --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/css/tabler-vendors.min.css */' \
"$(cat ${tablerVendorsCss})" "$(cat ${tablerVendorsCss})"
substituteInPlace sqlpage/sqlpage.js \ substituteInPlace sqlpage/sqlpage.js \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/js/tabler.min.js */' \ --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta20/dist/js/tabler.min.js */' \
"$(cat ${tablerJs})" "$(cat ${tablerJs})"
substituteInPlace sqlpage/sqlpage.js \ substituteInPlace sqlpage/sqlpage.js \
--replace '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.2/dist/list.min.js */' \ --replace '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.4/dist/list.min.js */' \
"$(cat ${listJsFixed})" "$(cat ${listJsFixed})"
substituteInPlace sqlpage/tabler-icons.svg \ substituteInPlace sqlpage/tabler-icons.svg \
--replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.30.0/tabler-sprite.svg */' \ --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.39.0/tabler-sprite.svg */' \
"$(cat ${tablerIcons})" "$(cat ${tablerIcons})"
''; '';
cargoHash = "sha256-kJzBvZSh6jkSJ4um+KYp7fKklDPlvOgz5NQb7j99brw="; cargoHash = "sha256-ooK4eIaPbUsxgDuVJkWHlArMa81TtlRfR6YYEAh7cLY=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config