From 09c1d8ce2eef60835b48b6f9826467860edfad86 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 27 Jan 2023 13:10:35 +0100 Subject: tv iosevka 2: init at 15.6.3 --- tv/5pkgs/override/iosevka-tv-2.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 tv/5pkgs/override/iosevka-tv-2.nix (limited to 'tv/5pkgs/override/iosevka-tv-2.nix') diff --git a/tv/5pkgs/override/iosevka-tv-2.nix b/tv/5pkgs/override/iosevka-tv-2.nix new file mode 100644 index 000000000..e4702f06c --- /dev/null +++ b/tv/5pkgs/override/iosevka-tv-2.nix @@ -0,0 +1,26 @@ +self: super: + +let + prebuilt = + self.stdenv.mkDerivation rec { + pname = "iosevka-tv-2"; + version = "15.6.3"; + src = self.fetchurl { + urls = [ + "https://c.krebsco.de/iosevka-tv-2-${version}.tar.gz" + "https://ni.krebsco.de/~tv/mirrors/iosevka/iosevka-tv-2-${version}.tar.gz" + ]; + hash = "sha256-W2bOlM0dYKAt+k2OpNJsNx6/hWEItJ2Tob8thtJJ1BA="; + }; + installPhase = '' + mkdir $out + mv * $out/ + ''; + }; +in + +if super.iosevka.version == prebuilt.version then + prebuilt + +else + super.iosevka-tv-2 -- cgit v1.2.3 From 08009331800e7fa9c1ac1fae8711750bab1ed950 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 27 Jan 2023 16:17:22 +0100 Subject: tv iosevka: use fetchzip --- tv/5pkgs/override/iosevka-tv-2.nix | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) (limited to 'tv/5pkgs/override/iosevka-tv-2.nix') diff --git a/tv/5pkgs/override/iosevka-tv-2.nix b/tv/5pkgs/override/iosevka-tv-2.nix index e4702f06c..2eecf3cff 100644 --- a/tv/5pkgs/override/iosevka-tv-2.nix +++ b/tv/5pkgs/override/iosevka-tv-2.nix @@ -1,26 +1,20 @@ self: super: let - prebuilt = - self.stdenv.mkDerivation rec { - pname = "iosevka-tv-2"; - version = "15.6.3"; - src = self.fetchurl { - urls = [ - "https://c.krebsco.de/iosevka-tv-2-${version}.tar.gz" - "https://ni.krebsco.de/~tv/mirrors/iosevka/iosevka-tv-2-${version}.tar.gz" - ]; - hash = "sha256-W2bOlM0dYKAt+k2OpNJsNx6/hWEItJ2Tob8thtJJ1BA="; - }; - installPhase = '' - mkdir $out - mv * $out/ - ''; - }; + srcpkg = super.iosevka-tv-2; + binpkg = self.fetchzip { + inherit (srcpkg) pname version; + stripRoot = false; + hash = "sha256-PuIrW1ftYD5PW4du6gq1XpUM3v0potwmj+vAxJImF/A="; + urls = [ + "https://c.krebsco.de/${srcpkg.name}.tar.gz" + "https://ni.krebsco.de/~tv/mirrors/iosevka/${srcpkg.name}.tar.gz" + ]; + }; in -if super.iosevka.version == prebuilt.version then - prebuilt +if srcpkg.version == binpkg.version then + binpkg else - super.iosevka-tv-2 + srcpkg -- cgit v1.2.3