Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
PaymentServer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Administrator
PaymentServer
Commits
779a9204
Commit
779a9204
authored
3 years ago
by
Jean-Paul Calderone
Browse files
Options
Downloads
Patches
Plain Diff
attempt to supply libchallenge_bypass_ristretto_ffi, to no effect
parent
68f3fc20
No related branches found
No related tags found
1 merge request
!93
Update to a newer Haskell.nix
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
default.nix
+30
-20
30 additions, 20 deletions
default.nix
with
30 additions
and
20 deletions
default.nix
+
30
−
20
View file @
779a9204
let
moreOverlays
=
[
(
import
./oldnix/overlay.nix
)
];
# Read in the Niv sources
sources
=
import
./nix/sources.nix
{
};
# If ./nix/sources.nix file is not found run:
...
...
@@ -10,7 +12,7 @@ let
# If haskellNix is not found run:
# niv add input-output-hk/haskell.nix -n haskellNix
libchallenge_bypass_ristretto_ffi
=
pkgs
.
callPackage
./oldnix/challenge-bypass-ristretto.nix
{
}
;
allOverlays
=
moreOverlays
++
haskellNix
.
nixpkgsArgs
.
overlays
;
# Import nixpkgs and pass the haskell.nix provided nixpkgsArgs
pkgs
=
import
...
...
@@ -20,22 +22,30 @@ let
haskellNix
.
sources
.
nixpkgs-2009
# These arguments passed to nixpkgs, include some patches and also
# the haskell.nix functionality itself as an overlay.
(
haskellNix
.
nixpkgsArgs
//
{
overlays
=
haskellNix
.
nixpkgsArgs
.
overlays
++
[
(
self
:
super
:
{
inherit
libchallenge_bypass_ristretto_ffi
;
})
];
});
(
haskellNix
.
nixpkgsArgs
//
{
overlays
=
allOverlays
;
});
in
pkgs
.
haskell-nix
.
project
{
hsPkgs
=
pkgs
.
haskell-nix
.
project
{
# 'cleanGit' cleans a source directory based on the files known by git
src
=
pkgs
.
haskell-nix
.
haskellLib
.
cleanGit
{
name
=
"PaymentServer"
;
src
=
./.
;
};
modules
=
[{
packages
.
PaymentServer
.
components
.
library
.
libs
=
pkgs
.
lib
.
mkForce
[
libchallenge_bypass_ristretto_ffi
packages
.
PaymentServer
.
components
.
library
.
libs
=
[
pkgs
.
pkg-config
pkgs
.
libchallenge_bypass_ristretto_ffi
];
}];
}
};
in
hsPkgs
# pkgs.lib.recursiveUpdate hsPkgs {
# PaymentServer.setup.propagatedNativeBuildInputs = [
# pkgs.pkg-config
# pkgs.libchallenge_bypass_ristretto_ffi
# ];
# PaymentServer.components.library.propagatedNativeBuildInputs = [
# pkgs.pkg-config
# pkgs.libchallenge_bypass_ristretto_ffi
# ];
# }
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment