diff --git a/arm7tdmi/src/arm/exec.rs b/arm7tdmi/src/arm/exec.rs index 417955d..ef3984d 100644 --- a/arm7tdmi/src/arm/exec.rs +++ b/arm7tdmi/src/arm/exec.rs @@ -1,5 +1,3 @@ -use bit::BitIndex; - use crate::{ alu::*, memory::{MemoryAccess, MemoryInterface}, diff --git a/flake.lock b/flake.lock index 3ca045c..ac72795 100644 --- a/flake.lock +++ b/flake.lock @@ -21,55 +21,6 @@ "type": "github" } }, - "flake-utils": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixgl": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1685908677, - "narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=", - "owner": "guibou", - "repo": "nixGL", - "rev": "489d6b095ab9d289fe11af0219a9ff00fe87c7c5", - "type": "github" - }, - "original": { - "owner": "guibou", - "repo": "nixGL", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1660551188, - "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "441dc5d512153039f19ef198e662e4f3dbb9fd65", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1710272261, @@ -89,7 +40,6 @@ "root": { "inputs": { "fenix": "fenix", - "nixgl": "nixgl", "nixpkgs-unstable": "nixpkgs-unstable", "utils": "utils" } diff --git a/flake.nix b/flake.nix index 64b984e..4de1b74 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,6 @@ nixpkgs-unstable, utils, fenix, - nixgl, ... }: utils.lib.eachDefaultSystem @@ -23,7 +22,7 @@ system: let pkgs = import nixpkgs-unstable { inherit system; - overlays = [fenix.overlays.default nixgl.overlay]; + overlays = [fenix.overlays.default]; }; toolchain = pkgs.fenix.complete; in rec