Ensure conformity to flake spec

Author: sd234678

.github/workflows/build-prod.yaml

@@ -37,13 +37,13 @@ jobs:
       - name: Get new version number
         run: echo "version_number=$(grep -E '^version' package.yaml | cut -d' ' -f2)" >> $GITHUB_ENV
       - name: Run pre-commit hooks
-        run: nix build '.#runChecks'
+        run: nix flake check
       - name: Build nix-bootstrap
         run: nix build
       - name: Check for vulnerabilities
-        run: nix run .\#ciPackages.vulnix -- -C -w vulnerability-whitelist.toml result/
+        run: nix run .\#ciPackages_vulnix -- -C -w vulnerability-whitelist.toml result/
       - name: Build release artefact
-        run: nix run .\#ciPackages.buildBinaryCache
+        run: nix run .\#ciPackages_buildBinaryCache
       - uses: actions/upload-artifact@v4
         with:
           name: "release-${{ env.version_number }}"

.github/workflows/build.yaml

@@ -31,8 +31,8 @@ jobs:
           (git fetch --all && git diff "$(git describe --tags --abbrev=0)" -- package.yaml | grep version) ||
           (echo "You must bump the nix-bootstrap version number in package.yaml!" && exit 1)
       - name: Run pre-commit hooks
-        run: nix build '.#runChecks'
+        run: nix flake check
       - name: Build nix-bootstrap
         run: nix build
       - name: Check for vulnerabilities
-        run: nix run .\#ciPackages.vulnix -- -C -w vulnerability-whitelist.toml result/
+        run: nix run .\#ciPackages_vulnix -- -C -w vulnerability-whitelist.toml result/

.last-exported-commit

@@ -1 +1 @@
-Last exported commit from parent repo: 7bde353a888c3babcd2738d8e7157fadf8878d25
+Last exported commit from parent repo: aaa042431723bcf4d4cd9f7d28cf59290a4350c7

flake.lock

@@ -59,8 +59,6 @@
         };
       in {
         checks = {pre-commit-check = pre-commit-hooks.pureHooks;};
-        defaultPackage = self.packages.${system}.default;
-        devShell = self.devShells.${system}.default;
         devShells = {
           default = nixpkgs.mkShell ({
               buildInputs =
@@ -84,16 +82,8 @@
           default = nix-bootstrap;
           inherit nix-bootstrap;
           # To be used as tools in CI
-          ciPackages = {
-            inherit buildBinaryCache;
-            inherit (nixpkgs) vulnix;
-          };
-          # runChecks is a hack required to allow checks to run on a single system
-          # when using Import from Deviation (https://discourse.nixos.org/t/nix-flake-check-for-current-system-only/18366)
-          # Building it is the single-system equivalent of running "nix flake check".
-          runChecks = nixpkgs.runCommand "run-checks" {
-            currentSystemChecks = builtins.attrValues self.checks.${system};
-          } "echo $currentSystemChecks; touch $out";
+          ciPackages_buildBinaryCache = buildBinaryCache;
+          ciPackages_vulnix = nixpkgs.vulnix;
         };
       }
     );

flake.nix

@@ -5,7 +5,7 @@ cabal-version: 2.0
 -- see: https://github.com/sol/hpack
 
 name:           nix-bootstrap
-version:        2.2.2.0
+version:        2.2.2.1
 author:         gchquser
 maintainer:     48051938+sd234678@users.noreply.github.com
 copyright:      Crown Copyright

nix-bootstrap.cabal

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 name: nix-bootstrap
-version: 2.2.2.0
+version: 2.2.2.1
 author: gchquser
 maintainer: 48051938+sd234678@users.noreply.github.com
 copyright: Crown Copyright