Skip to content

Commit 6fa5f39

Browse files
vaibhavsagarvaibhavsagar
committed
Update for new Nix expressions
1 parent 18a1a71 commit 6fa5f39

File tree

26 files changed

+387
-86
lines changed

26 files changed

+387
-86
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
result
44
dist
55
dist-newstyle
6+
bellroy-application
7+
mercury-interview

‎callcc/default.nix

+17-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
in import "${pkgs.ihaskell}/release.nix" {
4-
compiler = "ghc928";
5-
nixpkgs = import pkgs.nixpkgs {};
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
};
11+
};
12+
};
13+
};
14+
};
15+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
16+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
17+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
18+
extraEnvironmentBinaries = [jupyterlab];
19+
packages = self: with self; [];
620
}

‎chart-diagrams/default.nix

+17-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,21 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
in import "${pkgs.ihaskell}/release.nix" {
4-
nixpkgs = import pkgs.nixpkgs {};
5-
compiler = "ghc928";
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
};
11+
};
12+
};
13+
};
14+
};
15+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
16+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
17+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
18+
extraEnvironmentBinaries = [jupyterlab];
619
packages = self: with self; [ ihaskell-aeson ihaskell-blaze ihaskell-charts ihaskell-diagrams ];
20+
systemPackages = self: with self; [ graphviz ];
721
}

‎codensity/default.nix

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
in import "${pkgs.ihaskell}/release.nix" {
4-
compiler = "ghc928";
5-
nixpkgs = import pkgs.nixpkgs {};
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
};
11+
};
12+
};
13+
};
14+
};
15+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
16+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
17+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
18+
extraEnvironmentBinaries = [jupyterlab];
619
packages = self: with self; [];
720
}

‎continuations/default.nix

+17-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
in import "${pkgs.ihaskell}/release.nix" {
4-
nixpkgs = import pkgs.nixpkgs {};
5-
compiler = "ghc928";
6-
packages = self: with self; [ ihaskell-widgets ];
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
};
11+
};
12+
};
13+
};
14+
};
15+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
16+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
17+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
18+
extraEnvironmentBinaries = [jupyterlab];
19+
packages = self: with self; [];
720
}

‎deriving-via/default.nix

+16-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,20 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
rise = import ../rise.nix;
4-
in import "${pkgs.ihaskell}/release.nix" {
5-
nixpkgs = import pkgs.nixpkgs {};
6-
compiler = "ghc928";
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
};
11+
};
12+
};
13+
};
14+
};
15+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
16+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
17+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
18+
extraEnvironmentBinaries = [jupyterlab];
719
packages = self: with self; [];
8-
pythonPackages = p: [ (rise p) ];
920
}

‎docker/default.nix

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
nixpkgs = import pkgs.nixpkgs {};
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
};
11+
};
12+
};
13+
};
14+
};
15+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
16+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
417
NB_USER = "jovyan";
518
NB_UID = "1000";
619
dockerEtc = nixpkgs.runCommand "docker-etc" {} ''
@@ -16,10 +29,9 @@ let
1629
echo "root:x::" > $out/etc/gshadow
1730
echo "jovyan:!::" >> $out/etc/gshadow
1831
'';
19-
ihaskell = import "${pkgs.ihaskell}/release.nix" {
20-
inherit nixpkgs;
21-
compiler = "ghc928";
32+
ihaskell = nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
2233
packages = self: with self; [];
34+
extraEnvironmentBinaries = [jupyterlab];
2335
staticExecutable = true;
2436
};
2537
image = nixpkgs.dockerTools.buildLayeredImage {

‎dragon-curve/default.nix

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
in import "${pkgs.ihaskell}/release.nix" {
4-
nixpkgs = import pkgs.nixpkgs {};
5-
compiler = "ghc928";
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
};
11+
};
12+
};
13+
};
14+
};
15+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
16+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
17+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
18+
extraEnvironmentBinaries = [jupyterlab];
619
packages = self: with self; [];
720
}

‎efficient-combinator-parsers/default.nix

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
in import "${pkgs.ihaskell}/release.nix" {
4-
compiler = "ghc928";
5-
nixpkgs = import pkgs.nixpkgs {};
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
};
11+
};
12+
};
13+
};
14+
};
15+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
16+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
17+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
18+
extraEnvironmentBinaries = [jupyterlab];
619
packages = self: with self; [ timeit ];
720
}

