Merge branch 'adinapoli/issue-3' into 'master'

Upgrade nixpkgs and GHC

Closes #3

See merge request !5

haskell-igraph.cabal

@@ -66,16 +66,15 @@ library
   build-tool-depends:
       c2hs:c2hs >=0.25.0
   build-depends:
-      base >=4.10 && <5.0
-    , bytestring >=0.9
-    , cereal
-    , conduit >=1.3.0
-    , containers
-    , data-ordlist
-    , primitive
-    , singletons >= 3.0 && < 3.3
-    , singletons-base > 3.0
-    , singletons-th > 3.0
+      base >=4.10 && <5.0,
+      bytestring >= 0.11.5 && < 0.12,
+      cereal >= 0.5.8 && < 0.6,
+      containers >= 0.6.7 && < 0.7,
+      conduit >= 1.3.6 && < 1.4,
+      primitive >= 0.9.0 && < 0.10,
+      data-ordlist >= 0.4.7 && < 0.5,
+      singletons-base >= 3.2 && < 3.3,
+      singletons-th >= 3.2 && < 3.3,
   default-language: Haskell2010
 
 test-suite test

nix/pinned-25.05.darwin.nix

+import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/32fb99ba93fea2798be0e997ea331dd78167f814.tar.gz")

nix/pinned-25.05.nix

+import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/c46290747b2aaf090f48a478270feb858837bf11.tar.gz")

nix/pkgs.nix

-{ pkgs ? import ./pinned-23.11.nix {} }:
+{ pkgs ? import (if builtins.elem builtins.currentSystem ["x86_64-darwin" "aarch64-darwin"]
+                 then ./pinned-25.05.darwin.nix
+                 else ./pinned-25.05.nix) {} }:
 
 rec {
   inherit pkgs;
-  ghc = pkgs.haskell.compiler.ghc947;
+  ghc = pkgs.haskell.compiler.ghc966;
   igraph_0_10_4 = pkgs.igraph.overrideAttrs (finalAttrs: previousAttrs: {
     version = "0.10.4";
 
@@ -17,7 +19,7 @@ rec {
       echo "0.10.4" > IGRAPH_VERSION
     '';
 
-    outputs = [ "out" "doc" ];
+    outputs = [ "dev" "out" "doc" ];
 
     buildInputs = [
       pkgs.arpack
@@ -46,14 +48,17 @@ rec {
       "-DBUILD_SHARED_LIBS=ON"
     ];
 
+    doCheck = false;
+
     postInstall = ''
       mkdir -p "$out/share"
       cp -r doc "$out/share"
     '';
 
     postFixup = previousAttrs.postFixup + ''
+      echo "Copying files where they belong .."
       CUR_DIR=$PWD
-      cd "$out/include/igraph" && cp *.h ../
+      cd "$dev/include/igraph" && cp *.h ../
       cd $CUR_DIR
     '';
 
@@ -69,8 +74,8 @@ rec {
        ]);
   libPaths = pkgs.lib.makeLibraryPath nonhsBuildInputs;
   shellHook = ''
-    export LD_LIBRARY_PATH="${pkgs.gfortran7.cc.lib}:${libPaths}:$LD_LIBRARY_PATH"
-    export LIBRARY_PATH="${pkgs.gfortran7.cc.lib}:${libPaths}"
+    export LD_LIBRARY_PATH="${pkgs.gfortran.cc.lib}:${libPaths}:$LD_LIBRARY_PATH"
+    export LIBRARY_PATH="${pkgs.gfortran.cc.lib}:${libPaths}"
   '';
   shell = pkgs.mkShell {
     name = "igraph-shell";