From c9f486be9b305f0abb6ada8ba89894fca06c0f6f Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 3 Jul 2023 14:51:08 -0700 Subject: [PATCH] Revert "update nix to 23.05" This reverts commit fe657648325df2c7645aca762279fdcc30296948. --- flake.lock | 14 +++++++------- flake.nix | 2 +- nix/devshell.nix | 7 +++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 6483ce0e5..3b2739b62 100644 --- a/flake.lock +++ b/flake.lock @@ -64,27 +64,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1688409007, - "narHash": "sha256-4wWwle3V7x4gTGdfBhAvrYK2CV6fJZKhTfS6ncHU7LY=", + "lastModified": 1670114716, + "narHash": "sha256-Nu55yMyh77xOz4EMrgkS70awxL/Guh6SzG1XLAUHJLc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4f751ba5aae4b9c495a2607630c6773729be4ae2", + "rev": "4a8306947aa965121c7c38221d6f73e438a5d55e", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-23.05", + "ref": "release-22.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1688221086, - "narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=", + "lastModified": 1670086663, + "narHash": "sha256-hT8C8AQB74tdoCPwz4nlJypLMD7GI2F5q+vn+VE/qQk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825", + "rev": "813836d64fa57285d108f0dbf2356457ccd304e3", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3202d16a2..26b387158 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "ghostty"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/release-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/release-22.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; flake-utils.url = "github:numtide/flake-utils"; zig.url = "github:mitchellh/zig-overlay"; diff --git a/nix/devshell.nix b/nix/devshell.nix index 4ae248888..1f627c5ac 100644 --- a/nix/devshell.nix +++ b/nix/devshell.nix @@ -8,7 +8,7 @@ , nodejs , parallel , pkg-config -, python3 +, python , scdoc , tracy , valgrind @@ -78,8 +78,9 @@ in mkShell rec { nodejs # Testing + gdb parallel - python3 + python tracy vttest @@ -91,8 +92,6 @@ in mkShell rec { debugedit flatpak-builder - # Testing - gdb valgrind wraptest ];