Skip to content

Split utility functions out from default.nix #38

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

Open
madeline-os wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Split utility functions out from default.nix #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe75967
Split utility functions out from default.nix
madeline-os Aug 21, 2022
04b3760
Update lib.nix
madeline-os Aug 22, 2022
3738f0f
Fix nix eval error
Ericson2314 Aug 24, 2022
28a9463
Merge branch 'master' into mh-split-lib
Ericson2314 Oct 3, 2024
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
13 changes: 8 additions & 5 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@
, ghc ? (import ./versions.nix).ghc.preferred
}:

with pkgs.haskell.lib;

let inherit (pkgs) lib;
let
postInstallGenerateOptparseApplicativeCompletion = exeName: ''
bashCompDir="''${!outputBin}/share/bash-completion/completions"
zshCompDir="''${!outputBin}/share/zsh/vendor-completions"
Expand Down Expand Up @@ -55,9 +53,14 @@ in rec {
# thing to install
command = project.nix-thunk.components.exes.nix-thunk;

inherit (import ./dep/gitignore.nix { inherit lib; }) gitignoreSource;
inherit (import ./dep/gitignore.nix { inherit (pkgs) lib; }) gitignoreSource;

lib = pkgs.callPackage ./lib.nix {
inherit gitignoreSource;
inherit (pkgs) fetchgitPrivate;
Copy link
Member

@Ericson2314 Ericson2314 Aug 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed?

Copy link
Contributor Author

@madeline-os madeline-os Aug 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea, idk why. i know fetchgitPrivate has since been removed, but it should still show up w/ callPackage on our checkout. I wanted to look further into this.

};

inherit (import ./lib.nix { inherit pkgs gitignoreSource; })
inherit (lib)
thunkSource
mapSubdirectories
;
Expand Down
15 changes: 8 additions & 7 deletions lib.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@
# that is what these functions help with.

{
lib ? pkgs.lib,
pkgs,
gitignoreSource ?
(import ./dep/gitignore.nix { inherit lib; }).gitignoreSource,
lib,
fetchgit,
fetchgitPrivate,
gitignoreSource ? (import ./dep/gitignore.nix { inherit lib; }).gitignoreSource,
fetchFromGitHub,
}:

{
Expand Down Expand Up @@ -47,11 +48,11 @@
else if hasValidThunk "git.json" then (
let gitArgs = filterArgs (builtins.fromJSON (builtins.readFile (p + "/git.json")));
in if builtins.elem "@" (lib.stringToCharacters gitArgs.url)
then pkgs.fetchgitPrivate gitArgs
else pkgs.fetchgit gitArgs
then fetchgitPrivate gitArgs
else fetchgit gitArgs
)
else if hasValidThunk "github.json" then
pkgs.fetchFromGitHub (filterArgs (builtins.fromJSON (builtins.readFile (p + "/github.json"))))
fetchFromGitHub (filterArgs (builtins.fromJSON (builtins.readFile (p + "/github.json"))))
else {
name = baseNameOf p;
outPath = gitignoreSource p;
Expand Down