Distribution.Nixpkgs.Haskell.FromCabal: emit mainProgram

If a there is a single executable, it is obviously the mainProgram. We'll see a lot of example binaries this way, of course, but these being built is not exactly a new problem. Fixes: NixOS#541
sternenseemann · May 28, 2022 · 7008e8b · 7008e8b
1 parent 755b7dd
commit 7008e8b
Show file tree

Hide file tree

Showing 43 changed files with 51 additions and 0 deletions.
diff --git a/src/Distribution/Nixpkgs/Haskell/FromCabal.hs b/src/Distribution/Nixpkgs/Haskell/FromCabal.hs
@@ -135,6 +135,7 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
                      & Nix.platforms .~ Nothing
                      & Nix.badPlatforms .~ Nothing
                      & Nix.hydraPlatforms .~ (if isFreeLicense nixLicense then Nothing else Just Set.empty)
+                     & Nix.mainProgram .~ nixMainProgram
                      & Nix.maintainers .~ mempty
                      & Nix.broken .~ not (null missingDeps)
                      )
@@ -144,6 +145,14 @@ fromPackageDescription haskellResolver nixpkgsResolver missingDeps flags Package
     nixLicense :: Nix.License
     nixLicense =  either fromSPDXLicense fromCabalLicense licenseRaw
 
+    -- return the name of the executable if there is exactly one. If more,
+    -- it is hard to decide automatically which should be the default/main one.
+    nixMainProgram :: Maybe String
+    nixMainProgram =
+      case executables of
+        [mainProgram] -> Just $ unUnqualComponentName $ exeName mainProgram
+        _ -> Nothing
+
     resolveInHackage :: Identifier -> Binding
     resolveInHackage i | (i^.ident) `elem` [ unPackageName n | (Dependency n _ _) <- missingDeps ] = bindNull i
                        | otherwise = binding # (i, path # ["self",i])   -- TODO: "self" shouldn't be hardcoded.

diff --git a/test/golden-test-cases/HTF.nix.golden b/test/golden-test-cases/HTF.nix.golden
@@ -28,4 +28,5 @@ mkDerivation {
   homepage = "https://github.com/skogsbaer/HTF/";
   description = "The Haskell Test Framework";
   license = "LGPL";
+  mainProgram = "htfpp";
 }
diff --git a/test/golden-test-cases/ReadArgs.nix.golden b/test/golden-test-cases/ReadArgs.nix.golden
@@ -11,4 +11,5 @@ mkDerivation {
   homepage = "http://github.com/rampion/ReadArgs";
   description = "Simple command line argument parsing";
   license = lib.licenses.bsd3;
+  mainProgram = "ReadArgsEx";
 }
diff --git a/test/golden-test-cases/aeson-pretty.nix.golden b/test/golden-test-cases/aeson-pretty.nix.golden
@@ -17,4 +17,5 @@ mkDerivation {
   homepage = "http://github.com/informatikr/aeson-pretty";
   description = "JSON pretty-printing library and command-line tool";
   license = lib.licenses.bsd3;
+  mainProgram = "aeson-pretty";
 }
diff --git a/test/golden-test-cases/apply-refact.nix.golden b/test/golden-test-cases/apply-refact.nix.golden
@@ -26,4 +26,5 @@ mkDerivation {
   ];
   description = "Perform refactorings specified by the refact library";
   license = lib.licenses.bsd3;
+  mainProgram = "refactor";
 }
diff --git a/test/golden-test-cases/benchpress.nix.golden b/test/golden-test-cases/benchpress.nix.golden
@@ -10,4 +10,5 @@ mkDerivation {
   homepage = "https://github.com/WillSewell/benchpress";
   description = "Micro-benchmarking with detailed statistics";
   license = lib.licenses.bsd3;
+  mainProgram = "example";
 }
diff --git a/test/golden-test-cases/blosum.nix.golden b/test/golden-test-cases/blosum.nix.golden
@@ -17,4 +17,5 @@ mkDerivation {
   homepage = "http://github.com/GregorySchwartz/blosum#readme";
   description = "BLOSUM generator";
   license = lib.licenses.gpl2Only;
+  mainProgram = "blosum";
 }
diff --git a/test/golden-test-cases/brittany.nix.golden b/test/golden-test-cases/brittany.nix.golden
@@ -35,4 +35,5 @@ mkDerivation {
   homepage = "https://github.com/lspitzner/brittany/";
   description = "Haskell source code formatter";
   license = lib.licenses.agpl3Only;
+  mainProgram = "brittany";
 }
