Update for new Nix expressions

.gitignore

@@ -3,3 +3,5 @@
 result
 dist
 dist-newstyle
+bellroy-application
+mercury-interview

callcc/default.nix

@@ -1,6 +1,20 @@
 let
   pkgs = import ../pkgs.nix;
-in import "${pkgs.ihaskell}/release.nix" {
-  compiler = "ghc928";
-  nixpkgs  = import pkgs.nixpkgs {};
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
+in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
+  extraEnvironmentBinaries = [jupyterlab];
+  packages = self: with self; [];
 }

chart-diagrams/default.nix

@@ -1,7 +1,21 @@
 let
   pkgs = import ../pkgs.nix;
-in import "${pkgs.ihaskell}/release.nix" {
-  nixpkgs = import pkgs.nixpkgs {};
-  compiler = "ghc928";
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
+in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
+  extraEnvironmentBinaries = [jupyterlab];
   packages = self: with self; [ ihaskell-aeson ihaskell-blaze ihaskell-charts ihaskell-diagrams ];
+  systemPackages = self: with self; [ graphviz ];
 }

codensity/default.nix

@@ -1,7 +1,20 @@
 let
   pkgs = import ../pkgs.nix;
-in import "${pkgs.ihaskell}/release.nix" {
-  compiler = "ghc928";
-  nixpkgs = import pkgs.nixpkgs {};
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
+in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
+  extraEnvironmentBinaries = [jupyterlab];
   packages = self: with self; [];
 }

continuations/default.nix

@@ -1,7 +1,20 @@
 let
   pkgs = import ../pkgs.nix;
-in import "${pkgs.ihaskell}/release.nix" {
-  nixpkgs = import pkgs.nixpkgs {};
-  compiler = "ghc928";
-  packages = self: with self; [ ihaskell-widgets ];
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
+in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
+  extraEnvironmentBinaries = [jupyterlab];
+  packages = self: with self; [];
 }

deriving-via/default.nix

@@ -1,9 +1,20 @@
 let
   pkgs = import ../pkgs.nix;
-  rise = import ../rise.nix;
-in import "${pkgs.ihaskell}/release.nix" {
-  nixpkgs = import pkgs.nixpkgs {};
-  compiler = "ghc928";
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
+in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
+  extraEnvironmentBinaries = [jupyterlab];
   packages = self: with self; [];
-  pythonPackages = p: [ (rise p) ];
 }

docker/default.nix

@@ -1,6 +1,19 @@
 let
   pkgs = import ../pkgs.nix;
-  nixpkgs = import pkgs.nixpkgs {};
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
   NB_USER = "jovyan";
   NB_UID = "1000";
   dockerEtc = nixpkgs.runCommand "docker-etc" {} ''
@@ -16,10 +29,9 @@ let
     echo "root:x::" > $out/etc/gshadow
     echo "jovyan:!::" >> $out/etc/gshadow
   '';
-  ihaskell = import "${pkgs.ihaskell}/release.nix" {
-    inherit nixpkgs;
-    compiler = "ghc928";
+  ihaskell = nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
     packages = self: with self; [];
+    extraEnvironmentBinaries = [jupyterlab];
     staticExecutable = true;
   };
   image = nixpkgs.dockerTools.buildLayeredImage {

dragon-curve/default.nix

@@ -1,7 +1,20 @@
 let
   pkgs = import ../pkgs.nix;
-in import "${pkgs.ihaskell}/release.nix" {
-  nixpkgs = import pkgs.nixpkgs {};
-  compiler = "ghc928";
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
+in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
+  extraEnvironmentBinaries = [jupyterlab];
   packages = self: with self; [];
 }

efficient-combinator-parsers/default.nix

@@ -1,7 +1,20 @@
 let
   pkgs = import ../pkgs.nix;
-in import "${pkgs.ihaskell}/release.nix" {
-  compiler = "ghc928";
-  nixpkgs  = import pkgs.nixpkgs {};
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
+in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
+  extraEnvironmentBinaries = [jupyterlab];
   packages = self: with self; [ timeit ];
 }

git-from-scratch/default.nix

@@ -1,6 +1,19 @@
 let
   pkgs = import ../pkgs.nix;
-  nixpkgs = import pkgs.nixpkgs {};
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
   cleanSource = name: type: let
       baseName = baseNameOf (toString name);
       lib = nixpkgs.lib;
@@ -17,9 +30,7 @@ let
     );
   git-from-scratch =
     nixpkgs.haskellPackages.callCabal2nix "git-from-scratch" (builtins.filterSource cleanSource ./.) {};
