coder · kylecarbs · Aug 8, 2022 · Aug 7, 2022 · Aug 7, 2022 · Aug 7, 2022
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use nix
diff --git a/coderd/util/tz/tz_linux.go b/coderd/util/tz/tz_linux.go
@@ -29,16 +29,16 @@ func TimezoneIANA() (*time.Location, error) {
 		return nil, xerrors.Errorf("lookup timezone from env: %w", err)
 	}
 
-	lp, err := filepath.EvalSymlinks(etcLocaltime)
-	if err != nil {
-		return nil, xerrors.Errorf("read location of %s: %w", etcLocaltime, err)
+	location, err := filepath.EvalSymlinks(etcLocaltime)
+	if err == nil {
+		location = strings.Replace(location, zoneInfoPath, "", -1)
+		location = strings.TrimPrefix(location, string(filepath.Separator))
+	} else {
+		location, _ = time.Now().Zone()
 	}
-
-	stripped := strings.Replace(lp, zoneInfoPath, "", -1)
-	stripped = strings.TrimPrefix(stripped, string(filepath.Separator))
-	loc, err = time.LoadLocation(stripped)
+	loc, err = time.LoadLocation(location)
 	if err != nil {
-		return nil, xerrors.Errorf("invalid location %q guessed from %s: %w", stripped, lp, err)
+		return nil, xerrors.Errorf("invalid location from %q: %w", location, err)
 	}
 	return loc, nil
 }
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -4,6 +4,9 @@
 
 Coder requires Go 1.18+, Node 14+, and GNU Make.
 
+> **Note**:
+> Use [Nix](https://nix.dev/) for a one-command setup: `nix-shell`
+
 ### Development workflow
 
 Use the following `make` commands and scripts in development:

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -0,0 +1,52 @@
+{
+  description = "Development environments on your infrastructure";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+    drpc.url = "github:storj/drpc/v0.0.32";
+  };
+
+  outputs = { self, nixpkgs, flake-utils, drpc }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
+        formatter = pkgs.nixpkgs-fmt;
+        devShells.default = pkgs.mkShell {
+          buildInputs = with pkgs; [
+            bat
+            drpc.defaultPackage.${system}
+            exa
+            git
+            go-migrate
+            go_1_19
+            golangci-lint
+            gopls
+            goreleaser
+            gotestsum
+            helm
+            jq
+            nfpm
+            nodePackages.typescript
+            nodePackages.typescript-language-server
+            nodejs
+            openssh
+            openssl
+            postgresql
+            protoc-gen-go
+            ripgrep
+            shellcheck
+            shfmt
+            sqlc
+            terraform
+            typos
+            yarn
+            zip
+            zstd
+          ];
+        };
+      }
+    );
+}
diff --git a/provisionersdk/agent_test.go b/provisionersdk/agent_test.go
@@ -46,6 +46,9 @@ func TestAgentScript(t *testing.T) {
 		}
 		script = strings.ReplaceAll(script, "${ACCESS_URL}", srvURL.String()+"/")
 		script = strings.ReplaceAll(script, "${AUTH_TYPE}", "token")
+		// In certain distributions "echo" is a part of coreutils, and determines
+		// it's functionality based on the exec path name.
+		script = strings.ReplaceAll(script, "BINARY_NAME=coder", "BINARY_NAME=echo")
 		// This is intentionally ran in single quotes to mimic how a customer may
 		// embed our script. Our scripts should not include any single quotes.
 		// nolint:gosec

diff --git a/scripts/build_go_slim.sh b/scripts/build_go_slim.sh
@@ -58,7 +58,7 @@ done
 # Check dependencies
 dependencies go
 if [[ $compress != 0 ]]; then
-	dependencies shasum tar zstd
+	dependencies openssl tar zstd
 
 	if [[ $compress != [0-9]* ]] || [[ $compress -gt 22 ]] || [[ $compress -lt 1 ]]; then
 		error "Invalid value for compress, must in in the range of [1, 22]"
@@ -114,7 +114,7 @@ if [[ $compress != 0 ]]; then
 	sha_file=coder.sha1
 	sha_dest="$dest_dir/$sha_file"
 	log "--- Generating SHA1 for coder-slim binaries ($sha_dest)"
-	shasum -b -a 1 coder-* | tee $sha_file
+	openssl dgst -r -sha1 coder-* | tee $sha_file
 	echo "$sha_dest"
 	log
 	log

diff --git a/shell.nix b/shell.nix
@@ -0,0 +1,10 @@
+(import
+  (
+    fetchTarball {
+      url = "https://github.com/edolstra/flake-compat/archive/b4a34015c698c7793d592d66adbab377907a2be8.tar.gz";
+      sha256 = "1qc703yg0babixi6wshn5wm2kgl5y1drcswgszh4xxzbrwkk9sv7";
+    }
+  )
+  {
+    src = ./.;
+  }).shellNix
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		use nix
kylecarbs marked this conversation as resolved. Show resolved Hide resolved