Commit 39380616 authored by Vaibhav Sagar's avatar Vaibhav Sagar

release.nix: use extend instead of override

parent 65360961
...@@ -35,25 +35,22 @@ let ...@@ -35,25 +35,22 @@ let
"ihaskell-static-canvas" "ihaskell-static-canvas"
"ihaskell-widgets" "ihaskell-widgets"
]); ]);
haskellPackages = nixpkgs.haskell.packages."${compiler}".override { haskellPackages = nixpkgs.haskell.packages."${compiler}".extend (self: super: {
overrides = self: super: { ihaskell = nixpkgs.haskell.lib.overrideCabal (
ihaskell = nixpkgs.haskell.lib.overrideCabal ( self.callCabal2nix "ihaskell" ihaskell-src {}) (_drv: {
self.callCabal2nix "ihaskell" ihaskell-src {}) (_drv: { preCheck = ''
preCheck = '' export HOME=$(${nixpkgs.pkgs.coreutils}/bin/mktemp -d)
export HOME=$(${nixpkgs.pkgs.coreutils}/bin/mktemp -d) export PATH=$PWD/dist/build/ihaskell:$PATH
export PATH=$PWD/dist/build/ihaskell:$PATH export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH
export GHC_PACKAGE_PATH=$PWD/dist/package.conf.inplace/:$GHC_PACKAGE_PATH '';
''; });
}); 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 {};
haskell-src-exts = self.haskell-src-exts_1_20_2; haskell-src-exts = self.haskell-src-exts_1_20_2;
static-canvas = nixpkgs.haskell.lib.doJailbreak super.static-canvas; static-canvas = nixpkgs.haskell.lib.doJailbreak super.static-canvas;
} // displays self);
} // displays self;
};
ihaskellEnv = haskellPackages.ghcWithPackages (self: [ self.ihaskell ] ++ packages self); ihaskellEnv = haskellPackages.ghcWithPackages (self: [ self.ihaskell ] ++ packages self);
jupyter = nixpkgs.python3.withPackages (ps: [ ps.jupyter ps.notebook ]); jupyter = nixpkgs.python3.withPackages (ps: [ ps.jupyter ps.notebook ]);
ihaskellSh = cmd: extraArgs: nixpkgs.writeScriptBin "ihaskell-${cmd}" '' ihaskellSh = cmd: extraArgs: nixpkgs.writeScriptBin "ihaskell-${cmd}" ''
......
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