From 584e028d6fb8632c01cf5b52301f2cbd30f0919d Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Sat, 31 Aug 2024 21:39:05 +0200 Subject: [PATCH 1/2] iotools: Move package definition into by-name directory Signed-off-by: Felix Singer --- .../misc/iotools/default.nix => by-name/io/iotools/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/iotools/default.nix => by-name/io/iotools/package.nix} (100%) diff --git a/pkgs/tools/misc/iotools/default.nix b/pkgs/by-name/io/iotools/package.nix similarity index 100% rename from pkgs/tools/misc/iotools/default.nix rename to pkgs/by-name/io/iotools/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b005d902b0968..3f7e819ad936e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5414,8 +5414,6 @@ with pkgs; iotas = callPackage ../applications/office/iotas { }; - iotools = callPackage ../tools/misc/iotools { }; - jellycli = callPackage ../applications/audio/jellycli { }; jellyfin-ffmpeg = callPackage ../development/libraries/jellyfin-ffmpeg { }; From 55f70de250b7d163147deba4f038ca5a535d82ca Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 6 Sep 2024 22:18:55 +0200 Subject: [PATCH 2/2] iotools: Format package.nix Signed-off-by: Felix Singer --- pkgs/by-name/io/iotools/package.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/io/iotools/package.nix b/pkgs/by-name/io/iotools/package.nix index 17330d9c19cb7..182b8f9779131 100644 --- a/pkgs/by-name/io/iotools/package.nix +++ b/pkgs/by-name/io/iotools/package.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, fetchFromGitHub }: +{ + stdenv, + lib, + fetchFromGitHub, +}: stdenv.mkDerivation rec { pname = "iotools"; @@ -11,7 +15,10 @@ stdenv.mkDerivation rec { sha256 = "0vymnah44d5bzsjhfmxkcrlrikkp0db22k7a1s8bknz7glk9fldn"; }; - makeFlags = [ "DEBUG=0" "STATIC=0" ]; + makeFlags = [ + "DEBUG=0" + "STATIC=0" + ]; installPhase = '' install -Dm755 iotools -t $out/bin @@ -30,7 +37,10 @@ stdenv.mkDerivation rec { homepage = "https://github.com/adurbin/iotools"; license = licenses.gpl2Only; maintainers = with maintainers; [ felixsinger ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ + "x86_64-linux" + "i686-linux" + ]; mainProgram = "iotools"; }; }