From 996fbc60f9e97e3b019af6ed368891a8545721ba Mon Sep 17 00:00:00 2001 From: Zitrone Date: Sun, 16 Jun 2024 21:49:45 +0200 Subject: [PATCH 1/3] HentaiAtHome: rename to hentai-at-home --- .../default.nix => by-name/he/hentai-at-home/package.nix} | 2 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{applications/misc/HentaiAtHome/default.nix => by-name/he/hentai-at-home/package.nix} (98%) diff --git a/pkgs/applications/misc/HentaiAtHome/default.nix b/pkgs/by-name/he/hentai-at-home/package.nix similarity index 98% rename from pkgs/applications/misc/HentaiAtHome/default.nix rename to pkgs/by-name/he/hentai-at-home/package.nix index bca7697f758a..7d6693265481 100644 --- a/pkgs/applications/misc/HentaiAtHome/default.nix +++ b/pkgs/by-name/he/hentai-at-home/package.nix @@ -9,7 +9,7 @@ , }: stdenvNoCC.mkDerivation rec { - pname = "HentaiAtHome"; + pname = "hentai-at-home"; version = "1.6.3"; src = fetchzip { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d7cf6ef30692..a0258da02394 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -538,6 +538,7 @@ mapAliases ({ haxe_3_2 = throw "'haxe_3_2' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 haxe_3_4 = throw "'haxe_3_4' has been removed because it is old and no longer used by any packages in nixpkgs"; # Added 2023-03-15 + HentaiAtHome = hentai-at-home; # Added 2024-06-12 hepmc = throw "'hepmc' has been renamed to/replaced by 'hepmc2'"; # Converted to throw 2023-09-10 hikari = throw "hikari has been removed from nixpkgs, it was unmaintained and required wlroots_0_15 at the time of removal"; # Added 2024-03-28 hip = throw "'hip' has been removed in favor of 'rocmPackages.clr'"; # Added 2023-10-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d12ff3f330ba..7c0bfc3f7e4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39277,8 +39277,6 @@ with pkgs; velero = callPackage ../applications/networking/cluster/velero { }; - HentaiAtHome = callPackage ../applications/misc/HentaiAtHome { }; - hplip = callPackage ../misc/drivers/hplip { }; hplipWithPlugin = hplip.override { withPlugin = true; }; From a922c21a79acf9405e6219a12cad9040b8847f67 Mon Sep 17 00:00:00 2001 From: Zitrone Date: Sun, 16 Jun 2024 21:54:04 +0200 Subject: [PATCH 2/3] hentai-at-home: format with rfc formatter --- pkgs/by-name/he/hentai-at-home/package.nix | 31 ++++++++++++---------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/he/hentai-at-home/package.nix b/pkgs/by-name/he/hentai-at-home/package.nix index 7d6693265481..d5efd85b5172 100644 --- a/pkgs/by-name/he/hentai-at-home/package.nix +++ b/pkgs/by-name/he/hentai-at-home/package.nix @@ -1,12 +1,12 @@ -{ buildPackages -, fetchzip -, javaOpts ? "-XX:+UseZGC" -, jdk -, jre_headless -, lib -, makeWrapper -, stdenvNoCC -, +{ + buildPackages, + fetchzip, + javaOpts ? "-XX:+UseZGC", + jdk, + jre_headless, + lib, + makeWrapper, + stdenvNoCC, }: stdenvNoCC.mkDerivation rec { pname = "hentai-at-home"; @@ -18,11 +18,15 @@ stdenvNoCC.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ jdk makeWrapper ]; + nativeBuildInputs = [ + jdk + makeWrapper + ]; LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = lib.optionalString (stdenvNoCC.buildPlatform.libc == "glibc") - "${buildPackages.glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString ( + stdenvNoCC.buildPlatform.libc == "glibc" + ) "${buildPackages.glibcLocales}/lib/locale/locale-archive"; buildPhase = '' make all @@ -48,8 +52,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://ehwiki.org/wiki/Hentai@Home"; - description = - "Hentai@Home is an open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries"; + description = "Hentai@Home is an open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries"; license = licenses.gpl3; maintainers = with maintainers; [ terrorjack ]; mainProgram = "HentaiAtHome"; From 51803d6dbcbef6e2f9b32a3003544ec0dfb6955c Mon Sep 17 00:00:00 2001 From: Zitrone Date: Sun, 16 Jun 2024 21:51:47 +0200 Subject: [PATCH 3/3] hentai-at-home: add meta.platforms, fix meta.description & refactor --- pkgs/by-name/he/hentai-at-home/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/he/hentai-at-home/package.nix b/pkgs/by-name/he/hentai-at-home/package.nix index d5efd85b5172..29809e10ab64 100644 --- a/pkgs/by-name/he/hentai-at-home/package.nix +++ b/pkgs/by-name/he/hentai-at-home/package.nix @@ -1,19 +1,19 @@ { - buildPackages, - fetchzip, - javaOpts ? "-XX:+UseZGC", - jdk, - jre_headless, lib, - makeWrapper, stdenvNoCC, + fetchzip, + jdk, + makeWrapper, + buildPackages, + jre_headless, + javaOpts ? "-XX:+UseZGC", }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "hentai-at-home"; version = "1.6.3"; src = fetchzip { - url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}_src.zip"; + url = "https://repo.e-hentai.org/hath/HentaiAtHome_${finalAttrs.version}_src.zip"; hash = "sha512-kBB5mn9MwpkZ0z+Fl5ABs4YWBkXkMRcADYSAPkeifyhbYQQPOnijXKYZCkzE4UB3uQ1j6Kj6WnpO/4jquYEiOQ=="; stripRoot = false; }; @@ -52,9 +52,10 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://ehwiki.org/wiki/Hentai@Home"; - description = "Hentai@Home is an open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries"; + description = "Open-source P2P gallery distribution system which reduces the load on the E-Hentai Galleries"; license = licenses.gpl3; maintainers = with maintainers; [ terrorjack ]; mainProgram = "HentaiAtHome"; + platforms = jdk.meta.platforms; }; -} +})