Skip to content

Commit 4d2f8d2

Browse files
authored
Bump go to 1.24 (#131)
Signed-off-by: James Hamlin <[email protected]>
1 parent 3b2afdd commit 4d2f8d2

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

nix/sources.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"homepage": "",
66
"owner": "NixOS",
77
"repo": "nixpkgs",
8-
"rev": "6e31010bb321acfebdb43952d9cde86eaf0e70ad",
9-
"sha256": "0yfc5c8qy7dklag82y4d823d0i25r3flfxqbzyq6wgn94k9j5cpf",
8+
"rev": "2b78ecc45e163d655c08c9a4cffb4a91c66d0493",
9+
"sha256": "092l8qa82w97hj2pal2hzdzxnw20jya5pz9x2igj7swhpzmhxyzk",
1010
"type": "tarball",
11-
"url": "https://github.com/NixOS/nixpkgs/archive/6e31010bb321acfebdb43952d9cde86eaf0e70ad.tar.gz",
11+
"url": "https://github.com/NixOS/nixpkgs/archive/2b78ecc45e163d655c08c9a4cffb4a91c66d0493.tar.gz",
1212
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
1313
}
1414
}

shell.nix

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,17 @@
66

77
pkgs.mkShell {
88
nativeBuildInputs = [
9-
pkgs.go_1_21
9+
pkgs.go_1_24
1010
pkgs.clojure
1111
];
1212

1313
shellHook = ''
1414
export MACOSX_DEPLOYMENT_TARGET=12.0
15+
16+
# Remove xcbuild's xcrun from PATH
17+
export PATH=$(echo "$PATH" | sed "s|${pkgs.xcbuild.xcrun}/bin||g")
18+
19+
# Let Xcode pick its own developer dir
20+
unset DEVELOPER_DIR
1521
'';
1622
}

0 commit comments

Comments
 (0)