bad/devos
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Merge #330

Browse source 
330: Fix: Haskell overlay r=blaggacao a=GTrunSec

using `lib.composeExtensions` for packageOverrides is more idiomatic.
Fixes: https://github.com/divnix/devos/pull/325#pullrequestreview-687772802
such as 
```
 python3 = pkgs.python3.override (old: {
   5 │ │ packageOverrides =
   4 │ │ │ pkgs.lib.composeExtensions
   3 │ │ │ │ (old.packageOverrides or (_: _: { }))
   2 │ │ │ │ packageOverrides;
   1 │ });
```

Co-authored-by: GTrunSec <gtrunsec@hardenedlinux.org>
This commit is contained in:
bors[bot] 2021-06-25 12:54:51 +00:00 committed by GitHub
commit 741e8fdc47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

@ -52,7 +52,6 @@
nur.overlay nur.overlay
agenix.overlay agenix.overlay
nvfetcher.overlay nvfetcher.overlay
(final: prev: { nvfetcher-bin = nvfetcher.defaultPackage.${final.system}; })
./pkgs/default.nix ./pkgs/default.nix
]; ];
}; };

10
overlays/overrides.nix
View file

@ -14,15 +14,15 @@ channels: final: prev: {
starship; starship;
haskellPackages = prev.haskellPackages.override { haskellPackages = prev.haskellPackages.override
overrides = hfinal: hprev: (old: {
overrides = prev.lib.composeExtensions (old.overrides or (_: _: { })) (hfinal: hprev:
let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version; let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version;
in in
{ {
# same for haskell packages, matching ghc versions # same for haskell packages, matching ghc versions
inherit (channels.latest.haskell.packages."ghc${version}") inherit (channels.latest.haskell.packages."ghc${version}")
haskell-language-server; haskell-language-server;
}; });
}; });
} }