Merge branch 'master' into dev

tomhanika · Jun 6, 2024 · 4a514dd · 4a514dd
2 parents b4151f9 + 5254a10
commit 4a514dd
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/update-deps-lock.yaml b/.github/workflows/update-deps-lock.yaml
@@ -10,6 +10,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+
       - uses: DeterminateSystems/nix-installer-action@v4
       - uses: DeterminateSystems/magic-nix-cache-action@v2
       - name: Update deps-lock

diff --git a/.gitignore b/.gitignore
@@ -27,4 +27,4 @@
 /doc/tutorials/icfca-2013/icfca2013-tutorial-live.html
 /.lsp/
 /.direnv/
-/.clj-kondo/
+/.clj-kondo/
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -16,7 +16,8 @@ Additional Contributors are
 * Johannes Hirth        (pq-cores, scale-measures)
 * Gleb Kanterov         (interval-scale)
 * Maximilian Marx       (Wikidata)
+* Jannik Nordmeyer	(Metric Contexts, Causal Implications)
 * Maximilian Stubbemann (concept-robustness)
 * Anselm von Wangenheim (DimDraw)
 * Johannes Wollbold     (bug reports, feature requests)
-* Jannik Nordmeyer	(Metric Contexts, Causal Implications)
+
diff --git a/deps-lock.json b/deps-lock.json
@@ -93,6 +93,7 @@
       "hash": "sha256-ZIsMIEuk8EDcQ8KfguRHHstmdWCK+wuzGp7BxCYTenQ="
     },
     {
+
       "mvn-path": "com/clojure-goes-fast/clj-async-profiler/1.0.5/clj-async-profiler-1.0.5.jar",
       "mvn-repo": "https://repo.clojars.org/",
       "hash": "sha256-GCU/PtxlxREIczFMtETc+xxGGK+y7c+hZjeTGY/M/dk="
@@ -457,7 +458,7 @@
       "mvn-repo": "https://repo.clojars.org/",
       "hash": "sha256-2OgLA0KFMl6QX1RkmhWYtoe5pKmaOk9LlO7TWXyyEEg="
     },
-    {
+
       "mvn-path": "hiccup/hiccup/1.0.5/hiccup-1.0.5.jar",
       "mvn-repo": "https://repo.clojars.org/",
       "hash": "sha256-D9Sn5HRh29rnILaEsZcWTrtpO7Y1jI4UZ/+nhwdsB/w="

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -35,7 +35,6 @@
       ];
 
       channels.nixpkgs.overlaysBuilder = channels: [inputs.clj-nix.overlays.default];
-
       overlays.default = final: prev: {
         inherit (self.packages."${final.system}") conexp-clj;
       };
@@ -77,6 +76,7 @@
             doCheck = true;
             checkPhase = "lein test";
           };
+
       in rec {
         packages = {
           conexp-clj = conexp;
@@ -94,10 +94,12 @@
             deps = mk-deps-cache {lock-file = ./deps-lock.json;};
           in
             mkApp {
+
               drv = writeShellScriptBin "conexp-clj-tests" ''
                 lein test $@
               '';
             };
+
         };
 
         checks = {
@@ -116,3 +118,4 @@
 # Local Variables:
 # apheleia-formatter: alejandra
 # End:
+