Skip to content

Commit

Permalink
Merge pull request #10 from jwillikers/24.11
Browse files Browse the repository at this point in the history
Switch to the NixOS 24.11 branch
  • Loading branch information
jwillikers authored Nov 18, 2024
2 parents bff40f4 + a19a959 commit 679b94a
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/treefmt.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- uses: DeterminateSystems/nix-installer-action@v16
- uses: DeterminateSystems/magic-nix-cache-action@v8
- name: Run treefmt
run: nix develop --command treefmt --fail-on-change --no-cache
run: nix develop --command treefmt --ci
- uses: reviewdog/action-suggester@v1
with:
fail_on_error: true
Expand Down
8 changes: 4 additions & 4 deletions .justfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ default: build
alias b := build

build derivation="update-nix-direnv":
nix build '.#{{ derivation }}'
nix build ".#{{ derivation }}"

alias c := check

Expand All @@ -22,7 +22,7 @@ format:
alias r := run

run derivation="update-nix-direnv":
nix run '.#{{ derivation }}'
nix run ".#{{ derivation }}"

alias t := test

Expand All @@ -34,6 +34,6 @@ alias u := update
alias up := update

update:
nix run '.#update-nix-direnv'
nix run '.#update-nixos-release'
nix run ".#update-nix-direnv"
nix run ".#update-nixos-release"
nix flake update
31 changes: 7 additions & 24 deletions flake.lock

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

9 changes: 3 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
inputs = {
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
pre-commit-hooks = {
url = "github:cachix/pre-commit-hooks.nix";
inputs = {
Expand All @@ -20,7 +19,6 @@
# deadnix: skip
self,
nixpkgs,
nixpkgs-unstable,
flake-utils,
pre-commit-hooks,
treefmt-nix,
Expand All @@ -30,9 +28,8 @@
let
overlays = [ ];
pkgs = import nixpkgs { inherit system overlays; };
unstablePkgs = import nixpkgs-unstable { inherit system overlays; };
lib = import ./lib { inherit self system; };
packages = import ./packages { pkgs = unstablePkgs; };
packages = import ./packages { inherit pkgs; };
pre-commit = pre-commit-hooks.lib.${system}.run (
import ./pre-commit-hooks.nix { inherit pkgs treefmtEval; }
);
Expand All @@ -58,7 +55,7 @@
fish
just
lychee
unstablePkgs.nushell
nushell
treefmtEval.config.build.wrapper
# Make formatters available for IDE's.
(builtins.attrValues treefmtEval.config.build.programs)
Expand Down

0 comments on commit 679b94a

Please sign in to comment.