Skip to content

Commit

Permalink
Merge pull request #749 from kachick/prefer-stable-nixpkgs
Browse files Browse the repository at this point in the history
Prefer stable nixpkgs and add some devtools
  • Loading branch information
kachick authored Apr 5, 2024
2 parents 57271cd + 4023232 commit 2f486e6
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 11 deletions.
4 changes: 4 additions & 0 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ script = [
# "nixpkgs-fmt --version",
"actionlint --version",
"typos --version",
"gh --version",
"jq --version",
"jnv --version",
"pinact --version",
]

[tasks.check_no_git_diff]
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.

21 changes: 14 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
# - 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-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 @@ -24,16 +26,21 @@
nil
nixpkgs-fmt

nodejs_20
deno
dprint
cargo-make
typos
actionlint

edge-pkgs.nodejs_20
edge-pkgs.deno
edge-pkgs.dprint
edge-pkgs.typos

# Helper for writing and linting actions
edge-pkgs.actionlint
edge-pkgs.pinact

# For fighting the GitHub API
gh
jq
edge-pkgs.jnv
];
};
});
Expand Down

0 comments on commit 2f486e6

Please sign in to comment.