Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
haskell-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
160
Issues
160
List
Board
Labels
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
haskell-gargantext
Commits
b9cd7de8
Commit
b9cd7de8
authored
Jan 04, 2024
by
Alfredo Di Napoli
Committed by
Alfredo Di Napoli
Jan 22, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Take another route, use on older nixpkgs with llvm-12
parent
96563a13
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
418 additions
and
34 deletions
+418
-34
cabal.project
cabal.project
+2
-1
ghc947.nix
nix/overlays/ghc947.nix
+396
-0
pinned-23.05.nix
nix/pinned-23.05.nix
+6
-0
pkgs.nix
nix/pkgs.nix
+14
-33
No files found.
cabal.project
View file @
b9cd7de8
...
...
@@ -156,10 +156,11 @@ source-repository-package
location
:
https
://
github
.
com
/
chessai
/
eigen
.
git
tag
:
1790f
df9138970dde0dbabf8b270698145a4a88c
--
llvm
-
12
with
support
for
GHC
9.4
.*
source
-
repository
-
package
type
:
git
location
:
https
://
github
.
com
/
adinapoli
/
llvm
-
hs
.
git
tag
:
7
87
dddc034c94fbe5322b3a3c766c153c9259306
tag
:
7
533
a9ccd3bfe77141745f6b61039a26aaf5c83b
subdir
:
llvm
-
hs
-
pure
source
-
repository
-
package
...
...
nix/overlays/ghc947.nix
0 → 100644
View file @
b9cd7de8
This diff is collapsed.
Click to expand it.
nix/pinned-23.05.nix
0 → 100644
View file @
b9cd7de8
import
(
builtins
.
fetchGit
{
name
=
"nixos-23.05"
;
url
=
"https://github.com/nixos/nixpkgs"
;
ref
=
"refs/heads/nixos-23.05"
;
rev
=
"4ecab3273592f27479a583fb6d975d4aba3486fe"
;
})
nix/pkgs.nix
View file @
b9cd7de8
{
pkgs
?
import
./pinned-23.
11
.nix
{}
}:
{
pkgs
?
import
./pinned-23.
05
.nix
{}
}:
rec
{
inherit
pkgs
;
# If we are on a Mac, in order to build successfully with cabal we need a bit more work.
ghc
=
if
pkgs
.
stdenv
.
isDarwin
then
haskell1
.
compiler
.
ghc947
.
overrideAttrs
(
finalAttrs
:
previousAttrs
:
{
# See https://github.com/NixOS/nixpkgs/pull/149942/files
patches
=
previousAttrs
.
patches
++
[
# Reverts the linking behavior of GHC to not resolve `-libc++` to `c++`.
(
pkgs
.
fetchpatch
{
url
=
"https://gist.githubusercontent.com/adinapoli/bf722db15f72763bf79dff13a3104b6f/raw/21e4fe65e71e721aece563b0c39be6ba1ace5b28/ghc947-macOS-loadArchive-fix.patch"
;
sha256
=
"sha256-0rWN6nGIVlB65QBGX3PaHPQFCitGGC8wTJg8kPJu5KQ="
;
})
];
})
else
pkgs
.
haskell
.
compiler
.
ghc947
;
haskell1
=
pkgs
.
haskell
//
{
packages
=
pkgs
.
haskell
.
packages
//
{
ghc947
=
pkgs
.
haskell
.
packages
.
ghc947
.
override
{
overrides
=
self
:
super
:
{
#directory = self.callPackage ./overlays/directory-1.3.7.1.nix {};
#process = self.callPackage ./overlays/process-1.6.17.0.nix {};
#hackage-security = self.callPackage ./overlays/hackage-security-0.6.2.3.nix {};
#Cabal = self.callPackage ./overlays/Cabal-3.10.1.0.nix {};
#Cabal-syntax = self.callPackage ./overlays/Cabal-syntax-3.10.1.0.nix {};
#cabal-install-solver = self.callPackage ./overlays/cabal-install-solver-3.10.1.0.nix {};
#cabal-install = self.callPackage ./overlays/cabal-install-3.10.1.0.nix {};
};
};
};
ghc947
=
pkgs
.
callPackage
./overlays/ghc947.nix
{
bootPkgs
=
pkgs
.
haskell
.
packages
.
ghc8107
;
inherit
(
pkgs
.
buildPackages
.
python3Packages
)
sphinx
;
# Need to use apple's patched xattr until
# https://github.com/xattr/xattr/issues/44 and
# https://github.com/xattr/xattr/issues/55 are solved.
inherit
(
pkgs
.
buildPackages
.
darwin
)
xattr
autoSignDarwinBinariesHook
;
buildTargetLlvmPackages
=
pkgs
.
pkgsBuildTarget
.
llvmPackages_12
;
llvmPackages
=
pkgs
.
llvmPackages_12
;
};
#cabal_install_3_10_1_0 = pkgs.haskell.lib.compose.justStaticExecutables haskell1.packages.ghc947.cabal-install;
graphviz
=
pkgs
.
graphviz
.
overrideAttrs
(
finalAttrs
:
previousAttrs
:
{
...
...
@@ -44,7 +26,7 @@ rec {
igraph_0_10_4
=
pkgs
.
igraph
.
overrideAttrs
(
finalAttrs
:
previousAttrs
:
{
version
=
"0.10.4"
;
nativeBuildInputs
=
previousAttrs
.
nativeBuildInputs
or
[]
++
[
pkgs
.
gcc7
pkgs
.
clang_11
];
nativeBuildInputs
=
previousAttrs
.
nativeBuildInputs
or
[]
++
[
pkgs
.
clang_12
];
src
=
pkgs
.
fetchFromGitHub
{
owner
=
"igraph"
;
...
...
@@ -99,7 +81,7 @@ rec {
});
hsBuildInputs
=
[
ghc
ghc
947
#cabal_install_3_10_1_0
];
nonhsBuildInputs
=
with
pkgs
;
[
...
...
@@ -121,12 +103,11 @@ rec {
zlib
blas
gfortran7
# gfortran7.cc.lib
expat
icu
graphviz
llvm_1
1
clang_1
1
llvm_1
2
clang_1
2
gcc7
igraph_0_10_4
libpqxx
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment