Include all open source pkgs, use nixpkgs-unstable

Author: harendra-kumar

default.nix

@@ -9,14 +9,15 @@ nixpkgs ? import
 let
   commit =
     if builtins.match ".*darwin.*" builtins.currentSystem != null
-    # use https://channels.nixos.org/nixpkgs-25.05-darwin/git-revision
+    #see https://channels.nixos.org/nixpkgs-25.05-darwin/git-revision
     then "c3d456aad3a84fcd76b4bebf8b48be169fc45c31"
     #stan fails to build for macOS on this one
     #then "branch-off-24.11" # nixpkgs 24.11
-    # use https://channels.nixos.org/nixpkgs-25.05/git-revision
-    #else "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20";
+    else "de69d2ba6c70e747320df9c096523b623d3a4c35"; # nixpkgs-unstable
+    #see https://channels.nixos.org/nixpkgs-25.05/git-revision
+    #else "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20"; # nixpkgs 25.05
     #else "50ab793786d9de88ee30ec4e4c24fb4236fc2674"; # nixpkgs 24.11
-    else "branch-off-24.11"; # nixpkgs 24.11
+    #else "branch-off-24.11"; # nixpkgs 24.11
 in
   builtins.fetchTarball {
     url = "https://github.com/NixOS/nixpkgs/archive/${commit}.tar.gz";
@@ -49,7 +50,7 @@ in
 }:
 let src =
       builtins.fetchTarball {
-        url = "https://github.com/composewell/nixpack/archive/59fdf661cb2f7df0.tar.gz";
+        url = "https://github.com/composewell/nixpack/archive/e50da53dfcf24085fff75149a.tar.gz";
       };
     nixpack = import "${src}/nix";
 

flake.lock

@@ -1,13 +1,14 @@
 {
-  description = "Streamly Development Environment";
+  description = "Composewell Open Source Packages";
 
   # XXX it downloads both of these on both systems.
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/branch-off-24.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/de69d2ba6c70e747320df9c096523b623d3a4c35"; # nixpkgs-unstable
     #nixpkgs.url = "github:NixOS/nixpkgs/b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20"; # nixpkgs-25.05
+    #nixpkgs.url = "github:NixOS/nixpkgs/branch-off-24.11";
     nixpkgs-darwin.url = "github:NixOS/nixpkgs/c3d456aad3a84fcd76b4bebf8b48be169fc45c31"; # nixpkgs-25.05-darwin
     # For local testing use "path:.../nixpack";
-    nixpack.url = "github:composewell/nixpack/59fdf661cb2f7df0929f89818a9dfcf6c6c23a78";
+    nixpack.url = "github:composewell/nixpack/e50da53dfcf24085fff75149a266646b28bd18fb";
   };
 
   outputs = { self, nixpkgs, nixpkgs-darwin, nixpack }:
@@ -24,7 +25,7 @@
             sources = import ./sources.nix {inherit nixpack;};
             packages = import ./packages.nix;
             compiler = "default";
-            hoogle = true;
+            hoogle = false;
             isDev = true;
       };
     } // { inherit nixpack;} ;

flake.nix

@@ -30,24 +30,58 @@ packages =
     ];
 
 libraries =
-  with hpkgs;
-    [ # Streamly packages
-      fusion-plugin
-      streamly
-      streamly-bytestring
-      streamly-core
-      streamly-coreutils
-      streamly-filepath
-      streamly-fsevents
-      streamly-process
-      streamly-statistics
-      streamly-text
-      #streamly-examples
-
-      # For tests and benchmarks
-      hspec
-      tasty-bench
-      temporary
-      scientific
-    ];
+with nixpkgs.haskellPackages;
+
+let streamly-packages = [
+    fusion-plugin
+    streamly-core
+    streamly
+
+    # dependent on streamly
+    streamly-bytestring
+    streamly-text
+    streamly-filepath
+
+    streamly-fsevents
+    streamly-examples
+    streamly-process
+    streamly-coreutils
+    streamly-statistics
+  ];
+
+  other-packages = [
+    # For tests and benchmarks
+    hspec
+    tasty-bench
+    temporary
+    scientific
+  ];
+
+  composewell-packages = [
+    # dependent on streamly-process
+    simple-rpc
+    simple-rpc-generate
+
+    packdiff
+
+    bench-show
+    # depends on streamly-coreutils, bench-show
+    bench-report
+
+    # depends on bench-report, on macOS fails with heap-overflow
+    # streaming-benchmarks
+
+    # dependent on streamly-process, streamly-coreutils, packdiff
+    relcheck
+
+    markdown-doctest
+    # haskell-perf
+    # streamly-lz4
+    # streamly-relay
+  ];
+
+  in streamly-packages
+    ++ other-packages
+    ++ composewell-packages
+    ;
 }

