fix ci

.github/workflows/ci.yml

@@ -3,6 +3,18 @@ on: [push, pull_request]
 name: CI
 
 jobs:
+  ambuild:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v20
+      - uses: icewind1991/attic-action@v1
+        with:
+          name: ci
+          instance: https://cache.icewind.me
+          authToken: '${{ secrets.ATTIC_TOKEN }}'
+      - run: nix build .#ambuild
+
   sdk-matrix:
     runs-on: ubuntu-latest
     outputs:
@@ -18,7 +30,7 @@ jobs:
     needs: sdk-matrix
     strategy:
       fail-fast: false
-      matrix: ${{fromJson(needs.hl2sdk-matrix.outputs.matrix)}}
+      matrix: ${{fromJson(needs.sdk-matrix.outputs.matrix)}}
     steps:
       - uses: actions/checkout@v3
       - uses: cachix/install-nix-action@v20
@@ -29,24 +41,12 @@ jobs:
           authToken: '${{ secrets.ATTIC_TOKEN }}'
       - run: nix build .#hl2sdk.${{ matrix.sdk }}
 
-  ambuild:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v20
-      - uses: icewind1991/attic-action@v1
-        with:
-          name: ci
-          instance: https://cache.icewind.me
-          authToken: '${{ secrets.ATTIC_TOKEN }}'
-      - run: nix build .#ambuild
-
   sourcemod:
     runs-on: ubuntu-latest
-    needs: [hl2sdk-matrix, ambuild, hl2sdk]
+    needs: [sdk-matrix, ambuild, hl2sdk]
     strategy:
       fail-fast: false
-      matrix: ${{fromJson(needs.hl2sdk-matrix.outputs.matrix)}}
+      matrix: ${{fromJson(needs.sdk-matrix.outputs.matrix)}}
     steps:
       - uses: actions/checkout@v3
       - uses: cachix/install-nix-action@v20

pkgs/default.nix

@@ -1,5 +1,5 @@
 final: prev: {
-  hl2sdk =  final.callPackage ./hl2sdk.nix {};
+  hl2sdk = (import ./hl2sdk.nix) {inherit (final) fetchFromGitHub;};
   ambuild = final.python3Packages.callPackage ./ambuild.nix {};
   metamod-source = final.callPackage ./metamod-source.nix {};
   sourcemod = final.callPackage ./sourcemod.nix {};

pkgs/sourcemod-includes.nix

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     owner = "alliedmodders";
     repo = "sourcemod";
     rev = "39c2dc60e0c0d963cfbe39bee3a7cf953cc8055c";
-    sha256 = "sha256-SwrBuOAebmLq5bgjw5i8CFuEDTtvDqLYY/dk4holrzw=";
+    sha256 = "sha256-9maE7NKSpkMfK4NgO0NAItpj2ONhGhsOOp81rTpKyFE=";
   };
 
   doConfigure = false;