From a4867fb9633e079c8c8698b7535c19ad8342edd5 Mon Sep 17 00:00:00 2001 From: Peter Becich Date: Sat, 23 Mar 2024 16:36:02 -0700 Subject: [PATCH] `nix flake update` --- flake.lock | 12 ++++++------ flake.nix | 18 +++++++++++++----- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 6075d613..df0c2e83 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ }, "haskell-flake": { "locked": { - "lastModified": 1709467224, - "narHash": "sha256-xnPTkLMqq78BiTqt6WXj2TXLupclJi+NEH84HDbQSPc=", + "lastModified": 1711376786, + "narHash": "sha256-AgTchS11b8y7RGLKv6tsHPuzthcgDok4VIpqq+BG5O4=", "owner": "srid", "repo": "haskell-flake", - "rev": "9173cc45aeb72b7e7adfe0e5a53a425fe439e3ca", + "rev": "b5bfa21723e55590e92f4896d7bc3ad212cf425a", "type": "github" }, "original": { @@ -52,11 +52,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1709856773, - "narHash": "sha256-QJ3yNJLhfDZbln1HEhIGXmPlwqCk22MbyicFNfSVs3A=", + "lastModified": 1711411942, + "narHash": "sha256-xY4gqwF9i7PFHhpWIdtUjUsp/bFG7EtHtg0cwqXm4Jw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a32bb438c0219345fc535b4f910da21fa4c4aaa2", + "rev": "39a71cf239c585c3b740f94760ed20695acfcc35", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a8b1d18d..2cb86903 100644 --- a/flake.nix +++ b/flake.nix @@ -19,18 +19,26 @@ # has only one. packages.default = config.packages.hackage-server; haskellProjects.default = { + # basePackages = pkgs.haskell.packages.ghc98; settings = { hackage-server.check = false; - ap-normalize.check = false; # https://community.flake.parts/haskell-flake/dependency#nixpkgs tar = { super, ... }: - { custom = _: super.tar_0_6_1_0; }; - # tasty = { super, ... }: - # { custom = _: super.tasty_1_5; }; + { custom = _: super.tar_0_6_2_0; }; + tls = { super, ... }: + { custom = _: super.tls_2_0_1; }; + tls-session-manager = { super, ... }: + { custom = _: super.tls-session-manager_0_0_5; }; + tasty = { super, ... }: + { custom = _: super.tasty_1_5; }; + logict.jailbreak = true; + integer-logarithms.jailbreak = true; + time-compat.jailbreak = true; + indexed-traversable-instances.jailbreak = true; }; packages = { # https://community.flake.parts/haskell-flake/dependency#path - tls.source = "1.9.0"; + # tls.source = "1.9.0"; }; devShell = { tools = hp: {