mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
tvl-depot/third_party/nixpkgs/default.nix

83 lines
3 KiB
Nix
Raw Normal View History

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
2021-04-10 18:05:16 +02:00
# This file imports the pinned nixpkgs sets and applies relevant
# modifications, such as our overlays.
#
refactor(3p/nixpkgs): Pin nixpkgs sources via niv There's no need for us to reinvent the wheel here. niv pins are in //third_party/sources, and niv commands need to be run with `niv -s third_party/sources/sources.json` to operate on the correct file. Note that niv by default wants to put the loader file in //nix/sources.nix. This file has been moved to //third_party/sources/default.nix which makes niv throw a warning, but everything still works as intended. Change-Id: I2b2a6f8edf33c429a6d7be9d174ba1996d9a0193 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5143 Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su>
2022-01-31 12:19:21 +01:00
# The actual source pinning happens via niv in //third_party/sources
#
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
2021-04-10 18:05:16 +02:00
# Note that the attribute exposed by this (third_party.nixpkgs) is
# "special" in that the fixpoint used as readTree's config parameter
# in //default.nix passes this attribute as the `pkgs` argument to all
# readTree derivations.
fix(3p/nixpkgs): pass localSystem from depot to nixpkgs Change-Id: I75d2ad14ebc81a76cfa7c8d83e77b4a124b03466 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5846 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
2022-06-04 01:35:52 +02:00
{ depot ? { }
, externalArgs ? { }
, depotOverlays ? true
feat(3p/nixpkgs): pass localSystem along This ties the top-level localSystem so it's passed to the instance of nixpkgs as well. Change-Id: I9ea3431d5cb35bb99765c5b4d2f22190376435af Reviewed-on: https://cl.tvl.fyi/c/depot/+/5856 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
2022-06-07 10:52:00 +02:00
, localSystem ? externalArgs.localSystem or builtins.currentSystem
feat(third_party/nixpkgs): allow setting crossSystem This allows cross-compiling depot targets to other architectures, so `nix-build --argstr crossSystem aarch64-linux -A tvix.nar-bridge` will emit a cross-compiled aarch64-linux binary. There's still some other cross-related issues in crate2nix to sort out for crate2nix builds, but this CL can already land. Co-Authored-By: raitobezarius <tvl@lahfa.xyz> Change-Id: I467d49d125dd707a4142bfde18eea4a1c3afaf70 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9755 Reviewed-by: raitobezarius <tvl@lahfa.xyz> Tested-by: BuildkiteCI
2023-10-16 15:29:56 +02:00
, crossSystem ? externalArgs.crossSystem or localSystem
feat(3p/nixpkgs): add additionalOverlays optional arg This allows applying additional overlays to nixpkgs before instantiating it. Change-Id: Iee486086e13bb73e6bd20a817b1106c3cd99c935 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11407 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: raitobezarius <tvl@lahfa.xyz> Tested-by: BuildkiteCI
2024-04-13 12:43:41 +02:00
# additional overlays to be applied.
# Useful when calling this file in a view exported from depot.
, additionalOverlays ? [ ]
fix(3p/nixpkgs): pass localSystem from depot to nixpkgs Change-Id: I75d2ad14ebc81a76cfa7c8d83e77b4a124b03466 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5846 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
2022-06-04 01:35:52 +02:00
, ...
}:
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
2021-04-10 18:05:16 +02:00
let
fix(3p/nixpkgs): pass the same args to stable as to unstable nixpkgs Of course we can't pass the overlays without causing an infinite recursion, but they are also intended purely for unstable nixpkgs, so it doesn't matter. Change-Id: I0e1b42e37ad12872f9420cf59dff6d944b2bc5d3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5847 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
2022-06-04 01:38:25 +02:00
# Arguments passed to both the stable nixpkgs and the main, unstable one.
# Includes everything but overlays which are only passed to unstable nixpkgs.
commonNixpkgsArgs = {
# allow users to inject their config into builds (e.g. to test CA derivations)
config =
(if externalArgs ? nixpkgsConfig then externalArgs.nixpkgsConfig else { })
// {
allowUnfree = true;
chore(3p/sources): bump channels & overlays (2023-10-04) nixpkgs changed something in how it deals with configuration of the package set itself when that is externally instantiated (like in depot) It seems like we can work around this mostly by just ... deleting some code, as all instances of this were for allowing unfree code, which we've already set on the top-level anyways. * //users/sterni: fix nixpkgs config assertion to point at pkgs.config * //users/wpcarro: disable locate service, which is broken in nixpkgs Change-Id: Iacf6f1c8fd5b5289e7265e155d74f8269a858ceb Reviewed-on: https://cl.tvl.fyi/c/depot/+/9541 Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: grfn <grfn@gws.fyi> Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su> Reviewed-by: tazjin <tazjin@tvl.su>
2023-10-04 22:39:08 +02:00
allowUnfreeRedistributable = true;
fix(3p/nixpkgs): pass the same args to stable as to unstable nixpkgs Of course we can't pass the overlays without causing an infinite recursion, but they are also intended purely for unstable nixpkgs, so it doesn't matter. Change-Id: I0e1b42e37ad12872f9420cf59dff6d944b2bc5d3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5847 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
2022-06-04 01:38:25 +02:00
allowBroken = true;
chore(3p/sources): Bump channels & overlays Set checkMeta = false in nixpkgs config to prevent it from complaining about our custom meta attributes. Change-Id: I044dc6e2804eacdf8f6136698536fa1b2df79f85 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6797 Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de>
2022-09-28 12:25:18 +02:00
# Forbids our meta.ci attribute
# https://github.com/NixOS/nixpkgs/pull/191171#issuecomment-1260650771
checkMeta = false;
fix(3p/nixpkgs): pass the same args to stable as to unstable nixpkgs Of course we can't pass the overlays without causing an infinite recursion, but they are also intended purely for unstable nixpkgs, so it doesn't matter. Change-Id: I0e1b42e37ad12872f9420cf59dff6d944b2bc5d3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5847 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
2022-06-04 01:38:25 +02:00
};
feat(third_party/nixpkgs): allow setting crossSystem This allows cross-compiling depot targets to other architectures, so `nix-build --argstr crossSystem aarch64-linux -A tvix.nar-bridge` will emit a cross-compiled aarch64-linux binary. There's still some other cross-related issues in crate2nix to sort out for crate2nix builds, but this CL can already land. Co-Authored-By: raitobezarius <tvl@lahfa.xyz> Change-Id: I467d49d125dd707a4142bfde18eea4a1c3afaf70 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9755 Reviewed-by: raitobezarius <tvl@lahfa.xyz> Tested-by: BuildkiteCI
2023-10-16 15:29:56 +02:00
inherit localSystem crossSystem;
fix(3p/nixpkgs): pass the same args to stable as to unstable nixpkgs Of course we can't pass the overlays without causing an infinite recursion, but they are also intended purely for unstable nixpkgs, so it doesn't matter. Change-Id: I0e1b42e37ad12872f9420cf59dff6d944b2bc5d3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5847 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
2022-06-04 01:38:25 +02:00
};
feat(3p/nixpkgs): Plumb through externalArgs.nixpkgsBisectPath This lets the import of the depot root accept an additional argument called `externalArgs`, which can be used to pass additional arguments into a depot package set. This is used in //third_party/nixpkgs for replacing the source of the nixos-unstable channel with a path. With this we can bisect the nixpkgs used in third_party easily. Change-Id: I4f65eb3d6b521ed9f437649b7b068f1e6ab8210f Reviewed-on: https://cl.tvl.fyi/c/depot/+/2925 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
2021-04-10 23:43:41 +02:00
# import the nixos-unstable package set, or optionally use the
# source (e.g. a path) specified by the `nixpkgsBisectPath`
# argument. This is intended for use-cases where the depot is
# bisected against nixpkgs to find the root cause of an issue in a
# channel bump.
refactor(3p/nixpkgs): Pin nixpkgs sources via niv There's no need for us to reinvent the wheel here. niv pins are in //third_party/sources, and niv commands need to be run with `niv -s third_party/sources/sources.json` to operate on the correct file. Note that niv by default wants to put the loader file in //nix/sources.nix. This file has been moved to //third_party/sources/default.nix which makes niv throw a warning, but everything still works as intended. Change-Id: I2b2a6f8edf33c429a6d7be9d174ba1996d9a0193 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5143 Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su>
2022-01-31 12:19:21 +01:00
nixpkgsSrc = externalArgs.nixpkgsBisectPath or depot.third_party.sources.nixpkgs;
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
2021-04-10 18:05:16 +02:00
# Stable package set is imported, but not exposed, to overlay
# required packages into the unstable set.
fix(3p/nixpkgs): pass the same args to stable as to unstable nixpkgs Of course we can't pass the overlays without causing an infinite recursion, but they are also intended purely for unstable nixpkgs, so it doesn't matter. Change-Id: I0e1b42e37ad12872f9420cf59dff6d944b2bc5d3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5847 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
2022-06-04 01:38:25 +02:00
stableNixpkgs = import depot.third_party.sources.nixpkgs-stable commonNixpkgsArgs;
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
2021-04-10 18:05:16 +02:00
# Overlay for packages that should come from the stable channel
# instead (e.g. because something is broken in unstable).
fix(users/Profpatsch/alacritty): use alacritty from stable Change-Id: I8a3f22dd752b5cd70518424335de876210e9bcd4 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5487 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
2022-04-21 11:33:45 +02:00
# Use `stableNixpkgs` from above.
chore(3p/sources): Bump channels & overlays * agenix has not been updated (https://github.com/ryantm/agenix/pull/241). * wasm-bindgen bumped to 0.2.92 in Rust WASM projects * 3p/lisp: port lispPackages from stable channel The Lisp package set we are using (`pkgs.lispPackages`) is the "old old" package set, whereas we were supposed to have been using `pkgs.lispPackages_new` (which is the "old new" package set). Either way we missed that train, and now there's a "new new" package set, but with a twist: Lisp packages in nixpkgs are now tied to their compilers, so the most generic way to access them seems to be from `pkgs.sbclPackages`. Switching to the packages from the "new new" package set doesn't work: Lots of stuff stops building if we just switch the sources over, and not everything is trivially fixable. For now we stay on the lispPackages from the stable channel. We need to look into the migration later. Or rewrite panettone. * tvix: update generated protobuf files * 3p/nixpkgs: pick trunk from stable channel; newer versions try to read files and do network I/O during build, but don't print enough details in error messages to figure out why. * 3p/overlays: remove tdlib override (nixpkgs is currently new enough) * 3p/overlays: override telega.el sources while updates are lagging in nixpkgs * users/flokli/ipu6-softisp: update firmware paths, which NixOS now stores zstd-compressed. Change-Id: I5a7a6c8b5d0688461bca92b9e6d654356d3a1cf1 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11711 Tested-by: BuildkiteCI Reviewed-by: flokli <flokli@flokli.de> Reviewed-by: tazjin <tazjin@tvl.su>
2024-05-24 12:33:34 +02:00
stableOverlay = _unstableSelf: unstableSuper: {
# newer trunk fails somewhere within reqwest, trying to read a mystery file
trunk = stableNixpkgs.trunk;
# the big lis package change breaks everything in //3p/lisp, undo it for now.
lispPackages = stableNixpkgs.lispPackages;
};
feat(3p/nixpkgs): Expose nixpkgs commit hashes This makes it possible to use the hashes in things that should, for example, be keyed on the nixpkgs version (such as cache-folders for Nixery). Change-Id: I500d13a4d96b0c28fcf6ca383d2a86515565da36 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3341 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
2021-08-12 15:15:53 +02:00
# Overlay to expose the nixpkgs commits we are using to other Nix code.
commitsOverlay = _: _: {
nixpkgsCommits = {
refactor(3p/nixpkgs): Pin nixpkgs sources via niv There's no need for us to reinvent the wheel here. niv pins are in //third_party/sources, and niv commands need to be run with `niv -s third_party/sources/sources.json` to operate on the correct file. Note that niv by default wants to put the loader file in //nix/sources.nix. This file has been moved to //third_party/sources/default.nix which makes niv throw a warning, but everything still works as intended. Change-Id: I2b2a6f8edf33c429a6d7be9d174ba1996d9a0193 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5143 Reviewed-by: grfn <grfn@gws.fyi> Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Autosubmit: tazjin <tazjin@tvl.su>
2022-01-31 12:19:21 +01:00
unstable = depot.third_party.sources.nixpkgs.rev;
stable = depot.third_party.sources.nixpkgs-stable.rev;
feat(3p/nixpkgs): Expose nixpkgs commit hashes This makes it possible to use the hashes in things that should, for example, be keyed on the nixpkgs version (such as cache-folders for Nixery). Change-Id: I500d13a4d96b0c28fcf6ca383d2a86515565da36 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3341 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
2021-08-12 15:15:53 +02:00
};
};
style: format entire depot with nixpkgs-fmt This CL can be used to compare the style of nixpkgs-fmt against other formatters (nixpkgs, alejandra). Change-Id: I87c6abff6bcb546b02ead15ad0405f81e01b6d9e Reviewed-on: https://cl.tvl.fyi/c/depot/+/4397 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: lukegb <lukegb@tvl.fyi> Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: Profpatsch <mail@profpatsch.de> Reviewed-by: kanepyork <rikingcoding@gmail.com> Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: cynthia <cynthia@tvl.fyi> Reviewed-by: edef <edef@edef.eu> Reviewed-by: eta <tvl@eta.st> Reviewed-by: grfn <grfn@gws.fyi>
2022-01-30 17:06:58 +01:00
in
fix(3p/nixpkgs): pass the same args to stable as to unstable nixpkgs Of course we can't pass the overlays without causing an infinite recursion, but they are also intended purely for unstable nixpkgs, so it doesn't matter. Change-Id: I0e1b42e37ad12872f9420cf59dff6d944b2bc5d3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5847 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
2022-06-04 01:38:25 +02:00
import nixpkgsSrc (commonNixpkgsArgs // {
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
2021-04-10 18:05:16 +02:00
overlays = [
feat(3p/nixpkgs): Expose nixpkgs commit hashes This makes it possible to use the hashes in things that should, for example, be keyed on the nixpkgs version (such as cache-folders for Nixery). Change-Id: I500d13a4d96b0c28fcf6ca383d2a86515565da36 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3341 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
2021-08-12 15:15:53 +02:00
commitsOverlay
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
2021-04-10 18:05:16 +02:00
stableOverlay
chore(3p/nixpkgs): Make externally importable This change is required for using our package set in exported josh workspaces. It has no functional impact on depot itself. Change-Id: Id48b40f067b5d53a2b7386a0ba1146a72268b923 Reviewed-on: https://cl.tvl.fyi/c/depot/+/4990 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
2022-01-18 17:28:00 +01:00
] ++ (if depotOverlays then [
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
2021-04-10 18:05:16 +02:00
depot.third_party.overlays.haskell
fix(3p/overlays): Use notmuch.el from nixpkgs ... instead of the one from the overlay, which can be out of sync. This requires the TVL overlay to be applied after the Emacs overlay. Change-Id: Idac403ea612e334c14b45759dc216699a506678f Reviewed-on: https://cl.tvl.fyi/c/depot/+/3484 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: tazjin <mail@tazj.in>
2021-09-01 12:14:37 +02:00
depot.third_party.overlays.tvl
feat(nix/buildLisp): add ecl Adds ECL as a second supported implementation, specifically a statically linked ECL. This is interesting because we can create statically linked binaries, but has a few drawbacks which doesn't make it generally useful: * Loading things is very slow: The statically linked ECL only has byte compilation available, so when we do load things or use the REPL it is significantly worse than with e. g. SBCL. * We can't load shared objects via the FFI since ECL's dffi is not available when linked statically. This means that as it stands, we can't build a statically linked //web/panettone for example. Since ECL is quite slow anyways, I think these drawbacks are worth it since the biggest reason for using ECL would be to get a statically linked binary. If we change our minds, it shouldn't be too hard to provide ecl-static and ecl-dynamic as separate implementations. ECL is LGPL and some libraries it uses as part of its runtime are as well. I've outlined in the ecl-static overlay why this should be of no concern in the context of depot even though we are statically linking. Currently everything is building except projects that are using cffi to load shared libaries which have gotten an appropriate `badImplementations` entry. To get the rest building the following changes were made: * Anywhere a dependency on UIOP is expressed as `bundled "uiop"` we now use `bundled "asdf"` for all implementations except SBCL. From my testing, SBCL seems to be the only implementation to support using `(require 'uiop)` to only load the UIOP package. Where both a dependency on ASDF and UIOP exists, we just delete the UIOP one. `(require 'asdf)` always causes UIOP to be available. * Where appropriate only conditionally compile SBCL-specific code and if any build the corresponding files for ECL. * //lisp/klatre: Use the standard condition parse-error for all implementations except SBCL in try-parse-integer. * //3p/lisp/ironclad: disable SBCL assembly optimization hack for all other platforms as it may interfere with compilation. * //3p/lisp/trivial-mimes: prevent call to asdf function by substituting it out of the source since it always errors out in ECL and we hardcode the correct path elsewhere anyways. As it stands ECL still suffers from a very weird problem which happens when compiling postmodern and moptilities: https://gitlab.com/embeddable-common-lisp/ecl/-/issues/651 Change-Id: I0285924f92ac154126b4c42145073c3fb33702ed Reviewed-on: https://cl.tvl.fyi/c/depot/+/3297 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: eta <tvl@eta.st>
2021-08-09 02:47:07 +02:00
depot.third_party.overlays.ecl-static
fix(third_party/nixpkgs): always use easy-dhall-nix tools Using the dhall executables from nixpkgs is basically always a mistake, they have to be built and are regularly broken. We don’t want to care about that, but just use the official statically built binary releases. Change-Id: Ia6d9254076ca21f55e020ae81548e80d6be8281d Reviewed-on: https://cl.tvl.fyi/c/depot/+/3041 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su> Reviewed-by: zseri <zseri.devel@ytrizja.de>
2021-04-18 10:29:49 +02:00
depot.third_party.overlays.dhall
feat(3p): add pure rust-overlay this overlay makes things like webassembly toolchains accessible in depot. it is similar to the official mozilla overlay, except fully pinned and updated daily by the upstream. Change-Id: I0eb31a43d367807d5d7e70269852c1520159cca6 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5979 Tested-by: BuildkiteCI Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: grfn <grfn@gws.fyi>
2022-07-27 12:53:48 +02:00
(import depot.third_party.sources.rust-overlay)
feat(3p/nixpkgs): add additionalOverlays optional arg This allows applying additional overlays to nixpkgs before instantiating it. Change-Id: Iee486086e13bb73e6bd20a817b1106c3cd99c935 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11407 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: raitobezarius <tvl@lahfa.xyz> Tested-by: BuildkiteCI
2024-04-13 12:43:41 +02:00
] else [ ] ++ additionalOverlays);
fix(3p/nixpkgs): pass the same args to stable as to unstable nixpkgs Of course we can't pass the overlays without causing an infinite recursion, but they are also intended purely for unstable nixpkgs, so it doesn't matter. Change-Id: I0e1b42e37ad12872f9420cf59dff6d944b2bc5d3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5847 Autosubmit: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
2022-06-04 01:38:25 +02:00
})
Reference in a new issue Copy permalink