diff --git a/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch b/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch index 6c98af6abf8e..5634f03dfb79 100644 --- a/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch +++ b/pkgs/by-name/ho/homer/0001-build-enable-specifying-custom-sass-compiler-path-by.patch @@ -13,15 +13,15 @@ Signed-off-by: Christoph Heiss create mode 100644 patches/sass-embedded.patch diff --git a/package.json b/package.json -index b66e6ff..94aaa86 100644 +index 87e57b9..723e0b6 100644 --- a/package.json +++ b/package.json @@ -28,5 +28,10 @@ - "vite-plugin-pwa": "^0.21.0" + "vite-plugin-pwa": "^0.21.1" }, "license": "Apache-2.0", -- "packageManager": "pnpm@9.14.2+sha512.6e2baf77d06b9362294152c851c4f278ede37ab1eba3a55fda317a4a17b209f4dbb973fb250a77abc463a341fcb1f17f17cfa24091c4eb319cda0d9b84278387" -+ "packageManager": "pnpm@9.14.2+sha512.6e2baf77d06b9362294152c851c4f278ede37ab1eba3a55fda317a4a17b209f4dbb973fb250a77abc463a341fcb1f17f17cfa24091c4eb319cda0d9b84278387", +- "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0" ++ "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0", + "pnpm": { + "patchedDependencies": { + "sass-embedded": "patches/sass-embedded.patch" @@ -50,135 +50,95 @@ index 0000000..f941a8e + ? 'linux-musl' + : process.platform; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml -index ecc1e3c..a7164d0 100644 +index f347757..d054bea 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,6 +4,11 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false - + +patchedDependencies: + sass-embedded: + hash: 6wjvcsryx2tfkpottp4wf5nbzi + path: patches/sass-embedded.patch + importers: - + .: @@ -26,7 +31,7 @@ importers: devDependencies: '@vitejs/plugin-vue': - specifier: ^5.2.0 -- version: 5.2.0(vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0))(vue@3.5.13) -+ version: 5.2.0(vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(vue@3.5.13) + specifier: ^5.2.1 +- version: 5.2.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13) ++ version: 5.2.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13) '@vue/eslint-config-prettier': - specifier: ^10.0.0 - version: 10.0.0(eslint@9.15.0)(prettier@3.3.3) + specifier: ^10.2.0 + version: 10.2.0(eslint@9.19.0)(prettier@3.4.2) @@ -44,13 +49,13 @@ importers: - version: 3.3.3 + version: 3.4.2 sass-embedded: - specifier: ^1.81.0 -- version: 1.81.0 -+ version: 1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi) + specifier: ^1.83.4 +- version: 1.83.4 ++ version: 1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi) vite: - specifier: ^5.4.11 -- version: 5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0) -+ version: 5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0) + specifier: ^6.0.11 +- version: 6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) ++ version: 6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) vite-plugin-pwa: - specifier: ^0.21.0 -- version: 0.21.0(vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0) -+ version: 0.21.0(vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0) - + specifier: ^0.21.1 +- version: 0.21.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0) ++ version: 0.21.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0) + packages: - -@@ -2548,7 +2553,7 @@ snapshots: - '@babel/code-frame@7.25.7': - dependencies: - '@babel/highlight': 7.25.7 -- picocolors: 1.1.0 -+ picocolors: 1.1.1 - - '@babel/compat-data@7.25.8': {} - -@@ -2715,7 +2720,7 @@ snapshots: - '@babel/helper-validator-identifier': 7.25.7 - chalk: 2.4.2 - js-tokens: 4.0.0 -- picocolors: 1.1.0 -+ picocolors: 1.1.1 - - '@babel/parser@7.25.8': - dependencies: -@@ -3521,9 +3526,9 @@ snapshots: - + +@@ -3683,9 +3688,9 @@ snapshots: + '@types/trusted-types@2.0.7': {} - -- '@vitejs/plugin-vue@5.2.0(vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0))(vue@3.5.13)': -+ '@vitejs/plugin-vue@5.2.0(vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(vue@3.5.13)': + +- '@vitejs/plugin-vue@5.2.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13)': ++ '@vitejs/plugin-vue@5.2.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(vue@3.5.13)': dependencies: -- vite: 5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0) -+ vite: 5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0) +- vite: 6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) ++ vite: 6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.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.81.0: +@@ -4965,7 +4970,7 @@ snapshots: + sass-embedded-win32-x64@1.83.4: optional: true - -- sass-embedded@1.81.0: -+ sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi): + +- sass-embedded@1.83.4: ++ sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi): dependencies: '@bufbuild/protobuf': 2.2.0 buffer-builder: 0.2.0 -@@ -4879,7 +4884,7 @@ snapshots: - terser@5.35.0: - dependencies: - '@jridgewell/source-map': 0.3.6 -- acorn: 8.13.0 -+ acorn: 8.14.0 - commander: 2.20.3 - source-map-support: 0.5.21 - -@@ -4975,7 +4980,7 @@ snapshots: - dependencies: - browserslist: 4.24.0 - escalade: 3.2.0 -- picocolors: 1.1.0 -+ picocolors: 1.1.1 - - uri-js@4.4.1: - dependencies: -@@ -4987,18 +4992,18 @@ snapshots: - +@@ -5286,18 +5291,18 @@ snapshots: + varint@6.0.0: {} - -- vite-plugin-pwa@0.21.0(vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0): -+ vite-plugin-pwa@0.21.0(vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0))(workbox-build@7.1.0)(workbox-window@7.1.0): + +- vite-plugin-pwa@0.21.1(vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0): ++ vite-plugin-pwa@0.21.1(vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0))(workbox-build@7.1.0)(workbox-window@7.1.0): dependencies: debug: 4.3.7 pretty-bytes: 6.1.1 tinyglobby: 0.2.10 -- vite: 5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0) -+ vite: 5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0) +- vite: 6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) ++ vite: 6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0) workbox-build: 7.1.0 workbox-window: 7.1.0 transitivePeerDependencies: - supports-color - -- vite@5.4.11(sass-embedded@1.81.0)(sass@1.79.5)(terser@5.35.0): -+ vite@5.4.11(sass-embedded@1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.35.0): + +- vite@6.0.11(sass-embedded@1.83.4)(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0): ++ vite@6.0.11(sass-embedded@1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi))(sass@1.79.5)(terser@5.37.0)(yaml@2.7.0): dependencies: - esbuild: 0.21.5 - postcss: 8.4.47 -@@ -5006,7 +5011,7 @@ snapshots: + esbuild: 0.24.2 + postcss: 8.5.1 +@@ -5305,7 +5310,7 @@ snapshots: optionalDependencies: fsevents: 2.3.3 sass: 1.79.5 -- sass-embedded: 1.81.0 -+ sass-embedded: 1.81.0(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi) - terser: 5.35.0 - - vue-eslint-parser@9.4.3(eslint@9.15.0): --- -2.47.0 - +- sass-embedded: 1.83.4 ++ sass-embedded: 1.83.4(patch_hash=6wjvcsryx2tfkpottp4wf5nbzi) + terser: 5.37.0 + yaml: 2.7.0 diff --git a/pkgs/by-name/ho/homer/package.nix b/pkgs/by-name/ho/homer/package.nix index 7d104aa46ff0..eaad9c42bd8f 100644 --- a/pkgs/by-name/ho/homer/package.nix +++ b/pkgs/by-name/ho/homer/package.nix @@ -10,12 +10,12 @@ }: stdenvNoCC.mkDerivation rec { pname = "homer"; - version = "24.12.1"; + version = "25.02.1"; src = fetchFromGitHub { owner = "bastienwirtz"; repo = "homer"; rev = "v${version}"; - hash = "sha256-nOhovVqWlHPunwruJrgqFhhDxccKBp/iEyB3Y3C5Cz8="; + hash = "sha256-Fh6qV2eU7VRskbPun7OcJmqgjILVE8w5lV70xH6znmc="; }; pnpmDeps = pnpm_9.fetchDeps { @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { src patches ; - hash = "sha256-+FijxCiI5pr6kp+/99DJJOJSI9w6pbtfW25SUyEcWio="; + hash = "sha256-qeMmPI2B5FW82qLVtbREDjQh76THMCOZRQCM0DgvCqI="; }; # Enables specifying a custom Sass compiler binary path via `SASS_EMBEDDED_BIN_PATH` environment variable.