From bf02a7ee4c4ad63ed5a4159ff47f4791246da092 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 31 Jan 2026 00:15:33 -0800 Subject: [PATCH] Add codex 0.92.0 PR patch and fix deprecation warnings - Add nixpkgs PR 483705 to bump codex from 0.89.0 to 0.92.0 - Disable overlay version overrides in favor of PR patches - Replace deprecated pkgs.system with pkgs.stdenv.hostPlatform.system - Replace deprecated xfce.thunar with thunar Co-Authored-By: Claude Opus 4.5 --- nixos/code.nix | 2 +- nixos/desktop.nix | 4 ++-- nixos/electron.nix | 2 +- nixos/flake.nix | 4 ++++ nixos/gitea-runner.nix | 2 +- nixos/hyprland.nix | 4 ++-- nixos/overlay.nix | 6 +++--- nixos/secrets.nix | 2 +- nixos/xmonad.nix | 4 ++-- 9 files changed, 17 insertions(+), 13 deletions(-) diff --git a/nixos/code.nix b/nixos/code.nix index b144488a..191ee08b 100644 --- a/nixos/code.nix +++ b/nixos/code.nix @@ -78,7 +78,7 @@ makeEnable config "myModules.code" true { nixd nil alejandra - ] ++ (if pkgs.system == "x86_64-linux" then with pkgs; [ + ] ++ (if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then with pkgs; [ # purescript purescript # Broken diff --git a/nixos/desktop.nix b/nixos/desktop.nix index 0d1fb363..856ce732 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -87,7 +87,7 @@ makeEnable config "myModules.desktop" true { # TODO: reenable # transmission_3-gtk vlc - xfce.thunar + thunar # Audio picard @@ -102,7 +102,7 @@ makeEnable config "myModules.desktop" true { # Visualization graphviz nodePackages.mermaid-cli - ] ++ (if pkgs.system == "x86_64-linux" then with pkgs; [ + ] ++ (if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then with pkgs; [ google-chrome pommed_light slack diff --git a/nixos/electron.nix b/nixos/electron.nix index 6da21472..58a3ee0a 100644 --- a/nixos/electron.nix +++ b/nixos/electron.nix @@ -8,7 +8,7 @@ makeEnable config "myModules.electron" false { # keybase-gui zoom-us ]; - home-manager.users = forEachUser (if pkgs.system == "x86_64-linux" then { + home-manager.users = forEachUser (if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then { # systemd.user.services.bitwarden = { # Unit = { # Description = "Bitwarden"; diff --git a/nixos/flake.nix b/nixos/flake.nix index a756c675..66fa87ab 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -153,6 +153,10 @@ pr = 434160; # git-sync-rs package hash = "sha256-0j0IcyHd7rE+MXc0SHu8UixW7Jbtzu1NnzSjEVeZmTA="; } + { + pr = 483705; # codex: 0.89.0 -> 0.92.0 + hash = "sha256-tkZP0ATAAuBNnJGo+xjXJD0byXAgeKoB+U3ZUaoCTHM="; + } # claude-code # { # pr = 464698; diff --git a/nixos/gitea-runner.nix b/nixos/gitea-runner.nix index 3db894b8..6aca16ee 100644 --- a/nixos/gitea-runner.nix +++ b/nixos/gitea-runner.nix @@ -40,7 +40,7 @@ makeEnable config "myModules.gitea-runner" false { url = "https://dev.railbird.ai"; tokenFile = config.age.secrets.gitea-runner-token.path; labels = [ - "nixos-${pkgs.system}:host" + "nixos-${pkgs.stdenv.hostPlatform.system}:host" "nix:docker://localhost:5921/nix-runner" ]; }; diff --git a/nixos/hyprland.nix b/nixos/hyprland.nix index 49f7d616..2288ce82 100644 --- a/nixos/hyprland.nix +++ b/nixos/hyprland.nix @@ -3,7 +3,7 @@ makeEnable config "myModules.hyprland" true { programs.hyprland = { enable = true; # Use Hyprland from the flake for proper plugin compatibility - package = inputs.hyprland.packages.${pkgs.system}.hyprland; + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; }; # Hyprland-specific packages @@ -21,7 +21,7 @@ makeEnable config "myModules.hyprland" true { wlsunset # Night light / blue light filter # hy3 plugin from flake (properly built against matching Hyprland) - inputs.hy3.packages.${pkgs.system}.hy3 + inputs.hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3 # For scripts jq diff --git a/nixos/overlay.nix b/nixos/overlay.nix index 08e04c05..75246196 100644 --- a/nixos/overlay.nix +++ b/nixos/overlay.nix @@ -1,8 +1,8 @@ final: prev: let # Enable/disable version overrides (set to false to use nixpkgs versions) - enableCodexOverride = true; - enableClaudeCodeOverride = true; + enableCodexOverride = false; # Using PR patches instead + enableClaudeCodeOverride = false; # Disabled - needs proper buildNpmPackage override # Codex version override - update these values to bump the version codexVersion = { @@ -13,7 +13,7 @@ let claudeCodeVersion = { version = "2.1.22"; hash = "sha256-OqvLiwB5TwZaxDvyN/+/+eueBdWNaYxd81cd5AZK/mA="; - npmDepsHash = ""; + npmDepsHash = "sha256-vy7osk3UAOEgsJx9jdcGe2wICOk5Urzxh1WLAHyHM+U="; }; in { diff --git a/nixos/secrets.nix b/nixos/secrets.nix index 75885772..066d3bf4 100644 --- a/nixos/secrets.nix +++ b/nixos/secrets.nix @@ -3,7 +3,7 @@ imports = [ inputs.agenix.homeManagerModules.default ]; age.identityPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ]; home.packages = [ - inputs.agenix.packages."${pkgs.system}".default + inputs.agenix.packages."${pkgs.stdenv.hostPlatform.system}".default ]; age.secrets.gpg-keys.file = ./secrets/gpg-keys.age; age.secrets.gpg-passphrase.file = ./secrets/gpg-passphrase.age; diff --git a/nixos/xmonad.nix b/nixos/xmonad.nix index e9716c5d..a65bd400 100644 --- a/nixos/xmonad.nix +++ b/nixos/xmonad.nix @@ -31,7 +31,7 @@ makeEnable config "myModules.xmonad" true { # haskellPackages.gtk-sni-tray haskellPackages.status-notifier-item haskellPackages.dbus-hslogger - inputs.imalison-taffybar.defaultPackage."${pkgs.system}" + inputs.imalison-taffybar.defaultPackage."${pkgs.stdenv.hostPlatform.system}" ]; home-manager.users = forEachUser { @@ -43,7 +43,7 @@ makeEnable config "myModules.xmonad" true { services.taffybar = { enable = true; - package = inputs.imalison-taffybar.defaultPackage."${pkgs.system}"; + package = inputs.imalison-taffybar.defaultPackage."${pkgs.stdenv.hostPlatform.system}"; }; services.kdeconnect = {