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

Conflicts:
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix

17 files changed, 135 insertions, 93 deletions

diff --git a/nixpkgs/pkgs/development/nim-packages/astpatternmatching/default.nix b/nixpkgs/pkgs/development/nim-packages/astpatternmatching/default.nix
index 6f1137ac7045..c5c5a988bd5d 100644
--- a/nixpkgs/pkgs/development/nim-packages/astpatternmatching/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/astpatternmatching/default.nix
@@ -3,6 +3,6 @@
 fetchFromGitHub {
   owner = "krux02";
   repo = "ast-pattern-matching";
-  rev = "87f7d163421af5a4f5e5cb6da7b93278e6897e96";
-  sha256 = "19mb5bb6riia8380p5dpc3q0vwgrj958dd6p7vw8vkvwiqrzg6zq";
+  rev = "eb8b99d595517fd5d41ccc954edb896267f2db78";
+  hash = "sha256-wPIiFr8OfXM7Hyh5o2aQXnlgkqLf0FennN6zzVTGgY4=";
 }
diff --git a/nixpkgs/pkgs/development/nim-packages/chroma/default.nix b/nixpkgs/pkgs/development/nim-packages/chroma/default.nix
index 266cd0645f36..f8f161eef67e 100644
--- a/nixpkgs/pkgs/development/nim-packages/chroma/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/chroma/default.nix
@@ -1,7 +1,18 @@
-{ fetchNimble }:
+{ lib, buildNimPackage, fetchFromGitHub }:
 
