b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskellPackages: move purescript override block into inherit

Browse source 
Since the “purescript block” was at the end of the file before (after a
set update), a lot of unrelated overrides where added to it
accidentally, leading to a confusing collection of overrides in there.
With the inherit method of establishing a shared scope for a handful of
overrides this should no longer be a problem.
This commit is contained in:
sternenseemann 2022-11-26 23:51:54 +01:00
parent a2da422ee3
commit 2c0e0d2b1c
1 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -2560,35 +2560,40 @@ self: super: {
# Too strict upper bound on HTTP
oeis = doJailbreak super.oeis;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
# We need to build purescript with these dependencies and thus also its reverse
# dependencies to avoid version mismatches in their dependency closure.
# TODO(@cdepillabout): maybe unify with the spago overlay in configuration-nix.nix?
purescriptOverlay = self: super: {
# As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0,
# but it has a problem with parsing the `async` keyword. It doesn't allow
# `async` to be used as an object key:
# https://github.com/erikd/language-javascript/issues/131
language-javascript = self.language-javascript_0_7_0_0;
};
in {
purescript =
lib.pipe
(super.purescript.overrideScope purescriptOverlay)
([
# PureScript uses nodejs to run tests, so the tests have been disabled
# for now. If someone is interested in figuring out how to get this
# working, it seems like it might be possible.
dontCheck
# The current version of purescript (0.14.5) has version bounds for LTS-17,
# but it compiles cleanly using deps in LTS-18 as well. This jailbreak can
# likely be removed when purescript-0.14.6 is released.
doJailbreak
# Generate shell completions
(self.generateOptparseApplicativeCompletions [ "purs" ])
]);
inherit
(let
# We need to build purescript with these dependencies and thus also its reverse
# dependencies to avoid version mismatches in their dependency closure.
# TODO(@cdepillabout): maybe unify with the spago overlay in configuration-nix.nix?
purescriptOverlay = self: super: {
# As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0,
# but it has a problem with parsing the `async` keyword. It doesn't allow
# `async` to be used as an object key:
# https://github.com/erikd/language-javascript/issues/131
language-javascript = self.language-javascript_0_7_0_0;
};
in {
purescript =
lib.pipe
(super.purescript.overrideScope purescriptOverlay)
([
# PureScript uses nodejs to run tests, so the tests have been disabled
# for now. If someone is interested in figuring out how to get this
# working, it seems like it might be possible.
dontCheck
# The current version of purescript (0.14.5) has version bounds for LTS-17,
# but it compiles cleanly using deps in LTS-18 as well. This jailbreak can
# likely be removed when purescript-0.14.6 is released.
doJailbreak
# Generate shell completions
(self.generateOptparseApplicativeCompletions [ "purs" ])
]);
purenix = super.purenix.overrideScope purescriptOverlay;
purenix = super.purenix.overrideScope purescriptOverlay;
})
purescript
purenix
;
# 2022-11-05: https://github.com/ysangkok/haskell-tzdata/issues/3
tzdata = dontCheck super.tzdata;
@ -2603,4 +2608,4 @@ in {
swarm = doJailbreak (super.swarm.override {
brick = doJailbreak (dontCheck super.brick_1_3);
});
})
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super