Skip to content
This repository was archived by the owner on Sep 23, 2020. It is now read-only.

NXG-27 Set default nixpkgs and stackage sources in default.nix #38

Open
vcanadi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

NXG-27 Set default nixpkgs and stackage sources in default.nix #38

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
6 changes: 5 additions & 1 deletion nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ let
makeNixageProj = proj': root:
let
# Set defaults and root
proj = { extra-deps = {}; } // proj' // { inherit root; };
proj = {
extra-deps = {};
nixpkgs-stackage = import ./nixpkgs-stackage.nix;
nixpkgs = import ./nixpkgs.nix;
} // proj' // { inherit root; };

nixageProj = nixagePackages proj;
_nixage = {
Expand Down
14 changes: 2 additions & 12 deletions nix/makePackages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,9 @@ let
inherit (import ./stackage.nix) fixResolverName;
inherit (import ./upstream.nix { inherit pkgs; }) callCabal2nix;

stackageSrc =
if proj ? nixpkgs-stackage
then proj.nixpkgs-stackage
else import ./nixpkgs-stackage.nix;

nixpkgsSrc =
if proj ? nixpkgs
then proj.nixpkgs
else import ./nixpkgs.nix;

projPkgs = import (fetchTarball nixpkgsSrc) {
projPkgs = import (fetchTarball proj.nixpkgs) {
inherit config system;
overlays = [ overrides (import (fetchTarball stackageSrc)) ];
overlays = [ overrides (import (fetchTarball proj.nixpkgs-stackage)) ];
};

resolver = fixResolverName proj.resolver;
Expand Down