Bump nix and dhall (#102)

Author: berewt

.github/workflows/nix-test.yml

@@ -3,24 +3,24 @@ on:
   pull_request:
   push:
     branches:
-      - 'main'
+      - "main"
 jobs:
   test-matrix:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-    - name: Set up nix
-      uses: cachix/install-nix-action@v18
-    - name: Start cachix
-      uses: cachix/cachix-action@v12
-      with:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Set up nix
+        uses: cachix/install-nix-action@v31
+      - name: Start cachix
+        uses: cachix/cachix-action@v15
+        with:
           name: replica
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - name: Test build
-      run: nix build
-    - name: Run tests
-      run: nix flake check --show-trace
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+      - name: Test build
+        run: nix build
+      - name: Run tests
+        run: nix flake check --show-trace

.gitignore

@@ -18,5 +18,5 @@ examples/.replica
 src/Replica/Version.idr
 
 /build
-/submodules
-
+/depends
+/result

.replica/test/fileREPL/expected

@@ -1,3 +1,3 @@
 1/1: Building Test (Test.idr)
-Test> "Hello, World!"
+Test> "Hello, World!"
 Test> Bye for now!

.replica/test/packageREPL/expected

@@ -1,4 +1,4 @@
 1/1: Building Test (Test.idr)
 Test> Imported module Test
-Test> "Hello, World!"
+Test> "Hello, World!"
 Test> Bye for now!

.replica/test/rawREPL/expected

@@ -1,2 +1,2 @@
-Main> Just "work!"
+Main> Just "work!"
 Main> Bye for now!

Makefile

@@ -9,14 +9,15 @@ REPLICA_TESTS_DHALL := $(wildcard ./tests/replica/*/*.dhall)
 REPLICA_TESTS := $(REPLICA_TESTS_DHALL:.dhall=.json)
 REPLICA_EXE := build/exec/replica
 
-META_DHALL := $(wildcard ./tests/META/*.dhall)
+META_DHALL := $(wildcard ./tests/Meta/*.dhall)
 TEST_INCLUDE_DHALL := $(wildcard ./tests/*.dhall)
 
 DEST = ${HOME}/.local/bin
 
 build: src/Replica/Version.idr
 	idris2 --build replica.ipkg
 
+# Generate the version module in Idris from version.nix
 src/Replica/Version.idr: version.nix
 	echo "module Replica.Version" > src/Replica/Version.idr
 	echo "" >> src/Replica/Version.idr
@@ -35,13 +36,14 @@ clean-test:
 clean: clean-test
 	${RM} -r build
 
+# Generate JSON from Dhall
 .dhall.json:
 	dhall-to-json --file $? --output $@
 
 ${TEST}: ${TEST_DHALL} ${TEST_INCLUDE_DHALL}
 	dhall-to-json --file ${TEST_DHALL} --output $@
 
-freeze: ${TEST_DHALL} ${META_DHALL} ${TEST_INCLUDE_DHALL}
+freeze: ${TEST_DHALL} ${META_DHALL} ${TEST_INCLUDE_DHALL} ${REPLICA_TESTS_DHALL}
 	dhall freeze $?
 
 generate: ${REPLICA_TESTS} ${TEST} build

flake.lock

@@ -18,17 +18,17 @@
   outputs = { self, nixpkgs, idris, papers, flake-utils, pre-commit-hooks, replicadhall }:
     flake-utils.lib.eachDefaultSystem (system:
       let
-        pkgs = import nixpkgs { inherit system; };
-        inherit (pkgs)
+        npkgs = import nixpkgs { inherit system; };
+        inherit (npkgs)
           dhall
           lib;
-        inherit (pkgs.haskellPackages)
+        inherit (npkgs.haskellPackages)
           dhall-json;
 
         version = import ./version.nix;
-        idrisPkgs = idris.packages.${system};
+        idrisPkgs = idris.packages.${system} // papers;
 
-        callPackage = lib.callPackageWith (pkgs // packages);
+        callPackage = lib.callPackageWith (npkgs // packages);
 
         packages = {
           inherit version;
@@ -46,7 +46,7 @@
           replica_dhall
           papersLib;
 
-        dockerImage = pkgs.dockerTools.buildImage {
+        dockerImage = npkgs.dockerTools.buildImage {
           name = "replica";
           config = {
             Cmd = [ "${replica}/bin/replica" ];
@@ -75,8 +75,8 @@
           };
         };
 
-        devShells.default = pkgs.mkShell {
-          packages = [ idrisPkgs.idris2 papersLib pkgs.rlwrap dhall dhall-json ];
+        devShells.default = npkgs.mkShell {
+          packages = [ idrisPkgs.idris2 papersLib npkgs.rlwrap dhall dhall-json ];
           shellHook = ''
             alias idris2="rlwrap -s 1000 idris2 --no-banner"
             ${self.checks.${system}.pre-commit-check.shellHook}

flake.nix

@@ -1,6 +1,6 @@
 { buildIdris, papersLib }:
 buildIdris {
-  projectName = "replica";
+  ipkgName = "replica";
   src = ../.;
   idrisLibraries = [ papersLib ];
 }

nix/buildReplica.nix

@@ -2,10 +2,9 @@
 let
   version = import ../version.nix;
   papersPkg = buildIdris {
-    projectName = "papers";
+    ipkgName = "papers";
     src = papers;
     idrisLibraries = [ ];
-    preBuild = "cd libs/papers";
   };
 in
-papersPkg.installLibrary
+papersPkg.library { }