Port NeoHaskell to haskell.nix Infrastructure

.vscode/settings.json

@@ -20,6 +20,7 @@
     "Monoid",
     "Nanotime",
     "NEOHASKELL",
+    "nhcli",
     "nhcore",
     "nixfmt",
     "nixpkgs",

cli/nhcli.cabal

@@ -1,6 +1,6 @@
 cabal-version:      3.4
 name:               nhcli
-version:            0.9.0
+version:            0.9.1
 synopsis:           Command Line Tool for NeoHaskell
 description:        NeoHaskell is a dialect of Haskell that is focused on newcomer-friendliness and productivity.
 homepage:           https://neohaskell.org
@@ -11,7 +11,7 @@ maintainer:         nhlib@nickseagull.dev
 copyright:
 category:           Development
 build-type:         Simple
-extra-source-files: ../nix/haskellnix.nix, ../nix/haskell-project.nix
+extra-source-files: ./nix/haskell-project.nix
 
 common common_cfg
     ghc-options:  -Wall

cli/nix/haskell-project.nix

@@ -1,28 +1,44 @@
 { pkgs }:
 
-# Generic function to create a Haskell project template
-{ projectName, src }:
+{ packages, mainPackageName, executableName }:
 let
   haskellNix = import (pkgs.fetchFromGitHub {
     owner = "input-output-hk";
     repo = "haskell.nix";
     rev = "4d493449406ec91db804511a6d15b6f076ba40e7";
     sha256 = "sha256-CHNMDgFfpTV5WkVhmMLf5d5qaLUjgeoziVgmgnhPGrI=";
-  }) { inherit pkgs; };
-  # Apply haskell.nix overlay
+  }) { };
   pkgsWithOverlay = import haskellNix.sources.nixpkgs-unstable {
     overlays = [
       haskellNix.overlay
-      (final: _prev: {
-        "${projectName}Project" = final.haskell-nix.cabalProject {
-          inherit src;
-          compiler-nix-name = "ghc910";
-        };
-      })
+      (final: _prev:
+        builtins.listToAttrs (builtins.map (packageName: {
+          name = "${packageName}";
+          value = final.haskell-nix.cabalProject {
+            src = packages.${packageName};
+            compiler-nix-name = "ghc910";
+          };
+        }) (builtins.attrNames packages)))
     ];
     inherit (haskellNix) config;
   };
 
-  flake = pkgsWithOverlay."${projectName}Project".flake { };
+  pkg = pkgsWithOverlay."${mainPackageName}";
 
-in flake.packages."${projectName}:exe:${projectName}"
+in {
+  shell = pkg.shellFor {
+    tools = {
+      cabal = { };
+      hlint = { };
+      haskell-language-server = { };
+    };
+    buildInputs = [
+      pkgs.nil
+      pkgs.nixfmt-classic
+      pkgs.nixpkgs-fmt
+      pkgs.pkg-config
+      pkgs.zlib
+    ];
+  };
+  package = (pkg.flake { }).packages."${executableName}";
+}

cli/src/Neo.hs

@@ -49,7 +49,7 @@ run = do
         Command.CommandOptions
           { name = "neo",
             description = "NeoHaskell's console helper",
-            version = Just [Core.version|0.9.0|],
+            version = Just [Core.version|0.9.1|],
             decoder = commandsParser
           }
   cmd <- Command.parseHandler parser

cli/src/Neo/Build.hs

@@ -75,10 +75,12 @@ handle config = do
   File.writeText targetAppPath appMainFile
     |> Task.mapError (\_ -> CustomError "Could not write app main file")
 
