Merge branch 'bump-rolling' into bump-rolling

cachix · Jun 24, 2024 · 9eda71f · 9eda71f
2 parents 9693852 + 285676e
commit 9eda71f
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 0 deletions.
diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix
@@ -23,6 +23,8 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.7";
 
+  doCheck = false;
+
   src = fetchFromGitHub {
     owner = "seperman";
     repo = "deepdiff";

diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix
@@ -53,11 +53,21 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+<<<<<<< bump-rolling
   checkInputs = [ cacert ] ++ passthru.optional-dependencies.DNSSEC;
+=======
+  doCheck = false;
+
+  checkInputs = [
+    cacert
+  ] ++ passthru.optional-dependencies.DNSSEC;
+>>>>>>> bump-rolling
 
   disabledTests = [
     # dns.exception.SyntaxError: protocol not found
     "test_misc_good_WKS_text"
+    # https://github.com/NixOS/nixpkgs/pull/289916#issuecomment-2001972844
+    "test_basic_getaddrinfo"
   ];
 
   pythonImportsCheck = [ "dns" ];

diff --git a/pkgs/servers/search/meilisearch/Cargo.lock b/pkgs/servers/search/meilisearch/Cargo.lock
diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix
@@ -1,3 +1,4 @@
+<<<<<<< bump-rolling
 {
   stdenv,
   lib,
@@ -11,6 +12,20 @@
 
 let
   version = "1.8.3";
+=======
+{ stdenv
+, lib
+, rustPlatform
+, fetchFromGitHub
+, Security
+, SystemConfiguration
+, nixosTests
+, nix-update-script
+, libclang
+}:
+
+let version = "1.7.6";
+>>>>>>> bump-rolling
 in
 rustPlatform.buildRustPackage {
   pname = "meilisearch";
@@ -20,7 +35,11 @@ rustPlatform.buildRustPackage {
     owner = "meilisearch";
     repo = "MeiliSearch";
     rev = "refs/tags/v${version}";
+<<<<<<< bump-rolling
     hash = "sha256-R074dn9kWxHf5loq/K4aLWvrJwpt7YAigNU0YHc0mRg=";
+=======
+    hash = "sha256-LsJM7zkoiu5LZb/rhnZaAS/wVNH8b6YZ+vNEE1wVIIk=";
+>>>>>>> bump-rolling
   };
 
   cargoBuildFlags = [ "--package=meilisearch" ];
@@ -44,6 +63,8 @@ rustPlatform.buildRustPackage {
     SystemConfiguration
   ];
 
+  env.LIBCLANG_PATH = "${libclang.lib}/lib";
+
   passthru = {
     updateScript = nix-update-script { };
     tests = {