diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2023-05-15 11:10:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-15 11:10:25 +0200 |
commit | aa23ec90588c4e6d66fe4b5df482888333a3ca8d (patch) | |
tree | 3cef6693129817ea61619010977f55f4f186b799 | |
parent | 5d66db2b0f7175822b64c0a43e499260aae6a0c4 (diff) | |
parent | 16ad0ec345e1f54f64d3b05d568c3746b701edb8 (diff) | |
download | nixlib-aa23ec90588c4e6d66fe4b5df482888333a3ca8d.tar nixlib-aa23ec90588c4e6d66fe4b5df482888333a3ca8d.tar.gz nixlib-aa23ec90588c4e6d66fe4b5df482888333a3ca8d.tar.bz2 nixlib-aa23ec90588c4e6d66fe4b5df482888333a3ca8d.tar.lz nixlib-aa23ec90588c4e6d66fe4b5df482888333a3ca8d.tar.xz nixlib-aa23ec90588c4e6d66fe4b5df482888333a3ca8d.tar.zst nixlib-aa23ec90588c4e6d66fe4b5df482888333a3ca8d.zip |
Merge pull request #231557 from andersk/electron-fiddle
-rw-r--r-- | pkgs/development/tools/electron-fiddle/default.nix | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/pkgs/development/tools/electron-fiddle/default.nix b/pkgs/development/tools/electron-fiddle/default.nix index 102c3cbaf31a..eb4874750fae 100644 --- a/pkgs/development/tools/electron-fiddle/default.nix +++ b/pkgs/development/tools/electron-fiddle/default.nix @@ -1,12 +1,13 @@ { buildFHSEnv -, electron_22 +, electron_24 , fetchFromGitHub , fetchYarnDeps +, fetchurl , fixup_yarn_lock , git , lib , makeDesktopItem -, nodejs_16 +, nodejs_18 , stdenvNoCC , util-linux , zip @@ -14,21 +15,29 @@ let pname = "electron-fiddle"; - version = "0.32.1"; - electron = electron_22; - nodejs = nodejs_16; + version = "0.32.6"; + electron = electron_24; + nodejs = nodejs_18; src = fetchFromGitHub { owner = "electron"; repo = "fiddle"; rev = "v${version}"; - hash = "sha256-k+cbg03mwvobyazIUqm+TO9OMYVFQICy4CtkUZmvkr8="; + hash = "sha256-Iuss2xwts1aWy2rKYG7J2EvFdH8Bbedn/uZG2bi9UHw="; + }; + + # As of https://github.com/electron/fiddle/pull/1316 this is fetched + # from the network and has no stable hash. Grab an old version from + # the repository. + releasesJson = fetchurl { + url = "https://raw.githubusercontent.com/electron/fiddle/v0.32.4~18/static/releases.json"; + hash = "sha256-1sxd3eJ6/WjXS6XQbrgKUTNUmrhuc1dAvy+VAivGErg="; }; inherit (nodejs.pkgs) yarn; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-3vM+YPIA3zeWBaEFXU5lFl+VaGmAY0Qdg4pSA6mIKl0="; + hash = "sha256-dwhwUWwv6RYKEMdhRBvKVXvM8n1r+Qo0D3/uFsWIOpw="; }; electronDummyMirror = "https://electron.invalid/"; @@ -55,6 +64,8 @@ let cp -ra '${electron}/lib/electron' "$TMPDIR/electron" chmod -R u+w "$TMPDIR/electron" (cd "$TMPDIR/electron" && zip -0Xr ~/.cache/electron/${electronDummyHash}/${electronDummyFilename} .) + + ln -s ${releasesJson} static/releases.json ''; buildPhase = '' |