Skip to content

Commit 509f372

Browse files
vaibhavsagarvaibhavsagar
committed
Update notebooks for GHC 9.6
1 parent 79e88b3 commit 509f372

File tree

31 files changed

+1048
-705
lines changed

31 files changed

+1048
-705
lines changed

‎callcc/default.nix

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,10 @@ let
33
pkgs = import ../pkgs.nix;
44
overlay = sel: sup: {
55
nix-filter = import pkgs.nix-filter;
6-
haskell = sup.haskell // {
7-
packages = sup.haskell.packages // {
8-
ghc948 = sup.haskell.packages.ghc948.override {
9-
overrides = self: super: {
10-
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
11-
};
12-
};
13-
};
14-
};
156
};
167
nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
178
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
18-
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
9+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
1910
extraEnvironmentBinaries = [jupyterlab];
2011
packages = self: with self; [];
2112
}

‎chart-diagrams/default.nix

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,10 @@ let
33
pkgs = import ../pkgs.nix;
44
overlay = sel: sup: {
55
nix-filter = import pkgs.nix-filter;
6-
haskell = sup.haskell // {
7-
packages = sup.haskell.packages // {
8-
ghc948 = sup.haskell.packages.ghc948.override {
9-
overrides = self: super: {
10-
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
11-
};
12-
};
13-
};
14-
};
156
};
167
nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
178
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
18-
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
9+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
1910
extraEnvironmentBinaries = [jupyterlab];
2011
packages = self: with self; [ ihaskell-aeson ihaskell-blaze ihaskell-charts ihaskell-diagrams ];
2112
systemPackages = self: with self; [ graphviz ];

‎codensity/default.nix

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,10 @@ let
33
pkgs = import ../pkgs.nix;
44
overlay = sel: sup: {
55
nix-filter = import pkgs.nix-filter;
6-
haskell = sup.haskell // {
7-
packages = sup.haskell.packages // {
8-
ghc948 = sup.haskell.packages.ghc948.override {
9-
overrides = self: super: {
10-
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
11-
};
12-
};
13-
};
14-
};
156
};
167
nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
178
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
18-
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
9+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
1910
extraEnvironmentBinaries = [jupyterlab];
2011
packages = self: with self; [];
2112
}

‎continuations/default.nix

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,10 @@ let
33
pkgs = import ../pkgs.nix;
44
overlay = sel: sup: {
55
nix-filter = import pkgs.nix-filter;
6-
haskell = sup.haskell // {
7-
packages = sup.haskell.packages // {
8-
ghc948 = sup.haskell.packages.ghc948.override {
9-
overrides = self: super: {
10-
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
11-
};
12-
};
13-
};
14-
};
156
};
167
nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
178
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
18-
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
9+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
1910
extraEnvironmentBinaries = [jupyterlab];
2011
packages = self: with self; [];
2112
}

‎deriving-via/default.nix

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,10 @@ let
33
pkgs = import ../pkgs.nix;
44
overlay = sel: sup: {
55
nix-filter = import pkgs.nix-filter;
6-
haskell = sup.haskell // {
7-
packages = sup.haskell.packages // {
8-
ghc948 = sup.haskell.packages.ghc948.override {
9-
overrides = self: super: {
10-
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
11-
};
12-
};
13-
};
14-
};
156
};
167
nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
178
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
18-
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
9+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
1910
extraEnvironmentBinaries = [jupyterlab];
2011
packages = self: with self; [];
2112
}

‎docker/default.nix

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ let
33
pkgs = import ../pkgs.nix;
44
overlay = sel: sup: {
55
nix-filter = import pkgs.nix-filter;
6-
haskell = sup.haskell // {
7-
packages = sup.haskell.packages // {
8-
ghc948 = sup.haskell.packages.ghc948.override {
9-
overrides = self: super: {
10-
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
11-
};
12-
};
13-
};
14-
};
156
};
167
nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
178
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
@@ -30,7 +21,7 @@ let
3021
echo "root:x::" > $out/etc/gshadow
3122
echo "jovyan:!::" >> $out/etc/gshadow
3223
'';
33-
ihaskell = nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
24+
ihaskell = nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
3425
packages = self: with self; [];
3526
extraEnvironmentBinaries = [jupyterlab];
3627
staticExecutable = true;

