From 2c349d14a412e6a669fbc546941e7181474cd5d9 Mon Sep 17 00:00:00 2001
From: Jake Arkinstall <65358059+jake-arkinstall@users.noreply.github.com>
Date: Tue, 30 Jul 2024 14:45:52 +0100
Subject: [PATCH] Added nix-community cachix, pinned to tket's nixpkgs, added
 sympy to mypy ignore list

---
 flake.lock | 26 ++++++++++++++------------
 flake.nix  |  6 +++---
 mypy.ini   |  4 ++--
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index d3959756..eaae203b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,15 +38,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719235230,
-        "narHash": "sha256-o2mvJJxQ0dE7YHJsWjO8nMfWCvZQHAC9DAtiMc3GSBs=",
-        "owner": "NixOS",
+        "lastModified": 1722087241,
+        "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6acfb07b7ff392f1cdfe2dfb96f21cb919ca359d",
+        "rev": "8c50662509100d53229d4be607f1a3a31157fa12",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -54,7 +55,10 @@
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": [
+          "tket",
+          "nixpkgs"
+        ],
         "tket": "tket"
       }
     },
@@ -91,16 +95,14 @@
     "tket": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1718711031,
-        "narHash": "sha256-sAYbO/qXZ61Y3Yk2K1VQU+ER+dGOgIZeeNM9FPe27iI=",
+        "lastModified": 1722327570,
+        "narHash": "sha256-e4T0mMg+zGd+PlaY3OXOGQ6gclbwjVoapRlnHJ6gDf0=",
         "owner": "CQCL",
         "repo": "tket",
-        "rev": "d5451418f257e0aee61244aed56714b894c0ef09",
+        "rev": "da1f491059b608701701da6202abb96c67ac6031",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index aba8a503..05266460 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,15 +1,15 @@
 {
   description = "Pytket Cutensornet Extension";
-  nixConfig.extra-substituters = "https://tket.cachix.org https://cache.nixos.org https://cuda-maintainers.cachix.org";
+  nixConfig.extra-substituters = "https://tket.cachix.org https://cache.nixos.org https://cuda-maintainers.cachix.org https://nix-community.cachix.org";
   nixConfig.trusted-public-keys = ''
     tket.cachix.org-1:ACdm5Zg19qPL0PpvUwTPPiIx8SEUy+D/uqa9vKJFwh0=
     cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
     cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E=
+    nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=
   '';
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs";
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.tket.url = "github:CQCL/tket";
-  inputs.tket.inputs.nixpkgs.follows = "nixpkgs";
+  inputs.nixpkgs.follows = "tket/nixpkgs";
   outputs = { self, nixpkgs, flake-utils, tket }:
     flake-utils.lib.eachDefaultSystem (system:
       let
diff --git a/mypy.ini b/mypy.ini
index 485c9c7d..a136fddc 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -19,10 +19,10 @@ warn_no_return = False
 warn_return_any = True
 warn_unreachable = True
 
-[mypy-pytest.*]
+[mypy-lark.*]
 ignore_missing_imports = True
 ignore_errors = True
 
-[mypy-lark.*]
+[mypy-sympy.*]
 ignore_missing_imports = True
 ignore_errors = True