homer: 25.04.1 -> 25.08.1
Git changelog: https://github.com/bastienwirtz/homer/compare/v25.04.1...v25.08.1 Release tag: https://github.com/bastienwirtz/homer/releases/tag/v25.08.1 Signed-off-by: Christoph Heiss <christoph@c8h4.io>
This commit is contained in:
+81
-76
@@ -1,24 +1,23 @@
|
||||
From d4d4a299de39685e59f256c81d8e60ce6efd8b23 Mon Sep 17 00:00:00 2001
|
||||
From 0f77537ce2ba5c1a23d5c2a154bdc77450d1e0e5 Mon Sep 17 00:00:00 2001
|
||||
From: Christoph Heiss <christoph@c8h4.io>
|
||||
Date: Wed, 1 Jan 2025 18:02:40 +0100
|
||||
Date: Tue, 26 Aug 2025 10:23:14 +0200
|
||||
Subject: [PATCH] build: enable specifying custom sass compiler path by env-var
|
||||
|
||||
Signed-off-by: Felix Buehler <account@buehler.rocks>
|
||||
Signed-off-by: Christoph Heiss <christoph@c8h4.io>
|
||||
---
|
||||
package.json | 7 ++++++-
|
||||
package.json | 5 ++++-
|
||||
patches/sass-embedded.patch | 15 +++++++++++++++
|
||||
pnpm-lock.yaml | 35 ++++++++++++++++++++---------------
|
||||
3 files changed, 41 insertions(+), 16 deletions(-)
|
||||
pnpm-lock.yaml | 27 ++++++++++++++++-----------
|
||||
3 files changed, 35 insertions(+), 12 deletions(-)
|
||||
create mode 100644 patches/sass-embedded.patch
|
||||
|
||||
diff --git i/package.json w/package.json
|
||||
index 897b42e..7a91a85 100644
|
||||
--- i/package.json
|
||||
+++ w/package.json
|
||||
diff --git a/package.json b/package.json
|
||||
index a67d2c6..17f17b1 100644
|
||||
--- a/package.json
|
||||
+++ b/package.json
|
||||
@@ -32,6 +32,9 @@
|
||||
"license": "Apache-2.0",
|
||||
"packageManager": "pnpm@10.4.1+sha512.c753b6c3ad7afa13af388fa6d808035a008e30ea9993f58c6663e2bc5ff21679aa834db094987129aa4d488b86df57f7b634981b2f827cdcacc698cc0cfb88af",
|
||||
"packageManager": "pnpm@10.14.0+sha512.ad27a79641b49c3e481a16a805baa71817a04bbe06a38d17e60e2eaee83f6a146c6a688125f5792e48dd5ba30e7da52a5cda4c3992b9ccf333f9ce223af84748",
|
||||
"pnpm": {
|
||||
- "neverBuiltDependencies": []
|
||||
+ "neverBuiltDependencies": [],
|
||||
@@ -29,7 +28,7 @@ index 897b42e..7a91a85 100644
|
||||
}
|
||||
diff --git a/patches/sass-embedded.patch b/patches/sass-embedded.patch
|
||||
new file mode 100644
|
||||
index 0000000..f941a8e
|
||||
index 0000000..5e02bed
|
||||
--- /dev/null
|
||||
+++ b/patches/sass-embedded.patch
|
||||
@@ -0,0 +1,15 @@
|
||||
@@ -37,106 +36,112 @@ index 0000000..f941a8e
|
||||
+index ae33aa3028e1a120d9e84b043bb19a71f1083b96..7a49d16a54982312ad638632d6750d7bec670f02 100644
|
||||
+--- a/dist/lib/src/compiler-path.js
|
||||
++++ b/dist/lib/src/compiler-path.js
|
||||
+@@ -24,6 +24,10 @@ function isLinuxMusl(path) {
|
||||
+ }
|
||||
+@@ -8,6 +8,10 @@ const p = require("path");
|
||||
+ const compiler_module_1 = require("./compiler-module");
|
||||
+ /** The full command for the embedded compiler executable. */
|
||||
+ exports.compilerCommand = (() => {
|
||||
++ const binPath = process.env.SASS_EMBEDDED_BIN_PATH;
|
||||
++ if (binPath) {
|
||||
++ return [binPath];
|
||||
++ }
|
||||
+ const platform = process.platform === 'linux' && isLinuxMusl(process.execPath)
|
||||
+ ? 'linux-musl'
|
||||
+ : process.platform;
|
||||
diff --git i/pnpm-lock.yaml w/pnpm-lock.yaml
|
||||
index 5df58fb..bb27c4b 100644
|
||||
--- i/pnpm-lock.yaml
|
||||
+++ w/pnpm-lock.yaml
|
||||
+ try {
|
||||
+ return [
|
||||
+ require.resolve(`${compiler_module_1.compilerModule}/dart-sass/src/dart` +
|
||||
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
|
||||
index 8f98554..44d1691 100644
|
||||
--- a/pnpm-lock.yaml
|
||||
+++ b/pnpm-lock.yaml
|
||||
@@ -4,6 +4,11 @@ settings:
|
||||
autoInstallPeers: true
|
||||
excludeLinksFromLockfile: false
|
||||
|
||||
|
||||
+patchedDependencies:
|
||||
+ sass-embedded:
|
||||
+ hash: 6wjvcsryx2tfkpottp4wf5nbzi
|
||||
+ hash: 24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20
|
||||
+ path: patches/sass-embedded.patch
|
||||
+
|
||||
importers:
|
||||
|
||||
|
||||
.:
|
||||
@@ -29,7 +34,7 @@ importers:
|
||||
version: 9.21.0
|
||||
version: 9.32.0
|
||||
'@vitejs/plugin-vue':
|
||||
specifier: ^5.2.1
|
||||
- version: 5.2.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)
|
||||
+ version: 5.2.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)
|
||||
specifier: ^6.0.1
|
||||
- version: 6.0.1(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)
|
||||
+ version: 6.0.1(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)
|
||||
'@vue/eslint-config-prettier':
|
||||
specifier: ^10.2.0
|
||||
version: 10.2.0(eslint@9.21.0)(prettier@3.5.2)
|
||||
version: 10.2.0(eslint@9.32.0)(prettier@3.6.2)
|
||||
@@ -50,13 +55,13 @@ importers:
|
||||
version: 3.5.2
|
||||
version: 3.6.2
|
||||
sass-embedded:
|
||||
specifier: ^1.85.0
|
||||
- version: 1.85.0
|
||||
+ version: 1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
|
||||
specifier: ^1.90.0
|
||||
- version: 1.90.0
|
||||
+ version: 1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20)
|
||||
vite:
|
||||
specifier: ^6.1.3
|
||||
- version: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0)
|
||||
+ version: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0)
|
||||
specifier: ^7.0.6
|
||||
- version: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
|
||||
+ version: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
|
||||
vite-plugin-pwa:
|
||||
specifier: ^0.21.1
|
||||
- version: 0.21.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
|
||||
+ version: 0.21.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
|
||||
|
||||
specifier: ^1.0.2
|
||||
- version: 1.0.2(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0)
|
||||
+ version: 1.0.2(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0)
|
||||
|
||||
packages:
|
||||
|
||||
@@ -3477,9 +3482,9 @@ snapshots:
|
||||
|
||||
|
||||
@@ -3634,10 +3639,10 @@ snapshots:
|
||||
|
||||
'@types/trusted-types@2.0.7': {}
|
||||
|
||||
- '@vitejs/plugin-vue@5.2.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)':
|
||||
+ '@vitejs/plugin-vue@5.2.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(vue@3.5.13)':
|
||||
|
||||
- '@vitejs/plugin-vue@6.0.1(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)':
|
||||
+ '@vitejs/plugin-vue@6.0.1(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(vue@3.5.18)':
|
||||
dependencies:
|
||||
- vite: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0)
|
||||
+ vite: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0)
|
||||
vue: 3.5.13
|
||||
|
||||
'@vue/compiler-core@3.5.13':
|
||||
@@ -4702,7 +4707,7 @@ snapshots:
|
||||
sass-embedded-win32-x64@1.85.0:
|
||||
'@rolldown/pluginutils': 1.0.0-beta.29
|
||||
- vite: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
|
||||
+ vite: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
|
||||
vue: 3.5.18
|
||||
|
||||
'@vue/compiler-core@3.5.18':
|
||||
@@ -4869,7 +4874,7 @@ snapshots:
|
||||
sass-embedded-win32-x64@1.90.0:
|
||||
optional: true
|
||||
|
||||
- sass-embedded@1.85.0:
|
||||
+ sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi):
|
||||
|
||||
- sass-embedded@1.90.0:
|
||||
+ sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20):
|
||||
dependencies:
|
||||
'@bufbuild/protobuf': 2.2.3
|
||||
'@bufbuild/protobuf': 2.6.3
|
||||
buffer-builder: 0.2.0
|
||||
@@ -5001,25 +5006,25 @@ snapshots:
|
||||
|
||||
@@ -5184,18 +5189,18 @@ snapshots:
|
||||
|
||||
varint@6.0.0: {}
|
||||
|
||||
- vite-plugin-pwa@0.21.1(vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
|
||||
+ vite-plugin-pwa@0.21.1(vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
|
||||
|
||||
- vite-plugin-pwa@1.0.2(vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0):
|
||||
+ vite-plugin-pwa@1.0.2(vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0):
|
||||
dependencies:
|
||||
debug: 4.4.0
|
||||
debug: 4.4.1
|
||||
pretty-bytes: 6.1.1
|
||||
tinyglobby: 0.2.12
|
||||
- vite: 6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0)
|
||||
+ vite: 6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0)
|
||||
tinyglobby: 0.2.14
|
||||
- vite: 7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
|
||||
+ vite: 7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1)
|
||||
workbox-build: 7.3.0
|
||||
workbox-window: 7.3.0
|
||||
transitivePeerDependencies:
|
||||
- supports-color
|
||||
|
||||
- vite@6.1.3(sass-embedded@1.85.0)(terser@5.39.0)(yaml@2.7.0):
|
||||
+ vite@6.1.3(sass-embedded@1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(terser@5.39.0)(yaml@2.7.0):
|
||||
|
||||
- vite@7.0.6(sass-embedded@1.90.0)(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1):
|
||||
+ vite@7.0.6(sass-embedded@1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20))(sass@1.90.0)(terser@5.43.1)(yaml@2.8.1):
|
||||
dependencies:
|
||||
esbuild: 0.24.2
|
||||
postcss: 8.5.3
|
||||
rollup: 4.38.0
|
||||
esbuild: 0.25.8
|
||||
fdir: 6.4.6(picomatch@4.0.3)
|
||||
@@ -5206,7 +5211,7 @@ snapshots:
|
||||
optionalDependencies:
|
||||
fsevents: 2.3.3
|
||||
- sass-embedded: 1.85.0
|
||||
+ sass-embedded: 1.85.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi)
|
||||
terser: 5.39.0
|
||||
yaml: 2.7.0
|
||||
sass: 1.90.0
|
||||
- sass-embedded: 1.90.0
|
||||
+ sass-embedded: 1.90.0(patch_hash=24d35db63138795a11bb26b230cf743c82f571c7e2ee061db58263799d659e20)
|
||||
terser: 5.43.1
|
||||
yaml: 2.8.1
|
||||
|
||||
--
|
||||
2.50.1
|
||||
|
||||
|
||||
@@ -2,31 +2,32 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchFromGitHub,
|
||||
pnpm_9,
|
||||
pnpm_10,
|
||||
nodejs,
|
||||
dart-sass,
|
||||
nix-update-script,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "homer";
|
||||
version = "25.04.1";
|
||||
version = "25.08.1";
|
||||
src = fetchFromGitHub {
|
||||
owner = "bastienwirtz";
|
||||
repo = "homer";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hvDrFGv6Mht9whA2lJbDLQnP2LkOiCo3NtjMpWr/q6A=";
|
||||
hash = "sha256-DA2gdh6o67QDC4y+N5DVG0ktjt/ORNbycU/y2cUjUE0=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
pnpmDeps = pnpm_10.fetchDeps {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
patches
|
||||
;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-y1R+rlaOtFOHHAgEHPBl40536U10Ft0iUSfGcfXS08Y=";
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-y/4f/39NOVV46Eg3h7fw8K43/kUIBqtiokTRRlX7398=";
|
||||
};
|
||||
|
||||
# Enables specifying a custom Sass compiler binary path via `SASS_EMBEDDED_BIN_PATH` environment variable.
|
||||
@@ -35,7 +36,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
nativeBuildInputs = [
|
||||
nodejs
|
||||
dart-sass
|
||||
pnpm_9.configHook
|
||||
pnpm_10.configHook
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
@@ -65,7 +66,7 @@ stdenvNoCC.mkDerivation rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Very simple static homepage for your server";
|
||||
homepage = "https://homer-demo.netlify.app/";
|
||||
homepage = "https://github.com/bastienwirtz/homer";
|
||||
changelog = "https://github.com/bastienwirtz/homer/releases";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [
|
||||
|
||||
Reference in New Issue
Block a user