Skip to content

Commit

Permalink
Prefer stable pkgs for bash and basics in Nix
Browse files Browse the repository at this point in the history
  • Loading branch information
kachick committed Apr 4, 2024
1 parent 19a46f6 commit 40797e3
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/generate_site_and_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
env:
# Keep same version with `make deps`
HUGO_VERSION: 0.122.0
HUGO_VERSION: 0.124.1
steps:
- name: Install Hugo CLI
run: |
Expand Down
25 changes: 21 additions & 4 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
{
inputs = {
# How to update the revision: `nix flake update --commit-lock-file`
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
edge-nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-utils.url = "github:numtide/flake-utils";
};

outputs = { self, nixpkgs, flake-utils }:
outputs = { self, nixpkgs, edge-nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages.${system};
edge-pkgs = edge-nixpkgs.legacyPackages.${system};
in
{
devShells.default = with pkgs;
Expand All @@ -17,19 +19,20 @@
# https://github.com/NixOS/nix/issues/730#issuecomment-162323824
bashInteractive

hugo
go_1_22
gnumake
coreutils
peco
typos
dprint
yamlfmt
typos
imagemagick
actionlint
nil
nixpkgs-fmt
vim

edge-pkgs.hugo
edge-pkgs.go_1_22
edge-pkgs.dprint
];
};
});
Expand Down

0 comments on commit 40797e3

Please sign in to comment.