This should avoid having two builds of Nix 2.3 in the closure of whitby
and sanduny.
Change-Id: Id4b8d34da73d3f579c97adcda44df26992290764
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8192
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
* //3p/sources: temporarily switch to nixos-unstable-small, since it
includes:
- evans update we are interested in, allowing us to drop our evans
patches.
- awscli2 update that unbreaks //users/grfn
* //3p/overlays/tvl:
- drop evans patches
- update tdlib to 1.8.11 to make tazjin's emacs happy
- drop obsolete mullvad workaround
* //users/grfn/keyboard: disable -Werror for array-bounds warnings.
Seems like a non-trivial job to resolve the warning properly,
hopefully GCC 12 still generates the same working code as GCC 11 used
to.
* //users/grfn/system/home: remove yubikey-manager-qt.
Yubico can't seem to keep that on pace with yubikey-manager. It
requires a <5 version of the latter which is incompatible with the
recently released cryptography >= 39.
* //3p/gerrit: update changed FOD hash for the fetch step
Change-Id: I590ab996247e69b0ab5059cd173840ef4ebfe939
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8133
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
Included fixes:
* //3p/overlays: tdlib override no longer needed (bump has landed upstream)
* //corp/{predlozhnik,tvixbolt}: bump wasm-bindgen to match nixpkgs
Home-manager has not been bumped as it has introduced an
incompatibility with Nix 2.3
Change-Id: I96ac3462b82c73db1ba23be03d7968f10abc9b53
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8033
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Reviewed-by: sterni <sternenseemann@systemli.org>
* //3p/gerrit: prevent python2 from crashing evaluating due to
upstream now officially considering it insecure after being EOL
for 3 years.
Overriding the meta set has the benefit that we do not need to
whitelist the package globally, forcing us to opt in everywhere
the dependency is acceptable.
* //3p/overlays: bump tdlib so tazjin's emacs can build
Change-Id: I50df82d35d56b0dd44b5f687e2dcb101db79738d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7809
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
* //third_party/overlays/tvl: remove SBCL override, as SBCL 2.2.11 fixes
the bug we were running into.
* //fun/gemma: use historical nixpkgs for everything due to ABI
incompatibilities triggered by preloaded libredirect.so wanting
GLIBC_2.34 which is not available in elm-make.
Change-Id: I465f0366413856e45ddd1e67fc9d732075e2f3c5
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7595
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
This version supports newer Cargo features that are starting to appear
in our dependencies.
Change-Id: I2eb7efdf945cacc53e8ced6ac9cb0255d08ca582
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7589
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
By re-using the nix_2_3 expression from nixpkgs we are no longer stuck
with the 2021 expression from Nix's release.nix and the resulting
derivation has a shape that other expressions in nixpkgs expect (e.g.
nix-serve), so we can actually overlay our fork into the nix_2_3
attribute. This should reduce duplication on e.g. whitby.
Since there is no nixUnstable expression in nixpkgs anymore, it expects
a Nix release tarball which we produle using the appropriate release.nix
job from the repository. Sadly there is some trickery involved in
getting it to respect localSystem, since the tarball job is not based on
the passed in systems list.
Change-Id: Ib49f298334d166327f91559a06b0a37b2488bc63
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7262
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
cl/5832 added a global system parameter to depot which allowed specifying
what `system` should be used for nixpkgs and all depot derivations
(assuming a native compilation case) which was implemented in cl/5846.
This allows instantiating derivations for a different system than
whatever builtins.currentSystem happens to be. This is useful for
debugging, allows you to schedule builds on build servers for
other platforms or build for architectures that are a subset of
the one you are running (e.g. i686-linux).
This change eliminates all remaining uses of builtins.currentSystem
which could lead to an inconsistent combination of `system` values
when passing `localSystem`.
Change-Id: I0f824f4f0afa88ef1ddd9a8cecb24bf94bacde7a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7260
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: sterni <sternenseemann@systemli.org>
If more of these issues crop up, we should consider making a patch for
our Nix fork that ignores the --experimental-features flag.
Change-Id: If146804f2c9f9375f2035985a6fd99f72b0fdcc7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7165
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
* //ops/machines/whitby: Disable grafana, since the grafana module was
changed upstream in a way that our configuration no longer works.
Since the OpenSSL security update is relatively pressing, adapting the
grafana configuration beforehand is not a hard requirement. See
https://github.com/NixOS/nixpkgs/pull/191768.
* //tools/depotfmt: keep Go at version 1.18 to forgo a reformat of the
tree.
* //nix/buildGo: keep Go at version 1.18, as 1.19 changed the CLI
interface (?) in a way that breaks buildGo.
* //3p/overlays/tvl: drop upstreamed tdlib upgrade.
* //3p/overlays/tvl: patch buf to work around breakage due to git 2.38.1
TODO items for Go are tracked in b/215.
Change-Id: Ie08fef49cf3db12e6b5225a8b992a990ddc5b642
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7141
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: tazjin <tazjin@tvl.su>
* //users/grfn/system/home/modules:
The MultiMC saga continues with:
> PolyMC has been removed from nixpkgs due to a hostile takeover
> by a rogue maintainer. The rest of the maintainers have made a
> fork which is packaged as 'prismlauncher'.
* //third_party/overlays:
Override tdlib to 1.8.7 while waiting for nixpkgs to catch up.
* //users/tazjin/finito:
Disable on CI temporarily as it has been broken by some change
in nixpkgs, now failing to compile a dependency.
Change-Id: Ide038a8d466bfdc19dc9016beb03ae4817939a2b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7066
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: grfn <grfn@gws.fyi>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Instead of waiting for nixpkgs to [update home-manager], we can track
the upstream repository directly (using master as a channel seems to
be common practice) and overlay the up to date source into our nixpkgs
instance.
For //users/tazjin/home and //users/wpcarro/nixos/marcus, we need to
set `home.stateVersion`, since the default value for this option was
removed some time this summer.
[update home-manager]: https://github.com/NixOS/nixpkgs/issues/197907
Change-Id: I8c153fb7d3b55a4040652a5d619761b640119105
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7098
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reimplement the test discovery of the lang tests script in Nix which
allows for a more flexible skipping logic that can e.g. react to the C++
Nix version used. This allows us to run the test suite against both
C++ Nix 2.3 and the latest C++ Nix version 2.11. The latter is mainly
useful, so we can implement newer Nix features and still verify them
against the C++ implementation.
Change-Id: I30c802844133b86b5e49f5e4f4fefacdb6215e0e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7042
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
* //3p/overlays/tvl: apply more or less questionable compilation fix for
electrum with protobuf >= 4.
Change-Id: Iedbc45cb96b9e5382e304f2cd5ed9fc1c13f7884
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6850
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Previously, we just fetched from the pull request branch which we should
clean up.
Change-Id: I53db11066056ca6c6ef5c2da68d9833372ae5dfe
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6793
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Upstream nixpkgs removed a lot of aliases this time, so we needed to do
the following transformations. It's a real shame that aliases only
really become discoverable easily when they are removed.
* runCommandNoCC -> runCommand
* gmailieer -> lieer
We also need to work around the fact that home-manager hasn't catched
on to this rename.
* mysql -> mariadb
* pkgconfig -> pkg-config
This also affects our Nix fork which needs to be bumped.
* prometheus_client -> prometheus-client
* rxvt_unicode -> rxvt-unicode-unwrapped
* nix-review -> nixpkgs-review
* oauth2_proxy -> oauth2-proxy
Additionally, some Go-related builders decided to drop support for
passing the sha256 hash in directly, so we need to use the generic hash
arguments.
Change-Id: I84aaa225ef18962937f8616a9ff064822f0d5dc3
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6792
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Without this escape, it is possible for Nix to produce escaped
representations which are not literal Nix values again.
This was fixed in upstream Nix in
https://github.com/NixOS/nix/pull/4012 (though only for eval, not in
the REPL) and the updated test is picked from upstream after that commit.
Because we run the C++ Nix tests against our test suite as well, this
also bumps our custom Nix 2.3 to a commit that includes the
cherry-picked fix from the PR above.
Change-Id: I478547ade65f655c606ec46f7143932064192283
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6271
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
This includes a small fix relating to string configureFlags being
deprecated, silencing a warning during eval.
Change-Id: I9528a5554dbc56d4d3f2a60edcb7de338ca6adc0
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5911
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
* //3p/nixpkgs: awscli2 has been fixed in unstable
* //3p/overlays: git now has separateDebugInfo = true; so we need to
work around a bug in srcOnly until the corresponding fix is merged.
* //3p/overlays: upgrade tdlib to match telega in depot.
Change-Id: Idb79f2844e6a156aa83451dd57a5ac624abb0dfc
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5894
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Autosubmit: sterni <sternenseemann@systemli.org>
* //3p/overlays/tvl: nixpkgs-fmt 1.3.0 contains the fix we care about,
so we can drop the override.
* //3p/nixpkgs: use awscli2 from stable nixpkgs as it's broken in
unstable at the moment. Waiting on:
https://nixpk.gs/pr-tracker.html?pr=178313
Change-Id: I9bb605d7940e53ebac80e3357799a3827a9415be
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5890
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: tazjin <tazjin@tvl.su>
It costs me money and time to use uncacheable builtin fetchers.
Change-Id: I0241cdecbc79e7135765ab4f4c49b4b2c9985d2e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5548
Tested-by: BuildkiteCI
Autosubmit: tazjin <tazjin@tvl.su>
Reviewed-by: sterni <sternenseemann@systemli.org>
* //3p/farmhash: drop, as it is unused and started to fail
* //3p/overlays/tvl:
- patch barrier to work with gcc 11
- disable outdated test suite for python38Packages.backports-zoneinfo
which still assumes zoneinfo 2020a.
* //3p/overlays/haskell: patch generic-arbitrary to avoid neg resizes
* //users/grfn/achilles: disable CI due to linking trouble (ugh).
* //users/grfn/system/home/games: Disable DFHack for dwarf fortress as
it's now failing to build
Refs: ENG-328
Change-Id: I4e1ee8fd9525d4868b82f9bad8ca5f09e7fdb9d0
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5506
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
This PR fixed issues with build user management by waiting for in-use
build users to become available instead of failing the build:
https://github.com/NixOS/nix/pull/3564
I backported it to 2.3 in the Github repository this commit points to.
Change-Id: Id22ba202c675a20203bdbcdc776c1c2ee7c0fc68
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5488
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Use nixos-unstable-small which fixes CVE-2018-25032
(out of bounds write while compressing).
* //users/grfn/xanthous:
- Supporting random-fu 0.3 requires considerable changes and patching
random-extras (https://github.com/aristidb/random-extras/pull/5).
For now we downgrade random-fu and its dependency rvar to 0.2.*,
forcing us to build xanthous with GHC 8.10.7, due to random-fu 0.2.*
not supporting that version.
Nix expressions for the downgraded packages are checked in to avoid
the potential need to compile Haskell at pipeline eval time.
- generic-arbitrary exposes a GenericArbitrary newtype now.
This means we no longer have to implement it in xanthous
downstream and patch generic-arbitrary to expose the
GArbitrary type class.
- Minor adjustments for lens 5.0:
Xanthous.Game.Memo: clear needs to use ASetter' instead of Lens'
Xanthous.Data.EntityMap: TraversableWithIndex no longer has an
itraversed function.
- Xanthous.Orphans: adjust for aeson's KeyMap, use KM.size explicitly
instead of relying on MonoTraversable's length
* //nix/buildLisp: the CCL issue has resurfaced, disabling the
implementation once again.
* //3p/arion: remove, as depot uses the nixpkgs package of it anyways.
* //users/wpcarro: accomodate GHC 9.0.1's stricter parsing of operators.
* //users/tazjin: disable rustfmt as it stopped respecting settings
* //3p/overlays: upgrade home-manager until fix for serivce generation
has landed upstream
* //users/grfn/system: remove rr override, as the pinned commit is part
of the 5.5.0 release shipped by nixpkgs.
Change-Id: If229e7317ba48498f85170b57ee9053f6997ff8a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5428
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: wpcarro <wpcarro@gmail.com>
* //3p/overlays: add workaround for broken URL in current channel.
The added assert should fire as soon as the fix lands in channels
as a reminder to clean it up.
Change-Id: I3014fbacec5f8933bb0c055a065c5ff2935b131b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5425
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
* //3p/overlays/tvl: propagate git as a native build input from magit,
because magit checks the version of git at load time ever since a
recent commit [1]. This check been escalated to a failure in a
subsequent commit [2]. The result is that anything require-ing magit
will fail with an error if git is not in PATH (or a path to git
provided) which is basically what happens in byte compilation of all
packages that depend on magit.
For now the easiest way to work around it is letting magit have its
way and provide git which easy enough for it. Upstream should probably
think about this behaviour or emacs-overlay address it somehow. For
now I've opened an issue with magit [3].
[1]: 6c4ff54a08
[2]: 8394f0d4ea
[3]: https://github.com/magit/magit/issues/4614
Change-Id: I6aaf8258c3798b76cdaa6eef066c6224e374e02e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5326
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Otherwise the skipping will be nuked by the subsequent readTree
change (cl/5186).
Change-Id: Ia1101d5073ecf892fb1881d6ee4a723c5d572c84
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5188
Tested-by: BuildkiteCI
Reviewed-by: ezemtsov <eugene.zemtsov@gmail.com>
Autosubmit: tazjin <tazjin@tvl.su>
We need 'meta.ci' to be an attribute set for new CI features.
Change-Id: I83d04e2d74e42e49fe739b049ee4ba799f6d5d86
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5007
Tested-by: BuildkiteCI
Reviewed-by: ezemtsov <eugene.zemtsov@gmail.com>
Reviewed-by: wpcarro <wpcarro@gmail.com>
Temporarily use a master commit as some interesting failures have been
fixed there (yubikey-manager and notmuch).
* //users/tazjin/nixos/camden: The acme module was moved around, so we
need to adjust the disabled module path.
Change-Id: I21c6a1963ffe4205f3577f531ce10b778a82e2ff
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4865
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Note that the login.tvl.fyi WWW configuration is still kind of hanging
around until we've settled where Keycloak lives.
Change-Id: Iaca4e394a7371cafa3716ca66ef09c4eca5b1520
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4626
Autosubmit: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
Reviewed-by: lukegb <lukegb@tvl.fyi>
* //third_party/overlays/tvl: drop override for treefmt, as the channel
now contains treefmt 0.3.0
Change-Id: I84e52f5dccd22eb4318f7f79fc4c2f4751c6bdc1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4519
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
I have an issue where my AMD laptop occasionally does not wake from
suspend. The only thing ever indicated in the logs is related to the
patched line here:
xss-lock[2409537]: saver_blank: line 19: exec: sleep: not found
This stems from xsecurelock calling a script that in turn calls sleep,
in a loop.
I don't know if this causes my unsuspend problem because this also
happens sometimes without anything failing, but it's the best lead
I've got for now. Will run with this fix for a while and see if
anything changes in the stability of suspend.
Change-Id: Ie8190433c2125cbeddb909013be9dfa00141d5c6
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4403
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Right now the only included formatter is gofmt, but we will extend
this over time.
The version of treefmt is bumped to 0.3.0 (which supports custom
config files) until this lands in nixpkgs.
Change-Id: I1e1aafd05ec7427c616f90c90490c528ecb2615c
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4399
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
this is now upstreamed in nixpkgs
Change-Id: I6131edd326fa347f546df30b865cbc2327ae2577
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4398
Reviewed-by: tazjin <mail@tazj.in>
Autosubmit: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
This is a bit silly, I assumed hte previous one would concatenate the
path before importing it into the store - but it doesn't.
Change-Id: Iebb4c9cb432751448deeac07d6b7ad8225711d30
Where I'm using stable in the non-versioning sense of the word.
https: //github.com/edolstra/nix-serve/issues/28
Change-Id: I87869a62bc0f3b289950a79aabd4d2041390bb09
There is too much breakage with the newer version than I have time to
deal with right now (and I think the same goes for the others).
Change-Id: I54045d1ef16d0215e516986477d734c54e48f1f8
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3904
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: lukegb <lukegb@tvl.fyi>
nixpkgs has upgraded to SBCL 2.1.9 in the meantime, so dropping the
override will ensure that we keep pace with upstream going forward,
instead of ending up with an out-of-date SBCL.
Change-Id: I5e04532d5ef653de4ec083deee9c9a72522daaf1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/3881
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
