Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/libraries/mesa/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix

Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391

39 files changed, 211 insertions, 148 deletions

diff --git a/nixpkgs/pkgs/development/nim-packages/asciigraph/default.nix b/nixpkgs/pkgs/development/nim-packages/asciigraph/default.nix
index 51cc4c89eca0..0d8b471102ee 100644
--- a/nixpkgs/pkgs/development/nim-packages/asciigraph/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/asciigraph/default.nix
@@ -11,7 +11,6 @@ buildNimPackage rec {
     hash = "sha256-JMBAW8hkE2wuXkRt4aHqFPoz1HX1J4SslvcaQXfpDNk";
   };
 
-  doCheck = true;
 
   meta = with lib;
     src.meta // {
diff --git a/nixpkgs/pkgs/development/nim-packages/base32/default.nix b/nixpkgs/pkgs/development/nim-packages/base32/default.nix
index 543c63754bc6..a6ae28b45b54 100644
--- a/nixpkgs/pkgs/development/nim-packages/base32/default.nix
+++ b/nixpkgs/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 ];
diff --git a/nixpkgs/pkgs/development/nim-packages/base45/default.nix b/nixpkgs/pkgs/development/nim-packages/base45/default.nix
index b63f3073e774..349508445953 100644
--- a/nixpkgs/pkgs/development/nim-packages/base45/default.nix
+++ b/nixpkgs/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;
diff --git a/nixpkgs/pkgs/development/nim-packages/build-nim-package/default.nix b/nixpkgs/pkgs/development/nim-packages/build-nim-package/default.nix
index 5c64b7b745c2..6e20b78899f6 100644
--- a/nixpkgs/pkgs/development/nim-packages/build-nim-package/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/build-nim-package/default.nix
@@ -1,45 +1,45 @@
 { lib, stdenv, nim, nim_builder }:
+pkgArgs:
 
