diff --git a/flake.lock b/flake.lock index 04081b9..005400f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1692260837, - "narHash": "sha256-2FpkX1zl+7ni7djK7NeE1ZGupRUwZgjW+RPCSBgDf4k=", + "lastModified": 1691882297, + "narHash": "sha256-e1/LAQSGLnBywfA1TfMl0Vj3tvYka73XOZ/D2/CJowE=", "owner": "nix-community", "repo": "home-manager", - "rev": "6a94c1a59737783c282c4031555a289c28b961e4", + "rev": "c3ab5ea047e6dc73df530948f7367455749d8906", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692174805, - "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=", + "lastModified": 1691654369, + "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e", + "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", "type": "github" }, "original": { diff --git a/home/desktop.nix b/home/desktop.nix index 214f269..749afdd 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -24,10 +24,7 @@ monaco-powerline mtools mtr - # TODO: Zig currently has issues under Darwin, so - # we'll temporarily prefer ncdu 1.x. - # See also: https://github.com/NixOS/nixpkgs/pull/249722 - ncdu_1 + ncdu neofetch nixopsUnstable p7zip diff --git a/pkgs/swiftformat.nix b/pkgs/swiftformat.nix index a1004a8..e1e4579 100644 --- a/pkgs/swiftformat.nix +++ b/pkgs/swiftformat.nix @@ -1,14 +1,19 @@ { stdenv, lib, fetchFromGitHub, swift, swiftpm, swiftPackages }: +# This derivation is impure: it relies on an Xcode toolchain being installed +# and available in the expected place. The values of sandboxProfile and +# hydraPlatforms are copied pretty directly from the MacVim derivation, which +# is also impure. + stdenv.mkDerivation rec { pname = "swiftformat"; - version = "0.52.1"; + version = "0.52.0"; src = fetchFromGitHub { owner = "nicklockwood"; repo = "SwiftFormat"; rev = version; - sha256 = "sha256-0JSspbYIYXfE3oDMi2EfR7pZzQsEtbvB8LJplOtq2sk="; + sha256 = "sha256-Y8ZbmFdrNCzfGLeA+nPc0DHXBHaUw6JFpONbm+LnTjk="; }; nativeBuildInputs = [ swift swiftpm ];