diff options
Diffstat (limited to 'nixpkgs/pkgs/data')
22 files changed, 238 insertions, 143 deletions
diff --git a/nixpkgs/pkgs/data/fonts/cozette/default.nix b/nixpkgs/pkgs/data/fonts/cozette/default.nix index 192599c7e987..f20e4d82222c 100644 --- a/nixpkgs/pkgs/data/fonts/cozette/default.nix +++ b/nixpkgs/pkgs/data/fonts/cozette/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "cozette"; - version = "1.22.0"; + version = "1.22.2"; src = fetchzip { url = "https://github.com/slavfox/Cozette/releases/download/v.${version}/CozetteFonts-v-${builtins.replaceStrings ["."] ["-"] version}.zip"; - hash = "sha256-IB+YQcIpxYumJ5ETezqQ2yVlvdh+wllJ+MkVHPWZCEg="; + hash = "sha256-Y6StCbAsFJrRZtJu1IAsMYuyNhwe3YIlT41EhSXhCUE="; }; installPhase = '' diff --git a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index 1c6221f36da6..4897a9f3772b 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/nixpkgs/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 = "26.0.1"; + version = "26.2.0"; 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 6e15d96a10da..348aac92deef 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/nixpkgs/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 = "25.1.1"; + version = "26.2.1"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-IEP4xxL5rez15FVCKdgNBmCv9yHFqtHz/YKTQciQWMg="; + hash = "sha256-0vesbUo9HTNkSEBPgkDJzmIWWMLRDMsJza87FMqAoMQ="; }; - npmDepsHash = "sha256-E4dC3WCXvnx9qUxOM+f6/HfBxKhUvsD9TEVmPJGwbDs="; + npmDepsHash = "sha256-d2ar4CcTp4b3yZHZl3R5PWItTICI4N7rJucplhnLSTI="; nativeBuildInputs = [ remarshal diff --git a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index aa92e96f4147..7046fb8db017 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0rr2a78svxi67hbwzxj4izz27lag0x3kdaxndp8w8vp4q5wdl7ny"; - iosevka-aile = "0057ncsrq5jdc1szg8wcwp3fcjn2iaspmgscapbfqdkvbfwpxr1w"; - iosevka-curly = "10byxhv3zh5akp0phclfb1vssa2abm3bc2z5a1s1p1giz6npzr7y"; - iosevka-curly-slab = "0h1n4w6s22jcxli2yhmpfankaqfqhw9yv48qpyyqsyclcyhnp41r"; - iosevka-etoile = "1wrfmkynfj3vrnyg2c7qx8j2icr5a2ixpjmh4dfxw4jh5k0bgh91"; - iosevka-slab = "0qfbi7sl1byipkgz83p30yndzx3x7ss8id7pia508ggdhv899xqg"; - iosevka-ss01 = "1jamw3zjdq1by309zic1mcliz42837xp1qill8s2mx54dv1l9c88"; - iosevka-ss02 = "1xzdi58ls44cjhwd5z82w1bhw9lliysa98728ld58jkryq8f0wc7"; - iosevka-ss03 = "13wi8phrarflp701xssyfvx3a9bhahs52pcwx5440c278892kpw1"; - iosevka-ss04 = "1l9zzy65wjz4mgf5wwam1hc72wn24glnvahmn32a9r1hjnwmmj7p"; - iosevka-ss05 = "14glack97mar9z65qp919hv3yzaw0hb618y9fjpxyl8aw7zh9jvn"; - iosevka-ss06 = "0bv6vymg58lj0ndi7982spn5qh461dg14p9k13hyyj42yi880x4w"; - iosevka-ss07 = "10qan63yhwgp6hxdj45wwdnncj8917a8m4amd197kzky6h2q5xf9"; - iosevka-ss08 = "0k7qx4pg64v8wh4xcxn73xhjwqcspssi769fc72wfnqm2hb7pn23"; - iosevka-ss09 = "04lsdxqgk42vzqlgvx0d74f7vbchiinr7wz658j4bph5dfcdzchq"; - iosevka-ss10 = "05bzz0psvfv9m1lf5zyjl04wk1h5xzncg5md7gaxr1dviw8shp1f"; - iosevka-ss11 = "11i7wrb1dnmgng8hcx0ng4xphd7gikfv4kv4wr792rz1f5dkmd3s"; - iosevka-ss12 = "1jhjbyv6z6s3ay1y011h7hf7capg7b5pkjfjb6yb7wca85bn3b67"; - iosevka-ss13 = "1xr8rrrvdb74qx8ajxx7adywvmsvzvg7q1zzy5hl219w8f5rxji1"; - iosevka-ss14 = "19ngfzlrzff8zbnm48nwd5n2l2h7v36pcp5rprjl9hbngjcl0acq"; - iosevka-ss15 = "0kxkm81mki2p95r61ipczggzxar45jxf1xhvlgs0k6s8ysr0h24a"; - iosevka-ss16 = "01arpv2pxgs1m5vqg8mzcnfkmaml4cl643ab4i284xxl9d8za712"; - iosevka-ss17 = "0ypc59wrpyh7p5jyigai89wj7ji81r80za25nk8mngaskk90pk28"; - iosevka-ss18 = "1n48psav41fk2kiic8hgdw7hyr8p34ahvys9v6zpi16djapq1sff"; - sgr-iosevka = "0w0jrva0rhxs0l9rqww0c3w69q2k2b1xfcn25n89gh0m0zz5iq75"; - sgr-iosevka-aile = "17hhs8jkvqwvlw7hxsdwng6sgh6j6myrzp89ljhqfq8f9i847q72"; - sgr-iosevka-curly = "13kvw8ln4ys6rv1ajjgd4iqsp5rlzr4lsp59yhwqzf40fjnw7l05"; - sgr-iosevka-curly-slab = "097mfshjmapiclbxjzwli031wd4mf7w4jbcy3kn1pmb8ndjl4mnb"; - sgr-iosevka-etoile = "0if0868s94jyn7yj7z3adjrm3kkngm804jdi7sabi8pa3mrrnbj0"; - sgr-iosevka-fixed = "0q7r9lnh3icasqzhscxy0fd1v9gvc7nw38y059iybpv9n41hwjgf"; - sgr-iosevka-fixed-curly = "00k2i270zmpmdliivrjvvr1bghqaj04b102kvggcjrhgljj02r9s"; - sgr-iosevka-fixed-curly-slab = "1xq3dw3lgjpwcj54lb3vz8n8pjgvygap3rk6sq5q39w5ga3njhc1"; - sgr-iosevka-fixed-slab = "00wxahzfrhwf9nfwpv3hl7n0r3wshi06bqqlffd1rps8vm52g8bj"; - sgr-iosevka-fixed-ss01 = "0bqyb43q9ip8x761c9h6fj2n6saq9k9krj5glynpk9qn7rj086fv"; - sgr-iosevka-fixed-ss02 = "1icz41wpr061jy4r6p7lgcgjrgb3gmf80yqrlkwaiidgahr25h0f"; - sgr-iosevka-fixed-ss03 = "0050q4i05xw3a9h8yzw2c3yzip0xg75xv433z26g6p22h44rbasd"; - sgr-iosevka-fixed-ss04 = "1qq6l1cpsqsbx5v5n49gqq5pvvy9g3vws4877dd77q31309n9q29"; - sgr-iosevka-fixed-ss05 = "07bs5fgva3nzdmc785m0i3b8mvaqp16rw1aan11gy1i14064ayr7"; - sgr-iosevka-fixed-ss06 = "1lpsr82r40r9wandcxcn1gcs44cmd4x7p295gkd4b8zyvkbxhmx0"; - sgr-iosevka-fixed-ss07 = "0xhnxh2hhnyp7difb0rxwid45kc2ykwr7n7rbdn2ay6wzq5f7j2d"; - sgr-iosevka-fixed-ss08 = "1hmbfyiclny4jcf3rshra5zhs4s0hfmz2cyw0zpvg0mp7j2xkvw7"; - sgr-iosevka-fixed-ss09 = "0jwzgyrr57kbkdpys47f1dpl74q37iv5k4bl01hpxpl6hl5npnz9"; - sgr-iosevka-fixed-ss10 = "1qv9pq947d82ms1cysc48msxa9hqaqr62r7czwjh5nb5a7s9kym0"; - sgr-iosevka-fixed-ss11 = "0lay5dj4q1vd8s5llr9kcmhrjz5pvjbcdxh8vqlykjymn038pcc7"; - sgr-iosevka-fixed-ss12 = "0iwd5rrf11da8w7vym90ikw7piai7pw1mw7q57i7pdsp588dq76i"; - sgr-iosevka-fixed-ss13 = "1ymslbh1kpyj5zva4m7rg6ac74j215y614zxmvrndlgjp7xnpq2d"; - sgr-iosevka-fixed-ss14 = "123hq7pxjfn1239kw8fisdf895wryqrmqi79x8dcqhncbvcy57dz"; - sgr-iosevka-fixed-ss15 = "03yd228gf4vj11cwr5nmq6i34v1xa79b3j0mf173psxgm40kfxjy"; - sgr-iosevka-fixed-ss16 = "0rxr9cj59ici41idgd40la3jn882zhshsr35inmylyxlxhsiyqf1"; - sgr-iosevka-fixed-ss17 = "0qqnl7r0kvdwxfxspvji3a4kgh0naqhpmza9c46z2f36khfp4js7"; - sgr-iosevka-fixed-ss18 = "0qkjdn8zq1xv4llayhsp5h7rphf4j16zwk3sdvqwclpdhflpwncg"; - sgr-iosevka-slab = "0k8ma569dpsdfllw5mrjfcqn157195v4m1viykhqs8y2p5gmwzyk"; - sgr-iosevka-ss01 = "0s58pbsqy7nwm3370hj002idgxjhikq9w01axysasbax7maw46di"; - sgr-iosevka-ss02 = "1d7lbf8ifki037x2sn479131rda1slgmyl9bkn9dpi660s33nlmj"; - sgr-iosevka-ss03 = "10d1hgjdpd93hksbhshlsj7hz7m2b4ivdxxadyvzs295r05w6sr7"; - sgr-iosevka-ss04 = "0rpddjxmipm45i420mjnrcspik0ifnilcs25hnjpp76svipgmrrf"; - sgr-iosevka-ss05 = "00h4whmf3qzsyymz7fh988iwwhhmyya0gql0q4zzv4i6w8pr62sh"; - sgr-iosevka-ss06 = "1qca1z6vr77iis6wcbidbqc4qkhhfpnjb6iyifzx2hfzk858lq7f"; - sgr-iosevka-ss07 = "0vi1rgg7db3h7yj6fnqsbxpjpysvis89sv5f2bny0yxhzj6wzqwb"; - sgr-iosevka-ss08 = "19sxsnzc3rkvvlx9w3ys6agnjvzr08j77ccm451j3k9asybfk1hw"; - sgr-iosevka-ss09 = "16ip24nz9wz517ji0zrf0l41m4avg2pc0y57pdr6mzqjq1qc0428"; - sgr-iosevka-ss10 = "0zqbd9ng0f83k5sj4ndhi9c9gl1im686i4nijp71vzps767scclz"; - sgr-iosevka-ss11 = "14psy4w63007ysw21jlslgbryqlb9yk0pwh3zf1b5dqspg3qf9z1"; - sgr-iosevka-ss12 = "1k4f7a7j1589ch263988a09mgrlmgbxwsz7iqalcb8cpzbljvirc"; - sgr-iosevka-ss13 = "0rhkdrgzqqy70dggm0plz1y14rhabs4f3m6kdrgrbh0v97hhi160"; - sgr-iosevka-ss14 = "0r00nrdilxcqnwfrcs6w1zklw09pa2sjjkiszm3fkcmcrzchqbnq"; - sgr-iosevka-ss15 = "0f8r55ad90ssbdaczgv3skqgamjp9v2mdnzqbvmbrw7diy6r1ggg"; - sgr-iosevka-ss16 = "11kz020068isdvfzdp3g33kvfdxmmcsrl2b3misizypvq1pwc4dv"; - sgr-iosevka-ss17 = "1gm45xp3sqw6szaxkqz9z5ff01l3mc5dr6mlaqvq4yrpj8v40ql0"; - sgr-iosevka-ss18 = "09cl87c8fin4wiy2ngw0cv1xxzjpl138yxicq28vhwvxrgkb3syn"; - sgr-iosevka-term = "1884wmmp7kyxiapw9jp5d2w4dq2bpqw6rdyaz9zwp73n9mql3bwx"; - sgr-iosevka-term-curly = "0d085vv4xikl1nsckpf81h0p6p0ilgr2blzx3711k9kvs6fsg2cw"; - sgr-iosevka-term-curly-slab = "0lqjnv9vhrfgcsds9rll7jhyhnqk2sq3wa694gc6xnzg1grc8p5d"; - sgr-iosevka-term-slab = "1j01vm9djbb9lw6nd0n7mvzfrd5aj3gl7azg1mf91ls0pxz81w4b"; - sgr-iosevka-term-ss01 = "1pb5kwm02dblrlw16lrf70bk9k7v9dpgz7wg9fj2iy1fkmx5d0il"; - sgr-iosevka-term-ss02 = "0biczq6b6fg9lyz33j8ffbc8l49yqlxigy7sjxmc4bwmpibz20yc"; - sgr-iosevka-term-ss03 = "0nvqdsx96jfjhgg5fq0wc53gh3qvk0jvfz6nh7alw6b4c27pjqwa"; - sgr-iosevka-term-ss04 = "11qg3s5gxcc5z1009mlb2iz6hycpll2a2azisx8mkjfihzryx88n"; - sgr-iosevka-term-ss05 = "1k2cwnn09pn4j07aj6mkmm03d8nl74jdc69gshi90fbm12688b0g"; - sgr-iosevka-term-ss06 = "06lgk8kcfk8vc2dh1nd7ab7z6mfpxqh4h1jnhyj6ca6fq2k12khf"; - sgr-iosevka-term-ss07 = "0ksj9nhir6bg35583lylqy50nz3ap9ba13vlxx1bfv99ah6y3z88"; - sgr-iosevka-term-ss08 = "0x3f4i4mzx1b0n844hfi78by4657lz7lwpr6dlqkwkw58pzg6x5f"; - sgr-iosevka-term-ss09 = "07favifpnx26hgnnah2jpfgk8cvzj6xzshvvbfmnhjyfq0b37fyw"; - sgr-iosevka-term-ss10 = "021hkqzaijjkk8s90mkqsqmc8n62h6zdlzbgpah24snwdapqyv5f"; - sgr-iosevka-term-ss11 = "0smipv7hk7c6ar836k3sc7czzcg7f3ppfx1vyl81rzvpb136bvxf"; - sgr-iosevka-term-ss12 = "1qm35k70dpc3xgxl1vaslmhbchk38mqx7brz8a3qb6kx75mjviq0"; - sgr-iosevka-term-ss13 = "015ibdhmbyl57b1687qvhg1xx6mnqgvxgdc3aly2kj6a0xk5jf0g"; - sgr-iosevka-term-ss14 = "0i91xy0dvbx1hawqz5sy8dhrv2i5cs9frix963rprsjwhzzj91ny"; - sgr-iosevka-term-ss15 = "0nnpzqplmafvdm0ibnvvdh3w0j7cj5kni352kqq7rvkxjyx3pwd4"; - sgr-iosevka-term-ss16 = "1hag4vkj974g320k5cdckd334vlk9sq7rdpg9zwsil79dhnlrajk"; - sgr-iosevka-term-ss17 = "0xhv40h4m2b6zv5pprjz51i996hgyfxchysv70wdask3x20wg18c"; - sgr-iosevka-term-ss18 = "0k5hy0pb8ksnqx7r4ln588qw1s04qd87p41viwrw5krdhdvfyhmi"; + iosevka = "1hbh2s718c2abp404rginas3bqlddgw3bl4k3hv6yi76sdd5wmkw"; + iosevka-aile = "08l7hidkfc9xwavmcvwis7zma1shyqb9p6n2bcwnrs22826hgn0f"; + iosevka-curly = "0sm77rfhqjf5iwvn8fc7cqr8g7q6nyycal8bqx8h4wyin8mac6ss"; + iosevka-curly-slab = "1kvakcscpsfkwfgk8j1pk44xzq5lkhp1m6f6q75cpcrbakmfdw0y"; + iosevka-etoile = "0vgf3jigdysxhp24kzyhhxmi84sxmnvy99r4l4vjk9fhnpzkhv28"; + iosevka-slab = "127w2ysvv2cnc5zdyz5znwawfmnvpm4by35igkzlcyplgsygdi16"; + iosevka-ss01 = "0gl79saa0k1x9b01khxip7wmw2lvaf1glcpsj5733ywwiy381k7d"; + iosevka-ss02 = "0rc4lf7bx61zs17rd9chnszlbzjpdh867mxvv9gwcm5biyn56zxv"; + iosevka-ss03 = "0vpz5djxbjca1hq233bl78bbaw7wnky3mjgk5va4mbwvscszpq7d"; + iosevka-ss04 = "06zf1mccd5082a3cqga46g82dm14asv4x7ljnv21nxqwqb54xrar"; + iosevka-ss05 = "1r5pxm2gyj1s7qvdsnydczqlpwdqc4c27wfh70gj83s6sn0xaszr"; + iosevka-ss06 = "08cm7zb0ha16ldh7cy337c226s9vjkr14w9b6v025wq2f7l0axv4"; + iosevka-ss07 = "1qcc19i5m3hkgkp89a02g2xcyx3xbgwdav88fw3cn5cq9cd32nvg"; + iosevka-ss08 = "1cd2f3aagikdhh8zh54ijfy0qkmkadpxx9ikc65i0mdwqvrq66qs"; + iosevka-ss09 = "04gwpk1blrhlakg9253l69d2n5xp7bvy6s1va535z08yln6m2zzq"; + iosevka-ss10 = "1cxazjh94p4dqsfhs7xb0jfdxyg17w0fi6kvns62scprl11spbah"; + iosevka-ss11 = "1jgxc03vg45hj2y61kp0hplz4b3v13i9x98j3v5m07m5w4pvz92v"; + iosevka-ss12 = "0i2h2kdrhq610ca8clsmpfn4c71qvm23fpn389c0kxls8wg5z7h4"; + iosevka-ss13 = "0mxkxa68krhwlpxn00msir4za5zldhqilnzb2rhsbgwsla5vx0y4"; + iosevka-ss14 = "0fhg8jdkin4m9fj1d96n9521cx7ffz230abcrkgffas8404x4c6l"; + iosevka-ss15 = "17fxkh3vl9wb7ajyda6dhwzym71i5gn1qzarnaalabqrrg9vg8aq"; + iosevka-ss16 = "0w3j91963hh6nlnfy6igz5bj7k81gw4grcsvl58p81z3fb4n4wcc"; + iosevka-ss17 = "04fmk1wwhh9snmpz9k07acjyjibi7d2l7yjlpbzzc0kwy3i7x37z"; + iosevka-ss18 = "0k90yhz9a44h8r9kiknnxhm94f9s7xk0m074g4wh07ngc80npaqb"; + sgr-iosevka = "0hiz1a3gjl684m0wq0i328j0ryrpa5436j6g5agfvdsima60dknv"; + sgr-iosevka-aile = "18jbnig6shvqcvwmpjc9z14z9am9wsl8ybm7mrw7b237jkfy9839"; + sgr-iosevka-curly = "1ljs1k0xrd91n1n8chcb0jmcpgjjvgc9qwdxnk1i2zbds515hbsh"; + sgr-iosevka-curly-slab = "1iqngf3a0mkx52ljmxwsd0088x6zpac6dyz9502wfmp5wrp7y4wf"; + sgr-iosevka-etoile = "0w8zs73xl4arkksb9xd4g8nyf8n90ya0hb0yg35dqzqqdsf9b5mp"; + sgr-iosevka-fixed = "1j62gdc1d8rcakg1a46q2bhnnlyzvfnmiz0gp8ia91vz51j9s8vy"; + sgr-iosevka-fixed-curly = "1sdvbyi7h486drvqi1nccz05nn93wzhi6wwn889kgxawrimpbars"; + sgr-iosevka-fixed-curly-slab = "1q96b285kxih0lrqrmy16hiwniq7vx6f07l3h9xqhinln8g2mvi8"; + sgr-iosevka-fixed-slab = "14j718phwai25fwgva3xhz816h9gkds3lhnfmrdxmlj1z5rnsk5z"; + sgr-iosevka-fixed-ss01 = "1gi9hhzsfrjl5bykyswi882blndggb28b0isdhyhvv5rsjpl6vrq"; + sgr-iosevka-fixed-ss02 = "1l9k878199nclzmfhc52qcll7x7i4fq71mj495sr4024vm7dgns1"; + sgr-iosevka-fixed-ss03 = "1vpn6sfz8ps64ysxcviwziw2qhazjj94vx962pvahwd991lgdila"; + sgr-iosevka-fixed-ss04 = "11847shnrdzfgj4rryk22ba16bxmdsj2qf9vah6qnivsdaw9ymc1"; + sgr-iosevka-fixed-ss05 = "1n2whdxrlmxgvdqhxgq0qyxrnidgbaw2mmw8s3a06qpcpqi20d3v"; + sgr-iosevka-fixed-ss06 = "15lhkka5slax5c0vawprfdbdhbbiqapv4d2b02w7fp9g8p0s1ljc"; + sgr-iosevka-fixed-ss07 = "0ijhsmlp66a1la299w5jvrfnykasznybb22fhq7lkjzdn1blgim9"; + sgr-iosevka-fixed-ss08 = "1q8d54a7a1xq5a1jkc0c8qns6nq3gyldabjaplczq5p79s2j2fca"; + sgr-iosevka-fixed-ss09 = "1p86b22v8mn5xs9vxyary8jz1jfy0hy1g7yc4lwmslkvxndjvfld"; + sgr-iosevka-fixed-ss10 = "1y3rlr3b5bfx97mr7kpg2x2wgk88z7jhx0vh3b33d9q4sd626vcr"; + sgr-iosevka-fixed-ss11 = "0i6zajhdnfml9ja613jmy3gb6als2chrigkjyzxm0aih4wfm7lly"; + sgr-iosevka-fixed-ss12 = "0f4p7gmb2g991v1858y53wlxvsnd7fmrsp8d9jxj4nlzpl7giazj"; + sgr-iosevka-fixed-ss13 = "1230ss6fxk5py0fkn3mcdc1ky1jfp31hz8fqlvkwz3vf954yfqj1"; + sgr-iosevka-fixed-ss14 = "0hhpmby5jzb839yldzlaj90h1d0d53agxcdiphp9vbmrr3mp3ycd"; + sgr-iosevka-fixed-ss15 = "1dq7f72zi094hvgpdm912f5ijp8nrcxsd78wsk35nllv4cggswma"; + sgr-iosevka-fixed-ss16 = "0jlbc0xx3pf3bnlw5p7rpjw6a7hj75lhh78c9qldhdxpiyks2jwk"; + sgr-iosevka-fixed-ss17 = "0vbqwvn604njd09lc8g4nxq6isjpzv984345l76cpz3hhn22a986"; + sgr-iosevka-fixed-ss18 = "1xznqj1wwvk9rclgr0nx0p5wx1p3a9sbdbigirmifhjn77mrji9c"; + sgr-iosevka-slab = "0wmh2dg12gd05vsr8jsx4mflczpyw6prvlap173yll0rif80dwxd"; + sgr-iosevka-ss01 = "0h93n0v2xzph0j2xq289ssi69dvlbqqz0f9yb41khq6bfz2y6ra7"; + sgr-iosevka-ss02 = "0vk3h1wxdrgjhy999ikmpkakd8xwsad06q3bbk74q2m9ld3m48jl"; + sgr-iosevka-ss03 = "0bs4nrvzfmmbh7f8liyd94d47kqgz3iw3mbi5q0cavh4vylhlz6c"; + sgr-iosevka-ss04 = "0dhz9a2nl4ydj0gdxa9xhvbqf68h3d3yr81zh8gxkj2c84g3lyrn"; + sgr-iosevka-ss05 = "1q9fvi4kpgjxz03c2jlxbxcw8qvj7h20xdmkgk7kgbvkvvrgmyam"; + sgr-iosevka-ss06 = "09hf8g8hrw2q6lc60x5fdq0xvic0hx2g7y200p5jj2ghdw6jb7zr"; + sgr-iosevka-ss07 = "09pn58i1gprrvrq1b5i5sc83ly8gpcxds35kj1l4p8x0h5zz5ffr"; + sgr-iosevka-ss08 = "19lr6zp4j9wrn9xwffqyrrdy35gfl6fk27i03w07gx4hbl1x45nn"; + sgr-iosevka-ss09 = "06654zmjf406lzbn3q9f1212r5raw56npii5cc0mn6cfka8lhiyb"; + sgr-iosevka-ss10 = "0qi00x4vmxvzqyh1556f0fgc9cplapnri3vn10ky7pmmypwlzicf"; + sgr-iosevka-ss11 = "105l97zm4kmacacqdasac601r04cxj2w6vbciamb3id4yjkr5lqq"; + sgr-iosevka-ss12 = "1sd02jb4wpw0ax7yd0l2lzkdgl6sv7j64myfzmpgf79n38ik3x6c"; + sgr-iosevka-ss13 = "0jyizpqxbnkf8ac299brahacjxp0h0hzwhaz5bd11439gkwjpff4"; + sgr-iosevka-ss14 = "02p2fscj5zvypb1mcnhx7cr09dx4d0gmyhnyvlxw3d8l7r600x7k"; + sgr-iosevka-ss15 = "0ihmgn49i13xki0ikw1acj0p8vg8siyrgr48apq0vfj9d8yb1fnq"; + sgr-iosevka-ss16 = "0ggaqg0z63x9x1jp4dw4zi3nm44bfq5v3z22fi2fmkrd9w2l3sl8"; + sgr-iosevka-ss17 = "1bdk2rwqs68738acl1g5afz1vpaq11qfck54vdphidmppg6fflib"; + sgr-iosevka-ss18 = "0s336j7wi8rys4kc7zpz9xfq3fcvhajlmpjzkb1qhjxwrsxzk2g9"; + sgr-iosevka-term = "0329698yx6nagmc9pjil5g3bcd4chng4685bllgzwn6751y3w74p"; + sgr-iosevka-term-curly = "16p82qiqkimy1przl7hxyd9lh7qkff8q8k1y8339gf35drjs0yii"; + sgr-iosevka-term-curly-slab = "0vqbhaq107ka798jz84r2ipmf68j511dimkrzqwxcy223nmwh5wm"; + sgr-iosevka-term-slab = "0gb8vk3hf7fj1wj0n14ha01cxwg767xwhklraq8iz4hj71axj9n2"; + sgr-iosevka-term-ss01 = "1gnbza11zs4c4zalmpf7yz4wqhx322vd7gsaz1c97hszh11az9hl"; + sgr-iosevka-term-ss02 = "12hfn784lwz7ldw3siqxk47b2j9yrd4lx9xs56cd9p44wdvspiaq"; + sgr-iosevka-term-ss03 = "0h56ch2hhp70djbp13a9zr99imr6jincqqwkmpn3pm5z9kr82y9b"; + sgr-iosevka-term-ss04 = "1nnf8pzdra4xqvvwi487f83blpapyfmpjzm0mqpndws11chl6ndw"; + sgr-iosevka-term-ss05 = "0g3znbjjh1kjm02bmaf28gqdgk7b0l9sx3hcg0pfyfs9iv05fh8a"; + sgr-iosevka-term-ss06 = "1v7w15k7s0qrm307lkkrmzy3g09q20d6ws7jmbp7xswxvibfhxkl"; + sgr-iosevka-term-ss07 = "1i3cg20xz230chw3l3q4bzlp6m62563bgy599cfjjp1si2inx734"; + sgr-iosevka-term-ss08 = "1jspdgrkszgqzzm04q5l21583j6vfh01qv6f0jr2z9235877f2xw"; + sgr-iosevka-term-ss09 = "0gc201k5z4kfpsdbkn7kn163cpvxasg01gx9brwypkydsr5m8imz"; + sgr-iosevka-term-ss10 = "0k4q749vgyz1wpxdg2hg7np52h9b1nx50pw9s0k73fl2n45g7559"; + sgr-iosevka-term-ss11 = "1s2gqdac7ckw574vwbryfab8hgkjr72yf3s2pc4gr5gcyd97863a"; + sgr-iosevka-term-ss12 = "0js64ad31vi0zcr07qyamyv7my1cz1dym3jiw3dkcrm3lmi6b65d"; + sgr-iosevka-term-ss13 = "0kz3166n81h7fzif89mad2g2blvm8hd69ww76k3zivx3rzxvl6m6"; + sgr-iosevka-term-ss14 = "15nah0qmrp0z0x159yyh848yy2874yx9ijyfwy6cvs7ildzd0fkv"; + sgr-iosevka-term-ss15 = "05p8is5qwji723gxjffx6si1rcsfspizpn0gr6cvdkz9cwcv0sqv"; + sgr-iosevka-term-ss16 = "0dp22hbvxj4sjmz1hw4qiqf70fj95zr0mw6f38wvy79813101c14"; + sgr-iosevka-term-ss17 = "1nbv2p8ddajrymm8a5556xjcx5aia6f1zqrgpjsf6pq0qs06x3di"; + sgr-iosevka-term-ss18 = "115s4lvh3ml374815w3c2649js29ba5vpq375fd24vlysr147zxd"; } diff --git a/nixpkgs/pkgs/data/fonts/liberation-fonts/default.nix b/nixpkgs/pkgs/data/fonts/liberation-fonts/default.nix index 04ee3781b6bb..0160ebfdc450 100644 --- a/nixpkgs/pkgs/data/fonts/liberation-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/liberation-fonts/default.nix @@ -4,7 +4,7 @@ let commonNativeBuildInputs = [ fontforge python3 ]; common = - { version, repo, sha256, nativeBuildInputs, postPatch ? null }: + { version, repo, sha256, docsToInstall, nativeBuildInputs, postPatch ? null }: stdenv.mkDerivation rec { pname = "liberation-fonts"; inherit version; @@ -20,11 +20,10 @@ let installPhase = '' find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; - install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS || true - install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog || true - install -m444 -Dt $out/share/doc/${pname}-${version} COPYING || true - install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true - install -m444 -Dt $out/share/doc/${pname}-${version} README || true + for i in ${toString docsToInstall}; do + # not all docs exist in all versions + install -m444 -Dt $out/share/doc/${pname}-${version} $i || true + done ''; meta = with lib; { @@ -51,18 +50,20 @@ in liberation_ttf_v1 = common { repo = "liberation-1.7-fonts"; version = "1.07.5"; - nativeBuildInputs = commonNativeBuildInputs ; + docsToInstall = [ "AUTHORS" "ChangeLog" "COPYING" "License.txt" "README" ]; + nativeBuildInputs = commonNativeBuildInputs; sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; }; liberation_ttf_v2 = common { repo = "liberation-fonts"; - version = "2.1.0"; + version = "2.1.5"; + docsToInstall = [ "AUTHORS" "ChangeLog" "LICENSE" "README.md" ]; nativeBuildInputs = commonNativeBuildInputs ++ [ fonttools ]; postPatch = '' substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ 'font = ttLib.TTFont(fontfile)' \ 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)' ''; - sha256 = "03xpzaas264x5n6qisxkhc68pkpn32m7y78qdm3rdkxdwi8mv8mz"; + sha256 = "Wg1uoD2k/69Wn6XU+7wHqf2KO/bt4y7pwgmG7+IUh4Q="; }; } diff --git a/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix b/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix index bd20ff2dd0cd..3632656ade81 100644 --- a/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix +++ b/nixpkgs/pkgs/data/fonts/lxgw-neoxihei/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.102.1"; + version = "1.103.1"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-prEyymKABhu7/jdiyUyZ4xb6rrYmo91Jt462qQKV9/0="; + hash = "sha256-z9SzSt+GXV+9GLtzjY6EQQa6bKrixYo03kEfzGfug90="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/data/fonts/sarabun/default.nix b/nixpkgs/pkgs/data/fonts/sarabun/default.nix new file mode 100644 index 000000000000..42bc349effe2 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/sarabun/default.nix @@ -0,0 +1,41 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "sarabun"; + version = "unstable-2018-08-24"; + + src = fetchFromGitHub { + owner = "cadsondemak"; + repo = pname; + rev = "854cdbc6afa002ff8c2ce6aa7b86f99c7f71c9eb"; + sha256 = "jcSQ72WK0GucZPgG7IQKrKzCOEbGgbQVl21RIKSF6A0="; + }; + + outputs = [ "out" "doc" ]; + + buildPhase = '' + mkdir -p $doc/${pname} $out/share/fonts/truetype + + cp -r $src/OFL.txt $src/docs/* $doc/${pname} + cp $src/fonts/*.ttf $out/share/fonts/truetype + ''; + + meta = { + homepage = "https://cadsondemak.github.io/${pname}/"; + description = "A slightly-condensed looped Thai and sans serif Latin typeface for communications"; + longDescription = '' + The most popular typeface from the 13 fonts from SIPA Thailand’s National + fonts project. Sarabun was designed by Suppakit Chalermlarp to be a + serious text face. Great choice for a long reading formal text. This font + was selected by the royal Thai government to be the official typeface for + documentation purpose. It was also adopted by many private organizations + to be used as a communication font. Sarabun has a slightly condensed + proportion which fits perfectly with Thai legibility. It also carries a + neutral Thai traditional loop design which can easily fit in with any + occasion. Probably one of the most today’s familiar Thai loop typefaces. + ''; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ toastal ]; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix b/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix index a6840559e293..b5954f485e71 100644 --- a/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "sarasa-gothic"; - version = "0.41.3"; + version = "0.41.6"; 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-/VC9zhWC3jJuIXQ2fel6moLzrdsguPaylgfkY9FoClQ="; + hash = "sha256-6CDK9DNjBQ5EPp562na0DOWFmlxnlVl8Z8pwm3pGQ9A="; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/data/fonts/source-han/default.nix b/nixpkgs/pkgs/data/fonts/source-han/default.nix index 2f9111865455..0174324b016a 100644 --- a/nixpkgs/pkgs/data/fonts/source-han/default.nix +++ b/nixpkgs/pkgs/data/fonts/source-han/default.nix @@ -11,6 +11,7 @@ let , rev , hash , zip ? "" + , prefix ? "" }: let Family = lib.toUpper (lib.substring 0 1 family) + @@ -21,7 +22,7 @@ let version = lib.removeSuffix "R" rev; src = fetchurl { - url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/SourceHan${Family}.ttc${zip}"; + url = "https://github.com/adobe-fonts/source-han-${family}/releases/download/${rev}/${prefix}SourceHan${Family}.ttc${zip}"; inherit hash; }; @@ -61,9 +62,10 @@ in serif = makePackage { family = "serif"; description = "serif"; - rev = "2.000R"; - hash = "sha256-RDgywab7gwT+YBO7F1KJvKOv0E/3+7Zi/pQl+UDsGcM="; + rev = "2.001R"; + hash = "sha256-ULdrtPLtzsgfZEHWkr4ebC/FSROHBWJJVD+PzdIJ6Og="; zip = ".zip"; + prefix = "01_"; }; mono = makePackage { diff --git a/nixpkgs/pkgs/data/fonts/source-sans/default.nix b/nixpkgs/pkgs/data/fonts/source-sans/default.nix index 1433804ce71d..a3e2d4309066 100644 --- a/nixpkgs/pkgs/data/fonts/source-sans/default.nix +++ b/nixpkgs/pkgs/data/fonts/source-sans/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "source-sans"; - version = "3.046"; + version = "3.052"; src = fetchzip { url = "https://github.com/adobe-fonts/source-sans/archive/${version}R.zip"; - hash = "sha256-nBLEK+T5n1CdZK2zvCWIhF2MxPmiAwL9l55a55yHtgU="; + hash = "sha256-yzbYy/ZS1GGlgJW+ARVWF4tjFqmMq7x+YqSQnojtQBs="; }; installPhase = '' @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { install -Dm444 OTF/*.otf -t $out/share/fonts/opentype install -Dm444 TTF/*.ttf -t $out/share/fonts/truetype - install -Dm444 VAR/*.otf -t $out/share/fonts/variable + install -Dm444 VF/*.otf -t $out/share/fonts/variable runHook postInstall ''; diff --git a/nixpkgs/pkgs/data/fonts/source-serif/default.nix b/nixpkgs/pkgs/data/fonts/source-serif/default.nix index 626b36f2705b..dd129b10faab 100644 --- a/nixpkgs/pkgs/data/fonts/source-serif/default.nix +++ b/nixpkgs/pkgs/data/fonts/source-serif/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "source-serif"; - version = "4.004"; + version = "4.005"; src = fetchzip { - url = "https://github.com/adobe-fonts/source-serif/releases/download/${version}R/source-serif-${version}.zip"; - hash = "sha256-tGSMOwYBEZat7MI78wkPr6lgJdsOdOaIZb+IAOoOlq4="; + url = "https://github.com/adobe-fonts/source-serif/archive/refs/tags/${version}R.zip"; + hash = "sha256-djeRJWcKqirkHus52JSeZJXeB7yMTnUXpkPxyzgRC04="; }; installPhase = '' diff --git a/nixpkgs/pkgs/data/icons/google-cursor/default.nix b/nixpkgs/pkgs/data/icons/google-cursor/default.nix new file mode 100644 index 000000000000..c3fb5aad29a3 --- /dev/null +++ b/nixpkgs/pkgs/data/icons/google-cursor/default.nix @@ -0,0 +1,51 @@ +{ stdenvNoCC +, fetchzip +, lib +}: + +let + colors = [ + { + name = "Black"; + hash = "sha256-pb2U9j1m8uJaILxUxKqp8q9FGuwzZsQvhPP3bfGZL5I="; + } + { + name = "Blue"; + hash = "sha256-PmJeGShQLIC7ceRwQvSbphqz19fKptksZeHKi9QSL5Y="; + } + { + name = "Red"; + hash = "sha256-/X81jLoWaw4UMoDRf1f6oaKKRWexQc4PAACy3doV4Kc="; + } + { + name = "White"; + hash = "sha256-eT/Zy6O6TBD6G8q/dg+9rNYDHutLLxEY1lvLDP90b+g="; + } + ]; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "google-cursor"; + version = "2.0.0"; + + sourceRoot = "."; + srcs = map + (color: (fetchzip { + url = "https://github.com/ful1e5/Google_Cursor/releases/download/v${finalAttrs.version}/GoogleDot-${color.name}.tar.gz"; + name = "GoogleDot-${color.name}"; + hash = color.hash; + })) + colors; + + postInstall = '' + mkdir -p $out/share/icons + cp -r GoogleDot-* $out/share/icons + ''; + + meta = with lib; { + description = "An opensource cursor theme inspired by Google"; + homepage = "https://github.com/ful1e5/Google_Cursor"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ quadradical ]; + }; +}) diff --git a/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index daf8c4410713..52325798033e 100644 --- a/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "23.07.21"; + version = "23.08.09"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-QwbjJ38fWRkzd1nmsPWcwUQ7p96S/tGEvIfhLsOX1bg="; + sha256 = "sha256-YLr5WQox1TzGxRZGJf7NzFRhkNIPJaYFyOYwp9MfkDQ="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index ecfea598a55e..e8d6b81e1ff1 100644 --- a/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "23.07.21"; + version = "23.08.16"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-rHT4lD+RcwRmE63Dd7/oXVAltRTfpisptzyD1EQG4Aw="; + sha256 = "sha256-zlh3Jh3ZrNo58ijGPwdaiHnTFoT6L3ZC0VTRY0Se3qs="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/nixpkgs/pkgs/data/misc/cacert/default.nix b/nixpkgs/pkgs/data/misc/cacert/default.nix index 6fd4a6641cec..d489c23c6b8d 100644 --- a/nixpkgs/pkgs/data/misc/cacert/default.nix +++ b/nixpkgs/pkgs/data/misc/cacert/default.nix @@ -30,7 +30,7 @@ let ])); extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings); - srcVersion = "3.90"; + srcVersion = "3.92"; version = if nssOverride != null then nssOverride.version else srcVersion; meta = with lib; { homepage = "https://curl.haxx.se/docs/caextract.html"; @@ -45,7 +45,7 @@ let src = if nssOverride != null then nssOverride.src else fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/nss-${version}.tar.gz"; - hash = "sha256-ms1lNMQdjq0Z/Kb8s//+0vnwnEN8PXn+5qTuZoqqk7Y="; + hash = "sha256-PbGS1uiCA5rwKufq8yF+0RS7etg0FMZGdyq4Ah4kolQ="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/data/misc/clash-geoip/default.nix b/nixpkgs/pkgs/data/misc/clash-geoip/default.nix index 8faeef9d0045..3488bfc0a5f9 100644 --- a/nixpkgs/pkgs/data/misc/clash-geoip/default.nix +++ b/nixpkgs/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20230712"; + version = "20230812"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-QXxY/WruYY09LL+OEKhd/EUb+GOI49KFnG75mbwMWoU="; + sha256 = "sha256-yO8zSQjNYGxaSXcOhFOIE4HsiMnCm3ZVYfVZg5xO96s="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/data/misc/hackage/pin.json b/nixpkgs/pkgs/data/misc/hackage/pin.json index df31806dffb4..98212bdf25a9 100644 --- a/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "2951c03cb95b8892bd6d4eb89d135764c35a8d7f", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2951c03cb95b8892bd6d4eb89d135764c35a8d7f.tar.gz", - "sha256": "08sh9l9df2p51q4xhrl14jga48i0ad78fp7w3cccgcw1bqq4yxml", - "msg": "Update from Hackage at 2023-06-19T20:13:38Z" + "commit": "4cdb9878496fdb36b8b9c5f2ab0ef8a44a0f859f", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/4cdb9878496fdb36b8b9c5f2ab0ef8a44a0f859f.tar.gz", + "sha256": "0yhymzcsls48hf44ncd79xn786rfh4k70h78w7b0ihn7lrjgsynv", + "msg": "Update from Hackage at 2023-07-24T19:28:29Z" } diff --git a/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix b/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix index 8864f3923f91..1e07a3a39ebb 100644 --- a/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230730120627"; + version = "20230810162343"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-lnTP8KDYdIa7iq14h0TEVfAlJDtsURfSZaEdQ8L1TRM="; + hash = "sha256-RzYFpbiy0ajOjyu9Fdw+aJX9cLbquXzfWiLPaszyxOY="; }; vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; meta = with lib; { diff --git a/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix b/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix index 88bec5d09d62..314ad37bc4d8 100644 --- a/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix +++ b/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { description = "A style to bend Qt applications to look like they belong into GNOME Shell"; homepage = "https://github.com/FedoraQt/adwaita-qt"; license = licenses.gpl2Plus; - maintainers = teams.gnome.members ++ (with maintainers; [ ]); + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix b/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix index c71c86269e71..6b56064b8734 100644 --- a/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix +++ b/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix @@ -19,17 +19,17 @@ in lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants -lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dracula" "gruvbox" "rimless" "normal" ] tweaks +lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "all" "black" "rimless" "normal" "float" ] tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023.04.11"; + version = "2023-08-12"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-lVHDQmu9GLesasmI2GQ0hx4f2NtgaM4IlJk/hXe2XzY="; + hash = "sha256-Ss6IXd4vYUvIF5/Hn4IVLNvDSaewTY0GNZp7X5Lmz/c="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix b/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix index ea5cf7a7d92d..31422625a48d 100644 --- a/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/nixpkgs/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -22,7 +22,7 @@ in lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "blue" "all" ] themeVariants lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants -lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dark" "rimless" "normal" ] tweaks +lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "darker" "rimless" "normal" "float" "colorful" ] tweaks lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens stdenvNoCC.mkDerivation rec { diff --git a/nixpkgs/pkgs/data/themes/mojave/default.nix b/nixpkgs/pkgs/data/themes/mojave/default.nix index 0e4bbdbe5aae..82256441fbb1 100644 --- a/nixpkgs/pkgs/data/themes/mojave/default.nix +++ b/nixpkgs/pkgs/data/themes/mojave/default.nix @@ -103,7 +103,7 @@ stdenvNoCC.mkDerivation rec { done ${lib.optionalString wallpapers '' - for f in ../wallpapers/Mojave{,-timed}.xml; do + for f in ../${wallpapers_src.name}/Mojave{,-timed}.xml; do substituteInPlace $f --replace /usr $out done ''} @@ -123,9 +123,9 @@ stdenvNoCC.mkDerivation rec { ${lib.optionalString wallpapers '' mkdir -p $out/share/backgrounds/Mojave mkdir -p $out/share/gnome-background-properties - cp -a ../wallpapers/Mojave*.jpeg $out/share/backgrounds/Mojave/ - cp -a ../wallpapers/Mojave-timed.xml $out/share/backgrounds/Mojave/ - cp -a ../wallpapers/Mojave.xml $out/share/gnome-background-properties/ + cp -a ../${wallpapers_src.name}/Mojave*.jpeg $out/share/backgrounds/Mojave/ + cp -a ../${wallpapers_src.name}/Mojave-timed.xml $out/share/backgrounds/Mojave/ + cp -a ../${wallpapers_src.name}/Mojave.xml $out/share/gnome-background-properties/ ''} # Replace duplicate files with soft links to the first file in each |