Commit 17188f8c authored by Vaibhav Sagar's avatar Vaibhav Sagar

Use NixOS 19.09

parent 5e44fe50
...@@ -395,14 +395,14 @@ matrix: ...@@ -395,14 +395,14 @@ matrix:
- export NIX_CONF_DIR=~ - export NIX_CONF_DIR=~
- echo "binary-caches = https://cache.nixos.org https://ihaskell.cachix.org" >> $NIX_CONF_DIR/nix.conf - echo "binary-caches = https://cache.nixos.org https://ihaskell.cachix.org" >> $NIX_CONF_DIR/nix.conf
- echo "binary-cache-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= ihaskell.cachix.org-1:WoIvex/Ft/++sjYW3ntqPUL3jDGXIKDpX60pC8d5VLM=" >> $NIX_CONF_DIR/nix.conf - echo "binary-cache-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= ihaskell.cachix.org-1:WoIvex/Ft/++sjYW3ntqPUL3jDGXIKDpX60pC8d5VLM=" >> $NIX_CONF_DIR/nix.conf
- glibcLocales=$(nix-build https://github.com/NixOS/nixpkgs-channels/tarball/nixos-19.03 -A glibcLocales) - glibcLocales=$(nix-build https://github.com/NixOS/nixpkgs-channels/tarball/nixos-19.09 -A glibcLocales)
- echo $glibcLocales - echo $glibcLocales
- export LOCALE_ARCHIVE_2_27="${glibcLocales}/lib/locale/locale-archive" - export LOCALE_ARCHIVE_2_27="${glibcLocales}/lib/locale/locale-archive"
script: script:
- > - >
nix-build nix-build
-I nixpkgs=https://github.com/NixOS/nixpkgs-channels/tarball/nixos-19.03 -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/tarball/nixos-19.09
release.nix release.nix
--argstr compiler "ghc864" --argstr compiler "ghc865"
- nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/tarball/nixos-19.03 -p cachix --run 'cachix push ihaskell result' - nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/tarball/nixos-19.09 -p cachix --run 'cachix push ihaskell result'
- test/acceptance.nbconvert.sh result/bin/ihaskell-nbconvert - test/acceptance.nbconvert.sh result/bin/ihaskell-nbconvert
{ compiler ? "ghc864" { compiler ? "ghc865"
, nixpkgs ? import <nixpkgs> {} , nixpkgs ? import <nixpkgs> {}
, packages ? (_: []) , packages ? (_: [])
, pythonPackages ? (_: []) , pythonPackages ? (_: [])
......
...@@ -45,14 +45,9 @@ let ...@@ -45,14 +45,9 @@ let
}); });
ghc-parser = self.callCabal2nix "ghc-parser" ghc-parser-src {}; ghc-parser = self.callCabal2nix "ghc-parser" ghc-parser-src {};
ipython-kernel = self.callCabal2nix "ipython-kernel" ipython-kernel-src {}; ipython-kernel = self.callCabal2nix "ipython-kernel" ipython-kernel-src {};
zeromq4-haskell = self.callHackage "zeromq4-haskell" "0.8.0" {};
haskell-src-exts = self.haskell-src-exts_1_21_0;
inline-r = nixpkgs.haskell.lib.dontCheck super.inline-r; inline-r = nixpkgs.haskell.lib.dontCheck super.inline-r;
static-canvas = nixpkgs.haskell.lib.doJailbreak super.static-canvas; static-canvas = nixpkgs.haskell.lib.doJailbreak super.static-canvas;
system-fileio = nixpkgs.haskell.lib.doJailbreak super.system-fileio;
Chart = nixpkgs.haskell.lib.doJailbreak super.Chart;
Chart-cairo = nixpkgs.haskell.lib.doJailbreak super.Chart-cairo;
} // displays self); } // displays self);
}); });
ihaskellEnv = haskellPackages.ghcWithPackages (self: [ self.ihaskell ] ++ packages self); ihaskellEnv = haskellPackages.ghcWithPackages (self: [ self.ihaskell ] ++ packages self);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment