Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tahoe-ssk
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
PrivateStorage
tahoe-ssk
Commits
7eaf686f
Commit
7eaf686f
authored
1 year ago
by
Jean-Paul Calderone
Browse files
Options
Downloads
Patches
Plain Diff
bump hs-flake-utils and use the new write-cabal-project helper
parent
e6aa53d8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!19
Release 0.3.0.0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
flake.lock
+4
-4
4 additions, 4 deletions
flake.lock
flake.nix
+6
-22
6 additions, 22 deletions
flake.nix
with
10 additions
and
26 deletions
flake.lock
+
4
−
4
View file @
7eaf686f
...
...
@@ -216,11 +216,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 169
2187439
,
"narHash": "sha256-
m7c4EPFWmB1OmV3dSYQk2qtXR53xOjZdLCjMtzHSK34
=",
"lastModified": 169
6619796
,
"narHash": "sha256-
4PjNRfnk22EuGCu7mF2sAb3JtaWKuBdgew4frd+Xpts
=",
"ref": "main",
"rev": "
408f3deab2e2f6ae60349776dde02c44f71fb386
",
"revCount": 1
6
,
"rev": "
8887555c96886d81d671fb68a3a2d000e578c4e0
",
"revCount": 1
9
,
"type": "git",
"url": "https://whetstone.private.storage/jcalderone/hs-flake-utils.git"
},
...
...
This diff is collapsed.
Click to expand it.
flake.nix
+
6
−
22
View file @
7eaf686f
...
...
@@ -46,7 +46,7 @@
checks
=
hslib
.
checks
{};
devShells
=
hslib
.
devShells
{
shellHook
=
''
nix run .#
genera
te-cabal-project
nix run .#
wri
te-cabal-project
''
;
extraBuildInputs
=
pkgs
:
with
pkgs
;
[
...
...
@@ -56,27 +56,11 @@
packages
=
hslib
.
packages
{};
apps
.
hlint
=
hslib
.
apps
.
hlint
{};
apps
.
generate-cabal-project
=
{
type
=
"app"
;
program
=
"
${
pkgs
.
writeShellApplication
{
name
=
"generate-cabal-project"
;
text
=
''
cat >cabal.project.local <<EOF
-- This file is auto-generated by the flake devShell's shellHook. Do
-- not edit this file. Make changes in flake.nix.
tests: true
packages:
-- These aren't released on hackage yet so we have to get them
-- another way. Here, we get them from the Nix store.
-- tahoe-chk
${
tahoe-chk
}
-- tahoe-capabilities
${
tahoe-capabilities
}
EOF
''
;
}
}
/bin/generate-cabal-project"
;
apps
.
write-cabal-project
=
hslib
.
apps
.
write-cabal-project
{
localPackages
=
{
"tahoe-chk"
=
tahoe-chk
.
sourceInfo
.
outPath
;
"tahoe-capabilities"
=
tahoe-capabilities
.
sourceInfo
.
outPath
;
};
};
apps
.
cabal-test
=
hslib
.
apps
.
cabal-test
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment