From 46947f5db93850249a5c23661648dff7262a471d Mon Sep 17 00:00:00 2001 From: Tomo Date: Mon, 28 Oct 2024 07:11:37 +0000 Subject: [PATCH 1/3] exodus: format with nixfmt-rfc-style --- .../blockchains/exodus/default.nix | 62 +++++++++++-------- 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 5e13ece9a51e..a2a46d081f9e 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -1,28 +1,29 @@ -{ stdenv -, lib -, fetchurl -, unzip -, glib -, systemd -, nss -, nspr -, gtk3-x11 -, pango -, atk -, cairo -, gdk-pixbuf -, xorg -, xorg_sys_opengl -, util-linux -, alsa-lib -, dbus -, at-spi2-atk -, cups -, vivaldi-ffmpeg-codecs -, libpulseaudio -, at-spi2-core -, libxkbcommon -, mesa +{ + stdenv, + lib, + fetchurl, + unzip, + glib, + systemd, + nss, + nspr, + gtk3-x11, + pango, + atk, + cairo, + gdk-pixbuf, + xorg, + xorg_sys_opengl, + util-linux, + alsa-lib, + dbus, + at-spi2-atk, + cups, + vivaldi-ffmpeg-codecs, + libpulseaudio, + at-spi2-core, + libxkbcommon, + mesa, }: stdenv.mkDerivation (finalAttrs: { @@ -32,7 +33,10 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { name = "exodus-linux-x64-${finalAttrs.version}.zip"; url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip"; - curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; + curlOptsList = [ + "--user-agent" + "Mozilla/5.0" + ]; hash = "sha256-+g7DdDrSVmBl1wCSCoJcO2gmbWQBnJUYqjT+GuDlCYw="; }; @@ -102,6 +106,10 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; - maintainers = with maintainers; [ mmahut rople380 Crafter ]; + maintainers = with maintainers; [ + mmahut + rople380 + Crafter + ]; }; }) From f6a4aedd23d095c0f81389405b8ea7fa56720d20 Mon Sep 17 00:00:00 2001 From: Tomo Date: Mon, 28 Oct 2024 07:13:07 +0000 Subject: [PATCH 2/3] exodus: move to by-name --- .../exodus/default.nix => by-name/ex/exodus/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/blockchains/exodus/default.nix => by-name/ex/exodus/package.nix} (100%) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/by-name/ex/exodus/package.nix similarity index 100% rename from pkgs/applications/blockchains/exodus/default.nix rename to pkgs/by-name/ex/exodus/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8c91ae92e68..5b19c5243911 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33856,8 +33856,6 @@ with pkgs; erigon = callPackage ../applications/blockchains/erigon { }; - exodus = callPackage ../applications/blockchains/exodus { }; - faraday = callPackage ../applications/blockchains/faraday { }; fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { }; From c0738f3d8797c5c625b213ceb7c053d581d08c76 Mon Sep 17 00:00:00 2001 From: Tomo Date: Mon, 28 Oct 2024 07:19:04 +0000 Subject: [PATCH 3/3] exodus: use requireFile for src Upstream blocks automated downloads based on User-Agent: https://github.com/NixOS/nixpkgs/issues/313548#issuecomment-2131323093 Closes #313548 --- pkgs/by-name/ex/exodus/package.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ex/exodus/package.nix b/pkgs/by-name/ex/exodus/package.nix index a2a46d081f9e..b301e4e26cd8 100644 --- a/pkgs/by-name/ex/exodus/package.nix +++ b/pkgs/by-name/ex/exodus/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchurl, + requireFile, unzip, glib, systemd, @@ -30,13 +30,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "exodus"; version = "24.19.4"; - src = fetchurl { + src = requireFile { name = "exodus-linux-x64-${finalAttrs.version}.zip"; url = "https://downloads.exodus.com/releases/exodus-linux-x64-${finalAttrs.version}.zip"; - curlOptsList = [ - "--user-agent" - "Mozilla/5.0" - ]; hash = "sha256-+g7DdDrSVmBl1wCSCoJcO2gmbWQBnJUYqjT+GuDlCYw="; };