Modernize the Nix infrastructure

srid · Jan 12, 2024 · 4339af1 · 4339af1
1 parent 50d1a08
commit 4339af1
Show file tree

Hide file tree

Showing 16 changed files with 266 additions and 248 deletions.
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,5 @@ cabal.project.local~
 .ghc.environment.*
 result
 result-*
+
+.direnv
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -0,0 +1,12 @@
+// We use https://github.com/juspay/jenkins-nix-ci
+
+pipeline {
+    agent { label 'nixos' }
+    stages {
+        stage ('Build') {
+            steps {
+                nixCI ()
+            }
+        }
+    }
+}
diff --git a/bin/format b/bin/format
diff --git a/bin/repl b/bin/repl
diff --git a/bin/run b/bin/run
diff --git a/bin/run-via-tmux b/bin/run-via-tmux
diff --git a/commonmark-simple.cabal b/commonmark-simple.cabal
@@ -9,22 +9,21 @@ category:           Text
 
 -- TODO: Before hackage release.
 -- A short (one-line) description of the package.
-synopsis: Simple interface to commonmark-hs
+synopsis:           Simple interface to commonmark-hs
 
 -- A longer description of the package.
-description: Simple interface to parsing Markdown using commonmark-hs
+description:        Simple interface to parsing Markdown using commonmark-hs
 
 -- A URL where users can report bugs.
-bug-reports: https://github.com/srid/commonmark-simple
-
+bug-reports:        https://github.com/srid/commonmark-simple
 extra-source-files:
   LICENSE
   README.md
 
 library
   build-depends:
     , aeson
-    , base                   >=4.13.0.0 && <=4.18.0.0
+    , base                   >=4.13.0.0 && <4.18.0.0.0
     , commonmark
     , commonmark-extensions
     , commonmark-pandoc
@@ -48,7 +47,6 @@ library
     -fprint-explicit-foralls -fprint-explicit-kinds
 
   default-extensions:
-    NoStarIsType
     BangPatterns
     ConstraintKinds
     DataKinds
@@ -74,6 +72,7 @@ library
     LambdaCase
     MultiParamTypeClasses
     MultiWayIf
+    NoStarIsType
     NumericUnderscores
     OverloadedStrings
     PolyKinds

diff --git a/default.nix b/default.nix
diff --git a/flake.lock b/flake.lock