From 4c89a05e46b5d1bdbb1f29da2d1d433a125cc2d8 Mon Sep 17 00:00:00 2001
From: atse <atse@m-labs.hk>
Date: Wed, 29 Nov 2023 12:10:14 +0800
Subject: [PATCH] Update nix repos and use repo qasync and pyqtgraph

Now that they are updated, no reason to use our own.
---
 flake.lock |  8 ++++----
 flake.nix  | 29 +++--------------------------
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/flake.lock b/flake.lock
index 79fe89d..21877f4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,16 +18,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1691421349,
-        "narHash": "sha256-RRJyX0CUrs4uW4gMhd/X4rcDG8PTgaaCQM5rXEJOx6g=",
+        "lastModified": 1701156937,
+        "narHash": "sha256-jpMJOFvOTejx211D8z/gz0ErRtQPy6RXxgD2ZB86mso=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "011567f35433879aae5024fc6ec53f2a0568a6c4",
+        "rev": "7c4c20509c4363195841faa6c911777a134acdf3",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 824bf39..d451e84 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   description = "Firmware for the Sinara 8451 Thermostat";
 
-  inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05;
+  inputs.nixpkgs.url = github:NixOS/nixpkgs/nixos-23.11;
   inputs.mozilla-overlay = { url = github:mozilla/nixpkgs-mozilla; flake = false; };
 
   outputs = { self, nixpkgs, mozilla-overlay }:
@@ -56,39 +56,16 @@
         dontFixup = true;
       };
 
-      qasync = pkgs.python3Packages.buildPythonPackage rec {
-        pname = "qasync";
-        version = "0.27.1";
-        format = "pyproject";
-        src = pkgs.fetchPypi {
-          inherit pname version;
-          sha256 = "sha256-jcdo/R7l3hBEx8MF7M8tOdJNh4A+pxGJ1AJPtHX0mF8=";
-        };
-        buildInputs = [ pkgs.python3Packages.poetry-core ];
-        propagatedBuildInputs = [ pkgs.python3Packages.pyqt6 ];
-      };
-
-      pyqtgraph = pkgs.python3Packages.buildPythonPackage rec {
-        pname = "pyqtgraph";
-        version = "0.13.3";
-        format = "pyproject";
-        src = pkgs.fetchPypi {
-          inherit pname version;
-          sha256 = "sha256-WBCNhBHHBU4IQdi3ke6F4QH8KWubNZwOAd3jipj/Ks4=";
-        };
-        propagatedBuildInputs = with pkgs.python3Packages; [ numpy pyqt6 ];
-      };
-
       pglive = pkgs.python3Packages.buildPythonPackage rec {
         pname = "pglive";
         version = "0.7.2";
         format = "pyproject";
         src = pkgs.fetchPypi {
           inherit pname version;
-          sha256 = "sha256-jqj8X6H1N5mJQ4OrY5ANqRB0YJByqg/bNneEALWmH1A=";
+          hash = "sha256-jqj8X6H1N5mJQ4OrY5ANqRB0YJByqg/bNneEALWmH1A=";
         };
         buildInputs = [ pkgs.python3Packages.poetry-core ];
-        propagatedBuildInputs = [ pyqtgraph pkgs.python3Packages.numpy ];
+        propagatedBuildInputs = with pkgs.python3Packages; [ pyqtgraph numpy ];
       };
 
       thermostat_gui = pkgs.python3Packages.buildPythonPackage {