From 0f47fbb7a7e929f16a914810e4d037eafb3b0ed1 Mon Sep 17 00:00:00 2001
From: Shae Erisson <shae@scannedinavian.com>
Date: Wed, 28 Feb 2024 17:16:47 -0500
Subject: [PATCH] update to nixos-23.11 so we can use ghc 9.6
---
flake.nix | 12 +++++++-----
lib.nix | 12 ++++++------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/flake.nix b/flake.nix
index f92c817..d1cfa09 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,12 +2,14 @@
description = "a Nix flake library for Haskell projects";
inputs = {
- nixpkgs.url = github:nixos/nixpkgs?ref=nixos-22.11;
- flake-utils.url = github:numtide/flake-utils;
+ nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-23.11";
+ flake-utils.url = "github:numtide/flake-utils";
flake-utils.inputs.nixpkgs.follows = "nixpkgs";
- pre-commit-hooks.url = github:cachix/pre-commit-hooks.nix;
- pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
- pre-commit-hooks.inputs.flake-utils.follows = "flake-utils";
+ pre-commit-hooks = {
+ url = "github:cachix/pre-commit-hooks.nix";
+ inputs.nixpkgs.follows = "nixpkgs";
+ inputs.flake-utils.follows = "flake-utils";
+ };
};
outputs = {
diff --git a/lib.nix b/lib.nix
index 6d2e752..97103ae 100644
--- a/lib.nix
+++ b/lib.nix
@@ -22,12 +22,13 @@ let
} // (hsPkgsOverrides hfinal hprev);
};
in
+
rec {
- checks = { }: {
- pre-commit-check = preCommitCheck { };
+ checks = _: {
+ pre-commit-check = preCommitCheck _;
};
- preCommitCheck = { }:
+ preCommitCheck = _:
pre-commit-hooks.lib.${pkgs.system}.run {
inherit src;
hooks = {
@@ -65,12 +66,11 @@ rec {
# haskellPackages.fourmolu
haskellPackages.ghcid
hsPkgs.haskell-language-server
- # nodePackages.serve
] ++ (extraBuildInputs pkgs);
};
};
- packages = { }: flake-utils.lib.flattenTree rec {
+ packages = _: flake-utils.lib.flattenTree rec {
default = hsPkgs.${packageName};
${packageName} = default;
};
@@ -141,7 +141,7 @@ rec {
};
# Upload a candidate or (with `--publish`) publish a release.
- release = { }: {
+ release = _: {
type = "app";
program = "${
pkgs.writeShellApplication {
--
GitLab