Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

monad-bayes series Nix environment: update jupyterWith pin #13

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

monad-bayes series Nix environment: update jupyterWith pin #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c706e73
monad-bayes series: update jupyterWith rev
curiousleo Jun 10, 2020
7d86c21
Update IHaskell and monad-bayes pins
curiousleo Jun 10, 2020
f6ce82a
Disable jupyterlab-ihaskell extension
curiousleo Jun 10, 2020
a87ad95
Update haskell-overlay.nix
curiousleo Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 18 additions & 30 deletions monad-bayes-series/haskell-overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
# Mostly copied from:
# https://raw.githubusercontent.com/tweag/jupyterWith/b0b4e55da09973a57b82200789816f050a970f3e/nix/haskell-overlay.nix

_: pkgs:

let
ihaskellSrc = pkgs.fetchFromGitHub {
owner = "gibiansky";
repo = "IHaskell";
rev = "2318ee2a90cfc98390651657aec434586b963235";
sha256 = "0svjzs81i77s710cfb7pxkfdi979mhjazpc2l9k9ha752spz04cj";
rev = "d7dc460a421abaa41e04fe150e264bc2bab5cbad";
sha256 = "157mqfprjbjal5mvrqwpgnfvc93fn1pqwwkhfpcs7jm5c34bkv3q";
};

monadBayesSrc = pkgs.fetchFromGitHub {
owner = "adscib";
owner = "tweag";
repo = "monad-bayes";
rev = "fb87bf039bab35dcc82de8ccf8963a7a576af355";
sha256 = "0jz7lswdzxzn5zzwypdawdj7j0y20aakmqggv9pw4sknajdqqqyf";
rev = "1d368b9309b39112a7b38e779157ae481dd1c2ef";
sha256 = "15sf3gm2zn31wcxbr8yqvnsfgnw176xn79vfqcf536bscx2l6bvp";
};

hVegaSrc = pkgs.fetchFromGitHub {
Expand Down Expand Up @@ -67,36 +70,21 @@ let
ihaskell-widgets = callDisplayPackage "widgets";

# Marked as broken in this version of Nixpkgs.
chell = hspkgs.callHackage "chell" "0.4.0.2" {};
patience = hspkgs.callHackage "patience" "0.1.1" {};

# Version compatible with ghc-lib-parser.
hlint = hspkgs.callHackage "hlint" "2.2.1" {};
#chell = hspkgs.callHackage "chell" "0.4.0.2" {};
#patience = hspkgs.callHackage "patience" "0.1.1" {};

# Tests not passing.
Diff = dontCheck hspkgs.Diff;
zeromq4-haskell = dontCheck hspkgs.zeromq4-haskell;
funflow = dontCheck hspkgs.funflow;

# Haddocks not building.
ghc-lib-parser = dontHaddock hspkgs.ghc-lib-parser;

# Missing dependency.
aeson = pkgs.haskell.lib.addBuildDepends hspkgs.aeson [ self.contravariant ];

#Diff = dontCheck hspkgs.Diff;
#zeromq4-haskell = dontCheck hspkgs.zeromq4-haskell;

};
in

{
haskell = pkgs.haskell // {
packages = pkgs.haskell.packages // {
"ghc865" = pkgs.haskell.packages.ghc865.override (old: {
overrides =
pkgs.lib.composeExtensions
(old.overrides or (_: _: {}))
overrides;}
);
};
};
haskellPackages = pkgs.haskellPackages.override (old: {
overrides =
pkgs.lib.composeExtensions
(old.overrides or (_: _: {}))
overrides;
});
}
16 changes: 10 additions & 6 deletions monad-bayes-series/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let
jupyterLib = builtins.fetchGit {
url = https://github.com/tweag/jupyterWith;
rev = "70f1dddd6446ab0155a5b0ff659153b397419a2d";
rev = "b0b4e55da09973a57b82200789816f050a970f3e";
};
nixpkgsPath = jupyterLib + "/nix";
haskellOverlay = import ./haskell-overlay.nix;
Expand Down Expand Up @@ -29,11 +29,15 @@ let
jupyterlabWithKernels =
jupyter.jupyterlabWith {
kernels = [ ihaskellWithPackages ];
directory = jupyter.mkDirectoryWith {
extensions = [
"jupyterlab-ihaskell"
];
};
# The jupyterlab-ihaskell extension is incompatible with the latest
# jupyterWith version. Re-enable the extension to get syntax highlighting
# once there is a compatible version.
#
#directory = jupyter.mkDirectoryWith {
# extensions = [
# "jupyterlab-ihaskell"
# ];
#};
};
in
jupyterlabWithKernels.env