diff --git a/test/golden-test-cases/colorize-haskell.nix.golden b/test/golden-test-cases/colorize-haskell.nix.golden
@@ -10,4 +10,5 @@ mkDerivation {
   homepage = "http://github.com/yav/colorize-haskell";
   description = "Highligt Haskell source";
   license = lib.licenses.bsd3;
+  mainProgram = "hscolor";
 }
diff --git a/test/golden-test-cases/cpu.nix.golden b/test/golden-test-cases/cpu.nix.golden
@@ -10,4 +10,5 @@ mkDerivation {
   homepage = "http://github.com/vincenthz/hs-cpu";
   description = "Cpu information and properties helpers";
   license = lib.licenses.bsd3;
+  mainProgram = "cpuid";
 }
diff --git a/test/golden-test-cases/criterion.nix.golden b/test/golden-test-cases/criterion.nix.golden
@@ -28,4 +28,5 @@ mkDerivation {
   homepage = "http://www.serpentine.com/criterion";
   description = "Robust, reliable performance measurement and analysis";
   license = lib.licenses.bsd3;
+  mainProgram = "criterion-report";
 }
diff --git a/test/golden-test-cases/data-msgpack.nix.golden b/test/golden-test-cases/data-msgpack.nix.golden
@@ -23,4 +23,5 @@ mkDerivation {
   homepage = "http://msgpack.org/";
   description = "A Haskell implementation of MessagePack";
   license = lib.licenses.bsd3;
+  mainProgram = "msgpack-parser";
 }
diff --git a/test/golden-test-cases/dhall-bash.nix.golden b/test/golden-test-cases/dhall-bash.nix.golden
@@ -17,4 +17,5 @@ mkDerivation {
   ];
   description = "Compile Dhall to Bash";
   license = lib.licenses.bsd3;
+  mainProgram = "dhall-to-bash";
 }
diff --git a/test/golden-test-cases/dotenv.nix.golden b/test/golden-test-cases/dotenv.nix.golden
@@ -24,4 +24,5 @@ mkDerivation {
   homepage = "https://github.com/stackbuilders/dotenv-hs";
   description = "Loads environment variables from dotenv files";
   license = lib.licenses.mit;
+  mainProgram = "dotenv";
 }
diff --git a/test/golden-test-cases/file-modules.nix.golden b/test/golden-test-cases/file-modules.nix.golden
@@ -18,4 +18,5 @@ mkDerivation {
   homepage = "https://github.com/yamadapc/stack-run-auto";
   description = "Takes a Haskell source-code file and outputs its modules";
   license = lib.licenses.mit;
+  mainProgram = "file-modules";
 }
diff --git a/test/golden-test-cases/ghcid.nix.golden b/test/golden-test-cases/ghcid.nix.golden
@@ -22,4 +22,5 @@ mkDerivation {
   homepage = "https://github.com/ndmitchell/ghcid#readme";
   description = "GHCi based bare bones IDE";
   license = lib.licenses.bsd3;
+  mainProgram = "ghcid";
 }
diff --git a/test/golden-test-cases/giphy-api.nix.golden b/test/golden-test-cases/giphy-api.nix.golden
@@ -21,4 +21,5 @@ mkDerivation {
   homepage = "http://github.com/passy/giphy-api#readme";
   description = "Giphy HTTP API wrapper and CLI search tool";
   license = lib.licenses.bsd3;
+  mainProgram = "giphy-search";
 }
diff --git a/test/golden-test-cases/hakyll.nix.golden b/test/golden-test-cases/hakyll.nix.golden
@@ -39,4 +39,5 @@ mkDerivation {
   homepage = "http://jaspervdj.be/hakyll";
   description = "A static website compiler library";
   license = lib.licenses.bsd3;
+  mainProgram = "hakyll-init";
 }
diff --git a/test/golden-test-cases/happy.nix.golden b/test/golden-test-cases/happy.nix.golden
@@ -13,4 +13,5 @@ mkDerivation {
   homepage = "https://www.haskell.org/happy/";
   description = "Happy is a parser generator for Haskell";
   license = lib.licenses.bsd2;
+  mainProgram = "happy";
 }
