mirror of
https://github.com/IHaskell/IHaskell.git
synced 2025-04-19 12:56:08 +00:00
Merge pull request #776 from gibiansky/disable-default-display
Don't include display modules by default when building with Nix
This commit is contained in:
commit
e4276ec382
36
.travis.yml
36
.travis.yml
@ -204,7 +204,23 @@ matrix:
|
||||
- export NIX_CONF_DIR=~
|
||||
- echo "binary-caches = http://128.199.234.106:3000" >> $NIX_CONF_DIR/nix.conf
|
||||
- echo "binary-cache-public-keys = 128.199.234.106:jzUyrIQHov5i6f94jQVriqPDLuPYlZPAsga3W3k+L8E=" >> $NIX_CONF_DIR/nix.conf
|
||||
script: nix-build -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/a0b50eab599005127476e7b3b4ae8bd2d363091b.tar.gz $RELEASE_NIX
|
||||
script:
|
||||
- >
|
||||
nix-build
|
||||
-I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/a0b50eab599005127476e7b3b4ae8bd2d363091b.tar.gz
|
||||
$RELEASE_NIX
|
||||
--arg packages '(p: with p; [
|
||||
ihaskell-aeson
|
||||
ihaskell-blaze
|
||||
ihaskell-charts
|
||||
ihaskell-diagrams
|
||||
ihaskell-gnuplot
|
||||
ihaskell-hatex
|
||||
ihaskell-juicypixels
|
||||
ihaskell-magic
|
||||
ihaskell-plot
|
||||
ihaskell-static-canvas
|
||||
])'
|
||||
- language: nix
|
||||
env: RELEASE_NIX="release-8.2.nix"
|
||||
cache:
|
||||
@ -214,4 +230,20 @@ matrix:
|
||||
- export NIX_CONF_DIR=~
|
||||
- echo "binary-caches = http://128.199.234.106:3000" >> $NIX_CONF_DIR/nix.conf
|
||||
- echo "binary-cache-public-keys = 128.199.234.106:jzUyrIQHov5i6f94jQVriqPDLuPYlZPAsga3W3k+L8E=" >> $NIX_CONF_DIR/nix.conf
|
||||
script: nix-build -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/a0b50eab599005127476e7b3b4ae8bd2d363091b.tar.gz $RELEASE_NIX
|
||||
script:
|
||||
- >
|
||||
nix-build
|
||||
-I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/a0b50eab599005127476e7b3b4ae8bd2d363091b.tar.gz
|
||||
$RELEASE_NIX
|
||||
--arg packages '(p: with p; [
|
||||
ihaskell-aeson
|
||||
ihaskell-blaze
|
||||
ihaskell-charts
|
||||
ihaskell-diagrams
|
||||
ihaskell-gnuplot
|
||||
ihaskell-hatex
|
||||
ihaskell-juicypixels
|
||||
ihaskell-magic
|
||||
ihaskell-plot
|
||||
ihaskell-static-canvas
|
||||
])'
|
||||
|
@ -107,21 +107,7 @@ let
|
||||
} // displays self;
|
||||
};
|
||||
ihaskell = haskellPackages.ihaskell;
|
||||
ihaskellEnv = haskellPackages.ghcWithPackages (self: with self; [
|
||||
ihaskell
|
||||
ihaskell-aeson
|
||||
ihaskell-blaze
|
||||
ihaskell-charts
|
||||
ihaskell-diagrams
|
||||
ihaskell-gnuplot
|
||||
ihaskell-hatex
|
||||
ihaskell-juicypixels
|
||||
ihaskell-magic
|
||||
ihaskell-plot
|
||||
# ihaskell-rlangqq
|
||||
ihaskell-static-canvas
|
||||
# ihaskell-widgets
|
||||
] ++ packages self);
|
||||
ihaskellEnv = haskellPackages.ghcWithPackages (self: [ self.ihaskell ] ++ packages self);
|
||||
jupyter = nixpkgs.python3.withPackages (ps: [ ps.jupyter ps.notebook ]);
|
||||
ihaskellSh = nixpkgs.writeScriptBin "ihaskell-notebook" ''
|
||||
#! ${nixpkgs.stdenv.shell}
|
||||
|
16
release.nix
16
release.nix
@ -64,21 +64,7 @@ let
|
||||
} // displays self;
|
||||
};
|
||||
ihaskell = haskellPackages.ihaskell;
|
||||
ihaskellEnv = haskellPackages.ghcWithPackages (self: with self; [
|
||||
ihaskell
|
||||
ihaskell-aeson
|
||||
ihaskell-blaze
|
||||
ihaskell-charts
|
||||
ihaskell-diagrams
|
||||
ihaskell-gnuplot
|
||||
ihaskell-hatex
|
||||
ihaskell-juicypixels
|
||||
ihaskell-magic
|
||||
ihaskell-plot
|
||||
# ihaskell-rlangqq
|
||||
ihaskell-static-canvas
|
||||
# ihaskell-widgets
|
||||
] ++ packages self);
|
||||
ihaskellEnv = haskellPackages.ghcWithPackages (self: [ self.ihaskell ] ++ packages self);
|
||||
jupyter = nixpkgs.python3.withPackages (ps: [ ps.jupyter ps.notebook ]);
|
||||
ihaskellSh = nixpkgs.writeScriptBin "ihaskell-notebook" ''
|
||||
#! ${nixpkgs.stdenv.shell}
|
||||
|
Loading…
x
Reference in New Issue
Block a user