Skip to content

flake/dev/diff-plugins: make a package output; ci: use diff-plugins from package output #3517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/pr-merged.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ jobs:
- name: Install Nix
uses: cachix/install-nix-action@v31
with:
nix_path: nixpkgs=channel:nixpkgs-unstable
extra_nix_config: |
accept-flake-config = true

Expand Down Expand Up @@ -124,7 +123,7 @@ jobs:
head: ${{ github.event.pull_request.head.sha }}
run: |
out=$(mktemp)
./flake/dev/diff-plugins.py --compact "$base" "$head" > "$out"
nix run .#diff-plugins --compact "$base" "$head" > "$out"
{
echo -n 'json='
jq -c . < "$out"
Expand All @@ -138,7 +137,7 @@ jobs:
head: ${{ github.event.pull_request.merge_commit_sha }}
run: |
out=$(mktemp)
./flake/dev/diff-plugins.py --compact "$base" "$head" > "$out"
nix run .#diff-plugins --compact "$base" "$head" > "$out"
{
echo -n 'json='
jq -c . < "$out"
Expand Down
1 change: 1 addition & 0 deletions flake/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
packages = lib.optionalAttrs (partitionStack == [ ]) {
# Propagate `packages` from the `dev` partition:
inherit (config.partitions.dev.module.flake.packages.${system})
diff-plugins
list-plugins
;
};
Expand Down
1 change: 1 addition & 0 deletions flake/dev/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{
imports = [
./devshell.nix
./diff-plugins
./list-plugins
./package-tests.nix
./template-tests.nix
Expand Down
5 changes: 0 additions & 5 deletions flake/dev/devshell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,6 @@
command = ''${./new-plugin.py} "$@"'';
help = "Create a new plugin";
}
{
name = "diff-plugins";
command = ''${./diff-plugins.py} "$@"'';
help = "Compare available plugins with another nixvim commit";
}
];
};
};
Expand Down
30 changes: 30 additions & 0 deletions flake/dev/diff-plugins/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
perSystem =
{
lib,
pkgs,
...
}:
let
package = pkgs.writers.writePython3Bin "diff-plugins" {
# Disable flake8 checks that are incompatible with the ruff ones
flakeIgnore = [
# Thinks shebang is a block comment
"E265"
# line too long
"E501"
];
} (builtins.readFile ./diff-plugins.py);
in
{
packages.diff-plugins = package;

devshells.default.commands = [
{
name = "diff-plugins";
command = ''${lib.getExe package} "$@"'';
help = "Compare available plugins with another nixvim commit";
}
];
};
}
File renamed without changes.