Skip to content

Commit a1a3760

Browse files
Zimmi48Zimmi48
authored
Merge pull request #88 from coq-community/update-nixpkgs
Update to latest nixpkgs-unstable to get Coq package updates.
2 parents 88a03a0 + 225b171 commit a1a3760

File tree

3 files changed

+186
-2
lines changed

3 files changed

+186
-2
lines changed

‎.github/workflows/nix-action-8.14.yml‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,57 @@ jobs:
4545
name: Building/fetching current CI target
4646
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
4747
job "Cheerios"
48+
ITree:
49+
needs:
50+
- coq
51+
- coq-ext-lib
52+
- paco
53+
runs-on: ubuntu-latest
54+
steps:
55+
- name: Determine which commit to test
56+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
57+
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
58+
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
59+
\ | cut -f1)\n if [ -z \"$merge_commit\" ]; then\n echo \"tested_commit=${{\
60+
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
61+
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
62+
- name: Git checkout
63+
uses: actions/checkout@v2
64+
with:
65+
fetch-depth: 0
66+
ref: ${{ env.tested_commit }}
67+
- name: Cachix install
68+
uses: cachix/install-nix-action@v16
69+
with:
70+
nix_path: nixpkgs=channel:nixpkgs-unstable
71+
- name: Cachix setup coq-community
72+
uses: cachix/cachix-action@v10
73+
with:
74+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
75+
extraPullNames: coq, math-comp
76+
name: coq-community
77+
- id: stepCheck
78+
name: Checking presence of CI target ITree
79+
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
80+
\ bundle \"8.14\" --argstr job \"ITree\" \\\n --dry-run 2>&1 > /dev/null)\n\
81+
echo $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run | grep\
82+
\ \"built:\" | sed \"s/.*/built/\")\n"
83+
- if: steps.stepCheck.outputs.status == 'built'
84+
name: 'Building/fetching previous CI target: coq'
85+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
86+
job "coq"
87+
- if: steps.stepCheck.outputs.status == 'built'
88+
name: 'Building/fetching previous CI target: coq-ext-lib'
89+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
90+
job "coq-ext-lib"
91+
- if: steps.stepCheck.outputs.status == 'built'
92+
name: 'Building/fetching previous CI target: paco'
93+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
94+
job "paco"
95+
- if: steps.stepCheck.outputs.status == 'built'
96+
name: Building/fetching current CI target
97+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
98+
job "ITree"
4899
InfSeqExt:
49100
needs:
50101
- coq
@@ -367,6 +418,57 @@ jobs:
367418
name: Building/fetching current CI target
368419
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
369420
job "bignums"
421+
category-theory:
422+
needs:
423+
- coq
424+
- mathcomp-ssreflect
425+
- equations
426+
runs-on: ubuntu-latest
427+
steps:
428+
- name: Determine which commit to test
429+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
430+
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
431+
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
432+
\ | cut -f1)\n if [ -z \"$merge_commit\" ]; then\n echo \"tested_commit=${{\
433+
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
434+
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
435+
- name: Git checkout
436+
uses: actions/checkout@v2
437+
with:
438+
fetch-depth: 0
439+
ref: ${{ env.tested_commit }}
440+
- name: Cachix install
441+
uses: cachix/install-nix-action@v16
442+
with:
443+
nix_path: nixpkgs=channel:nixpkgs-unstable
444+
- name: Cachix setup coq-community
445+
uses: cachix/cachix-action@v10
446+
with:
447+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
448+
extraPullNames: coq, math-comp
449+
name: coq-community
450+
- id: stepCheck
451+
name: Checking presence of CI target category-theory
452+
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
453+
\ bundle \"8.14\" --argstr job \"category-theory\" \\\n --dry-run 2>&1 >\
454+
\ /dev/null)\necho $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run\
455+
\ | grep \"built:\" | sed \"s/.*/built/\")\n"
456+
- if: steps.stepCheck.outputs.status == 'built'
457+
name: 'Building/fetching previous CI target: coq'
458+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
459+
job "coq"
460+
- if: steps.stepCheck.outputs.status == 'built'
461+
name: 'Building/fetching previous CI target: mathcomp-ssreflect'
462+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
463+
job "mathcomp-ssreflect"
464+
- if: steps.stepCheck.outputs.status == 'built'
465+
name: 'Building/fetching previous CI target: equations'
466+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
467+
job "equations"
468+
- if: steps.stepCheck.outputs.status == 'built'
469+
name: Building/fetching current CI target
470+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
471+
job "category-theory"
370472
ceres:
371473
needs:
372474
- coq
@@ -2342,6 +2444,47 @@ jobs:
23422444
name: Building/fetching current CI target
23432445
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
23442446
job "multinomials"
2447+
paco:
2448+
needs:
2449+
- coq
2450+
runs-on: ubuntu-latest
2451+
steps:
2452+
- name: Determine which commit to test
2453+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
2454+
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
2455+
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
2456+
\ | cut -f1)\n if [ -z \"$merge_commit\" ]; then\n echo \"tested_commit=${{\
2457+
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
2458+
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
2459+
- name: Git checkout
2460+
uses: actions/checkout@v2
2461+
with:
2462+
fetch-depth: 0
2463+
ref: ${{ env.tested_commit }}
2464+
- name: Cachix install
2465+
uses: cachix/install-nix-action@v16
2466+
with:
2467+
nix_path: nixpkgs=channel:nixpkgs-unstable
2468+
- name: Cachix setup coq-community
2469+
uses: cachix/cachix-action@v10
2470+
with:
2471+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
2472+
extraPullNames: coq, math-comp
2473+
name: coq-community
2474+
- id: stepCheck
2475+
name: Checking presence of CI target paco
2476+
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
2477+
\ bundle \"8.14\" --argstr job \"paco\" \\\n --dry-run 2>&1 > /dev/null)\n\
2478+
echo $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run | grep\
2479+
\ \"built:\" | sed \"s/.*/built/\")\n"
2480+
- if: steps.stepCheck.outputs.status == 'built'
2481+
name: 'Building/fetching previous CI target: coq'
2482+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
2483+
job "coq"
2484+
- if: steps.stepCheck.outputs.status == 'built'
2485+
name: Building/fetching current CI target
2486+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.14" --argstr
2487+
job "paco"
23452488
paramcoq:
23462489
needs:
23472490
- coq

‎.github/workflows/nix-action-8.15.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -964,6 +964,47 @@ jobs:
964964
name: Building/fetching current CI target
965965
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.15" --argstr
966966
job "mathcomp-ssreflect"
967+
paco:
968+
needs:
969+
- coq
970+
runs-on: ubuntu-latest
971+
steps:
972+
- name: Determine which commit to test
973+
run: "if [ ${{ github.event_name }} = \"push\" ]; then\n echo \"tested_commit=${{\
974+
\ github.sha }}\" >> $GITHUB_ENV\nelse\n merge_commit=$(git ls-remote ${{\
975+
\ github.event.repository.html_url }} refs/pull/${{ github.event.number }}/merge\
976+
\ | cut -f1)\n if [ -z \"$merge_commit\" ]; then\n echo \"tested_commit=${{\
977+
\ github.event.pull_request.head.sha }}\" >> $GITHUB_ENV\n else\n echo\
978+
\ \"tested_commit=$merge_commit\" >> $GITHUB_ENV\n fi\nfi\n"
979+
- name: Git checkout
980+
uses: actions/checkout@v2
981+
with:
982+
fetch-depth: 0
983+
ref: ${{ env.tested_commit }}
984+
- name: Cachix install
985+
uses: cachix/install-nix-action@v16
986+
with:
987+
nix_path: nixpkgs=channel:nixpkgs-unstable
988+
- name: Cachix setup coq-community
989+
uses: cachix/cachix-action@v10
990+
with:
991+
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
992+
extraPullNames: coq, math-comp
993+
name: coq-community
994+
- id: stepCheck
995+
name: Checking presence of CI target paco
996+
run: "nb_dry_run=$(NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link \\\n --argstr\
997+
\ bundle \"8.15\" --argstr job \"paco\" \\\n --dry-run 2>&1 > /dev/null)\n\
998+
echo $nb_dry_run\necho ::set-output name=status::$(echo $nb_dry_run | grep\
999+
\ \"built:\" | sed \"s/.*/built/\")\n"
1000+
- if: steps.stepCheck.outputs.status == 'built'
1001+
name: 'Building/fetching previous CI target: coq'
1002+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.15" --argstr
1003+
job "coq"
1004+
- if: steps.stepCheck.outputs.status == 'built'
1005+
name: Building/fetching current CI target
1006+
run: NIXPKGS_ALLOW_UNFREE=1 nix-build --no-out-link --argstr bundle "8.15" --argstr
1007+
job "paco"
9671008
pocklington:
9681009
needs:
9691010
- coq

‎.nix/nixpkgs.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
fetchTarball {
2-
url = https://github.com/NixOS/nixpkgs/archive/913585103b8311c7f946d3d3ff48419b9ad14b21.tar.gz;
3-
sha256 = "1awxiffhg1327iswlydlwan5413gq4azlf47qynif0725c1qg5ym";
2+
url = https://github.com/NixOS/nixpkgs/archive/81cbfc8f2a1e218249b7bff74013b63150171496.tar.gz;
3+
sha256 = "0lpwn58l342mfag6wq2wrgd9hzp8mxl7b653v389i6wsqgww00kl";
44
}

0 commit comments

Comments
 (0)