Switch to using my fork of nixpkgs.

nix/configuration/flake.lock

@@ -39,11 +39,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756733629,
+        "lastModified": 1758160037,
-        "narHash": "sha256-dwWGlDhcO5SMIvMSTB4mjQ5Pvo2vtxvpIknhVnSz2I8=",
+        "narHash": "sha256-fXelTdjdILspZ1IUU9aICB1+PXwSFiF8j+7ujwo1VpQ=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "a5c4f2ab72e3d1ab43e3e65aa421c6f2bd2e12a1",
+        "rev": "4f554162fff88e77655073d352eec0cea71103a2",
         "type": "github"
       },
       "original": {
@@ -190,18 +190,18 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1756787288,
+        "lastModified": 1758242085,
-        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
+        "narHash": "sha256-hnrtEiy8qLMskZr0FBp0vbtMJ9xA4HvDdzuFRLxRiFg=",
-        "owner": "NixOS",
+        "ref": "og-amd-debug-tools",
-        "repo": "nixpkgs",
+        "rev": "7b0f433195e299008850d16e85a862177419cef6",
-        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
+        "revCount": 862645,
-        "type": "github"
+        "type": "git",
+        "url": "https://github.com/tomalexander/nixpkgs.git"
       },
       "original": {
-        "owner": "NixOS",
+        "ref": "og-amd-debug-tools",
-        "ref": "nixos-unstable",
+        "type": "git",
-        "repo": "nixpkgs",
+        "url": "https://github.com/tomalexander/nixpkgs.git"
-        "type": "github"
       }
     },
     "nixpkgs-dda3dcd3f": {
@@ -238,18 +238,18 @@
     },
     "nixpkgs-unoptimized": {
       "locked": {
-        "lastModified": 1756787288,
+        "lastModified": 1758242085,
-        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
+        "narHash": "sha256-hnrtEiy8qLMskZr0FBp0vbtMJ9xA4HvDdzuFRLxRiFg=",
-        "owner": "NixOS",
+        "ref": "og-amd-debug-tools",
-        "repo": "nixpkgs",
+        "rev": "7b0f433195e299008850d16e85a862177419cef6",
-        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
+        "revCount": 862645,
-        "type": "github"
+        "type": "git",
+        "url": "https://github.com/tomalexander/nixpkgs.git"
       },
       "original": {
-        "owner": "NixOS",
+        "ref": "og-amd-debug-tools",
-        "ref": "nixos-unstable",
+        "type": "git",
-        "repo": "nixpkgs",
+        "url": "https://github.com/tomalexander/nixpkgs.git"
-        "type": "github"
       }
     },
     "pre-commit-hooks-nix": {

nix/configuration/flake.nix

@@ -42,9 +42,11 @@
 
   inputs = {
     impermanence.url = "github:nix-community/impermanence";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    # nixpkgs.url = "github:tomalexander/nixpkgs/amd-debug-tools";
+    nixpkgs.url = "git+https://github.com/tomalexander/nixpkgs.git?ref=og-amd-debug-tools";
     nixpkgs-dda3dcd3f.url = "github:NixOS/nixpkgs/dda3dcd3fe03e991015e9a74b22d35950f264a54";
-    nixpkgs-unoptimized.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-unoptimized.url = "git+https://github.com/tomalexander/nixpkgs.git?ref=og-amd-debug-tools";
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.2";
 

nix/configuration/roles/amd_s2idle/cysystemd.nix

@@ -1,48 +0,0 @@
-{
-  lib,
-  pkgs,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-  cython,
-  pkg-config,
-  setuptools,
-}:
-
-let
-  version = "1.6.3";
-in
-buildPythonPackage {
-  pname = "cysystemd";
-  inherit version;
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "mosquito";
-    repo = "cysystemd";
-    tag = version;
-    hash = "sha256-xumrQgoKfFeKdRQUIYXXiXEcNd76i4wo/EIDm8BN7oU=";
-  };
-
-  disabled = pythonOlder "3.6";
-
-  build-system = [
-    setuptools
-    cython
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [ pkgs.systemd ];
-
-  pythonImportsCheck = [ "cysystemd" ];
-
-  meta = {
-    description = "systemd wrapper on Cython";
-    homepage = "https://github.com/mosquito/cysystemd";
-    license = lib.licenses.asl20;
-    platforms = lib.platforms.linux;
-  };
-}

nix/configuration/roles/amd_s2idle/default.nix

@@ -23,24 +23,6 @@
         environment.systemPackages = with pkgs; [
           amd-debug-tools
         ];
-        nixpkgs.overlays = [
-          (
-            final: prev:
-            let
-              innerPackage = (final.callPackage ./package.nix { });
-            in
-            {
-              amd-debug-tools = innerPackage;
-            }
-          )
-          (final: prev: {
-            pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
-              (python-final: python-prev: {
-                cysystemd = (python-final.callPackage ./cysystemd.nix { });
-              })
-            ];
-          })
-        ];
       }
     ]
   );

nix/configuration/roles/amd_s2idle/package.nix

@@ -1,58 +0,0 @@
-{
-  lib,
-  fetchgit,
-  python3Packages,
-  acpica-tools,
-  ethtool,
-  libdisplay-info,
-}:
-
-let
-  version = "0.2.7";
-in
-python3Packages.buildPythonApplication {
-  pname = "amd-debug-tools";
-  inherit version;
-  pyproject = true;
-
-  build-system = with python3Packages; [
-    setuptools
-    setuptools-git-versioning
-    setuptools-git
-    pyudev
-  ];
-  dependencies = with python3Packages; [
-    cysystemd
-    jinja2
-    matplotlib
-    pandas
-    pyudev
-    seaborn
-    tabulate
-    acpica-tools
-    ethtool
-    libdisplay-info
-  ];
-  src = fetchgit {
-    url = "https://git.kernel.org/pub/scm/linux/kernel/git/superm1/amd-debug-tools.git";
-    tag = version;
-    hash = "sha256-6X9cUKN0BkkKcYGU+YJYCGT+l5iUZDN+D8Fqq/ns98Q=";
-    leaveDotGit = true;
-  };
-
-  disabled = python3Packages.pythonOlder "3.7";
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail ', "setuptools-git-versioning>=2.0,<3"' ""
-  '';
-
-  pythonImportsCheck = [ "amd_debug" ];
-
-  meta = {
-    description = "Debug tools for AMD zen systems";
-    homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/superm1/amd-debug-tools.git/";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.linux;
-  };
-}