Put codd in pkgs/by-name

NixOS · Nov 10, 2024 · b81969f · b81969f
1 parent f7af0ba
commit b81969f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/...velopment/tools/database/codd/default.nix → pkgs/by-name/co/codd/generated.nix b/...velopment/tools/database/codd/default.nix → pkgs/by-name/co/codd/generated.nix
@@ -1,3 +1,6 @@
+# This was generated with cabal2nix but contains important modifications like jailbreaking haxl
+# and disabling tests selectively, among a few other minor things.
+# Don't just blindly replace it with something generated by cabal2nix.
 {
   lib,
   haskell,
@@ -10,8 +13,8 @@ let
 
   # Haxl has relatively tight version requirements and is thus marked as broken.
   haxlJailbroken = haskell.lib.markUnbroken (haskell.lib.doJailbreak haskellPackages.haxl);
-in
 
+in
 mkDerivation rec {
   pname = "codd";
 

diff --git a/pkgs/by-name/co/codd/package.nix b/pkgs/by-name/co/codd/package.nix
@@ -0,0 +1,6 @@
+{ haskell, haskellPackages }:
+
+let
+  generated = haskellPackages.callPackage ./generated.nix { };
+in
+haskell.lib.compose.justStaticExecutables generated
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -6130,8 +6130,6 @@ with pkgs;
   clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv;
   libcxxStdenv = if stdenv.hostPlatform.isDarwin then stdenv else lowPrio llvmPackages.libcxxStdenv;
 
-  codd = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../development/tools/database/codd { });
-
   comby = callPackage ../development/tools/comby {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };