public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: remove redundant rec

Browse Source
This commit is contained in:
volth
2019-08-28 11:07:32 +00:00
parent 5061fe0c2c
commit 08f68313a4
1875 changed files with 2591 additions and 2596 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/fonts/aileron/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ let
pname = "aileron";
in
fetchzip rec {
fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
pkgs/data/fonts/ankacoder/condensed.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let version = "1.100"; in
fetchzip rec {
fetchzip {
name = "ankacoder-condensed-${version}";
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoderCondensed.${version}.zip";
pkgs/data/fonts/ankacoder/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let version = "1.100"; in
fetchzip rec {
fetchzip {
name = "ankacoder-${version}";
url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/anka-coder-fonts/AnkaCoder.${version}.zip";
pkgs/data/fonts/behdad-fonts/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
pname = "behdad-fonts";
version = "0.0.3";
in fetchFromGitHub rec {
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "font-store";
repo = "BehdadFont";
pkgs/data/fonts/caladea/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "20130214";
in fetchzip rec {
in fetchzip {
name = "caladea-${version}";
url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-${version}.tar.gz";
pkgs/data/fonts/carlito/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "20130920";
in fetchzip rec {
in fetchzip {
name = "carlito-${version}";
url = "https://commondatastorage.googleapis.com/chromeos-localmirror/distfiles/crosextrafonts-carlito-${version}.tar.gz";
pkgs/data/fonts/dina-pcf/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{stdenv, fetchurl, unzip, bdftopcf, mkfontdir, mkfontscale}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
version = "2.92";
pname = "dina-font-pcf";
pkgs/data/fonts/dina/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "2.92";
in fetchzip rec {
in fetchzip {
name = "dina-font-${version}";
# `meta.homepage` has no direct download link
pkgs/data/fonts/envypn-font/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, mkfontdir, mkfontscale }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "envypn-font-1.7.1";
src = fetchurl {
pkgs/data/fonts/eunomia/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ let
pname = "eunomia";
in
fetchzip rec {
fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
pkgs/data/fonts/f5_6/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ let
pname = "f5_6";
in
fetchzip rec {
fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
pkgs/data/fonts/ferrum/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ let
pname = "ferrum";
in
fetchzip rec {
fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
pkgs/data/fonts/font-awesome-5/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub }:
let
font-awesome = { version, sha256, rev ? version}: fetchFromGitHub rec {
font-awesome = { version, sha256, rev ? version}: fetchFromGitHub {
name = "font-awesome-${version}";
pkgs/data/fonts/google-fonts/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "google-fonts";
version = "2019-07-14";
pkgs/data/fonts/hack/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "3.003";
in fetchzip rec {
in fetchzip {
name = "hack-font-${version}";
url = "https://github.com/chrissimpkins/Hack/releases/download/v${version}/Hack-v${version}-ttf.zip";
pkgs/data/fonts/helvetica-neue-lt-std/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "2013.06.07"; # date of most recent file in distribution
in fetchzip rec {
in fetchzip {
name = "helvetica-neue-lt-std-${version}";
url = "http://www.ephifonts.com/downloads/helvetica-neue-lt-std.zip";
pkgs/data/fonts/hyperscrypt/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@ let
pname = "HyperScrypt";
in
fetchzip rec {
fetchzip {
name = "${lib.toLower pname}-font-${version}";
url = "https://gitlab.com/StudioTriple/Hyper-Scrypt/-/archive/${version}/Hyper-Scrypt-${version}.zip";
sha256 = "01pf5p2scmw02s0gxnibiwxbpzczphaaapv0v4s7svk9aw2gmc0m";
pkgs/data/fonts/ia-writer-duospace/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "20180721";
in fetchFromGitHub rec {
in fetchFromGitHub {
name = "ia-writer-duospace-${version}";
owner = "iaolo";
pkgs/data/fonts/ibm-plex/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "2.0.0";
in fetchzip rec {
in fetchzip {
name = "ibm-plex-${version}";
url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip";
postFetch = ''
pkgs/data/fonts/inconsolata/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, google-fonts }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "inconsolata";
inherit (google-fonts) src version;
pkgs/data/fonts/input-fonts/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, requireFile, unzip }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "input-fonts";
version = "2017-08-10"; # date of the download and checksum
pkgs/data/fonts/inriafonts/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
pname = "inriafonts";
version = "1.200";
in fetchFromGitHub rec {
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "BlackFoundry";
repo = "InriaFonts";
pkgs/data/fonts/iosevka/bin.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "2.2.1";
in fetchzip rec {
in fetchzip {
name = "iosevka-bin-${version}";
url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip";
pkgs/data/fonts/ir-standard-fonts/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
pname = "ir-standard-fonts";
version = "unstable-2017-01-21";
in fetchFromGitHub rec {
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "morealaz";
repo = pname;
pkgs/data/fonts/kawkab-mono/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, fetchzip }:
fetchzip rec {
fetchzip {
name = "kawkab-mono-20151015";
url = "http://makkuk.com/kawkab-mono/downloads/kawkab-mono-0.1.zip";
pkgs/data/fonts/libertine/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, fontforge }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "linux-libertine-5.3.0";
src = fetchurl {
pkgs/data/fonts/luculent/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let version = "2.0.0"; in
fetchzip rec {
fetchzip {
name = "luculent-${version}";
url = http://www.eastfarthing.com/luculent/luculent.tar.xz;
pkgs/data/fonts/medio/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ let
pname = "medio";
in
fetchzip rec {
fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
pkgs/data/fonts/monoid/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, python, fontforge }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "monoid";
version = "2016-07-21";
pkgs/data/fonts/mplus-outline-fonts/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "063a";
in fetchzip rec {
in fetchzip {
name = "mplus-${version}";
url = "mirror://osdn/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz";
pkgs/data/fonts/myrica/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub }:
fetchFromGitHub rec {
fetchFromGitHub {
name = "myrica-2.011.20160403";
owner = "tomokuni";
pkgs/data/fonts/nafees/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{stdenv, fetchurl, unzip}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "nafees";
srcs = [(fetchurl {
pkgs/data/fonts/nanum-gothic-coding/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@ let
version = "VER2.5";
fullName = "NanumGothicCoding-2.5";
in fetchzip rec {
in fetchzip {
name = "nanum-gothic-coding";
url = "https://github.com/naver/nanumfont/releases/download/${version}/${fullName}.zip";
pkgs/data/fonts/nika-fonts/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
pname = "nika-fonts";
version = "1.0.0";
in fetchFromGitHub rec {
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "font-store";
repo = "NikaFont";
pkgs/data/fonts/norwester/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
version = "1.2";
pname = "norwester";
in fetchzip rec {
in fetchzip {
name = "${pname}-${version}";
url = "http://jamiewilson.io/norwester/assets/norwester.zip";
pkgs/data/fonts/noto-fonts/default.nix
+1 -1
View File
@@ -46,7 +46,7 @@ let
};
in
rec {
{
noto-fonts = mkNoto {
name = "noto-fonts";
weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}";
pkgs/data/fonts/noto-fonts/tools.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ fetchFromGitHub, pythonPackages, lib }:
pythonPackages.buildPythonPackage rec {
pythonPackages.buildPythonPackage {
version = "2017-09-25";
pname = "nototools";
pkgs/data/fonts/open-sans/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
pname = "open-sans";
version = "1.11";
in fetchFromGitLab rec {
in fetchFromGitLab {
name = "${pname}-${version}";
domain = "salsa.debian.org";
pkgs/data/fonts/parastoo-fonts/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
pname = "parastoo-fonts";
version = "1.0.0-alpha5";
in fetchFromGitHub rec {
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
pkgs/data/fonts/paratype-pt/mono.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchzip }:
fetchzip rec {
fetchzip {
name = "paratype-pt-mono";
url = [
pkgs/data/fonts/paratype-pt/sans.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchzip }:
fetchzip rec {
fetchzip {
name = "paratype-pt-sans";
url = [
pkgs/data/fonts/paratype-pt/serif.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchzip }:
fetchzip rec {
fetchzip {
name = "paratype-pt-serif";
url = [
pkgs/data/fonts/pecita/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@ let
version = "5.4";
in
fetchurl rec {
fetchurl {
name = "pecita-${version}";
url = "http://pecita.eu/b/Pecita.otf";
pkgs/data/fonts/penna/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ let
pname = "penna";
in
fetchzip rec {
fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
pkgs/data/fonts/profont/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, fetchzip }:
fetchzip rec {
fetchzip {
name = "profont";
url = "http://web.archive.org/web/20160707013914/http://tobiasjung.name/downloadfile.php?file=profont-x11.zip";
pkgs/data/fonts/proggyfonts/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
# adapted from https://aur.archlinux.org/packages/proggyfonts/
stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "proggyfonts-0.1";
src = fetchurl {
pkgs/data/fonts/public-sans/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "1.005";
in fetchzip rec {
in fetchzip {
name = "public-sans-${version}";
url = "https://github.com/uswds/public-sans/releases/download/v${version}/public-sans-v${version}.zip";
pkgs/data/fonts/redhat-liberation-fonts/default.nix
+2 -2
View File
@@ -50,13 +50,13 @@ let
};
in {
liberation_ttf_v1 = common rec {
liberation_ttf_v1 = common {
repo = "liberation-1.7-fonts";
version = "1.07.5";
nativeBuildInputs = [ fontforge ];
sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v";
};
liberation_ttf_v2 = common rec {
liberation_ttf_v2 = common {
repo = "liberation-fonts";
version = "2.00.4";
nativeBuildInputs = [ fontforge fonttools ];
pkgs/data/fonts/redhat-official/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, fetchzip }:
let version = "2.2.0"; in
fetchzip rec {
fetchzip {
name = "redhat-official-${version}";
url = "https://github.com/RedHatOfficial/RedHatFont/archive/${version}.zip";
pkgs/data/fonts/roboto-mono/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@ let
# last commit on the directory containing the fonts in the upstream repository
commit = "883939708704a19a295e0652036369d22469e8dc";
in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "roboto-mono";
version = "2016-01-11";
pkgs/data/fonts/roboto-slab/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@ let
# last commit on the directory containing the fonts in the upstream repository
commit = "883939708704a19a295e0652036369d22469e8dc";
in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "roboto-slab";
version = "2016-01-11";
pkgs/data/fonts/roboto/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "2.138";
in fetchzip rec {
in fetchzip {
name = "roboto-${version}";
url = "https://github.com/google/roboto/releases/download/v${version}/roboto-unhinted.zip";
pkgs/data/fonts/route159/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ let
pname = "route159";
in
fetchzip rec {
fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
pkgs/data/fonts/sahel-fonts/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
pname = "sahel-fonts";
version = "1.0.0-alpha22";
in fetchFromGitHub rec {
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
pkgs/data/fonts/samim-fonts/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
pname = "samim-fonts";
version = "3.1.0";
in fetchFromGitHub rec {
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
pkgs/data/fonts/sarasa-gothic/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "0.8.0";
in fetchurl rec {
in fetchurl {
name = "sarasa-gothic-${version}";
url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
pkgs/data/fonts/seshat/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ let
pname = "seshat";
in
fetchzip rec {
fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}.zip";
pkgs/data/fonts/shabnam-fonts/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
pname = "shabnam-fonts";
version = "4.0.0";
in fetchFromGitHub rec {
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
pkgs/data/fonts/spleen/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
pname = "spleen";
version = "1.0.5";
in fetchurl rec {
in fetchurl {
name = "${pname}-${version}";
url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz";
pkgs/data/fonts/stix-otf/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "1.1.1";
in fetchzip rec {
in fetchzip {
name = "stix-otf-${version}";
url = "http://ftp.fi.muni.cz/pub/linux/gentoo/distfiles/STIXv${version}-word.zip";
pkgs/data/fonts/sudo/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "0.37";
in fetchzip rec {
in fetchzip {
name = "sudo-font-${version}";
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
sha256 = "16x6vs016wz6rmd4p248ri9fn35xq7r3dc8hv4w2c4rz1xl8c099";
pkgs/data/fonts/tenderness/default.nix
+1 -1
View File
@@ -6,7 +6,7 @@ let
pname = "tenderness";
in
fetchzip rec {
fetchzip {
name = "${pname}-font-${majorVersion}.${minorVersion}";
url = "http://dotcolon.net/DL/font/${pname}_${majorVersion}${minorVersion}.zip";
pkgs/data/fonts/terminus-font-ttf/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
let
version = "4.47.0";
in fetchzip rec {
in fetchzip {
name = "terminus-font-ttf-${version}";
url = "http://files.ax86.net/terminus-ttf/files/${version}/terminus-ttf-${version}.zip";
pkgs/data/fonts/ubuntu-font-family/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, fetchzip }:
fetchzip rec {
fetchzip {
name = "ubuntu-font-family-0.83";
url = "https://assets.ubuntu.com/v1/fad7939b-ubuntu-font-family-0.83.zip";
pkgs/data/fonts/ucs-fonts/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, mkfontdir, mkfontscale }:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "ucs-fonts";
version = "20090406";
pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
version = "1.0";
in
fetchzip rec {
fetchzip {
name = "ultimate-oldschool-pc-font-pack-${version}";
url = "http://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip";
sha256 = "0hid4dgqfy2w26734vcw2rxmpacd9vd1r2qpdr9ww1n3kgc92k9y";
pkgs/data/fonts/vazir-fonts/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
pname = "vazir-fonts";
version = "19.2.0";
in fetchFromGitHub rec {
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "rastikerdar";
pkgs/data/fonts/vdrsymbols/default.nix
+1 -1
View File
@@ -1,6 +1,6 @@
{ lib, fetchzip }:
fetchzip rec {
fetchzip {
name = "vdrsymbols-20100612";
url = http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz;
pkgs/data/fonts/xkcd-font/default.nix
+1 -1
View File
@@ -3,7 +3,7 @@
let
pname = "xkcd-font";
version = "unstable-2017-08-24";
in fetchFromGitHub rec {
in fetchFromGitHub {
name = "${pname}-${version}";
owner = "ipython";