-  -- FIXME: Create another thread that renders the output of the build via streaming.
-  -- As right now there's no output at all
+  let buildExpression :: Text =
+        [fmt|{ pkgs ? import <nixpkgs> {} }:
+  ( (#{nixFile}) { inherit pkgs; } ).package|]
+
   completion <-
-    Subprocess.openInherit "nix-build" (Array.fromLinkedList ["-E", nixFile]) rootFolder Subprocess.InheritBOTH
+    Subprocess.openInherit "nix-build" (Array.fromLinkedList ["-E", buildExpression]) rootFolder Subprocess.InheritBOTH
   if completion.exitCode != 0
     then errorOut completion.stderr
     else print completion.stdout

cli/src/Neo/Build/Templates/Nix.hs

@@ -18,8 +18,11 @@ let
   hp = (#{haskellProject});
 
 in (hp { inherit pkgs;  }) {
-  projectName = "#{name}";
-  src = ./.;
+  packages = {
+    "#{name}" = ./.;
+  };
+  mainPackageName = "#{name}";
+  executableName = "#{name}:exe:#{name}";
 }
 
   |]

cli/src/Neo/Shell.hs

@@ -75,9 +75,10 @@ handle config = do
   File.writeText targetAppPath appMainFile
     |> Task.mapError (\_ -> CustomError "Could not write app main file")
 
-  let shellExpression =
+  let shellExpression :: Text =
         [fmt|{ pkgs ? import <nixpkgs> {} }:
-  ( (#{nixFile}) { inherit pkgs; } ).env|]
+  ( (#{nixFile}) { inherit pkgs; } ).shell|]
+
   completion <-
     Subprocess.openInherit "nix-shell" (Array.fromLinkedList ["-E", shellExpression]) rootFolder Subprocess.InheritBOTH
   if completion.exitCode != 0

common.nix

@@ -0,0 +1,12 @@
+{ pkgs ? import ./nix/nixpkgs.nix { } }:
+
+let hp = import ./cli/nix/haskell-project.nix { inherit pkgs; };
+in (hp {
+  packages = {
+    "nhcore" = ./.;
+    "nhcli" = ./.;
+  };
+
+  mainPackageName = "nhcli";
+  executableName = "nhcli:exe:neo";
+})

core/nhcore.cabal

@@ -1,6 +1,6 @@
 cabal-version:      3.4
 name:               nhcore
-version:            0.9.0
+version:            0.9.1
 synopsis:           Core Library for NeoHaskell
 description:        NeoHaskell is a dialect of Haskell that is focused on newcomer-friendliness and productivity.
 homepage:           https://neohaskell.org

default.nix

@@ -1 +1,2 @@
-import ./cli/default.nix
+{ pkgs ? import ./nix/nixpkgs.nix { } }:
+((import ./common.nix { inherit pkgs; }).package)

nix/nixpkgs.nix

@@ -1,6 +1,10 @@
+# Pinned nixpkgs for NeoHaskell project
+# Last updated: 2025-08-25
+# Commit from nixos-unstable branch (2025-08-19)
 import (builtins.fetchTarball {
-  name = "nixpkgs-054144e5";
-  url =
-    "https://github.com/nixos/nixpkgs/archive/054144e516ca1e3cf5706d5c3427d350eaa107af.tar.gz";
-  sha256 = "0ixd2mc9kkmr8mz20ah2j7akgwllxsjv94ah895zgi9b9q1h25ka";
+  name = "nixpkgs-20075955";
+  url = "https://github.com/nixos/nixpkgs/archive/20075955deac2583bb12f07151c2df830ef346b4.tar.gz";
+  # To get the sha256, run:
+  # nix-prefetch-url --unpack https://github.com/nixos/nixpkgs/archive/20075955deac2583bb12f07151c2df830ef346b4.tar.gz
+  sha256 = "1s3lxb33cwazlx72pygcbcc76bbgbhdil6q9bhqbzbjxj001zk0w";
 })

scripts/install.sh

@@ -45,38 +45,51 @@ if [[ $REPLY =~ ^[Nn]$ ]]; then
 else
     echo "🔧 Adding binary cache configuration..."
 
-    # Create /etc/nix/nix.conf if it doesn't exist
-    if [ ! -f /etc/nix/nix.conf ]; then
-        echo "Creating /etc/nix/nix.conf..."
-        sudo mkdir -p /etc/nix
-        sudo touch /etc/nix/nix.conf
+    # Add binary cache configuration to custom config file
+    sudo mkdir -p /etc/nix
+    if [ ! -f /etc/nix/nix.custom.conf ]; then
+        echo "Creating /etc/nix/nix.custom.conf..."
+        sudo touch /etc/nix/nix.custom.conf
     fi
 
-    # Check if the substituters line exists
-    if sudo grep -q "^extra-substituters" /etc/nix/nix.conf; then
-        # Add to existing line if not already present
-        if ! sudo grep -q "$BINARY_CACHE_SUBSTITUTERS" /etc/nix/nix.conf; then
-            escaped_substituters=$(printf '%s\n' "$BINARY_CACHE_SUBSTITUTERS" | sed 's/[[\.*^$()+?{|]/\\&/g')
-            sudo sed -i "/^extra-substituters/s/$/ $escaped_substituters/" /etc/nix/nix.conf
-        fi
-    else
-        # Add new line
-        echo "extra-substituters = $BINARY_CACHE_SUBSTITUTERS" | sudo tee -a /etc/nix/nix.conf > /dev/null
+    # Append our config if not already present
+    if ! sudo grep -q "$BINARY_CACHE_SUBSTITUTERS" /etc/nix/nix.custom.conf; then
+        echo "extra-substituters = $BINARY_CACHE_SUBSTITUTERS" | sudo tee -a /etc/nix/nix.custom.conf > /dev/null
+    fi
+    if ! sudo grep -q "$BINARY_CACHE_PUBLIC_KEYS" /etc/nix/nix.custom.conf; then
+        echo "extra-trusted-public-keys = $BINARY_CACHE_PUBLIC_KEYS" | sudo tee -a /etc/nix/nix.custom.conf > /dev/null
     fi
 
-    # Check if the trusted-public-keys line exists
-    if sudo grep -q "^extra-trusted-public-keys" /etc/nix/nix.conf; then
-        # Add to existing line if not already present
-        if ! sudo grep -q "$BINARY_CACHE_PUBLIC_KEYS" /etc/nix/nix.conf; then
-            escaped_keys=$(printf '%s\n' "$BINARY_CACHE_PUBLIC_KEYS" | sed 's/[[\.*^$()+?{|]/\\&/g')
-            sudo sed -i "/^extra-trusted-public-keys/s/$/ $escaped_keys/" /etc/nix/nix.conf
+    echo "✅ Binary cache configuration added successfully!"
+
+    # Restart nix daemon to pick up new configuration
+    echo "🔄 Restarting Nix daemon to apply configuration changes..."
+
+    # Detect platform and restart daemon accordingly
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        # macOS
+        if sudo launchctl kickstart -k system/org.nixos.nix-daemon 2>/dev/null; then
+            echo "✅ Nix daemon restarted successfully on macOS"
+        else
+            echo "⚠️  Failed to restart nix daemon on macOS - configuration will take effect on next restart"
+        fi
+    elif command -v systemctl &> /dev/null; then
+        # Linux with systemd (including WSL with systemd)
+        if sudo systemctl restart nix-daemon.service 2>/dev/null; then
+            echo "✅ Nix daemon restarted successfully"
+        else
+            echo "⚠️  Failed to restart nix daemon - configuration will take effect on next restart"
         fi
     else
-        # Add new line
-        echo "extra-trusted-public-keys = $BINARY_CACHE_PUBLIC_KEYS" | sudo tee -a /etc/nix/nix.conf > /dev/null
+        # WSL or Linux without systemd - try pkill approach
+        echo "🔄 Attempting to restart nix daemon..."
+        if sudo pkill nix-daemon 2>/dev/null; then
+            echo "✅ Nix daemon stopped - it will restart automatically on next use"
+        else
+            echo "⚠️  Cannot automatically restart nix daemon on this system"
+            echo "    Configuration will take effect when you restart your shell or reboot"
+        fi
     fi
-
-    echo "✅ Binary cache configuration added successfully!"
 fi
 
 echo ""

shell.nix

@@ -1,58 +1 @@
-{ pkgs ? import ./nix/nixpkgs.nix { }, }:
-let
-  nix-pre-commit-hooks = import (builtins.fetchTarball
-    "https://github.com/cachix/git-hooks.nix/tarball/master");
-in let
-  pre-commit = {
-    # Configured with the module options defined in `modules/pre-commit.nix`:
-    pre-commit-check = nix-pre-commit-hooks.run {
-      src = ./.;
-      # If your hooks are intrusive, avoid running on each commit with a default_states like this:
-      # default_stages = ["manual" "pre-push"];
-      hooks = {
-        fourmolu.enable = true;
-        nixfmt-classic.enable = true;
-      };
-    };
-  };
-in pkgs.mkShell rec {
-  buildInputs = [
-    # Haskell dev tools
-    pkgs.ghc
-    pkgs.cabal-install
-    pkgs.haskell-language-server
-    pkgs.fourmolu
-    pkgs.hlint
-    pkgs.haskellPackages.zlib
-    pkgs.haskellPackages.hspec-discover
-    pkgs.haskellPackages.doctest
-
-    # Nix dev tools
-    pkgs.nil
-    pkgs.nixfmt-classic
-    pkgs.nixpkgs-fmt
-
-    # Website
-    pkgs.nodejs
-
-    # Required native libs
-    pkgs.pkg-config
-    pkgs.zlib
-  ] ++ pre-commit.pre-commit-check.enabledPackages;
-
-  shellHook = ''
-    unset TEMP TMP TEMPDIR TMPDIR   # Required for nix-shell to work
-    ${pre-commit.pre-commit-check.shellHook}
-
-    run-doctests-verbose() {
-      cabal repl --with-compiler=doctest --repl-options=--verbose core
-    }
-
-    run-doctests() {
-      cabal repl --with-compiler=doctest core
-    }
-  '';
-
-  # Required for cabal to find the location of zlib and other native libraries
-  LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
-}
+{ pkgs ? import ./nix/nixpkgs.nix { } }: ((import ./common.nix { inherit pkgs; }).shell)