diff --git a/test/golden-test-cases/haskell-tools-debug.nix.golden b/test/golden-test-cases/haskell-tools-debug.nix.golden
@@ -19,4 +19,5 @@ mkDerivation {
   homepage = "https://github.com/haskell-tools/haskell-tools";
   description = "Debugging Tools for Haskell-tools";
   license = lib.licenses.bsd3;
+  mainProgram = "ht-debug";
 }
diff --git a/test/golden-test-cases/highlighting-kate.nix.golden b/test/golden-test-cases/highlighting-kate.nix.golden
@@ -19,4 +19,5 @@ mkDerivation {
   homepage = "http://github.com/jgm/highlighting-kate";
   description = "Syntax highlighting";
   license = "GPL";
+  mainProgram = "highlighting-kate";
 }
diff --git a/test/golden-test-cases/hit.nix.golden b/test/golden-test-cases/hit.nix.golden
@@ -21,4 +21,5 @@ mkDerivation {
   homepage = "http://github.com/vincenthz/hit";
   description = "Git operations in haskell";
   license = lib.licenses.bsd3;
+  mainProgram = "Hit";
 }
diff --git a/test/golden-test-cases/hoogle.nix.golden b/test/golden-test-cases/hoogle.nix.golden
@@ -27,4 +27,5 @@ mkDerivation {
   homepage = "http://hoogle.haskell.org/";
   description = "Haskell API Search";
   license = lib.licenses.bsd3;
+  mainProgram = "hoogle";
 }
diff --git a/test/golden-test-cases/hsinstall.nix.golden b/test/golden-test-cases/hsinstall.nix.golden
@@ -10,4 +10,5 @@ mkDerivation {
   executableHaskellDepends = [ base directory filepath ];
   description = "Install Haskell software";
   license = lib.licenses.isc;
+  mainProgram = "an-app";
 }
diff --git a/test/golden-test-cases/hsyslog.nix.golden b/test/golden-test-cases/hsyslog.nix.golden
@@ -11,4 +11,5 @@ mkDerivation {
   homepage = "http://github.com/peti/hsyslog";
   description = "FFI interface to syslog(3) from POSIX.1-2001";
   license = lib.licenses.bsd3;
+  mainProgram = "hsyslog-example";
 }
diff --git a/test/golden-test-cases/intero.nix.golden b/test/golden-test-cases/intero.nix.golden
@@ -21,4 +21,5 @@ mkDerivation {
   homepage = "https://github.com/commercialhaskell/intero";
   description = "Complete interactive development program for Haskell";
   license = lib.licenses.bsd3;
+  mainProgram = "intero";
 }
diff --git a/test/golden-test-cases/jose.nix.golden b/test/golden-test-cases/jose.nix.golden
@@ -28,4 +28,5 @@ mkDerivation {
   homepage = "https://github.com/frasertweedale/hs-jose";
   description = "Javascript Object Signing and Encryption and JSON Web Token library";
   license = lib.licenses.asl20;
+  mainProgram = "example";
 }
diff --git a/test/golden-test-cases/katydid.nix.golden b/test/golden-test-cases/katydid.nix.golden
@@ -18,4 +18,5 @@ mkDerivation {
   homepage = "https://github.com/katydid/katydid-haskell";
   description = "A haskell implementation of Katydid";
   license = lib.licenses.bsd3;
+  mainProgram = "katydid-exe";
 }
diff --git a/test/golden-test-cases/lazy-csv.nix.golden b/test/golden-test-cases/lazy-csv.nix.golden
@@ -10,4 +10,5 @@ mkDerivation {
   homepage = "http://code.haskell.org/lazy-csv";
   description = "Efficient lazy parsers for CSV (comma-separated values)";
   license = lib.licenses.bsd3;
+  mainProgram = "csvSelect";
 }
diff --git a/test/golden-test-cases/mole.nix.golden b/test/golden-test-cases/mole.nix.golden
@@ -23,4 +23,5 @@ mkDerivation {
   ];
   description = "A glorified string replacement tool";
   license = lib.licenses.mit;
+  mainProgram = "mole";
 }
diff --git a/test/golden-test-cases/nvim-hs.nix.golden b/test/golden-test-cases/nvim-hs.nix.golden
@@ -36,4 +36,5 @@ mkDerivation {
   homepage = "https://github.com/neovimhaskell/nvim-hs";
   description = "Haskell plugin backend for neovim";
   license = lib.licenses.asl20;
+  mainProgram = "nvim-hs";
 }
