Skip to content

Commit

Permalink
Update notebooks for GHC 9.6
Browse files Browse the repository at this point in the history
  • Loading branch information
@vaibhavsagar
vaibhavsagar committed Jul 5, 2024
1 parent 79e88b3 commit 509f372
Show file tree
Hide file tree
Showing 31 changed files with 1,048 additions and 705 deletions.
11 changes: 1 addition & 10 deletions callcc/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,10 @@ let
pkgs = import ../pkgs.nix;
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 { inherit system; overlays = [ overlay ]; });
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
extraEnvironmentBinaries = [jupyterlab];
packages = self: with self; [];
}
11 changes: 1 addition & 10 deletions chart-diagrams/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,10 @@ let
pkgs = import ../pkgs.nix;
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 { inherit system; overlays = [ overlay ]; });
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
extraEnvironmentBinaries = [jupyterlab];
packages = self: with self; [ ihaskell-aeson ihaskell-blaze ihaskell-charts ihaskell-diagrams ];
systemPackages = self: with self; [ graphviz ];
Expand Down
11 changes: 1 addition & 10 deletions codensity/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,10 @@ let
pkgs = import ../pkgs.nix;
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 { inherit system; overlays = [ overlay ]; });
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
extraEnvironmentBinaries = [jupyterlab];
packages = self: with self; [];
}
11 changes: 1 addition & 10 deletions continuations/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,10 @@ let
pkgs = import ../pkgs.nix;
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 { inherit system; overlays = [ overlay ]; });
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
extraEnvironmentBinaries = [jupyterlab];
packages = self: with self; [];
}
11 changes: 1 addition & 10 deletions deriving-via/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,10 @@ let
pkgs = import ../pkgs.nix;
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 { inherit system; overlays = [ overlay ]; });
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
extraEnvironmentBinaries = [jupyterlab];
packages = self: with self; [];
}
11 changes: 1 addition & 10 deletions docker/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,6 @@ let
pkgs = import ../pkgs.nix;
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 { inherit system; overlays = [ overlay ]; });
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
Expand All @@ -30,7 +21,7 @@ let
echo "root:x::" > $out/etc/gshadow
echo "jovyan:!::" >> $out/etc/gshadow
'';
ihaskell = nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
ihaskell = nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
packages = self: with self; [];
extraEnvironmentBinaries = [jupyterlab];
staticExecutable = true;
Expand Down
11 changes: 1 addition & 10 deletions dragon-curve/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,10 @@ let
pkgs = import ../pkgs.nix;
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 { inherit system; overlays = [ overlay ]; });
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
extraEnvironmentBinaries = [jupyterlab];
packages = self: with self; [];
}
11 changes: 1 addition & 10 deletions efficient-combinator-parsers/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,10 @@ let
pkgs = import ../pkgs.nix;
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 { inherit system; overlays = [ overlay ]; });
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
extraEnvironmentBinaries = [jupyterlab];
packages = self: with self; [ timeit ];
}
14 changes: 7 additions & 7 deletions flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
inputs.flake-utils.url = "github:numtide/flake-utils";
inputs.nix-filter.url = "github:numtide/nix-filter";
inputs.ihaskell.url = "github:IHaskell/IHaskell";
Expand Down
11 changes: 1 addition & 10 deletions git-from-scratch/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,6 @@ let
pkgs = import ../pkgs.nix;
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 { inherit system; overlays = [ overlay ]; });
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
Expand All @@ -31,7 +22,7 @@ let
);
git-from-scratch =
nixpkgs.haskellPackages.callCabal2nix "git-from-scratch" (builtins.filterSource cleanSource ./.) {};
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
packages = self: with self; [
SHA
attoparsec
Expand Down
11 changes: 1 addition & 10 deletions graphviz/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,10 @@ let
pkgs = import ../pkgs.nix;
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 { inherit system; overlays = [ overlay ]; });
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
extraEnvironmentBinaries = [ jupyterlab ];
packages = self: with self; [ here ihaskell-graphviz ];
systemPackages = self: with self; [ graphviz ];
Expand Down
4 changes: 2 additions & 2 deletions hamt/HAMTVisualisation.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1077,9 +1077,9 @@
"mimetype": "text/x-haskell",
"name": "haskell",
"pygments_lexer": "Haskell",
"version": "9.2.8"
"version": "9.4.8"
}
},
"nbformat": 4,
"nbformat_minor": 2
"nbformat_minor": 4
}
Loading

0 comments on commit 509f372

Please sign in to comment.