M .github/workflows/add-artifacts-to-current-releases.yml → .github/workflows/add-artifacts-to-current-releases.yml

@@ -58,6 +58,7 @@ sh init.sh -y
           nimble install -y zippy
           nimble install -y nifty
           nifty install
+          nifty build discount
       # Build for Linux
       - name: Build (Linux)
         run: nimble build -d:release --gcc.exe:musl-gcc --gcc.linkerexe:musl-gcc --gc:orc --opt:size --deepcopy:on

M .github/workflows/ci.yml → .github/workflows/ci.yml

@@ -1,14 +1,14 @@ 
 name: CI
 
-# Controls when the action will run. 
+# Controls when the action will run.
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ master ]
-    tags-ignore: [ '**' ]
+    branches: [master]
+    tags-ignore: ["**"]
   pull_request:
-    branches: [ master ]
-    tags-ignore: [ '**' ]
+    branches: [master]
+    tags-ignore: ["**"]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -27,10 +27,10 @@ # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
-      
+
       - name: install musl-gcc
-        run: sudo apt-get install -y musl-tools 
-      
+        run: sudo apt-get install -y musl-tools
+
       - name: Update $PATH
         run: echo "$HOME/.nimble/bin" >> $GITHUB_PATH
 
@@ -41,16 +41,19 @@ sh init.sh -y
 
       - name: Install nifty
         run: nimble install -y nifty
-        
+
       - name: Install zippy
         run: nimble install zippy
-        
+
       - name: Install deps
         run: nifty install
-      
+
+      - name: Build discount
+        run: nifty build discount
+
       - name: Build
         run: nimble build -d:release --opt:size --gcc.exe:musl-gcc --gcc.linkerexe:musl-gcc --cpu:amd64 --os:linux
-      
+
       - name: Build Site
         run: |
           cd site

M hastysite.nim → hastysite.nim

@@ -11,7 +11,6 @@ std/sha1,
   logging,
   pegs
 
-{.passL: "-Lpackages/hastyscribe/src/hastyscribepkg/vendor".}
 when defined(linux):
   {.passL:"-static".}
 

M nifty.json → nifty.json

@@ -1,46 +1,59 @@ 
-{
-  "storage": "packages",
-  "commands": {
-    "install": {
-      "git+src": {
-        "cmd": "git clone {{src}} --depth 1"
-      },
-      "git+src+tag": {
-        "cmd": "git clone --branch {{tag}} {{src}} --depth 1"
-      },
-      "curl+src+name": {
-        "cmd": "curl {{src}} -o {{name}}"
-      },
-      "_syntax": "install [<package>]",
-      "_description": "Installs the specified package (or all mapped packages) to the storage directory."
-    },
-    "upgrade": {
-      "_syntax": "upgrade [<package>]",
-      "_description": "Upgrades the specified previously-installed package (or all packages).",
-      "git+name": {
-        "cmd": "git pull",
-        "pwd": "{{name}}"
-      },
-      "curl+src+name": {
-        "cmd": "curl {{src}} -o {{name}}"
-      }
-    }
-  },
-  "packages": {
-    "hastyscribe": {
-      "name": "hastyscribe",
-      "git": true,
-      "src": "https://github.com/h3rald/hastyscribe.git"
-    },
-    "min": {
-      "name": "min",
-      "git": true,
-      "src": "https://github.com/h3rald/min.git"
-    },
-    "moustachu": {
-      "name": "moustachu",
-      "src": "https://github.com/fenekku/moustachu",
-      "git": true
-    }
-  }
-}
+{
+  "storage": "packages",
+  "commands": {
+    "install": {
+      "git+src": {
+        "cmd": "git clone {{src}} --depth 1"
+      },
+      "git+src+tag": {
+        "cmd": "git clone --branch {{tag}} {{src}} --depth 1"
+      },
+      "curl+src+name": {
+        "cmd": "curl {{src}} -o {{name}}"
+      },
+      "_syntax": "install [<package>]",
+      "_description": "Installs the specified package (or all mapped packages) to the storage directory."
+    },
+    "build": {
+      "name+configure.sh": {
+        "pwd": "{{name}}",
+        "cmd": "sh configure.sh --github-checkbox=input && make"
+      }
+    },
+    "upgrade": {
+      "_syntax": "upgrade [<package>]",
+      "_description": "Upgrades the specified previously-installed package (or all packages).",
+      "git+name": {
+        "cmd": "git pull",
+        "pwd": "{{name}}"
+      },
+      "curl+src+name": {
+        "cmd": "curl {{src}} -o {{name}}"
+      }
+    }
+  },
+  "packages": {
+    "discount": {
+      "configure.sh": true,
+      "name": "discount",
+      "src": "https://github.com/Orc/discount.git",
+      "tag": "v2.2.7",
+      "git": true
+    },
+    "hastyscribe": {
+      "name": "hastyscribe",
+      "git": true,
+      "src": "https://github.com/h3rald/hastyscribe.git"
+    },
+    "min": {
+      "name": "min",
+      "git": true,
+      "src": "https://github.com/h3rald/min.git"
+    },
+    "moustachu": {
+      "name": "moustachu",
+      "src": "https://github.com/fenekku/moustachu",
+      "git": true
+    }
+  }
+}