Merge pull request #611 from nix-community/build-systems-2022-05-05

Sync build systems (2022-05-05)

nix/sources.json

@@ -5,10 +5,10 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ff9efb0724de5ae0f9db9df2debefced7eb1571d",
-        "sha256": "188h461pilsiym2dqzl17vx1g9pb816cwdi0az9mbw207w721avz",
+        "rev": "cbe587c735b734405f56803e267820ee1559e6c1",
+        "sha256": "0jii8slqbwbvrngf9911z3al1s80v7kk8idma9p9k0d5fm3g4z7h",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/ff9efb0724de5ae0f9db9df2debefced7eb1571d.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/cbe587c735b734405f56803e267820ee1559e6c1.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

overrides/build-systems.json

@@ -98,6 +98,9 @@
   "ansible-later": [
     "poetry-core"
   ],
+  "ansible-runner": [
+    "pbr"
+  ],
   "apache-beam": [
     "cython"
   ],
@@ -141,6 +144,9 @@
   "awesomeversion": [
     "poetry-core"
   ],
+  "aws-adfs": [
+    "poetry-core"
+  ],
   "aws-error-utils": [
     "poetry"
   ],
@@ -204,6 +210,9 @@
   "clikit": [
     "poetry-core"
   ],
+  "cloudflare-dyndns": [
+    "poetry"
+  ],
   "collections-extended": [
     "poetry-core"
   ],
@@ -246,6 +255,9 @@
   "cypari2": [
     "cython"
   ],
+  "cypherpunkpay": [
+    "poetry-core"
+  ],
   "cysignals": [
     "cython"
   ],
@@ -338,6 +350,13 @@
   "enumatch": [
     "poetry"
   ],
+  "exceptiongroup": [
+    "flit-core",
+    "flitBuildHook"
+  ],
+  "falcon": [
+    "cython"
+  ],
   "fastapi": [
     "flitBuildHook"
   ],
@@ -407,6 +426,9 @@
   "generic": [
     "poetry-core"
   ],
+  "gensim": [
+    "cython"
+  ],
   "glances-api": [
     "poetry-core"
   ],
@@ -527,6 +549,9 @@
   "isort": [
     "poetry-core"
   ],
+  "jarowinkler": [
+    "cython"
+  ],
   "jedi-language-server": [
     "poetry"
   ],
@@ -575,6 +600,9 @@
   "ldappool": [
     "pbr"
   ],
+  "levenshtein": [
+    "cython"
+  ],
   "libgpuarray": [
     "cython"
   ],
@@ -651,6 +679,9 @@
   "memory-allocator": [
     "cython"
   ],
+  "meteofrance-api": [
+    "poetry"
+  ],
   "metprint": [
     "poetry-core"
   ],
@@ -719,6 +750,9 @@
   "netdata": [
     "poetry-core"
   ],
+  "netutils": [
+    "poetry-core"
+  ],
   "newversion": [
     "poetry-core"
   ],
@@ -1044,9 +1078,15 @@
   "pyquil": [
     "poetry-core"
   ],
+  "pyrad": [
+    "poetry-core"
+  ],
   "pyregion": [
     "cython"
   ],
+  "pyrevolve": [
+    "cython"
+  ],
   "pyrmvtransport": [
     "flit"
   ],
@@ -1062,6 +1102,9 @@
   "pysigma": [
     "poetry-core"
   ],
+  "pysigma-backend-insightidr": [
+    "poetry-core"
+  ],
   "pysigma-backend-splunk": [
     "poetry-core"
   ],
@@ -1071,14 +1114,30 @@
   "pysigma-pipeline-sysmon": [
     "poetry-core"
   ],
+  "pysigma-pipeline-windows": [
+    "poetry-core"
+  ],
+  "pyslurm": [
+    "cython"
+  ],
   "pysmf": [
     "cython"
   ],
   "pysml": [
     "poetry-core"
   ],
+  "pysnmp-pyasn1": [
+    "poetry-core"
+  ],
+  "pysnmp-pysmi": [
+    "poetry-core"
+  ],
+  "pysnmplib": [
+    "poetry-core"
+  ],
   "pysnow": [
-    "poetry"
+    "poetry",
+    "poetry-core"
   ],
   "pysptk": [
     "cython"
@@ -1098,6 +1157,9 @@
   "pytest-httpserver": [
     "poetry-core"
   ],
+  "pytest-isort": [
+    "poetry-core"
+  ],
   "pytest-mockservers": [
     "poetry-core"
   ],
@@ -1160,6 +1222,9 @@
   "python-openstackclient": [
     "pbr"
   ],
+  "python-pae": [
+    "poetry-core"
+  ],
   "python-pkcs11": [
     "cython"
   ],
@@ -1344,6 +1409,9 @@
   "sentinel": [
     "poetry-core"
   ],
+  "seventeentrack": [
+    "poetry-core"
+  ],
   "sfepy": [
     "cython"
   ],
@@ -1576,6 +1644,9 @@
   "typing-extensions": [
     "flit-core"
   ],
+  "uharfbuzz": [
+    "cython"
+  ],
   "unpaddedbase64": [
     "poetry-core"
   ],
@@ -1621,8 +1692,14 @@
   "yoda": [
     "cython"
   ],
+  "yte": [
+    "poetry-core"
+  ],
   "zeversolarlocal": [
     "flit-core",
     "flitBuildHook"
+  ],
+  "zwave-me-ws": [
+    "poetry-core"
   ]
 }

overrides/default.nix

@@ -1203,6 +1203,29 @@ lib.composeManyExtensions [
         }
       );
 
+
+      pandas = super.pandas.overridePythonAttrs (old: {
+
+        buildInputs = old.buildInputs or [ ] ++ lib.optional stdenv.isDarwin pkgs.libcxx;
+
+        # Doesn't work with -Werror,-Wunused-command-line-argument
+        # https://github.com/NixOS/nixpkgs/issues/39687
+        hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow";
+
+        # For OSX, we need to add a dependency on libcxx, which provides
+        # `complex.h` and other libraries that pandas depends on to build.
+        postPatch = lib.optionalString stdenv.isDarwin ''
+          cpp_sdk="${lib.getDev pkgs.libcxx}/include/c++/v1";
+          echo "Adding $cpp_sdk to the setup.py common_include variable"
+          substituteInPlace setup.py \
+            --replace "['pandas/src/klib', 'pandas/src']" \
+                      "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
+        '';
+
+
+        enableParallelBuilding = true;
+      });
+
       pantalaimon = super.pantalaimon.overridePythonAttrs (old: {
         nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ pkgs.installShellFiles ];
         postInstall = old.postInstall or "" + ''

tests/default.nix

@@ -87,7 +87,8 @@ builtins.removeAttrs
   trivial-cross = skipOSX (callTest ./trivial-cross { });
 
   # Inherit test cases from nixpkgs
-  inherit (pkgs) nixops nixops_unstable;
+  nixops = pkgs.nixops;
+  nixops_unstable = skipOSX pkgs.nixops_unstable;
 
   # Rmfuse fails on darwin because osxfuse only implements fuse api v2
   rmfuse = skipOSX pkgs.rmfuse;

tools/find-build-systems.py

@@ -40,6 +40,7 @@ SKIP_ATTRS = {
     "packaging",
     "poetry",
     "flitBuildHook",
+    "platformdirs",
 }