From 14ad4b203592ce987810989a78f9587f34ea0bcc Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Wed, 25 Sep 2024 23:57:36 +0900 Subject: [PATCH 1/2] redo: modernized derivation and formatted - Removed unnecessary `rec` - Formatted via nixfmt-rfc-style - Fixed expired link - Added mainProgram --- .../tools/build-managers/redo/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix index e6a68c4215c3..8e3e138501e9 100644 --- a/pkgs/development/tools/build-managers/redo/default.nix +++ b/pkgs/development/tools/build-managers/redo/default.nix @@ -1,8 +1,14 @@ -{lib, stdenv, fetchFromGitHub, perl }: +{ + lib, + stdenv, + fetchFromGitHub, + perl, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "redo"; version = "1.4"; + src = fetchFromGitHub { owner = "jdebp"; repo = "redo"; @@ -10,20 +16,24 @@ stdenv.mkDerivation rec { hash = "sha256-cA8UN4aQnJ8VyMW3mDOIPna4Ucw1kp8CirZTDhSoCpU="; }; - nativeBuildInputs = [ perl /* for pod2man */ ]; + nativeBuildInputs = [ + perl # for pod2man + ]; buildPhase = '' package/compile ''; + installPhase = '' package/export $out/ ''; meta = { - homepage = "https://jdebp.eu./Softwares/redo/"; + homepage = "https://github.com/jdebp/redo"; description = "System for building target files from source files"; license = lib.licenses.bsd2; - maintainers = [ ]; + maintainers = with lib.maintainers; [ momeemt ]; + mainProgram = "redo"; platforms = lib.platforms.unix; }; } From 31ec73e49bb0b9100da163246f497d9cd2409429 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Wed, 25 Sep 2024 23:58:55 +0900 Subject: [PATCH 2/2] redo: moved to by-name --- .../redo/default.nix => by-name/re/redo/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/build-managers/redo/default.nix => by-name/re/redo/package.nix} (100%) diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/by-name/re/redo/package.nix similarity index 100% rename from pkgs/development/tools/build-managers/redo/default.nix rename to pkgs/by-name/re/redo/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20802383bd4c..cd0763101b37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18460,8 +18460,6 @@ with pkgs; redisinsight = callPackage ../development/tools/redisinsight { }; - redo = callPackage ../development/tools/build-managers/redo { }; - redo-apenwarr = callPackage ../development/tools/build-managers/redo-apenwarr { }; redo-c = callPackage ../development/tools/build-managers/redo-c { };