Add verify-nixpkgs-revs step to codedown-languages

.github/workflows/ci.yml

@@ -6,6 +6,16 @@ on:
   workflow_dispatch:
 
 jobs:
+  verify-nixpkgs-revs:
+    runs-on: self-hosted
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: verify-default-nix.sh
+      if: "!contains(github.event.head_commit.message, 'noci')"
+      run: ./scripts/verify-default-nix.sh
+
   test:
     name: ${{matrix.suite}}
     runs-on: self-hosted

sample_environments_generate.sh → scripts/sample_environments_generate.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd "$SCRIPTDIR/.."
 
 echo "args: {" > sample_environments.nix
 

sample_environments_visualize.sh → scripts/sample_environments_visualize.sh

@@ -1,5 +1,8 @@
 #!/usr/bin/env sh
 
+SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd "$SCRIPTDIR/.."
+
 set -e
 
 nix build '.#sample_environments_farm'

update-default-nix.sh → scripts/update-default-nix.sh

@@ -2,7 +2,7 @@
 
 
 SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd $SCRIPTDIR
+cd "$SCRIPTDIR/.."
 
 output=$(nix flake metadata --json)
 

scripts/verify-default-nix.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env sh
+
+set -e
+
+SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd "$SCRIPTDIR"
+
+FLAKE_NIXPKGS_REV=$(nix flake info --json | jq -r .locks.nodes.nixpkgs.locked.rev)
+FLAKE_NIXPKGS_UNSTABLE_REV=$(nix flake info --json | jq -r '.locks.nodes["nixpkgs-unstable"].locked.rev')
+
+echo "FLAKE_NIXPKGS_REV: $FLAKE_NIXPKGS_REV"
+echo "FLAKE_NIXPKGS_UNSTABLE_REV: $FLAKE_NIXPKGS_UNSTABLE_REV"
+
+DEFAULT_NIXPKGS_REV=$(cat default.nix | grep nixpkgs-rev | cut -d'"' -f2)
+DEFAULT_NIXPKGS_UNSTABLE_REV=$(cat default.nix | grep nixpkgs-unstable-rev | cut -d'"' -f2)
+
+echo "DEFAULT_NIXPKGS_REV: $DEFAULT_NIXPKGS_REV"
+echo "DEFAULT_NIXPKGS_UNSTABLE_REV: $DEFAULT_NIXPKGS_UNSTABLE_REV"
+
+
+if [ "$FLAKE_NIXPKGS_REV" != "$DEFAULT_NIXPKGS_REV" ]; then
+    echo "nixpkgs rev differed between flake and default.nix"
+    exit 1
+fi
+
+if [ "$FLAKE_NIXPKGS_UNSTABLE_REV" != "$DEFAULT_NIXPKGS_UNSTABLE_REV" ]; then
+    echo "nixpkgs-unstable rev differed between flake and default.nix"
+    exit 1
+fi