Skip to content
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

Jump to bottom

updating flake to support updated CI_Integration #35

Merged
merged 1 commit into from
Mar 24, 2022
Merged

updating flake to support updated CI_Integration #35

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
updating flake to support updated CI_Integration
  • Loading branch information
@DarthPJB @MatthewCroughan
DarthPJB authored and MatthewCroughan committed Mar 24, 2022
commit e47d61664931d2cd0232922966e377d65dfa4ceb
3 changes: 0 additions & 3 deletions ci.nix
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions flake-compat.nix
View file
Open in desktop

This file was deleted.

117 changes: 8 additions & 109 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.

20 changes: 3 additions & 17 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,23 @@
{
description = "dUSD";
inputs = {
danalib.url = "github:ardanalabs/danalib";
haskell-nix.url = "github:input-output-hk/haskell.nix";
nixpkgs.follows = "haskell-nix/nixpkgs-unstable";
haskell-nix.inputs.nixpkgs.follows = "haskell-nix/nixpkgs-2105";
plutus.url = "github:input-output-hk/plutus";
# used for libsodium-vrf
flake-compat-ci.url = "github:hercules-ci/flake-compat-ci";
flake-compat = {
url = "github:edolstra/flake-compat";
flake = false;
};
# used for libsodium-vrf
};
outputs =
{
self,
nixpkgs,
haskell-nix,
plutus,
flake-compat,
flake-compat-ci,
danalib,
}
@ inputs:
let
# System types to support.
supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
supportedSystems = [ "x86_64-linux" ]; #"aarch64-linux" ];

# Helper function to generate an attrset '{ x86_64-linux = f "x86_64-linux"; ... }'.
forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
Expand Down Expand Up @@ -101,11 +92,6 @@
};
in
{
ciNix = flake-compat-ci.lib.recurseIntoFlakeWith {
flake = self;
systems = [ "x86_64-linux" ];
};

project = forAllSystems projectFor;
flake = forAllSystems (system: (projectFor system).flake { });

Expand Down Expand Up @@ -136,7 +122,7 @@
);

devShell = forAllSystems (system: self.flake.${system}.devShell);

defaultPackage = forAllSystems (system: self.packages.${system}."dUSD:test:tests");
apps = forAllSystems (system: let
pkgs = (forAllSystems nixpkgsFor)."${system}";
in
Expand Down