From bb0574d97e5123c0568f2a89b179ee3bdc705277 Mon Sep 17 00:00:00 2001 From: Spotlight Date: Tue, 17 Jun 2025 18:11:03 -0500 Subject: [PATCH] swiftformat: Remove Upstream `nixpkgs` now builds `swiftformat` via SwiftPM. --- flake.lock | 12 ++++++------ pkgs/default.nix | 1 - pkgs/swiftformat.nix | 31 ------------------------------- 3 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 pkgs/swiftformat.nix diff --git a/flake.lock b/flake.lock index c3fbad0..57550d4 100644 --- a/flake.lock +++ b/flake.lock @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1749999552, - "narHash": "sha256-iCUuEq9qXUh8L1c2bRyCayAqfuUEs9nGAUlXv2RcoF8=", + "lastModified": 1750127463, + "narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "04672588c61aebd18c0d0ada66dd7bb4d8edab0d", + "rev": "28eef8722d1af18ca13e687dbf485e1c653a0402", "type": "github" }, "original": { @@ -142,11 +142,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { diff --git a/pkgs/default.nix b/pkgs/default.nix index c99976a..398992d 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -2,5 +2,4 @@ ipsw = pkgs.callPackage ./ipsw.nix { }; monaco-powerline = pkgs.callPackage ./monaco-powerline/default.nix { }; telnet = pkgs.callPackage ./telnet.nix { }; - swiftformat = pkgs.callPackage ./swiftformat.nix { }; } diff --git a/pkgs/swiftformat.nix b/pkgs/swiftformat.nix deleted file mode 100644 index 371e443..0000000 --- a/pkgs/swiftformat.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ clangStdenv, lib, fetchFromGitHub, swift, swiftpm, swiftPackages }: - -swiftPackages.stdenv.mkDerivation rec { - pname = "swiftformat"; - version = "0.56.4"; - - src = fetchFromGitHub { - owner = "nicklockwood"; - repo = "SwiftFormat"; - rev = version; - sha256 = "sha256-WnBQTpbz9tcnbvmtWpZ9esirWdQKJOpVmH8zk97OuFE="; - }; - - nativeBuildInputs = [ swift swiftpm ]; - buildInputs = [ swiftPackages.Dispatch swiftPackages.Foundation ]; - - installPhase = '' - binPath="$(swiftpmBinPath)" - mkdir -p $out/bin - cp $binPath/swiftformat $out/bin/ - ''; - - meta = with lib; { - description = "A code formatting and linting tool for Swift"; - homepage = "https://github.com/nicklockwood/SwiftFormat"; - license = licenses.mit; - maintainers = [ maintainers.bdesham ]; - platforms = with lib.platforms; linux ++ darwin; - hydraPlatforms = [ ]; - }; -}