Files
Mathias Fredriksson d3e471feb0 fix: bump sqlc fork to restore CTE scope tracking (#32187)
Without coder/sqlc's CTE scope fix (coder/sqlc#1), sqlc rejects valid
queries that put a subquery inside a CTE with a false "column reference
is ambiguous" error. The fix only ever existed on the side branch the
old pin pointed at. #25105 moved the pin to the fork's merge of upstream
v1.31.1, which didn't include it, so the fix was silently dropped. No
current query hits the bug, but the next one would have failed at
make gen.

The fix is now on the fork's main. Generated code is unchanged.
2026-11-17 12:41:18 +02:00

455 lines
15 KiB
Nix
Raw Permalink Blame History

This file contains ambiguous Unicode characters
This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.
{
description = "Development environments on your infrastructure";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-pinned.url = "github:nixos/nixpkgs/5deee6281831847857720668867729617629ef1f";
flake-utils.url = "github:numtide/flake-utils";
pnpm2nix = {
url = "github:ThomasK33/pnpm2nix-nzbr";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
drpc = {
url = "github:storj/drpc/v0.0.34";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
};
outputs =
{
self,
nixpkgs,
nixpkgs-pinned,
nixpkgs-unstable,
flake-utils,
drpc,
pnpm2nix,
}:
flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = import nixpkgs {
inherit system;
# Workaround for: google-chrome has an unfree license (‘unfree’), refusing to evaluate.
config.allowUnfree = true;
};
# pinnedPkgs is used to pin packages that need to stay in sync with CI.
# Everything else uses unstable.
pinnedPkgs = import nixpkgs-pinned {
inherit system;
};
unstablePkgs = import nixpkgs-unstable {
inherit system;
# Workaround for: terraform has an unfree license (‘bsl11’), refusing to evaluate.
config.allowUnfreePredicate =
pkg:
builtins.elem (pkgs.lib.getName pkg) [
"terraform"
];
};
formatter = pkgs.nixfmt-rfc-style;
nodejs = unstablePkgs.nodejs_22;
pnpm = pkgs.pnpm_10.override {
inherit nodejs; # Ensure it points to the above nodejs version
};
mise = pkgs.stdenvNoCC.mkDerivation rec {
pname = "mise";
version = "2026.10.25";
target = {
x86_64-linux = "linux-x64";
aarch64-linux = "linux-arm64";
x86_64-darwin = "macos-x64";
aarch64-darwin = "macos-arm64";
}.${system};
src = pkgs.fetchurl {
url = "https://github.com/jdx/mise/releases/download/v${version}/mise-v${version}-${target}";
hash = {
x86_64-linux = "sha256-XTYuzFeNx8FGZ5uEHdqUnWRyy/hv9WNdt6/cobaz/Yc=";
aarch64-linux = "sha256-uwnoixMWTKkGkaXMBCcm0HnwuiarVVJzRMsXPC6DyZg=";
x86_64-darwin = "sha256-4G6z8DEd7b9llS7CwCRzmISGU7MC5qrZnXNxrZujMwE=";
aarch64-darwin = "sha256-ij7wB2WwCSeBl6umJ6wA1unGP2rrBNT0ss/g5Z3cL9Y=";
}.${system};
};
dontUnpack = true;
installPhase = ''
install -Dm755 "$src" "$out/bin/mise"
'';
};
# Check in https://search.nixos.org/packages to find new packages.
# Use `nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update`
# to update the lock file if packages are out-of-date.
# From https://nixos.wiki/wiki/Google_Cloud_SDK
gdk = pkgs.google-cloud-sdk.withExtraComponents [
pkgs.google-cloud-sdk.components.gke-gcloud-auth-plugin
];
proto_gen_go_1_30 = pkgs.buildGoModule rec {
name = "protoc-gen-go";
owner = "protocolbuffers";
repo = "protobuf-go";
rev = "v1.30.0";
src = pkgs.fetchFromGitHub {
inherit owner repo rev;
# Updated with ./scripts/update-flake.sh`.
sha256 = "sha256-GTZQ40uoi62Im2F4YvlZWiSNNJ4fEAkRojYa0EYz9HU=";
};
subPackages = [ "cmd/protoc-gen-go" ];
vendorHash = null;
};
# Keep protoc aligned with mise.toml so local Nix shells use
# the same codegen tool version as CI and release workflows,
# regardless of nixpkgs channel defaults.
protobuf_23_4 =
let
releases = {
x86_64-linux = {
platform = "linux-x86_64";
hash = "sha256-BQLyhqye2GC2KaeWWhRSex8t0THkKD+iPC1/GEZyqpo=";
};
aarch64-linux = {
platform = "linux-aarch_64";
hash = "sha256-HHdQtuA4MFtaf8PQzaHr798Qak8wp4e/gm7S/EfDln0=";
};
aarch64-darwin = {
platform = "osx-aarch_64";
hash = "sha256-jHr66GJraBHntYl9FtlAwtv1Cx4TXtlYoB22VmvdpyY=";
};
x86_64-darwin = {
platform = "osx-x86_64";
hash = "sha256-B+X9zxsHCNM2fcXm640TXefkB9dTFskxVc/YqzYu7IA=";
};
};
target = releases.${system} or null;
in
if target != null then
pkgs.runCommand "protobuf-23.4" {
nativeBuildInputs = [ pkgs.unzip ];
src = pkgs.fetchurl {
url = "https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-${target.platform}.zip";
hash = target.hash;
};
} ''
mkdir -p "$out"
cd "$out"
unzip "$src"
chmod +x "$out/bin/protoc"
''
else
throw "protobuf 23.4 is not defined for ${system}";
# Custom sqlc build from the coder/sqlc fork: upstream sqlc v1.31.1
# plus CTE scope tracking, which fixes false "column reference is
# ambiguous" errors for subqueries inside CTEs. See:
# - https://github.com/coder/sqlc/pull/1
# - https://github.com/sqlc-dev/sqlc/pull/4159 (upstream)
#
# To update hashes:
# 1. Run: `nix --extra-experimental-features 'nix-command flakes' build .#devShells.x86_64-linux.default`
# 2. Nix will fail with the correct sha256 hash for src
# 3. Update the sha256 and run again
# 4. Nix will fail with the correct vendorHash
# 5. Update the vendorHash
sqlc-custom = unstablePkgs.buildGo126Module {
pname = "sqlc";
version = "coder-fork-fb627c9c93f089ff1888f6799ca348986b2818e0";
src = pkgs.fetchFromGitHub {
owner = "coder";
repo = "sqlc";
rev = "fb627c9c93f089ff1888f6799ca348986b2818e0";
sha256 = "sha256-50KkO+tqHMrMUUivwPcoyLtBmkewY7Vf0VLRSQJVgGA=";
};
subPackages = [ "cmd/sqlc" ];
vendorHash = "sha256-4Cb15MhKyhRvYVKfMqBwuC3WBBIJE6AinJt02+TSMVY=";
};
paralleltestctx = unstablePkgs.buildGo126Module {
pname = "paralleltestctx";
version = "0.0.2-unstable-2026-10-20";
src = pkgs.fetchFromGitHub {
owner = "coder";
repo = "paralleltestctx";
rev = "95009df793fb85bcbe71628e6dded30e5cfdb3c3";
sha256 = "sha256-8uvRRSDPgXGtSL5YFdd5gxPAt0d9jXZ+kPivrkkgI7c=";
};
subPackages = [ "cmd/paralleltestctx" ];
vendorHash = "sha256-gWFc1Cm+UMNcvBxUgyVrreFXbwR8rwac4L2QBUDKo6M=";
};
# Keep this pin aligned with mise.toml when updating Terraform.
terraform_1_15_5 =
let
releases = {
x86_64-linux = {
platform = "linux_amd64";
hash = "sha256-5vFrLwsTfuVynKqMTnmjuuTuJhrNGYofz6hYSmKWYFs=";
};
aarch64-linux = {
platform = "linux_arm64";
hash = "sha256-hY4IwYGna2siPox2eo6YOSLuvi0GLblJot5mzgQMNow=";
};
aarch64-darwin = {
platform = "darwin_arm64";
hash = "sha256-2gx+8nipETR4YnWOdXOlkHNl5mSFwmN89cIXxeInmS4=";
};
x86_64-darwin = {
platform = "darwin_amd64";
hash = "sha256-ZrRy3MNs93DYN1ftTQAsR2F0hCwFxoY3tAp+mVGc8+E=";
};
};
target = releases.${system} or null;
in
if target != null then
pkgs.runCommand "terraform-1.17.2" {
nativeBuildInputs = [ pkgs.unzip ];
src = pkgs.fetchurl {
url = "https://releases.hashicorp.com/terraform/1.17.2/terraform_1.17.2_${target.platform}.zip";
hash = target.hash;
};
} ''
mkdir -p "$out/bin"
unzip -p "$src" terraform > "$out/bin/terraform"
chmod +x "$out/bin/terraform"
''
else
unstablePkgs.terraform;
# Packages required to build the frontend
frontendPackages =
with pkgs;
[
cairo
pango
pixman
libpng
libjpeg
giflib
librsvg
python312Packages.setuptools # Needed for node-gyp
]
++ (lib.optionals stdenv.targetPlatform.isDarwin [
darwin.apple_sdk_12_3.frameworks.Foundation
xcbuild
]);
migrate = pkgs.go-migrate.overrideAttrs (_oldAttrs: {
# Coder only needs migrate for migration creation and local Postgres
# migrations. The nixpkgs default build includes every database
# driver and is broken by a bad Go and driver combination, so rebuild
# only with the driver we need.
tags = [ "postgres" ];
});
googleChrome =
if pkgs.stdenv.isLinux then
pkgs.google-chrome.overrideAttrs (
finalAttrs: oldAttrs: {
version = "155.0.8059.84";
src = pkgs.fetchurl {
url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
hash = "sha256-j70q5pzffumLdRPDOWp7Xgb5dPhiX91ZDfMJHdDD6d4=";
};
# Chrome no longer ships standalone ANGLE libraries.
installPhase =
builtins.replaceStrings
[
''
# Make sure that libGL and libvulkan are found by ANGLE libGLESv2.so
patchelf --set-rpath $rpath $out/share/google/$appname/lib*GL*
''
]
[ "" ]
oldAttrs.installPhase;
}
)
else
pkgs.google-chrome;
# The minimal set of packages to build Coder.
devShellPackages =
with pkgs;
[
# google-chrome is not available on aarch64 linux
(lib.optionalDrvAttr (!stdenv.isLinux || !stdenv.isAarch64) googleChrome)
# strace is not available on OSX
(lib.optionalDrvAttr (!pkgs.stdenv.isDarwin) strace)
bat
cairo
curl
cosign
delve
dive
drpc.defaultPackage.${system}
formatter
fzf
gawk
gcc13
gdk
getopt
gh
git
git-lfs
(lib.optionalDrvAttr stdenv.isLinux glibcLocales)
gnumake
gnused
gnugrep
gnutar
unstablePkgs.go_1_26
gofumpt
migrate
(pinnedPkgs.golangci-lint)
gopls
gotestsum
hadolint
jq
kubectl
kubectx
kubernetes-helm
lazydocker
lazygit
less
mise
unstablePkgs.mockgen
moreutils
nfpm
nix-prefetch-git
nodejs
openssh
openssl
paralleltestctx
pango
pixman
pkg-config
pnpm
postgresql_16
proto_gen_go_1_30
protobuf_23_4
ripgrep
rsync
shellcheck
(pinnedPkgs.shfmt)
# sqlc
sqlc-custom
syft
terraform_1_15_5
typos
which
# Needed for many LD system libs!
(lib.optional stdenv.isLinux util-linux)
vim
wget
yq-go
zip
zsh
zstd
]
++ frontendPackages;
# buildSite packages the site directory.
buildSite = pnpm2nix.packages.${system}.mkPnpmPackage {
inherit nodejs pnpm;
src = ./site/.;
# Required for the `canvas` package!
extraBuildInputs = frontendPackages;
installInPlace = true;
distDir = "out";
};
version = "v0.0.0-nix-${self.shortRev or self.dirtyShortRev}";
# To make faster subsequent builds, you could extract the `.zst`
# slim bundle into it's own derivation.
buildFat =
osArch:
unstablePkgs.buildGo126Module {
name = "coder-${osArch}";
# Updated with ./scripts/update-flake.sh`.
# This should be updated whenever go.mod changes!
vendorHash = "sha256-6sdvX0Wglj0CZiig2VD45JzuTcxwg7yrGoPPQUYvuqU=";
proxyVendor = true;
src = ./.;
nativeBuildInputs = with pkgs; [
getopt
openssl
zstd
];
preBuild = ''
# Replaces /usr/bin/env with an absolute path to the interpreter.
patchShebangs ./scripts
'';
buildPhase = ''
runHook preBuild
# Unpack the site contents.
mkdir -p ./site/out ./site/node_modules/
cp -r ${buildSite.out}/* ./site/out
touch ./site/node_modules/.installed
# Build and copy the binary!
export CODER_FORCE_VERSION=${version}
# Flagging 'site/node_modules/.installed' as an old file,
# as we do not want to trigger codegen during a build.
make -j -o 'site/node_modules/.installed' build/coder_${osArch}
'';
installPhase = ''
mkdir -p $out/bin
cp -r ./build/coder_${osArch} $out/bin/coder
'';
};
in
rec {
inherit formatter;
devShells = {
default =
(pkgs.mkShell.override (
pkgs.lib.optionalAttrs pkgs.stdenv.isDarwin {
stdenv = pkgs.overrideSDK pkgs.stdenv "12.3";
}
))
{
buildInputs = devShellPackages;
LOCALE_ARCHIVE =
with pkgs;
lib.optionalDrvAttr stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
NODE_OPTIONS = "--max-old-space-size=8192";
GOPRIVATE = "coder.com,cdr.dev,go.coder.com,github.com/cdr,github.com/coder";
};
};
packages = {
default = packages.${system};
proto_gen_go = proto_gen_go_1_30;
site = buildSite;
# Copying `OS_ARCHES` from the Makefile.
x86_64-linux = buildFat "linux_amd64";
aarch64-linux = buildFat "linux_arm64";
x86_64-darwin = buildFat "darwin_amd64";
aarch64-darwin = buildFat "darwin_arm64";
x86_64-windows = buildFat "windows_amd64.exe";
aarch64-windows = buildFat "windows_arm64.exe";
};
}
);
}