NotificationsYou must be signed in to change notification settings
Fork1.1k
Star11.7k

Commit304bbde

committed

fix(flake.nix): Install locales on linux host devShells

Change-Id: I22dba63d317b41749c807a55e15278006cdcecadSigned-off-by: Thomas Kosiewski <tk@coder.com>

1 parent8f02e63 commit304bbdeCopy full SHA for 304bbde

File tree

2 files changed

+11

-7

lines changed

dogfood/contents
- Dockerfile.nix
flake.nix

2 files changed

+11

-7

lines changed

`‎dogfood/contents/Dockerfile.nix‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# Build stage`
`2`		`-FROMnixos/nix:2.19.2asnix`
	`2`	`+FROMnixos/nix:2.19.2ASnix`
`3`	`3`
`4`	`4`	`# enable --experimental-features 'nix-command flakes' globally`
`5`	`5`	`# nix does not enable these features by default these are required to run commands like`
`@@ -14,7 +14,7 @@ RUN nix profile install "/app#all" --priority 4 && \`
`14`	`14`	`nix-collect-garbage-d`
`15`	`15`
`16`	`16`	`# Final image`
`17`		`-FROMcodercom/enterprise-base:latestasfinal`
	`17`	`+FROMcodercom/enterprise-base:latestASfinal`
`18`	`18`
`19`	`19`	`# Set the non-root user`
`20`	`20`	`USERroot`

`‎flake.nix‎`

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,20 +58,22 @@`
`58`	`58`
`59`	`59`	`# The minimal set of packages to build Coder.`
`60`	`60`	`devShellPackages=withpkgs;[`
`61`		`-# google-chrome is not available onOSX andaarch64 linux`
`62`		`-(ifpkgs.stdenv.hostPlatform.isDarwin\|\|pkgs.stdenv.hostPlatform.isAarch64thennullelsegoogle-chrome)`
	`61`	`+# google-chrome is not available on aarch64 linux`
	`62`	`+(lib.optionalDrvAttr(!stdenv.isLinux\|\|!stdenv.isAarch64)google-chrome)`
`63`	`63`	`# strace is not available on OSX`
`64`		`-(ifpkgs.stdenv.hostPlatform.isDarwinthennullelsestrace)`
	`64`	`+(lib.optionalDrvAttr(!pkgs.stdenv.isDarwin)strace)`
`65`	`65`	`bat`
`66`	`66`	`cairo`
`67`	`67`	`curl`
`68`	`68`	`delve`
`69`	`69`	`drpc.defaultPackage.${system}`
	`70`	`+fzf`
`70`	`71`	`gcc`
`71`	`72`	`gdk`
`72`	`73`	`getopt`
`73`	`74`	`gh`
`74`	`75`	`git`
	`76`	`+(lib.optionalDrvAttrstdenv.isLinuxglibcLocales)`
`75`	`77`	`gnumake`
`76`	`78`	`gnused`
`77`	`79`	`go_1_22`
`@@ -85,8 +87,10 @@`
`85`	`87`	`kubernetes-helm`
`86`	`88`	`less`
`87`	`89`	`mockgen`
	`90`	`+moreutils`
`88`	`91`	`nfpm`
`89`	`92`	`nodejs`
	`93`	`+neovim`
`90`	`94`	`pnpm`
`91`	`95`	`openssh`
`92`	`96`	`openssl`
`@@ -98,8 +102,6 @@`
`98`	`102`	`protobuf`
`99`	`103`	`proto_gen_go_1_30`
`100`	`104`	`ripgrep`
`101`		`-# This doesn't build on latest nixpkgs (July 10 2024)`
`102`		`-(pinnedPkgs.sapling)`
`103`	`105`	`shellcheck`
`104`	`106`	`(pinnedPkgs.shfmt)`
`105`	`107`	`sqlc`
`@@ -165,6 +167,8 @@`
`165`	`167`	`export PLAYWRIGHT_BROWSERS_PATH=${pkgs.playwright-driver.browsers}`
`166`	`168`	`export PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS=true`
`167`	`169`	`'';`
	`170`	`+`
	`171`	`+LOCALE_ARCHIVE=withpkgs;lib.optionalDrvAttrstdenv.isLinux"${glibcLocales}/lib/locale/locale-archive";`
`168`	`172`	`};`
`169`	`173`	`packages={`
`170`	`174`	`proto_gen_go=proto_gen_go_1_30;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit304bbde

File tree

2 files changed

2 files changed

`‎dogfood/contents/Dockerfile.nix‎`

`‎flake.nix‎`

0 commit comments