Commit b9cd7de8 authored by Alfredo Di Napoli's avatar Alfredo Di Napoli Committed by Alfredo Di Napoli

Take another route, use on older nixpkgs with llvm-12

parent 96563a13
...@@ -156,10 +156,11 @@ source-repository-package ...@@ -156,10 +156,11 @@ source-repository-package
location: https://github.com/chessai/eigen.git location: https://github.com/chessai/eigen.git
tag: 1790fdf9138970dde0dbabf8b270698145a4a88c tag: 1790fdf9138970dde0dbabf8b270698145a4a88c
-- llvm-12 with support for GHC 9.4.*
source-repository-package source-repository-package
type: git type: git
location: https://github.com/adinapoli/llvm-hs.git location: https://github.com/adinapoli/llvm-hs.git
tag: 787dddc034c94fbe5322b3a3c766c153c9259306 tag: 7533a9ccd3bfe77141745f6b61039a26aaf5c83b
subdir: llvm-hs-pure subdir: llvm-hs-pure
source-repository-package source-repository-package
......
This diff is collapsed.
import (builtins.fetchGit {
name = "nixos-23.05";
url = "https://github.com/nixos/nixpkgs";
ref = "refs/heads/nixos-23.05";
rev = "4ecab3273592f27479a583fb6d975d4aba3486fe";
})
{ pkgs ? import ./pinned-23.11.nix {} }: { pkgs ? import ./pinned-23.05.nix {} }:
rec { rec {
inherit pkgs; inherit pkgs;
# If we are on a Mac, in order to build successfully with cabal we need a bit more work. ghc947 = pkgs.callPackage ./overlays/ghc947.nix {
ghc = if pkgs.stdenv.isDarwin bootPkgs = pkgs.haskell.packages.ghc8107;
then haskell1.compiler.ghc947.overrideAttrs (finalAttrs: previousAttrs: { inherit (pkgs.buildPackages.python3Packages) sphinx;
# See https://github.com/NixOS/nixpkgs/pull/149942/files # Need to use apple's patched xattr until
patches = previousAttrs.patches ++ [ # https://github.com/xattr/xattr/issues/44 and
# Reverts the linking behavior of GHC to not resolve `-libc++` to `c++`. # https://github.com/xattr/xattr/issues/55 are solved.
(pkgs.fetchpatch { inherit (pkgs.buildPackages.darwin) xattr autoSignDarwinBinariesHook;
url = "https://gist.githubusercontent.com/adinapoli/bf722db15f72763bf79dff13a3104b6f/raw/21e4fe65e71e721aece563b0c39be6ba1ace5b28/ghc947-macOS-loadArchive-fix.patch"; buildTargetLlvmPackages = pkgs.pkgsBuildTarget.llvmPackages_12;
sha256 = "sha256-0rWN6nGIVlB65QBGX3PaHPQFCitGGC8wTJg8kPJu5KQ="; llvmPackages = pkgs.llvmPackages_12;
})
];
})
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 {};
};
};
};
}; };
#cabal_install_3_10_1_0 = pkgs.haskell.lib.compose.justStaticExecutables haskell1.packages.ghc947.cabal-install; #cabal_install_3_10_1_0 = pkgs.haskell.lib.compose.justStaticExecutables haskell1.packages.ghc947.cabal-install;
graphviz = pkgs.graphviz.overrideAttrs (finalAttrs: previousAttrs: { graphviz = pkgs.graphviz.overrideAttrs (finalAttrs: previousAttrs: {
...@@ -44,7 +26,7 @@ rec { ...@@ -44,7 +26,7 @@ rec {
igraph_0_10_4 = pkgs.igraph.overrideAttrs (finalAttrs: previousAttrs: { igraph_0_10_4 = pkgs.igraph.overrideAttrs (finalAttrs: previousAttrs: {
version = "0.10.4"; version = "0.10.4";
nativeBuildInputs = previousAttrs.nativeBuildInputs or [] ++ [ pkgs.gcc7 pkgs.clang_11 ]; nativeBuildInputs = previousAttrs.nativeBuildInputs or [] ++ [ pkgs.clang_12 ];
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "igraph"; owner = "igraph";
...@@ -99,7 +81,7 @@ rec { ...@@ -99,7 +81,7 @@ rec {
}); });
hsBuildInputs = [ hsBuildInputs = [
ghc ghc947
#cabal_install_3_10_1_0 #cabal_install_3_10_1_0
]; ];
nonhsBuildInputs = with pkgs; [ nonhsBuildInputs = with pkgs; [
...@@ -121,12 +103,11 @@ rec { ...@@ -121,12 +103,11 @@ rec {
zlib zlib
blas blas
gfortran7 gfortran7
# gfortran7.cc.lib
expat expat
icu icu
graphviz graphviz
llvm_11 llvm_12
clang_11 clang_12
gcc7 gcc7
igraph_0_10_4 igraph_0_10_4
libpqxx libpqxx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment