fix Nix CI (#152)

* restore .nix/config.nix * update nix toolbox * gen Nix actions -- Co-authored-by: Cyril Cohen <[email protected]>
affeldt-aist · Feb 25, 2025 · f012d61 · f012d61
1 parent ef25be7
commit f012d61
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/nix-action-default.yml b/.github/workflows/nix-action-default.yml
@@ -35,12 +35,18 @@ jobs:
       with:
         extraPullNames: coq-community, math-comp
         name: coq
+    - id: stepGetDerivation
+      name: Getting derivation for current job (monae)
+      run: "NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n   --argstr bundle
+        \"default\" --argstr job \"monae\" \\\n   --dry-run 2> err > out || (touch
+        fail; true)\n"
+    - name: Error reporting
+      run: "echo \"out=\"; cat out\necho \"err=\"; cat err\n"
+    - name: Failure check
+      run: if [ -e fail ]; then exit 1; else exit 0; fi;
     - id: stepCheck
-      name: Checking presence of CI target monae
-      run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n   --argstr
-        bundle \"default\" --argstr job \"monae\" \\\n   --dry-run 2>&1 > /dev/null)\n
-        echo $nb_dry_run\necho status=$(echo $nb_dry_run | grep \"built:\" | sed \"\
-        s/.*/built/\") >> $GITHUB_OUTPUT\n"
+      name: Checking presence of CI target for current job
+      run: (echo -n status=; cat out err | grep "built:" | sed "s/.*/built/") >> $GITHUB_OUTPUT
     - if: steps.stepCheck.outputs.status == 'built'
       name: 'Building/fetching previous CI target: coq'
       run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "default"

diff --git a/.nix/config.nix b/.nix/config.nix
@@ -42,7 +42,6 @@
     ## You can override Coq and other Coq coqPackages
     ## through the following attribute
     # coqPackages.coq.override.version = "8.11";
-    mathcomp.override.version = "2.3.0";
 
     ## In some cases, light overrides are not available/enough
     ## in which case you can use either

diff --git a/.nix/coq-nix-toolbox.nix b/.nix/coq-nix-toolbox.nix
@@ -1 +1 @@
-"13785ca796a883ca3f2fc1c1a1daa0ba8cea9ff2"
+"366790c4db5c3ce6ad86b30d14a9bd5ae2b3853e"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		"13785ca796a883ca3f2fc1c1a1daa0ba8cea9ff2"
		"366790c4db5c3ce6ad86b30d14a9bd5ae2b3853e"