diff options
Diffstat (limited to 'nixpkgs/pkgs/data')
48 files changed, 477 insertions, 210 deletions
diff --git a/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix b/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix index ebd171c65455..6e2122091872 100644 --- a/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "https://help.gnome.org/users/gnome-help/"; license = licenses.cc-by-30; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/data/documentation/man-pages/default.nix b/nixpkgs/pkgs/data/documentation/man-pages/default.nix index a8f38b1a6c6a..d31272c2a5fb 100644 --- a/nixpkgs/pkgs/data/documentation/man-pages/default.nix +++ b/nixpkgs/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "man-pages"; - version = "5.09"; + version = "5.11"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; - sha256 = "1whbxim4diyan97y9pz9k4ck16rmjalw5i1m0dg6ycv3pxv386nz"; + sha256 = "sha256-PtpdzlGEWZ7Dfa40lM+WTFUDYumkH7ckeS2mEL2xPKo="; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; diff --git a/nixpkgs/pkgs/data/fonts/3270font/default.nix b/nixpkgs/pkgs/data/fonts/3270font/default.nix index dacfdfbcceae..d737c9383f15 100644 --- a/nixpkgs/pkgs/data/fonts/3270font/default.nix +++ b/nixpkgs/pkgs/data/fonts/3270font/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2.2.1"; + version = "2.3.0"; in fetchzip { name = "3270font-${version}"; - url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_70de9c7.zip"; + url = "https://github.com/rbanffy/3270font/releases/download/v${version}/3270_fonts_fd00815.zip"; - sha256 = "0spz9abp87r3bncjim6hs47fmhg86qbgips4x6nfpqzg5qh2xd2m"; + sha256 = "0ny2jcsfa1kfzkm979dfzqv756ijm5xirm02ln7a4kwhxxsm5xr1"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix b/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix index 7f934658479a..e09ad70f1468 100644 --- a/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix +++ b/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2009.22"; + version = "2102.25"; in fetchzip { name = "cascadia-code-${version}"; url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; - sha256 = "0wdkjzaf5a14yfiqqqn6wvi6db6r7g1m5r07cg9730b0mkzhfyhl"; + sha256 = "14qhawcf1jmv68zdfbi2zfqdw4cf8fpk7plxzphmkqsp7hlw9pzx"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/nixpkgs/pkgs/data/fonts/curie/default.nix b/nixpkgs/pkgs/data/fonts/curie/default.nix new file mode 100644 index 000000000000..fd21d1964a21 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/curie/default.nix @@ -0,0 +1,29 @@ +{ lib, fetchurl }: + +let + version = "1.0"; +in fetchurl rec { + name = "curie-${version}"; + + url = "https://github.com/NerdyPepper/curie/releases/download/v${version}/curie-v${version}.tar.gz"; + + downloadToTemp = true; + + recursiveHash = true; + + sha256 = "sha256-twPAzsbTveYW0rQd7FYZz5AMZgvPbNmn5c7Nfzn7B0A="; + + postFetch = '' + tar xzf $downloadedFile + mkdir -p $out/share/fonts/misc + install *.otb $out/share/fonts/misc + ''; + + meta = with lib; { + description = "An upscaled version of scientifica"; + homepage = "https://github.com/NerdyPepper/curie"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/input-fonts/default.nix b/nixpkgs/pkgs/data/fonts/input-fonts/default.nix index 9956325e15bc..36a18c1f8f1c 100644 --- a/nixpkgs/pkgs/data/fonts/input-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/input-fonts/default.nix @@ -1,31 +1,76 @@ -{ lib, stdenv, requireFile, unzip }: +{ lib +, stdenv +, fetchzip +, python3 +, config +, acceptLicense ? config.input-fonts.acceptLicense or false +}: -stdenv.mkDerivation { - pname = "input-fonts"; - version = "2019-11-25"; # date of the download and checksum +let - src = requireFile { - name = "Input-Font.zip"; - url = "https://input.fontbureau.com/download/"; - sha256 = "10rax2a7vzidcs7kyfg5lv5bwp9i7kvjpdcsd10p0517syijkp3b"; - }; + throwLicense = throw '' + Input is available free of charge for private/unpublished usage. This includes things like your personal coding app or for composing plain text documents. + To use it, you need to agree to its license: https://input.djr.com/license/ + + You can express acceptance by setting acceptLicense to true in your + configuration. Note that this is not a free license so it requires allowing + unfree licenses. + + configuration.nix: + nixpkgs.config.allowUnfree = true; + nixpkgs.config.input-fonts.acceptLicense = true; + + config.nix: + allowUnfree = true; + input-fonts.acceptLicense = true; + + If you would like to support this project, consider purchasing a license at <http://input.djr.com/buy>. + ''; - nativeBuildInputs = [ unzip ]; + releaseDate = "2015-06-24"; - phases = [ "unpackPhase" "installPhase" ]; +in - sourceRoot = "."; +stdenv.mkDerivation rec { + pname = "input-fonts"; + version = "1.2"; + + src = + assert !acceptLicense -> throwLicense; + fetchzip { + name = "input-fonts-${version}"; + # Add .zip parameter so that zip unpackCmd can match it. + url = "https://input.djr.com/build/?fontSelection=whole&a=0&g=0&i=0&l=0&zero=0&asterisk=0&braces=0&preset=default&line-height=1.2&accept=I+do&email=&.zip"; + sha256 = "BESZ4Bjgm2hvQ7oPpMvYSlE8EqvQjqHZtXWIovqyIzA="; + stripRoot = false; + + extraPostFetch = '' + # Reset the timestamp to release date for determinism. + PATH=${lib.makeBinPath [ python3.pkgs.fonttools ]}:$PATH + for ttf_file in $out/Input_Fonts/*/*/*.ttf; do + ttx_file=$(dirname "$ttf_file")/$(basename "$ttf_file" .ttf).ttx + ttx "$ttf_file" + rm "$ttf_file" + touch -m -t ${builtins.replaceStrings [ "-" ] [ "" ] releaseDate}0000 "$ttx_file" + ttx --recalc-timestamp "$ttx_file" + rm "$ttx_file" + done + ''; + }; + + dontConfigure = true; + dontBuild = true; installPhase = '' + runHook preInstall + mkdir -p $out/share/fonts/truetype find Input_Fonts -name "*.ttf" -exec cp -a {} "$out"/share/fonts/truetype/ \; mkdir -p "$out"/share/doc cp -a *.txt "$out"/share/doc/ - ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "15sdhqqqd4jgk80fw7ncx49avi9cxbdgyrvnrfya0066x4q4r6lv"; + runHook postInstall + ''; meta = with lib; { description = "Fonts for Code, from Font Bureau"; @@ -42,9 +87,12 @@ stdenv.mkDerivation { generous spacing, large punctuation, and easily distinguishable characters — but without the limitations of a fixed width. ''; - homepage = "https://input.fontbureau.com"; + homepage = "https://input.djr.com/"; license = licenses.unfree; - maintainers = with maintainers; [ romildo ]; + maintainers = with maintainers; [ + jtojnar + romildo + ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/data/fonts/inter-ui/default.nix b/nixpkgs/pkgs/data/fonts/inter-ui/default.nix deleted file mode 100644 index 37b48f7ceb2f..000000000000 --- a/nixpkgs/pkgs/data/fonts/inter-ui/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, fetchzip }: - -# XXX: IMPORTANT: -# For compat, keep this at the last version that used the name "Inter UI" -# For newer versions, which are now simply named "Inter", -# see the expression for `inter` (../inter/default.nix). -let - version = "3.2"; -in fetchzip { - name = "inter-ui-${version}"; - - url = "https://github.com/rsms/inter/releases/download/v${version}/Inter-UI-${version}.zip"; - - postFetch = '' - mkdir -p $out/share/fonts/opentype - unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - ''; - - sha256 = "01d2ql803jrhss6g60djvs08x9xl7z6b3snkn03vqnrajdgifcl4"; - - meta = with lib; { - homepage = "https://rsms.me/inter/"; - description = "A typeface specially designed for user interfaces"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ demize ]; - }; -} - diff --git a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index e9fad77e8c0a..26d67ba170e1 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "4.5.0"; + version = "5.0.5"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/nixpkgs/pkgs/data/fonts/iosevka/default.nix index cbdd309db5e5..04e5b48bd0bd 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal +{ stdenv, lib, nodejs, nodePackages, remarshal , ttfautohint-nox # Custom font set options. # See https://typeof.net/Iosevka/customizer diff --git a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 8ee3206d0705..6c31d3edb742 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,24 +1,26 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1ic5w8w4v27vfq7pvx9wv2zdcsj16xi71ln2a3fb4kh93zj84kl8"; - iosevka-aile = "1qv2b4zcz172knvr39argqshjpin1lidlafilfcm569cp8rasrdd"; - iosevka-curly = "0x9pdgyiab8hibyf1yrwn6cr90aqy9ygyk1zz9nqzcndk5mk54p4"; - iosevka-curly-slab = "0mxnbf9dwq3iq5dc0cgrdqf2dlyymylv46psb83n5kra4rz1wxnb"; - iosevka-etoile = "1rz9dkpiwwfjnhiajfxg3rrnf4lyxnynx89qswg0b8wql4q6bz71"; - iosevka-slab = "17p0cf4k8k3kabqp0b1anqqj8phfw7nnxiiscnngbrxhdvhpp62n"; - iosevka-sparkle = "0ip46lcq7gcv77ar6vqz51lhf448fd0nviijfpqfg7gdywdzalm0"; - iosevka-ss01 = "1v1z2rx7r6nb45i3qcb9pvilm6yxxkl5ks7ldmm902cx67pkv7rj"; - iosevka-ss02 = "1pd4sbr1p1cf9917nnn22v1kah8jfgm9jpfvq1j51wyr8lnxqz2k"; - iosevka-ss03 = "0pdbvrzilrxxcaz9gnhnqxvk4ipfxcgys41sasl3znxzij1ary8s"; - iosevka-ss04 = "08xwdp5s3dp30qy81j3qwhhqk1bibcpnh2i00a3kyw3g6jsnsvmp"; - iosevka-ss05 = "1njf1ysd42k2rc2lvg5ilq6q2wvg8dlm04d7wygdamw0yx6sia83"; - iosevka-ss06 = "04g4m770i1b75gl1lanbs0ibmjj8vg5yfwyn6n0bidfn30z4n01l"; - iosevka-ss07 = "07f1n44f5bvifbns6572ys6zihac6yljv7frm58w7xgyl0a3prvg"; - iosevka-ss08 = "157cq5jfxvr0n7ksqln5mjmr800dbyfy8vwl0ngbf0aiq3mw2x8f"; - iosevka-ss09 = "0yib3mhb48g2vjiaviwgcl6lad4dbwwblnmv4zi880bdvz7jrwr9"; - iosevka-ss10 = "06s0s9x1fiqqmnkm42khasws40db7l68d2ycsm38mx6b62nlsbkr"; - iosevka-ss11 = "0yzy322zqas0id70i1p92x7fbim8gai0a61nf6bf33aq3qgsj2w8"; - iosevka-ss12 = "0lhmhwd4z44y4469av6na7k5w4ra47g98dxfi0mb42a4n4sq0k5j"; - iosevka-ss13 = "1cq91iqfgq4fsazi2pjh6l4n9mgci4aayqp7fiy8lydv7f1ym0z9"; - iosevka-ss14 = "0xid48yr2qfsh6kvlajlaqnb43ck351kg8r3bwpvzrdbvl809983"; + iosevka = "1fva80sxdcmsl8y3m23ndif3ff54if37g1xqpda1f13yrbd9ii8q"; + iosevka-aile = "0fy58yd17k8k41j5f48572d4vad3zz7c2mbc6vsiii9abfkwwalr"; + iosevka-curly = "1lxw8na3qvc5g04prczl7qprdkvd0zf91ybmv276dnkq27abnjn4"; + iosevka-curly-slab = "19b6xr5vjnb20j34x2ynfji63qibczn0mm2j76d01py304839bws"; + iosevka-etoile = "0fhcn69idb6w8abpmmvpdp9c08zdhy0zwn8nbyy9jcznwj8vwb7m"; + iosevka-slab = "0jlm3l13p9c965zx6z4df65lzxzj9yjjvpwlnx94ipayinxa1iff"; + iosevka-ss01 = "1i6bvslpxj87p3xi198l486ba40ixicdkmj29vcb1d7w1hhr6wnm"; + iosevka-ss02 = "1raczi1ja4barvjg5cp3j96kyph4aj8qlp9i10q7835sy29q3285"; + iosevka-ss03 = "0cn9hi5w9rx8xhbh9a75c7s9pxa3dkqfhd24lbp72hwfgv5nk1v0"; + iosevka-ss04 = "0v8fvif71604vyqanphq9mmlmx4xy0y2bykvplhrj1zmrj6v2ing"; + iosevka-ss05 = "1fh99av3ml2zhjvdif02r2f82n4hsswpgd2i42d964swjdplxdga"; + iosevka-ss06 = "0b0kl49djpc77qpmr1g2nzrg0q477xkjiqxb2i33pkrjsxn4vhn7"; + iosevka-ss07 = "1d2by3najsambqxyzapnmd200hah39jq0mqdalidb2kjh5lx9n6k"; + iosevka-ss08 = "05m03zn9pfl1khvl9xvgmlaygh1ni67lj2pc8zjgqydyls1vmxl4"; + iosevka-ss09 = "1hzglj7sclg6h4jc9ibb1777apl11885w1gpscv81b8n1h0qhnb7"; + iosevka-ss10 = "1fr52sclgp10k0lh86scjn3aylvsfnr7msg7jfsr3bkg61f5x1da"; + iosevka-ss11 = "1cmdjmlqvhn3qvqdfflwa4wgza364jn9gbj5vq8rsd6qili175ix"; + iosevka-ss12 = "0bk56hh9894z59rpkk5s9hhmkz1b2gmvfys46frijg3am54xh03q"; + iosevka-ss13 = "1kgxlxz1cdkzrfbnkavscf48im9lwiya9rcqlaa10k0ssas28br5"; + iosevka-ss14 = "06djgn86r2yy3ll2ask5mr9qhqibqzr7v95db5dzxcbz7hrmaaxf"; + iosevka-ss15 = "0qcld7h38c7cif518sa84x50igxjkh38ckav9qhhv7ls1n5h0jpm"; + iosevka-ss16 = "0qa6h8qx60rajbpp0v4wxia5n3yinp2nvwy2dsi1270prra7r49x"; + iosevka-ss17 = "1s04vlkll42am6w3lcka518zv2dlrwwnykdid0sp81najwmq0fk3"; } diff --git a/nixpkgs/pkgs/data/fonts/joypixels/default.nix b/nixpkgs/pkgs/data/fonts/joypixels/default.nix index d7442b345217..146b832af9c7 100644 --- a/nixpkgs/pkgs/data/fonts/joypixels/default.nix +++ b/nixpkgs/pkgs/data/fonts/joypixels/default.nix @@ -58,15 +58,15 @@ in stdenv.mkDerivation rec { pname = "joypixels"; - version = "6.0.0"; + version = "6.5.0"; src = assert !acceptLicense -> throwLicense; with systemSpecific; fetchurl { name = fontFile; url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}"; sha256 = { - darwin = "1s1dibgpv4lc9cwbgykgwjxxhg2rbn5g9fyd10r6apj9xhfn8cyn"; - }.${kernel.name} or "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s"; + darwin = "034bwxy6ljvhx9zlm6jkb8vw222sg79sjwlcjfql51rk6zkmv4wx"; + }.${kernel.name} or "1v6hz0qhbnzayxhs5j9qfa2ggn7nak53ij7kr06m93wcmlnnln86"; }; dontUnpack = true; @@ -82,9 +82,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The finest emoji you can use legally (formerly EmojiOne)"; longDescription = '' - New for 2020! JoyPixels 6.0 includes 3,342 originally crafted icon - designs and is 100% Unicode 13 compatible. We offer the largest selection - of files ranging from png, svg, iconjar, sprites, and fonts. + Updated for 2021! JoyPixels 6.5 includes 3,559 originally crafted icon + designs and is 100% Unicode 13.1 compatible. We offer the largest + selection of files ranging from png, svg, iconjar, sprites, and fonts. ''; homepage = "https://www.joypixels.com/fonts"; license = diff --git a/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/nixpkgs/pkgs/data/fonts/julia-mono/default.nix index 8774913c83cc..77083268b0c8 100644 --- a/nixpkgs/pkgs/data/fonts/julia-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -1,22 +1,26 @@ { lib, fetchzip }: let - version = "0.022"; + version = "0.035"; + in fetchzip { name = "JuliaMono-${version}"; url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono.zip"; - sha256 = "sha256-/MVT6n842sSiuPZNYxN3q1vn6yvMvmcTEDyvAd2GikA="; + sha256 = "sha256:17w8rn37wadxnmakhd6mpmqdx14dsrc3qym4k9b47albl1a34i1j"; postFetch = '' mkdir -p $out/share/fonts/truetype unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - meta = { + meta = with lib; { description = "A monospaced font for scientific and technical computing"; - maintainers = with lib.maintainers; [ suhr ]; - platforms = with lib.platforms; all; - homepage = "https://juliamono.netlify.app/"; - license = lib.licenses.ofl; + longDescription = '' + JuliaMono is a monospaced typeface designed for use in text editing environments that require a wide range of specialist and technical Unicode characters. It was intended as a fun experiment to be presented at the 2020 JuliaCon conference in Lisbon, Portugal (which of course didn’t physically happen in Lisbon, but online). + ''; + maintainers = with maintainers; [ suhr ]; + platforms = with platforms; all; + homepage = "https://cormullion.github.io/pages/2020-07-26-JuliaMono/"; + license = licenses.ofl; }; } diff --git a/nixpkgs/pkgs/data/fonts/kreative-square-fonts/default.nix b/nixpkgs/pkgs/data/fonts/kreative-square-fonts/default.nix new file mode 100644 index 000000000000..c9e51319733f --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/kreative-square-fonts/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub }: + +let + pname = "kreative-square-fonts"; + version = "unstable-2021-01-29"; +in +fetchFromGitHub { + name = "${pname}-${version}"; + + owner = "kreativekorp"; + repo = "open-relay"; + rev = "084f05af3602307499981651eca56851bec01fca"; + + postFetch = '' + tar xf $downloadedFile --strip=1 + install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquare.ttf + install -Dm444 -t $out/share/fonts/truetype/ KreativeSquare/KreativeSquareSM.ttf + ''; + sha256 = "15vvbbzv6b3jh7lxg77viycdd7yf3y8lxy54vs3rsrsxwncg0pak"; + + meta = with lib; { + description = "Fullwidth scalable monospace font designed specifically to support pseudographics, semigraphics, and private use characters"; + homepage = "https://www.kreativekorp.com/software/fonts/ksquare.shtml"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.linus ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/montserrat/default.nix b/nixpkgs/pkgs/data/fonts/montserrat/default.nix index de8ea80b0175..41135122f054 100644 --- a/nixpkgs/pkgs/data/fonts/montserrat/default.nix +++ b/nixpkgs/pkgs/data/fonts/montserrat/default.nix @@ -1,29 +1,28 @@ -# Originally packaged for ArchLinux. -# -# https://aur.archlinux.org/packages/ttf-montserrat/ - -{ lib, fetchzip }: +{ lib, fetchFromGitHub }: let - version = "1.0"; -in fetchzip { - name = "montserrat-${version}"; - - url = "https://marvid.fr/~eeva/mirror/Montserrat.tar.gz"; + pname = "montserrat"; + version = "7.210"; +in fetchFromGitHub { + name = "${pname}-${version}"; + owner = "JulietaUla"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-C6T0Iz1rFC+EsKFJRil2jGTMQ4X7wR80E3eORL5qi0U="; postFetch = '' - tar -xzf $downloadedFile --strip-components=1 - mkdir -p $out/share/fonts/montserrat - cp *.ttf $out/share/fonts/montserrat + tar xf $downloadedFile --strip 1 + install -Dm 444 fonts/otf/*.otf -t $out/share/fonts/otf + install -Dm 444 fonts/ttf/*.ttf -t $out/share/fonts/ttf + install -Dm 444 fonts/webfonts/*.woff -t $out/share/fonts/woff + install -Dm 444 fonts/webfonts/*.woff2 -t $out/share/fonts/woff2 ''; - sha256 = "11sdgvhaqg59mq71aqwqp2mb428984hjxy7hd1vasia9kgk8259w"; - meta = with lib; { description = "A geometric sans serif font with extended latin support (Regular, Alternates, Subrayada)"; - homepage = "https://www.fontspace.com/julieta-ulanovsky/montserrat"; - license = licenses.ofl; - platforms = platforms.all; - maintainers = with maintainers; [ scolobb ]; + homepage = "https://www.fontspace.com/julieta-ulanovsky/montserrat"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ scolobb jk ]; }; } diff --git a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix index c70e758a8321..a2f96a5e980f 100644 --- a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix @@ -4,7 +4,6 @@ , fetchFromGitHub , fetchurl , fetchzip -, optipng , cairo , python3 , pkg-config diff --git a/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix b/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix index f5bd6335dfbb..c43ff3a313f2 100644 --- a/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix +++ b/nixpkgs/pkgs/data/fonts/noto-fonts/tools.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, lib, buildPythonPackage, pythonOlder , afdko, appdirs, attrs, black, booleanoperations, brotlipy, click -, defcon, fontmath, fontparts, fontpens, fonttools, fs, lxml +, defcon, fontmath, fontparts, fontpens, fonttools, lxml , mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour , toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli , pillow, six, bash, setuptools_scm }: diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix index 6b1cd370241b..4dd6093922cc 100644 --- a/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix +++ b/nixpkgs/pkgs/data/fonts/paratype-pt/mono.nix @@ -3,7 +3,7 @@ fetchzip { name = "paratype-pt-mono"; - url = [ + urls = [ "https://company.paratype.com/system/attachments/631/original/ptmono.zip" "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip" ]; diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix index d6b783ebe4c7..8b47dd9ee1fb 100644 --- a/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix +++ b/nixpkgs/pkgs/data/fonts/paratype-pt/sans.nix @@ -3,7 +3,7 @@ fetchzip { name = "paratype-pt-sans"; - url = [ + urls = [ "https://company.paratype.com/system/attachments/629/original/ptsans.zip" "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip" ]; diff --git a/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix b/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix index 2b5eeafd09b9..a4142f757fcc 100644 --- a/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix +++ b/nixpkgs/pkgs/data/fonts/paratype-pt/serif.nix @@ -3,7 +3,7 @@ fetchzip { name = "paratype-pt-serif"; - url = [ + urls = [ "https://company.paratype.com/system/attachments/634/original/ptserif.zip" "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip" ]; diff --git a/nixpkgs/pkgs/data/fonts/recursive/default.nix b/nixpkgs/pkgs/data/fonts/recursive/default.nix index d6929153bf45..88c80574e8fc 100644 --- a/nixpkgs/pkgs/data/fonts/recursive/default.nix +++ b/nixpkgs/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.071"; + version = "1.077"; in fetchzip { name = "recursive-${version}"; @@ -14,7 +14,7 @@ fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "0db410vcvgawb89f11l2v7w3b7l70wzlwwv8df3vnangl3mdv13z"; + sha256 = "sha256-deztulQ33TIMevEQOP5OS8tmf6UjXT8IiVpRjkdismY="; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/nixpkgs/pkgs/data/fonts/scientifica/default.nix b/nixpkgs/pkgs/data/fonts/scientifica/default.nix index 2a2b237d5275..d8eda3e92326 100644 --- a/nixpkgs/pkgs/data/fonts/scientifica/default.nix +++ b/nixpkgs/pkgs/data/fonts/scientifica/default.nix @@ -1,25 +1,25 @@ { lib, fetchurl }: let - version = "2.1"; + version = "2.2"; in fetchurl rec { name = "scientifica-${version}"; - url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica-v${version}.tar"; + url = "https://github.com/NerdyPepper/scientifica/releases/download/v${version}/scientifica.tar"; downloadToTemp = true; recursiveHash = true; - sha256 = "081faa48d6g86pacmgjqa96in72rjldavnwxq6bdq2br33h3qwrz"; + sha256 = "sha256-mkZnuW+CB20t6MEpEeQR1CWkIUtqgVwrKN4sezQRaB4="; postFetch = '' - tar xvf $downloadedFile + tar xf $downloadedFile mkdir -p $out/share/fonts/truetype mkdir -p $out/share/fonts/misc - cp scientifica/ttf/*.ttf $out/share/fonts/truetype - cp scientifica/otb/*.otb $out/share/fonts/misc - cp scientifica/bdf/*.bdf $out/share/fonts/misc + install scientifica/ttf/*.ttf $out/share/fonts/truetype + install scientifica/otb/*.otb $out/share/fonts/misc + install scientifica/bdf/*.bdf $out/share/fonts/misc ''; meta = with lib; { diff --git a/nixpkgs/pkgs/data/fonts/spleen/default.nix b/nixpkgs/pkgs/data/fonts/spleen/default.nix index 726f60938bb2..4dea9253c02d 100644 --- a/nixpkgs/pkgs/data/fonts/spleen/default.nix +++ b/nixpkgs/pkgs/data/fonts/spleen/default.nix @@ -2,7 +2,7 @@ let pname = "spleen"; - version = "1.8.2"; + version = "1.9.0"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; @@ -19,7 +19,7 @@ in fetchurl { # create fonts.dir so NixOS xorg module adds to fp ${mkfontscale}/bin/mkfontdir "$d" ''; - sha256 = "0195d8ssmd8hc0q941z6zwnccffxajv4vylypsndxf28f3ikawby"; + sha256 = "sha256-hNPbYiU+v7kCYKVyOn+uc5cSlu9bWsC4CwFvfH6StWM="; meta = with lib; { description = "Monospaced bitmap fonts"; diff --git a/nixpkgs/pkgs/data/fonts/stix-two/default.nix b/nixpkgs/pkgs/data/fonts/stix-two/default.nix index 3d957f249f5b..53c4143842d9 100644 --- a/nixpkgs/pkgs/data/fonts/stix-two/default.nix +++ b/nixpkgs/pkgs/data/fonts/stix-two/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2.11"; + version = "2.12"; in fetchzip { name = "stix-two-${version}"; url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip"; - sha256 = "19ndavx5k85vm6wvq9603kynpgbfddbjiihivffvnbrxwf13h34n"; + sha256 = "1a6v8p5zbjlv1gfhph0rzkvnmvxf4n1y0mdrdgng01yyl1nngrn9"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix b/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix index e74e51a95dcb..6cceee558a94 100644 --- a/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/nixpkgs/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -14,14 +14,14 @@ }: let - version = "13.0.1"; + version = "13.0.2"; twemojiSrc = fetchFromGitHub { name = "twemoji"; owner = "twitter"; repo = "twemoji"; rev = "v${version}"; - sha256 = "0acinlv2l3s1jga2i9wh16mvgkxw4ipzgvjx8c80zd104lpdpgd9"; + sha256 = "069pyq09jfzwp3xla8vmhbyyam32x2iyp0s29xcxlkj22p99bg6d"; }; pythonEnv = diff --git a/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix b/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix index 5902356703ac..7c5d9dbba6ea 100644 --- a/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix +++ b/nixpkgs/pkgs/data/fonts/vista-fonts-chs/default.nix @@ -1,15 +1,23 @@ -{ lib, fetchzip, buildPackages }: +{ lib, stdenvNoCC, fetchurl, cabextract }: -# Modified from vista-fonts +stdenvNoCC.mkDerivation { + pname = "vista-fonts-chs"; + version = "1"; -fetchzip { - name = "vista-fonts-chs-1"; + src = fetchurl { + url = "http://web.archive.org/web/20161221192937if_/http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE"; + # Alternative mirror: + # http://www.eeo.cn/download/font/VistaFont_CHS.EXE + sha256 = "1qwm30b8aq9piyqv07hv8b5bac9ms40rsdf8pwix5dyk8020i8xi"; + }; - url = "http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE"; + nativeBuildInputs = [ cabextract ]; - postFetch = '' - ${buildPackages.cabextract}/bin/cabextract --lowercase --filter '*.TTF' $downloadedFile + unpackPhase = '' + cabextract --lowercase --filter '*.TTF' $src + ''; + installPhase = '' mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype @@ -20,8 +28,6 @@ fetchzip { --subst-var-by fontname "Microsoft YaHei" ''; - sha256 = "1zwrgck84k80gpg7493jdnxnv9ajxk5c7qndinnmqydnrw239zbw"; - meta = { description = "TrueType fonts from Microsoft Windows Vista For Simplified Chinese (Microsoft YaHei)"; homepage = "https://www.microsoft.com/typography/fonts/family.aspx?FID=350"; diff --git a/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix b/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix index 20b5b673ccff..ca2ae302b3ee 100644 --- a/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix @@ -1,14 +1,22 @@ -{ lib, fetchzip, cabextract }: +{ lib, stdenvNoCC, fetchurl, cabextract }: -fetchzip { - name = "vista-fonts-1"; +stdenvNoCC.mkDerivation { + pname = "vista-fonts"; + version = "1"; - url = "https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe"; + src = fetchurl { + url = "mirror://sourceforge/mscorefonts2/cabs/PowerPointViewer.exe"; + sha256 = "07vhjdw8iip7gxk6wvp4myhvbn9619g10j9qvpbzz4ihima57ry4"; + }; + + nativeBuildInputs = [ cabextract ]; - postFetch = '' - ${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile - ${cabextract}/bin/cabextract --lowercase --filter '*.TTF' ppviewer.cab + unpackPhase = '' + cabextract --lowercase --filter ppviewer.cab $src + cabextract --lowercase --filter '*.TTF' ppviewer.cab + ''; + installPhase = '' mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype @@ -21,8 +29,6 @@ fetchzip { done ''; - sha256 = "sha256-x7JSXS9Q1fzlJTVR+MAS3f2+cmo/H0s1qkY9FPjx2zI="; - meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; homepage = "http://www.microsoft.com/typography/ClearTypeFonts.mspx"; diff --git a/nixpkgs/pkgs/data/fonts/vollkorn/default.nix b/nixpkgs/pkgs/data/fonts/vollkorn/default.nix new file mode 100644 index 000000000000..6c5836da5b05 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/vollkorn/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchzip }: +let + pname = "vollkorn"; + version = "4.105"; +in +fetchzip { + name = "${pname}-${version}"; + url = "http://vollkorn-typeface.com/download/vollkorn-${builtins.replaceStrings ["."] ["-"] version}.zip"; + sha256 = "0srff2nqs7353mqcpmvaq156lamfh621py4h1771n0l9ix2c8mss"; + stripRoot = false; + + postFetch = '' + mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}} + unzip $downloadedFile + cp -v {Fontlog,OFL-FAQ,OFL}.txt $out/share/doc/${pname}-${version}/ + cp -v PS-OTF/*.otf $out/share/fonts/opentype + cp -v TTF/*.ttf $out/share/fonts/truetype + cp -v WOFF/*.woff $out/share/fonts/WOFF + cp -v WOFF2/*.woff2 $out/share/fonts/WOFF2 + ''; + + meta = with lib; { + homepage = "http://vollkorn-typeface.com/"; + description = "The free and healthy typeface for bread and butter use"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = [ maintainers.schmittlauch ]; + }; +} diff --git a/nixpkgs/pkgs/data/icons/iso-flags/default.nix b/nixpkgs/pkgs/data/icons/iso-flags/default.nix index 4252853b898c..57cc1752f187 100644 --- a/nixpkgs/pkgs/data/icons/iso-flags/default.nix +++ b/nixpkgs/pkgs/data/icons/iso-flags/default.nix @@ -1,9 +1,7 @@ { lib, stdenv , fetchFromGitHub , perl -, perlPackages , inkscape -, pngcrush , librsvg , targets ? [ "all" ] }: diff --git a/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix index 36aee979f0b1..bdc7b55d9c2b 100644 --- a/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub , gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub , gtk3, adwaita-icon-theme, breeze-icons, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-YGhusal8g/UXMqrQvj147OScg51uNABTMIXxVXvnpKY="; + sha256 = "1qnqz0h2c5kilch3308l8nfshgsrkllyysvqn0mxy70iziw895rv"; }; nativeBuildInputs = [ @@ -16,20 +16,24 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ + adwaita-icon-theme breeze-icons - gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' + runHook preInstall + mkdir -p $out/share/icons mv kora* $out/share/icons/ for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme + gtk-update-icon-cache -f $theme done + + runHook postInstall ''; meta = with lib; { diff --git a/nixpkgs/pkgs/data/icons/luna-icons/default.nix b/nixpkgs/pkgs/data/icons/luna-icons/default.nix index b3513818df87..ff907e91bf94 100644 --- a/nixpkgs/pkgs/data/icons/luna-icons/default.nix +++ b/nixpkgs/pkgs/data/icons/luna-icons/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "0.9.2"; + version = "1.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0ajx7yjkgj5ynbjmd6k3cldjn0qr51h6k80hjgr7vqd0ybyylh5p"; + sha256 = "11g740x1asy7jbfn52gp1zx7hzhklw6f97m469wgyi9yf954js15"; }; nativeBuildInputs = [ @@ -35,12 +35,6 @@ stdenv.mkDerivation rec { mkdir -p $out/share/icons cp -a Luna* $out/share/icons - # remove files with spaces in the name, otherwise - # gtk-update-icon-cache fails with the message "The generated cache - # was invalid" - # https://github.com/darkomarko42/Luna-Icons/issues/2 - rm "$out/share/icons/Luna/scalable/apps/yast-checkmedia (copia).svg" - for theme in $out/share/icons/*; do gtk-update-icon-cache "$theme" done diff --git a/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix index 75c7cd58007a..32365b70184b 100644 --- a/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation { dontDropIconThemeCache = true; + dontWrapQtApps = true; + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme diff --git a/nixpkgs/pkgs/data/icons/oranchelo-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/oranchelo-icon-theme/default.nix new file mode 100644 index 000000000000..9288b9307f55 --- /dev/null +++ b/nixpkgs/pkgs/data/icons/oranchelo-icon-theme/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, gtk3, plasma5Packages, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "oranchelo-icon-theme"; + version = "0.8.0.1"; + + src = fetchFromGitHub { + owner = "OrancheloTeam"; + repo = pname; + rev = "096c8c8d550ac9a85f5f34f3f30243e6f198df2d"; + sha256 = "sha256-TKi42SA33pGKdrPtGTpvxFbOP+5N93Y4BvO4CRTveLM="; + }; + + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + plasma5Packages.breeze-icons + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + mkdir -p $out/share/icons + cp -r $Oranchelo* $out/share/icons/ + ''; + + meta = with lib; { + description = "Oranchelo icon theme"; + homepage = "https://github.com/OrancheloTeam/oranchelo-icon-theme"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ _414owen ]; + }; +} diff --git a/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index b18354910e44..ff18baf75f4b 100644 --- a/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20210201"; + version = "20210401"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-TQEpNFmsloq1jIg6QsuY8kllINpmwJCY+Anwker6Z5M="; + sha256 = "sha256-t0zoeIpj+0QVH1wmbEIJdqzEDOGzpclePv+bcZgtnwo="; }; nativeBuildInputs = [ @@ -25,20 +25,22 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; installPhase = '' + runHook preInstall mkdir -p $out/share/icons mv {,e}Papirus* $out/share/icons for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + runHook postInstall ''; meta = with lib; { description = "Papirus icon theme"; homepage = "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme"; - license = licenses.lgpl3; + license = licenses.gpl3Only; # darwin gives hash mismatch in source, probably because of file names differing only in case platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + maintainers = with maintainers; [ romildo fortuneteller2k ]; }; } diff --git a/nixpkgs/pkgs/data/misc/cacert/default.nix b/nixpkgs/pkgs/data/misc/cacert/default.nix index e50aa81656a9..9357a60a91f5 100644 --- a/nixpkgs/pkgs/data/misc/cacert/default.nix +++ b/nixpkgs/pkgs/data/misc/cacert/default.nix @@ -10,13 +10,6 @@ with lib; let - - certdata2pem = fetchurl { - name = "certdata2pem.py"; - url = "https://salsa.debian.org/debian/ca-certificates/raw/debian/20170717/mozilla/certdata2pem.py"; - sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy"; - }; - version = "3.60"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in @@ -29,6 +22,15 @@ stdenv.mkDerivation { sha256 = "hKvVV1q4dMU65RG9Rh5dCGjRobOE7kB1MVTN0dWQ/j0="; }; + certdata2pem = fetchurl { + name = "certdata2pem.py"; + urls = [ + "https://salsa.debian.org/debian/ca-certificates/raw/debian/20170717/mozilla/certdata2pem.py" + "https://git.launchpad.net/ubuntu/+source/ca-certificates/plain/mozilla/certdata2pem.py?id=47e49e1e0a8a1ca74deda27f88fe181191562957" + ]; + sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy"; + }; + outputs = [ "out" "unbundled" ]; nativeBuildInputs = [ python3 ]; @@ -40,7 +42,8 @@ stdenv.mkDerivation { ${concatStringsSep "\n" (map (c: ''"${c}"'') blacklist)} EOF - cat ${certdata2pem} > certdata2pem.py + # copy from the store, otherwise python will scan it for imports + cat "$certdata2pem" > certdata2pem.py ''; buildPhase = '' diff --git a/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix b/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix index f7da9381e610..cabc28a89ce9 100644 --- a/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix +++ b/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix @@ -1,13 +1,13 @@ { lib, stdenv , fetchurl -, python +, python2 }: stdenv.mkDerivation rec { pname = "conway_polynomials"; version = "0.5"; - pythonEnv = python.withPackages (ps: with ps; [ six ]); + pythonEnv = python2.withPackages (ps: with ps; [ six ]); src = fetchurl { url = "mirror://sageupstream/conway_polynomials/conway_polynomials-${version}.tar.bz2"; diff --git a/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix b/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix index 988716f5429e..982594000210 100644 --- a/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix +++ b/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, python +, python2 }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { export SAGE_SHARE="$out/share" export PYTHONPATH=$PWD - ${python.interpreter} ${spkg-install} + ${python2.interpreter} ${spkg-install} ''; meta = with lib; { diff --git a/nixpkgs/pkgs/data/misc/hackage/default.nix b/nixpkgs/pkgs/data/misc/hackage/default.nix index d1d8b91bdacb..597c6577cb0c 100644 --- a/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/c0fe8e827d5ec71141700f5d5a90a6f6616ecbc5.tar.gz"; - sha256 = "16is1cipkfiabbh01i247vqfviwzjpfhgf6pkli61wwlhnk0q95s"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/fd3fefef13b49cbcd9a08b46c2aa4ceb204de5e0.tar.gz"; + sha256 = "1dr4bqsisizw3qn9qxjpbk0rjri6s0gv9g9717cwfcixy940af2s"; } diff --git a/nixpkgs/pkgs/data/misc/iana-etc/default.nix b/nixpkgs/pkgs/data/misc/iana-etc/default.nix index 421054fa17f0..60735eb4782c 100644 --- a/nixpkgs/pkgs/data/misc/iana-etc/default.nix +++ b/nixpkgs/pkgs/data/misc/iana-etc/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "20200729"; + version = "20210225"; in fetchzip { name = "iana-etc-${version}"; url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "05cymmisfvpyd7fwzc6axvm5fsi1v6hzs0pjr4xp1i95wvpz7qpm"; + sha256 = "sha256-NVvZG3EJEYOXFDTBXD5m9sg/8msyMiBMkiZr+ZxWZ/g="; postFetch = '' tar -xzvf $downloadedFile --strip-components=1 diff --git a/nixpkgs/pkgs/data/misc/libkkc-data/default.nix b/nixpkgs/pkgs/data/misc/libkkc-data/default.nix index 96130b2de5e1..7fcd2fbf516f 100644 --- a/nixpkgs/pkgs/data/misc/libkkc-data/default.nix +++ b/nixpkgs/pkgs/data/misc/libkkc-data/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, marisa, libkkc }: +{ lib, stdenv, fetchurl, python2, libkkc }: stdenv.mkDerivation rec { pname = "libkkc-data"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy"; }; - nativeBuildInputs = [ marisa ]; + nativeBuildInputs = [ python2.pkgs.marisa ]; + + strictDeps = true; meta = with lib; { description = "Language model data package for libkkc"; diff --git a/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix b/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix index caab674393a1..af8a157d491c 100644 --- a/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix +++ b/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix @@ -1,13 +1,25 @@ -{ stdenv, fetchFromGitHub, imagemagick }: +{ stdenv +, fetchFromGitHub +, imagemagick +}: stdenv.mkDerivation { - name = "nixos-icons-2017-03-16"; - srcs = fetchFromGitHub { + pname = "nixos-icons"; + version = "2021-02-24"; + + src = fetchFromGitHub { owner = "NixOS"; repo = "nixos-artwork"; - rev = "783ca1249fc4cfe523ad4e541f37e2229891bc8b"; - sha256 = "0wp08b1gh2chs1xri43wziznyjcplx0clpsrb13wzyscv290ay5a"; + rev = "488c22aad523c709c44169d3e88d34b4691c20dc"; + sha256 = "ZoanCzn4pqGB1fyMzMyGQVT0eIhNdL7ZHJSn1VZWVRs="; }; - makeFlags = [ "DESTDIR=$(out)" "prefix=" ]; - nativeBuildInputs = [ imagemagick ]; + + nativeBuildInputs = [ + imagemagick + ]; + + makeFlags = [ + "DESTDIR=${placeholder "out"}" + "prefix=" + ]; } diff --git a/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix index a75b2c1b65da..ec0fa407d733 100644 --- a/nixpkgs/pkgs/data/misc/osinfo-db/default.nix +++ b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20210202"; + version = "20210312"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-C7Vq7d+Uos9IhTwOgsrK64c9mMGVkNgfvOrbBqORsRs="; + sha256 = "sha256-dUjsCeRFynN4xc65njntyohX+Ck4MeCzy1WPQjCHDhA="; }; nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; diff --git a/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix b/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix index 19f02a16f470..f4ab4c058512 100644 --- a/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,25 +2,28 @@ stdenv.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.11"; + version = "3.12"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - sha256 = "1iwyqhh6lh51a47mhfy98zvjan8yjsvlym8qz0isx2i1zzxlj47a"; + sha256 = "09xci8dzblg3d30jf7s43zialbcxlxly03zrkiymcvnzixg8v48f"; }; - phases = [ "unpackPhase" "installPhase" ]; - installPhase = '' + runHook preInstall + install -vDt $out/json json/licenses.json + + runHook postInstall ''; - meta = { + meta = with lib; { description = "Various data formats for the SPDX License List"; homepage = "https://github.com/spdx/license-list-data"; - license = lib.licenses.cc0; - platforms = lib.platforms.all; + license = licenses.cc0; + maintainers = with maintainers; [ oxzi ]; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/data/misc/tzdata/default.nix b/nixpkgs/pkgs/data/misc/tzdata/default.nix index 98a6b9877d15..7ab25da3cc43 100644 --- a/nixpkgs/pkgs/data/misc/tzdata/default.nix +++ b/nixpkgs/pkgs/data/misc/tzdata/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { preInstall = '' mv zic.o zic.o.orig mv zic zic.orig - make $makeFlags cc=cc AR=ar zic + make $makeFlags cc=${stdenv.cc.nativePrefix}cc AR=${stdenv.cc.nativePrefix}ar zic mv zic zic-native mv zic.o.orig zic.o mv zic.orig zic diff --git a/nixpkgs/pkgs/data/themes/jade1/default.nix b/nixpkgs/pkgs/data/themes/jade1/default.nix index 122d0a4a6568..6eea90c71192 100644 --- a/nixpkgs/pkgs/data/themes/jade1/default.nix +++ b/nixpkgs/pkgs/data/themes/jade1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.11"; + version = "1.12"; src = fetchurl { url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; - sha256 = "0jljmychbs2lsf6g1pck83x4acljdqqsllkdjgiwv3nnlwahzlvs"; + sha256 = "1pawdfyvpbvhb6fa27rgjp49vlbmix9pq192wjlv2wgq7v4ip9y8"; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/data/themes/juno/default.nix b/nixpkgs/pkgs/data/themes/juno/default.nix new file mode 100644 index 000000000000..9e1580a6a14d --- /dev/null +++ b/nixpkgs/pkgs/data/themes/juno/default.nix @@ -0,0 +1,45 @@ +{ lib, stdenv, fetchurl, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + pname = "juno"; + version = "0.0.1"; + + srcs = [ + (fetchurl { + url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno.tar.xz"; + sha256 = "1cghsn9qagcf1nlga5cal0aqch6hkjm5wk6ja791zxhdqy3crx1i"; + }) + (fetchurl { + url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno-mirage.tar.xz"; + sha256 = "0zh6bc85svmwh8qrhpn8mim0pj322x2x2i9sxnp7p1938p5z5m2b"; + }) + (fetchurl { + url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno-ocean.tar.xz"; + sha256 = "0m2wgmcn12dfq5badzlpzjc8792ba9hi32c79vfvqawdn1q3hrdx"; + }) + (fetchurl { + url = "https://github.com/gvolpe/Juno/releases/download/${version}/Juno-palenight.tar.xz"; + sha256 = "1hn2l0m76x61ixjd253hi7czm65asdjdhqvvlv7idbccc40pvrak"; + }) + ]; + + sourceRoot = "."; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Juno* $out/share/themes + rm $out/share/themes/*/{LICENSE,README.md} + runHook postInstall + ''; + + meta = with lib; { + description = "GTK themes inspired by epic vscode themes"; + homepage = "https://github.com/EliverLara/Juno"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.gvolpe ]; + }; +} diff --git a/nixpkgs/pkgs/data/themes/matcha/default.nix b/nixpkgs/pkgs/data/themes/matcha/default.nix index f7f139a9ea97..08d0f51094da 100644 --- a/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2021-01-12"; + version = "2021-04-05"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1h6y89aajygbp1rc3d5dw2vgb64a3hiajlifb4xnzhycc77vjskr"; + sha256 = "0bm7hr4lqqz3z2miif38628r4qcy7i5hdk6sm0ngjacm43cl0qvg"; }; buildInputs = [ gdk-pixbuf librsvg ]; @@ -16,16 +16,18 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; installPhase = '' + runHook preInstall patchShebangs . mkdir -p $out/share/themes name= ./install.sh -d $out/share/themes install -D -t $out/share/gtksourceview-3.0/styles src/extra/gedit/matcha.xml mkdir -p $out/share/doc/${pname} cp -a src/extra/firefox $out/share/doc/${pname} + runHook postInstall ''; meta = with lib; { - description = "A stylish flat Design theme for GTK based desktop environments"; + description = "A stylish flat design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/theme-matcha"; license = licenses.gpl3Only; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/data/themes/orchis/default.nix b/nixpkgs/pkgs/data/themes/orchis/default.nix new file mode 100644 index 000000000000..cf479021fb1d --- /dev/null +++ b/nixpkgs/pkgs/data/themes/orchis/default.nix @@ -0,0 +1,42 @@ +{ lib, stdenv, fetchFromGitHub, gtk3, gnome-themes-extra, gtk-engine-murrine +, accentColor ? "default" }: + +stdenv.mkDerivation rec { + pname = "orchis"; + version = "2021-02-28"; + + src = fetchFromGitHub { + repo = "Orchis-theme"; + owner = "vinceliuice"; + rev = version; + sha256 = "sha256-HmC2e34n1eThFGgw9OzSgp5VFJOylyozpXgk9SO84+I="; + }; + + nativeBuildInputs = [ gtk3 ]; + + buildInputs = [ gnome-themes-extra ]; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + + preInstall = '' + mkdir -p $out/share/themes + ''; + + installPhase = '' + runHook preInstall + bash install.sh -d $out/share/themes -t ${accentColor} + runHook postInstall + ''; + + meta = with lib; { + description = "A Material Design theme for GNOME/GTK based desktop environments."; + homepage = "https://github.com/vinceliuice/Orchis-theme"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = [ maintainers.fufexan ]; + }; +} diff --git a/nixpkgs/pkgs/data/themes/yaru/default.nix b/nixpkgs/pkgs/data/themes/yaru/default.nix index 7121aed9b1e4..f0d2493473a4 100644 --- a/nixpkgs/pkgs/data/themes/yaru/default.nix +++ b/nixpkgs/pkgs/data/themes/yaru/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "20.10.2"; + version = "21.04.1"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "0vxs17nbahrdix1q9xj06nflm344lfgj2mrafsvyfcr2isn61iv6"; + sha256 = "0z6k8q9b5xjx6xwirqbsqq5jjxw79ar2d61r7cgipqmbjdsjfgjz"; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Ubuntu community theme 'yaru' - default Ubuntu theme since 18.10"; homepage = "https://github.com/ubuntu/yaru"; - license = with licenses; [ cc-by-sa-40 gpl3 ]; + license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ]; platforms = platforms.linux; maintainers = [ maintainers.jD91mZM2 ]; }; |