From eecb3fa483fd0022f619495d984060d4498cff77 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sat, 8 Jan 2022 11:39:25 -0500 Subject: [PATCH] Advance nixpkgs, and other inputs --- README.md | 2 +- flake.lock | 20 ++++++++++---------- flake.nix | 5 ++++- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index dd6c775..efe0c31 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ cd .. && mv haskell-template ${NAME} && cd ${NAME} ## Tips -- Run `nix flake update` to nixpkgs and other flake inputs. +- Run `nix flake update` to update all flake inputs. nixpkgs is pinned to a specific a rev, which you can advance to the latest rev reported in [status.nixos.org](https://status.nixos.org). ## Alternatives diff --git a/flake.lock b/flake.lock index 8bdadcf..a4a99f7 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1627913399, - "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "lastModified": 1641205782, + "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", "type": "github" }, "original": { @@ -18,11 +18,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1631561581, - "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "lastModified": 1638122382, + "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", "type": "github" }, "original": { @@ -33,17 +33,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1638553308, - "narHash": "sha256-qlHRqp+7gJj+LUNfEl01M9xHQoX2Bx4e1ha/nssXSo8=", + "lastModified": 1641577433, + "narHash": "sha256-T7lS8vpbC3dgtrkb2ueC9HWaX4RYUwdP7IEttnvKQ8Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2df15ba83d0510a56f2583fd3481723835acb5a1", + "rev": "568e0bc498ee51fdd88e1e94089de05f2fdbd18b", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "2df15ba83d0510a56f2583fd3481723835acb5a1", + "rev": "568e0bc498ee51fdd88e1e94089de05f2fdbd18b", "type": "github" } }, diff --git a/flake.nix b/flake.nix index f7a3613..95d41e9 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "haskell-template's description"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/2df15ba83d0510a56f2583fd3481723835acb5a1"; + nixpkgs.url = "github:nixos/nixpkgs/568e0bc498ee51fdd88e1e94089de05f2fdbd18b"; flake-utils.url = "github:numtide/flake-utils"; flake-compat = { url = "github:edolstra/flake-compat"; @@ -38,6 +38,9 @@ overrides = self: super: with pkgs.haskell.lib; { # Use callCabal2nix to override Haskell dependencies here # cf. https://tek.brick.do/K3VXJd8mEKO7 + # Example: + # > NanoID = self.callCabal2nix "NanoID" inputs.NanoID { }; + # Assumes that you have the 'NanoID' flake input defined. }; modifier = drv: pkgs.haskell.lib.addBuildTools drv