about summary refs log tree commit diff
path: root/third_party/nixpkgs
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2023-04-16T13·16+0200
committersterni <sternenseemann@systemli.org>2023-04-26T15·40+0000
commit6ce45cbaea127c03c63aa91f7cfc37b42b2b9bdc (patch)
tree0d78f2189dda2f3dfac3a27c5ae53dee436843b6 /third_party/nixpkgs
parent6daf91c9cd52b729483aca6e1eaafc50fd796e7f (diff)
chore(3p/sources): Bump channels & overlays r/6112
* //3p/sources: Note that emacs-overlay is not updated for now, as
  changes in emacs HEAD break //users/sterni/emacs.

* //3p/gerrit_plugins/code-owners: deps hash changed once again
  or was no longer in the Nix store.

  Unfortunately, building the deps derivations from scratch for gerrit
  and the gerrit plugins no longer works due to a nixpkgs regression:
  Due to a (operator precedence) mistake in the way the deps
  derivation's installPhase is computed, it would append extra code to
  the installPhase provided by us, causing a bash syntax error.

  I have proposed a fix for this
  upstream (<https://github.com/NixOS/nixpkgs/pull/228305>). Adding a
  workaround in the repo would be possible, but a bit annoying. Since
  the derivations are fixed output anyways, I've opted to build the
  missing deps derivation (for code-owners) locally using the fixed
  nixpkgs, updated the sha256 and copied the result into whitby's Nix
  store. Hopefully by the next time we'll be rebuilding the deps
  derivations again the fix will have propagated into the NixOS unstable
  channel.

* //users/grfn/system/system:roswellSystem: Use mysql80 from stable.
  See also https://github.com/NixOS/nixpkgs/issues/226673.

Change-Id: I9b9d57f589be4cdc3fd4f39729c170a25a655b74
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8483
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Diffstat (limited to 'third_party/nixpkgs')
-rw-r--r--third_party/nixpkgs/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index dcca6db7ea..daae0ca8aa 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -54,6 +54,10 @@ let
 
       # binaryen does not build on unstable as of 2022-08-22
       binaryen
+
+      # mysql80 is broken as of 2023-04-26, but should work after the next
+      # staging-next cycle: https://github.com/NixOS/nixpkgs/issues/226673
+      mysql80
       ;
   };