refactor: Move nixpkgs attribute to third_party.nixpkgs
Please read b/108 to make sense of this. This gets rid of the explicit list of exposed packages from nixpkgs, and instead makes the entire package set available at `third_party.nixpkgs`. To accommodate this, a LOT of things have to be very slightly shuffled around. Some of this was done in already submitted CLs, but this change is unfortunately still quite noisy. Pay extra attention to: * overlay-like functionality that was partially moved to actual overlays (partially as in, the minimum required to get a green build) * modified uses of the package set path, esp. in NixOS systems Special notes: * xanthous has been disabled in CI because of issues with the Haskell overlay * //third_party/nix has been disabled because of other unclear dependency issues Both of these will be tackled in a followup CL. Change-Id: I2f9c60a4d275fdb5209264be0addfd7e06c53118 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2910 Reviewed-by: glittershark <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
This commit is contained in:
parent
a83abc9024
commit
473604f567
46 changed files with 276 additions and 488 deletions
59
third_party/overlays/haskell/default.nix
vendored
59
third_party/overlays/haskell/default.nix
vendored
|
|
@ -1,34 +1,41 @@
|
|||
# Defines overrides for Haskell packages, for example to avoid
|
||||
# breakage currently present in nixpkgs or to modify package versions.
|
||||
# Defines an overlay for overriding Haskell packages, for example to
|
||||
# avoid breakage currently present in nixpkgs or to modify package
|
||||
# versions.
|
||||
|
||||
{ ... }: # This file needs nothing from readTree
|
||||
{ pkgs }: # ... but is called with a separate package set in the overlay
|
||||
|
||||
self: super: with pkgs.haskell.lib; rec {
|
||||
generic-arbitrary = appendPatch
|
||||
super.generic-arbitrary
|
||||
[ ./patches/generic-arbitrary-export-garbitrary.patch ];
|
||||
self: super: # overlay parameters for the nixpkgs overlay
|
||||
|
||||
random = dontCheck (self.callHackageDirect {
|
||||
pkg = "random";
|
||||
ver = "1.2.0";
|
||||
sha256 = "06s3mmqbsfwv09j2s45qnd66nrxfp9280gnl9ng8yh128pfr7bjh";
|
||||
} {});
|
||||
let
|
||||
overrides = hsSelf: hsSuper: with super.haskell.lib; rec {
|
||||
generic-arbitrary = appendPatch hsSuper.generic-arbitrary
|
||||
[ ./patches/generic-arbitrary-export-garbitrary.patch ];
|
||||
|
||||
# random <1.2
|
||||
test-framework = doJailbreak super.test-framework;
|
||||
hashable = doJailbreak super.hashable;
|
||||
test-framework-quickcheck2 = doJailbreak super.test-framework-quickcheck2;
|
||||
# random = dontCheck (hsSuper.callHackageDirect {
|
||||
# pkg = "random";
|
||||
# ver = "1.2.0";
|
||||
# sha256 = "06s3mmqbsfwv09j2s45qnd66nrxfp9280gnl9ng8yh128pfr7bjh";
|
||||
# } {});
|
||||
|
||||
# can be removed if we have the following PR or equivalent
|
||||
# https://github.com/NixOS/nixpkgs/pull/116931
|
||||
hedgehog-classes = overrideCabal super.hedgehog-classes (attrs: {
|
||||
# remove version bound on semirings which is inside a
|
||||
# conditional, so doJailbreak doesn't work
|
||||
prePatch = ''
|
||||
sed -i 's|semirings.*0.6|semirings|g' hedgehog-classes.cabal
|
||||
'';
|
||||
});
|
||||
# random <1.2
|
||||
test-framework = doJailbreak hsSuper.test-framework;
|
||||
hashable = doJailbreak hsSuper.hashable;
|
||||
test-framework-quickcheck2 = doJailbreak hsSuper.test-framework-quickcheck2;
|
||||
|
||||
hgeometry-combinatorial = dontCheck super.hgeometry-combinatorial;
|
||||
# can be removed if we have the following PR or equivalent
|
||||
# https://github.com/NixOS/nixpkgs/pull/116931
|
||||
hedgehog-classes = overrideCabal hsSuper.hedgehog-classes (attrs: {
|
||||
# remove version bound on semirings which is inside a
|
||||
# conditional, so doJailbreak doesn't work
|
||||
prePatch = ''
|
||||
sed -i 's|semirings.*0.6|semirings|g' hedgehog-classes.cabal
|
||||
'';
|
||||
});
|
||||
|
||||
hgeometry-combinatorial = dontCheck hsSuper.hgeometry-combinatorial;
|
||||
};
|
||||
in {
|
||||
haskellPackages = super.haskellPackages.override {
|
||||
inherit overrides;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
27
third_party/overlays/tvl.nix
vendored
Normal file
27
third_party/overlays/tvl.nix
vendored
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
# This overlay is used to make TVL-specific modifications in the
|
||||
# nixpkgs tree, where required.
|
||||
{ ... }:
|
||||
|
||||
self: super: {
|
||||
# Required for apereo-cas
|
||||
# TODO(lukegb): Document why?
|
||||
gradle_6 = (super.gradleGen.override {
|
||||
java = self.jdk11;
|
||||
jdk = self.jdk11;
|
||||
}).gradleGen rec {
|
||||
name = "gradle-6.5.1";
|
||||
nativeVersion = "0.22-milestone-3";
|
||||
|
||||
src = builtins.fetchurl {
|
||||
url = "https://services.gradle.org/distributions/${name}-bin.zip";
|
||||
sha256 = "0jmmipjh4fbsn92zpifa5cqg5ws2a4ha0s4jzqhrg4zs542x79sh";
|
||||
};
|
||||
};
|
||||
|
||||
# Use LLVM 11
|
||||
llvmPackages = self.llvmPackages_11;
|
||||
clangStdenv = self.llvmPackages_11.stdenv;
|
||||
clang-tools = (super.clang-tools.override {
|
||||
llvmPackages = self.llvmPackages_11;
|
||||
});
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue