Skip to content

inputs: drop gitignore.nix #721

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.

Sign up for GitHub

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

Merged
sandydoo merged 1 commit into from
Jul 1, 2026
+5 −32
Merged

inputs: drop gitignore.nix #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 0 additions & 21 deletions flake.lock
View file
Open in desktop

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

8 changes: 2 additions & 6 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,8 @@
url = "github:NixOS/flake-compat";
flake = false;
};
inputs.gitignore = {
url = "github:hercules-ci/gitignore.nix";
inputs.nixpkgs.follows = "nixpkgs";
};

outputs = { self, nixpkgs, gitignore, ... }:
outputs = { self, nixpkgs, ... }:
let
lib = nixpkgs.lib;
defaultSystems = [
Expand All @@ -24,7 +20,7 @@
let
args = {
pkgs = nixpkgs.legacyPackages.${system};
exposed = import ./nix { inherit nixpkgs system; gitignore-nix-src = gitignore; isFlakes = true; };
exposed = import ./nix { inherit nixpkgs system; isFlakes = true; };
};
in
fn args;
Expand Down
2 changes: 0 additions & 2 deletions nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ system ? builtins.currentSystem
, nixpkgs
, gitignore-nix-src
, isFlakes ? false
,
}:
Expand All @@ -15,7 +14,6 @@ let
pkgs
tools
isFlakes
gitignore-nix-src
;
};

Expand Down
6 changes: 3 additions & 3 deletions nix/run.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
builtinStuff@{ lib, pkgs, tools, gitignore-nix-src, isFlakes }:
builtinStuff@{ lib, pkgs, tools, isFlakes }:

options@
{ src
Expand All @@ -18,12 +18,12 @@ let
config = lib.mkMerge [
moduleOptions
{
_module.args = { inherit pkgs gitignore-nix-src; };
_module.args = { inherit pkgs; };
tools = lib.mkDefault (builtinStuff.tools // tools);
rootSrc =
if isFlakes
then src
else gitignore-nix-src.lib.gitignoreSource src;
else pkgs.nix-gitignore.gitignoreSource [ ] src;
}
];
}
Expand Down
Loading