|
4 | 4 | inputs = { |
5 | 5 | nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; |
6 | 6 | flake-utils.url = "github:numtide/flake-utils"; |
7 | | - # Shared development environment (provides pinned Go + Zig 0.15.1 + common tools) |
8 | | - dev-env.url = "github:spyderorg/dev-env"; |
| 7 | + |
| 8 | + dev-env = { |
| 9 | + url = "github:devnw/dev-env"; |
| 10 | + inputs = { |
| 11 | + nixpkgs.follows = "nixpkgs"; |
| 12 | + unstable.follows = "nixpkgs"; |
| 13 | + flake-utils.follows = "flake-utils"; |
| 14 | + }; |
| 15 | + }; |
| 16 | + |
9 | 17 | gomod2nix.url = "github:nix-community/gomod2nix"; |
10 | 18 | }; |
11 | 19 |
|
|
24 | 32 | let |
25 | 33 | pkgs = nixpkgs.legacyPackages.${system}; |
26 | 34 | # Pull toolchains / common tooling from centralized dev-env flake |
27 | | - inherit (dev-env.packages.${system}) zigPackages goPackages commonPackages; |
| 35 | + inherit (dev-env.packages.${system}) goPackages commonPackages; |
28 | 36 | buildGoApp = gomod2nix.legacyPackages.${system}.buildGoApplication; |
29 | 37 |
|
30 | 38 | # Use GOPRIVATE only (default to go.spyder.org) |
|
131 | 139 | } |
132 | 140 | // gitAuthEnv; |
133 | 141 | packages = |
134 | | - # Base developer toolchain (Go + Zig + shared utilities) |
135 | 142 | [ |
136 | 143 | goPackages |
137 | 144 | commonPackages |
|
146 | 153 | flake-utils.lib.eachDefaultSystem (system: flakeForSystem nixpkgs system); |
147 | 154 |
|
148 | 155 | nixConfig = { |
149 | | - extra-substituters = [ "https://spyder.cachix.org" ]; |
| 156 | + extra-substituters = [ |
| 157 | + "https://oss-devnw.cachix.org" |
| 158 | + "https://oss-spyder.cachix.org" |
| 159 | + "https://oss-codepros.cachix.org" |
| 160 | + ]; |
150 | 161 | extra-trusted-public-keys = [ |
151 | | - "spyder.cachix.org-1:xZG2a8INH6yNyOAwtN2Ojjys0GO9D1pXEe3PNriT04E=" |
| 162 | + "oss-devnw.cachix.org-1:iJblmQB0mX8MTEqkKJv3piJK3mimEbHpgU1+FSeRuGY=" |
| 163 | + "oss-spyder.cachix.org-1:CMypXJpvr7z6IGQdIGDHgZBaZX7JSX9AuPErD/in01g=" |
| 164 | + "oss-codepros.cachix.org-1:dP82KzkIxKQp+kS1RgxasR9JYlFdy4W9y7heHeD5h34=" |
152 | 165 | ]; |
153 | 166 | }; |
154 | 167 | } |
0 commit comments