maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Simplify unstable preview

Browse source
This commit is contained in:
Malte Brandy 2021-05-24 14:45:35 +02:00
parent 6a23c8bf82
commit acd47fb184
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
3 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
overlays/10-previews.nix
View file

@ -3,6 +3,5 @@ let
unstable = import super.sources.nixos-unstable { };
in
{
inherit (unstable) laminar upterm syncthing vimPlugins dhallPackages fzf gomuks neochat mirage-im nheko;
matrix-synapse-tools.rust-synapse-compress-state = unstable.matrix-synapse-tools.rust-synapse-compress-state;
inherit (unstable) laminar upterm syncthing vimPlugins dhallPackages fzf gomuks neochat mirage-im nheko haskellPackages ghc cachix nix-output-monitor matrix-synapse-tools;
}

15
overlays/30-ghc.nix
View file

@ -1,8 +1,7 @@
self: super:
final: prev:
let
inherit (super) fetchFromGitHub;
unstable = import super.sources.nixos-unstable { };
inherit (unstable.haskell.lib) overrideCabal unmarkBroken doJailbreak dontCheck;
inherit (prev) ghc haskellPackages;
inherit (prev.haskell.lib) overrideCabal unmarkBroken doJailbreak dontCheck;
makeHaskellScriptPackages = p: {
inherit (p)
aeson shh string-interpolate relude replace-megaparsec async say
@ -20,16 +19,8 @@ let
hedgehog nix-derivation req
;
} // makeHaskellScriptPackages p;
overrides = self: super: {
generic-optics = dontCheck (unmarkBroken super.generic-optics);
};
haskellPackages = unstable.haskellPackages.extend overrides;
ghc = haskellPackages.ghc;
in
{
inherit ghc haskellPackages;
cachix = unstable.cachix;
nix-output-monitor = unstable.nix-output-monitor;
myHaskellPackages = makeHaskellPackages haskellPackages;
myHaskellScriptPackages = makeHaskellScriptPackages haskellPackages;
ghcWithPackages = ghc.withHoogle (p: builtins.attrValues (makeHaskellPackages p));

5
overlays/logfeed/default.nix
View file

@ -1,7 +1,4 @@
final: prev:
let
master = import prev.sources.nixpkgs-master { };
in
{
logfeed = master.haskellPackages.callCabal2nix "logfeed" prev.sources.logfeed { };
logfeed = prev.haskellPackages.callCabal2nix "logfeed" prev.sources.logfeed { };
}