buildNimPackage: doCheck by default

2023-06-14 12:11:20 +01:00 · 2023-06-14 12:11:20 +01:00 · 17984299b9
commit 17984299b9
parent 077d8a3447
30 changed files with 15 additions and 41 deletions
--- a/doc/languages-frameworks/nim.section.md
+++ b/doc/languages-frameworks/nim.section.md
@ -59,7 +59,6 @@ buildNimPackage (finalAttrs: {
    hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";
  };
  propagatedBuildInputs = [ SDL2 ];
-  doCheck = true;
 })
 ```

--- a/pkgs/development/nim-packages/asciigraph/default.nix
+++ b/pkgs/development/nim-packages/asciigraph/default.nix
@ -11,7 +11,6 @@ buildNimPackage rec {
    hash = "sha256-JMBAW8hkE2wuXkRt4aHqFPoz1HX1J4SslvcaQXfpDNk";
  };

-  doCheck = true;

  meta = with lib;
    src.meta // {
--- a/pkgs/development/nim-packages/base32/default.nix
+++ b/pkgs/development/nim-packages/base32/default.nix
@ -9,7 +9,6 @@ buildNimPackage rec {
    rev = version;
    hash = "sha256-BsDly13xsY2bu4N9LGHB0OGej/JhAx3B01TDdF0M8Jk=";
  };
-  doCheck = true;
  meta = src.meta // {
    description = "Base32 library for Nim";
    maintainers = with lib.maintainers; [ ehmry ];
--- a/pkgs/development/nim-packages/base45/default.nix
+++ b/pkgs/development/nim-packages/base45/default.nix
@ -9,7 +9,6 @@ buildNimPackage rec {
    rev = version;
    hash = "sha256-9he+14yYVGt2s1IuRLPRsv23xnJzERkWRvIHr3PxFYk=";
  };
-  doCheck = true;
  meta = src.meta // {
    description = "Base45 library for Nim";
    license = lib.licenses.unlicense;
--- a/pkgs/development/nim-packages/build-nim-package/default.nix
+++ b/pkgs/development/nim-packages/build-nim-package/default.nix
@ -5,6 +5,7 @@ let
  baseAttrs = {
    strictDeps = true;
    enableParallelBuilding = true;
+    doCheck = true;
    configurePhase = ''
      runHook preConfigure
      export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS
@ -30,7 +31,7 @@ let
  };

  inputsOverride =
-    { depsBuildBuild ? [ ], nativeBuildInputs ? [ ], meta, ... }: {
+    { depsBuildBuild ? [ ], nativeBuildInputs ? [ ], ... }: {
      depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
      nativeBuildInputs = [ nim ] ++ nativeBuildInputs;
    };
--- a/pkgs/development/nim-packages/bumpy/default.nix
+++ b/pkgs/development/nim-packages/bumpy/default.nix
@ -13,7 +13,6 @@ buildNimPackage rec {

  propagatedBuildInputs = [ vmath ];

-  doCheck = true;

  meta = with lib;
    src.meta // {
--- a/pkgs/development/nim-packages/cbor/default.nix
+++ b/pkgs/development/nim-packages/cbor/default.nix
@ -9,7 +9,6 @@ buildNimPackage rec {
    rev = version;
    hash = "sha256-VmSYWgXDJLB2D2m3/ymrEytT2iW5JE56WmDz2MPHAqQ=";
  };
-  doCheck = true;
  meta = with lib;
    src.meta // {
      description =
--- a/pkgs/development/nim-packages/flatty/default.nix
+++ b/pkgs/development/nim-packages/flatty/default.nix
@ -11,7 +11,6 @@ buildNimPackage rec {
    hash = "sha256-ZmhjehmEJHm5qNlsGQvyYLajUdwhWt1+AtRppRrNtgA=";
  };

-  doCheck = true;

  meta = with lib;
    src.meta // {
--- a/pkgs/development/nim-packages/freedesktop_org/default.nix
+++ b/pkgs/development/nim-packages/freedesktop_org/default.nix
@ -11,7 +11,6 @@ let
      rev = "695f1285d63f1954c25eb1f42798d90fa7bcbe14";
      hash = "sha256-Z2Qr14pv2RHzQNfEYIKuXKHfHvvIfaEiGCHHCWJZFyw=";
    };
-    doCheck = true;
  };
 in buildNimPackage rec {
  pname = "freedesktop_org";
@ -23,7 +22,6 @@ in buildNimPackage rec {
    hash = "sha256-gEN8kiWYCfC9H7o4UE8Xza5s7OwU3TFno6XnIlEm9Dg=";
  };
  propagatedBuildInputs = [ configparser ];
-  doCheck = true;
  meta = src.meta // {
    description = "Some Nim procedures for looking up freedesktop.org data";
    license = lib.licenses.unlicense;
--- a/pkgs/development/nim-packages/getdns/default.nix
+++ b/pkgs/development/nim-packages/getdns/default.nix
@ -13,7 +13,6 @@ buildNimPackage rec {
  propagatedNativeBuildInputs = [ pkg-config ];
  propagatedBuildInputs = [ getdns ];

-  doCheck = true;
  checkPhase = "nim c tests/test_example_synchronous";
    # The test requires network but check if it builds.

--- a/pkgs/development/nim-packages/hts-nim/default.nix
+++ b/pkgs/development/nim-packages/hts-nim/default.nix
@ -10,4 +10,5 @@ buildNimPackage rec {
    sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7";
  };
  propagatedBuildInputs = [ htslib ];
+  doCheck = false;
 }
--- a/pkgs/development/nim-packages/illwillwidgets/default.nix
+++ b/pkgs/development/nim-packages/illwillwidgets/default.nix
@ -1,4 +1,4 @@
-{ lib, buildNimPackage, fetchFromGitHub }:
+{ lib, buildNimPackage, fetchFromGitHub, illwill }:

 buildNimPackage rec {
  pname = "illwillwidgets";
@ -11,6 +11,9 @@ buildNimPackage rec {
    hash = "sha256-YVNdgs8jquJ58qbcyNMMJt+hJYcvahYpkSrDBbO4ILU=";
  };

+  propagatedBuildInputs = [ illwill ];
+  doCheck = false;
+
  meta = with lib;
    src.meta // {
      description = "Mouse enabled widgets for illwill";
--- a/pkgs/development/nim-packages/jsony/default.nix
+++ b/pkgs/development/nim-packages/jsony/default.nix
@ -11,7 +11,6 @@ buildNimPackage rec {
    sha256 = "1p250wb97nzz2g0vvq6mn521fx7sn1jpk1ralbzqh5q8clh4g7wr";
  };

-  doCheck = true;

  meta = with lib;
    src.meta // {
--- a/pkgs/development/nim-packages/nimSHA2/default.nix
+++ b/pkgs/development/nim-packages/nimSHA2/default.nix
@ -9,7 +9,6 @@ buildNimPackage rec {
    rev = "b8f666069dff1ed0c5142dd1ca692f0e71434716";
    hash = "sha256-Wqb3mQ7638UOTze71mf6WMyGiw9qTwhbJiGGb+9OR2k=";
  };
-  doCheck = true;
  meta = src.meta // {
    description = "Secure Hash Algorithm 2";
    maintainers = with lib.maintainers; [ ehmry ];
--- a/pkgs/development/nim-packages/nimraylib-now/default.nix
+++ b/pkgs/development/nim-packages/nimraylib-now/default.nix
@ -1,4 +1,4 @@
-{ lib, nimPackages, fetchFromGitHub }:
+{ lib, nimPackages, fetchFromGitHub, raylib }:

 nimPackages.buildNimPackage rec {
  pname = "nimraylib-now";
@ -11,6 +11,10 @@ nimPackages.buildNimPackage rec {
    sha256 = "sha256-18YiAzJ46dpD5JN+gH0MWKchZ5YLPBNcm9eVFnyy2Sw=";
  };

+  propagatedBuildInputs = [ raylib ];
+
+  doCheck = false; # no $DISPLAY available
+
  meta = with lib; {
    homepage = "https://github.com/greenfork/nimraylib_now";
    description = "The Ultimate Raylib gaming library wrapper for Nim";
--- a/pkgs/development/nim-packages/npeg/default.nix
+++ b/pkgs/development/nim-packages/npeg/default.nix
@ -9,7 +9,6 @@ buildNimPackage rec {
    rev = version;
    hash = "sha256-kN91cp50ZL4INeRWqwrRK6CAkVXUq4rN4YlcN6WL/3Y=";
  };
-  doCheck = true;
  meta = src.meta // {
    description = "NPeg is a pure Nim pattern matching library";
    maintainers = with lib.maintainers; [ ehmry ];
--- a/pkgs/development/nim-packages/parsetoml/default.nix
+++ b/pkgs/development/nim-packages/parsetoml/default.nix
@ -11,7 +11,6 @@ buildNimPackage rec {
    hash = "sha256-jtqn59x2ZRRgrPir6u/frsDHnl4kvTJWpbejxti8aHY=";
  };

-  doCheck = true;

  meta = with lib;
    src.meta // {
--- a/pkgs/development/nim-packages/pixie/default.nix
+++ b/pkgs/development/nim-packages/pixie/default.nix
@ -14,7 +14,6 @@ buildNimPackage rec {

  propagatedBuildInputs = [ bumpy chroma flatty nimsimd vmath zippy ];

-  doCheck = true;

  meta = with lib;
    src.meta // {
--- a/pkgs/development/nim-packages/safeset/default.nix
+++ b/pkgs/development/nim-packages/safeset/default.nix
@ -11,7 +11,6 @@ buildNimPackage rec {
    hash = "sha256-ZLdStoNVoQhRkD2iEzKxhs1UPfgnbJM9QCDHdjH7vTU=";
  };

-  doCheck = true;

  meta = with lib;
    src.meta // {
--- a/pkgs/development/nim-packages/sdl2/default.nix
+++ b/pkgs/development/nim-packages/sdl2/default.nix
@ -8,7 +8,6 @@ buildNimPackage (finalAttrs: {
    hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";
  };
  propagatedBuildInputs = [ SDL2 ];
-  doCheck = true;
  meta = {
    description = "Nim wrapper for SDL 2.x";
    platforms = lib.platforms.linux; # Problems with Darwin.
--- a/pkgs/development/nim-packages/snappy/config.patch
+++ b/pkgs/development/nim-packages/snappy/config.patch
@ -1,7 +0,0 @@
-diff --git a/tests/config.nims b/tests/config.nims
-index 46348f1..fbe9f5e 100644
--- a/tests/config.nims
-+++ b/tests/config.nims
-@@ -1 +1,2 @@
- switch("path", "..")
-+switch("passL", "-lsnappy")
--- a/pkgs/development/nim-packages/snappy/default.nix
+++ b/pkgs/development/nim-packages/snappy/default.nix
@ -10,11 +10,7 @@ buildNimPackage rec {
    hash = "sha256-18CFRuDK+E701MHrCixx22QSVmglTc0EJwrMCsKwayM=";
  };
  propagatedBuildInputs = [ snappy ];
-  patches = [ ./config.patch ];
-  preCheck = ''
-    mkdir $NIX_BUILD_TOP/nimcache/
-    mv -v tests/data $NIX_BUILD_TOP/nimcache/data
-  ''; # test standards, please
+  doCheck = false;
  meta = with lib;
    src.meta // {
      description = "Nim implementation of snappy compression algorithm";
--- a/pkgs/development/nim-packages/spry/default.nix
+++ b/pkgs/development/nim-packages/spry/default.nix
@ -12,7 +12,6 @@ buildNimPackage rec {
  };
  buildInputs = [ rocksdb snappy spryvm stew tempfile ui ];
  patches = [ ./nil.patch ./python.patch ];
-  doCheck = true;
  meta = with lib;
    src.meta // {
      description =
--- a/pkgs/development/nim-packages/spryvm/default.nix
+++ b/pkgs/development/nim-packages/spryvm/default.nix
@ -11,7 +11,6 @@ buildNimPackage rec {
  };
  propagatedBuildInputs = [ sqlite ];
  patches = [ ./nil.patch ];
-  doCheck = true;
  meta = with lib;
    src.meta // {
      description = "Spry virtual machine";
--- a/pkgs/development/nim-packages/syndicate/default.nix
+++ b/pkgs/development/nim-packages/syndicate/default.nix
@ -11,7 +11,6 @@ buildNimPackage rec {
    hash = "sha256-yTPbEsBcpEPXfmhykbWzWdnJ2ExEJxdii1L+mqx8VGQ=";
  };
  propagatedBuildInputs = [ nimSHA2 preserves ];
-  doCheck = true;
  meta = src.meta // {
    description = "Nim implementation of the Syndicated Actor model";
    license = lib.licenses.unlicense;
--- a/pkgs/development/nim-packages/tkrzw/default.nix
+++ b/pkgs/development/nim-packages/tkrzw/default.nix
@ -11,7 +11,6 @@ buildNimPackage rec {
  };
  propagatedNativeBuildInputs = [ pkg-config ];
  propagatedBuildInputs = [ tkrzw ];
-  doCheck = true;
  meta = with lib;
    src.meta // {
      description = "Nim wrappers over some of the Tkrzw C++ library";
--- a/pkgs/development/nim-packages/ui/default.nix
+++ b/pkgs/development/nim-packages/ui/default.nix
@ -14,7 +14,6 @@ buildNimPackage rec {
  postPatch = ''
    echo {.passL: r\"$(pkg-config --libs libui)\".} >> ui/rawui.nim
  '';
-  doCheck = true;
  meta = with lib;
    src.meta // {
      description = "Nim bindings to libui";
--- a/pkgs/development/nim-packages/x11/default.nix
+++ b/pkgs/development/nim-packages/x11/default.nix
@ -11,8 +11,6 @@ buildNimPackage rec {
    hash = "sha256-2XRyXiBxAc9Zx/w0zRBHRZ240qww0FJvIvOKZ8YH50A=";
  };

-  doCheck = true;
-
  meta = with lib;
    src.meta // {
      description = "X11 library for nim";
--- a/pkgs/development/nim-packages/zippy/default.nix
+++ b/pkgs/development/nim-packages/zippy/default.nix
@ -13,8 +13,6 @@ buildNimPackage rec {
    hash = "sha256-w64ENRyP3mNTtESSt7CDDxUkjYSfziNVVedkO4HIuJ8=";
  };

-  doCheck = true;
-
  meta = with lib;
    src.meta // {
      description = "Pure Nim implementation of deflate, zlib, gzip and zip";
--- a/pkgs/development/tools/misc/nimlsp/default.nix
+++ b/pkgs/development/tools/misc/nimlsp/default.nix
@ -22,6 +22,8 @@ nimPackages.buildNimPackage rec {

  nimDefines = [ "nimcore" "nimsuggest" "debugCommunication" "debugLogging" ];

+  doCheck = false;
+
  meta = with lib; {
    description = "Language Server Protocol implementation for Nim";
    homepage = "https://github.com/PMunch/nimlsp";