diff --git a/test/golden-test-cases/pager.nix.golden b/test/golden-test-cases/pager.nix.golden
@@ -16,4 +16,5 @@ mkDerivation {
   homepage = "https://github.com/pharpend/pager";
   description = "Open up a pager, like 'less' or 'more'";
   license = lib.licenses.bsd2;
+  mainProgram = "hs-pager-test-pager";
 }
diff --git a/test/golden-test-cases/pathtype.nix.golden b/test/golden-test-cases/pathtype.nix.golden
@@ -15,4 +15,5 @@ mkDerivation {
   homepage = "http://hub.darcs.net/thielema/pathtype/";
   description = "Type-safe replacement for System.FilePath etc";
   license = lib.licenses.bsd3;
+  mainProgram = "create-pathtype-test";
 }
diff --git a/test/golden-test-cases/persistent-mysql-haskell.nix.golden b/test/golden-test-cases/persistent-mysql-haskell.nix.golden
@@ -20,4 +20,5 @@ mkDerivation {
   homepage = "http://www.yesodweb.com/book/persistent";
   description = "A pure haskell backend for the persistent library using MySQL database server";
   license = lib.licenses.mit;
+  mainProgram = "persistent-mysql-haskell-example";
 }
diff --git a/test/golden-test-cases/profiterole.nix.golden b/test/golden-test-cases/profiterole.nix.golden
@@ -14,4 +14,5 @@ mkDerivation {
   homepage = "https://github.com/ndmitchell/profiterole#readme";
   description = "Restructure GHC profile reports";
   license = lib.licenses.bsd3;
+  mainProgram = "profiterole";
 }
diff --git a/test/golden-test-cases/rasterific-svg.nix.golden b/test/golden-test-cases/rasterific-svg.nix.golden
@@ -20,4 +20,5 @@ mkDerivation {
   ];
   description = "SVG renderer based on Rasterific";
   license = lib.licenses.bsd3;
+  mainProgram = "svgrender";
 }
diff --git a/test/golden-test-cases/soxlib.nix.golden b/test/golden-test-cases/soxlib.nix.golden
@@ -16,4 +16,5 @@ mkDerivation {
   homepage = "http://www.haskell.org/haskellwiki/Sox";
   description = "Write, read, convert audio signals using libsox";
   license = lib.licenses.bsd3;
+  mainProgram = "soxlib-demo";
 }
diff --git a/test/golden-test-cases/taggy.nix.golden b/test/golden-test-cases/taggy.nix.golden
@@ -24,4 +24,5 @@ mkDerivation {
   homepage = "http://github.com/alpmestan/taggy";
   description = "Efficient and simple HTML/XML parsing library";
   license = lib.licenses.bsd3;
+  mainProgram = "taggy";
 }
diff --git a/test/golden-test-cases/terminal-progress-bar.nix.golden b/test/golden-test-cases/terminal-progress-bar.nix.golden
@@ -14,4 +14,5 @@ mkDerivation {
   homepage = "https://github.com/roelvandijk/terminal-progress-bar";
   description = "A simple progress bar in the terminal";
   license = lib.licenses.bsd3;
+  mainProgram = "example";
 }
diff --git a/test/golden-test-cases/texmath.nix.golden b/test/golden-test-cases/texmath.nix.golden
@@ -18,4 +18,5 @@ mkDerivation {
   homepage = "http://github.com/jgm/texmath";
   description = "Conversion between formats used to represent mathematics";
   license = "GPL";
+  mainProgram = "texmath";
 }
diff --git a/test/golden-test-cases/turtle-options.nix.golden b/test/golden-test-cases/turtle-options.nix.golden
@@ -13,4 +13,5 @@ mkDerivation {
   homepage = "https://github.com/elaye/turtle-options#readme";
   description = "Collection of command line options and parsers for these options";
   license = lib.licenses.bsd3;
+  mainProgram = "example";
 }
diff --git a/test/golden-test-cases/unlit.nix.golden b/test/golden-test-cases/unlit.nix.golden
@@ -9,4 +9,5 @@ mkDerivation {
   executableHaskellDepends = [ base directory text ];
   description = "Tool to convert literate code between styles or to code";
   license = lib.licenses.bsd3;
+  mainProgram = "unlit";
 }
diff --git a/test/golden-test-cases/wai-middleware-auth.nix.golden b/test/golden-test-cases/wai-middleware-auth.nix.golden
@@ -25,4 +25,5 @@ mkDerivation {
   ];
   description = "Authentication middleware that secures WAI application";
   license = lib.licenses.mit;
+  mainProgram = "wai-auth";
 }