From c51b9a630fdf8451dd1cb741b0a75a62ac2d0e24 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 18 Oct 2024 20:50:13 +0800 Subject: [PATCH 1/3] epic: run nixfmt --- .../networking/irc/epic5/default.nix | 33 +++++++++++++++---- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index c3a10cc39e9d..349ae8c0c834 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, openssl, ncurses, libiconv, tcl, coreutils, fetchpatch, libxcrypt }: +{ + lib, + stdenv, + fetchurl, + openssl, + ncurses, + libiconv, + tcl, + coreutils, + fetchpatch, + libxcrypt, +}: stdenv.mkDerivation rec { pname = "epic5"; @@ -10,8 +21,16 @@ stdenv.mkDerivation rec { }; # Darwin needs libiconv, tcl; while Linux build don't - buildInputs = [ openssl ncurses libxcrypt ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv tcl ]; + buildInputs = + [ + openssl + ncurses + libxcrypt + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + tcl + ]; patches = [ (fetchpatch { @@ -20,7 +39,10 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ "--disable-debug" "--with-ipv6" ]; + configureFlags = [ + "--disable-debug" + "--with-ipv6" + ]; postConfigure = '' substituteInPlace bsdinstall \ @@ -36,6 +58,3 @@ stdenv.mkDerivation rec { maintainers = [ ]; }; } - - - From 1b2eb552be105468da2ab4fb542034599bcc9bf3 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 18 Oct 2024 20:51:06 +0800 Subject: [PATCH 2/3] epic: move to by-name --- .../irc/epic5/default.nix => by-name/ep/epic5/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/irc/epic5/default.nix => by-name/ep/epic5/package.nix} (100%) diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/by-name/ep/epic5/package.nix similarity index 100% rename from pkgs/applications/networking/irc/epic5/default.nix rename to pkgs/by-name/ep/epic5/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 982de17fe824..c5a4fba39e3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28879,8 +28879,6 @@ with pkgs; ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; - epic5 = callPackage ../applications/networking/irc/epic5 { }; - epick = callPackage ../applications/graphics/epick { inherit (darwin.apple_sdk.frameworks) AppKit; }; From 23142ecd11ac992c176e09624694606343391932 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Fri, 18 Oct 2024 21:07:59 +0800 Subject: [PATCH 3/3] epic: 2.0.1 -> 3.0 --- pkgs/by-name/ep/epic5/package.nix | 43 ++++++++++++------------------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/pkgs/by-name/ep/epic5/package.nix b/pkgs/by-name/ep/epic5/package.nix index 349ae8c0c834..a73b64043b5c 100644 --- a/pkgs/by-name/ep/epic5/package.nix +++ b/pkgs/by-name/ep/epic5/package.nix @@ -1,60 +1,51 @@ { lib, stdenv, + ruby, fetchurl, openssl, ncurses, libiconv, tcl, - coreutils, - fetchpatch, libxcrypt, + perl, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "epic5"; - version = "2.0.1"; + version = "3.0"; src = fetchurl { - url = "http://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/${pname}-${version}.tar.xz"; - sha256 = "1ap73d5f4vccxjaaq249zh981z85106vvqmxfm4plvy76b40y9jm"; + url = "https://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-${finalAttrs.version}.tar.xz"; + hash = "sha256-ltRzUME6PZkBnaDmoEsMf4Datt26WQvMZ527iswXeaE="; }; - # Darwin needs libiconv, tcl; while Linux build don't buildInputs = [ openssl ncurses libxcrypt + ruby ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv tcl ]; - patches = [ - (fetchpatch { - url = "https://sources.debian.net/data/main/e/epic5/2.0.1-1/debian/patches/openssl-1.1.patch"; - sha256 = "03bpsyv1sr5icajs2qkdvv8nnn6rz6yvvj7pgiq8gz9sbp6siyfv"; - }) - ]; - configureFlags = [ - "--disable-debug" "--with-ipv6" ]; - postConfigure = '' - substituteInPlace bsdinstall \ - --replace /bin/cp ${coreutils}/bin/cp \ - --replace /bin/rm ${coreutils}/bin/rm \ - --replace /bin/chmod ${coreutils}/bin/chmod \ - ''; + nativeBuildInputs = [ + perl + ]; - meta = with lib; { - homepage = "http://epicsol.org"; + meta = { + homepage = "https://epicsol.org"; description = "IRC client that offers a great ircII interface"; - license = licenses.bsd3; - maintainers = [ ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.unix; + mainProgram = "epic5"; }; -} +})