Simplify unstable preview
This commit is contained in:
parent
6a23c8bf82
commit
acd47fb184
|
@ -3,6 +3,5 @@ let
|
||||||
unstable = import super.sources.nixos-unstable { };
|
unstable = import super.sources.nixos-unstable { };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
inherit (unstable) laminar upterm syncthing vimPlugins dhallPackages fzf gomuks neochat mirage-im nheko;
|
inherit (unstable) laminar upterm syncthing vimPlugins dhallPackages fzf gomuks neochat mirage-im nheko haskellPackages ghc cachix nix-output-monitor matrix-synapse-tools;
|
||||||
matrix-synapse-tools.rust-synapse-compress-state = unstable.matrix-synapse-tools.rust-synapse-compress-state;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
self: super:
|
final: prev:
|
||||||
let
|
let
|
||||||
inherit (super) fetchFromGitHub;
|
inherit (prev) ghc haskellPackages;
|
||||||
unstable = import super.sources.nixos-unstable { };
|
inherit (prev.haskell.lib) overrideCabal unmarkBroken doJailbreak dontCheck;
|
||||||
inherit (unstable.haskell.lib) overrideCabal unmarkBroken doJailbreak dontCheck;
|
|
||||||
makeHaskellScriptPackages = p: {
|
makeHaskellScriptPackages = p: {
|
||||||
inherit (p)
|
inherit (p)
|
||||||
aeson shh string-interpolate relude replace-megaparsec async say
|
aeson shh string-interpolate relude replace-megaparsec async say
|
||||||
|
@ -20,16 +19,8 @@ let
|
||||||
hedgehog nix-derivation req
|
hedgehog nix-derivation req
|
||||||
;
|
;
|
||||||
} // makeHaskellScriptPackages p;
|
} // makeHaskellScriptPackages p;
|
||||||
overrides = self: super: {
|
|
||||||
generic-optics = dontCheck (unmarkBroken super.generic-optics);
|
|
||||||
};
|
|
||||||
haskellPackages = unstable.haskellPackages.extend overrides;
|
|
||||||
ghc = haskellPackages.ghc;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
inherit ghc haskellPackages;
|
|
||||||
cachix = unstable.cachix;
|
|
||||||
nix-output-monitor = unstable.nix-output-monitor;
|
|
||||||
myHaskellPackages = makeHaskellPackages haskellPackages;
|
myHaskellPackages = makeHaskellPackages haskellPackages;
|
||||||
myHaskellScriptPackages = makeHaskellScriptPackages haskellPackages;
|
myHaskellScriptPackages = makeHaskellScriptPackages haskellPackages;
|
||||||
ghcWithPackages = ghc.withHoogle (p: builtins.attrValues (makeHaskellPackages p));
|
ghcWithPackages = ghc.withHoogle (p: builtins.attrValues (makeHaskellPackages p));
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
final: prev:
|
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 { };
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue