From bf1e9b307fd6bbd840f27d2affe5ea336a5107e6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 4 Jan 2025 19:54:58 +0100 Subject: [PATCH] iosevka, iosevka-bin: move to pkgs/by-name --- .../iosevka/bin.nix => by-name/io/iosevka-bin/package.nix} | 0 .../fonts/iosevka => by-name/io/iosevka-bin}/update-bin.sh | 2 +- .../{data/fonts/iosevka => by-name/io/iosevka-bin}/variants.nix | 0 .../iosevka/default.nix => by-name/io/iosevka/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{data/fonts/iosevka/bin.nix => by-name/io/iosevka-bin/package.nix} (100%) rename pkgs/{data/fonts/iosevka => by-name/io/iosevka-bin}/update-bin.sh (95%) rename pkgs/{data/fonts/iosevka => by-name/io/iosevka-bin}/variants.nix (100%) rename pkgs/{data/fonts/iosevka/default.nix => by-name/io/iosevka/package.nix} (100%) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/by-name/io/iosevka-bin/package.nix similarity index 100% rename from pkgs/data/fonts/iosevka/bin.nix rename to pkgs/by-name/io/iosevka-bin/package.nix diff --git a/pkgs/data/fonts/iosevka/update-bin.sh b/pkgs/by-name/io/iosevka-bin/update-bin.sh similarity index 95% rename from pkgs/data/fonts/iosevka/update-bin.sh rename to pkgs/by-name/io/iosevka-bin/update-bin.sh index bfa50e1a6e52..287ca1cdade4 100755 --- a/pkgs/data/fonts/iosevka/update-bin.sh +++ b/pkgs/by-name/io/iosevka-bin/update-bin.sh @@ -14,7 +14,7 @@ if test "$oldVersion" = "$version"; then exit 0 fi -sed -i "s/$oldVersion/$version/" bin.nix +sed -i "s/$oldVersion/$version/" package.nix { echo '# This file was autogenerated. DO NOT EDIT!' diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix similarity index 100% rename from pkgs/data/fonts/iosevka/variants.nix rename to pkgs/by-name/io/iosevka-bin/variants.nix diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/by-name/io/iosevka/package.nix similarity index 100% rename from pkgs/data/fonts/iosevka/default.nix rename to pkgs/by-name/io/iosevka/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1246415e951..2d626ee7372a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12766,8 +12766,6 @@ with pkgs; inherit (plasma5Packages) breeze-icons; }; - iosevka = callPackage ../data/fonts/iosevka { }; - iosevka-bin = callPackage ../data/fonts/iosevka/bin.nix { }; iosevka-comfy = recurseIntoAttrs (callPackages ../data/fonts/iosevka/comfy.nix {}); kde-rounded-corners = kdePackages.callPackage ../data/themes/kwin-decorations/kde-rounded-corners { };