mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p): Bump nixpkgs to nixos-unstable from 2020-11-21

Browse source 
Included fixes for random breakage:

* 3p/awscli: pick from the stable channel; it is broken on unstable
* 3p/googletest: bumped version & removed patches that nixpkgs applies
* 3p/lisp/cffi: bumped library version for SBCL compat
* 3p/nix: fix libsystemd attribute
* 3p/nix: reformatted (clang-format handling of ternaries changed)
* glittershark/home: Use home-manager from nixkpgs
* glittershark/kernel: bumped linux-ck patch hash
* glittershark/kernel: removed "patch patch"
* multi/whitby: Use home-manager from nixpkgs
* tazjin/frog: drop Sourcetrail (it doesn't build currently)

Note that in addition to these changes, some previous CLs updated the
versions of git and cgit which was necessary for this channel bump,
but which could not be done in the same commit due to the nature of
the subtree merges.

Change-Id: If2563e8a68e2750c4b913a976ff7b93b42e8b7f3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2110
Tested-by: BuildkiteCI
Reviewed-by: multi <depot@in-addr.xyz>
Reviewed-by: glittershark <grfn@gws.fyi>
This commit is contained in:
Vincent Ambo 2020-11-21 18:22:54 +01:00 committed by tazjin
parent e908882610
commit 5a00e58904
17 changed files with 71 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
third_party/default.nix vendored
View file

@ -5,11 +5,11 @@
{ ... }:
let
# Tracking nixos-unstable as of 2020-08-16.
nixpkgsCommit = "16fc531784ac226fb268cc59ad573d2746c109c1";
# Tracking nixos-unstable as of 2020-11-21.
nixpkgsCommit = "a322b32e9d74fb476944ff6cfb55833dc69cfaaa";
nixpkgsSrc = fetchTarball {
url = "https://github.com/NixOS/nixpkgs-channels/archive/${nixpkgsCommit}.tar.gz";
sha256 = "0qw1jpdfih9y0dycslapzfp8bl4z7vfg9c7qz176wghwybm4sx0a";
url = "https://github.com/NixOS/nixpkgs/archive/${nixpkgsCommit}.tar.gz";
sha256 = "1r0mkiqxija75spnyksmh8x5j4smnrxv5f7768s81gsl570kls0l";
};
nixpkgs = import nixpkgsSrc {
config.allowUnfree = true;
@ -38,7 +38,6 @@ let
autoreconfHook
avrdude
avrlibc
awscli
bashInteractive
bat
buildBazelPackage
@ -159,6 +158,12 @@ let
zlib
zstd;
# Inherit packages from the stable channel for things that are
# broken on unstable
inherit (stableNixpkgs)
awscli # TODO(grfn): Move back to unstable once it is fixed
;
# Required by //third_party/nix
inherit (nixpkgs)
aws-sdk-cpp

5
third_party/gtest/default.nix vendored
View file

@ -6,7 +6,8 @@
src = pkgs.fetchFromGitHub {
owner = "google";
repo = "googletest";
rev = "a781fe29bcf73003559a3583167fe3d647518464";
sha256 = "0zny8kgbkslazzsnskygj3pkcj7l13xhgcwjyxswxymxq8m41kgy";
rev = "9dce5e5d878176dc0054ef381f5c6e705f43ef99";
sha256 = "05xi61j7j251dzkgk9965lqpbacsy44iblzql941kw9d4nk0q6jl";
};
patches = [];
})

2
third_party/lisp/cffi.nix vendored
View file

