From 4bcfdfd271587d2ada5e17fe967035bda1254085 Mon Sep 17 00:00:00 2001 From: isabel Date: Thu, 18 Jul 2024 23:58:45 +0100 Subject: [PATCH 1/3] mangal: move to by-name --- .../misc/mangal/default.nix => by-name/ma/mangal/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/mangal/default.nix => by-name/ma/mangal/package.nix} (100%) diff --git a/pkgs/applications/misc/mangal/default.nix b/pkgs/by-name/ma/mangal/package.nix similarity index 100% rename from pkgs/applications/misc/mangal/default.nix rename to pkgs/by-name/ma/mangal/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b2018bdc1ec2..77bbede50cef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1001,8 +1001,6 @@ with pkgs; graph-easy = callPackage ../tools/graphics/graph-easy { }; - mangal = callPackage ../applications/misc/mangal { }; - mermaid-filter = callPackage ../tools/misc/mermaid-filter { }; graphw00f = callPackage ../tools/security/graphw00f { }; From 3bb5e993cac3a6e1c3056d2bc9bf43eb2c7a5951 Mon Sep 17 00:00:00 2001 From: isabel Date: Thu, 18 Jul 2024 23:59:19 +0100 Subject: [PATCH 2/3] mangal: format with nixfmt-rfc-style --- pkgs/by-name/ma/mangal/package.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ma/mangal/package.nix b/pkgs/by-name/ma/mangal/package.nix index cc485d84e8e0..65e26ee20556 100644 --- a/pkgs/by-name/ma/mangal/package.nix +++ b/pkgs/by-name/ma/mangal/package.nix @@ -1,5 +1,10 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: - +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: buildGoModule rec { pname = "mangal"; version = "4.0.6"; @@ -14,7 +19,10 @@ buildGoModule rec { proxyVendor = true; vendorHash = null; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" + "-w" + ]; nativeBuildInputs = [ installShellFiles ]; @@ -30,8 +38,7 @@ buildGoModule rec { doCheck = false; # test fail because of sandbox meta = with lib; { - description = - "A fancy CLI app written in Go which scrapes, downloads and packs manga into different formats"; + description = "CLI app written in Go which scrapes, downloads and packs manga into different formats"; homepage = "https://github.com/metafates/mangal"; license = licenses.mit; maintainers = [ maintainers.bertof ]; From 498701505d7ac872c4e56cb4857d0a0860565a2c Mon Sep 17 00:00:00 2001 From: isabel Date: Fri, 19 Jul 2024 20:39:27 +0100 Subject: [PATCH 3/3] mangal: fix build --- .git-blame-ignore-revs | 3 +++ pkgs/by-name/ma/mangal/package.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 012889bb2e82..0c5869db6b61 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -141,3 +141,6 @@ acd0e3898feb321cb9a71a0fd376f1157d0f4553 # poptracker: format with nixfmt-rfc-style (#326697) ff5c8f6cc3d1f2e017e86d50965c14b71f00567b + +# mangal: format with nixfmt-rfc-style #328284 +3bb5e993cac3a6e1c3056d2bc9bf43eb2c7a5951 diff --git a/pkgs/by-name/ma/mangal/package.nix b/pkgs/by-name/ma/mangal/package.nix index 65e26ee20556..c1d7c1540508 100644 --- a/pkgs/by-name/ma/mangal/package.nix +++ b/pkgs/by-name/ma/mangal/package.nix @@ -28,7 +28,7 @@ buildGoModule rec { postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # Mangal creates a config file in the folder ~/.config/mangal and fails if not possible - export MANGAL_CONFIG_PATH=`mktemp -d` + export HOME=$(mktemp -d) installShellCompletion --cmd mangal \ --bash <($out/bin/mangal completion bash) \ --zsh <($out/bin/mangal completion zsh) \