update fficxx to 0.7.0.1. dependency removed. (#21)

* add prompt * remove direnv * version up * use git master version of fficxx (for the time being before hackage update) * update CHANGES
wavewave · Jul 28, 2023 · 5b5a3a5 · 5b5a3a5
1 parent eacc92b
commit 5b5a3a5
Show file tree

Hide file tree

Showing 15 changed files with 75 additions and 34 deletions.
diff --git a/.envrc b/.envrc
diff --git a/HROOT-generate/HROOT-generate.cabal b/HROOT-generate/HROOT-generate.cabal
@@ -1,6 +1,6 @@
 Cabal-Version:  3.0
 Name:		HROOT-generate
-Version:	0.10.0.2
+Version:	0.10.0.3
 Synopsis:	automatic HROOT binding generation
 Description: 	automatic HROOT binding generation
 License:        LGPL-2.1-or-later
@@ -23,8 +23,8 @@ Library
                  cmdargs,
                  containers,
                  directory,
-                 fficxx >= 0.7,
-                 fficxx-runtime >= 0.7,
+                 fficxx >= 0.7.0.1,
+                 fficxx-runtime >= 0.7.0.1,
                  filepath>1,
                  haskell-src-exts,
                  mtl>2,
@@ -57,7 +57,7 @@ Executable HROOT-generate
                  Cabal,
                  containers,
                  directory,
-                 fficxx >= 0.7,
+                 fficxx >= 0.7.0.1,
                  filepath>1,
                  mtl>2,
                  optparse-applicative,

diff --git a/HROOT-generate/app/HROOT-generate.hs b/HROOT-generate/app/HROOT-generate.hs
@@ -173,7 +173,7 @@ makeUmbrellaCabal :: String
 makeUmbrellaCabal =
   let pkgname = "HROOT"
       -- TODO: this should be factored out.
-      version = "0.10.0.1"
+      version = "0.10.0.3"
       pkg_summarymodule = "HROOT"
       pkg_deps =
         [ "HROOT-core",

diff --git a/HROOT-generate/src/HROOT/Data/Core/Class.hs b/HROOT-generate/src/HROOT/Data/Core/Class.hs
@@ -90,7 +90,7 @@ corecabal :: Cabal
 corecabal =
   Cabal
     { cabal_pkgname = CabalName "HROOT-core",
-      cabal_version = "0.10.0.1",
+      cabal_version = "0.10.0.3",
       cabal_cheaderprefix = "HROOTCore",
       cabal_moduleprefix = "HROOT.Core",
       cabal_additional_c_incs = [],

diff --git a/HROOT-generate/src/HROOT/Data/Graf/Class.hs b/HROOT-generate/src/HROOT/Data/Graf/Class.hs
@@ -46,7 +46,7 @@ grafcabal :: Cabal
 grafcabal =
   Cabal
     { cabal_pkgname = CabalName "HROOT-graf",
-      cabal_version = "0.10.0.1",
+      cabal_version = "0.10.0.3",
       cabal_cheaderprefix = "HROOTGraf",
       cabal_moduleprefix = "HROOT.Graf",
       cabal_additional_c_incs = [],

diff --git a/HROOT-generate/src/HROOT/Data/Hist/Class.hs b/HROOT-generate/src/HROOT/Data/Hist/Class.hs
@@ -53,7 +53,7 @@ histcabal :: Cabal
 histcabal =
   Cabal
     { cabal_pkgname = CabalName "HROOT-hist",
-      cabal_version = "0.10.0.1",
+      cabal_version = "0.10.0.3",
       cabal_cheaderprefix = "HROOTHist",
       cabal_moduleprefix = "HROOT.Hist",
       cabal_additional_c_incs = [],

diff --git a/HROOT-generate/src/HROOT/Data/IO/Class.hs b/HROOT-generate/src/HROOT/Data/IO/Class.hs
@@ -22,7 +22,7 @@ iocabal :: Cabal
 iocabal =
   Cabal
     { cabal_pkgname = CabalName "HROOT-io",
-      cabal_version = "0.10.0.1",
+      cabal_version = "0.10.0.3",
       cabal_cheaderprefix = "HROOTIO",
       cabal_moduleprefix = "HROOT.IO",
       cabal_additional_c_incs = [],

diff --git a/HROOT-generate/src/HROOT/Data/Math/Class.hs b/HROOT-generate/src/HROOT/Data/Math/Class.hs
@@ -21,7 +21,7 @@ mathcabal :: Cabal
 mathcabal =
   Cabal
     { cabal_pkgname = CabalName "HROOT-math",
-      cabal_version = "0.10.0.1",
+      cabal_version = "0.10.0.3",
       cabal_cheaderprefix = "HROOTMath",
       cabal_moduleprefix = "HROOT.Math",
       cabal_additional_c_incs = [],

diff --git a/HROOT-generate/src/HROOT/Data/Net/Class.hs b/HROOT-generate/src/HROOT/Data/Net/Class.hs
@@ -22,7 +22,7 @@ netcabal :: Cabal
 netcabal =
   Cabal
     { cabal_pkgname = CabalName "HROOT-net",
-      cabal_version = "0.10.0.1",
+      cabal_version = "0.10.0.3",
       cabal_cheaderprefix = "HROOTNet",
       cabal_moduleprefix = "HROOT.Net",
       cabal_additional_c_incs = [],

diff --git a/HROOT-generate/src/HROOT/Data/RooFit/RooStats/Class.hs b/HROOT-generate/src/HROOT/Data/RooFit/RooStats/Class.hs
@@ -37,7 +37,7 @@ roostatscabal :: Cabal
 roostatscabal =
   Cabal
     { cabal_pkgname = CabalName "HROOT-RooFit-RooStats",
-      cabal_version = "0.10.0.1",
+      cabal_version = "0.10.0.3",
       cabal_cheaderprefix = "HROOTRooFitRooStats",
       cabal_moduleprefix = "HROOT.RooFit.RooStats",
       cabal_additional_c_incs = [],

diff --git a/HROOT-generate/src/HROOT/Data/Tree/Class.hs b/HROOT-generate/src/HROOT/Data/Tree/Class.hs
@@ -29,7 +29,7 @@ treecabal :: Cabal
 treecabal =
   Cabal
     { cabal_pkgname = CabalName "HROOT-tree",
-      cabal_version = "0.10.0.1",
+      cabal_version = "0.10.0.3",
       cabal_cheaderprefix = "HROOTTree",
       cabal_moduleprefix = "HROOT.Tree",
       cabal_additional_c_incs = [],

diff --git a/HROOT-generate/template/CHANGES b/HROOT-generate/template/CHANGES
@@ -1,5 +1,10 @@
 # Changelog for HROOT
 
+## 0.10.0.3
+- update fficxx to 0.7.0.1. dependency removed. (#21)
+
+## 0.10.0.2
+
 ## 0.10.0.1
 - Use hackage-version of fficxx (#18)
 - Generate docs in CI (#17)

diff --git a/docs/conf.py b/docs/conf.py
@@ -9,9 +9,9 @@
 import sphinx_rtd_theme
 
 project = 'HROOT'
-copyright = '2011-2022, Ian-Woo Kim'
+copyright = '2011-2023, Ian-Woo Kim'
 author = 'Ian-Woo Kim'
-release = '0.10.0.1'
+release = '0.10.0.3'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,8 +3,14 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/master";
     flake-utils.url = "github:numtide/flake-utils";
+    fficxx = {
+      url = "github:wavewave/fficxx/master";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
+
   };
-  outputs = { self, nixpkgs, flake-utils }:
+  outputs = { self, nixpkgs, flake-utils, fficxx }:
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs {
@@ -18,19 +24,21 @@
             inherit (final) root;
           } self super);
 
-        fficxx-version = "0.7.0.0";
+        #fficxx-version = "0.7.0.1";
 
         hpkgsFor = compiler:
           pkgs.haskell.packages.${compiler}.extend (hself: hsuper:
-            {
-              "fficxx" = hself.callHackage "fficxx" fficxx-version { };
-              "fficxx-runtime" =
-                hself.callHackage "fficxx-runtime" fficxx-version { };
-              "stdcxx" = hself.callHackage "stdcxx" fficxx-version { };
-              "template" = pkgs.haskell.lib.doJailbreak hsuper.template;
-              "ormolu" = pkgs.haskell.lib.overrideCabal hsuper.ormolu
-                (drv: { enableSeparateBinOutput = false; });
-            } // haskellOverlay pkgs hself hsuper);
+            (fficxx.haskellOverlay.${system} pkgs hself hsuper //
+              # temporarily commented out until the hackage is updated.
+              {
+                #"fficxx" = hself.callHackage "fficxx" fficxx-version { };
+                #"fficxx-runtime" =
+                #  hself.callHackage "fficxx-runtime" fficxx-version { };
+                #"stdcxx" = hself.callHackage "stdcxx" fficxx-version { };
+                #"template" = pkgs.haskell.lib.doJailbreak hsuper.template;
+                "ormolu" = pkgs.haskell.lib.overrideCabal hsuper.ormolu
+                  (drv: { enableSeparateBinOutput = false; });
+              } // haskellOverlay pkgs hself hsuper));
 
         mkPackages = compiler: {
           inherit (hpkgsFor compiler)
@@ -42,8 +50,13 @@
           let
             hsenv = withHROOT:
               (hpkgsFor compiler).ghcWithPackages (p:
-                [ p.fficxx p.fficxx-runtime p.stdcxx p.optparse-applicative p.dotgen ]
-                ++ (pkgs.lib.optional withHROOT p.HROOT));
+                [
+                  p.fficxx
+                  p.fficxx-runtime
+                  p.stdcxx
+                  p.optparse-applicative
+                  p.dotgen
+                ] ++ (pkgs.lib.optional withHROOT p.HROOT));
             pyenv = pkgs.python3.withPackages
               (p: [ p.sphinx p.sphinx_rtd_theme p.myst-parser ]);
             shBuildInputs = withHROOT: [
@@ -59,11 +72,13 @@
             mkShell = withHROOT:
               pkgs.mkShell {
                 buildInputs = shBuildInputs withHROOT;
-                shellHook = if system == "aarch64-darwin" || system
+                shellHook = ''
+                  export PS1="\n[HROOT:\w]$ \0"
+                '' + (if system == "aarch64-darwin" || system
                 == "x86_64-darwin" then
                   ''export MACOSX_DEPLOYMENT_TARGET="10.16"''
                 else
-                  null;
+                  null);
               };
           in {
             env = mkShell true;