diff options
| author | Ben Sima <ben@bsima.me> | 2024-12-31 13:48:05 -0500 |
|---|---|---|
| committer | Ben Sima <ben@bsima.me> | 2024-12-31 13:48:05 -0500 |
| commit | 3790d334c994db7a0e1eac9c130c2b1316c78c35 (patch) | |
| tree | df8bb9ecc6f1273864f8fc88082906526e0ab324 /Omni/Bild/CcacheWrapper.nix | |
| parent | 27904066fd204a2b844c27132e86f83acf217eed (diff) | |
Upgrade nixos 24.05 -> 24.11, ghc 9.4.8 -> 9.6.6
It's good to update, I think nixos 24.05 was deprecated anyway. The iPython
dontCheck is because there was a test timeout; I don't even know why iPython is
being pulled in but whatever.
Diffstat (limited to 'Omni/Bild/CcacheWrapper.nix')
| -rw-r--r-- | Omni/Bild/CcacheWrapper.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Omni/Bild/CcacheWrapper.nix b/Omni/Bild/CcacheWrapper.nix index 78e5a08..644c2f6 100644 --- a/Omni/Bild/CcacheWrapper.nix +++ b/Omni/Bild/CcacheWrapper.nix @@ -6,6 +6,7 @@ let ccacheDir = "/var/cache/ccache"; # https://github.com/NixOS/nixpkgs/pull/216363#issuecomment-1430356886 + # deadnix: skip fixwebkit = pkg: self.useCcacheStdenv (pkg.overrideAttrs (attrs: rec { preConfigure = attrs.preConfigure + '' @@ -49,9 +50,9 @@ in { nvcc = self.useCcacheStdenv super.nvcc; onnx = self.useCcacheStdenv super.onnx; onnxruntime = self.useCcacheStdenv super.onnxruntime; - webkit = fixwebkit super.webkit; - webkitgtk = fixwebkit super.webkitgtk; - webkitgtk_4_1 = fixwebkit super.webkitgtk_4_1; - webkitgtk_5_0 = fixwebkit super.webkitgtk_5_0; - webkitgtk_6_0 = fixwebkit super.webkitgtk_6_0; + # webkit = fixwebkit super.webkit; + # webkitgtk = fixwebkit super.webkitgtk; + # webkitgtk_4_1 = fixwebkit super.webkitgtk_4_1; + # webkitgtk_5_0 = fixwebkit super.webkitgtk_5_0; + # webkitgtk_6_0 = fixwebkit super.webkitgtk_6_0; } |