‎dragon-curve/default.nix

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,10 @@ let
33
pkgs = import ../pkgs.nix;
44
overlay = sel: sup: {
55
nix-filter = import pkgs.nix-filter;
6-
haskell = sup.haskell // {
7-
packages = sup.haskell.packages // {
8-
ghc948 = sup.haskell.packages.ghc948.override {
9-
overrides = self: super: {
10-
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
11-
};
12-
};
13-
};
14-
};
156
};
167
nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
178
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
18-
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
9+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
1910
extraEnvironmentBinaries = [jupyterlab];
2011
packages = self: with self; [];
2112
}

‎efficient-combinator-parsers/default.nix

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,10 @@ let
33
pkgs = import ../pkgs.nix;
44
overlay = sel: sup: {
55
nix-filter = import pkgs.nix-filter;
6-
haskell = sup.haskell // {
7-
packages = sup.haskell.packages // {
8-
ghc948 = sup.haskell.packages.ghc948.override {
9-
overrides = self: super: {
10-
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
11-
};
12-
};
13-
};
14-
};
156
};
167
nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
178
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
18-
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
9+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
1910
extraEnvironmentBinaries = [jupyterlab];
2011
packages = self: with self; [ timeit ];
2112
}

‎flake.lock

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
2+
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
33
inputs.flake-utils.url = "github:numtide/flake-utils";
44
inputs.nix-filter.url = "github:numtide/nix-filter";
55
inputs.ihaskell.url = "github:IHaskell/IHaskell";

‎git-from-scratch/default.nix

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ let
33
pkgs = import ../pkgs.nix;
44
overlay = sel: sup: {
55
nix-filter = import pkgs.nix-filter;
6-
haskell = sup.haskell // {
7-
packages = sup.haskell.packages // {
8-
ghc948 = sup.haskell.packages.ghc948.override {
9-
overrides = self: super: {
10-
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
11-
};
12-
};
13-
};
14-
};
156
};
167
nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
178
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
@@ -31,7 +22,7 @@ let
3122
);
3223
git-from-scratch =
3324
nixpkgs.haskellPackages.callCabal2nix "git-from-scratch" (builtins.filterSource cleanSource ./.) {};
34-
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
25+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
3526
packages = self: with self; [
3627
SHA
3728
attoparsec

‎graphviz/default.nix

+1-10
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,10 @@ let
33
pkgs = import ../pkgs.nix;
44
overlay = sel: sup: {
55
nix-filter = import pkgs.nix-filter;
6-
haskell = sup.haskell // {
7-
packages = sup.haskell.packages // {
8-
ghc948 = sup.haskell.packages.ghc948.override {
9-
overrides = self: super: {
10-
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
11-
};
12-
};
13-
};
14-
};
156
};
167
nixpkgs = (import pkgs.nixpkgs { inherit system; overlays = [ overlay ]; });
178
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
18-
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
9+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc96"; }{
1910
extraEnvironmentBinaries = [ jupyterlab ];
2011
packages = self: with self; [ here ihaskell-graphviz ];
2112
systemPackages = self: with self; [ graphviz ];

‎hamt/HAMTVisualisation.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -1077,9 +1077,9 @@
10771077
"mimetype": "text/x-haskell",
10781078
"name": "haskell",
10791079
"pygments_lexer": "Haskell",
1080-
"version": "9.2.8"
1080+
"version": "9.4.8"
10811081
}
10821082
},
10831083
"nbformat": 4,
1084-
"nbformat_minor": 2
1084+
"nbformat_minor": 4
10851085
}

0 commit comments

Comments
 (0)