diff --git a/flake.lock b/flake.lock index 3a64c79..4858a52 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1705625727, - "narHash": "sha256-naMq6+TNLpEiBBjc0XaCbMLYJxJXWTZz4JGSpYGgIOM=", + "lastModified": 1719249093, + "narHash": "sha256-0q1haa3sw6GbmJ+WhogMnducZGjEaCa/iR6hF2vq80I=", "owner": "ipetkov", "repo": "crane", - "rev": "8f515142e805dc377cf8edb0ff75d14a11307f89", + "rev": "9791c77eb7e98b8d8ac5b0305d47282f994411ca", "type": "github" }, "original": { @@ -28,11 +28,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1708150887, - "narHash": "sha256-lyEaeShLZqQtFO+ULLfxF9fYaYpTal0Ck1B+iKYBOMs=", + "lastModified": 1719383337, + "narHash": "sha256-7aKGFBZbcKknVrjIX/N+n4sgHCT+vdvWYWMojQml8Fk=", "owner": "nix-community", "repo": "fenix", - "rev": "761431323e30846bae160e15682cfa687c200606", + "rev": "773bb2f15cebb936259f460f6fcfdd90019692ab", "type": "github" }, "original": { @@ -55,32 +55,16 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -89,53 +73,13 @@ "type": "github" } }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1711487526, - "narHash": "sha256-UzWAyEd171lA5XtwDpo77Ahy/2yduATyoZrwD0UQBJ0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "4bb051adec18a10b7efbb4a612a83c1c1b8d38a0", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, - "nix": { - "inputs": { - "flake-compat": "flake-compat_2", - "libgit2": "libgit2", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1711461841, - "narHash": "sha256-iRtvOcJbohyhav+deEajI/Ln/LU/6WqSfLyXDQaNEro=", - "owner": "NixOS", - "repo": "nix", - "rev": "3272ed0d5813175ea240ce2dfadf9de24c9d14ae", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "latest-release", - "repo": "nix", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1705697961, - "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=", + "lastModified": 1719317636, + "narHash": "sha256-bu0xbu2Z6DDzA9LGV81yJunIti6r7tjUImeR8orAL/I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc", + "rev": "9c513fc6fb75142f6aec6b7545cb8af2236b80f5", "type": "github" }, "original": { @@ -145,29 +89,12 @@ "type": "github" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "root": { "inputs": { "crane": "crane", "fenix": "fenix", "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nix": "nix", "nixpkgs": "nixpkgs", "treefmt-nix": "treefmt-nix" } @@ -175,11 +102,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1708018577, - "narHash": "sha256-B75VUqKvQeIqAUnYw4bGjY3xxrCqzRBJHLbmD0MAWEw=", + "lastModified": 1719378198, + "narHash": "sha256-c1jWpdPlZyL6/a0pWa30680ivP7nMLNBPuz5hMGoifg=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "b9b0d29b8e69b02457cfabe20c4c69cdb45f3cc5", + "rev": "b33a0cae335b85e11a700df2d9a7c0006a3b80ec", "type": "github" }, "original": { @@ -211,11 +138,11 @@ ] }, "locked": { - "lastModified": 1718522839, - "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", + "lastModified": 1719243788, + "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", + "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2690451..cbac349 100644 --- a/flake.nix +++ b/flake.nix @@ -6,8 +6,6 @@ inputs.fenix.url = "github:nix-community/fenix"; inputs.flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"; inputs.flake-utils.url = "github:numtide/flake-utils"; - inputs.nix.inputs.nixpkgs.follows = "nixpkgs"; - inputs.nix.url = "github:NixOS/nix/latest-release"; inputs.treefmt-nix.url = "github:numtide/treefmt-nix"; inputs.treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; @@ -17,7 +15,6 @@ fenix, flake-compat, flake-utils, - nix, nixpkgs, treefmt-nix, }: let @@ -26,8 +23,8 @@ flake-utils.lib.eachDefaultSystem (system: let pkgs = nixpkgs.legacyPackages.${system}; toolchain = fenix.packages.${system}.stable.completeToolchain; - craneLib = crane.lib.${system}.overrideToolchain toolchain; - nixDrv = nix.packages.${system}.nix; + craneLib = (crane.mkLib pkgs).overrideToolchain toolchain; + nixDrv = pkgs.nixVersions.nix_2_21; isolatedNix = postfix: pkgs.symlinkJoin { diff --git a/src/main.rs b/src/main.rs index 5ce1338..ae1098f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -67,10 +67,6 @@ async fn main() -> anyhow::Result<()> { } } -#[derive(Debug, Clone, derive_more::Display)] -#[display("{}", _0)] -struct Eprintln(String); - #[derive(Debug, derive_more::Deref)] struct PtyLine(String);