diff options
Diffstat (limited to 'pkgs/data')
23 files changed, 492 insertions, 144 deletions
diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index 59620b16a6ccf..8ff9344b3f522 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "scheme-manpages"; - version = "unstable-2023-02-06"; + version = "unstable-2023-03-26"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "ccaa76761a1b100e99287c120196bd5f32d4a403"; - hash = "sha256-RL/94dQiZJ60cXHQ9r4P3hRBqe55oUissCmSp4XLM+o="; + rev = "eac67db33b2111f19ac267585032df8b4838e6f4"; + hash = "sha256-FBoagGHWsxZo40gOqeBUw0L+LtNAVF/q6IZ3N9QBFQs="; }; dontBuild = true; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 27988d5ee565b..36f0dda5165ef 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -37,6 +37,9 @@ stdenv.mkDerivation rec { postPatch = '' sed -i CMakeLists.txt \ -e 's@^project.*@project(Zeal VERSION ${version})@' + '' + lib.optionalString (!isQt5) '' + substituteInPlace src/app/CMakeLists.txt \ + --replace "COMPONENTS Widgets" "COMPONENTS Widgets QmlIntegration" ''; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config wrapQtAppsHook ]; diff --git a/pkgs/data/fonts/cozette/default.nix b/pkgs/data/fonts/cozette/default.nix index 7eff1c211b90b..7073c6215602d 100644 --- a/pkgs/data/fonts/cozette/default.nix +++ b/pkgs/data/fonts/cozette/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "cozette"; - version = "1.19.1"; + version = "1.19.2"; src = fetchzip { url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts.zip"; - hash = "sha256-CpabWJJDCY+mgE+9U8L50MmWVfhkm+LnfMQtOTXyE8s="; + hash = "sha256-+TnKUgrAafR5irS9XeXWfb1a2PfUKOXf8CAmqJbf6y4="; }; installPhase = '' diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index dfb58f178f806..d18a9d24dfae4 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "22.0.1"; + version = "22.0.2"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index c16d69f1affb8..6f974d078b027 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - version = "22.0.0"; + version = "22.0.2"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-TvzUUuwmDP2K1deUsODV/FDjPTgZjVvilUdfrkeaO88="; + hash = "sha256-cBIcf6GEJnkOvKPMWTb9dWqN9uPs4ynr6tLc7+B6f3k="; }; - npmDepsHash = "sha256-G+iAGKweh5MOFTaNHLnSUwVMTSlgL/w0zrS2SrJrsJE="; + npmDepsHash = "sha256-tLdJuDFVPdnEtHdGdU7G6N+LIiINVVB5/NNFaeveK/U="; nativeBuildInputs = [ remarshal diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 033ad53b96eb5..c75708299a59a 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "07b6qsbj5bm74ibsda070hfawsimbs4q9wz9fvkw2bfv1ywqw88i"; - iosevka-aile = "0d56dljj9fs9yix7q6dn0ynzcqfg4i86y0c85ppwwvxdq20h3nil"; - iosevka-curly = "10xys2dy15sk8him46jslvmx2wy1slzcs9fi9kc3y7bbi513w08l"; - iosevka-curly-slab = "0z9hlb22d8p29a39jxndgx5b8fvazs71nbbr95gh72nc9mqhlnnk"; - iosevka-etoile = "1nm67p4xnwp060i2a5ar9zn8k670d1b9bav0chd26g4lwr9gj4im"; - iosevka-slab = "1a272hc40lr1rxqwvzavh985cbhwns146w2jz1b49nzxprd65fw5"; - iosevka-ss01 = "1d8m3gzkx0sjg7jijv4yh6rn99qkxpl3179ibcvlk2imx1c2cmbd"; - iosevka-ss02 = "19kn3i18zryygji0rriyzkkr679rqhw9w1zkmryjv1fm6rwpnvfb"; - iosevka-ss03 = "1c291lr34j66mmgzfy7ric37j72nal6b3f1kyp1g58zgr2dbmwqm"; - iosevka-ss04 = "1viv5f6hk34gpppzdxz7yfahx35n3ccshpssl0yw5hln606c7y4j"; - iosevka-ss05 = "1zmj4ca3fbf382ax4wa7y9hr6n79j8bgkk41slcciypw4plk3c1c"; - iosevka-ss06 = "0xjs4vah94wm2mc5s95nk6g8ppwircgsqpdzkgzxpchhgvhf61p2"; - iosevka-ss07 = "1zhiyg8yqmallw49lx6lry084hpginvw4wj5f7ziccxql5awlp3c"; - iosevka-ss08 = "1rzz6fbfdpx6z9y0hzqw7azxpdm00dvnh9dlckbi63nx0zyim4m6"; - iosevka-ss09 = "07wrl3394ni4n113yz1c3r6ffrf0fk7p51hdkhalsdjy7kgykw1q"; - iosevka-ss10 = "1lm58ki16xsqqi9bvj0i98pl8wzc6vr0c7x485kh1wqxs7zdrk31"; - iosevka-ss11 = "02pypr22g4fbf0i3cslqpp24lrhlmbnbp3i6lxghsv85mvbivix3"; - iosevka-ss12 = "0qpnzf6kq56ps9yhnkah16gxf57zfbxi8mq830i5g1szidvg1ayj"; - iosevka-ss13 = "0y853mhkghl9p04g6mxg1w5i3jb98f0vawcl7m5d46ab7vw6rd63"; - iosevka-ss14 = "02ndw330nqc942px4fcbw6azaixfm656dkdb2jk9q2zxs54zvy34"; - iosevka-ss15 = "1iymfy1j67w3qn0l4c91lzbwsaz6ipmy52gn0mk33smk9w5pgwdf"; - iosevka-ss16 = "0m3ii5rm1ixjwszcipl0znsj4ghd0xb5qqmi0inszzn0i3ah9n82"; - iosevka-ss17 = "027g1pa5rm5clasan3wvr42clsd8yajp9scaz2hqz0j5sazp78i0"; - iosevka-ss18 = "1r920sb22mzzl4q2a796i908ava572qsj30vj7qz7cv13cliqmj2"; - sgr-iosevka = "17jiy0acws5pv4rsaqvnds8vvin45plw9cgqp3144wpazds5qch4"; - sgr-iosevka-aile = "0mq482p34pgh7fhnq1psx9zz7y405hbm1scv83w4ph80g51pf67z"; - sgr-iosevka-curly = "1yzlpdh07n23043s72x1zhr2qpn12d6iqi6p52jf328kmmq3ni70"; - sgr-iosevka-curly-slab = "1xrrl70bkn42mgwv8zi994ly7isk3bvynfxkg13qvqg4wfz3j289"; - sgr-iosevka-etoile = "1j6n7h0qjv2agfyyzvs95dgw4yk3pcd46gxk1c04la1vaaybz4rh"; - sgr-iosevka-fixed = "0b0d7a561jpv2k7dica18m64rfgrc52ka9rq1rl72r6001ahl8ym"; - sgr-iosevka-fixed-curly = "08ryhxa8xb5ma3s3b7ggh3b3zmjy57dlqxawbq71k0hzqwwkwabn"; - sgr-iosevka-fixed-curly-slab = "0kk4rlk6q1dby6d7x9y3vmv5pz1gwrkskprncjfx1829xjyaca9r"; - sgr-iosevka-fixed-slab = "0zwkiqf226asw1g584k5b9blc4kjwjdxkcba2xcykcd8a7f0bpv6"; - sgr-iosevka-fixed-ss01 = "1ig2r3j4ljxhgipcbwizfmjypmjk6bmngsm1l5ci0c4ysp0q7ivi"; - sgr-iosevka-fixed-ss02 = "0p35vxzrfpr46hvim4g5nng8m4db6y3a3p9knv3g3h0bwy94h2z1"; - sgr-iosevka-fixed-ss03 = "0j1nikg83bhaidbpc174rrkdwj4njc76pyhh66fgsd0jd92zhw8f"; - sgr-iosevka-fixed-ss04 = "0gi9ba74d1m1rxplrfvfll2lq7h0avbqy606nqz3f70yx1rwn85s"; - sgr-iosevka-fixed-ss05 = "01l9l73l4cmldw5x0rfbm6iw7lmlrnpxk0259yyjv9h58ld665ib"; - sgr-iosevka-fixed-ss06 = "18mirz27w43msk682r2kpnzx36yz4573n02kc18mq2sfc3bc8v6j"; - sgr-iosevka-fixed-ss07 = "0xa4j8zphhff407cwl328rlj4f0rvfqlbm3jf90g04nnw8hkxq6k"; - sgr-iosevka-fixed-ss08 = "12i4sfzrlqkc43sdzr5m7rq3mr7c4rwynpp34v6ycs1xxns2869h"; - sgr-iosevka-fixed-ss09 = "0xjgzzzhpk3ngysp9q046zqh9knfmfx7f07z1b6hr4q0min9jnh0"; - sgr-iosevka-fixed-ss10 = "1mfkkdpd2q575pkq4vj3spmb1lwvpvffdwydi5d7g2rc410sdwnh"; - sgr-iosevka-fixed-ss11 = "0hjd4996178p7j4iin16pigk0ar6dxk5yczzjn9p0ldzdcxqsd2q"; - sgr-iosevka-fixed-ss12 = "06jcxbpnqm45461rrma101xwjh4jzkilgk6vvjirhx91jnxgka9a"; - sgr-iosevka-fixed-ss13 = "03pl1rn4rphfz5nvkalkvn5mz50nsvxz19i71v0q46kam3j0jh1i"; - sgr-iosevka-fixed-ss14 = "0lqjdi0lg8g7y1lcv4f1jn9kgchj35jvlpy42752xkd5y9gi7gvw"; - sgr-iosevka-fixed-ss15 = "03hi24qjgg4j1c4wmgv90jilvsr3p2x61gxhq4d2kbfv8qdsxr0x"; - sgr-iosevka-fixed-ss16 = "1nh0nhlc5nkn35rfwfggvm18npmqb2hwcqxwv8sn4phgk5qy265a"; - sgr-iosevka-fixed-ss17 = "0s7qpzjn87v4zpcr0xf4fh75rcbasbrvs4g7m4knympks3j0l0ml"; - sgr-iosevka-fixed-ss18 = "1id6rhmzh1ajlgq577nnzpdcjcdhwbps63wnf7d1s1gvv1vz8s1i"; - sgr-iosevka-slab = "0k1l4svb9xv8mh7b4sdd83ksxbp03p5p73h1rkcnbyvbwd2g7wmj"; - sgr-iosevka-ss01 = "17fy7r3x66l2ghwi1i3649fgxc4mn7w3rd6hbqppg13kv1nmh9gj"; - sgr-iosevka-ss02 = "1gpg2bjbdr8g1fa6imiphdbss3aj3r5j855iivl4gm7pbx65i4vi"; - sgr-iosevka-ss03 = "0ihk71a16pjgb41jwha8vz5j0qmzwf5lj5fi0lx076xrivj926mn"; - sgr-iosevka-ss04 = "0j8jd76ql2p1ywzpf7qxg81iggl6222x7r3kn3vkb670xk0ms4hi"; - sgr-iosevka-ss05 = "1yxb5d8vwpscv96rhgr9kj8sr2di2aw9hwxaxgas11sbyj9ck74x"; - sgr-iosevka-ss06 = "1a5c2drl1nx5rp01c1bvflm7xq7sgg37yzyk66m3m936w5121ik5"; - sgr-iosevka-ss07 = "0adpc4wfdsd7k5ql64s7ab7kpy8f22wqrvhj92pj4svaqzw0ci9q"; - sgr-iosevka-ss08 = "097bqxpjk8w52v9pwqd91plrlfjavprpa26dpsam9gimn26m2dsy"; - sgr-iosevka-ss09 = "08ynpbxjqx7krkjaqdjfxjxj630ll6x8yrm2bw7hsq725ldnl27a"; - sgr-iosevka-ss10 = "0diqkbnp799fxl69zgr0r3d101sfg6nllibc752dhlp1n1h74c97"; - sgr-iosevka-ss11 = "1ja65jgq916vab5ivg6qv42ahiz7021ib33crgg1j5j9n46mfrn1"; - sgr-iosevka-ss12 = "05m59m4bh0jv03falz5s341x8113wirrlh0qmm0akbdh52wjpdgp"; - sgr-iosevka-ss13 = "074z4qhq1gfrq2f8fl75v8yspkjcz5b6y0cxazl0g2m4r4h0ra84"; - sgr-iosevka-ss14 = "0k46isqq08nnfkdrv3xy7fvvd78b28w1478p6ra75rzmywjaa6h8"; - sgr-iosevka-ss15 = "0j50jix1xmx19a5b42dc04sfgw9bazhss8k3jsjmjb9fn51ik7vf"; - sgr-iosevka-ss16 = "1jycdvx4g5zcrd2368nmda496zw4ns2lpzpjmrnymc7j60rmn57p"; - sgr-iosevka-ss17 = "14mr18r0nvbc0v2462wrf9fq4b5x05cm9rxivirsx39a3pmgcbb5"; - sgr-iosevka-ss18 = "1hix6m6qy4aqbnlli60dxcggy4sq5vhpyk4qjv8ls97awfqv5n0s"; - sgr-iosevka-term = "09lfj25kfr9zl31j6lky5sd3jzjd4cqm8l9aql7ip5sh3wnyfkjv"; - sgr-iosevka-term-curly = "0l8nik08vb4jv5v6sb7zarb9518j91xial1wjq7d26r1cchp90wm"; - sgr-iosevka-term-curly-slab = "04dd5va9hv8c05sklcndah6d85rjcqq29z8yqrm361xr4g459bz4"; - sgr-iosevka-term-slab = "1pd0zqzfc4nvrdwqp7hv85g8059rljn7kn5ldk0kh1s5yl8h4fcf"; - sgr-iosevka-term-ss01 = "16dpd3lrq40zfvzkx1148hw9fjmlkn74p0s27i71zbj1hrinx8m8"; - sgr-iosevka-term-ss02 = "1gimjwgyw7j4fspj7vilydf7fz6p8njlic2359r0rpvzlfshidcz"; - sgr-iosevka-term-ss03 = "0nncgiyznad3fh0d3qkwh0yzfdghskrsakyiha96gf26qfayy9l7"; - sgr-iosevka-term-ss04 = "02n15g1akil04bw72jbrnc4fv0h3zj4fsi8vxz9gbi04p7sf484f"; - sgr-iosevka-term-ss05 = "1856yny5d5y0r8k6v87w3lz9ly1qgbxfbb01vq4p8mrq4wr6riy5"; - sgr-iosevka-term-ss06 = "0a6r4npcvisq85wnqx7ylpdcq2a70yl8mgj4d6q784kyf0fc0nal"; - sgr-iosevka-term-ss07 = "1fiwq4mycf219czpd3darln18wjkv8q4yxah1m75ps6jbg4gzcpk"; - sgr-iosevka-term-ss08 = "07ab3qd5hf82dqc9crr27vz1d2nlwbvswgwhp1qr47lfrmj7bw55"; - sgr-iosevka-term-ss09 = "02d945cvjq8aamq36y6lzkx1rrcg3b0cx0vb8ri5i4awxsa3k2bn"; - sgr-iosevka-term-ss10 = "1p98k3nrwsvdi9fc93ahwh41pm4141nr13w6ganhfa4xysy3spvq"; - sgr-iosevka-term-ss11 = "1c0h0lqbbradlc09ah3azms4xd19wck51741785hhns3r1y21rp2"; - sgr-iosevka-term-ss12 = "1fdc8dkqvh0wlzm7r2pdm5rhna5qc2pia6k9y3ynsmbl3rkn0hfw"; - sgr-iosevka-term-ss13 = "058w71k3rzm1bmmf0lnm9nk1255j241g40rqll3dzkvvpcywk60c"; - sgr-iosevka-term-ss14 = "046bx96k8jxiyyfx46ldvjngpa71gkhwd0ihadlj3pjphy7gjqsp"; - sgr-iosevka-term-ss15 = "073dwxr4p6jjz324xhzmaq23jr5ifqfwnvbsrcrqb8drq1rrlqls"; - sgr-iosevka-term-ss16 = "1ni5bxbdsh3blqxnca46mcpdzwvwjcx0h9fqn4zzn7nggii6w62q"; - sgr-iosevka-term-ss17 = "0q9gv9y637sb4zi2vk37g3528dnq7yzvwkdmj8pikzbv62fgicys"; - sgr-iosevka-term-ss18 = "1s229bayr8n3rg15sbh4x765p64zpvz45zrxi5lni30yyk08gnnj"; + iosevka = "0dj0fk40impvlnbgmpnhndhad841sbk7056nyaxagiz12qq6rrii"; + iosevka-aile = "01r6gdl2s93mhsr7ipq8ir6sy7srpyn8w09yd06hqh26ps40ki2b"; + iosevka-curly = "0d0wsb5fpknxix6qng6mzkfdj2abm8hq067bqvbqhrdwhvbl83x9"; + iosevka-curly-slab = "1hh9ck2pbsjaj81hivq9b7wqxb03mr6hsargw6gic4qn6pkk4l3n"; + iosevka-etoile = "0p85jw25pkhndcdi56l9yg1hm4rsdjvy713q89dygrn5678nw74w"; + iosevka-slab = "11vf6w59pcs71liw0k0nrhaw61nbn4n68vrj1b4rymc7mdaxfp1i"; + iosevka-ss01 = "0hiffyfhfwwy55i1rvr78mvlmgx3c4czfx0lf4vmq2c6c4bldbf7"; + iosevka-ss02 = "1z796x3a7hv05wir06rcj8i1l99169a7wab9j3ibb819pdycs5v7"; + iosevka-ss03 = "1jjmg538avphd3djdjy521q0lbn7ip97qpf479kgvcr1hhv606kl"; + iosevka-ss04 = "09xfsnl5dqzind60wip38pr0j9db47prbcgndfh283jcaysh5c0b"; + iosevka-ss05 = "1mj4q45ifxvgwrrrmlv46p9cliznc4z2vipdf6k8b05ad71n7gab"; + iosevka-ss06 = "02hn8dajvn5x303fv5gfl95hhsvql4h8525hd9k3a93g9qj13ib8"; + iosevka-ss07 = "1hki40chpp3bnz6ksbly8lpjiqywdhgkqpc2h25lksdg8hwd8mcb"; + iosevka-ss08 = "16bpzbcq2i0flw48ch2dfxljgscrm2fxfrcb2112wjv8zvi593hd"; + iosevka-ss09 = "0ajm1gn45zklijyijxvib0iy47q7jvgmp2kdgmsa5zwwvnh8fipb"; + iosevka-ss10 = "1g1if97w5mzzvm8y141rsqby90pmvc4whxxrjvdpmv94yb2biryp"; + iosevka-ss11 = "0icx5cflzk05h51i4i7p5wbdkrpnyfn9r89rsvrd22vxc038xhmg"; + iosevka-ss12 = "1var71j3pfa2fakrmm0c5sgiznbnqnxsnnkmpcb2xpjy4q68xfq1"; + iosevka-ss13 = "0mpidl1hickx60zmza94002721jfs169b5a1l6vxwi5x6vk5329v"; + iosevka-ss14 = "15z0ipnx2spgsp68465x7c8fkvb4hjnyl8pmfj2izn6jmgsrlc4x"; + iosevka-ss15 = "0fyw53nvv45z55x2cnm9kcdcbiw1nykycychkih2fwlydm67vj0d"; + iosevka-ss16 = "18lja4xw63i013ndqhm7kr7ggpbwc5zsxam7xib258nfhyx548ff"; + iosevka-ss17 = "1h2q2v93504539imbn0gbkxi9jw71hisl6px87hs3sh6lmm5kjfm"; + iosevka-ss18 = "085j759av6pspqn3sajrc12w74m7h5y64vdi1spmgd97dnj1gz6q"; + sgr-iosevka = "1ykc80hgc9pipqvqw4m3mqj37rhf6hskgds42kxqzxdn194072m1"; + sgr-iosevka-aile = "0c1jhff87hg4hxwrrp1vxx8gq1bkl9q85py1fz7gb3xdbim54s3z"; + sgr-iosevka-curly = "0zb3y46wbsjb847s31s56gjf9sj8ikp8qvsg1fm2m01idv6f21ig"; + sgr-iosevka-curly-slab = "113wmkzaaqp1yw95ld2j4l1f7yw9miq4bv4zjf9jib4ss6yjq97v"; + sgr-iosevka-etoile = "1pgsh5myw2ihnlk6qkxr7p46sg1402mqvqn7bi2ch8gd472gijck"; + sgr-iosevka-fixed = "1jf1icg1mqv1059p9msvk64j09apcqc9alvzrrxdqblw9b2ckrkj"; + sgr-iosevka-fixed-curly = "1p3m6i1cbphxqrwyj2n0d7zwx9f75nvdsdfyyh8wvap88xwm0ggf"; + sgr-iosevka-fixed-curly-slab = "0lgvai6293ddxckr9yvymi704pymcyp3ks4yx3jn207f70mpdg41"; + sgr-iosevka-fixed-slab = "17935bvl9yly24g95wi2g4faahnj98z3dkb1a6dkb4frjq1nif2m"; + sgr-iosevka-fixed-ss01 = "0wqpm57zcis9h8pzwvyjw8gggrwfgzlc3zd9c3shh7mpzx6zcj88"; + sgr-iosevka-fixed-ss02 = "00jlapqakmpjcdycvdlhlm46iyvr05b8qskl6m7fxqg46dvnzz9z"; + sgr-iosevka-fixed-ss03 = "1qd9wybq9miazkqkpis61s07yak7pn2lfawws421ynfgbb5r7987"; + sgr-iosevka-fixed-ss04 = "0dbrimliy072mqg1gys9cmbl0ac56iavjnl73d14mxc77ciavkkl"; + sgr-iosevka-fixed-ss05 = "1xfhvbzi91gddql6q1byyi40s9n6ym517c2pf6zpirnk6a7415k6"; + sgr-iosevka-fixed-ss06 = "0ibji574aifh7pqpdgnmgmp3k784swjdvly9292sd758mlh8j5sa"; + sgr-iosevka-fixed-ss07 = "1ixx123q5w7pbp9sgm84bhmzi7zy0h1ki3plm891mfv64pkbg42w"; + sgr-iosevka-fixed-ss08 = "00jwiwbgrj6yxqjdp4g8cbsq2jk5pz6h401mh7y6wp2j3y2xrrkb"; + sgr-iosevka-fixed-ss09 = "0jikxfir5md9qp5j1lhk1l9vjx2m15ncy9nkvb50mm32b6y5x3ph"; + sgr-iosevka-fixed-ss10 = "0ampkjvr8qyadfc0yvmyvac7gnm1xi441vz1pf8n2qniypy29bgj"; + sgr-iosevka-fixed-ss11 = "1nchlqkilglymydj33jzgp9wfivja2x3p8app3g9rgcsncsgjyc8"; + sgr-iosevka-fixed-ss12 = "1wpza8g4as1p4cd8g0lv20m2k57f22kazp2w7810k2wzv06613jq"; + sgr-iosevka-fixed-ss13 = "0phh86fk0l37998vxakz0vsxwsj1lbbzls23q56x7hgynnh8nr3x"; + sgr-iosevka-fixed-ss14 = "1x1hmfj692ify57lffg08pa2420fgx0amha1kdzyyxf87s3maqx8"; + sgr-iosevka-fixed-ss15 = "0qbf0b92668pxhjx778nnm5mj2w65c02k3cwk4f4x8vwkagwq2jp"; + sgr-iosevka-fixed-ss16 = "0wmlcckbyrr1sspqfp5r6rymy5myy53q02fl7agv1c7bwfx9iycr"; + sgr-iosevka-fixed-ss17 = "1rrkyv919m86biydl8jivfyn7wf8cna5c3b8rwv80ihz131zgj6z"; + sgr-iosevka-fixed-ss18 = "1s5gj3iyyfgkkxy23yzbibwrzw4s2x9xprc5hhzyh2r10zvib5cf"; + sgr-iosevka-slab = "1313y3nma1pqxm73yksw1b4vkvbwnv434hvkpqk1gp232j3i6dw2"; + sgr-iosevka-ss01 = "137lmgn490vyl2y7aa5pqa66rsdwrsd4z8nz22fsks3p1pzm3fc7"; + sgr-iosevka-ss02 = "1rhc76hfm204l5bmp1jdi74f0ay34g9q2rzi7lz5jirjjinnvadj"; + sgr-iosevka-ss03 = "1gpb5vcx624gi0jjrj8p7jpm6r2465gpbn3khq46f9557ril4m5y"; + sgr-iosevka-ss04 = "0kf1pmq2ffiam4zllj6x1dzd738zi9a843fz6jkpjbf9fascad9z"; + sgr-iosevka-ss05 = "1xibjsa438lwk4y4bf0r7gjqy5czp7j7fml08f492jb1dwz7vqhq"; + sgr-iosevka-ss06 = "1mk6haqj77b7r8cazkhf0bzd5w9ln2s6chsr12pd6bzmvphvzrzi"; + sgr-iosevka-ss07 = "087030ckif8w4mv7j9y4pirfia5g8dh385awpqc6fffls9l0l0zh"; + sgr-iosevka-ss08 = "0gzgsl7li9i1hl0ffw81j4w2ps3wy4kq986fwcwhgk7n9cy9rg97"; + sgr-iosevka-ss09 = "1hsdgsg5y40bxwjkhm2q7jmjcjffsyjwa741n7fkfaqrqwl6273g"; + sgr-iosevka-ss10 = "0ayspdypq0n7j8nbx17lxzki84icy5bzk88xq6akp7g6n035vw37"; + sgr-iosevka-ss11 = "0kf2a1765qrmd5ba3s3hw8hxgzbcqi9dwb754yid18kiipl3lp4l"; + sgr-iosevka-ss12 = "02d8i8qizfd1akhp0857y5i60hq3y4dj2dg2aq9pf4ldydcvc16g"; + sgr-iosevka-ss13 = "0aw77vcfmr868vyff01cqln09xb1f30lwcsg4mqg2ym2ibp0xv71"; + sgr-iosevka-ss14 = "1s1y5hww1vlqavgp4rr36bdvdicx7azw0yyrgv401i5w1p5z0088"; + sgr-iosevka-ss15 = "1wb8s43hjw36x99sh610ms5x04nb6pi9z7i0dcpch7x9g2kk9ydh"; + sgr-iosevka-ss16 = "1fwgskyl6ys383sa6fkkmdpw61m0d5nxc2vrhw56wysfvrz2cfa8"; + sgr-iosevka-ss17 = "1zvzwy90gkaiq9ij9030wssnrjrkx9xkddwghaa1s2p9bdyfnf8x"; + sgr-iosevka-ss18 = "12ijnkr69hahk8ghgibz438ar3yfky4kzwb9r08y43zjvycf2qhg"; + sgr-iosevka-term = "13dvkydib9gv7308i093zpxpr40cr3admq0c4gg6ki3ix7cml3ac"; + sgr-iosevka-term-curly = "0991m6p3b4kiyw0rgvxswwn263i7if7nznbivyzdsj1dgp3b2pkr"; + sgr-iosevka-term-curly-slab = "1qbhhd4w2nxga2j7llsn8w3qa66rfw4nqylsw6dknqfhf34ba2mq"; + sgr-iosevka-term-slab = "0g0dy4nrgy1a3xdbc5nxyh7y8j7plkbk09bid8rq51rdsljzp1hg"; + sgr-iosevka-term-ss01 = "1smlqzqvp8by7rz5g5nbywyg740v9fhyiy3khn9rx5szyj92pmrb"; + sgr-iosevka-term-ss02 = "1caxixkzbjapdr3k1ki1wfvcgs74mng0h15y00msfga1pjbj41vw"; + sgr-iosevka-term-ss03 = "1fsbzb57jx2qcdmixxpgpqm8x1rlvc5vzkgx2w9z83nrll3iba5n"; + sgr-iosevka-term-ss04 = "0zmpgsb0x8d8pggliqyl79hnxv5ivir0d8z2bg5zy1cw5ryzz94w"; + sgr-iosevka-term-ss05 = "17d8ak2xnmp0g37b5ly3qik38mmmblrdqgmixp4i91wldf66h58c"; + sgr-iosevka-term-ss06 = "0vv5gga66c5rs2vl4ncid403yqx7nwjfkr4mr5krlpc6lhs7wzhk"; + sgr-iosevka-term-ss07 = "0mjpm4x0gy4749fnha26xssm7aw72sh7rgf3jf46pmqz40ya829b"; + sgr-iosevka-term-ss08 = "1hw3cjfr3wwmjvi84vdn32kpk6x9zyqi43ib9nva7db4if39vf7s"; + sgr-iosevka-term-ss09 = "1049yb11dlxc7d97hw51mzssrc0ips2dll8wglinp0l23y1nhf2s"; + sgr-iosevka-term-ss10 = "0nzgcr2rlcgzfidnpix1dxyqiz273xmhfipfkflz5plpqvscd0c1"; + sgr-iosevka-term-ss11 = "135crs740qprnzk0mycp83vw9x1m8za6w51syvvx8h0vncsc8g6b"; + sgr-iosevka-term-ss12 = "1a2qrp44i4gqqpn2ycmslnm2g92v79v4hsim2ssiia474s5qn41z"; + sgr-iosevka-term-ss13 = "18dbgl28iykw1hqcmanvpkc8zk12547rgw8zisr4vwqck8an50vb"; + sgr-iosevka-term-ss14 = "0474ricwyvcmk9baxmd3gq1p6zrgnj59p0bbrsfc142ixqgkc0pp"; + sgr-iosevka-term-ss15 = "1g8pjbyxnhvx62g96zlfpbq2kdc329j0pcr8iib7isyhijh4ygcx"; + sgr-iosevka-term-ss16 = "199jhbfh2zbmp07jzi2wm8a63zhmasf4a04bp9i13pqwxz9hic7i"; + sgr-iosevka-term-ss17 = "1lyv2hpmyalrwbhcxjqw9lzil9dfhrf971vazg366wngwn027sp2"; + sgr-iosevka-term-ss18 = "1wszzj13gv3kc488yg9bshrf98db86xi0958g9l2y9l137h4frbz"; } diff --git a/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix index 6b93826d4d993..234fd2c508f19 100644 --- a/pkgs/data/fonts/lxgw-neoxihei/default.nix +++ b/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.009"; + version = "1.010"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-Q7rrgqrjALLY2y40mNfNmzSeGwcVwhZUmDj08nlWsao="; + hash = "sha256-IIiQn2Qlac4ZFy/gVubrpqEpJIt0Dav2TEL29xDC7w4="; }; dontUnpack = true; diff --git a/pkgs/data/fonts/maple-font/default.nix b/pkgs/data/fonts/maple-font/default.nix index 15a77c2481935..3c870abab6ad8 100644 --- a/pkgs/data/fonts/maple-font/default.nix +++ b/pkgs/data/fonts/maple-font/default.nix @@ -9,7 +9,7 @@ let rec{ inherit pname desc; - version = "6.2"; + version = "6.3"; src = fetchurl { url = "https://github.com/subframe7536/Maple-font/releases/download/v${version}/${pname}.zip"; inherit sha256; @@ -21,6 +21,8 @@ let nativeBuildInputs = [ unzip ]; installPhase = '' find . -name '*.ttf' -exec install -Dt $out/share/fonts/truetype {} \; + find . -name '*.otf' -exec install -Dt $out/share/fonts/opentype {} \; + find . -name '*.woff2' -exec install -Dt $out/share/fonts/woff2 {} \; ''; meta = with lib; { @@ -38,22 +40,33 @@ in { Mono = maple-font { pname = "MapleMono"; - sha256 = "sha256-KhG0gQRnHFvpoxdcySSEYWDtOgG4xIm8X0Ua9o1aGTw="; + sha256 = "sha256-Ap4OwP/QGFz9+xn12rekia1/pwRxZvv+H+ZmZiXcxcY="; desc = "monospace"; }; NF = maple-font { pname = "MapleMono-NF"; - sha256 = "sha256-Ov6AEaLy80cwrFtmKWUceI809SwBlHsQf2F86/sc/6A="; + sha256 = "sha256-WZHFQRG+81TF5YgOT249c8VA8vAvYowiQx/pqsDuJ4o="; desc = "Nerd Font"; }; SC-NF = maple-font { pname = "MapleMono-SC-NF"; - sha256 = "sha256-bb62YGzdE9qvlyuZG7YI16gOxWC+AijlRLY8ET+q5Rg="; + sha256 = "sha256-26odkmMljEwstRywDYJ7Dst5pfOXrtQTcrFFxbRwHcA="; desc = "Nerd Font SC"; }; + opentype = maple-font { + pname = "MapleMono-otf"; + sha256 = "sha256-u2IuymjiosoSbdIW7h2QalagTI+eDMRSuhLgXy5RdRA="; + desc = "OpenType"; + }; + + woff2 = maple-font { + pname = "MapleMono-woff2"; + sha256 = "sha256-iv6Q/aYMlAkhaem8tFWAzqc9mVgWQXghBzcHJz1dg/Y="; + desc = "WOFF2.0"; + }; } diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index c8a3a65a00b78..3498e840eae69 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-gothic"; - version = "0.40.4"; + version = "0.40.5"; src = fetchurl { # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - hash = "sha256-PVlozsWYomsQKp8WxHD8+pxzlTmIKGPK71HDLWMR9S0="; + hash = "sha256-bs3o8+LyCTCZvUYigUWfSmjFrzPg7nLzElZYxDEsQ9k="; }; sourceRoot = "."; diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index 89d189f4f8b13..911fbc69b55d9 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "spleen"; - version = "1.9.2"; + version = "1.9.3"; src = fetchurl { url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; - hash = "sha256-AOGgGJLye0Yg3QTlNZPgRdtRim8atn+ZIm8aPpUnivY="; + hash = "sha256-t60e2wKl3a0RfKlPAm64RQtRUE0ugbw6A4deEtTnayU="; }; nativeBuildInputs = [ xorg.mkfontscale ]; diff --git a/pkgs/data/fonts/whatsapp-emoji/default.nix b/pkgs/data/fonts/whatsapp-emoji/default.nix new file mode 100644 index 0000000000000..b118691fee1d4 --- /dev/null +++ b/pkgs/data/fonts/whatsapp-emoji/default.nix @@ -0,0 +1,46 @@ +{ stdenvNoCC +, lib +, fetchFromGitHub +, imagemagick +, nix-update-script +, pngquant +, python3Packages +, which +, zopfli +}: + +stdenvNoCC.mkDerivation rec { + pname = "whatsapp-emoji-linux"; + version = "2.22.8.79-1"; + + src = fetchFromGitHub { + rev = "refs/tags/${version}"; + owner = "dmlls"; + repo = "whatsapp-emoji-linux"; + hash = "sha256-AYdyNZYskBNT3v2wl+M0BAYi5piwmrVIDfucSZ3nfTE="; + }; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + imagemagick + pngquant + python3Packages.nototools + which + zopfli + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "WhatsApp Emoji for GNU/Linux"; + homepage = "https://github.com/dmlls/whatsapp-emoji-linux"; + maintainers = [ lib.maintainers.lucasew ]; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + license = lib.licenses.unfree; + }; +} diff --git a/pkgs/data/icons/colloid-icon-theme/default.nix b/pkgs/data/icons/colloid-icon-theme/default.nix index 5c0a3817f32f2..8384b924a9838 100644 --- a/pkgs/data/icons/colloid-icon-theme/default.nix +++ b/pkgs/data/icons/colloid-icon-theme/default.nix @@ -18,13 +18,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-01-08"; + version = "2023-03-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-n4kMOIp7AD5Ue4qY4G3ja/VTyYF7cqhdI0uuk9b6o5c="; + hash = "sha256-R7QKxZdcKUeTD6E9gj02Tu5tYv9JyqyH2sCsdOk9zTM="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index f7890c54aa34d..8d6fbe4ff4b5e 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.03.19"; + version = "23.04.05"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-kvIPtPJkBIioz/ScES3xmzjJ0IH4eK5wYSj5Jb2U47g="; + sha256 = "sha256-eyTiAfwons/VDsNCNfYp4OR+U37LvTIh8Wfktie8PKU="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 0c64d55f06182..2dce715b68858 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "23.04.05"; + version = "23.04.20"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-fyb0qHmZev7kH8/q6mk2WPT30Szx1/jLIweq12eAIaw="; + sha256 = "sha256-O9itWigot15qljmPx4msBa7ucb4j+Wb08q5UTsF2sB8="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index eee3a425b709b..d5c29013c51a7 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-01-29"; + version = "2023-04-16"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "J3opK+5xGmV81ubA60BZw9+9IifylrRYo+5cRLWd6Xs="; + sha256 = "OHI/kT4HMlWUTxIeGXjtuIYBzQKM3XTGXuE9cviNDTM="; }; nativeBuildInputs = [ diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/data/misc/cldr-annotations/default.nix index 729d3cdbb7b89..6d06d49eb7115 100644 --- a/pkgs/data/misc/cldr-annotations/default.nix +++ b/pkgs/data/misc/cldr-annotations/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "cldr-annotations"; - version = "42.0"; + version = "43.0"; src = fetchzip { url = "https://unicode.org/Public/cldr/${lib.versions.major version}/cldr-common-${version}.zip"; stripRoot = false; - hash = "sha256-paRon3ecGXNp3ZDnN1DU9RVU2NDWTBiKjy0OP3vcPLE="; + hash = "sha256-L8ikzRpSw4mDCV79TiUqhPHWC0PmGi4i4He0OAB54R0="; }; installPhase = '' diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 98511f02eaf0b..91ec5b8a71d87 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "a88deb396b19367026b858afe79fa1d0e0c1bc4f", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a88deb396b19367026b858afe79fa1d0e0c1bc4f.tar.gz", - "sha256": "04l2jd0shw1aq74nv9hhvdn76bcwp2hsfm8x3frbxllwgkk740s4", - "msg": "Update from Hackage at 2023-04-07T21:49:23Z" + "commit": "67ecaa60725908a5bc562294a2c0e03e30858aa7", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/67ecaa60725908a5bc562294a2c0e03e30858aa7.tar.gz", + "sha256": "0yf0dliq65j5achg3iqz0hkf25jjkgxarsdsr5vl2r5h41n39qg3", + "msg": "Update from Hackage at 2023-04-18T09:14:41Z" } diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 54a0c0320cead..12d108b271d00 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202304060040"; + version = "202304200041"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "8d65f1d075e077ffc5cdae297795c65f12b37159"; - sha256 = "sha256-RGDHYgecNDcVwa9yXMgjml72QLf14oHtDGCjXOjeF5A="; + rev = "7869655f0a2c9fd81d04e091b1c2657029b6e1f9"; + sha256 = "sha256-pgQU8gLErC9zo/GtwxHC2+4svFsxkgceV3IZPovVMo4="; }; installPhase = '' diff --git a/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/data/themes/adw-gtk3/default.nix index 25a6524dc0b35..b7c1444411044 100644 --- a/pkgs/data/themes/adw-gtk3/default.nix +++ b/pkgs/data/themes/adw-gtk3/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "adw-gtk3"; - version = "4.1"; + version = "4.5"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7E+eBbsavWdraCxxtwFdvFkxTWN/XMz8obvnpxf6PQc="; + sha256 = "sha256-x6ul5NZDWqEQfLzmpR7X5HgUmHNSbpuTnCquVEHFHL8="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/catppuccin-kde/default.nix b/pkgs/data/themes/catppuccin-kde/default.nix index b31b075a8fca0..d2f7caa52334c 100644 --- a/pkgs/data/themes/catppuccin-kde/default.nix +++ b/pkgs/data/themes/catppuccin-kde/default.nix @@ -1,24 +1,47 @@ { lib , stdenvNoCC , fetchFromGitHub +, flavour ? [ "frappe" ] +, accents ? [ "blue" ] +, winDecStyles ? [ "modern" ] }: +let + validFlavours = [ "mocha" "macchiato" "frappe" "latte" ]; + validAccents = [ "rosewater" "flamingo" "pink" "mauve" "red" "maroon" "peach" "yellow" "green" "teal" "sky" "sapphire" "blue" "lavender" ]; + validWinDecStyles = [ "modern" "classic" ]; + + installScript = ./install.sh; +in + + lib.checkListOfEnum "Invalid accent, valid accents are ${toString validAccents}" validAccents accents + lib.checkListOfEnum "Invalid flavour, valid flavours are ${toString validFlavours}" validFlavours flavour + lib.checkListOfEnum "Invalid window decoration style, valid styles are ${toString validWinDecStyles}" validWinDecStyles winDecStyles + stdenvNoCC.mkDerivation rec { pname = "kde"; - version = "unstable-2022-11-26"; + version = "0.2.2"; src = fetchFromGitHub { owner = "catppuccin"; repo = pname; - rev = "249df3ec0cdae79af379f4a10b802c50feac89ba"; - hash = "sha256-CH9GJnFqqdyIzW7VfGb3oB1YPULEZsfK3d1eyFALwKc="; + rev = "v${version}"; + hash = "sha256-P5mLLaQzMhG6aHvAj9SizUFQFLjqNKj1T1kQ4dgiacI="; }; installPhase = '' - mkdir -p $out/share/{plasma/look-and-feel,color-schemes} - find . -type f -name "Catppuccin*.colors" -exec cp "{}" $out/share/color-schemes \; - find . -type f -name "*.tar.gz" -exec tar -xzf "{}" \; - cp -R Catppuccin-* $out/share/plasma/look-and-feel + runHook preInstall + + patchShebangs . + for WINDECSTYLE in ${toString winDecStyles}; do + for FLAVOUR in ${toString flavour}; do + for ACCENT in ${toString accents}; do + FLAVOUR=$FLAVOUR ACCENT=$ACCENT WINDECSTYLE=$WINDECSTYLE bash ${installScript} + done; + done; + done; + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/themes/catppuccin-kde/install.sh b/pkgs/data/themes/catppuccin-kde/install.sh new file mode 100755 index 0000000000000..dec90274b450b --- /dev/null +++ b/pkgs/data/themes/catppuccin-kde/install.sh @@ -0,0 +1,263 @@ +COLORDIR=$out/share/color-schemes +AURORAEDIR=$out/share/aurorae/themes +LOOKANDFEELDIR=$out/share/plasma/look-and-feel +DESKTOPTHEMEDIR=$out/share/plasma/desktoptheme + +FLAVOUR=${FLAVOUR^} +ACCENT=${ACCENT^} +WINDECSTYLE=${WINDECSTYLE^} + +echo "Creating theme directories.." +mkdir -p $COLORDIR +mkdir -p $AURORAEDIR +mkdir -p $LOOKANDFEELDIR +mkdir -p $DESKTOPTHEMEDIR +mkdir ./dist + +# Sets accent based on the pallet selected (Best to fold this in your respective editor) +if [[ $ACCENT == "Rosewater" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#f5e0dc + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#f4dbd6 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#f2d5cf + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#dc8a78 + fi + echo "Accent Rosewater(1) was selected!" +elif [[ $ACCENT == "Flamingo" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#f2cdcd + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#f0c6c6 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#eebebe + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#dd7878 + fi + echo "Accent Flamingo(2) was selected!" + ACCENT="2" +elif [[ $ACCENT == "Pink" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#f5c2e7 + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#f5bde6 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#f4b8e4 + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#ea76cb + fi + echo "Accent Pink(3) was selected!" +elif [[ $ACCENT == "Mauve" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#cba6f7 + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#c6a0f6 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#ca9ee6 + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#8839ef + fi + echo "Accent Mauve(4) was selected!" +elif [[ $ACCENT == "Red" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#f38ba8 + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#ed8796 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#e78284 + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#d20f39 + fi + echo "Accent Red(5) was selected!" +elif [[ $ACCENT == "Maroon" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#eba0ac + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#ee99a0 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#ea999c + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#e64553 + fi + echo "Accent Maroon(6) was selected!" +elif [[ $ACCENT == "Peach" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#fab387 + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#f5a97f + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#ef9f76 + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#fe640b + fi + echo "Accent Peach(7) was selected!" +elif [[ $ACCENT == "Yellow" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#f9e2af + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#eed49f + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#e5c890 + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#df8e1d + fi + echo "Accent Yellow(8) was selected!" +elif [[ $ACCENT == "Green" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#a6e3a1 + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#a6da95 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#a6d189 + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#40a02b + fi + echo "Accent Green(9) was selected!" +elif [[ $ACCENT == "Teal" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#94e2d5 + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#8bd5ca + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#81c8be + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#179299 + fi + echo "Accent Teal(10) was selected!" +elif [[ $ACCENT == "Sky" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#89dceb + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#91d7e3 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#99d1db + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#04a5e5 + fi + echo "Accent Sky(11) was selected!" +elif [[ $ACCENT == "Sapphire" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#74c7ec + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#7dc4e4 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#85c1dc + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#209fb5 + fi + echo "Accent Sapphire(12) was selected!" +elif [[ $ACCENT == "Blue" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#89b4fa + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#8aadf4 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#8caaee + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#1e66f5 + fi + echo "Accent Blue(13) was selected!" +elif [[ $ACCENT == "Lavender" ]]; then + if [[ $FLAVOUR == "Mocha" ]]; then + ACCENTCOLOR=#b4befe + elif [[ $FLAVOUR == "Macchiato" ]]; then + ACCENTCOLOR=#b7bdf8 + elif [[ $FLAVOUR == "Frappe" ]]; then + ACCENTCOLOR=#babbf1 + elif [[ $FLAVOUR == "Latte" ]]; then + ACCENTCOLOR=#7287fd + fi + echo "Accent Lavender(14) was selected!" +else echo "Not a valid accent" && exit +fi + +if [[ $WINDECSTYLE == "Modern" ]]; then + WINDECSTYLECODE=__aurorae__svg__Catppuccin$FLAVOUR-Modern +elif [[ $WINDECSTYLE == "Classic" ]]; then + WINDECSTYLECODE=__aurorae__svg__Catppuccin$FLAVOUR-Classic +fi + +function ModifyLightlyPlasma { + + rm -rf $DESKTOPTHEMEDIR/lightly-plasma-git/icons/* + rm -rf $DESKTOPTHEMEDIR/lightly-plasma-git/translucent + rm $DESKTOPTHEMEDIR/lightly-plasma-git/widgets/tabbar.svgz + rm $DESKTOPTHEMEDIR/lightly-plasma-git/dialogs/background.svgz + + # Copy Patches + cp $DESKTOPTHEMEDIR/lightly-plasma-git/solid/* $DESKTOPTHEMEDIR/lightly-plasma-git -Rf + cp ./Patches/glowbar.svg $DESKTOPTHEMEDIR/lightly-plasma-git/widgets -rf + cp ./Patches/background.svg $DESKTOPTHEMEDIR/lightly-plasma-git/widgets -rf + cp ./Patches/panel-background.svgz $DESKTOPTHEMEDIR/lightly-plasma-git/widgets + + # Modify description to state that it has been modified by the KDE Catppuccin Installer + sed -e s/A\ plasma\ style\ with\ close\ to\ the\ look\ of\ the\ newest\ Lightly./*MODIFIED\ BY\ CATPPUCCIN\ KDE\ INSTALLER*\ A\ plasma\ style\ with\ close\ to\ the\ look\ of\ the\ newest\ Lightly./g $DESKTOPTHEMEDIR/lightly-plasma-git/metadata.desktop >> $DESKTOPTHEMEDIR/lightly-plasma-git/newMetadata.desktop + cp -f $DESKTOPTHEMEDIR/metadata.desktop $DESKTOPTHEMEDIR/lightly-plasma-git/metadata.desktop && rm $DESKTOPTHEMEDIR/metadata.desktop +} + +function AuroraeInstall { + if [[ $WINDECSTYLE == "Modern" ]]; then + cp ./Resources/aurorae/Catppuccin$FLAVOUR-Modern $AURORAEDIR -r; + elif [[ $WINDECSTYLE == "Classic" ]]; then + cp ./Resources/aurorae/Catppuccin$FLAVOUR-Classic $AURORAEDIR -r; + fi +} + +function BuildColorscheme { + # Add Metadata & Replace Accent in colors file + sed -e s/--accentColor/$ACCENTCOLOR/g -e s/--flavour/$FLAVOUR/g -e s/--accentName/$ACCENT/g ./Resources/base.colors > ./dist/base.colors + # Hydrate Metadata with Pallet + Accent Info + sed -e s/--accentName/$ACCENT/g -e s/--flavour/$FLAVOUR/g ./Resources/metadata.desktop > ./dist/Catppuccin-$FLAVOUR-$ACCENT/metadata.desktop + # Modify 'defaults' to set the correct Aurorae Theme + sed -e s/--accentName/$ACCENT/g -e s/--flavour/$FLAVOUR/g -e s/--aurorae/$WINDECSTYLECODE/g ./Resources/defaults > ./dist/Catppuccin-$FLAVOUR-$ACCENT/contents/defaults + # Hydrate Dummy colors according to Pallet + FLAVOURNAME=$FLAVOUR ACCENTNAME=$ACCENT ./Installer/color-build.sh -o ./dist/Catppuccin$FLAVOUR$ACCENT.colors -s ./dist/base.colors +} + +function BuildSplashScreen { + # Hydrate Dummy colors according to Pallet + FLAVOURNAME=$FLAVOUR ./Installer/color-build.sh -s ./Resources/splash/images/busywidget.svg -o ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg + # Replace Accent in colors file + sed ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg -e s/REPLACE--ACCENT/$ACCENTCOLOR/g > ./dist/$GLOBALTHEMENAME/contents/splash/images/busywidget.svg + # Cleanup temporary file + rm ./dist/$GLOBALTHEMENAME/contents/splash/images/_busywidget.svg + # Hydrate Dummy colors according to Pallet (QML file) + FLAVOURNAME=$FLAVOUR ./Installer/color-build.sh -s ./Resources/splash/Splash.qml -o ./dist/$GLOBALTHEMENAME/contents/splash/Splash.qml + # Add CTP Logo + # TODO: Switch between latte & mocha logo based on Pallet + cp ./Resources/splash/images/Logo.png ./dist/$GLOBALTHEMENAME/contents/splash/images +} + +# Prepare Global Theme Folder +GLOBALTHEMENAME="Catppuccin-$FLAVOUR-$ACCENT" +cp -r ./Resources/Catppuccin-$FLAVOUR-Global ./dist/$GLOBALTHEMENAME +mkdir -p ./dist/$GLOBALTHEMENAME/contents/splash/images + +# Build SplashScreen +echo "Building SplashScreen.." +BuildSplashScreen + +# Build Colorscheme +echo "Building Colorscheme.." +# Generate Color scheme +BuildColorscheme + +# Install Colorscheme +echo "Installing Colorscheme.." +mv ./dist/Catppuccin$FLAVOUR$ACCENT.colors $COLORDIR + +# Install Global Theme. +echo "Installing Global Theme.." +cp -r ./dist/$GLOBALTHEMENAME $LOOKANDFEELDIR + +# echo "Modifying lightly plasma theme.." +# ModifyLightlyPlasma + +echo "Installing aurorae theme.." +AuroraeInstall + +# Cleanup +echo "Cleaning up.." +rm -rf ./dist diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index 0685c55a5486e..efbe4ac122c08 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "image" "square" "round" ] tweaks stdenv.mkDerivation rec { inherit pname; - version = "2022-11-09"; + version = "2023-02-27"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "VmMlebERe6LDyfD/lo8o4TvNrJ37m2OHC25JkUc6sig="; + sha256 = "oBUBSPlOCBEaRRFK5ZyoGlk+gwcE8LtdwxvL+iTfuMA="; }; nativeBuildInputs = [ @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Flat Design theme for GTK based desktop environments"; - homepage = "https://vinceliuice.github.io/Qogir-theme"; + homepage = "https://github.com/vinceliuice/Qogir-theme"; license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index a056a405c0440..b4e50252fe534 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "22.10.3"; + version = "23.04.4"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - hash = "sha256-ZWt9I/Q5p6fAkheR6QlZI1DI/HL8bSNmHuO5+V3vunY="; + hash = "sha256-8MtRYNJJVhZzE5Ds1HSk+Ej3FUD/z2hGZAsuCeGzWb4="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; |