Skip to content

Commit 2ad7972

Browse files
committed
fix: update flakes to use the devnw oss flakes
1 parent 66978b7 commit 2ad7972

File tree

2 files changed

+235
-12
lines changed

2 files changed

+235
-12
lines changed

flake.lock

Lines changed: 216 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@
44
inputs = {
55
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
66
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+
917
gomod2nix.url = "github:nix-community/gomod2nix";
1018
};
1119

@@ -24,7 +32,7 @@
2432
let
2533
pkgs = nixpkgs.legacyPackages.${system};
2634
# 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;
2836
buildGoApp = gomod2nix.legacyPackages.${system}.buildGoApplication;
2937

3038
# Use GOPRIVATE only (default to go.spyder.org)
@@ -131,7 +139,6 @@
131139
}
132140
// gitAuthEnv;
133141
packages =
134-
# Base developer toolchain (Go + Zig + shared utilities)
135142
[
136143
goPackages
137144
commonPackages
@@ -146,9 +153,15 @@
146153
flake-utils.lib.eachDefaultSystem (system: flakeForSystem nixpkgs system);
147154

148155
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+
];
150161
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="
152165
];
153166
};
154167
}

0 commit comments

Comments
 (0)