-fetchNimble {
+buildNimPackage (final: prev: {
   pname = "chroma";
-  version = "0.2.5";
-  hash = "sha256-6lNHpO2aMorgkaPfo6kRcOs9r5R6T/kislVmkeoulw8=";
-}
+  version = "0.2.7";
+  src = fetchFromGitHub {
+    owner = "treeform";
+    repo = "chroma";
+    rev = final.version;
+    hash = "sha256-QSl8n60HO56kJ4BKKe/FjUC/cRNxqL2L56FqPwhmJl4=";
+  };
+  meta = final.src.meta // {
+    description = "Everything you want to do with colors";
+    homepage = "https://github.com/treeform/chroma";
+    license = [ lib.licenses.mit ];
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/db_connector/default.nix b/nixpkgs/pkgs/development/nim-packages/db_connector/default.nix
new file mode 100644
index 000000000000..287d6fd0552c
--- /dev/null
+++ b/nixpkgs/pkgs/development/nim-packages/db_connector/default.nix
@@ -0,0 +1,19 @@
+{ lib, buildNimPackage, fetchFromGitHub }:
+
+buildNimPackage (final: prev: {
+  pname = "db_connector";
+  version = "unstable-2023-02-23";
+  src = fetchFromGitHub {
+    owner = "nim-lang";
+    repo = "db_connector";
+    rev = "e65693709dd042bc723c8f1d46cc528701f1c479";
+    hash = "sha256-g5X51VbES8OxR5m9WexK70Yo6S2PnroKLabj1cUu1P0=";
+  };
+  doCheck = false; # tests only worked in the Nim sources
+  meta = final.src.meta // {
+    description = "Unified db connector in Nim";
+    homepage = "https://github.com/nim-lang/db_connector";
+    license = [ lib.licenses.mit ];
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/fetch-nimble/builder.sh b/nixpkgs/pkgs/development/nim-packages/fetch-nimble/builder.sh
deleted file mode 100644
index bc2f9bfc94f1..000000000000
--- a/nixpkgs/pkgs/development/nim-packages/fetch-nimble/builder.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-if [ -e .attrs.sh ]; then source .attrs.sh; fi
-source $stdenv/setup
-export HOME=$NIX_BUILD_TOP
-
-nimble --accept --noSSLCheck develop "${pkgname}@${version}"
-# TODO: bring in the certificates for Nimble to verify the fetch of
-# the package list.
-
-pkgdir=${NIX_BUILD_TOP}/${pkgname}
-
-find "$pkgdir" -name .git -print0 | xargs -0 rm -rf
-
-cp -a "$pkgdir" "$out"
diff --git a/nixpkgs/pkgs/development/nim-packages/fetch-nimble/default.nix b/nixpkgs/pkgs/development/nim-packages/fetch-nimble/default.nix
deleted file mode 100644
index ccdacc8e27b9..000000000000
--- a/nixpkgs/pkgs/development/nim-packages/fetch-nimble/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, makeOverridable, stdenv, gitMinimal, nim, cacert }:
-
-makeOverridable (
-
-  { pname, version, hash ? lib.fakeHash,
-
-  meta ? { }, passthru ? { }, preferLocalBuild ? true }:
-  stdenv.mkDerivation {
-    inherit version meta passthru preferLocalBuild;
-    pname = pname + "-src";
-    pkgname = pname;
-    builder = ./builder.sh;
-    nativeBuildInputs = [ gitMinimal nim ];
-    outputHash = hash;
-    outputHashAlgo = null;
-    outputHashMode = "recursive";
-    impureEnvVars = lib.fetchers.proxyImpureEnvVars
-      ++ [ "GIT_PROXY_COMMAND" "SOCKS_SERVER" ];
-    GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-  })
diff --git a/nixpkgs/pkgs/development/nim-packages/flatty/default.nix b/nixpkgs/pkgs/development/nim-packages/flatty/default.nix
index 26a827830d1c..8741c2cf8dc9 100644
--- a/nixpkgs/pkgs/development/nim-packages/flatty/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/flatty/default.nix
@@ -1,21 +1,21 @@
 { lib, buildNimPackage, fetchFromGitHub }:
 
-buildNimPackage rec {
+buildNimPackage (final: prev: {
   pname = "flatty";
   version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "treeform";
-    repo = pname;
-    rev = version;
+    repo = "flatty";
+    rev = final.version;
     hash = "sha256-ZmhjehmEJHm5qNlsGQvyYLajUdwhWt1+AtRppRrNtgA=";
   };
 
+  doCheck = false; # tests fail with Nim-2.0.0
 
-  meta = with lib;
-    src.meta // {
-      description = "Tools and serializer for plain flat binary files";
-      license = [ licenses.mit ];
-      maintainers = [ maintainers.ehmry ];
-    };
-}
+  meta = final.src.meta // {
+    description = "Tools and serializer for plain flat binary files";
+    license = [ lib.licenses.mit ];
+    maintainers = [ lib.maintainers.ehmry ];
+  };
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/hts-nim/default.nix b/nixpkgs/pkgs/development/nim-packages/hts-nim/default.nix
deleted file mode 100644
index d536133ce9b0..000000000000
--- a/nixpkgs/pkgs/development/nim-packages/hts-nim/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ buildNimPackage, fetchFromGitHub, htslib }:
-
-buildNimPackage rec {
-  pname = "hts-nim";
-  version = "0.3.4";
-  src = fetchFromGitHub {
-    owner = "brentp";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7";
-  };
-  propagatedBuildInputs = [ htslib ];
-  doCheck = false;
-}
diff --git a/nixpkgs/pkgs/development/nim-packages/hts/default.nix b/nixpkgs/pkgs/development/nim-packages/hts/default.nix
new file mode 100644
index 000000000000..1cf763d77b16
--- /dev/null
+++ b/nixpkgs/pkgs/development/nim-packages/hts/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildNimPackage, fetchFromGitHub, htslib }:
+
+buildNimPackage (final: prev: {
+  pname = "hts";
+  version = "0.3.23";
+  src = fetchFromGitHub {
+    owner = "brentp";
+    repo = "hts-nim";
+    rev = "v${final.version}";
+    hash = "sha256-o27yOtzW4hk8dpicqjW4D8zxqXHdxcz+e84PyK+yBq8=";
+  };
+  propagatedBuildInputs = [ htslib ];
+  nimFlags = [ "--mm:refc" ];
+  doCheck = false;
+  meta = final.src.meta // {
+    description = "Nim wrapper for htslib for parsing genomics data files";
+    homepage = "https://brentp.github.io/hts-nim/";
+    license = [ lib.licenses.mit ];
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/nim_builder/nim_builder.nim b/nixpkgs/pkgs/development/nim-packages/nim_builder/nim_builder.nim
index 8bb78555c269..8b70aa91ca99 100644
--- a/nixpkgs/pkgs/development/nim-packages/nim_builder/nim_builder.nim
+++ b/nixpkgs/pkgs/development/nim-packages/nim_builder/nim_builder.nim
@@ -150,7 +150,7 @@ proc checkPhase*() =
   proc before(idx: int) =
     echo "check job ", idx, ": ", cmds[idx]
   for path in walkPattern("tests/t*.nim"):
-    cmds.add("nim r $#" % [path])
+    cmds.add("nim r $# $#" % [getenv("nimFlags"), path])
   let err = execProcesses(
     cmds, n = 1,
     beforeRunEvent = before)
diff --git a/nixpkgs/pkgs/development/nim-packages/nimsimd/default.nix b/nixpkgs/pkgs/development/nim-packages/nimsimd/default.nix
index 9ccd96453572..57f85054ae37 100644
--- a/nixpkgs/pkgs/development/nim-packages/nimsimd/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/nimsimd/default.nix
@@ -1,7 +1,18 @@
-{ fetchNimble }:
+{ lib, buildNimPackage, fetchFromGitHub }:
 
-fetchNimble {
+buildNimPackage (final: prev: {
   pname = "nimsimd";
-  version = "1.0.0";
-  hash = "sha256-kp61fylAJ6MSN9hLYLi7CU2lxVR/lbrNCvZTe0LJLGo=";
-}
+  version = "1.2.5";
+  src = fetchFromGitHub {
+    owner = "guzba";
+    repo = "nimsimd";
+    rev = final.version;
+    hash = "sha256-EYLzpzmNUwEOEndAwnUXCqpIUMmpinpiZq+P6zO0Kk8=";
+  };
+  meta = final.src.meta // {
+    description = "Pleasant Nim bindings for SIMD instruction sets";
+    homepage = "https://github.com/guzba/nimsimd";
+    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 c869ff60f6a5..7969dfb38df3 100644
--- a/nixpkgs/pkgs/development/nim-packages/npeg/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/npeg/default.nix
@@ -9,6 +9,7 @@ buildNimPackage rec {
     rev = version;
     hash = "sha256-kN91cp50ZL4INeRWqwrRK6CAkVXUq4rN4YlcN6WL/3Y=";
   };
+  nimFlags = [ "--threads:off" ];
   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/pixie/default.nix b/nixpkgs/pkgs/development/nim-packages/pixie/default.nix
index 37b018b6fa65..00c79089fc02 100644
--- a/nixpkgs/pkgs/development/nim-packages/pixie/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/pixie/default.nix
@@ -14,6 +14,7 @@ buildNimPackage rec {
 
   propagatedBuildInputs = [ bumpy chroma flatty nimsimd vmath zippy ];
 
+  doCheck = false; # doesn't find dependencies
 
   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 d48f7830e71f..2a795584adb5 100644
--- a/nixpkgs/pkgs/development/nim-packages/preserves/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/preserves/default.nix
@@ -1,21 +1,21 @@
 { lib, stdenv, buildNimPackage, fetchFromGitea, nim-unwrapped, npeg }:
 
-buildNimPackage rec {
+buildNimPackage (final: prev: {
   pname = "preserves";
-  version = "20230530";
+  version = "20230801";
   src = fetchFromGitea {
     domain = "git.syndicate-lang.org";
     owner = "ehmry";
-    repo = "${pname}-nim";
-    rev = version;
-    hash = "sha256-IRIBGjv4po8VyL873v++ovqz8Vg6a9Qbh/M1fxpQXvY=";
+    repo = "preserves-nim";
+    rev = final.version;
+    hash = "sha256-60QsbXMYYfEWvXQAXu7XSpvg2J9YaGKDkDrfclcK6pc=";
   };
   propagatedBuildInputs = [ npeg ];
-  nimFlags = [ "--path:${nim-unwrapped}/nim" ];
+  nimFlags = [ "--mm:refc" "--path:${nim-unwrapped}/nim" "--threads:off" ];
   doCheck = !stdenv.isDarwin;
-  meta = src.meta // {
+  meta = final.src.meta // {
     description = "Nim implementation of the Preserves data language";
     license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ ehmry ];
   };
-}
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/sdl2/default.nix b/nixpkgs/pkgs/development/nim-packages/sdl2/default.nix
index 340cd2718ae2..09e274ad0072 100644
--- a/nixpkgs/pkgs/development/nim-packages/sdl2/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/sdl2/default.nix
@@ -1,16 +1,20 @@
-{ lib, buildNimPackage, fetchNimble, SDL2 }:
+{ lib, buildNimPackage, fetchFromGitHub, SDL2 }:
 
-buildNimPackage (finalAttrs: {
+buildNimPackage (final: prev: {
   pname = "sdl2";
-  version = "2.0.4";
-  src = fetchNimble {
-    inherit (finalAttrs) pname version;
-    hash = "sha256-Vtcj8goI4zZPQs2TbFoBFlcR5UqDtOldaXSH/+/xULk=";
+  version = "2.0.5";
+  src = fetchFromGitHub {
+    owner = "nim-lang";
+    repo = "sdl2";
+    rev = "v${final.version}";
+    hash = "sha256-oUTUWuBphoR0pBMkcJBVDW+dnnF8KK23F7eW3lOLNO4=";
   };
   propagatedBuildInputs = [ SDL2 ];
-  meta = {
+  meta = final.src.meta // {
     description = "Nim wrapper for SDL 2.x";
-    platforms = lib.platforms.linux; # Problems with Darwin.
+    homepage = "https://github.com/nim-lang/sdl2";
     license = [ lib.licenses.mit ];
+    maintainers = with lib.maintainers; [ ehmry ];
+    badPlatforms = lib.platforms.darwin;
   };
 })
diff --git a/nixpkgs/pkgs/development/nim-packages/smtp/default.nix b/nixpkgs/pkgs/development/nim-packages/smtp/default.nix
new file mode 100644
index 000000000000..b439e20bc243
--- /dev/null
+++ b/nixpkgs/pkgs/development/nim-packages/smtp/default.nix
@@ -0,0 +1,18 @@
+{ lib, buildNimPackage, fetchFromGitHub }:
+
+buildNimPackage (final: prev: {
+  pname = "smtp";
+  version = "unstable-2023-03-04";
+  src = fetchFromGitHub {
+    owner = "nim-lang";
+    repo = "smtp";
+    rev = "8013aa199dedd04905d46acf3484a232378de518";
+    hash = "sha256-7jPykp79nAY1G0CSajyn6Jw/Ad+XCulBk9HjtKMPEQ4=";
+  };
+  meta = final.src.meta // {
+    description = "SMTP client";
+    homepage = "https://github.com/nim-lang/smtp";
+    license = [ lib.licenses.mit ];
+    maintainers = with lib.maintainers; [ ehmry ];
+  };
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix b/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix
index e22455ad9098..63fb28442424 100644
--- a/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/syndicate/default.nix
@@ -1,19 +1,20 @@
 { lib, buildNimPackage, fetchFromGitea, hashlib, preserves }:
 
-buildNimPackage rec {
+buildNimPackage (final: prev: {
   pname = "syndicate";
-  version = "20230530";
+  version = "20230801";
   src = fetchFromGitea {
     domain = "git.syndicate-lang.org";
     owner = "ehmry";
-    repo = "${pname}-nim";
-    rev = version;
-    hash = "sha256-lUHoMSQwUlz9EDMvpFL9GlrwbwMvZDILSmuakONwe50=";
+    repo = "syndicate-nim";
+    rev = final.version;
+    hash = "sha256-/mZGWVdQ5FtZf2snPIjTG2tNFVzxQmxvkKuLCAGARYs=";
   };
   propagatedBuildInputs = [ hashlib preserves ];
-  meta = src.meta // {
+  nimFlags = [ "--mm:refc" "--threads:off" ];
+  meta = final.src.meta // {
     description = "Nim implementation of the Syndicated Actor model";
     license = lib.licenses.unlicense;
     maintainers = with lib.maintainers; [ ehmry ];
   };
-}
+})
diff --git a/nixpkgs/pkgs/development/nim-packages/vmath/default.nix b/nixpkgs/pkgs/development/nim-packages/vmath/default.nix
index 4a19a9c49bb3..b7c0c37cbdfb 100644
--- a/nixpkgs/pkgs/development/nim-packages/vmath/default.nix
+++ b/nixpkgs/pkgs/development/nim-packages/vmath/default.nix
@@ -11,6 +11,8 @@ buildNimPackage rec {
     hash = "sha256-/v0lQIOMogTxFRtbssziW4W6VhMDepM6Si8igLgcx30=";
   };
 
+  nimFlags = [ "--mm:refc" ];
+
   doCheck = !stdenv.isDarwin;
 
   meta = with lib;