-in import "${pkgs.ihaskell}/release.nix" {
-  inherit nixpkgs;
-  compiler = "ghc928";
+in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
   packages = self: with self; [
     SHA
     attoparsec
@@ -40,4 +51,5 @@ in import "${pkgs.ihaskell}/release.nix" {
     qpdf
     vim
   ];
+  extraEnvironmentBinaries = [jupyterlab];
 }

graphviz/default.nix

@@ -1,8 +1,21 @@
 let
   pkgs = import ../pkgs.nix;
-in import "${pkgs.ihaskell}/release.nix" {
-  compiler = "ghc928";
-  nixpkgs  = import pkgs.nixpkgs {};
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
+in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
+  extraEnvironmentBinaries = [ jupyterlab ];
   packages = self: with self; [ here ihaskell-graphviz ];
   systemPackages = self: with self; [ graphviz ];
 }

hamt/default.nix

@@ -1,8 +1,21 @@
 let
   pkgs = import ../pkgs.nix;
-in import "${pkgs.ihaskell}/release.nix" {
-  compiler = "ghc928";
-  nixpkgs  = import pkgs.nixpkgs {};
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
+in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
+  extraEnvironmentBinaries = [jupyterlab];
   packages = self: with self; [ bytestring memory pretty-show timeit vector here ihaskell-graphviz ];
   systemPackages = self: with self; [ graphviz ];
 }

higher-kinded-data/default.nix

@@ -1,7 +1,20 @@
 let
   pkgs = import ../pkgs.nix;
-in import "${pkgs.ihaskell}/release.nix" {
-  nixpkgs = import pkgs.nixpkgs {};
-  compiler = "ghc902";
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
+in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
+  extraEnvironmentBinaries = [ jupyterlab ];
   packages = self: with self; [ validation ];
 }

hs-updater/default.nix

@@ -1,8 +1,22 @@
 let
   pkgs = import ../pkgs.nix;
-in import "${pkgs.ihaskell}/release.nix" {
-  compiler = "ghc928";
-  nixpkgs  = import pkgs.nixpkgs {};
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+            sbv = sup.haskell.lib.dontCheck (self.callHackage "sbv" "10.1" {});
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
+in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
+  extraEnvironmentBinaries = [ jupyterlab ];
   packages = self: with self; [
     aeson
     aeson-pretty

intmap/default.nix

@@ -1,7 +1,20 @@
 let
   pkgs = import ../pkgs.nix;
-in import "${pkgs.ihaskell}/release.nix" {
-  compiler = "ghc928";
-  nixpkgs  = import pkgs.nixpkgs {};
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
+in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
+  extraEnvironmentBinaries = [ jupyterlab ];
   packages = self: with self; [ pretty-show ];
 }

lambda/default.nix

@@ -1,7 +1,20 @@
 let
   pkgs = import ../pkgs.nix;
-in import "${pkgs.ihaskell}/release.nix" {
-  compiler = "ghc928";
-  nixpkgs  = import pkgs.nixpkgs {};
+  overlay = sel: sup: {
+    nix-filter = import pkgs.nix-filter;
+    haskell = sup.haskell // {
+      packages = sup.haskell.packages // {
+        ghc948 = sup.haskell.packages.ghc948.override {
+          overrides = self: super: {
+            ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
+          };
+        };
+      };
+    };
+  };
+  nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
+  jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
+in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
   packages = self: with self; [ containers transformers vector ];
+  extraEnvironmentBinaries = [jupyterlab];
 }