diff options
Diffstat (limited to 'nixpkgs/pkgs/data')
17 files changed, 280 insertions, 77 deletions
diff --git a/nixpkgs/pkgs/data/fonts/dina/default.nix b/nixpkgs/pkgs/data/fonts/dina/default.nix index 2a770222ed10..3b5d75acb503 100644 --- a/nixpkgs/pkgs/data/fonts/dina/default.nix +++ b/nixpkgs/pkgs/data/fonts/dina/default.nix @@ -1,53 +1,59 @@ { lib, stdenv, fetchurl, unzip -, bdftopcf, mkfontscale, fontforge +, bdftopcf, mkfontscale, fonttosfnt }: stdenv.mkDerivation { pname = "dina-font"; version = "2.92"; + outputs = [ "out" "bdf" ]; + src = fetchurl { url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z"; }; nativeBuildInputs = - [ unzip bdftopcf mkfontscale fontforge ]; + [ unzip bdftopcf mkfontscale fonttosfnt ]; - patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf"; + postPatch = '' + sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf + ''; buildPhase = '' + runHook preBuild + newName() { - test "''${1:5:1}" = i && _it=Italic || _it= - case ''${1:6:3} in - 400) test -z $it && _weight=Medium ;; - 700) _weight=Bold ;; - esac - _pt=''${1%.bdf} - _pt=''${_pt#*-} - echo "Dina$_weight$_it$_pt" + test "''${1:5:1}" = i && _it=Italic || _it= + case ''${1:6:3} in + 400) test -z $it && _weight=Medium ;; + 700) _weight=Bold ;; + esac + _pt=''${1%.bdf} + _pt=''${_pt#*-} + echo "Dina$_weight$_it$_pt" } - # convert bdf fonts to pcf - for i in *.bdf; do - bdftopcf -t -o $(newName "$i").pcf "$i" + for f in *.bdf; do + name=$(newName "$f") + bdftopcf -t -o "$name.pcf" "$f" + fonttosfnt -v -o "$name.otb" "$f" done gzip -n -9 *.pcf - # convert bdf fonts to otb - for i in *.bdf; do - fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$(newName $i).otb\")" - done + runHook postBuild ''; installPhase = '' + runHook preInstall + install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz *.otb install -D -m 644 -t "$bdf/share/fonts/misc" *.bdf mkfontdir "$out/share/fonts/misc" mkfontdir "$bdf/share/fonts/misc" - ''; - outputs = [ "out" "bdf" ]; + runHook postInstall + ''; meta = with lib; { description = "A monospace bitmap font aimed at programmers"; diff --git a/nixpkgs/pkgs/data/fonts/efont-unicode/default.nix b/nixpkgs/pkgs/data/fonts/efont-unicode/default.nix new file mode 100644 index 000000000000..f4ea61cbc9eb --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/efont-unicode/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchzip, libfaketime, xorg }: + +stdenv.mkDerivation rec { + pname = "efont-unicode"; + version = "0.4.2"; + + src = fetchzip { + url = "http://openlab.ring.gr.jp/efont/dist/unicode-bdf/${pname}-bdf-${version}.tar.bz2"; + sha256 = "0bib3jgikq8s1m96imw4mlgbl5cbq1bs5sqig74s2l2cdfx3jaqc"; + }; + + nativeBuildInputs = with xorg; + [ libfaketime bdftopcf fonttosfnt mkfontscale ]; + + buildPhase = '' + runHook preBuild + + # convert bdf fonts to pcf + for f in *.bdf; do + bdftopcf -t -o "''${f%.bdf}.pcf" "$f" + done + gzip -n -9 *.pcf + + # convert bdf fonts to otb + for f in *.bdf; do + faketime -f "1970-01-01 00:00:01" \ + fonttosfnt -v -m 2 -o "''${f%.bdf}.otb" "$f" + done + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + dir=share/fonts/misc + install -D -m 644 -t "$out/$dir" *.otb *.pcf.gz + install -D -m 644 -t "$bdf/$dir" *.bdf + mkfontdir "$out/$dir" + mkfontdir "$bdf/$dir" + + runHook postInstall + ''; + + outputs = [ "out" "bdf" ]; + + meta = with lib; { + description = "The /efont/ Unicode bitmap font"; + homepage = "http://openlab.ring.gr.jp/efont/unicode/"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = [ maintainers.ncfavier ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/nixpkgs/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix index e9c646d32d08..2f7a804ad08d 100644 --- a/nixpkgs/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.2.0"; + version = "5.0.0"; in fetchzip { name = "emacs-all-the-icons-fonts-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/all-the-icons ''; - sha256 = "0ps8q9nkx67ivgn8na4s012360v36jwr0951rsg7j6dyyw9g41jq"; + sha256 = "0vc9bkm4pcc05llcd2c9zr3d88h3zmci0izla5wnw8hg1n0rsrii"; meta = with lib; { description = "Icon fonts for emacs all-the-icons"; diff --git a/nixpkgs/pkgs/data/fonts/google-fonts/default.nix b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix index 210902a0e71e..9689fddd3913 100644 --- a/nixpkgs/pkgs/data/fonts/google-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix @@ -1,22 +1,18 @@ -{ lib -, stdenv -, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "google-fonts"; - version = "unstable-2021-01-19"; + version = "unstable-2021-06-12"; outputs = [ "out" "adobeBlank" ]; src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "a3a831f0fe44cd58465c6937ea06873728f2ba0d"; - sha256 = "19abx2bj7mkysv2ihr43m3kpyf6kv6v2qjlm1skxc82rb72xqhix"; + rev = "370c795d7e5f9b02db9a793c2779e2c8f94c6adc"; + sha256 = "sha256-XKjxmupY2KuefCtKZMXWaba1TnNwdYM/P0xGXOtBGmM="; }; - phases = [ "unpackPhase" "patchPhase" "installPhase" ]; - patchPhase = '' # These directories need to be removed because they contain # older or duplicate versions of fonts also present in other @@ -33,6 +29,8 @@ stdenv.mkDerivation { fi ''; + dontBuild = true; + installPhase = '' adobeBlankDest=$adobeBlank/share/fonts/truetype install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf diff --git a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index 26d67ba170e1..b399741f9333 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 = "5.0.5"; + version = "7.0.4"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 6c31d3edb742..1f3da2a205d9 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,26 +1,27 @@ # This file was autogenerated. DO NOT EDIT! { - 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"; + iosevka = "10aa8bsykkfi3aplw4j7smj0brcbni3jxqzjbpsbv5b15wzvkm7y"; + iosevka-aile = "0pa79n41xha9rdj4vzz8cpmdhf0h4fjyphjl12i9qxh5znjr4yyz"; + iosevka-curly = "0shk75qdm5acfbxdvv985gnhaz3dys8wpshiis6y2raz8sam48qg"; + iosevka-curly-slab = "0z297s1bl2rrrmr3a4cds4cx4cw69p2y05jv999bkw9vrd6a5ij9"; + iosevka-etoile = "05h62ybd6b54b51h6m6dq3phvrw4jfcc6cyp1x44shj4az2ia17w"; + iosevka-slab = "07rp7rp3rjzzn6vnx3zbfizd924xhl702kcyq9qlif9g285l85nl"; + iosevka-ss01 = "1rvshgyhcq2cay9dssap9mhinhljn92adrbf8lbkaabf3fcyd19h"; + iosevka-ss02 = "0bscxfjhm1is7b7amr5jjj5wpxm1yps4cns47r4w26a0ad4lzf6b"; + iosevka-ss03 = "1l4mzv1w7wkjs4629hrj7svd3wwhjfvby0qsbq2fr71ngz4gdvva"; + iosevka-ss04 = "0mj5l316bji6mazgkzi5vigbfbgfnif0llmgacg0l5qayzaafqb1"; + iosevka-ss05 = "1gfc7b05fvf1m5vhlvbzxzim8qfcqf16dg8qmzdv625dk1mg2llf"; + iosevka-ss06 = "1n3mfn8h9gmf7ymc6f5ky5n70nn0nb2l8grj26hm9047cvbxcjqm"; + iosevka-ss07 = "0bffazcb6k7qd3c3fxg426mcgjzc5xncv8nsiz71frhi9crplprv"; + iosevka-ss08 = "1kv6v7n2qbgl185kfh401mjvs2iim6l3cw9zzghhfx6qv7xy0dcd"; + iosevka-ss09 = "0da9kcsxk4vllnxjlslm394lr3bhdsw4a2mi95szplipbf748jcp"; + iosevka-ss10 = "0935y7m603n3rfv38gmja7jhjmc6xrcx61psb3sznp7mlmi0dn7x"; + iosevka-ss11 = "1hh0b8qaas4bxz0sa8zi5sr4rmqrpgxfzaq53fsmxy7pzjkhjz09"; + iosevka-ss12 = "118ibl1i7981kjvf8g0rqrckh2chnxvyivk5wwmxhkw43x06ffjf"; + iosevka-ss13 = "1licqy5dy5z4s91yh086i0m362lavaqq6zr13715zaqh7ard7hva"; + iosevka-ss14 = "0y1f5hva9kpj9l3a56n6vbr8zbydd9c0knvsbpg68lcgmybfc97m"; + iosevka-ss15 = "11pm6frf74y27ym4kmh98pn2cqlab6msj0cxpah36ckpzkm5zdqq"; + iosevka-ss16 = "0z77549ydrbdhw96gc1zl3sg4s16cq7l56pwkfk9ificm1rwf1nm"; + iosevka-ss17 = "0zm34lfgrlcb97a8dx1g056qy6rr7722b1k6hm9dp676mi5va2cw"; + iosevka-ss18 = "0jmz975gny6fc7vf5cn8a4bl0y8pzdwlvfh0km9x7ijp711pw42p"; } diff --git a/nixpkgs/pkgs/data/fonts/ricty/default.nix b/nixpkgs/pkgs/data/fonts/ricty/default.nix index 435cdb7d163b..6bdd331c72c4 100644 --- a/nixpkgs/pkgs/data/fonts/ricty/default.nix +++ b/nixpkgs/pkgs/data/fonts/ricty/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.1.1"; src = fetchurl { - url = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty/ricty_generator-${version}.sh"; + url = "https://rictyfonts.github.io/files/ricty_generator-${version}.sh"; sha256 = "03fngb8f5hl7ifigdm5yljhs4z2x80cq8y8kna86d07ghknhzgw6"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high-quality Japanese font based on Inconsolata and Migu 1M"; - homepage = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html"; + homepage = "https://rictyfonts.github.io"; license = licenses.unfree; maintainers = [ maintainers.mikoim ]; }; diff --git a/nixpkgs/pkgs/data/fonts/spleen/default.nix b/nixpkgs/pkgs/data/fonts/spleen/default.nix index 4dea9253c02d..162197006ba7 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.9.0"; + version = "1.9.1"; 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 = "sha256-hNPbYiU+v7kCYKVyOn+uc5cSlu9bWsC4CwFvfH6StWM="; + sha256 = "sha256-6Imsa0ku8On63di0DOo0QxBa0t+tbtPRxM531EIiG94="; meta = with lib; { description = "Monospaced bitmap fonts"; diff --git a/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix b/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix new file mode 100644 index 000000000000..6122883c6156 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchzip }: + +let + version = "unstable-2018-09-11"; +in +fetchzip { + name = "times-newer-roman-${version}"; + + url = "https://web.archive.org/web/20210609022835/https://timesnewerroman.com/assets/TimesNewerRoman.zip"; + + postFetch = '' + mkdir -p $out/share/fonts/opentype + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + ''; + + hash = "sha256-Hx59RYLLwfimEQjEEes0lCpg6iql46DFwhQ7kVGiEzc="; + + meta = with lib; { + description = "A font that looks just like Times New Roman, except each character is 5-10% wider"; + homepage = "https://timesnewerroman.com/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ samuelgrf ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/unscii/default.nix b/nixpkgs/pkgs/data/fonts/unscii/default.nix index 066a4d4d9221..6fdeadf3776f 100644 --- a/nixpkgs/pkgs/data/fonts/unscii/default.nix +++ b/nixpkgs/pkgs/data/fonts/unscii/default.nix @@ -2,6 +2,11 @@ , fontforge, SDL, SDL_image, mkfontscale }: +let + perlenv = perl.withPackages (p: with p; [ + TextCharWidth + ]); +in stdenv.mkDerivation rec { pname = "unscii"; version = "1.1"; @@ -12,11 +17,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ (perl.withPackages (p: [ p.TextCharWidth ])) + [ perlenv bdftopcf fontforge SDL SDL_image mkfontscale ]; + # Fixes shebang -> wrapper problem on Darwin + postPatch = '' + for perltool in *.pl; do + substituteInPlace Makefile \ + --replace "./$perltool" "${perlenv}/bin/perl ./$perltool" + done + ''; + + makeFlags = [ + "CC=${stdenv.cc.targetPrefix}cc" + ]; + preConfigure = '' patchShebangs . ''; diff --git a/nixpkgs/pkgs/data/fonts/vazir-code-font/default.nix b/nixpkgs/pkgs/data/fonts/vazir-code-font/default.nix new file mode 100644 index 000000000000..6702fd1b0220 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/vazir-code-font/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub }: + +let + pname = "vazir-code-font"; + version = "1.1.2"; +in fetchFromGitHub { + name = "${pname}-${version}"; + + owner = "rastikerdar"; + repo = "vazir-code-font"; + rev = "v${version}"; + + postFetch = '' + tar xf $downloadedFile --strip=1 + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; + ''; + sha256 = "0ivwpn9xm2zwhwgg9mghyiy5v66cn4786w9j6rkff5cmzshv279r"; + + meta = with lib; { + homepage = "https://github.com/rastikerdar/vazir-code-font"; + description = "A Persian (farsi) Monospaced Font for coding"; + license = licenses.publicDomain; + platforms = platforms.all; + maintainers = [ maintainers.dearrude ]; + }; +} diff --git a/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix index bdc7b55d9c2b..a2426e842a6c 100644 --- a/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "1qnqz0h2c5kilch3308l8nfshgsrkllyysvqn0mxy70iziw895rv"; + sha256 = "sha256-tSkTwhhugvDTzzcxIln1xq3ZY6boHJR0LRGy20ONO5U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix new file mode 100644 index 000000000000..95f41caca1aa --- /dev/null +++ b/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, gnome +, gnome-icon-theme +, hicolor-icon-theme +}: + +stdenvNoCC.mkDerivation rec { + pname = "Whitesur-icon-theme"; + version = "2021-05-20"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "KboUYozTleOBKNun66g2oj7u/36hyQsPtRSk/x/LAWo="; + }; + + nativeBuildInputs = [ gtk3 ]; + + buildInputs = [ + gnome-icon-theme + gnome.adwaita-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons/WhiteSur{,-dark}/status + echo "$out/share/icons/WhiteSur/status $out/share/icons/WhiteSur-dark/status" | xargs -n 1 cp -r src/status/{16,22,24,32,symbolic} + echo "$out/share/icons/WhiteSur $out/share/icons/WhiteSur-dark" | xargs -n 1 cp -r ./{COPYING,AUTHORS} src/index.theme src/{actions,animations,apps,categories,devices,emblems,mimes,places} links/{actions,apps,categories,devices,emblems,mimes,places,status} + + # Change icon color for dark theme + sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/{actions,devices,places,status}/{16,22,24}/* + sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/actions/32/* + sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/{actions,apps,categories,emblems,devices,mimes,places,status}/symbolic/* + + for f in actions animations apps categories devices emblems mimes places status; do + ln -sf $out/share/icons/WhiteSur/$f $out/share/icons/WhiteSur/$f@2x + ln -sf $out/share/icons/WhiteSur-dark/$f $out/share/icons/WhiteSur-dark/$f@2x + done + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall + ''; + + meta = with lib; { + description = "MacOS Big Sur style icon theme for Linux desktops"; + homepage = "https://github.com/vinceliuice/WhiteSur-icon-theme"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ icy-thought ]; + }; + +} diff --git a/nixpkgs/pkgs/data/misc/hackage/pin.json b/nixpkgs/pkgs/data/misc/hackage/pin.json index 7c4e3b9a8694..3fc3fc21e477 100644 --- a/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "9be76e8f01853e5a2f0600107c9b50d12a17581b", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/9be76e8f01853e5a2f0600107c9b50d12a17581b.tar.gz", - "sha256": "0sy8lx04yb9lk9liscqr44z7lzzq67w3zmkq78a0yv37jadb557k", - "msg": "Update from Hackage at 2021-06-02T14:32:36Z" + "commit": "7708395682f798fe3649bd05387ab571fcf8890c", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7708395682f798fe3649bd05387ab571fcf8890c.tar.gz", + "sha256": "0pfv9nmccp9q6p77lmyh8jqkvq1ad392zyy72g8y6kdsgy71nir5", + "msg": "Update from Hackage at 2021-06-12T16:23:24Z" } diff --git a/nixpkgs/pkgs/data/themes/orchis/default.nix b/nixpkgs/pkgs/data/themes/orchis-theme/default.nix index a53e2f79f6a6..b63e9c06d29c 100644 --- a/nixpkgs/pkgs/data/themes/orchis/default.nix +++ b/nixpkgs/pkgs/data/themes/orchis-theme/default.nix @@ -9,14 +9,14 @@ }: stdenvNoCC.mkDerivation rec { - pname = "orchis"; - version = "2021-04-20"; + pname = "orchis-theme"; + version = "2021-06-09"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - sha256 = "sha256-cCUmainVTqFztZGpL2z2Zj6zcE2SQBWrec6yNFUMo5M="; + sha256 = "sha256-YlrocFDk3da2eqxbJ5lPUUxHHvJZx19LOa0MSljWY8Q="; }; nativeBuildInputs = [ gtk3 sassc ]; @@ -25,10 +25,6 @@ stdenvNoCC.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - dontPatch = true; - dontConfigure = true; - dontBuild = true; - preInstall = '' mkdir -p $out/share/themes ''; diff --git a/nixpkgs/pkgs/data/themes/sweet/default.nix b/nixpkgs/pkgs/data/themes/sweet/default.nix index 8a62735d2e52..bd1df3277c91 100644 --- a/nixpkgs/pkgs/data/themes/sweet/default.nix +++ b/nixpkgs/pkgs/data/themes/sweet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "sweet"; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { }) ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + sourceRoot = "."; installPhase = '' diff --git a/nixpkgs/pkgs/data/themes/yaru/default.nix b/nixpkgs/pkgs/data/themes/yaru/default.nix index c2f449e9f208..b37a921bbab8 100644 --- a/nixpkgs/pkgs/data/themes/yaru/default.nix +++ b/nixpkgs/pkgs/data/themes/yaru/default.nix @@ -1,5 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, - python3, gtk3, gnome, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: +{ lib +, stdenv +, fetchFromGitHub +, meson +, sassc +, pkg-config +, glib +, ninja +, python3 +, gtk3 +, gnome +, gtk-engine-murrine +, humanity-icon-theme +, hicolor-icon-theme +}: stdenv.mkDerivation rec { pname = "yaru"; @@ -13,7 +26,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; + buildInputs = [ gtk3 gnome.gnome-themes-extra ]; + propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -27,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ubuntu/yaru"; license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ]; platforms = platforms.linux; - maintainers = [ maintainers.jD91mZM2 ]; + maintainers = with maintainers; [ fortuneteller2k ]; }; } |