diff --git a/flake.lock b/flake.lock index 4cf97189..ff234191 100644 --- a/flake.lock +++ b/flake.lock @@ -286,11 +286,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1689321039, - "narHash": "sha256-BSYnmZBz6N6Xq1tmwkUtrLxmP1r4jBP7TYu2if5aE1A=", + "lastModified": 1689522023, + "narHash": "sha256-VyiFfeST4qopj7Vb1VhAMwB8IjkZVxE+XKl4tpKUw3o=", "owner": "CHN-beta", "repo": "nixpkgs", - "rev": "06f6e1dafa8ef5fa3728e8733526a3c96e83b3f1", + "rev": "b043f18e6ce64ef788928142ce74ae43df446f8b", "type": "github" }, "original": { diff --git a/modules/packages/hpc.nix b/modules/packages/hpc.nix index a1f1501b..b7ac4e1f 100644 --- a/modules/packages/hpc.nix +++ b/modules/packages/hpc.nix @@ -23,20 +23,21 @@ inputs: # config.programs.ccache.packageNames = [ "webkitgtk" "libreoffice" "tensorflow" "linux" "chromium" ]; config.nixpkgs.overlays = [(final: prev: { - libreoffice-qt = prev.libreoffice-qt.override { unwrapped = prev.libreoffice.unwrapped.override - { stdenv = final.ccacheStdenv.override { stdenv = prev.libreoffice.unwrapped.stdenv; }; }; }; + libreoffice-qt = prev.libreoffice-qt.override (prev: { unwrapped = prev.unwrapped.override + (prev: { stdenv = final.ccacheStdenv.override { stdenv = prev.stdenv; }; }); }); python3 = prev.python3.override { packageOverrides = python-final: python-prev: { tensorflow = python-prev.tensorflow.override { stdenv = final.ccacheStdenv.override { stdenv = python-prev.tensorflow.stdenv; }; }; };}; - webkitgtk = prev.webkitgtk.override { stdenv = final.ccacheStdenv.override { stdenv = prev.webkitgtk.stdenv; }; }; + webkitgtk = prev.webkitgtk.override (prev: + { stdenv = final.ccacheStdenv.override { stdenv = prev.stdenv; }; enableUnifiedBuilds = false; }); wxGTK31 = prev.wxGTK31.override { stdenv = final.ccacheStdenv.override { stdenv = prev.wxGTK31.stdenv; }; }; wxGTK32 = prev.wxGTK32.override { stdenv = final.ccacheStdenv.override { stdenv = prev.wxGTK32.stdenv; }; }; - # python3Packages.tensorflow = prev.python3Packages.tensorflow.override - # { stdenv = final.ccacheStdenv.override { stdenv = prev.python3Packages.tensorflow.stdenv; }; }; - # python3Packages.tensorflow = prev.python3Packages.tensorflow.override - # { stdenv = final.ccacheStdenv.override { stdenv = prev.python3Packages.tensorflow.stdenv; }; }; + # firefox-unwrapped = prev.firefox-unwrapped.override + # { stdenv = final.ccacheStdenv.override { stdenv = prev.firefox-unwrapped.stdenv; }; }; + # chromium = prev.chromium.override + # { stdenv = final.ccacheStdenv.override { stdenv = prev.chromium.stdenv; }; }; # linuxPackages_xanmod_latest = prev.linuxPackages_xanmod_latest.override # { # kernel = prev.linuxPackages_xanmod_latest.kernel.override