-{ strictDeps ? true, depsBuildBuild ? [ ], nativeBuildInputs ? [ ]
-, configurePhase ? null, buildPhase ? null, checkPhase ? null
-, installPhase ? null, enableParallelBuilding ? true, meta ? { }, ... }@attrs:
-
-stdenv.mkDerivation (attrs // {
-  inherit strictDeps enableParallelBuilding;
-  depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
-  nativeBuildInputs = [ nim ] ++ nativeBuildInputs;
-
-  configurePhase = if (configurePhase == null) then ''
-    runHook preConfigure
-    export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS
-    nim_builder --phase:configure
-    runHook postConfigure
-  '' else
-    configurePhase;
-
-  buildPhase = if (buildPhase == null) then ''
-    runHook preBuild
-    nim_builder --phase:build
-    runHook postBuild
-  '' else
-    buildPhase;
+let
+  baseAttrs = {
+    strictDeps = true;
+    enableParallelBuilding = true;
+    doCheck = true;
+    configurePhase = ''
+      runHook preConfigure
+      export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS
+      nim_builder --phase:configure
+      runHook postConfigure
+    '';
+    buildPhase = ''
+      runHook preBuild
+      nim_builder --phase:build
+      runHook postBuild
+    '';
+    checkPhase = ''
+      runHook preCheck
+      nim_builder --phase:check
+      runHook postCheck
+    '';
+    installPhase = ''
+      runHook preInstall
+      nim_builder --phase:install
+      runHook postInstall
+    '';
+    meta = { inherit (nim.meta) maintainers platforms; };
+  };
 
-  checkPhase = if (checkPhase == null) then ''
-    runHook preCheck
-    nim_builder --phase:check
-    runHook postCheck
-  '' else
-    checkPhase;
+  inputsOverride =
+    { depsBuildBuild ? [ ], nativeBuildInputs ? [ ], ... }: {
+      depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
+      nativeBuildInputs = [ nim ] ++ nativeBuildInputs;
+    };
 
-  installPhase = if (installPhase == null) then ''
-    runHook preInstall
-    nim_builder --phase:install
-    runHook postInstall
-  '' else
-    installPhase;
+  composition = finalAttrs:
+    let
+      asFunc = x: if builtins.isFunction x then x else (_: x);
+      prev = baseAttrs // (asFunc ((asFunc pkgArgs) finalAttrs)) baseAttrs;
+    in prev // inputsOverride prev;
 
-  meta = meta // {
-    platforms = meta.platforms or nim.meta.platforms;
-    maintainers = (meta.maintainers or [ ]) ++ [ lib.maintainers.ehmry ];
-  };
-})
+in stdenv.mkDerivation composition
diff --git a/nixpkgs/pkgs/development/nim-packages/bumpy/default.nix b/nixpkgs/pkgs/development/nim-packages/bumpy/default.nix
index 909894352319..c816f0901777 100644
--- a/nixpkgs/pkgs/development/nim-packages/bumpy/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/bumpy/default.nix
@@ -13,7 +13,6 @@ buildNimPackage rec {
 
   propagatedBuildInputs = [ vmath ];
 
-  doCheck = true;
 
   meta = with lib;
     src.meta // {
diff --git a/nixpkgs/pkgs/development/nim-packages/cbor/default.nix b/nixpkgs/pkgs/development/nim-packages/cbor/default.nix
index fd4d7ca190e4..2949f4c1c853 100644
--- a/nixpkgs/pkgs/development/nim-packages/cbor/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/cbor/default.nix
@@ -2,14 +2,13 @@
 
 buildNimPackage rec {
   pname = "cbor";
-  version = "20230310";
+  version = "20230619";
   src = fetchFromSourcehut {
     owner = "~ehmry";
     repo = "nim_${pname}";
     rev = version;
-    hash = "sha256-VmSYWgXDJLB2D2m3/ymrEytT2iW5JE56WmDz2MPHAqQ=";
+    hash = "sha256-F6T/5bUwrJyhRarTWO9cjbf7UfEOXPNWu6mfVKNZsQA=";
   };
-  doCheck = true;
   meta = with lib;
     src.meta // {
       description =
diff --git a/nixpkgs/pkgs/development/nim-packages/eris/default.nix b/nixpkgs/pkgs/development/nim-packages/eris/default.nix
index bdd7de6a463b..2d7b229ca1a1 100644
--- a/nixpkgs/pkgs/development/nim-packages/eris/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/eris/default.nix
@@ -1,27 +1,24 @@
-{ lib, buildNimPackage, fetchFromGitea, pkg-config
-, base32, coap, cbor, freedesktop_org, syndicate, tkrzw }:
+{ lib, buildNimPackage, fetchFromGitea, pkg-config, base32, coap, cbor
+, freedesktop_org, illwill, syndicate, tkrzw }:
 
-buildNimPackage rec {
+buildNimPackage (final: prev: {
   pname = "eris";
-  version = "20230201";
+  version = "20230722";
   outputs = [ "bin" "out" ];
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "eris";
-    repo = "nim-${pname}";
-    rev = version;
-    hash = "sha256-6vlD/woqTkbSRWhRtQD/ynk0DG+GrGwh6x+qUmo6YSQ=";
+    repo = "nim-eris";
+    rev = final.version;
+    hash = "sha256-JVl2/PmFVYuD4s9hKoQwVDKUa3PBWK5SBDEmVHVSuig=";
   };
   propagatedNativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [
-    base32
-    coap
-    cbor
-    freedesktop_org
-    syndicate
-    tkrzw
-  ];
+  propagatedBuildInputs =
+    [ base32 coap cbor freedesktop_org illwill tkrzw ];
   postInstall = ''
+    mkdir -p "$bin/share/recoll/filters"
+    mv "$bin/bin/rclerislink" "$bin/share/recoll/filters/"
+
     mkdir -p "$bin/share/applications"
     substitute "eris-open.desktop" "$bin/share/applications/eris-open.desktop"\
       --replace "Exec=eriscmd " "Exec=$bin/bin/eriscmd "
@@ -29,10 +26,11 @@ buildNimPackage rec {
     install -D "eris-link.xml" -t "$bin/share/mime/packages"
     install -D "eris48.png" "$bin/share/icons/hicolor/48x48/apps/eris.png"
   '';
-  meta = src.meta // {
+  meta = final.src.meta // {
+    homepage = "https://codeberg.org/eris/nim-eris";
     license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ ehmry ];
     mainProgram = "eriscmd";
     badPlatforms = lib.platforms.darwin;
   };
-}
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/flatty/default.nix b/nixpkgs/pkgs/development/nim-packages/flatty/default.nix
index 31abbfbdd21e..26a827830d1c 100644
--- a/nixpkgs/pkgs/development/nim-packages/flatty/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/flatty/default.nix
@@ -11,7 +11,6 @@ buildNimPackage rec {
     hash = "sha256-ZmhjehmEJHm5qNlsGQvyYLajUdwhWt1+AtRppRrNtgA=";
   };
 
-  doCheck = true;
 
   meta = with lib;
     src.meta // {
diff --git a/nixpkgs/pkgs/development/nim-packages/freedesktop_org/default.nix b/nixpkgs/pkgs/development/nim-packages/freedesktop_org/default.nix
index 745659622c41..52e672b3d697 100644
--- a/nixpkgs/pkgs/development/nim-packages/freedesktop_org/default.nix
+++ b/nixpkgs/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;
diff --git a/nixpkgs/pkgs/development/nim-packages/getdns/default.nix b/nixpkgs/pkgs/development/nim-packages/getdns/default.nix
index 035770da98be..7d85077d7e8a 100644
--- a/nixpkgs/pkgs/development/nim-packages/getdns/default.nix
+++ b/nixpkgs/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.
 
diff --git a/nixpkgs/pkgs/development/nim-packages/hashlib/default.nix b/nixpkgs/pkgs/development/nim-packages/hashlib/default.nix
new file mode 100644
index 000000000000..67fff072c182
--- /dev/null
+++ b/nixpkgs/pkgs/development/nim-packages/hashlib/default.nix
@@ -0,0 +1,17 @@
+{ lib, buildNimPackage, fetchFromGitHub }:
+
+buildNimPackage rec {
+  pname = "hashlib";
+  version = "1.0.1";
+  src = fetchFromGitHub {
+    owner = "khchen";
+    repo = pname;
+    rev = "84e0247555e4488594975900401baaf5bbbfb531";
+    hash = "sha256-nWNThelCh0LPVU7ryZgS/23hRRvJDVL2xWbQibb+zN0=";
+  };
+  meta = src.meta // {
+    description = "Hash Library for Nim";
+    maintainers = with lib.maintainers; [ ehmry ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/nixpkgs/pkgs/development/nim-packages/hts-nim/default.nix b/nixpkgs/pkgs/development/nim-packages/hts-nim/default.nix
index 960a9e63d215..d536133ce9b0 100644
--- a/nixpkgs/pkgs/development/nim-packages/hts-nim/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/hts-nim/default.nix
@@ -10,4 +10,5 @@ buildNimPackage rec {
     sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7";
   };
   propagatedBuildInputs = [ htslib ];
+  doCheck = false;
 }
diff --git a/nixpkgs/pkgs/development/nim-packages/illwill/default.nix b/nixpkgs/pkgs/development/nim-packages/illwill/default.nix
index a87588de0edd..aa5101766208 100644
--- a/nixpkgs/pkgs/development/nim-packages/illwill/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/illwill/default.nix
@@ -2,13 +2,13 @@
 
 buildNimPackage rec {
   pname = "illwill";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "johnnovak";
     repo = "illwill";
     rev = "v${version}";
-    hash = "sha256-9YBkad5iUKRb375caAuoYkfp5G6KQDhX/yXQ7vLu/CA=";
+    hash = "sha256-4DHGVWzN/WTAyDRBBpXlcfKnYIcbFt42/iWInaBUwi4=";
   };
 
   meta = with lib;
diff --git a/nixpkgs/pkgs/development/nim-packages/illwillwidgets/default.nix b/nixpkgs/pkgs/development/nim-packages/illwillwidgets/default.nix
index de0dbfa11645..f767216712ac 100644
--- a/nixpkgs/pkgs/development/nim-packages/illwillwidgets/default.nix
+++ b/nixpkgs/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";
diff --git a/nixpkgs/pkgs/development/nim-packages/jsony/default.nix b/nixpkgs/pkgs/development/nim-packages/jsony/default.nix
index bf8cf5d5c7f2..5f9c0f2741c2 100644
--- a/nixpkgs/pkgs/development/nim-packages/jsony/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/jsony/default.nix
@@ -11,7 +11,6 @@ buildNimPackage rec {
     sha256 = "1p250wb97nzz2g0vvq6mn521fx7sn1jpk1ralbzqh5q8clh4g7wr";
   };
 
-  doCheck = true;
 
   meta = with lib;
     src.meta // {
diff --git a/nixpkgs/pkgs/development/nim-packages/nimSHA2/default.nix b/nixpkgs/pkgs/development/nim-packages/nimSHA2/default.nix
index 812b179b5d70..ca9f08c8d253 100644
--- a/nixpkgs/pkgs/development/nim-packages/nimSHA2/default.nix
+++ b/nixpkgs/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 ];
diff --git a/nixpkgs/pkgs/development/nim-packages/nimraylib-now/default.nix b/nixpkgs/pkgs/development/nim-packages/nimraylib-now/default.nix
index 9610ac7afa66..f2e0028a32e1 100644
--- a/nixpkgs/pkgs/development/nim-packages/nimraylib-now/default.nix
+++ b/nixpkgs/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";
diff --git a/nixpkgs/pkgs/development/nim-packages/noise/default.nix b/nixpkgs/pkgs/development/nim-packages/noise/default.nix
index 7931467dbbd5..d4b9bfdda5b6 100644
--- a/nixpkgs/pkgs/development/nim-packages/noise/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/noise/default.nix
@@ -1,8 +1,18 @@
-{ fetchFromGitHub }:
+{ lib, buildNimPackage, fetchFromGitHub }:
 
-fetchFromGitHub {
-  owner = "jangko";
-  repo = "nim-noise";
-  rev = "v0.1.14";
-  sha256 = "0wndiphznfyb1pac6zysi3bqljwlfwj6ziarcwnpf00sw2zni449";
-}
+buildNimPackage (finalAttrs: {
+  pname = "noise";
+  version = "0.1.8";
+  src = fetchFromGitHub {
+    owner = "jangko";
+    repo = "nim-noise";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-QD7X1QTAKHYa2+QiYjrQq74CnEafwq/RsshlW2yZqmI=";
+  };
+  meta = finalAttrs.src.meta // {
+    description = "Nim implementation of linenoise";
+    homepage = "https://github.com/jangko/nim-noise";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/npeg/default.nix b/nixpkgs/pkgs/development/nim-packages/npeg/default.nix
index 51c7383bff3e..c869ff60f6a5 100644
--- a/nixpkgs/pkgs/development/nim-packages/npeg/default.nix
+++ b/nixpkgs/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 ];
diff --git a/nixpkgs/pkgs/development/nim-packages/parsetoml/default.nix b/nixpkgs/pkgs/development/nim-packages/parsetoml/default.nix
index 0c2e31dd41f4..d6504f1d9c67 100644
--- a/nixpkgs/pkgs/development/nim-packages/parsetoml/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/parsetoml/default.nix
@@ -11,7 +11,6 @@ buildNimPackage rec {
     hash = "sha256-jtqn59x2ZRRgrPir6u/frsDHnl4kvTJWpbejxti8aHY=";
   };
 
-  doCheck = true;
 
   meta = with lib;
     src.meta // {
diff --git a/nixpkgs/pkgs/development/nim-packages/pixie/default.nix b/nixpkgs/pkgs/development/nim-packages/pixie/default.nix
index 1366e55a1e36..37b018b6fa65 100644
--- a/nixpkgs/pkgs/development/nim-packages/pixie/default.nix
+++ b/nixpkgs/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 // {
diff --git a/nixpkgs/pkgs/development/nim-packages/preserves/default.nix b/nixpkgs/pkgs/development/nim-packages/preserves/default.nix
index 251975bcad6e..d48f7830e71f 100644
--- a/nixpkgs/pkgs/development/nim-packages/preserves/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/preserves/default.nix
@@ -1,16 +1,17 @@
-{ lib, stdenv, buildNimPackage, fetchFromGitea, npeg }:
+{ lib, stdenv, buildNimPackage, fetchFromGitea, nim-unwrapped, npeg }:
 
 buildNimPackage rec {
   pname = "preserves";
-  version = "20221102";
+  version = "20230530";
   src = fetchFromGitea {
     domain = "git.syndicate-lang.org";
     owner = "ehmry";
     repo = "${pname}-nim";
     rev = version;
-    hash = "sha256-oRsq1ugtrOvTn23596BXRy71TQZ4h/Vv6JGqBTZdoKY=";
+    hash = "sha256-IRIBGjv4po8VyL873v++ovqz8Vg6a9Qbh/M1fxpQXvY=";
   };
   propagatedBuildInputs = [ npeg ];
+  nimFlags = [ "--path:${nim-unwrapped}/nim" ];
   doCheck = !stdenv.isDarwin;
   meta = src.meta // {
     description = "Nim implementation of the Preserves data language";
diff --git a/nixpkgs/pkgs/development/nim-packages/regex/default.nix b/nixpkgs/pkgs/development/nim-packages/regex/default.nix
index 091377eb1f2e..03e4315a2c80 100644
--- a/nixpkgs/pkgs/development/nim-packages/regex/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/regex/default.nix
@@ -1,8 +1,20 @@
-{ fetchFromGitHub }:
+{ lib, buildNimPackage, fetchFromGitHub, unicodedb }:
 
-fetchFromGitHub {
-  owner = "nitely";
-  repo = "nim-regex";
-  rev = "eeefb4f";
-  sha256 = "13gn0qhnxz07474kv94br5qlac9j8pz2555fk83538fiq83vgbm5";
-}
+buildNimPackage (finalAttrs: {
+  pname = "regex";
+  version = "0.20.2";
+  src = fetchFromGitHub {
+    owner = "nitely";
+    repo = "nim-regex";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-VViDf0uD6bj9WOO827NRbLUt+PgBPEmz/A/DDRCrHpc=";
+  };
+  propagatedBuildInputs = [ unicodedb ];
+  doCheck = false;
+  meta = finalAttrs.src.meta // {
+    description = "Pure Nim regex engine";
+    homepage = "https://github.com/nitely/nim-regex";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/safeset/default.nix b/nixpkgs/pkgs/development/nim-packages/safeset/default.nix
index df613143e9a8..b92228421c75 100644
--- a/nixpkgs/pkgs/development/nim-packages/safeset/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/safeset/default.nix
@@ -11,7 +11,6 @@ buildNimPackage rec {
     hash = "sha256-ZLdStoNVoQhRkD2iEzKxhs1UPfgnbJM9QCDHdjH7vTU=";
   };
 
-  doCheck = true;
 
   meta = with lib;
     src.meta // {
diff --git a/nixpkgs/pkgs/development/nim-packages/sdl2/default.nix b/nixpkgs/pkgs/development/nim-packages/sdl2/default.nix
index ddcdf072c6b4..340cd2718ae2 100644
--- a/nixpkgs/pkgs/development/nim-packages/sdl2/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/sdl2/default.nix
@@ -1,17 +1,16 @@
 { lib, buildNimPackage, fetchNimble, SDL2 }:
 
-buildNimPackage rec {
+buildNimPackage (finalAttrs: {
   pname = "sdl2";
   version = "2.0.4";
   src = fetchNimble {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";
   };
   propagatedBuildInputs = [ SDL2 ];
-  doCheck = true;
   meta = {
     description = "Nim wrapper for SDL 2.x";
     platforms = lib.platforms.linux; # Problems with Darwin.
     license = [ lib.licenses.mit ];
   };
-}
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/segmentation/default.nix b/nixpkgs/pkgs/development/nim-packages/segmentation/default.nix
index c695cd00ca92..4d1520d62ee8 100644
--- a/nixpkgs/pkgs/development/nim-packages/segmentation/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/segmentation/default.nix
@@ -1,8 +1,19 @@
-{ fetchFromGitHub }:
+{ lib, buildNimPackage, fetchFromGitHub, unicodedb }:
 
-fetchFromGitHub {
-  owner = "nitely";
-  repo = "nim-segmentation";
-  rev = "v0.1.0";
-  sha256 = "007bkx8dwy8n340zbp6wyqfsq9bh6q5ykav1ywdlwykyp1n909bh";
-}
+buildNimPackage (finalAttrs: {
+  pname = "segmentation";
+  version = "0.1.0";
+  src = fetchFromGitHub {
+    owner = "nitely";
+    repo = "nim-segmentation";
+    rev = "v${finalAttrs.version}";
+    sha256 = "007bkx8dwy8n340zbp6wyqfsq9bh6q5ykav1ywdlwykyp1n909bh";
+  };
+  propagatedBuildInputs = [ unicodedb ];
+  meta = finalAttrs.src.meta // {
+    description = "Unicode text segmentation (tr29)";
+    homepage = "https://github.com/nitely/nim-segmentation";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/snappy/config.patch b/nixpkgs/pkgs/development/nim-packages/snappy/config.patch
deleted file mode 100644
index ffcec7032ca9..000000000000
--- a/nixpkgs/pkgs/development/nim-packages/snappy/config.patch
+++ /dev/null
@@ -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")
diff --git a/nixpkgs/pkgs/development/nim-packages/snappy/default.nix b/nixpkgs/pkgs/development/nim-packages/snappy/default.nix
index 88de1f4552a9..e3775b20631b 100644
--- a/nixpkgs/pkgs/development/nim-packages/snappy/default.nix
+++ b/nixpkgs/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";
diff --git a/nixpkgs/pkgs/development/nim-packages/spry/default.nix b/nixpkgs/pkgs/development/nim-packages/spry/default.nix
index ebb23de70144..590832d11f33 100644
--- a/nixpkgs/pkgs/development/nim-packages/spry/default.nix
+++ b/nixpkgs/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 =
diff --git a/nixpkgs/pkgs/development/nim-packages/spryvm/default.nix b/nixpkgs/pkgs/development/nim-packages/spryvm/default.nix
index 7ee6537b3a2b..618e78256913 100644
--- a/nixpkgs/pkgs/development/nim-packages/spryvm/default.nix
+++ b/nixpkgs/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";
diff --git a/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix b/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix
index 62f7ca936f78..e22455ad9098 100644
--- a/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix
@@ -1,17 +1,16 @@
-{ lib, buildNimPackage, fetchFromGitea, nimSHA2, preserves }:
+{ lib, buildNimPackage, fetchFromGitea, hashlib, preserves }:
 
 buildNimPackage rec {
   pname = "syndicate";
-  version = "20221102";
+  version = "20230530";
   src = fetchFromGitea {
     domain = "git.syndicate-lang.org";
     owner = "ehmry";
     repo = "${pname}-nim";
     rev = version;
-    hash = "sha256-yTPbEsBcpEPXfmhykbWzWdnJ2ExEJxdii1L+mqx8VGQ=";
+    hash = "sha256-lUHoMSQwUlz9EDMvpFL9GlrwbwMvZDILSmuakONwe50=";
   };
-  propagatedBuildInputs = [ nimSHA2 preserves ];
-  doCheck = true;
+  propagatedBuildInputs = [ hashlib preserves ];
   meta = src.meta // {
     description = "Nim implementation of the Syndicated Actor model";
     license = lib.licenses.unlicense;
diff --git a/nixpkgs/pkgs/development/nim-packages/taps/default.nix b/nixpkgs/pkgs/development/nim-packages/taps/default.nix
index 4bf8f247977e..ce453dbaa344 100644
--- a/nixpkgs/pkgs/development/nim-packages/taps/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/taps/default.nix
@@ -2,12 +2,12 @@
 
 buildNimPackage rec {
   pname = "taps";
-  version = "20221228";
+  version = "20230331";
   src = fetchFromSourcehut {
     owner = "~ehmry";
     repo = "nim_${pname}";
     rev = version;
-    hash = "sha256-0EjMP5pIPJg4/3nzj6ECC68f709TS06OrJlTZ0tavEo=";
+    hash = "sha256-p2DBJWFwS82oHPq0uMCtZWFbn8GFndEJBjhkHeuPGos=";
   };
   propagatedBuildInputs = [ getdns ];
   doCheck = false;
diff --git a/nixpkgs/pkgs/development/nim-packages/tkrzw/default.nix b/nixpkgs/pkgs/development/nim-packages/tkrzw/default.nix
index 1988260ac485..9f88067f988a 100644
--- a/nixpkgs/pkgs/development/nim-packages/tkrzw/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/tkrzw/default.nix
@@ -11,11 +11,10 @@ buildNimPackage rec {
   };
   propagatedNativeBuildInputs = [ pkg-config ];
   propagatedBuildInputs = [ tkrzw ];
-  doCheck = true;
   meta = with lib;
     src.meta // {
       description = "Nim wrappers over some of the Tkrzw C++ library";
-      license = lib.licenses.apsl20;
+      license = lib.licenses.asl20;
       maintainers = with lib.maintainers; [ ehmry ];
     };
 }
diff --git a/nixpkgs/pkgs/development/nim-packages/ui/default.nix b/nixpkgs/pkgs/development/nim-packages/ui/default.nix
index de7ef09b5012..0af0665bfa65 100644
--- a/nixpkgs/pkgs/development/nim-packages/ui/default.nix
+++ b/nixpkgs/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";
diff --git a/nixpkgs/pkgs/development/nim-packages/unicodedb/default.nix b/nixpkgs/pkgs/development/nim-packages/unicodedb/default.nix
index 8b60710e8210..cbc897a1fc4e 100644
--- a/nixpkgs/pkgs/development/nim-packages/unicodedb/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/unicodedb/default.nix
@@ -1,8 +1,18 @@
-{ fetchFromGitHub }:
+{ lib, buildNimPackage, fetchFromGitHub }:
 
-fetchFromGitHub {
-  owner = "nitely";
-  repo = "nim-unicodedb";
-  rev = "v0.9.0";
-  sha256 = "06j8d0bjbpv1iibqlmrac4qb61ggv17hvh6nv4pbccqk1rlpxhsq";
-}
+buildNimPackage (finalAttrs: {
+  pname = "unicodedb";
+  version = "0.12.0";
+  src = fetchFromGitHub {
+    owner = "nitely";
+    repo = "nim-unicodedb";
+    rev = finalAttrs.version;
+    hash = "sha256-vtksdRTWH/Fjp1z8KSFGjgn1SRUxtUZwlOa+vMuB53A=";
+  };
+  meta = finalAttrs.src.meta // {
+    description = "Unicode Character Database (UCD, tr44) for Nim";
+    homepage = "https://github.com/nitely/nim-unicodedb";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/unicodeplus/default.nix b/nixpkgs/pkgs/development/nim-packages/unicodeplus/default.nix
index 772524eaf94b..8efb1fee7ec0 100644
--- a/nixpkgs/pkgs/development/nim-packages/unicodeplus/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/unicodeplus/default.nix
@@ -1,8 +1,19 @@
-{ fetchFromGitHub }:
+{ lib, buildNimPackage, fetchFromGitHub, segmentation }:
 
-fetchFromGitHub {
-  owner = "nitely";
-  repo = "nim-unicodeplus";
-  rev = "v0.8.0";
-  sha256 = "181wzwivfgplkqn5r4crhnaqgsza7x6fi23i86djb2dxvm7v6qxk";
-}
+buildNimPackage (finalAttrs: {
+  pname = "unicodeplus";
+  version = "0.8.0";
+  src = fetchFromGitHub {
+    owner = "nitely";
+    repo = "nim-unicodeplus";
+    rev = "v${finalAttrs.version}";
+    sha256 = "181wzwivfgplkqn5r4crhnaqgsza7x6fi23i86djb2dxvm7v6qxk";
+  };
+  propagatedBuildInputs = [ segmentation ];
+  meta = finalAttrs.src.meta // {
+    description = "Common unicode operations";
+    homepage = "https://github.com/nitely/nim-unicodeplus";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/ws/default.nix b/nixpkgs/pkgs/development/nim-packages/ws/default.nix
new file mode 100644
index 000000000000..704d6d936bda
--- /dev/null
+++ b/nixpkgs/pkgs/development/nim-packages/ws/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildNimPackage, fetchFromGitHub }:
+
+buildNimPackage (finalAttrs: {
+  pname = "ws";
+  version = "0.5.0";
+  src = fetchFromGitHub {
+    owner = "treeform";
+    repo = "ws";
+    rev = finalAttrs.version;
+    hash = "sha256-3wVi6CjMTjcc5MJEozJN6W3TuYDb53w2MDCsv6lMH0k=";
+  };
+  preCheck = ''
+    rm tests/test_ws.nim tests/test_timeout.nim
+  '';
+  meta = finalAttrs.src.meta // {
+    description = "Simple WebSocket library for Nim";
+    homepage = "https://github.com/treeform/ws";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/x11/default.nix b/nixpkgs/pkgs/development/nim-packages/x11/default.nix
index abfac2e4b837..85c5a18a381d 100644
--- a/nixpkgs/pkgs/development/nim-packages/x11/default.nix
+++ b/nixpkgs/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";
diff --git a/nixpkgs/pkgs/development/nim-packages/zippy/default.nix b/nixpkgs/pkgs/development/nim-packages/zippy/default.nix
index ba27b0858f59..c89d030288e5 100644
--- a/nixpkgs/pkgs/development/nim-packages/zippy/default.nix
+++ b/nixpkgs/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";