Enable dpdgraph & HoTT for Coq 8.19 (#206)

Update after NixOS/nixpkgs#299461
coq-community · Mar 28, 2024 · bc9e46d · bc9e46d
1 parent abb4982
commit bc9e46d
Show file tree

Hide file tree

Showing 3 changed files with 210 additions and 2 deletions.
diff --git a/.github/workflows/nix-action-8.19-mathcomp2.yml b/.github/workflows/nix-action-8.19-mathcomp2.yml
@@ -56,6 +56,58 @@ jobs:
  name: Building/fetching current CI target
  run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.19-mathcomp2"
  --argstr job "Cheerios"
+ HoTT:
+ needs:
+ - coq
+ runs-on: ubuntu-latest
+ steps:
+ - name: Determine which commit to initially checkout
+ run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{\
+ \ github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha\
+ \ }}\" >> $GITHUB_ENV\nfi\n"
+ - name: Git checkout
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ ref: ${{ env.target_commit }}
+ - name: Determine which commit to test
+ run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
+ \ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
+ \ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
+ \ | cut -f1)\n mergeable=$(git merge --no-commit --no-ff ${{ github.event.pull_request.base.sha\
+ \ }} > /dev/null 2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n\
+ \  if [ -z \"$merge_commit\" -o \"x$mergeable\" != \"x0\" ]; then\n echo\
+ \ \"tested_commit=${{ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n\
+ \  else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
+ - name: Git checkout
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ ref: ${{ env.tested_commit }}
+ - name: Cachix install
+ uses: cachix/install-nix-action@v20
+ with:
+ nix_path: nixpkgs=channel:nixpkgs-unstable
+ - name: Cachix setup coq-community
+ uses: cachix/cachix-action@v12
+ with:
+ authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+ extraPullNames: coq, math-comp
+ name: coq-community
+ - id: stepCheck
+ name: Checking presence of CI target HoTT
+ run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
+ \ bundle \"8.19-mathcomp2\" --argstr job \"HoTT\" \\\n --dry-run 2>&1 >\
+ \ /dev/null)\necho $nb_dry_run\necho status=$(echo $nb_dry_run | grep \"built:\"\
+ \ | sed \"s/.*/built/\") >> $GITHUB_OUTPUT\n"
+ - 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 "8.19-mathcomp2"
+ --argstr job "coq"
+ - if: steps.stepCheck.outputs.status == 'built'
+ name: Building/fetching current CI target
+ run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.19-mathcomp2"
+ --argstr job "HoTT"
  ITree:
  needs:
  - coq
@@ -1228,6 +1280,58 @@ jobs:
  name: Building/fetching current CI target
  run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.19-mathcomp2"
  --argstr job "deriving"
+ dpdgraph:
+ needs:
+ - coq
+ runs-on: ubuntu-latest
+ steps:
+ - name: Determine which commit to initially checkout
+ run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{\
+ \ github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha\
+ \ }}\" >> $GITHUB_ENV\nfi\n"
+ - name: Git checkout
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ ref: ${{ env.target_commit }}
+ - name: Determine which commit to test
+ run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
+ \ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
+ \ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
+ \ | cut -f1)\n mergeable=$(git merge --no-commit --no-ff ${{ github.event.pull_request.base.sha\
+ \ }} > /dev/null 2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n\
+ \  if [ -z \"$merge_commit\" -o \"x$mergeable\" != \"x0\" ]; then\n echo\
+ \ \"tested_commit=${{ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n\
+ \  else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
+ - name: Git checkout
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ ref: ${{ env.tested_commit }}
+ - name: Cachix install
+ uses: cachix/install-nix-action@v20
+ with:
+ nix_path: nixpkgs=channel:nixpkgs-unstable
+ - name: Cachix setup coq-community
+ uses: cachix/cachix-action@v12
+ with:
+ authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+ extraPullNames: coq, math-comp
+ name: coq-community
+ - id: stepCheck
+ name: Checking presence of CI target dpdgraph
+ run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
+ \ bundle \"8.19-mathcomp2\" --argstr job \"dpdgraph\" \\\n --dry-run 2>&1\
+ \ > /dev/null)\necho $nb_dry_run\necho status=$(echo $nb_dry_run | grep \"\
+ built:\" | sed \"s/.*/built/\") >> $GITHUB_OUTPUT\n"
+ - 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 "8.19-mathcomp2"
+ --argstr job "coq"
+ - if: steps.stepCheck.outputs.status == 'built'
+ name: Building/fetching current CI target
+ run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.19-mathcomp2"
+ --argstr job "dpdgraph"
  equations:
  needs:
  - coq

diff --git a/.github/workflows/nix-action-8.19.yml b/.github/workflows/nix-action-8.19.yml
@@ -56,6 +56,58 @@ jobs:
  name: Building/fetching current CI target
  run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.19" --argstr
  job "Cheerios"
+ HoTT:
+ needs:
+ - coq
+ runs-on: ubuntu-latest
+ steps:
+ - name: Determine which commit to initially checkout
+ run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{\
+ \ github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha\
+ \ }}\" >> $GITHUB_ENV\nfi\n"
+ - name: Git checkout
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ ref: ${{ env.target_commit }}
+ - name: Determine which commit to test
+ run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
+ \ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
+ \ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
+ \ | cut -f1)\n mergeable=$(git merge --no-commit --no-ff ${{ github.event.pull_request.base.sha\
+ \ }} > /dev/null 2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n\
+ \  if [ -z \"$merge_commit\" -o \"x$mergeable\" != \"x0\" ]; then\n echo\
+ \ \"tested_commit=${{ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n\
+ \  else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
+ - name: Git checkout
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ ref: ${{ env.tested_commit }}
+ - name: Cachix install
+ uses: cachix/install-nix-action@v20
+ with:
+ nix_path: nixpkgs=channel:nixpkgs-unstable
+ - name: Cachix setup coq-community
+ uses: cachix/cachix-action@v12
+ with:
+ authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+ extraPullNames: coq, math-comp
+ name: coq-community
+ - id: stepCheck
+ name: Checking presence of CI target HoTT
+ run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
+ \ bundle \"8.19\" --argstr job \"HoTT\" \\\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"
+ - 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 "8.19" --argstr
+ job "coq"
+ - if: steps.stepCheck.outputs.status == 'built'
+ name: Building/fetching current CI target
+ run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.19" --argstr
+ job "HoTT"
  ITree:
  needs:
  - coq
@@ -1151,6 +1203,58 @@ jobs:
  name: Building/fetching current CI target
  run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.19" --argstr
  job "deriving"
+ dpdgraph:
+ needs:
+ - coq
+ runs-on: ubuntu-latest
+ steps:
+ - name: Determine which commit to initially checkout
+ run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"target_commit=${{\
+ \ github.sha }}\" >> $GITHUB_ENV\nelse\n echo \"target_commit=${{ github.event.pull_request.head.sha\
+ \ }}\" >> $GITHUB_ENV\nfi\n"
+ - name: Git checkout
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ ref: ${{ env.target_commit }}
+ - name: Determine which commit to test
+ run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
+ \ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
+ \ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
+ \ | cut -f1)\n mergeable=$(git merge --no-commit --no-ff ${{ github.event.pull_request.base.sha\
+ \ }} > /dev/null 2>&1; echo $?; git merge --abort > /dev/null 2>&1 || true)\n\
+ \  if [ -z \"$merge_commit\" -o \"x$mergeable\" != \"x0\" ]; then\n echo\
+ \ \"tested_commit=${{ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n\
+ \  else\n echo \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
+ - name: Git checkout
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ ref: ${{ env.tested_commit }}
+ - name: Cachix install
+ uses: cachix/install-nix-action@v20
+ with:
+ nix_path: nixpkgs=channel:nixpkgs-unstable
+ - name: Cachix setup coq-community
+ uses: cachix/cachix-action@v12
+ with:
+ authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+ extraPullNames: coq, math-comp
+ name: coq-community
+ - id: stepCheck
+ name: Checking presence of CI target dpdgraph
+ run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
+ \ bundle \"8.19\" --argstr job \"dpdgraph\" \\\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"
+ - 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 "8.19" --argstr
+ job "coq"
+ - if: steps.stepCheck.outputs.status == 'built'
+ name: Building/fetching current CI target
+ run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.19" --argstr
+ job "dpdgraph"
  equations:
  needs:
  - coq

diff --git a/.nix/nixpkgs.nix b/.nix/nixpkgs.nix
@@ -1,4 +1,4 @@
 fetchTarball {
- url = https://github.com/NixOS/nixpkgs/archive/e94ef3d0543fa039b177767c9824ed5847470453.tar.gz;
- sha256 = "1mfc2bwdlkd6k9x80a3fwx28c3prbz8wq7s2w04ga8wm4z2bjqw1";
+ url = https://github.com/NixOS/nixpkgs/archive/e0188a425eb0b221701e56a5e7b028713ffc7b62.tar.gz;
+ sha256 = "1z2gcjczcqn1zsxxj50d66c8ym3aryvv2r2jzcncmayy71m3a9i3";
  }