Skip to content

Commit

Permalink
Update flake to nixos-24.11 (#284)
Browse files Browse the repository at this point in the history
  • Loading branch information
kachick authored Dec 9, 2024
1 parent 8af15c5 commit f510e17
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 70 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ jobs:
- uses: actions/checkout@v4
- uses: dprint/check@v2.2
with:
dprint-version: '0.45.1' # selfup {"extract":"\\d[^']+","replacer":["bash","-c","dprint --version | cut -d ' ' -f 2"]}
dprint-version: '0.47.2' # selfup {"extract":"\\d[^']+","replacer":["bash","-c","dprint --version | cut -d ' ' -f 2"]}

typos:
timeout-minutes: 15
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: crate-ci/typos@v1.21.0 # selfup {"extract":"\\d\\.\\d+\\.\\d+","replacer":["bash","-c","typos --version | cut -d ' ' -f 2"]}
- uses: crate-ci/typos@v1.27.3 # selfup {"extract":"\\d\\.\\d+\\.\\d+","replacer":["bash","-c","typos --version | cut -d ' ' -f 2"]}
with:
files: |
.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-nixpkgs-and-versions-in-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
update-nixpkgs:
uses: kachick/selfup/.github/workflows/reusable-bump-flake-lock-and-selfup.yml@v1.1.7
uses: kachick/selfup/.github/workflows/reusable-bump-flake-lock-and-selfup.yml@v1.1.8
with:
app_id: ${{ vars.APP_ID }}
dry-run: ${{ github.event_name == 'pull_request' }}
Expand Down
52 changes: 20 additions & 32 deletions flake.lock

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

75 changes: 40 additions & 35 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,48 +1,53 @@
{
inputs = {
# Candidate channels
# - https://github.com/kachick/anylang-template/issues/17
# - https://discourse.nixos.org/t/differences-between-nix-channels/13998
# How to update the revision
# - `nix flake update --commit-lock-file` # https://nixos.org/manual/nix/stable/command-ref/new-cli/nix3-flake-update.html
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
selfup = {
url = "github:kachick/selfup/v1.1.8";
inputs.nixpkgs.follows = "nixpkgs";
};
};

outputs =
{
self,
nixpkgs,
flake-utils,
selfup,
}:
flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
{
formatter = pkgs.nixfmt-rfc-style;
devShells.default =
with pkgs;
mkShell {
buildInputs = [
# https://github.com/NixOS/nix/issues/730#issuecomment-162323824
# https://github.com/kachick/dotfiles/pull/228
bashInteractive
let
inherit (nixpkgs) lib;
forAllSystems = lib.genAttrs lib.systems.flakeExposed;
in
{
formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
devShells = forAllSystems (
system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
{
# Require CC to build io-console
default = pkgs.mkShell {
buildInputs =
(with pkgs; [
bashInteractive
findutils # xargs
nixfmt-rfc-style
nil

ruby_3_3
# Required to build psych via irb dependency
# https://github.com/kachick/irb-power_assert/issues/116
# https://github.com/ruby/irb/pull/648
libyaml

ruby_3_3
# Required to build psych via irb dependency
# https://github.com/kachick/irb-power_assert/issues/116
# https://github.com/ruby/irb/pull/648
libyaml
tree

tree
nil
nixfmt-rfc-style
dprint
typos
];
dprint
typos
])
++ [ selfup.packages.${system}.default ];
};
}
);
}
);
};
}

0 comments on commit f510e17

Please sign in to comment.