Commit graph

16 commits

Author SHA1 Message Date
Vincent Ambo
473604f567 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 21:18:55 +00:00
sterni
3a64d087f2 chore(3p): use haskell-language-server from nixpkgs
Upstream haskellPackages has a newer haskell-language-server than we had
and it is always in sync with the default GHC version of that package
set which we incidentally use to build all haskell derivations in depot.

I hope this will not cause us more trouble in the future, but I've
gotten the impression that maralorn makes an effort to prevent
haskell-language-server from being broken in haskellPackages, so ideally
we'll never have to worry about hls again. If we do have to, we may need
to switch to easy-hls-nix.

Note that I haven't had the time yet to verify that the shells actually
work since it's kinda late now and the rebuilds are many.

Change-Id: I74c192d57355904cfa45bb76d70346792ba05af5
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2662
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
2021-03-26 10:20:25 +00:00
sterni
a040c55d35 chore(users/gs/owothia): remove unnecessary overrides, simplify
* chatter and its dependencies have been fixed in upstream
  haskellPackages, so we can get rid of the packageSet.nix expression:
  https://github.com/NixOS/nixpkgs/pull/116803

* Merged default.nix and pkg.nix into one expression and use
  callCabal2nix instead of emulating it with nested imports.

* Minor refactor of shell.nix and remove haskell-language-server
  until we've redone it or replaced it with the upstream one as now the
  GHC versions are out of sync: hls is built with 8.8.4, but
  haskellPackages uses 8.10.4

Change-Id: Ie75eaa93ba8bd79e749e2442fb28c855b8a15a1d
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2661
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
2021-03-26 01:46:05 +00:00
sterni
3a49e4f4bf chore(3p): bump NixOS channels to 2021-03-25
OpenSSL released an update which fixes two severity high security
issues:

* https://mta.openssl.org/pipermail/openssl-announce/2021-March/000197.html
* https://mta.openssl.org/pipermail/openssl-announce/2021-March/000198.html

Update to the nixpkgs (currently still master) commits updating OpenSSL.

Other changes:

* Use GHC 8.8.4 for haskell-language-server as GHC 8.8.3 got removed
  from nixpkgs last friday.

Change-Id: Ic1b2f49284e78193a4330da4bb4b718a797f5ab1
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2653
Tested-by: BuildkiteCI
Reviewed-by: tazjin <mail@tazj.in>
Reviewed-by: lukegb <lukegb@tvl.fyi>
Reviewed-by: glittershark <grfn@gws.fyi>
2021-03-26 01:43:32 +00:00
sterni
531fc2b80b chore(3p/haskell_overlay): remove obsolete overrides
I actually wanted to check up on regex-tdfa-text in owothia, but
realized it was actually in a dependency. When porting the patch for
chatter to nixpkgs, I wondered if we could get rid of other overrides
or if we need to fix anything else in upstream.

* aeson, attoparsec, cassava, psqueues, hedgehog: jailbreaks are
  no longer necessary

* fgl, fgl-arbitrary: upstream has the versions pinned by now

* hgeometry, hgeometry-combinatoral: upstream has moved past the
  pinned versions, but we don't need to keep them downgraded as
  xanthous's build is not broken by them.

* random-source: the upstream compiler shouldn't crash anymore,
  additionally upstream has the version pinned here currently

* semialign: upstream also has 1.1.0.1 by now

* splitmix: splitmix has been fixed upstream and haskellPackages
  has moved past 0.1

* hspec-core: test suite passes or upstream has disabled it as well

* QuickCheck: upstream advanced to the same version

* vinyl: upstream moved past the pinned version, causes no build failures

* comonad-extras: has been fixed upstream

Change-Id: I34eff81ceaac005f2ad90dd9c1d3e623b8da91c0
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2606
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
2021-03-19 16:49:44 +00:00
Griffin Smith
a57f1469ef fix(owothia): Use correct articles
I'm an owothia, owo

