summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2023-01-27 16:17:22 +0100
committertv <tv@krebsco.de>2023-01-27 16:17:22 +0100
commit08009331800e7fa9c1ac1fae8711750bab1ed950 (patch)
treec42d82f8a79cebf649e4b671d9e925c97caeb93f
parent6a5b4c73b0655c38f0b6abc6550b2b3cdffc121b (diff)
tv iosevka: use fetchzip
-rw-r--r--tv/5pkgs/override/iosevka-tv-1.nix32
-rw-r--r--tv/5pkgs/override/iosevka-tv-2.nix32
2 files changed, 26 insertions, 38 deletions
diff --git a/tv/5pkgs/override/iosevka-tv-1.nix b/tv/5pkgs/override/iosevka-tv-1.nix
index 99b82d514..880160b3e 100644
--- a/tv/5pkgs/override/iosevka-tv-1.nix
+++ b/tv/5pkgs/override/iosevka-tv-1.nix
@@ -1,26 +1,20 @@
self: super:
let
- prebuilt =
- self.stdenv.mkDerivation rec {
- pname = "iosevka-tv-1";
- version = "15.6.3";
- src = self.fetchurl {
- urls = [
- "https://c.krebsco.de/iosevka-tv-1-${version}.tar.gz"
- "https://ni.krebsco.de/~tv/mirrors/iosevka/iosevka-tv-1-${version}.tar.gz"
- ];
- hash = "sha256-88OfNUbuNbGx3hFzYZ+gAYgOWZ+A8IYo45I1n/qOyhM=";
- };
- installPhase = ''
- mkdir $out
- mv * $out/
- '';
- };
+ srcpkg = super.iosevka-tv-1;
+ binpkg = self.fetchzip {
+ inherit (srcpkg) pname version;
+ stripRoot = false;
+ hash = "sha256-QIuTS70vUQSvDDXjY4uI6SCcu1XT4HjvzpthvrNX4h0=";
+ 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-1
+ srcpkg
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