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.

Sign up for GitHub

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

Jump to bottom

update etcher version - will update to electron v25 #274476

Closed
wants to merge 6 commits into from
Closed

update etcher version - will update to electron v25 #274476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2290db4
update etcher version - will update to electron v25
Dec 15, 2023
786d275
use electron_25 - failing - error: function 'anonymous lambda' called…
Dec 15, 2023
1b6e134
Still Failing - temp update to remove electron = electron_25
Dec 15, 2023
29d7044
update etcher electron version in all-packages.nix
Dec 15, 2023
98e8f36
remove version from all-packages.nix, to reference explicitly in etcher
Dec 15, 2023
3b7b9aa
undo formatting changes
Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/tools/misc/etcher/default.nix
View file
Open in desktop
Expand Up @@ -7,16 +7,16 @@
, dpkg
, makeWrapper
, udev
, electron
, electron_25
}:

stdenv.mkDerivation rec {
pname = "etcher";
version = "1.18.12";
version = "1.18.13"; # 1.18.13 uses electron 25

src = fetchurl {
url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher_${version}_amd64.deb";
hash = "sha256-Ucs187xTpbRJ7P32hCl8cHPxO3HCs44ZneAas043FXk=";
hash = "sha512-84RlIwhcWLSE84JFvfUVINPdL3uVrfnySMmXGGeFe6P0/wRaFD5GNyPyLNV3PvUL7srzl9bHeFwaQBcP+uZwng==";
};

# sudo-prompt has hardcoded binary paths on Linux and we patch them here
Expand Down Expand Up @@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
cp -a usr/share/* $out/share
cp -a opt/balenaEtcher/{locales,resources} $out/share/${pname}

makeWrapper ${electron}/bin/electron $out/bin/${pname} \
makeWrapper ${electron_25}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app

substituteInPlace $out/share/applications/balena-etcher.desktop \
Expand Down
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Expand Up @@ -8032,9 +8032,7 @@ with pkgs;

esshader = callPackage ../tools/graphics/esshader { };

etcher = callPackage ../tools/misc/etcher {
electron = electron_19;
};
etcher = callPackage ../tools/misc/etcher { };

ethercalc = callPackage ../servers/web-apps/ethercalc { };

Expand Down