Put codd in pkgs/by-name

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

Hide file tree

Showing 3 changed files with 15 additions and 19 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,18 +1,15 @@
-{
-  lib,
-  haskell,
-  mkDerivation,
-  fetchFromGitHub,
-  haskellPackages,
-}:
+# 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, mkDerivation, fetchFromGitHub, haskellPackages, }:
 
 let
 
   # Haxl has relatively tight version requirements and is thus marked as broken.
-  haxlJailbroken = haskell.lib.markUnbroken (haskell.lib.doJailbreak haskellPackages.haxl);
-in
+  haxlJailbroken =
+    haskell.lib.markUnbroken (haskell.lib.doJailbreak haskellPackages.haxl);
 
-mkDerivation rec {
+in mkDerivation rec {
   pname = "codd";
 
   version = "0.1.4";
@@ -89,14 +86,11 @@ mkDerivation rec {
   # We only run codd's tests that don't require postgresql nor strace. We need to support unix sockets in codd's test suite
   # before enabling postgresql's tests, and SystemResourcesSpecs might fail on macOS because of the need for strace and parsing
   # libc calls. Not that we really gain much from running SystemResourcesSpecs here anyway.
-  testFlags = [
-    "--skip"
-    "/DbDependentSpecs/"
-    "--skip"
-    "/SystemResourcesSpecs/"
-  ];
+  testFlags =
+    [ "--skip" "/DbDependentSpecs/" "--skip" "/SystemResourcesSpecs/" ];
 
-  description = "CLI tool that applies plain postgres SQL migrations atomically with strong and automatic cross-environment schema equality checks";
+  description =
+    "CLI tool that applies plain postgres SQL migrations atomically with strong and automatic cross-environment schema equality checks";
 
   mainProgram = "codd";
 

diff --git a/pkgs/by-name/co/codd/package.nix b/pkgs/by-name/co/codd/package.nix
@@ -0,0 +1,4 @@
+{ 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;
   };