From 116546725f496aa7cad32328b4c0105a7e9a5b57 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 16 Aug 2023 08:06:08 -0400
Subject: [PATCH] get `release` and `cabal-test` from hs-flake-utils
---
flake.lock | 8 ++++----
flake.nix | 23 ++++-------------------
2 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/flake.lock b/flake.lock
index e3c3233..17b6fae 100644
--- a/flake.lock
+++ b/flake.lock
@@ -216,11 +216,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
- "lastModified": 1686149618,
- "narHash": "sha256-/IHWacNutk3tklouWOgClp7FnOH+Yk6If13kKJMSEi8=",
+ "lastModified": 1692187439,
+ "narHash": "sha256-m7c4EPFWmB1OmV3dSYQk2qtXR53xOjZdLCjMtzHSK34=",
"ref": "main",
- "rev": "49696f704eb965f57d729871c6d450ac0aff2b68",
- "revCount": 12,
+ "rev": "408f3deab2e2f6ae60349776dde02c44f71fb386",
+ "revCount": 16,
"type": "git",
"url": "https://whetstone.private.storage/jcalderone/hs-flake-utils.git"
},
diff --git a/flake.nix b/flake.nix
index 5e6120b..4fe75f9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -79,25 +79,10 @@
}/bin/generate-cabal-project";
};
- # Using the working directory of `nix run`, do a build with cabal and
- # then run the test suite.
- apps.cabal-test = {
- type = "app";
- program = "${
- pkgs.writeShellApplication {
- name = "cabal-build-and-test";
- runtimeInputs = with pkgs; [pkg-config haskell.compiler.${ghcVersion} cabal-install];
-
- text = ''
- set -ex
- nix run .#generate-cabal-project
- cabal update hackage.haskell.org
- cabal build --enable-tests
- runtests=$(cabal list-bin --enable-tests tahoe-ssk-test)
- eval "$runtests"
- '';
- }
- }/bin/cabal-build-and-test";
+ apps.cabal-test = hslib.apps.cabal-test {
+ preBuild = "nix run .#generate-cabal-project";
};
+
+ apps.release = hslib.apps.release {};
});
}
--
GitLab