Skip to content

Commit 1054297

Browse files
chore(deps): bump nixpkgs from b5aa0fb to 0bb7ec5 (#73)
* chore(deps): bump nixpkgs from `b5aa0fb` to `0bb7ec5` Bumps [nixpkgs](https://github.com/nixos/nixpkgs) from `b5aa0fb` to `0bb7ec5`. - [Commits](NixOS/nixpkgs@b5aa0fb...0bb7ec5) --- updated-dependencies: - dependency-name: nixpkgs dependency-version: 0bb7ec54c8483066ec9d7720e780a5caa71f8612 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * fix(nix): pin Linux swiftformat nixpkgs --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Fukaya Temma <23367170+pranc1ngpegasus@users.noreply.github.com> Co-authored-by: pranc1ngpegasus <temma.fukaya@mokmok.dev>
1 parent e559744 commit 1054297

2 files changed

Lines changed: 27 additions & 1 deletion

File tree

flake.lock

Lines changed: 18 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
inputs = {
33
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
4+
# Keep Linux swiftformat on the last known-good nixpkgs revision. Newer
5+
# nixpkgs currently builds Swift 5.10 with a Clang-only TLS flag.
6+
nixpkgs-swiftformat.url = "github:nixos/nixpkgs/b5aa0fbd538984f6e3d201be0005b4463d8b09f8";
47
flake-utils.url = "github:numtide/flake-utils";
58
rust-overlay.url = "github:oxalica/rust-overlay";
69
rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
@@ -10,6 +13,7 @@
1013
{
1114
self,
1215
nixpkgs,
16+
nixpkgs-swiftformat,
1317
flake-utils,
1418
rust-overlay,
1519
}:
@@ -20,6 +24,11 @@
2024
inherit system;
2125
overlays = [ rust-overlay.overlays.default ];
2226
};
27+
swiftformat =
28+
if pkgs.stdenv.isLinux then
29+
(import nixpkgs-swiftformat { inherit system; }).swiftformat
30+
else
31+
pkgs.swiftformat;
2332
rustToolchain = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
2433

2534
# Shared by both devShells on macOS. Nix injects its own apple-sdk +

0 commit comments

Comments
 (0)