Change-Id: I59d523268851e792067e10d440147d12409c60f5
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1833
Tested-by: BuildkiteCI
Reviewed-by: eta <eta@theta.eu.org>
2020-08-24 15:11:20 +00:00
Vincent Ambo
d42c3dd72f chore(3p): Bump nixpkgs channels
Bumps both nixos-unstable and nixos-20.03 to today's versions, as per
status.nixos.org

Contains minor fixes to things that broke because of the update:

* tazjin/frog: hardware.u2f is a deprecated setting
* glittershark/system: modSha256 in Go modules is now vendorSha256
* glittershark/owothia: removed version constraint on relude

Change-Id: Ib3e9612b1b06ed547b90e4f8b0ffe5ed7fe0a5c4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1642
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
2020-08-06 00:15:33 +00:00
Profpatsch
0d8bb25bae feat(owothia): further owo nouns
Change-Id: I11876d617b6efed443b35b8193cc7a42cf0f0201
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1600
Reviewed-by: Profpatsch <mail@profpatsch.de>
2020-08-03 16:47:45 +00:00
Griffin Smith
d671195c3b feat(owothia): I'm a noun, owo
Change-Id: I793c2c011a12c82d45fab6f72a9578ee07878762
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1501
Tested-by: BuildkiteCI
Reviewed-by: eta <eta@theta.eu.org>
2020-07-31 15:22:09 +00:00
Griffin Smith
8138621b11 fix(owothia): Add " to stopword list
how *this* got classified as a verb I will never understand.

Change-Id: I1ae0c5092b0f4371fb191e19f576dac89fb941ab
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1250
Tested-by: BuildkiteCI
Reviewed-by: isomer <isomer@tvl.fyi>
2020-07-17 20:39:22 +00:00
eta
209f8ef79f feat(owothia): make more things configurable, better
- You can now configure server, port, password, nickserv password, and
  nick.
- eta doing haskell: https://theta.eu.org/lx/selif/8pu34rll.jpg
  - (props to grfn for basically writing half this CL)

Change-Id: I128ae01f5879df730a6404402ef16bf1f3429f98
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1164
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
2020-07-14 17:58:50 +00:00
Griffin Smith
2832ea43ea feat(owothia): Add realname
Change-Id: Ica75f7ec2f849431ebc5c4d1c299f61969bee03e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1135
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
2020-07-13 19:13:26 +00:00
Griffin Smith
6c98805500 feat(owothia): Remove stopwords
Remove a (currently rather brief) list of stopwords from the verbs
considered for owo'ing. The specific case I wanted to remove here is the
verb "'s" from a contraction (there have been a fair number of "'s me
owo") but I've added a few more just for good measure.

Change-Id: I53994663db1f8767ec5dc3ddc58dd35fb6cd6d70
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1134
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
2020-07-13 19:13:26 +00:00
Griffin Smith
4e52e2bd3d chore(owothia): ignore build directory
Change-Id: I5381a1a90323e7d15e47963b99d8c3ec65a53673
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1133
Reviewed-by: glittershark <grfn@gws.fyi>
Tested-by: BuildkiteCI
2020-07-13 17:51:16 +00:00
Griffin Smith
68df913b8a feat(owothia): Make chance configurable
Make the chance of an owo configurable via an _OWO_CHANCE env var.

Change-Id: Ia4d0e426b2825c6a7becc073ff99ae8037637032
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1132
Tested-by: BuildkiteCI
Reviewed-by: glittershark <grfn@gws.fyi>
2020-07-13 17:42:48 +00:00
Griffin Smith
2eb90cbca1 feat(owothia): Add owothia
Add owothia, an irc bot that picks a random verb out of a random subset
of messages and replies with a message of the form "<verb> me owo".

it's incredibly messy, full of warnings, includes a *number* of harcoded
things, but also is hilarious.

Change-Id: I73cacd533bbbff9e753d1e542308da25247a7034
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1063
Tested-by: BuildkiteCI
Reviewed-by: lukegb <lukegb@tvl.fyi>
2020-07-13 17:31:32 +00:00