Skip to content

[ETCM-108] Factor out mkSrc #703

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
merged 1 commit into from
Oct 13, 2020
Merged

[ETCM-108] Factor out mkSrc #703

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
2 changes: 1 addition & 1 deletion nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ let

inherit (final.mantisPkgs) mantis;

inherit (final.mantisPkgs) mantis-unwrapped;
mkSrc = import sources.nix-mksrc { inherit (final) lib; };
};
in import sources.nixpkgs {
inherit system;
Expand Down
17 changes: 1 addition & 16 deletions nix/pkgs/mantis/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
{ src, lib, gitignoreSource, callPackage, jre }: rec {

mkSrc = src:
let
isGit = builtins.pathExists (src + "/.git");
repo = builtins.fetchGit { url = src; submodules = true; };
dirty = repo.revCount == 0;
filterSrc = src:
lib.cleanSourceWith {
inherit src;
filter = path: _: !lib.hasSuffix "nix" path;
};
in if isGit then
if dirty then filterSrc (gitignoreSource src) else repo
else
src;
{ src, mkSrc, lib, gitignoreSource, callPackage, jre }: rec {

mantis-source = mkSrc src;

Expand Down
12 changes: 12 additions & 0 deletions nix/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,18 @@
"url": "https://github.com/nmattia/niv/archive/f73bf8d584148677b01859677a63191c31911eae.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nix-mksrc": {
"branch": "master",
"description": null,
"homepage": "",
"owner": "input-output-hk",
"repo": "nix-mksrc",
"rev": "c446c2da50209f06d75df9f06f9faa738939b54d",
"sha256": "1mnp88fvg9rkl211zsg1mjkx0kk63l9q4fdy3a4avbq8z9bjb1gf",
"type": "tarball",
"url": "https://github.com/input-output-hk/nix-mksrc/archive/c446c2da50209f06d75df9f06f9faa738939b54d.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixkite": {
"branch": "master",
"description": "Nixkite is a Buildkite pipeline generation tool using the NixOS module system",
Expand Down