haskellPackages: move purescript override block into inherit

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.

+34 -29
+34 -29
pkgs/development/haskell-modules/configuration-common.nix
··· 2560 2560 # Too strict upper bound on HTTP 2561 2561 oeis = doJailbreak super.oeis; 2562 2562 2563 - } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let 2564 - # We need to build purescript with these dependencies and thus also its reverse 2565 - # dependencies to avoid version mismatches in their dependency closure. 2566 - # TODO(@cdepillabout): maybe unify with the spago overlay in configuration-nix.nix? 2567 - purescriptOverlay = self: super: { 2568 - # As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0, 2569 - # but it has a problem with parsing the `async` keyword. It doesn't allow 2570 - # `async` to be used as an object key: 2571 - # https://github.com/erikd/language-javascript/issues/131 2572 - language-javascript = self.language-javascript_0_7_0_0; 2573 - }; 2574 - in { 2575 - purescript = 2576 - lib.pipe 2577 - (super.purescript.overrideScope purescriptOverlay) 2578 - ([ 2579 - # PureScript uses nodejs to run tests, so the tests have been disabled 2580 - # for now. If someone is interested in figuring out how to get this 2581 - # working, it seems like it might be possible. 2582 - dontCheck 2583 - # The current version of purescript (0.14.5) has version bounds for LTS-17, 2584 - # but it compiles cleanly using deps in LTS-18 as well. This jailbreak can 2585 - # likely be removed when purescript-0.14.6 is released. 2586 - doJailbreak 2587 - # Generate shell completions 2588 - (self.generateOptparseApplicativeCompletions [ "purs" ]) 2589 - ]); 2563 + inherit 2564 + (let 2565 + # We need to build purescript with these dependencies and thus also its reverse 2566 + # dependencies to avoid version mismatches in their dependency closure. 2567 + # TODO(@cdepillabout): maybe unify with the spago overlay in configuration-nix.nix? 2568 + purescriptOverlay = self: super: { 2569 + # As of 2021-11-08, the latest release of `language-javascript` is 0.7.1.0, 2570 + # but it has a problem with parsing the `async` keyword. It doesn't allow 2571 + # `async` to be used as an object key: 2572 + # https://github.com/erikd/language-javascript/issues/131 2573 + language-javascript = self.language-javascript_0_7_0_0; 2574 + }; 2575 + in { 2576 + purescript = 2577 + lib.pipe 2578 + (super.purescript.overrideScope purescriptOverlay) 2579 + ([ 2580 + # PureScript uses nodejs to run tests, so the tests have been disabled 2581 + # for now. If someone is interested in figuring out how to get this 2582 + # working, it seems like it might be possible. 2583 + dontCheck 2584 + # The current version of purescript (0.14.5) has version bounds for LTS-17, 2585 + # but it compiles cleanly using deps in LTS-18 as well. This jailbreak can 2586 + # likely be removed when purescript-0.14.6 is released. 2587 + doJailbreak 2588 + # Generate shell completions 2589 + (self.generateOptparseApplicativeCompletions [ "purs" ]) 2590 + ]); 2590 2591 2591 - purenix = super.purenix.overrideScope purescriptOverlay; 2592 + purenix = super.purenix.overrideScope purescriptOverlay; 2593 + }) 2594 + purescript 2595 + purenix 2596 + ; 2592 2597 2593 2598 # 2022-11-05: https://github.com/ysangkok/haskell-tzdata/issues/3 2594 2599 tzdata = dontCheck super.tzdata; ··· 2603 2608 swarm = doJailbreak (super.swarm.override { 2604 2609 brick = doJailbreak (dontCheck super.brick_1_3); 2605 2610 }); 2606 - }) 2611 + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super