packages.nix

@@ -10,7 +10,7 @@ with nixpack.sources;
 layers = [
 
 {
-  fusion-plugin        = hackage "0.2.7"  "sha256-+TuzCAzpTUrlXwldOiHi5ZL92ui7rTVb33iqF7o8xAI=";
+  #fusion-plugin        = hackage "0.2.7"  "sha256-+TuzCAzpTUrlXwldOiHi5ZL92ui7rTVb33iqF7o8xAI=";
   streamly             = hackage "0.11.0" "sha256-JMZAwJHqmDxN/CCDFhfuv77xmAx1JVhvYFDxMKyQoGk=";
   streamly-bytestring  = hackage "0.2.3"  "sha256-ZBV7RO6ibwNKA8S/zr2r31YTQYk4vrP5d7dieTC71hY=";
   streamly-core        = hackage "0.3.0"  "sha256-IOrPT45LfuzU1zs4YXAsrVXYAauIKUwElgB8O7ZMk6Q=";
@@ -21,6 +21,7 @@ layers = [
   streamly-statistics  = hackage "0.2.0"  "sha256-mkr7a3UOCFQqCQl+FRUruPaX4LZtuQt32MW86emnCG4=";
   streamly-text        = hackage "0.1.0"  "sha256-p1gqMDVlqV1PheTzxc2qnh9RanGJLbt3IC4xnwFTlOg=";
 
+  unicode-data         = hackageProf "0.6.0" "sha256-gW1E5VFwZcUX5v1dvi3INDDqUuwCcOTjCR5+lOW3Obc==";
 }
 
 # These are packages that are used to override the above packages in
@@ -29,7 +30,68 @@ layers = [
 # with packages on hackage only.
 
 {
-  streamly-coreutils   = composewell "streamly-coreutils" "c42a623ca862df2355533df4dbac0e555f273f23";
+  # The build flag is unable to reduce the dependencies so we use a
+  # special branch.
+  bench-show           = composewellBranchFlags "bench-show"
+                           "a8dd27cde3783ef734f179568a2c8789be2489c4"
+                           "no-charts"
+                           [ "--flags no-charts" ];
+
+  streaming-benchmarks = composewell "streaming-benchmarks"
+                           "3f24dfc7943faab4c183b88815968f56c36081ec";
+
+  streamly             = composewell "streamly"
+                           "6a596733e1eb022d8b4134bd2b123cdcd4dc05e8";
+
+  streamly-core        = composewellSubdir "streamly"
+                           "6a596733e1eb022d8b4134bd2b123cdcd4dc05e8" "/core";
+
+  streamly-fsevents    = composewell "streamly-fsevents"
+                           "fe2584e9502186090b1aee2671cca4bc14d7ad31";
+
+  streamly-text        = composewell "streamly-text"
+                           "ec6dd787246fdc93c6b6f935846fe126244b552b";
+
+  streamly-lz4         = composewell "streamly-lz4"
+                           "a929c20fb582da95783f84a48dc174204cb8601d";
+
+  # ---------------------------------------------------------------
+  # Pre-release packages
+  # ---------------------------------------------------------------
+
+  bench-report         = composewellFlags "bench-report"
+                           "4dad3ea916a950524bcfd5097fc6f0f63e645987"
+                           [ "--flags no-charts" ];
+
+  #haskell-perf         = composewell "haskell-perf"
+  #                         "c9b1357f7bbd7e3e71d30ed66a90beaa5e19ec36";
+
+  markdown-doctest     = composewell "markdown-doctest"
+                           "05dcf5f03128c49b66cf7c7778f567da1990014c";
+
+  packdiff             = composewell "packdiff"
+                           "37bef504c07df43cb4745b1ddab5fcbfde8d310b";
+
+  relcheck             = composewell "relcheck"
+                           "cfd2b83e15d5a583876fff3eec43d01313219cde";
+
+  simple-rpc           = composewellSubdir "simple-rpc"
+                           "1559b75214e6fde7e10b20889aa1e66c12e641f0" "/rpc";
+
+  simple-rpc-generate  = composewellSubdir "simple-rpc"
+                           "1559b75214e6fde7e10b20889aa1e66c12e641f0" "/generate";
+
+  streamly-coreutils   = composewell "streamly-coreutils"
+                           "fa180060c7510c89d2767980ca6f7ec7011d04b9";
+
+  #streamly-metrics     = composewell "streamly-metrics"
+  #                         "6080649563c6764f473e1279508506f91bb20b9f";
+
+  streamly-numeric     = composewell "streamly-numeric"
+                           "594821f8a725914817fec3a01d842ee17ac951f1";
+
+  #streamly-relay       = composewell "streamly-relay"
+  #                         "f615b7dcf5216bdc0abca4435b7f2e783543767f";
 }
 ];