@ -4,7 +4,7 @@
with depot.nix;
let src = builtins.fetchGit {
url = "https://github.com/cffi/cffi.git";
rev = "5e838bf46d0089c43ebd3ea014a207c403e29c61";
rev = "a49ff36a95cb62ffa6cb069d98378d665769926b";
};
in buildLisp.library {
name = "cffi";

2
third_party/nix/default.nix vendored
View file

@ -61,7 +61,7 @@ in lib.fix (self: pkgs.llvmPackages.libcxxStdenv.mkDerivation {
grpc
libseccomp
libsodium
systemd.lib.dev
systemd.dev
openssl
protobuf
sqlite

16
third_party/nix/src/libexpr/primops.cc vendored
View file

@ -964,12 +964,10 @@ static void prim_readDir(EvalState& state, const Pos& pos, Value** args,
if (ent.type == DT_UNKNOWN) {
ent.type = getFileType(path + "/" + ent.name);
}
mkStringNoCopy(*ent_val,
ent.type == DT_REG
? "regular"
: ent.type == DT_DIR
? "directory"
: ent.type == DT_LNK ? "symlink" : "unknown");
mkStringNoCopy(*ent_val, ent.type == DT_REG ? "regular"
: ent.type == DT_DIR ? "directory"
: ent.type == DT_LNK ? "symlink"
: "unknown");
}
}
@ -1055,10 +1053,8 @@ static void addPath(EvalState& state, const Pos& pos, const std::string& name,
state.callFunction(*filterFun, arg1, fun2, noPos);
Value arg2;
mkString(arg2, S_ISREG(st.st_mode)
? "regular"
: S_ISDIR(st.st_mode)
? "directory"
mkString(arg2, S_ISREG(st.st_mode) ? "regular"
: S_ISDIR(st.st_mode) ? "directory"
: S_ISLNK(st.st_mode)
? "symlink"
: "unknown" /* not supported, will fail! */);

6
third_party/nix/src/libstore/binary-cache-store.cc vendored
View file

@ -215,9 +215,9 @@ void BinaryCacheStore::addToStore(const ValidPathInfo& info,
/* Atomically write the NAR file. */
narInfo->url = "nar/" + narInfo->fileHash.to_string(Base32, false) + ".nar" +
(compression == "xz" ? ".xz"
: compression == "bzip2"
? ".bz2"
: compression == "br" ? ".br" : "");
: compression == "bzip2" ? ".bz2"
: compression == "br" ? ".br"
: "");
if ((repair != 0u) || !fileExists(narInfo->url)) {
stats.narWrite++;
upsertFile(narInfo->url, *narCompressed, "application/x-nix-nar");

9
third_party/nix/src/libstore/build.cc vendored
View file

@ -1462,10 +1462,8 @@ void DerivationGoal::tryToBuild() {
bool buildLocally = buildMode != bmNormal || parsedDrv->willBuildLocally();
auto started = [&]() {
auto msg = fmt(buildMode == bmRepair
? "repairing outputs of '%s'"
: buildMode == bmCheck
? "checking outputs of '%s'"
auto msg = fmt(buildMode == bmRepair ? "repairing outputs of '%s'"
: buildMode == bmCheck ? "checking outputs of '%s'"
: nrRounds > 1 ? "building '%s' (round %d/%d)"
: "building '%s'",
drvPath, curRound, nrRounds);
@ -1748,8 +1746,7 @@ void DerivationGoal::buildDone() {
else {
st = dynamic_cast<NotDeterministic*>(&e) != nullptr
? BuildResult::NotDeterministic
: statusOk(status)
? BuildResult::OutputRejected
: statusOk(status) ? BuildResult::OutputRejected
: fixedOutput || diskFull ? BuildResult::TransientFailure
: BuildResult::PermanentFailure;
}

14
third_party/nix/src/libstore/download.cc vendored
View file

@ -437,15 +437,15 @@ struct CurlDownloader : public Downloader {
request.verb(), request.uri))
: httpStatus != 0
? DownloadError(
err, fmt("unable to %s '%s': HTTP error %d",
request.verb(), request.uri, httpStatus) +
(code == CURLE_OK
? ""
err,
fmt("unable to %s '%s': HTTP error %d", request.verb(),
request.uri, httpStatus) +
(code == CURLE_OK ? ""
: fmt(" (curl error: %s)",
curl_easy_strerror(code))))
: DownloadError(err, fmt("unable to %s '%s': %s (%d)",
request.verb(), request.uri,
curl_easy_strerror(code), code));
: DownloadError(
err, fmt("unable to %s '%s': %s (%d)", request.verb(),
request.uri, curl_easy_strerror(code), code));
/* If this is a transient error, then maybe retry the
download after a while. If we're writing to a

6
third_party/nix/src/libstore/local-fs-store.cc vendored
View file

@ -38,9 +38,9 @@ struct LocalStoreAccessor : public FSAccessor {
throw Error(format("file '%1%' has unsupported type") % path);
}
return {S_ISREG(st.st_mode)
? Type::tRegular
: S_ISLNK(st.st_mode) ? Type::tSymlink : Type::tDirectory,
return {S_ISREG(st.st_mode) ? Type::tRegular
: S_ISLNK(st.st_mode) ? Type::tSymlink
: Type::tDirectory,
S_ISREG(st.st_mode) ? static_cast<uint64_t>(st.st_size) : 0,
S_ISREG(st.st_mode) && ((st.st_mode & S_IXUSR) != 0u)};
}

9
third_party/nix/src/nix-env/nix-env.cc vendored
View file

@ -260,12 +260,9 @@ static DrvInfos filterBySelector(EvalState& state, const DrvInfos& allElems,
auto k = newest.find(drvName.name);
if (k != newest.end()) {
d = j.first.querySystem() == k->second.first.querySystem()
? 0
: j.first.querySystem() == settings.thisSystem
? 1
: k->second.first.querySystem() == settings.thisSystem
? -1
d = j.first.querySystem() == k->second.first.querySystem() ? 0
: j.first.querySystem() == settings.thisSystem ? 1
: k->second.first.querySystem() == settings.thisSystem ? -1
: 0;
if (d == 0) {
d = comparePriorities(state, j.first, k->second.first);

16
third_party/nix/src/nix/hash.cc vendored
View file

@ -58,18 +58,18 @@ struct CmdToBase final : Command {
}
std::string name() override {
return base == Base16
? "to-base16"
return base == Base16 ? "to-base16"
: base == Base32 ? "to-base32"
: base == Base64 ? "to-base64" : "to-sri";
: base == Base64 ? "to-base64"
: "to-sri";
}
std::string description() override {
return fmt(
"convert a hash to %s representation",
base == Base16
? "base-16"
: base == Base32 ? "base-32" : base == Base64 ? "base-64" : "SRI");
return fmt("convert a hash to %s representation",
base == Base16 ? "base-16"
: base == Base32 ? "base-32"
: base == Base64 ? "base-64"
: "SRI");
}
void run() override {

3
third_party/nix/src/nix/ls.cc vendored
View file

@ -31,8 +31,7 @@ struct MixLs : virtual Args, MixJSON {
auto st = accessor->stat(curPath);
std::string tp = st.type == FSAccessor::Type::tRegular
? (st.isExecutable ? "-r-xr-xr-x" : "-r--r--r--")
: st.type == FSAccessor::Type::tSymlink
? "lrwxrwxrwx"
: st.type == FSAccessor::Type::tSymlink ? "lrwxrwxrwx"
: "dr-xr-xr-x";
std::cout << (format("%s %20d %s") % tp % st.fileSize % relPath);
if (st.type == FSAccessor::Type::tSymlink) {

7
users/glittershark/system/home/default.nix
View file

@ -5,12 +5,7 @@ with lib;
rec {
nixpkgs = import pkgs.nixpkgsSrc {};
home-manager = (fetchTarball {
url = "https://github.com/rycee/home-manager/archive/152769aed96d4d6f005ab40daf03ec4f5102c763.tar.gz";
sha256 = "10svwspmsf46rijzsh0h9nmz1mq2998wcml8yp36mwksgi8695pc";
});
home = confPath: (import "${home-manager}/modules" {
home = confPath: (import "${nixpkgs.home-manager.src}/modules" {
pkgs = nixpkgs;
configuration = { config, lib, ... }: {
imports = [confPath];

9
users/glittershark/system/system/modules/kernel.nix
View file

@ -11,20 +11,13 @@ let
name = "linux-ck-patch-${mm}-ck1.xz";
# example: http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz
url = "http://ck.kolivas.org/patches/${mj}.0/${mm}/${mm}-ck1/patch-${mm}-ck1.xz";
sha256 = "01jyg9x2ligr0gjic8lg4f7hw3isz94kqwdbzdk9n8nghklh38p4";
sha256 = "0cv1ayj9akl83q2whabj8v3qygkkfwvzcjqx539sw6j3r9qhrs64";
};
unpackPhase = ''
${pkgs.xz}/bin/unxz -kfdc $src > patch-${mm}-ck1
'';
patches = [
(builtins.fetchurl {
url = "https://aur.archlinux.org/cgit/aur.git/plain/fix_ck1_for_5.7.14.patch\?h\=linux-ck";
sha256 = "0l8f2kph4f2lvcjn0s2fg6n9xa6f4khjz7rqc4zxk58r7fh4s5v4";
})
];
installPhase = ''
cp patch-${mm}-ck1 $out
'';

10
users/multi/whitby/home-manager.nix
View file

@ -1,11 +1,6 @@
{ config ? throw "not a readTree target", ... }:
let
homeManagerSrc = (fetchTarball {
url = "https://github.com/nix-community/home-manager/archive/9b1b55ba0264a55add4b7b4e022bdc2832b531f6.tar.gz";
sha256 = "1lvnprvqfsjhi811ldagvfy4ilysxdj4arzi0f0gskll6czwjdr7";
});
depot = import <depot> {};
pkgs = import <nixpkgs> {};
@ -14,7 +9,10 @@ in
{
programs = {
home-manager = { enable = true; path = homeManagerSrc; };
home-manager = {
enable = true;
path = pkgs.home-manager.src;
};
bash = {
enable = true;

1
users/tazjin/nixos/frog/default.nix
View file

@ -280,7 +280,6 @@ in depot.lib.fix(self: {
rustup
screen
scrot
sourcetrail
spotify
steam
tokei