From 2f7d65ec1066e35b7bfd99b3b022764728f268de Mon Sep 17 00:00:00 2001 From: Chris Maniewski Date: Mon, 9 Dec 2024 15:31:46 +0100 Subject: [PATCH] fix: fix and update flake files --- flake.lock | 12 ++++++------ flake.nix | 17 ++++++----------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 13e5f078..ec0509b3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,24 +1,24 @@ { "nodes": { - "nixpkgs_node": { + "nixpkgs": { "locked": { - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1733015953, + "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "type": "github" } }, "root": { "inputs": { - "nixpkgs_node": "nixpkgs_node" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 3e8850c6..cbb2fad4 100644 --- a/flake.nix +++ b/flake.nix @@ -1,23 +1,18 @@ { - description = "Flake to develop the CDapp using nix(OS)"; + description = "Flake to develop the Colony docs using nix(OS)"; inputs = { - # node 20.11.0 - nixpkgs_node.url = "github:NixOS/nixpkgs/97b17f32362e475016f942bbdfda4a4a72a8a652"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; }; outputs = { self, - nixpkgs_node + nixpkgs, }: { - devShell.x86_64-linux = with nixpkgs_node.legacyPackages.x86_64-linux; + devShell.x86_64-linux = with nixpkgs.legacyPackages.x86_64-linux; mkShell { - buildInputs = [nodejs_20 nodePackages.pnpm zsh]; - shellHook = '' - if [ -n "$SHELL" ]; then - exec $SHELL - fi - ''; + buildInputs = [nodejs_20 pnpm_8 zsh]; + shellHook = "exec zsh"; }; }; }