Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8fa1af8

Browse files
authored
style(nix): use idiomatic inherit syntax (anomalyco#6457)
1 parent 73bc3e7 commit 8fa1af8

3 files changed

Lines changed: 31 additions & 20 deletions

File tree

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"aarch64-darwin"
1818
"x86_64-darwin"
1919
];
20-
lib = nixpkgs.lib;
20+
inherit (nixpkgs) lib;
2121
forEachSystem = lib.genAttrs systems;
2222
pkgsFor = system: nixpkgs.legacyPackages.${system};
2323
packageJson = builtins.fromJSON (builtins.readFile ./packages/opencode/package.json);
@@ -70,12 +70,12 @@
7070
in
7171
{
7272
default = mkPackage {
73-
version = packageJson.version;
73+
inherit (packageJson) version;
7474
src = ./.;
7575
scripts = ./nix/scripts;
7676
target = bunTarget.${system};
7777
modelsDev = "${modelsDev.${system}}/dist/_api.json";
78-
mkNodeModules = mkNodeModules;
78+
inherit mkNodeModules;
7979
};
8080
}
8181
);

nix/node-modules.nix

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
1-
{ hash, lib, stdenvNoCC, bun, cacert, curl }:
1+
{
2+
hash,
3+
lib,
4+
stdenvNoCC,
5+
bun,
6+
cacert,
7+
curl,
8+
}:
29
args:
310
stdenvNoCC.mkDerivation {
411
pname = "opencode-node_modules";
5-
version = args.version;
6-
src = args.src;
12+
inherit (args) version src;
713

8-
impureEnvVars =
9-
lib.fetchers.proxyImpureEnvVars
10-
++ [
11-
"GIT_PROXY_COMMAND"
12-
"SOCKS_SERVER"
13-
];
14+
impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
15+
"GIT_PROXY_COMMAND"
16+
"SOCKS_SERVER"
17+
];
1418

15-
nativeBuildInputs = [ bun cacert curl ];
19+
nativeBuildInputs = [
20+
bun
21+
cacert
22+
curl
23+
];
1624

1725
dontConfigure = true;
1826

nix/opencode.nix

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
{ lib, stdenvNoCC, bun, ripgrep, makeBinaryWrapper }:
1+
{
2+
lib,
3+
stdenvNoCC,
4+
bun,
5+
ripgrep,
6+
makeBinaryWrapper,
7+
}:
28
args:
39
let
4-
scripts = args.scripts;
10+
inherit (args) scripts;
511
mkModules =
612
attrs:
713
args.mkNodeModules (
@@ -14,13 +20,10 @@ let
1420
in
1521
stdenvNoCC.mkDerivation (finalAttrs: {
1622
pname = "opencode";
17-
version = args.version;
18-
19-
src = args.src;
23+
inherit (args) version src;
2024

2125
node_modules = mkModules {
22-
version = finalAttrs.version;
23-
src = finalAttrs.src;
26+
inherit (finalAttrs) version src;
2427
};
2528

2629
nativeBuildInputs = [

0 commit comments

Comments
 (0)