From 7d7f6281756bcf9f3c630b30a1ccd29fb1be11eb Mon Sep 17 00:00:00 2001 From: Paul Brinkmeier Date: Sat, 22 Feb 2025 19:26:10 +0100 Subject: [PATCH] Bump nixpkgs --- flake.lock | 8 ++++---- flake.nix | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 01af637..103bed3 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1703693486, - "narHash": "sha256-tuzNTOs+1zR2BEVKKrRRGdpR/n095AXIcT8Me1px2bI=", + "lastModified": 1740243248, + "narHash": "sha256-GJ/fV5AE+4i38/eXmAgBZs4lKYXfScpxPYviUV8ujlk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "671c2d3e1506a7ee1583515ca80cb3474fdc9c95", + "rev": "a6c4bfe37c51686c042b4bdb4e650a9414e96680", "type": "github" }, "original": { "owner": "nixos", - "ref": "release-23.11", + "ref": "release-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index d8b8512..ab3f209 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Unicode toy"; - inputs.nixpkgs.url = "github:nixos/nixpkgs/release-23.11"; + inputs.nixpkgs.url = "github:nixos/nixpkgs/release-24.11"; outputs = { self, nixpkgs }: let @@ -9,6 +9,10 @@ utoy = pkgs.haskellPackages.developPackage { root = ./.; + overrides = self: super: { + unicode-data = super.unicode-data_0_6_0; + unicode-data-names = pkgs.haskell.lib.markUnbroken super.unicode-data-names; + }; }; in { packages.x86_64-linux = rec { @@ -25,6 +29,10 @@ devShells.x86_64-linux.default = (pkgs.haskellPackages.developPackage { root = ./.; + overrides = self: super: { + unicode-data = super.unicode-data_0_6_0; + unicode-data-names = pkgs.haskell.lib.markUnbroken super.unicode-data-names; + }; modifier = drv: pkgs.haskell.lib.addBuildTools drv [ pkgs.cabal-install