chore(3p/sources): Bump channels & overlays
* //3p/overlays/haskell: clean up stale override * //3p/overlays/tvl: work around mullvad build failure * //3p/gerrit: update dependencies' output hash Change-Id: Iaea849fb199bb3d059e067c237ca939b3558a766 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7867 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Autosubmit: sterni <sternenseemann@systemli.org>
This commit is contained in:
parent
bfa662eadf
commit
23a5d730f7
4 changed files with 24 additions and 20 deletions
4
third_party/overlays/haskell/default.nix
vendored
4
third_party/overlays/haskell/default.nix
vendored
|
|
@ -42,10 +42,6 @@ in
|
|||
|
||||
# TODO(grfn): port to brick 1.4 (EventM gains an additional type argument in 1.0)
|
||||
brick = hsSelf.callPackage ./extra-pkgs/brick-0.73.nix { };
|
||||
|
||||
# TODO(sterni): upstream into nixpkgs
|
||||
binary-orphans =
|
||||
haskellLib.addBuildDepends [ hsSelf.OneTuple ] hsSuper.binary-orphans;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
8
third_party/overlays/tvl.nix
vendored
8
third_party/overlays/tvl.nix
vendored
|
|
@ -45,6 +45,14 @@ depot.nix.readTree.drvTargets {
|
|||
];
|
||||
});
|
||||
|
||||
# Apply workaround from https://github.com/NixOS/nixpkgs/pull/211469
|
||||
# until it hits the nixos-unstable channel
|
||||
mullvad = super.mullvad.overrideAttrs (old: {
|
||||
nativeBuildInputs = old.nativeBuildInputs ++ [
|
||||
self.buildPackages.git
|
||||
];
|
||||
});
|
||||
|
||||
home-manager = super.home-manager.overrideAttrs (_: {
|
||||
src = depot.third_party.sources.home-manager;
|
||||
version = "git-"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue