summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorja <[email protected]>2025-12-30 12:58:28 -0500
committerGitHub <[email protected]>2025-12-30 11:58:28 -0600
commit8fa1af851c4bb73bc53017fa57067b780ccb5626 (patch)
tree0cd4e7ebc78daed3b3c68b927abd1cc52ab1cc89
parent73bc3e704ecbb3c49e52f10c4ca4f56547265c64 (diff)
downloadopencode-8fa1af851c4bb73bc53017fa57067b780ccb5626.tar.gz
opencode-8fa1af851c4bb73bc53017fa57067b780ccb5626.zip
style(nix): use idiomatic inherit syntax (#6457)
-rw-r--r--flake.nix6
-rw-r--r--nix/node-modules.nix28
-rw-r--r--nix/opencode.nix17
3 files changed, 31 insertions, 20 deletions
diff --git a/flake.nix b/flake.nix
index a6614a5dc..a578da9c1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
"aarch64-darwin"
"x86_64-darwin"
];
- lib = nixpkgs.lib;
+ inherit (nixpkgs) lib;
forEachSystem = lib.genAttrs systems;
pkgsFor = system: nixpkgs.legacyPackages.${system};
packageJson = builtins.fromJSON (builtins.readFile ./packages/opencode/package.json);
@@ -70,12 +70,12 @@
in
{
default = mkPackage {
- version = packageJson.version;
+ inherit (packageJson) version;
src = ./.;
scripts = ./nix/scripts;
target = bunTarget.${system};
modelsDev = "${modelsDev.${system}}/dist/_api.json";
- mkNodeModules = mkNodeModules;
+ inherit mkNodeModules;
};
}
);
diff --git a/nix/node-modules.nix b/nix/node-modules.nix
index 7b22ef8e7..be7edd9c7 100644
--- a/nix/node-modules.nix
+++ b/nix/node-modules.nix
@@ -1,18 +1,26 @@
-{ hash, lib, stdenvNoCC, bun, cacert, curl }:
+{
+ hash,
+ lib,
+ stdenvNoCC,
+ bun,
+ cacert,
+ curl,
+}:
args:
stdenvNoCC.mkDerivation {
pname = "opencode-node_modules";
- version = args.version;
- src = args.src;
+ inherit (args) version src;
- impureEnvVars =
- lib.fetchers.proxyImpureEnvVars
- ++ [
- "GIT_PROXY_COMMAND"
- "SOCKS_SERVER"
- ];
+ impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
+ "GIT_PROXY_COMMAND"
+ "SOCKS_SERVER"
+ ];
- nativeBuildInputs = [ bun cacert curl ];
+ nativeBuildInputs = [
+ bun
+ cacert
+ curl
+ ];
dontConfigure = true;
diff --git a/nix/opencode.nix b/nix/opencode.nix
index 87b3f17ba..4f10e7498 100644
--- a/nix/opencode.nix
+++ b/nix/opencode.nix
@@ -1,7 +1,13 @@
-{ lib, stdenvNoCC, bun, ripgrep, makeBinaryWrapper }:
+{
+ lib,
+ stdenvNoCC,
+ bun,
+ ripgrep,
+ makeBinaryWrapper,
+}:
args:
let
- scripts = args.scripts;
+ inherit (args) scripts;
mkModules =
attrs:
args.mkNodeModules (
@@ -14,13 +20,10 @@ let
in
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "opencode";
- version = args.version;
-
- src = args.src;
+ inherit (args) version src;
node_modules = mkModules {
- version = finalAttrs.version;
- src = finalAttrs.src;
+ inherit (finalAttrs) version src;
};
nativeBuildInputs = [