From b97e23b1f439ed345c1a012b53b09b6eaab179ef Mon Sep 17 00:00:00 2001 From: James Brock Date: Wed, 22 May 2024 16:36:57 +0900 Subject: [PATCH] nix develop nixos-23.11, ghc948 --- flake.lock | 8 ++++---- flake.nix | 8 +++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 8d68527..21d8a3a 100644 --- a/flake.lock +++ b/flake.lock @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683408522, - "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", + "lastModified": 1716218643, + "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", + "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 3aa52b7..ae141bf 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ { description = "replace-megaparsec"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = inputs: @@ -12,16 +12,14 @@ packageOverrides = hfinal: hprev: prev.haskell.packageOverrides hfinal hprev // { replace-megaparsec = hfinal.callCabal2nix "replace-megaparsec" ./. { }; - # https://github.com/ddssff/listlike/issues/23 - ListLike = prev.haskell.lib.dontCheck hprev.ListLike; }; }; }; perSystem = system: let pkgs = import inputs.nixpkgs { inherit system; overlays = [ overlay ]; }; - # hspkgs = pkgs.haskellPackages; - hspkgs = pkgs.haskell.packages.ghc944; + hspkgs = pkgs.haskellPackages; + # hspkgs = pkgs.haskell.packages.ghc944; in { devShell = hspkgs.shellFor {