From eb40cab148cd70ef9666af4c3ec2acd95c9cea18 Mon Sep 17 00:00:00 2001 From: xeals Date: Thu, 15 Aug 2024 11:55:29 +1000 Subject: [PATCH] monaspace: remove upstreamed package --- pkgs/data/fonts/monaspace/default.nix | 73 --------------------------- pkgs/top-level/all-packages.nix | 9 ---- 2 files changed, 82 deletions(-) delete mode 100644 pkgs/data/fonts/monaspace/default.nix diff --git a/pkgs/data/fonts/monaspace/default.nix b/pkgs/data/fonts/monaspace/default.nix deleted file mode 100644 index ebc7c7a..0000000 --- a/pkgs/data/fonts/monaspace/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -}: - -let - mkMonaspace = - { pname - , variants ? [ ] - }: stdenvNoCC.mkDerivation rec { - inherit pname; - version = "1.000"; - - src = fetchFromGitHub { - owner = "githubnext"; - repo = "monaspace"; - rev = "v${version}"; - hash = "sha256-Zo56r0QoLwxwGQtcWP5cDlasx000G9BFeGINvvwEpQs="; - }; - - _variants = map (builtins.replaceStrings [ " " ] [ "" ]) variants; - - installPhase = '' - local out_font=$out/share/fonts/monaspace - '' + (if variants == [ ] then '' - install -m444 -Dt $out_font fonts/otf/*.otf - install -m444 -Dt $out_font fonts/variable/*.ttf - '' else '' - for variant in $_variants; do - install -m444 -Dt $out_font fonts/otf/"$variant"-*.otf - install -m444 -Dt $out_font fonts/variable/"$variant"Var*.ttf - done - ''); - - meta = { - description = "An innovative superfamily of fonts for code"; - homepage = "https://monaspace.githubnext.com/"; - longDescription = '' - Since the earliest days of the teletype machine, code has been set in - monospaced type — letters, on a grid. Monaspace is a new type system - that advances the state of the art for the display of code on screen. - ''; - license = lib.licenses.ofl; - platforms = lib.platforms.all; - }; - }; -in -{ - monaspace = mkMonaspace { - pname = "monaspace"; - }; - - monaspace-argon = mkMonaspace { - pname = "monaspace-argon"; - variants = [ "Monaspace Argon" ]; - }; - monaspace-krypton = mkMonaspace { - pname = "monaspace-krypton"; - variants = [ "Monaspace Krypton" ]; - }; - monaspace-neon = mkMonaspace { - pname = "monaspace-neon"; - variants = [ "Monaspace Neon" ]; - }; - monaspace-radon = mkMonaspace { - pname = "monaspace-radon"; - variants = [ "Monaspace Radon" ]; - }; - monaspace-xenon = mkMonaspace { - pname = "monaspace-xenon"; - variants = [ "Monaspace Xenon" ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74e15bc..72dbe63 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21,15 +21,6 @@ rec { ideaUltimateWithPlugins = ideaUltimatePlugins.jetbrainsWithPlugins; }; - monaspace-fonts = pkgs.callPackage ../data/fonts/monaspace/default.nix { }; - inherit (monaspace-fonts) - monaspace - monaspace-argon - monaspace-krypton - monaspace-neon - monaspace-radon - monaspace-xenon; - mopidy-subidy = pkgs.callPackage ../applications/audio/mopidy/subidy.nix { python3Packages = pkgs.python3Packages // python3Packages; };