From 25bbc404a1c3ef99435ced65f949d4731621ad26 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 4 Aug 2023 22:20:48 +0100 Subject: [PATCH] flood: fix mainProgram merge issue The package was repackaged using `buildNpmPackage` ([1]). In parallel its `meta.mainProgram` was defined for the old `node-packages.nix` packaging format ([2]). Both branches were merged almost at the same time, breaking the build. [1]: https://github.com/NixOS/nixpkgs/pull/245435 [2]: https://github.com/NixOS/nixpkgs/pull/247095 --- pkgs/applications/networking/p2p/flood/default.nix | 1 + pkgs/development/node-packages/main-programs.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/flood/default.nix b/pkgs/applications/networking/p2p/flood/default.nix index 3f577289502..8ee94f17e50 100644 --- a/pkgs/applications/networking/p2p/flood/default.nix +++ b/pkgs/applications/networking/p2p/flood/default.nix @@ -21,5 +21,6 @@ buildNpmPackage rec { homepage = "https://flood.js.org"; license = licenses.gpl3Only; maintainers = with maintainers; [ thiagokokada winter ]; + mainProgram = "flood"; }; } diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix index 2329de51149..494a69e8a3c 100644 --- a/pkgs/development/node-packages/main-programs.nix +++ b/pkgs/development/node-packages/main-programs.nix @@ -46,7 +46,6 @@ firebase-tools = "firebase"; fkill-cli = "fkill"; fleek-cli = "fleek"; - flood = "flood"; git-run = "gr"; gitmoji-cli = "gitmoji"; graphql-cli = "graphql";