‎git-from-scratch/default.nix

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
nixpkgs = import pkgs.nixpkgs {};
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
};
11+
};
12+
};
13+
};
14+
};
15+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
16+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
417
cleanSource = name: type: let
518
baseName = baseNameOf (toString name);
619
lib = nixpkgs.lib;
@@ -17,9 +30,7 @@ let
1730
);
1831
git-from-scratch =
1932
nixpkgs.haskellPackages.callCabal2nix "git-from-scratch" (builtins.filterSource cleanSource ./.) {};
20-
in import "${pkgs.ihaskell}/release.nix" {
21-
inherit nixpkgs;
22-
compiler = "ghc928";
33+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
2334
packages = self: with self; [
2435
SHA
2536
attoparsec
@@ -40,4 +51,5 @@ in import "${pkgs.ihaskell}/release.nix" {
4051
qpdf
4152
vim
4253
];
54+
extraEnvironmentBinaries = [jupyterlab];
4355
}

‎graphviz/default.nix

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
in import "${pkgs.ihaskell}/release.nix" {
4-
compiler = "ghc928";
5-
nixpkgs = import pkgs.nixpkgs {};
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
};
11+
};
12+
};
13+
};
14+
};
15+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
16+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
17+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
18+
extraEnvironmentBinaries = [ jupyterlab ];
619
packages = self: with self; [ here ihaskell-graphviz ];
720
systemPackages = self: with self; [ graphviz ];
821
}

‎hamt/default.nix

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
in import "${pkgs.ihaskell}/release.nix" {
4-
compiler = "ghc928";
5-
nixpkgs = import pkgs.nixpkgs {};
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
};
11+
};
12+
};
13+
};
14+
};
15+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
16+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
17+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
18+
extraEnvironmentBinaries = [jupyterlab];
619
packages = self: with self; [ bytestring memory pretty-show timeit vector here ihaskell-graphviz ];
720
systemPackages = self: with self; [ graphviz ];
821
}

‎higher-kinded-data/default.nix

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
in import "${pkgs.ihaskell}/release.nix" {
4-
nixpkgs = import pkgs.nixpkgs {};
5-
compiler = "ghc902";
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
};
11+
};
12+
};
13+
};
14+
};
15+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
16+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
17+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
18+
extraEnvironmentBinaries = [ jupyterlab ];
619
packages = self: with self; [ validation ];
720
}

‎hs-updater/default.nix

+17-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,22 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
in import "${pkgs.ihaskell}/release.nix" {
4-
compiler = "ghc928";
5-
nixpkgs = import pkgs.nixpkgs {};
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
sbv = sup.haskell.lib.dontCheck (self.callHackage "sbv" "10.1" {});
11+
};
12+
};
13+
};
14+
};
15+
};
16+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
17+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
18+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
19+
extraEnvironmentBinaries = [ jupyterlab ];
620
packages = self: with self; [
721
aeson
822
aeson-pretty

‎intmap/default.nix

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
in import "${pkgs.ihaskell}/release.nix" {
4-
compiler = "ghc928";
5-
nixpkgs = import pkgs.nixpkgs {};
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
};
11+
};
12+
};
13+
};
14+
};
15+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
16+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
17+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
18+
extraEnvironmentBinaries = [ jupyterlab ];
619
packages = self: with self; [ pretty-show ];
720
}

‎lambda/default.nix

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
let
22
pkgs = import ../pkgs.nix;
3-
in import "${pkgs.ihaskell}/release.nix" {
4-
compiler = "ghc928";
5-
nixpkgs = import pkgs.nixpkgs {};
3+
overlay = sel: sup: {
4+
nix-filter = import pkgs.nix-filter;
5+
haskell = sup.haskell // {
6+
packages = sup.haskell.packages // {
7+
ghc948 = sup.haskell.packages.ghc948.override {
8+
overrides = self: super: {
9+
ghc-syntax-highlighter = self.ghc-syntax-highlighter_0_0_10_0;
10+
};
11+
};
12+
};
13+
};
14+
};
15+
nixpkgs = (import pkgs.nixpkgs { overlays = [ overlay ]; });
16+
jupyterlab = nixpkgs.python3.withPackages (ps: [ ps.jupyterlab ps.notebook ]);
17+
in nixpkgs.callPackage "${pkgs.ihaskell}/nix/release.nix" { compiler = "ghc948"; }{
618
packages = self: with self; [ containers transformers vector ];
19+
extraEnvironmentBinaries = [jupyterlab];
720
}

0 commit comments

Comments
 (0)