From 13f5dc64ba271c14ab682295c7bf0f434a9e6fbe Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 12 Feb 2025 18:08:36 -0500 Subject: [PATCH 1/5] kakoune-cr: fix version --- pkgs/tools/misc/kakoune-cr/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/kakoune-cr/default.nix b/pkgs/tools/misc/kakoune-cr/default.nix index 4d97fc89794c..8a59b6757c6e 100644 --- a/pkgs/tools/misc/kakoune-cr/default.nix +++ b/pkgs/tools/misc/kakoune-cr/default.nix @@ -14,7 +14,7 @@ let in crystal.buildCrystalPackage rec { pname = "kakoune.cr"; - version = "unstable-2021-11-12"; + version = "0-unstable-2021-11-12"; src = fetchFromGitHub { owner = "alexherbo2"; From 227efd6c025a4267c92dc630539eb83972648fdc Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 12 Feb 2025 18:09:56 -0500 Subject: [PATCH 2/5] kakoune-cr: modernize --- pkgs/tools/misc/kakoune-cr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/kakoune-cr/default.nix b/pkgs/tools/misc/kakoune-cr/default.nix index 8a59b6757c6e..01b3b04e2646 100644 --- a/pkgs/tools/misc/kakoune-cr/default.nix +++ b/pkgs/tools/misc/kakoune-cr/default.nix @@ -47,14 +47,14 @@ crystal.buildCrystalPackage rec { $out/bin/kcr --help ''; - meta = with lib; { + meta = { homepage = "https://github.com/alexherbo2/kakoune.cr"; description = "Command-line tool for Kakoune"; - license = licenses.unlicense; - maintainers = with maintainers; [ + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ philiptaron malte-v ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; }; } From 75fb979c5e4634879d9cb53bf713b717574a4a1b Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 12 Feb 2025 18:10:27 -0500 Subject: [PATCH 3/5] kakoune-cr: fix build --- pkgs/tools/misc/kakoune-cr/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/kakoune-cr/default.nix b/pkgs/tools/misc/kakoune-cr/default.nix index 01b3b04e2646..8ce871205455 100644 --- a/pkgs/tools/misc/kakoune-cr/default.nix +++ b/pkgs/tools/misc/kakoune-cr/default.nix @@ -47,6 +47,8 @@ crystal.buildCrystalPackage rec { $out/bin/kcr --help ''; + dontCheckForBrokenSymlinks = true; + meta = { homepage = "https://github.com/alexherbo2/kakoune.cr"; description = "Command-line tool for Kakoune"; From 527172aeefb3e01b41a46baa286c29289baff55b Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 12 Feb 2025 18:11:36 -0500 Subject: [PATCH 4/5] kakoune-cr: drop dependency on crystal 1.2 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1fad5c7dcd1..adb08e65b899 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3823,7 +3823,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; - kakoune-cr = callPackage ../tools/misc/kakoune-cr { crystal = crystal_1_2; }; + kakoune-cr = callPackage ../tools/misc/kakoune-cr { }; kbs2 = callPackage ../tools/security/kbs2 { inherit (darwin.apple_sdk.frameworks) AppKit SystemConfiguration; From fe7fdde11e5d768d10fa770807a09eff40d770f9 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Wed, 12 Feb 2025 18:14:41 -0500 Subject: [PATCH 5/5] kakoune-cr: migrate to by-name --- .../default.nix => by-name/ka/kakoune-cr/package.nix} | 0 pkgs/{tools/misc => by-name/ka}/kakoune-cr/shard.lock | 0 pkgs/{tools/misc => by-name/ka}/kakoune-cr/shards.nix | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 deletions(-) rename pkgs/{tools/misc/kakoune-cr/default.nix => by-name/ka/kakoune-cr/package.nix} (100%) rename pkgs/{tools/misc => by-name/ka}/kakoune-cr/shard.lock (100%) rename pkgs/{tools/misc => by-name/ka}/kakoune-cr/shards.nix (100%) diff --git a/pkgs/tools/misc/kakoune-cr/default.nix b/pkgs/by-name/ka/kakoune-cr/package.nix similarity index 100% rename from pkgs/tools/misc/kakoune-cr/default.nix rename to pkgs/by-name/ka/kakoune-cr/package.nix diff --git a/pkgs/tools/misc/kakoune-cr/shard.lock b/pkgs/by-name/ka/kakoune-cr/shard.lock similarity index 100% rename from pkgs/tools/misc/kakoune-cr/shard.lock rename to pkgs/by-name/ka/kakoune-cr/shard.lock diff --git a/pkgs/tools/misc/kakoune-cr/shards.nix b/pkgs/by-name/ka/kakoune-cr/shards.nix similarity index 100% rename from pkgs/tools/misc/kakoune-cr/shards.nix rename to pkgs/by-name/ka/kakoune-cr/shards.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adb08e65b899..dac6812fb045 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3823,8 +3823,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; - kakoune-cr = callPackage ../tools/misc/kakoune-cr { }; - kbs2 = callPackage ../tools/security/kbs2 { inherit (darwin.apple_sdk.frameworks) AppKit SystemConfiguration; };