diff options
Diffstat (limited to 'pkgs/data')
81 files changed, 82 insertions, 82 deletions
diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix index a53ead29c1e8..7297d18df277 100644 --- a/pkgs/data/documentation/bgnet/default.nix +++ b/pkgs/data/documentation/bgnet/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, python, zip, fop }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "bgnet"; version = "3.0.21"; diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index d90fa99dd702..b3b2b956de87 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "std-man-pages-4.4.0"; src = fetchurl { diff --git a/pkgs/data/fonts/aileron/default.nix b/pkgs/data/fonts/aileron/default.nix index ee85ee598827..4961a5e7449d 100644 --- a/pkgs/data/fonts/aileron/default.nix +++ b/pkgs/data/fonts/aileron/default.nix @@ -6,7 +6,7 @@ let pname = "aileron"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/data/fonts/ankacoder/condensed.nix index 53f4d94b38fe..0b6340d1ba94 100644 --- a/pkgs/data/fonts/ankacoder/condensed.nix +++ b/pkgs/data/fonts/ankacoder/condensed.nix @@ -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"; diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix index 52e2d4a42330..3a57d08dbc28 100644 --- a/pkgs/data/fonts/ankacoder/default.nix +++ b/pkgs/data/fonts/ankacoder/default.nix @@ -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"; diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/data/fonts/behdad-fonts/default.nix index 8b4228ec4235..a0fcd5f7bbf5 100644 --- a/pkgs/data/fonts/behdad-fonts/default.nix +++ b/pkgs/data/fonts/behdad-fonts/default.nix @@ -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"; diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix index 29bd001f8089..b1f9312a7e9c 100644 --- a/pkgs/data/fonts/caladea/default.nix +++ b/pkgs/data/fonts/caladea/default.nix @@ -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"; diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix index 3c0e314579de..79913bb83980 100644 --- a/pkgs/data/fonts/carlito/default.nix +++ b/pkgs/data/fonts/carlito/default.nix @@ -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"; diff --git a/pkgs/data/fonts/dina-pcf/default.nix b/pkgs/data/fonts/dina-pcf/default.nix index 061bbb445fb2..eff0c579a707 100644 --- a/pkgs/data/fonts/dina-pcf/default.nix +++ b/pkgs/data/fonts/dina-pcf/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unzip, bdftopcf, mkfontdir, mkfontscale}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "2.92"; pname = "dina-font-pcf"; diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index 8638ec74f77a..0d4cd286219e 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -2,7 +2,7 @@ let version = "2.92"; -in fetchzip rec { +in fetchzip { name = "dina-font-${version}"; # `meta.homepage` has no direct download link diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index 0e31231d05fc..351a0617ddc8 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, mkfontdir, mkfontscale }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "envypn-font-1.7.1"; src = fetchurl { diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/data/fonts/eunomia/default.nix index 55250156fcd0..de68b17d6ebb 100644 --- a/pkgs/data/fonts/eunomia/default.nix +++ b/pkgs/data/fonts/eunomia/default.nix @@ -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"; diff --git a/pkgs/data/fonts/f5_6/default.nix b/pkgs/data/fonts/f5_6/default.nix index 28969f02364a..175648198cee 100644 --- a/pkgs/data/fonts/f5_6/default.nix +++ b/pkgs/data/fonts/f5_6/default.nix @@ -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"; diff --git a/pkgs/data/fonts/ferrum/default.nix b/pkgs/data/fonts/ferrum/default.nix index ec3f3218ea56..fe40252ab23d 100644 --- a/pkgs/data/fonts/ferrum/default.nix +++ b/pkgs/data/fonts/ferrum/default.nix @@ -6,7 +6,7 @@ let pname = "ferrum"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix index 422258f84d11..bcf02f1328e6 100644 --- a/pkgs/data/fonts/font-awesome-5/default.nix +++ b/pkgs/data/fonts/font-awesome-5/default.nix @@ -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}"; diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 707beb41231d..7c1af485a989 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "google-fonts"; version = "2019-07-14"; diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index ef0df1ba67f6..3c49bf7f5656 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -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"; diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix index 759d2c2db1d2..23f6fb29be07 100644 --- a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix +++ b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix @@ -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"; diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/data/fonts/hyperscrypt/default.nix index 362781c05bb5..726fbab95bd8 100644 --- a/pkgs/data/fonts/hyperscrypt/default.nix +++ b/pkgs/data/fonts/hyperscrypt/default.nix @@ -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"; diff --git a/pkgs/data/fonts/ia-writer-duospace/default.nix b/pkgs/data/fonts/ia-writer-duospace/default.nix index a042a31f1d02..1d910ed54a4b 100644 --- a/pkgs/data/fonts/ia-writer-duospace/default.nix +++ b/pkgs/data/fonts/ia-writer-duospace/default.nix @@ -2,7 +2,7 @@ let version = "20180721"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "ia-writer-duospace-${version}"; owner = "iaolo"; diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index 7e1014da2102..7401c5694624 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -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 = '' diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 94c43b11285e..a170a0780a48 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -1,6 +1,6 @@ { stdenv, google-fonts }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "inconsolata"; inherit (google-fonts) src version; diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index d079ae59b0d6..3bc836fa4e48 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -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 diff --git a/pkgs/data/fonts/inriafonts/default.nix b/pkgs/data/fonts/inriafonts/default.nix index 52c28db639ef..5a8e3476bf80 100644 --- a/pkgs/data/fonts/inriafonts/default.nix +++ b/pkgs/data/fonts/inriafonts/default.nix @@ -3,7 +3,7 @@ let pname = "inriafonts"; version = "1.200"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "BlackFoundry"; repo = "InriaFonts"; diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 0676d3c0e1f6..3e5dda85dccd 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -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"; diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix index 1501e0fb7fa2..eef3883506ef 100644 --- a/pkgs/data/fonts/ir-standard-fonts/default.nix +++ b/pkgs/data/fonts/ir-standard-fonts/default.nix @@ -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; diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix index c1de2806ef18..f6a031c7faf0 100644 --- a/pkgs/data/fonts/kawkab-mono/default.nix +++ b/pkgs/data/fonts/kawkab-mono/default.nix @@ -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"; diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index 2152b960cdc2..eb0a47e13d96 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fontforge }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "linux-libertine-5.3.0"; src = fetchurl { diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/data/fonts/luculent/default.nix index fe733359f3a8..7e5a69a2c1f7 100644 --- a/pkgs/data/fonts/luculent/default.nix +++ b/pkgs/data/fonts/luculent/default.nix @@ -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; diff --git a/pkgs/data/fonts/medio/default.nix b/pkgs/data/fonts/medio/default.nix index 024e6049a386..c94046f085f9 100644 --- a/pkgs/data/fonts/medio/default.nix +++ b/pkgs/data/fonts/medio/default.nix @@ -6,7 +6,7 @@ let pname = "medio"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/pkgs/data/fonts/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix index c4cf4f142516..06fb7499b81b 100644 --- a/pkgs/data/fonts/monoid/default.nix +++ b/pkgs/data/fonts/monoid/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, python, fontforge }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "monoid"; version = "2016-07-21"; diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 03bc8a0db4da..75e8899e664a 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -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"; diff --git a/pkgs/data/fonts/myrica/default.nix b/pkgs/data/fonts/myrica/default.nix index f3be8857284c..444d526f5ae1 100644 --- a/pkgs/data/fonts/myrica/default.nix +++ b/pkgs/data/fonts/myrica/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: -fetchFromGitHub rec { +fetchFromGitHub { name = "myrica-2.011.20160403"; owner = "tomokuni"; diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index b39a59d1ba7a..d2aaadc42794 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nafees"; srcs = [(fetchurl { diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/data/fonts/nanum-gothic-coding/default.nix index f6b8210290e7..7d908b62cc6d 100644 --- a/pkgs/data/fonts/nanum-gothic-coding/default.nix +++ b/pkgs/data/fonts/nanum-gothic-coding/default.nix @@ -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"; diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/data/fonts/nika-fonts/default.nix index c6bdbd40248a..3f58bc5f9336 100644 --- a/pkgs/data/fonts/nika-fonts/default.nix +++ b/pkgs/data/fonts/nika-fonts/default.nix @@ -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"; diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix index 0de5aa8fdf3e..ae70c74c3e49 100644 --- a/pkgs/data/fonts/norwester/default.nix +++ b/pkgs/data/fonts/norwester/default.nix @@ -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"; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 0acb8e2c7bed..bd0d39c7f29e 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -46,7 +46,7 @@ let }; in -rec { +{ noto-fonts = mkNoto { name = "noto-fonts"; weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}"; diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index 7db2d9ef75a6..f102c8cfeb2b 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, pythonPackages, lib }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonPackage { version = "2017-09-25"; pname = "nototools"; diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix index dfe1426d697a..0c1293ebda3f 100644 --- a/pkgs/data/fonts/open-sans/default.nix +++ b/pkgs/data/fonts/open-sans/default.nix @@ -3,7 +3,7 @@ let pname = "open-sans"; version = "1.11"; -in fetchFromGitLab rec { +in fetchFromGitLab { name = "${pname}-${version}"; domain = "salsa.debian.org"; diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/data/fonts/parastoo-fonts/default.nix index d02925e3a375..d297baddc4d7 100644 --- a/pkgs/data/fonts/parastoo-fonts/default.nix +++ b/pkgs/data/fonts/parastoo-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "parastoo-fonts"; version = "1.0.0-alpha5"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index e6f0776daea0..6b619d232016 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip }: -fetchzip rec { +fetchzip { name = "paratype-pt-mono"; url = [ diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index 1e6610e8e44d..a36928090264 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip }: -fetchzip rec { +fetchzip { name = "paratype-pt-sans"; url = [ diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index f4da6508f083..d74295571e00 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -1,6 +1,6 @@ { stdenv, fetchzip }: -fetchzip rec { +fetchzip { name = "paratype-pt-serif"; url = [ diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index 144ec3bab850..1fc252421de6 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -4,7 +4,7 @@ let version = "5.4"; in -fetchurl rec { +fetchurl { name = "pecita-${version}"; url = "http://pecita.eu/b/Pecita.otf"; diff --git a/pkgs/data/fonts/penna/default.nix b/pkgs/data/fonts/penna/default.nix index 57395c507fe0..784f9d2573ef 100644 --- a/pkgs/data/fonts/penna/default.nix +++ b/pkgs/data/fonts/penna/default.nix @@ -6,7 +6,7 @@ let pname = "penna"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix index c28c9283a9bc..89565910f7a5 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/data/fonts/profont/default.nix @@ -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"; diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index b2207e01df1a..580ea61a2df5 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -2,7 +2,7 @@ # adapted from https://aur.archlinux.org/packages/proggyfonts/ -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "proggyfonts-0.1"; src = fetchurl { diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix index 14c66fb39b22..46ebe4dd4b27 100644 --- a/pkgs/data/fonts/public-sans/default.nix +++ b/pkgs/data/fonts/public-sans/default.nix @@ -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"; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 61206ca5d14b..6d075424bc52 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -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 ]; diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix index c05b9c69aef5..33321a2c7fe1 100644 --- a/pkgs/data/fonts/redhat-official/default.nix +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -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"; diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix index d55e3b753dd7..cfd4e3808aa3 100644 --- a/pkgs/data/fonts/roboto-mono/default.nix +++ b/pkgs/data/fonts/roboto-mono/default.nix @@ -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"; diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix index 548414152ddb..f9f6ec342e91 100644 --- a/pkgs/data/fonts/roboto-slab/default.nix +++ b/pkgs/data/fonts/roboto-slab/default.nix @@ -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"; diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index 707d31ac531a..50629c5f9773 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -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"; diff --git a/pkgs/data/fonts/route159/default.nix b/pkgs/data/fonts/route159/default.nix index 1b8d4e60653c..cbc89c550b3c 100644 --- a/pkgs/data/fonts/route159/default.nix +++ b/pkgs/data/fonts/route159/default.nix @@ -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"; diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix index 0b90a43ca3e2..029ed33611f4 100644 --- a/pkgs/data/fonts/sahel-fonts/default.nix +++ b/pkgs/data/fonts/sahel-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "sahel-fonts"; version = "1.0.0-alpha22"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/data/fonts/samim-fonts/default.nix index dd4a01c782ee..d8d3d0d3b5ae 100644 --- a/pkgs/data/fonts/samim-fonts/default.nix +++ b/pkgs/data/fonts/samim-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "samim-fonts"; version = "3.1.0"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index f46fda0dd310..2d9fbfdae050 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -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"; diff --git a/pkgs/data/fonts/seshat/default.nix b/pkgs/data/fonts/seshat/default.nix index af3c5dd25ee0..71483a04cbb7 100644 --- a/pkgs/data/fonts/seshat/default.nix +++ b/pkgs/data/fonts/seshat/default.nix @@ -6,7 +6,7 @@ let pname = "seshat"; in -fetchzip rec { +fetchzip { name = "${pname}-font-${majorVersion}.${minorVersion}"; url = "http://dotcolon.net/DL/font/${pname}.zip"; diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix index 89bca56a53ef..5834b797eeab 100644 --- a/pkgs/data/fonts/shabnam-fonts/default.nix +++ b/pkgs/data/fonts/shabnam-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "shabnam-fonts"; version = "4.0.0"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 873528b8bde1..2964b8692dcc 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -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"; diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix index f5d15439079d..f3ff9600f5de 100644 --- a/pkgs/data/fonts/stix-otf/default.nix +++ b/pkgs/data/fonts/stix-otf/default.nix @@ -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"; diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index bfc66a77207f..d4192631c2ad 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -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"; diff --git a/pkgs/data/fonts/tenderness/default.nix b/pkgs/data/fonts/tenderness/default.nix index 958af414ff09..09ea566e7382 100644 --- a/pkgs/data/fonts/tenderness/default.nix +++ b/pkgs/data/fonts/tenderness/default.nix @@ -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"; diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index 211cc73cc9de..bdd0fd7762b6 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -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"; diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 5f072f90f055..7c90c16d4d1e 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -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"; diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index f1545e3d5b45..0ea0363763dc 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, mkfontdir, mkfontscale }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "ucs-fonts"; version = "20090406"; diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix index 35551e929e64..f9045794fe15 100644 --- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix +++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix @@ -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"; diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix index d004e75571b7..f39867538099 100755 --- a/pkgs/data/fonts/vazir-fonts/default.nix +++ b/pkgs/data/fonts/vazir-fonts/default.nix @@ -3,7 +3,7 @@ let pname = "vazir-fonts"; version = "19.2.0"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "rastikerdar"; diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix index 01a4072099ad..fd74897077f3 100644 --- a/pkgs/data/fonts/vdrsymbols/default.nix +++ b/pkgs/data/fonts/vdrsymbols/default.nix @@ -1,6 +1,6 @@ { lib, fetchzip }: -fetchzip rec { +fetchzip { name = "vdrsymbols-20100612"; url = http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz; diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix index 0e996da2fc7c..e5dd11db72a7 100644 --- a/pkgs/data/fonts/xkcd-font/default.nix +++ b/pkgs/data/fonts/xkcd-font/default.nix @@ -3,7 +3,7 @@ let pname = "xkcd-font"; version = "unstable-2017-08-24"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "ipython"; diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index 49d289cac391..a623af206048 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "maia-icon-theme"; version = "2018-02-24"; diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix index 54b54d278ffb..f1e0604acf86 100644 --- a/pkgs/data/misc/brise/default.nix +++ b/pkgs/data/misc/brise/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, librime }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "brise-unstable-2017-09-16"; src = fetchFromGitHub { diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index a99df2e7bd65..99739646a8ba 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -15,7 +15,7 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nss-cacert-${nss.version}"; src = nss.src; diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 38662bef0af3..8cbd526f3d3b 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -6,7 +6,7 @@ let url = "https://geolite.maxmind.com/download/geoip/database/${src}"; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "geolite-legacy"; version = "2017-12-02"; diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix index 71fe32c10665..4814232fbfe7 100644 --- a/pkgs/data/misc/nixos-artwork/default.nix +++ b/pkgs/data/misc/nixos-artwork/default.nix @@ -1,5 +1,5 @@ { callPackage }: -rec { +{ wallpapers = callPackage ./wallpapers.nix { }; } diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/data/misc/pari-galdata/default.nix index 1b6b60f104e0..2535e8cfc250 100644 --- a/pkgs/data/misc/pari-galdata/default.nix +++ b/pkgs/data/misc/pari-galdata/default.nix @@ -2,7 +2,7 @@ , fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "20080411"; pname = "pari-galdata"; diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/data/misc/pari-seadata-small/default.nix index 2d3d52f697ed..3470a0804f74 100644 --- a/pkgs/data/misc/pari-seadata-small/default.nix +++ b/pkgs/data/misc/pari-seadata-small/default.nix @@ -2,7 +2,7 @@ , fetchurl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { version = "20090618"; pname = "pari-seadata-small"; diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/data/misc/publicsuffix-list/default.nix index b5414ab18b4d..ca79e251f28a 100644 --- a/pkgs/data/misc/publicsuffix-list/default.nix +++ b/pkgs/data/misc/publicsuffix-list/default.nix @@ -3,7 +3,7 @@ let pname = "publicsuffix-list"; version = "2019-05-24"; -in fetchFromGitHub rec { +in fetchFromGitHub { name = "${pname}-${version}"; owner = "publicsuffix"; repo = "list"; diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 79924c4832f6..6952d2da6bad 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -2,7 +2,7 @@ , libxml2, glib}: let version = "1.12"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "shared-mime-info"; inherit version; diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index 09ca8897a216..db0b4ec66104 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "matcha"; version = "2019-06-22"; |