From 3ff8082ba9845184c09bd5929569e46c40c75483 Mon Sep 17 00:00:00 2001 From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com> Date: Fri, 6 Jun 2025 16:12:31 +0200 Subject: [PATCH] kopia-ui: 0.20.0 -> 0.20.1 Changelogs: - https://github.com/kopia/kopia/releases/tag/v0.20.1 --- pkgs/by-name/ko/kopia-ui/fix-paths.patch | 75 +++++++++++++++--------- pkgs/by-name/ko/kopia-ui/package.nix | 6 +- 2 files changed, 51 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/ko/kopia-ui/fix-paths.patch b/pkgs/by-name/ko/kopia-ui/fix-paths.patch index 22744100099e..8086285f0df4 100644 --- a/pkgs/by-name/ko/kopia-ui/fix-paths.patch +++ b/pkgs/by-name/ko/kopia-ui/fix-paths.patch @@ -1,42 +1,63 @@ diff --git a/public/utils.js b/public/utils.js -index 3cd38b63..54152694 100644 +index c5963e41..30f72965 100644 --- a/public/utils.js +++ b/public/utils.js -@@ -17,7 +17,7 @@ const osShortName = function () { +@@ -17,7 +17,7 @@ const osShortName = (function () { export function iconsPath() { - if (!app.isPackaged) { -- return path.join(__dirname, "..", "resources", osShortName, "icons"); -+ return path.join(__dirname, "..", "..", "icons"); - } + if (!app.isPackaged) { +- return path.join(__dirname, "..", "resources", osShortName, "icons"); ++ return path.join(__dirname, "..", "..", "icons"); + } - return path.join(process.resourcesPath, "icons"); -@@ -25,26 +25,14 @@ export function iconsPath() { + return path.join(process.resourcesPath, "icons"); +@@ -25,47 +25,14 @@ export function iconsPath() { export function publicPath() { - if (!app.isPackaged) { -- return path.join(__dirname, "..", "public"); -+ return path.join(__dirname, "..", "..", "public"); - } + if (!app.isPackaged) { +- return path.join(__dirname, "..", "public"); ++ return path.join(__dirname, "..", "..", "public"); + } - return process.resourcesPath; + return process.resourcesPath; } export function defaultServerBinary() { -- if (!app.isPackaged) { -- return { -- "mac": path.join(__dirname, "..", "..", "dist", "kopia_darwin_amd64", "kopia"), -- "win": path.join(__dirname, "..", "..", "dist", "kopia_windows_amd64", "kopia.exe"), -- "linux": path.join(__dirname, "..", "..", "dist", "kopia_linux_amd64", "kopia"), -- }[osShortName] -- } -- +- if (!app.isPackaged) { - return { -- "mac": path.join(process.resourcesPath, "server", "kopia"), -- "win": path.join(process.resourcesPath, "server", "kopia.exe"), -- "linux": path.join(process.resourcesPath, "server", "kopia"), -- }[osShortName] -+ return "KOPIA" +- mac: path.join( +- __dirname, +- "..", +- "..", +- "dist", +- "kopia_darwin_amd64", +- "kopia", +- ), +- win: path.join( +- __dirname, +- "..", +- "..", +- "dist", +- "kopia_windows_amd64", +- "kopia.exe", +- ), +- linux: path.join( +- __dirname, +- "..", +- "..", +- "dist", +- "kopia_linux_amd64", +- "kopia", +- ), +- }[osShortName]; +- } +- +- return { +- mac: path.join(process.resourcesPath, "server", "kopia"), +- win: path.join(process.resourcesPath, "server", "kopia.exe"), +- linux: path.join(process.resourcesPath, "server", "kopia"), +- }[osShortName]; ++ return "KOPIA"; } export function selectByOS(x) { - return x[osShortName] + return x[osShortName]; diff --git a/pkgs/by-name/ko/kopia-ui/package.nix b/pkgs/by-name/ko/kopia-ui/package.nix index 3becaeac4ecd..989146e16853 100644 --- a/pkgs/by-name/ko/kopia-ui/package.nix +++ b/pkgs/by-name/ko/kopia-ui/package.nix @@ -10,12 +10,12 @@ kopia, }: let - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "kopia"; repo = "kopia"; tag = "v${version}"; - hash = "sha256-AM9Mpy+9ZCvEtFtzYC87vqCNpLxO+yWVd4th9DDQ2QI="; + hash = "sha256-hKtrHv7MQjA/AQ/frjP2tPT6zqVPPGnBxYuhWtUgIl0="; }; in buildNpmPackage { @@ -24,7 +24,7 @@ buildNpmPackage { sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-FXPfZnqpuI6NgHk81HEJ7Hj8xCpXD0BKJgFeQ/Oce04="; + npmDepsHash = "sha256-5gXM5aLsUsJhxbt6IKY4Sg4SBI9ATe248K1TyZThg/0="; makeCacheWritable = true; nativeBuildInputs = [