Merge pull request #252 from fourchettes/unified_packaging_process

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
new file mode 100644 (file)
index 0000000..3645fe2
--- /dev/null
+++ b/.github/workflows/nix.yml
@@ -0,0 +1,11 @@
+name: "Nix Flake Check"
+on:
+  pull_request:
+  push:
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: cachix/install-nix-action@v19
+    - run: nix flake check

diff --git a/build/.gitignore b/haskell/build/.gitignore
similarity index 100%
rename from build/.gitignore
rename to haskell/build/.gitignore

diff --git a/build/Dockerfile b/haskell/build/Dockerfile
similarity index 89%
rename from build/Dockerfile
rename to haskell/build/Dockerfile
index f93b7376b08b761bc7ee5f05fca18a80e136dcd5..f047facd2ec468d13e72e1fecba02d470c118e54 100644 (file)
--- a/build/Dockerfile
+++ b/haskell/build/Dockerfile
@@ -6,5 +6,5 @@ RUN cp crtbeginT.o crtbeginT.o.orig
 RUN cp crtbeginS.o crtbeginT.o
 
 RUN git clone "https://github.com/b3nj5m1n/xdg-ninja" /tmp/xdg-ninja
-WORKDIR /tmp/xdg-ninja
+WORKDIR /tmp/xdg-ninja/haskell
 RUN stack install --ghc-options '-optl-static -fPIC'

diff --git a/build/build.sh b/haskell/build/build.sh
similarity index 100%
rename from build/build.sh
rename to haskell/build/build.sh

diff --git a/lib/AddProgram.hs b/haskell/lib/AddProgram.hs
similarity index 100%
rename from lib/AddProgram.hs
rename to haskell/lib/AddProgram.hs

diff --git a/lib/Checks.hs b/haskell/lib/Checks.hs
similarity index 100%
rename from lib/Checks.hs
rename to haskell/lib/Checks.hs

diff --git a/lib/EditProgram.hs b/haskell/lib/EditProgram.hs
similarity index 100%
rename from lib/EditProgram.hs
rename to haskell/lib/EditProgram.hs

diff --git a/lib/Output.hs b/haskell/lib/Output.hs
similarity index 100%
rename from lib/Output.hs
rename to haskell/lib/Output.hs

diff --git a/lib/PreviewProgram.hs b/haskell/lib/PreviewProgram.hs
similarity index 100%
rename from lib/PreviewProgram.hs
rename to haskell/lib/PreviewProgram.hs

diff --git a/lib/Program.hs b/haskell/lib/Program.hs
similarity index 100%
rename from lib/Program.hs
rename to haskell/lib/Program.hs

diff --git a/lib/Prompts.hs b/haskell/lib/Prompts.hs
similarity index 100%
rename from lib/Prompts.hs
rename to haskell/lib/Prompts.hs

diff --git a/src/add-program.hs b/haskell/src/add-program.hs
similarity index 100%
rename from src/add-program.hs
rename to haskell/src/add-program.hs

diff --git a/src/xdgnj.hs b/haskell/src/xdgnj.hs
similarity index 100%
rename from src/xdgnj.hs
rename to haskell/src/xdgnj.hs

diff --git a/stack.yaml b/haskell/stack.yaml
similarity index 100%
rename from stack.yaml
rename to haskell/stack.yaml

diff --git a/stack.yaml.lock b/haskell/stack.yaml.lock
similarity index 100%
rename from stack.yaml.lock
rename to haskell/stack.yaml.lock

diff --git a/xdg-ninja.cabal b/haskell/xdg-ninja.cabal
similarity index 100%
rename from xdg-ninja.cabal
rename to haskell/xdg-ninja.cabal

diff --git a/paradox-games.json b/programs/paradox-games.json
similarity index 100%
rename from paradox-games.json
rename to programs/paradox-games.json