Skip to content

Commit

Permalink
Merge branch 'master' into lemmih/dependabot-config
Browse files Browse the repository at this point in the history
  • Loading branch information
lemmih committed Jan 23, 2025
2 parents c7292af + f6d7da1 commit 1f6bbf3
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 12 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/eval-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: "Eval"
on:
push:
branches: 'master'
pull_request_target:
pull_request:
branches: 'master'

jobs:
check:
Expand All @@ -19,4 +20,4 @@ jobs:
name: wrangler
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Check
run: nix flake check -L
run: nix flake check -L
5 changes: 3 additions & 2 deletions .github/workflows/eval-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: "Eval (Checks)"
on:
push:
branches: 'master'
pull_request_target:
pull_request:
branches: 'master'

jobs:
wrangler:
Expand All @@ -19,4 +20,4 @@ jobs:
name: wrangler
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Build
run: nix build .#checks.x86_64-linux.wrangler
run: nix build .#checks.x86_64-linux.wrangler
5 changes: 3 additions & 2 deletions .github/workflows/eval-devshells.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: "Eval (devShells)"
on:
push:
branches: 'master'
pull_request_target:
pull_request:
branches: 'master'

jobs:
wrangler:
Expand All @@ -15,4 +16,4 @@ jobs:
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Build
run: nix build .#devShells.x86_64-linux.default
run: nix build .#devShells.x86_64-linux.default
5 changes: 3 additions & 2 deletions .github/workflows/eval-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: "Eval"
on:
push:
branches: 'master'
pull_request_target:
pull_request:
branches: 'master'

jobs:
format:
Expand All @@ -15,4 +16,4 @@ jobs:
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
- name: Check formatting
run: nix fmt -- -c .
run: nix fmt -- -c .
5 changes: 3 additions & 2 deletions .github/workflows/eval-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: "Eval (Packages)"
on:
push:
branches: 'master'
pull_request_target:
pull_request:
branches: 'master'

jobs:
wrangler:
Expand All @@ -19,4 +20,4 @@ jobs:
name: wrangler
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Build
run: nix build .#packages.x86_64-linux.wrangler
run: nix build .#packages.x86_64-linux.wrangler
4 changes: 2 additions & 2 deletions examples/hello-world/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#
# wrangler-flake.url = "https://flakehub.com/f/ryand56/wrangler/0.2.1.tar.gz"
#
# if it points to github, then running `nix flake update` will just get the
# if it points to github, then running `nix flake update` will just get the
# latest version from github and update wrangler as necessary.
wrangler-flake.url = "github:ryand56/wrangler";
};
Expand Down Expand Up @@ -41,7 +41,7 @@
{
default = pkgs.mkShell {
packages = [
# it's possible to add this package as an override to nixpkgs; here it's just
# it's possible to add this package as an override to nixpkgs; here it's just
# added directly...
wrangler-flake.packages.${system}.wrangler
pkgs.cowsay # this is just included as an example of a package import from nixpkgs - include here any packages you require
Expand Down

0 comments on commit 1f6bbf3

Please sign in to comment.