maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(3p/nixpkgs): Pin nixpkgs sources via niv

Browse source 
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>
This commit is contained in:
Vincent Ambo 2022-01-31 14:19:21 +03:00 • committed by tazjin
parent 8cfd97c9b5
commit 586f530ec4
3 changed files with 179 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

35
third_party/nixpkgs/default.nix vendored
View file

@ -1,6 +1,8 @@
# This file imports the pinned nixpkgs sets and applies relevant
# modifications, such as our overlays.
#
# The actual source pinning happens via niv in //third_party/sources
#
# 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
@ -9,40 +11,16 @@
{ depot ? { }, externalArgs ? { }, depotOverlays ? true, ... }:
let
# This provides the sources of nixpkgs. We track both
# nixos-unstable, and the current stable channel of the latest NixOS
# release.
# Tracking nixos-unstable as of 2022-01-27.
unstableHashes = {
commit = "945ec499041db73043f745fad3b2a3a01e826081";
sha256 = "1ixv310sjw0r5vda4yfwp3snyha2i9h7aqygd43cyvdk2qsjk8pq";
};
# Tracking nixos-21.11 as of 2022-01-26.
stableHashes = {
commit = "b3d86c56c786ad9530f1400adbd4dfac3c42877b";
sha256 = "09nslcjdgwwb6j9alxrsnq1wvhifq1nmzl2w02l305j0wsmgdial";
};
# 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.
nixpkgsSrc = externalArgs.nixpkgsBisectPath or (fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/${unstableHashes.commit}.tar.gz";
sha256 = unstableHashes.sha256;
});
stableNixpkgsSrc = fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/${stableHashes.commit}.tar.gz";
sha256 = stableHashes.sha256;
};
nixpkgsSrc = externalArgs.nixpkgsBisectPath or depot.third_party.sources.nixpkgs;
# Stable package set is imported, but not exposed, to overlay
# required packages into the unstable set.
stableNixpkgs = import stableNixpkgsSrc { };
stableNixpkgs = import depot.third_party.sources.nixpkgs-stable {};
# Overlay for packages that should come from the stable channel
# instead (e.g. because something is broken in unstable).
@ -53,11 +31,10 @@ let
# Overlay to expose the nixpkgs commits we are using to other Nix code.
commitsOverlay = _: _: {
nixpkgsCommits = {
unstable = unstableHashes.commit;
stable = stableHashes.commit;
unstable = depot.third_party.sources.nixpkgs.rev;
stable = depot.third_party.sources.nixpkgs-stable.rev;
};
};
in
import nixpkgsSrc {
# allow users to inject their config into builds (e.g. to test CA derivations)