Skip to content

Commit

Permalink
Merge branch 'tooling': do not instantiate nixpkgs, bump CI deps
Browse files Browse the repository at this point in the history
  • Loading branch information
wamserma committed Apr 27, 2024
2 parents a2a7cfa + cb8acb1 commit d018966
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
name: flake-programs-sqlite
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Cache build result on GitHub
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: updater.bundle
key: ${{ runner.os }}-bundle-${{ hashFiles('**/flake.lock') }}-${{ hashFiles('**/*.nix') }}-${{ hashFiles('**/*.nim*') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scrape.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
git config user.email github-actions@github.com
- name: fetch from cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: updater.bundle
key: ${{ runner.os }}-bundle-${{ hashFiles('**/flake.lock') }}-${{ hashFiles('**/*.nix') }}-${{ hashFiles('**/*.nim*') }}
Expand Down
6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
# provide db-package for all archs, but scaper/test only for most common
(utils.lib.eachSystem utils.lib.allSystems (system:
let
pkgs = import nixpkgs { inherit system; };
pkgs = nixpkgs.legacyPackages.${system};
in
nixpkgs.lib.recursiveUpdate
(nixpkgs.lib.optionalAttrs (builtins.elem system utils.lib.defaultSystems) rec {
packages.updater = pkgs.callPackage ./updater.nix {};
apps.updater = { type = "app"; program = "${packages.updater}/bin/updater";};
devShell = with pkgs; mkShell {
devShells.default = with pkgs; mkShell {
buildInputs = [ nim nimble-unwrapped nimlsp ];
};
checks.vmtest = import ./test.nix { inherit pkgs; flake = self; }; # nixpkgs must be set to a revision present in the JSON file
Expand All @@ -33,4 +33,4 @@
{
nixosModules.programs-sqlite = pass@{ pkgs, ... }: (import ./module.nix { programs-sqlite = (getDB pkgs); }) pass;
};
}
}

0 comments on commit d018966

Please sign in to comment.