diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-10-20 22:09:03 +0000 |
commit | 50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e (patch) | |
tree | f2556b911180125ccbb7ed0e78a54e92da89adce /nixpkgs/pkgs/data | |
parent | 4c16d4548a98563c9d9ad76f4e5b2202864ccd54 (diff) | |
parent | cfc75eec4603c06503ae750f88cf397e00796ea8 (diff) | |
download | nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.gz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.bz2 nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.lz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.xz nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.tar.zst nixlib-50c21d167f7114fa1dbd95e5c4fb30eeb1a2d02e.zip |
Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/data')
33 files changed, 471 insertions, 183 deletions
diff --git a/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix b/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix index 08916f3e561f..6eb1e3e74170 100644 --- a/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix +++ b/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "scheme-manpages"; - version = "unstable-2023-08-13"; + version = "unstable-2023-08-27"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "c17abb7dfb733fede4cf776a932e9696ccc7a4f2"; - hash = "sha256-9s/1sJEA4nowzQRpySOFzY+PxiUdz1Z3D931rMet4CA="; + rev = "44317b20616699b13b2b6276c86d796f4ae0c8dd"; + hash = "sha256-qxj9sEQYOZ+me2IhDS5S2GRSho4KWWrEm+5MNxfw1VI="; }; dontBuild = true; diff --git a/nixpkgs/pkgs/data/documentation/zeal/default.nix b/nixpkgs/pkgs/data/documentation/zeal/default.nix index 7d8adf6cc018..462b06054f3f 100644 --- a/nixpkgs/pkgs/data/documentation/zeal/default.nix +++ b/nixpkgs/pkgs/data/documentation/zeal/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch2 , cmake , extra-cmake-modules , pkg-config @@ -30,6 +31,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-s1FaazHVtWE697BO0hIOgZVowdkq68R9x327ZnJRnlo="; }; + patches = [ + # fix build with qt 6.6.0 + # treewide: replace deprecated qAsConst with std::as_const() + # https://github.com/zealdocs/zeal/pull/1565 + (fetchpatch2 { + url = "https://github.com/zealdocs/zeal/commit/d50a0115d58df2b222ede4c3a76b9686f4716465.patch"; + hash = "sha256-Ub6RCZGpLSOjvK17Jrm+meZuZGXcC4kI3QYl5HbsLWU="; + }) + ]; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace 'ZEAL_VERSION_SUFFIX "-dev"' 'ZEAL_VERSION_SUFFIX ""' diff --git a/nixpkgs/pkgs/data/fonts/font-awesome/default.nix b/nixpkgs/pkgs/data/fonts/font-awesome/default.nix index a6f748f2f07f..dfc808971b67 100644 --- a/nixpkgs/pkgs/data/fonts/font-awesome/default.nix +++ b/nixpkgs/pkgs/data/fonts/font-awesome/default.nix @@ -44,11 +44,11 @@ in hash = "sha256-LL9zWFC+76wH74nqKszPQf2ZDfXq8BiH6tuiK43wYHA="; }; v5 = font-awesome { - version = "5.15.3"; - hash = "sha256-CFXGsl70o/gXUCEKu8Wkv4EBRhrrcMIq8NpfWzcxEus="; + version = "5.15.4"; + hash = "sha256-gd23ZplNY56sm1lfkU3kPXUOmNmY5SRnT0qlQZRNuBo="; }; v6 = font-awesome { - version = "6.1.1"; - hash = "sha256-rujqhKI33Pi2xugMKGoTJDkPkCDK407+Da6yNJP2yAc="; + version = "6.4.2"; + hash = "sha256-/utIhn7CWxlWXshcCUj57WuObRmLTGhTfQo7L6FDHqA="; }; } diff --git a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index dc7d132884c4..fa1787d8f7fc 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 = "27.0.1"; + version = "27.2.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; @@ -33,7 +33,6 @@ in stdenv.mkDerivation rec { meta = { inherit (iosevka.meta) homepage downloadPage description license platforms; maintainers = with lib.maintainers; [ - cstrahan montchr ]; }; diff --git a/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix b/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix index fbe2f9533bac..fb788b287635 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix @@ -1,4 +1,4 @@ -{ lib, iosevka, fetchFromSourcehut, fetchFromGitHub, buildNpmPackage }: +{ lib, iosevka, fetchFromGitHub, buildNpmPackage }: let sets = [ @@ -20,17 +20,17 @@ let "comfy-wide-motion-fixed" # Slab | Wide | Monospaced | No | "comfy-wide-motion-duo" # Slab | Wide | Duospaced | Yes | ]; - version = "1.3.0"; - src = fetchFromSourcehut { - owner = "~protesilaos"; + version = "1.4.0"; + src = fetchFromGitHub { + owner = "protesilaos"; repo = "iosevka-comfy"; rev = version; - sha256 = "sha256-ajzUbobNf+Je8ls9htOCLPsB0OPSiqZzrc8bO6hQvio="; + sha256 = "sha256-kfEEJ6F1/dsG9CSLWcr0QOOnQxHPgPgb4QhgFrHTklE="; }; privateBuildPlan = src.outPath + "/private-build-plans.toml"; makeIosevkaFont = set: let superBuildNpmPackage = buildNpmPackage; in - (iosevka.override rec { + (iosevka.override { inherit set privateBuildPlan; buildNpmPackage = args: superBuildNpmPackage (args // { @@ -39,11 +39,11 @@ let src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; - rev = "7ef24b8d87fe50793444f9f84b140767f7e47029"; - hash = "sha256-RVBgJVMNyxV1KeNniwySsJUOmLDh6sFZju8szvzKlH4="; + rev = "f6e57fbf0b1242ad3069d45c815d79b9d68871a2"; + hash = "sha256-cS3SCKzUjVXF+n0Rt5eBLzieATB7W+hwEbzh6OQrMo4="; }; - npmDepsHash = "sha256-yogUBf+yfjfK8DE4gGgoGaTaYZagW8R1pCn7y0rEPt4="; + npmDepsHash = "sha256-c+ltdh5e3+idclYfqp0Xh9IUwoj7XYP1uzJG6+a5gFU="; meta = with lib; { inherit (src.meta) homepage; diff --git a/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 83dca9245161..28e0f75124e5 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 = "27.0.0"; + version = "27.2.1"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-LXQ7F+hEsPfve9yKEYav1O+ZN7uZqK8YmMT0Pr5FQpc="; + hash = "sha256-+d6pONsAoA0iI7VCuDHBGGjZPaxgLToouQpFTaX6edY="; }; - npmDepsHash = "sha256-SAdKtX+BuU0/me4ECzrKLRJRW6LzGZO2ehAB9iWRVF8="; + npmDepsHash = "sha256-c/QvrDjjoq2o1le++e7D0Lb18wyZc/q6ct++rkgYtzg="; nativeBuildInputs = [ remarshal @@ -136,7 +136,6 @@ buildNpmPackage rec { license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ - cstrahan jfrankenau ttuegel babariviere diff --git a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 6b3d3d53c82d..0094fc3e6fe1 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 = "131bxglkns15zan0xzk8k781458ig34jijzp0k27wdpw8dgblykh"; - iosevka-aile = "0xyxjj3kr0sb8s40kl1lyzmkd18w2m4qnarfbrssxcbafgs6hd3f"; - iosevka-curly = "0vgmynf2d2b0vxvksgsiss02was60zb7bavrffddh3fklrarkil8"; - iosevka-curly-slab = "1gg95wccw82v7xdgibajmf312lw1c8bdpk3jl1vvp4xmig06gnfs"; - iosevka-etoile = "1k928f9mj1fyjwxmn5iddb0p067mji408va96hcm7wy396gmh40j"; - iosevka-slab = "06kl8y0jpbirdpx7ga09icdsjp9x3hm1552h5sq4wgy8m2prlvja"; - iosevka-ss01 = "18dywa48mhfzaf3y4vq8509fk9sff1w7ddda6ldglvba15qj56q8"; - iosevka-ss02 = "0f1iqbvdrdvlk6z0mykm1f095jljni9xkbkc5pnxz5ahv6lxmx6g"; - iosevka-ss03 = "0bd50by3zlbph859g2fw5ly4lv8ywv4x1qmf1ja5ay02g5b41ail"; - iosevka-ss04 = "0gxfma9fl6q49i6ymk84a7pz4r4wnik0ixccx478i2pdbbmyvads"; - iosevka-ss05 = "0ms52v7y5sj579hghj8gc9rl736lpymslpbs3lfkx5p26kxwk3ny"; - iosevka-ss06 = "0qky2yplvfln3nhclbfzdl6hn0pyjra43by8pwqzx43ai87sz4rl"; - iosevka-ss07 = "17d0m773plnd3v8sj5j9sb5mb9qnqjnii43r0md8f0iwa3icp406"; - iosevka-ss08 = "1rx7jv8hhy55gajx4y2741zbrl212qgx7lslgd8y924gxspkfaxq"; - iosevka-ss09 = "1mz4sc7qn3nmq7l7cm3lh0i1pysqzns8pmqa9a7l6c8llzk8n9xa"; - iosevka-ss10 = "1z5wa5ja205z3zyw1jdw9l59fzvfw1bifvqn9qxlnbjrkrn5kdsf"; - iosevka-ss11 = "1lhw4ynk3wxp7bl4w2hg4vydj4y64nhi5cxn8mvamv9j7qqjyfdm"; - iosevka-ss12 = "1gya74qfzql3y2j820yihy5hhm9hqf7ip7qnv9mhdymwzpc5swb2"; - iosevka-ss13 = "0rr3nwwwvwh9q6fpkzxlxxw21gp8zsd611kx9m5igb6yx6wmm9z7"; - iosevka-ss14 = "0p7wha20va30834z2y55s89g00z19587bbv7z6id64lvdwyki3fk"; - iosevka-ss15 = "1bq707bkp5zyhjwdzadv9aaf8xnnxlzrqircgm56xbdc6j1y3zj2"; - iosevka-ss16 = "03pb7hr5ncvlsmg48xasycsmcqwwy831xq7f747pzn0pvfbpzbcm"; - iosevka-ss17 = "1scbnvd6wj9cm6ahxw5qa4cnq6ld118kmlzmd73fqram3l9m3w06"; - iosevka-ss18 = "0xq9cypwdpg13s7swvhhiazkw8fpsf85c8salbg4wp8j1lq6lcrm"; - sgr-iosevka = "1ha7n2liqkxlwiaz5r1zxv5ivchiyqrlahwd7w90w1z5sqwzmy3p"; - sgr-iosevka-aile = "0cp9nj3z9kc3fax1z0zrv3x725pl2m5w7sfz0idpfaiwa0593n10"; - sgr-iosevka-curly = "1lygvbjrg8lzbrqx7yznpc89r37farkk00dxnwjvc2v8r9796lv5"; - sgr-iosevka-curly-slab = "0cz3wsldvsqyq3lxm579zimch118pr5cbvgyq6x4437nykk0jm9c"; - sgr-iosevka-etoile = "0zxnpk0i8qkk8cq49sb2c6lr08j1y3pdj2560qcs7l64q4fzzr1v"; - sgr-iosevka-fixed = "08ha4khxz8pskj051hjv3rvzlg6ry3gxwlc2q1ajf2j4viyw8245"; - sgr-iosevka-fixed-curly = "1v4isscbgc6qya41znfnglply9rj7q6rmvn260r4rbj2hx99j5wy"; - sgr-iosevka-fixed-curly-slab = "0smw0anc9rljarr4c4szvyjbd0ajj7pl001pi69cjpx0xb8zrcsz"; - sgr-iosevka-fixed-slab = "0iffpdk35dkvczarn4y778k23rdicl0yr613w3z3alx1sajg02q4"; - sgr-iosevka-fixed-ss01 = "056xmr3688lhpvbn2sqii1p8py6smkpar6jl5bls529cmd8zcfwi"; - sgr-iosevka-fixed-ss02 = "0qrirgskr8xmcrbi3xvskb29xlq4sxhr67grin5m957nckqi257f"; - sgr-iosevka-fixed-ss03 = "12hxqax5b02iswpwmfv1kp08gdcxjijsl3a6fwl2gm2ciwvhc4mj"; - sgr-iosevka-fixed-ss04 = "0xlgxsrirkrwy0rrgiib5ahsqv9kcnfckcb02gkdn4w3bhlkydbr"; - sgr-iosevka-fixed-ss05 = "1v2a97kw5zpw8q46v59jsmm7y4s4b1ksfk3kjnm92c8vbysmkm1z"; - sgr-iosevka-fixed-ss06 = "1z3xb2jvgjg58kjipsvjkcc5pfsqs4pd86hvkjfbng2jjl0lvcjl"; - sgr-iosevka-fixed-ss07 = "1g2fzzylj0g4bz9zrf9mj42h0wrwg27zdq0njgj78wp4fspmllrl"; - sgr-iosevka-fixed-ss08 = "0qb8x8rxyq13yrv62hw7vx8bvl4nwdzdharxf6c34njsg0nafnw0"; - sgr-iosevka-fixed-ss09 = "07dhlnh3ismw8ixdnw73xam0jji6kha5h10cqjl3jbqxlghdm873"; - sgr-iosevka-fixed-ss10 = "0gas1ms88cd5fqajqa89vn87pnqlpy2kry418arwy9c3h5fpdw70"; - sgr-iosevka-fixed-ss11 = "15zpzv45m5fc7vb2apz6jywc0ip0ykxzb16qdj8qf8j4rq0ajyw0"; - sgr-iosevka-fixed-ss12 = "00pj11pkhkv72223mv0bhdj0qqv13ywc0gmdkfnmd9cbl0ml1yk8"; - sgr-iosevka-fixed-ss13 = "1c6qffagjn3qy87gszh0cfm2xz3bnyz8gf4aqbpxyjg55abd1jx0"; - sgr-iosevka-fixed-ss14 = "1pixg3sjaqc7m1nxcs5alczkk3axhscbgl3x599d5by02z7m1pxq"; - sgr-iosevka-fixed-ss15 = "0x0k5i3pd4dhbkpb427lmayrvj6bbbr3gp262asckhcsq093wh7c"; - sgr-iosevka-fixed-ss16 = "0rgv1cl5261bfhx50bkhz8276jbshzf8sz421nmz4qpmxzdalk1p"; - sgr-iosevka-fixed-ss17 = "1g1w7zirrl9gjky8nbgbh9qjdq03r6sdh9hxcli1wz5qv09zwmh0"; - sgr-iosevka-fixed-ss18 = "1igfnc9gl5wa06qaw3pisq4ppvd5nwzlh2f34r3xrzmiak9ljwlc"; - sgr-iosevka-slab = "17mpfvcf4wa2kql8024pdmdf23qm17ch9cr6s1a2pgwf0hn2b3nh"; - sgr-iosevka-ss01 = "14chhyysy66z01jq9j3d40765sz4d0v3ivzf319clv82q80gkm92"; - sgr-iosevka-ss02 = "1c8wdcz0f8c9jdc0nyia60m785pblvcd62ag4d329dli8fp0c4kg"; - sgr-iosevka-ss03 = "1jhl0pcwmvwkify2fdv5ml6l26106xnphxrqn11wsvg4dln3afjl"; - sgr-iosevka-ss04 = "1wj5nbdnb3n5vfc3y41cwbqqxnhd7p2b55qd05ij85b5a9cgsflj"; - sgr-iosevka-ss05 = "0zw7ryr7mf7c1njfin66yycg4lalrdvhdd4ycf031qj07v5py5cn"; - sgr-iosevka-ss06 = "1ka2l4mk0ahn4alnlhyspifg2qnm7cb3ydmndy3q249aidp58bzs"; - sgr-iosevka-ss07 = "085ghsjwysvzqpksj95x91yz0fyzc5pfj9lhpa8li0x2wjba2jsh"; - sgr-iosevka-ss08 = "0054z74wk3wbaj3nqnkp7h6fj0zqggnhi21wwfpq52knk8ffc00s"; - sgr-iosevka-ss09 = "0rbmhq7qix0v4ff8x9j6cgxnjfp80ck2gfww8a7k3nld9z4dn6v8"; - sgr-iosevka-ss10 = "1ckaiqw677fi195ah496zhhs678bc4xzh31hhwsmvp92y7mfy5na"; - sgr-iosevka-ss11 = "0zqv2qmvp07j430vbym6552zqky04dx2bnn66r40ndjsz96g8081"; - sgr-iosevka-ss12 = "10srsjb10qwhm9hgzm56aq58wgy3r9nrcyrvj7jq1q32s5r7jv16"; - sgr-iosevka-ss13 = "1aaikjri6xkhg6585r6079c41iqhdr94nlismk0zcdygy3ln6vbx"; - sgr-iosevka-ss14 = "01p421bprrsrddc0f8yxgfg0db8gxs7zgass4p8smainq3zym7v7"; - sgr-iosevka-ss15 = "0fping8ssj32rsacj7b8a13l0jcmmhznx0phv28x76hkcwagh674"; - sgr-iosevka-ss16 = "1nzk6hf689v7s81qi1nb7vdg2xvd7v2gv2id9xgdjbfmf3bld10j"; - sgr-iosevka-ss17 = "01cr9bw4cfyw7i4fim1xdcj5qn2l1dzccnakbqndycmnx4k1134v"; - sgr-iosevka-ss18 = "10i5qv9ans24mjymq9jh7i3ygdkjvr38y0xc44sn7fb5l72miz1l"; - sgr-iosevka-term = "02qaa9g0q1d66ha5391xm2vh24hr1vjqw6h6j05a9z2a0y712j71"; - sgr-iosevka-term-curly = "1xjv9n7dimrsn0dcz9jz6p810bdx7bhcrwnh6m5mvxcf7bpj8341"; - sgr-iosevka-term-curly-slab = "0sbj3s6ig6410092lsls7mq7h98cipmnabd1fcqxn6dszvhqq6q9"; - sgr-iosevka-term-slab = "101m8cgjr6s8c42xas2dqyzbl44ab0y1s4cx1rqr8bgr5zxp3jsc"; - sgr-iosevka-term-ss01 = "0b0i2gs1cv45b5ki8lgiclrly1sg2kh3r82gqbsh4scijv3md9m1"; - sgr-iosevka-term-ss02 = "0vsldgiscl74jmj55mzqg5zz5pbg6f2fqksfyfyjdps5f584dqq7"; - sgr-iosevka-term-ss03 = "10czljsmga2nvjix9lca84p271hx2i612984b2hbcz8cip4v2my6"; - sgr-iosevka-term-ss04 = "06fwjgkqmhngnsljklxz2ab9dpr4sqhn8pxrkhhqka4r5srpn454"; - sgr-iosevka-term-ss05 = "0lk1k89kjr7ld3bh8pcc8gagjgxv90bwgsgjmn7gqq7nj0kknh4j"; - sgr-iosevka-term-ss06 = "1apfrkfxq8xbc8hry7x5l8bx87zv13asyw03hirrvzvqrl6q76lw"; - sgr-iosevka-term-ss07 = "05rvnm17f7qgy4zq3chp12dqvdxwvfv7rld7axccyikqh3b63kn8"; - sgr-iosevka-term-ss08 = "1y0n2dl6vknvpxhn5d2zsnjj2vgpd9saqs0kmvlbd7lpjsz8d7i0"; - sgr-iosevka-term-ss09 = "0qkn7syk2wrk14nhwnkbbavsi518pi7qzppiq56y5z1l119dwhrg"; - sgr-iosevka-term-ss10 = "04b78kk5mggb5xdpigkbkgvcl9q5v41mpx466isqwgxa3p6bp2b4"; - sgr-iosevka-term-ss11 = "01wsf0qbybnw3bg7iy6yigamg31dhvl6k1gb8jsg4ylllpy7aip3"; - sgr-iosevka-term-ss12 = "079sbibpsa3xvp8v0pdcacfpck4s01xkczbrbzpnrwiha4b5dqj4"; - sgr-iosevka-term-ss13 = "1py76ly8wppb0q05mhv91q2x7slidwbbycm86q225yx8hgl0wjdi"; - sgr-iosevka-term-ss14 = "0sq49yvl03w56dzxpzvfr18bah964g93fg42n31q5bbybmgykd8j"; - sgr-iosevka-term-ss15 = "0x8kksl8k7zj0hh0fjlqmc5g2jwzdl8ylx6ljzdhfs6y9kdgf04r"; - sgr-iosevka-term-ss16 = "1kh0m87j4nghgpixh213zs8b626yy5vbmjd4ng17jvvdj98faxzn"; - sgr-iosevka-term-ss17 = "14rwlw0y8fv7ykyvxhpdhzycmi3j0zx3zrsvph61mnsk33p05vb9"; - sgr-iosevka-term-ss18 = "19m3f6sgn8ivdhy7nagym6c0nwfd9yyqjdn6q6lxd8hp751jzlf9"; + iosevka = "1jn883s4vvpfih31yxap2hg6xya9jfjnqa8f7iqkqyxxqrnx7zzm"; + iosevka-aile = "1p2s5nslifmdbjbqqlk02kl0rvpmr5pkq71hr9xim2dqb11kmcdl"; + iosevka-curly = "0rs7jmgpl1ki7b9i3l78fn63xbgd02wraixqb1yjc3lmxi9jbhxn"; + iosevka-curly-slab = "09rf82w41fbw7pm1ak9vv1i9450h2ia7x434gn9czx01wnb3s2zb"; + iosevka-etoile = "1621a74z378rz4l1gn9dr7fqqvnd1g7ipr5bw13qhwl5ljf170xs"; + iosevka-slab = "06x3hbi05bzlaci7hr3wk8j92zn97i41bw8xjnj8sh63mla36w9p"; + iosevka-ss01 = "1plp7lk9yzizfz9c5k4m51ynvp0zkz7r7vgx416rkwb3yh23fjpv"; + iosevka-ss02 = "0zpl9a8nccnrywaxj61glj4x7ai1fas9x463xqpy38w686n0jjyn"; + iosevka-ss03 = "1xrxvsj2ja9miwvgq7p6kxysn8858gk8qh2pp1bw1n67vppvhkp9"; + iosevka-ss04 = "1y0ac2dq8xmrbw84nar2jsxbyf9nck8fxh3dbl8vhvpnbwan150w"; + iosevka-ss05 = "1z722m5chr8jq24i7czph1qgkasah7y7i4wv2wv0n2j89mc2fbc2"; + iosevka-ss06 = "1fzsj9389cah6zp23vlr375j107jxfabqxaa7iv1hjbw3fa2vmdk"; + iosevka-ss07 = "18psmz6kfhdmpac408w1fsqfarahn60bypm8ci8y3gd8bk8js13c"; + iosevka-ss08 = "0hjlrly98hd4w5l6cm361h4cyvkdrlf3bp1g6f438aip0bj2y94w"; + iosevka-ss09 = "13jdlmamfbxnkqii6bkh0xm71fgqdvgnqs88dnq8pjyqhbl32sca"; + iosevka-ss10 = "15ak510q6di9hsy2p8k7gkp5d1kzgrmk2m55zh90w5irbr5fmbjp"; + iosevka-ss11 = "0x42pjik0iy2v11iq8i83wa88f6b6qymc3v2sih28rjhijxl7lsm"; + iosevka-ss12 = "15s7imcm4w61555crah1pxzc9yn3zffkj13zk8zidgk6v7jzb6rs"; + iosevka-ss13 = "1q3d3fyjsk6iwq1w6dv9rc7ivk021i3v2px574dfbqlswvb2sg86"; + iosevka-ss14 = "0r1fkrcqcccx4zz9qgzgq9si8xcbn7y1f2821cjs6cbfaxmrkwmc"; + iosevka-ss15 = "0vgwgkfnch5rn7kc9rblg1km4pzqwsglb31zqnx3rxhszm66j9q6"; + iosevka-ss16 = "009whnydn5rb6dj06scnc3722y8sddsv4jl42r70x2zzra14qdgk"; + iosevka-ss17 = "01j1gqrmlx3b6rlv6sg3kv9j39s2dwqvj35h4v0v7min2vn1hydj"; + iosevka-ss18 = "1pbwqgrkv560237marp5msq1y93llxvjrpixka15a79a7lmpd36i"; + sgr-iosevka = "0p31qdby1znrsz4hplrq81ngv1l2pxbn9x26hcpjxrbgv2mmvhfq"; + sgr-iosevka-aile = "00zapw8mk0z40jw69ynvdzhpd67rvi9lp509hf3vb7x3cq1ka1wz"; + sgr-iosevka-curly = "1rgxkc2ps8pmp3mgi2b51lv4j5cc5q7m6iizw8gbfl36qmzlfdlh"; + sgr-iosevka-curly-slab = "1fdxr0mkb40fa0605i8b8h51pg8p3cskjsggil9gp1376wzhr42q"; + sgr-iosevka-etoile = "1r91042avgn0f0p2rf09pam4wfjndkj7wml9vs082kc40aqgh9m5"; + sgr-iosevka-fixed = "13b5nkyxpm9izj0dmwc97lqbfvbxqyjg3677hpi6ywl3c6m1h542"; + sgr-iosevka-fixed-curly = "06r0lzcrhf9897yi9h6xh5n1mfb8j4v21nz81igs616w7gjlz0dk"; + sgr-iosevka-fixed-curly-slab = "1l9qaialwq2xygznylbwkizbqwghzl4625d845f8kwyl9krd92na"; + sgr-iosevka-fixed-slab = "199s1cdn22rjirrh1f9xhqbh77namriw077g11hykr4ibwy6sc6n"; + sgr-iosevka-fixed-ss01 = "1y51qk0pfq9r8hpcgmcykrvddl8rw5rjfysrbsjvf6zi59z5rk02"; + sgr-iosevka-fixed-ss02 = "12x3qrw6baxfwbj2wgawf9qpbk8nv7ccd9grqgw7b4qmy5j31n39"; + sgr-iosevka-fixed-ss03 = "1sf8xybh8l76dbm8vgk0y4lgdm5lb5pb4kgnipygqj9z0kasj07d"; + sgr-iosevka-fixed-ss04 = "0pbpqnv6kdnnl4yix3ysfrnxg3ainsl9m0pnkb1i21q5sav20ph5"; + sgr-iosevka-fixed-ss05 = "1vgfiqxwfg3m68dlk4s1x5ms293nbwgdq34y80hysp8pfzl7d07z"; + sgr-iosevka-fixed-ss06 = "17f3rxsh2nla6a8fhim88vxqj1kzafvcfbara1iwzsw3fw9gz2ai"; + sgr-iosevka-fixed-ss07 = "1j3r197jx51b7l5cpm2g5b7mzq53wp05f8ra3cz04r69qc0dj8i5"; + sgr-iosevka-fixed-ss08 = "1gj784bi4wy0282xbq3f24sqlm7b2s1gz2f8sna4bd5bgci8avb7"; + sgr-iosevka-fixed-ss09 = "0hhqvghq0mxbjzfhfcjgij94b40129vhg6x4slgk579kdfmr21y4"; + sgr-iosevka-fixed-ss10 = "044dam3cg2s29j0zbq03ypyyskws31dfvyyp01smds7njf8f2w39"; + sgr-iosevka-fixed-ss11 = "1xxmcai145rfjhlx4n5hcs7kdz298pxn9b3if85cpmdd9qhdmy48"; + sgr-iosevka-fixed-ss12 = "13rbsql91z2ndbx121j1yb3m10a2fwil0jilhfjj17rn0kh0a5qi"; + sgr-iosevka-fixed-ss13 = "19y6x2jln772afqy7y2k97kzpin73y5wq72fh7c9n9cmh1n24628"; + sgr-iosevka-fixed-ss14 = "0ndm0yk95a10qv95c9d5qhjx4vzc28wkahlxjadndxh82hn8zlqm"; + sgr-iosevka-fixed-ss15 = "107lwn4d01hry6jyk2blxdy7gx80ka6wrgxs80l5czx4jsk6kr66"; + sgr-iosevka-fixed-ss16 = "0ka5rp7svqp5hs2zdf0bq5lfhgfmqij93f53q1a0snispx1qnsn6"; + sgr-iosevka-fixed-ss17 = "18kvws3r66b1lqqpyphpf1nk6qdv6pv9c36zf0kpi7hpfcp1dvaa"; + sgr-iosevka-fixed-ss18 = "1s9gzh2ghs66rjjz7317x163072gy2fxbqmvhghngd7bpvbajdd6"; + sgr-iosevka-slab = "0b78y7pikcrlilzn2xlvg5f7liqp0zvzcknx9l47nh32sqn11f5j"; + sgr-iosevka-ss01 = "1nrj6dl3znakj3h0fvd37k71gcp2l0yfgqggdn6ms4cyyrq16z38"; + sgr-iosevka-ss02 = "0mhn1jx2ibllp8h05lm9ms8wh960yyncblx4pkj95sswm5kdv8vv"; + sgr-iosevka-ss03 = "0xxanqcpqh5fvhfad6cyk89yr2nza9lpig6dralizi8b1vxl7bnl"; + sgr-iosevka-ss04 = "1566hvq2lwnh6p7v55j8khi56y61cg88g7vnb306a0rakg5jv17y"; + sgr-iosevka-ss05 = "111pwbwp8fkiph6mrzblbx1nzdnzv9d6aphmkxlmrf1cs19jv71k"; + sgr-iosevka-ss06 = "0p57cqqfhyhri2r1ss8pcd2hdn4pvp0dwr8ls1iws5gaj2s5zbjx"; + sgr-iosevka-ss07 = "0clchkildx4vmk4xpd3xjx0xbihfkn61pcha00md4qf471ysnpmp"; + sgr-iosevka-ss08 = "17ici8in0sh2zy1ya9319k9qqjzg5nl7ky6mbb2skpgmh85figfp"; + sgr-iosevka-ss09 = "0fcwxcvzpc9l5dvmkqxf1g32xr4fk5rr389d6s3qbkdxdlc2vx63"; + sgr-iosevka-ss10 = "1d59vw8caj9nlpmfijwpgkbb6kxphgdrw2hd5ldcvxs0ny0r8fcd"; + sgr-iosevka-ss11 = "0d60zpdq7n73cn0lgnwhddxzw3x0i2cpqwpc1k78s8r8h36qmd05"; + sgr-iosevka-ss12 = "15sc20f2kf6i0wlcfy60ss2j6dyg6figd18g22zmm7msz2lda1b0"; + sgr-iosevka-ss13 = "0qi8ala5dm3r9gljwf5i84624h6arasd9mhww8nk3822cx8c8jd0"; + sgr-iosevka-ss14 = "0i9p2rz8ppwl6x9d2j4gry7l386nbv4g2jrrna6bwgk4nh12izg0"; + sgr-iosevka-ss15 = "0d4s197v96ka5c4b63kisiy8j694vskspc5vry4bgj4pbl7vl6lg"; + sgr-iosevka-ss16 = "1a02r483ihfnlzx0kir6p84q6bscrs798i5qaw7qiz3zi8kxdrgb"; + sgr-iosevka-ss17 = "1hi7dikls7x5zn79waki77bcp4w5hzx12mqmh0zx77aah3ghcax1"; + sgr-iosevka-ss18 = "1mkjyn5mjnlwrxfhxr1f3ja2fd6lbv54fxx0xy9zm1banz0pp3y1"; + sgr-iosevka-term = "0cmycg6vygxi3c1pdqddmh8mqpcrnkmn9y5c8xjzd1lygm41668q"; + sgr-iosevka-term-curly = "1q7r3qclmkniin8hx8digwk1rfgfcm4jz6mvjay5sfi5wa6g9fd0"; + sgr-iosevka-term-curly-slab = "07bf92s5zf9vny3560dr8zwxdg1jpdvz5ksmqcm74ib1024yk17r"; + sgr-iosevka-term-slab = "1am42m5jggfy0fv3580rsksklaiq8827da1s20ngiyxfzcgbgwf3"; + sgr-iosevka-term-ss01 = "09igqk8b4hmgmh1q1idvcjpz0vj15yzrsmcqhyrs1ygxyl2d6g5v"; + sgr-iosevka-term-ss02 = "143czw61bilpim4lqqzp9d2gz4igijyl2p87iy3f5pvh75qzk8fx"; + sgr-iosevka-term-ss03 = "02s7dsjxsm6dgp2rcz6n9dyi6priz9k5q5wd1rajfs6rgb01j1h7"; + sgr-iosevka-term-ss04 = "10paacm4gb0823pqacj1ps8s79k6zbayrqqqnhvklkqki2iiay4g"; + sgr-iosevka-term-ss05 = "0nn49fgxciwpfddcksb5krhvyqbr2zfx2zq1m5nswb70nzwwk8sj"; + sgr-iosevka-term-ss06 = "1r6xlbf9si5ycg96av2pjjak82qgj1sqdq634wkl41x4mj39zkjl"; + sgr-iosevka-term-ss07 = "1sfjv2ggqrgxjqykgycia62xa2g523yf61gix9dp79gyg6ga25nr"; + sgr-iosevka-term-ss08 = "0rk66nzjc4d7bjx9sfgnlzsx52mdrdmgl4xri6jd0ad3543j43bh"; + sgr-iosevka-term-ss09 = "0y12s0ynb5fda8kprwlbw6a9kkb7fwjfna2axgz5rxlz0ja14gs1"; + sgr-iosevka-term-ss10 = "0hy31v083cd9lcb7xfvh6lj4nvzlqkbm8lni092sp21iv43xpp4f"; + sgr-iosevka-term-ss11 = "0wb1c4l8327vsnkpj34grplw1v1mlr3wdavi7i0z5383qx4l3cn0"; + sgr-iosevka-term-ss12 = "0x8zgm1yl37ij1hq6bcdf0whfbyv4gdkqk94yi3xm74a744pzsvx"; + sgr-iosevka-term-ss13 = "1ia9q4gn9a6mr0n4vb6d8mnnp9s6l5v5y4fgi6ip0g49n0n8fw4r"; + sgr-iosevka-term-ss14 = "0ipfjn23jaz6xjb0v2pbirrvi18czir6nijh79kxrrs1k83mc4yq"; + sgr-iosevka-term-ss15 = "0pdlsd8qsp80y5rgp3vrhl1wjbj4b3bgqyavz1ayqccg939dvzqv"; + sgr-iosevka-term-ss16 = "0bz3i0cnijq84skhsjgy0p6p6ww364gnkrny1hgcw7w21d69n2x5"; + sgr-iosevka-term-ss17 = "1sfpaqviv1gqz4c29kmrm1v3zbr3615w90w96s5yxh2lr6zqxi7v"; + sgr-iosevka-term-ss18 = "02f7i400qk9pbyid4dr6p690sqphz52pvgprqp54q1lw07jksqa6"; } diff --git a/nixpkgs/pkgs/data/fonts/last-resort/default.nix b/nixpkgs/pkgs/data/fonts/last-resort/default.nix index 1932fd6da8a9..4ca067360520 100644 --- a/nixpkgs/pkgs/data/fonts/last-resort/default.nix +++ b/nixpkgs/pkgs/data/fonts/last-resort/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "last-resort"; - version = "15.000"; + version = "15.100"; src = fetchurl { url = "https://github.com/unicode-org/last-resort-font/releases/download/${version}/LastResortHE-Regular.ttf"; - hash = "sha256-Qyo/tuBvBHnG/LW8sUAy62xpeqlXfyfwjUCbr4vJEag="; + hash = "sha256-dPk6j7Orh1bg6GyzwsB4P9oQvepvl51YF4abpyhOVso="; }; dontUnpack = true; @@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec { description = "Fallback font of last resort"; homepage = "https://github.com/unicode-org/last-resort-font"; license = licenses.ofl; - maintainers = with maintainers; [ V ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix b/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix index 65045dc6d284..cd15891f2f4a 100644 --- a/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/nixpkgs/pkgs/data/fonts/lxgw-wenkai/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai"; - version = "1.300"; + version = "1.311"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKai/releases/download/v${version}/${pname}-v${version}.tar.gz"; - hash = "sha256-pPN8siF/8D78sEcXoF+vZ4BIeYWyXAuk4HBQJP+G3O8="; + hash = "sha256-R7j6SBWGbkS4cJI1J8M5NDIDeJDFMjtXZnGiyxm2rjg="; }; installPhase = '' diff --git a/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix b/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix index 8d56554939f6..631904942b3c 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.10"; + version = "0.42.1"; 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-RxXLjlWJEWaWph8jz1L1zZABYOm75MoxcI0cZJGBDvg="; + hash = "sha256-e6ig+boWzYiOzENkIsj/z9FFt2pZc+T0dYoFoeONMFM="; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix b/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix index 58ae313542d0..df68dbb844c5 100644 --- a/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix +++ b/nixpkgs/pkgs/data/fonts/sketchybar-app-font/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "sketchybar-app-font"; - version = "1.0.14"; + version = "1.0.17"; src = fetchurl { url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; - hash = "sha256-GPxNMlG6a7newSXorh2RULZ5XHYFmQbcB46C0RytTTU="; + hash = "sha256-sDMasHVcITTSUP9B87w4I7IZ44tYmabNNWl+kE3dUoE="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/data/fonts/source-han/default.nix b/nixpkgs/pkgs/data/fonts/source-han/default.nix index 0174324b016a..573cfd6c5b94 100644 --- a/nixpkgs/pkgs/data/fonts/source-han/default.nix +++ b/nixpkgs/pkgs/data/fonts/source-han/default.nix @@ -5,7 +5,7 @@ }: let - makePackage = + makeSuperOTC = { family , description , rev @@ -13,9 +13,10 @@ let , zip ? "" , prefix ? "" }: - let Family = - lib.toUpper (lib.substring 0 1 family) + - lib.substring 1 (lib.stringLength family) family; + let + Family = + lib.toUpper (lib.substring 0 1 family) + + lib.substring 1 (lib.stringLength family) family; in stdenvNoCC.mkDerivation rec { pname = "source-han-${family}"; @@ -49,9 +50,36 @@ let maintainers = with lib.maintainers; [ taku0 emily ]; }; }; + + makeVariable = + { family + , version + , hash + , format + }: + let + Family = + lib.toUpper (lib.substring 0 1 family) + + lib.substring 1 (lib.stringLength family) family; + in + fetchurl { + pname = "source-han-${family}-vf-${format}"; + inherit version hash; + url = "https://raw.githubusercontent.com/adobe-fonts/source-han-${family}/${version}R/Variable/OTC/SourceHan${Family}-VF.${format}.ttc"; + recursiveHash = true; + downloadToTemp = true; + postFetch = "install -Dm444 $downloadedFile $out/share/fonts/variable/SourceHan${Family}-VF.${format}.ttc"; + + meta = { + description = "An open source Pan-CJK ${Family} typeface"; + homepage = "https://github.com/adobe-fonts/source-han-${family}"; + license = lib.licenses.ofl; + maintainers = with lib.maintainers; [ taku0 emily ]; + }; + }; in { - sans = makePackage { + sans = makeSuperOTC { family = "sans"; description = "sans-serif"; rev = "2.004R"; @@ -59,7 +87,7 @@ in zip = ".zip"; }; - serif = makePackage { + serif = makeSuperOTC { family = "serif"; description = "serif"; rev = "2.001R"; @@ -68,10 +96,38 @@ in prefix = "01_"; }; - mono = makePackage { + mono = makeSuperOTC { family = "mono"; description = "monospaced"; rev = "1.002"; hash = "sha256-DBkkSN6QhI8R64M2h2iDqaNtxluJZeSJYAz8x6ZzWME="; }; + + sans-vf-otf = makeVariable { + family = "sans"; + version = "2.004"; + hash = "sha256-V7PE09c7h4RDS8Ij4PSI36Gy+LM+PVDi73Rcs+4DfHo="; + format = "otf"; + }; + + sans-vf-ttf = makeVariable { + family = "sans"; + version = "2.004"; + hash = "sha256-mXTG/d30gUxzxkJpaH4vOawRXMSxxTXlHCvHEsfGqbc="; + format = "ttf"; + }; + + serif-vf-otf = makeVariable { + family = "serif"; + version = "2.002"; + hash = "sha256-8sD4bU6w7HBm4vBuPAjcjpxN2rtEJugAw+X0bAOcmjA="; + format = "otf"; + }; + + serif-vf-ttf = makeVariable { + family = "serif"; + version = "2.002"; + hash = "sha256-dmTZFRsD55WCOg2+sqd8bkmTSnSNn5xUYf0PgzIvzww="; + format = "ttf"; + }; } diff --git a/nixpkgs/pkgs/data/fonts/unifont/default.nix b/nixpkgs/pkgs/data/fonts/unifont/default.nix index dda2b3f5bcb4..7784f4ac8c2b 100644 --- a/nixpkgs/pkgs/data/fonts/unifont/default.nix +++ b/nixpkgs/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "15.0.04"; + version = "15.1.02"; - ttf = fetchurl { - url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; - hash = "sha256-kkSbEvWBrvcnBgHDdKJjpSYF6BJDEwmYSxVQbPkQ6so="; + otf = fetchurl { + url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.otf"; + hash = "sha256-fmhm74zc6wJK2f5XkDq/BRc5Lv+rCvcDRodgHCSiUQA="; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - hash = "sha256-rdzJuOkXYojgm5VfpshtJuCJYM0/iS+HnWMXEDsLQPg="; + hash = "sha256-cCDXjSbpCe1U+Fx/xH/9NXWg6bkdRBV5AawFR0NyOHM="; }; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; @@ -33,9 +33,9 @@ stdenv.mkDerivation rec { install -m 644 -D unifont.otb "$out/share/fonts/unifont.otb" mkfontdir "$out/share/fonts" - # install pcf and ttf fonts + # install pcf and otf fonts install -m 644 -D ${pcf} $out/share/fonts/unifont.pcf.gz - install -m 644 -D ${ttf} $out/share/fonts/truetype/unifont.ttf + install -m 644 -D ${otf} $out/share/fonts/opentype/unifont.otf cd "$out/share/fonts" mkfontdir mkfontscale diff --git a/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix b/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix index 892ed5be2400..33ed947ae690 100644 --- a/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix +++ b/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "unifont_upper"; - version = "15.0.04"; + version = "15.1.02"; src = fetchurl { - url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.ttf"; - hash = "sha256-7iRcyKfGpv2rjVLPRNchxpXwj0KA5jlgDnCfG7byLLI="; + url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf"; + hash = "sha256-OTIwWA2p+7ldqEB5O6J18zU5RVoswC0t1G72fFeCKpU="; }; dontUnpack = true; @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm644 $src $out/share/fonts/truetype/unifont_upper.ttf + install -Dm644 $src $out/share/fonts/opentype/unifont_upper.otf runHook postInstall ''; 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 1b6be1d9bb43..a5e65ed34439 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.09.11"; + version = "23.10.09"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-9GTNE9Gt+dxdfOLD0Qv1utSkwigalAPxixGSC5Nj8XM="; + sha256 = "sha256-H5zkBV8WV03mPKAq0IqFXv/O2qE3zT9UJJMo4tt1Agc="; }; 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 395fd1ed31fa..0868f1c159b5 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.09.11"; + version = "23.10.09"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-YipdEvmQnqiuxheYS+y5t37uonzr/nH54PVLm4xp31E="; + sha256 = "sha256-NAvgrD0ckAC0vpF7BkEVWGmsuoWeMuSOdp2c9wEzv4s="; }; nativeBuildInputs = [ gtk3 ]; diff --git a/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix index 6e32d09dac68..518f0d11efd7 100644 --- a/nixpkgs/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/nixpkgs/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-06-25"; + version = "2023-10-07"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "nob0Isx785YRP4QIj2CK+v99CUiRwtkge1dNXCCwaDs="; + sha256 = "il+bYIcwm0BQF6U0J6h6rlzHSGSHYN/O8BezehYIpQ4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix b/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix index 22b66b1c65dc..6e391aa19ef0 100644 --- a/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix +++ b/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix @@ -56,6 +56,6 @@ stdenvNoCC.mkDerivation rec { description = "A style neutral scalable cursor theme"; platforms = platforms.all; license = licenses.cc-by-sa-30; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/data/icons/whitesur-cursors/default.nix b/nixpkgs/pkgs/data/icons/whitesur-cursors/default.nix new file mode 100644 index 000000000000..c16efa996d34 --- /dev/null +++ b/nixpkgs/pkgs/data/icons/whitesur-cursors/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation { + pname = "whitesur-cursors"; + version = "unstable-2022-06-17"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = "WhiteSur-cursors"; + rev = "5c94e8c22de067282f4cf6d782afd7b75cdd08c8"; + sha256 = "sha256-CFse0XZzJu+PWDcqmvIXvue+3cKX47oavZU9HYRDAg0="; + }; + + installPhase = '' + runHook preInstall + install -dm 755 $out/share/icons/WhiteSur-cursors + cp -r dist/* $out/share/icons/WhiteSur-cursors + runHook postInstall + ''; + + meta = { + description = "An x-cursor theme inspired by macOS and based on capitaine-cursors"; + homepage = "https://github.com/vinceliuice/WhiteSur-cursors"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/data/misc/clash-geoip/default.nix b/nixpkgs/pkgs/data/misc/clash-geoip/default.nix index 3488bfc0a5f9..b94137ccf4e6 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 = "20230812"; + version = "20230912"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-yO8zSQjNYGxaSXcOhFOIE4HsiMnCm3ZVYfVZg5xO96s="; + sha256 = "sha256-MyNlgsa+8OS7vkMq74KKmUVzBhmDpF4ED2Xdgl3GIS4="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix b/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix index e620280edbbb..8774f812ecef 100644 --- a/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix +++ b/nixpkgs/pkgs/data/misc/dbip-country-lite/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2023-09"; + version = "2023-10"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-3Mapa4qxUEMGUeqzoyzhatL43l1PPmw+Aye4bX92CAA="; + hash = "sha256-PQn8dyx4l3r7N52rv/Woth6J61+WvVL+SHKMkVVtFsw="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix b/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix index efb3f021ec5a..7574c16cba72 100644 --- a/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix +++ b/nixpkgs/pkgs/data/misc/ddccontrol-db/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20230821"; + version = "20231004"; src = fetchFromGitHub { owner = "ddccontrol"; repo = pname; rev = version; - sha256 = "sha256-R+DXpT9Tgt311G/OtmKp3sqN0ex/rlLt3JuSK7kciC0="; + sha256 = "sha256-C/FqLczkQ9thoAdBI2aDDKgp5ByTWVOJ9bcD9ICqyFM="; }; nativeBuildInputs = [ autoreconfHook intltool ]; diff --git a/nixpkgs/pkgs/data/misc/hackage/pin.json b/nixpkgs/pkgs/data/misc/hackage/pin.json index 7ccfd59396bf..55df79358bae 100644 --- a/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "69066b0daf2bbb4ca6f2b6de0bc9b8f27fffe4bc", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/69066b0daf2bbb4ca6f2b6de0bc9b8f27fffe4bc.tar.gz", - "sha256": "16ij50f7cx8gl3ypzwy50f5dr68y6m6n732sa1hwsng5db4vqzv7", - "msg": "Update from Hackage at 2023-08-17T07:12:25Z" + "commit": "ad59313651a92d9b7356f616268c7a3d80f52886", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ad59313651a92d9b7356f616268c7a3d80f52886.tar.gz", + "sha256": "0s66dx6daxfkdm40fcqvlh3h9bcjx1cydrmgxd7dxrlmqqgwn4lc", + "msg": "Update from Hackage at 2023-09-13T23:29:30Z" } 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 211ee414750f..67bb06ba2807 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 = "20230913074035"; + version = "20231015073627"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-A1401KSNkGoVEbiX2MyepesnyF0qVWZ7tuKLtoKUA/k="; + hash = "sha256-DffJ9d5ppTVLMTfITKd0zwCqBEKKMCwupLAFMr/o+dw="; }; vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; meta = with lib; { diff --git a/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix b/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix index 205fcabc7131..646f4ae491b0 100644 --- a/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix +++ b/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, xorgproto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rgb"; - version = "1.0.6"; + version = "1.1.0"; src = fetchurl { - url = "https://xorg.freedesktop.org/archive/individual/app/rgb-${version}.tar.bz2"; - sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv"; + url = "https://xorg.freedesktop.org/archive/individual/app/rgb-${finalAttrs.version}.tar.xz"; + hash = "sha256-/APX9W5bKmF2aBZ/iSeUjM5U+TCX58zZ8FYHf0ee03s="; }; nativeBuildInputs = [ pkg-config ]; @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "X11 colorname to RGB mapping database"; license = licenses.mit; - maintainers = [ maintainers.raskin ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; homepage = "https://xorg.freedesktop.org/"; }; -} +}) diff --git a/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix b/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix index b7c144441104..27811203c86e 100644 --- a/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix +++ b/nixpkgs/pkgs/data/themes/adw-gtk3/default.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "adw-gtk3"; - version = "4.5"; + version = "4.9"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x6ul5NZDWqEQfLzmpR7X5HgUmHNSbpuTnCquVEHFHL8="; + sha256 = "sha256-ni1u6696jrwjYZ4gppF9yD1RAum0+D7WxQgu09cxVGg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix b/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix index 4bda31746622..6459f50fe786 100644 --- a/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix +++ b/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix @@ -28,13 +28,13 @@ lib.checkListOfEnum "${pname}: tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "catppuccin"; repo = "gtk"; rev = "v${version}"; - sha256 = "sha256-b03V/c2do5FSm4Q0yN7V0RuoQX1fYsBd//Hj3R5MESI="; + hash = "sha256-J1iLN2FF3Ml/3zmntXYlfkv6dZcwl62A9X4ruAH1ll4="; }; nativeBuildInputs = [ gtk3 sassc ]; @@ -53,9 +53,12 @@ stdenvNoCC.mkDerivation rec { ''; postPatch = '' - patchShebangs --build colloid/clean-old-theme.sh colloid/install.sh + patchShebangs --build colloid/install.sh ''; + dontConfigure = true; + dontBuild = true; + installPhase = '' runHook preInstall @@ -76,6 +79,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/catppuccin/gtk"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.fufexan ]; + maintainers = with maintainers; [ fufexan PlayerNameHere ]; }; } diff --git a/nixpkgs/pkgs/data/themes/catppuccin/default.nix b/nixpkgs/pkgs/data/themes/catppuccin/default.nix new file mode 100644 index 000000000000..59e030eb9e0e --- /dev/null +++ b/nixpkgs/pkgs/data/themes/catppuccin/default.nix @@ -0,0 +1,189 @@ +let + validThemes = [ "bat" "bottom" "btop" "hyprland" "k9s" "kvantum" "lazygit" "plymouth" "refind" "rofi" "waybar" ]; +in +{ fetchFromGitHub +, lib +, stdenvNoCC +, accent ? "blue" +, variant ? "macchiato" +, themeList ? validThemes +}: +let + pname = "catppuccin"; + + validAccents = [ "rosewater" "flamingo" "pink" "mauve" "red" "maroon" "peach" "yellow" "green" "teal" "sky" "sapphire" "blue" "lavender" ]; + validVariants = [ "latte" "frappe" "macchiato" "mocha" ]; + + selectedSources = map (themeName: builtins.getAttr themeName sources) themeList; + sources = { + bat = fetchFromGitHub { + name = "bat"; + owner = "catppuccin"; + repo = "bat"; + rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1"; + hash = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw="; + }; + + bottom = fetchFromGitHub { + name = "bottom"; + owner = "catppuccin"; + repo = "bottom"; + rev = "c0efe9025f62f618a407999d89b04a231ba99c92"; + hash = "sha256-VaHX2I/Gn82wJWzybpWNqU3dPi3206xItOlt0iF6VVQ="; + }; + + btop = fetchFromGitHub { + name = "btop"; + owner = "catppuccin"; + repo = "btop"; + rev = "1.0.0"; + hash = "sha256-J3UezOQMDdxpflGax0rGBF/XMiKqdqZXuX4KMVGTxFk="; + }; + + hyprland = fetchFromGitHub { + name = "hyprland"; + owner = "catppuccin"; + repo = "hyprland"; + rev = "v1.2"; + hash = "sha256-07B5QmQmsUKYf38oWU3+2C6KO4JvinuTwmW1Pfk8CT8="; + }; + + k9s = fetchFromGitHub { + name = "k9s"; + owner = "catppuccin"; + repo = "k9s"; + rev = "516f44dd1a6680357cb30d96f7e656b653aa5059"; + hash = "sha256-PtBJRBNbLkj7D2ko7ebpEjbfK9Ywjs7zbE+Y8FQVEfA="; + }; + + kvantum = fetchFromGitHub { + name = "kvantum"; + owner = "catppuccin"; + repo = "Kvantum"; + rev = "d1e174c85311de9715aefc1eba4b8efd6b2730fc"; + sha256 = "sha256-IrHo8pnR3u90bq12m7FEXucUF79+iub3I9vgH5h86Lk="; + }; + + lazygit = fetchFromGitHub { + name = "lazygit"; + owner = "catppuccin"; + repo = "lazygit"; + rev = "0543c28e8af1a935f8c512ad9451facbcc17d8a8"; + hash = "sha256-OVihY5E+elPKag2H4RyWiSv+MdIqHtfGNM3/1u2ik6U="; + }; + + plymouth = fetchFromGitHub { + name = "plymouth"; + owner = "catppuccin"; + repo = "plymouth"; + rev = "d4105cf336599653783c34c4a2d6ca8c93f9281c"; + hash = "sha256-quBSH8hx3gD7y1JNWAKQdTk3CmO4t1kVo4cOGbeWlNE="; + }; + + refind = fetchFromGitHub { + name = "refind"; + owner = "catppuccin"; + repo = "refind"; + rev = "ff0b593c19bb9b469ee0ee36068b8d373f0fadc5"; + hash = "sha256-itUMo0lA23bJzH0Ndq7L2IaEYoVdNPYxbB/VWkRfRso="; + }; + + rofi = fetchFromGitHub { + name = "rofi"; + owner = "catppuccin"; + repo = "rofi"; + rev = "5350da41a11814f950c3354f090b90d4674a95ce"; + hash = "sha256-DNorfyl3C4RBclF2KDgwvQQwixpTwSRu7fIvihPN8JY="; + }; + + waybar = fetchFromGitHub { + name = "waybar"; + owner = "catppuccin"; + repo = "waybar"; + rev = "v1.0"; + hash = "sha256-vfwfBE3iqIN1cGoItSssR7h0z6tuJAhNarkziGFlNBw="; + }; + }; +in +lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] +lib.checkListOfEnum "${pname}: accent" validAccents [ accent ] +lib.checkListOfEnum "${pname}: themes" validThemes themeList + +stdenvNoCC.mkDerivation { + inherit pname; + version = "unstable-2023-10-09"; + + srcs = selectedSources; + + unpackPhase = '' + for s in $selectedSources; do + b=$(basename $s) + cp $s ''${b#*-} + done + ''; + + installPhase = '' + runHook preInstall + + local capitalizedVariant=$(sed 's/^\(.\)/\U\1/' <<< "${variant}") + local capitalizedAccent=$(sed 's/^\(.\)/\U\1/' <<< "${accent}") + + '' + lib.optionalString (lib.elem "bat" themeList) '' + mkdir -p $out/bat + cp "${sources.bat}/Catppuccin-${variant}.tmTheme" "$out/bat/" + + '' + lib.optionalString (lib.elem "btop" themeList) '' + mkdir -p $out/btop + cp "${sources.btop}/themes/catppuccin_${variant}.theme" "$out/btop/" + + '' + lib.optionalString (lib.elem "bottom" themeList) '' + mkdir -p $out/bottom + cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom/" + + '' + lib.optionalString (lib.elem "hyprland" themeList) '' + mkdir -p $out/hyprland + cp "${sources.hyprland}/themes/${variant}.conf" "$out/hyprland/" + + '' + lib.optionalString (lib.elem "k9s" themeList) '' + mkdir -p $out/k9s + cp "${sources.k9s}/dist/${variant}.yml" "$out/k9s/" + + '' + lib.optionalString (lib.elem "kvantum" themeList) '' + mkdir -p $out/share/Kvantum + cp -r ${sources.kvantum}/src/Catppuccin-"$capitalizedVariant"-"$capitalizedAccent" $out/share/Kvantum + + '' + lib.optionalString (lib.elem "lazygit" themeList) '' + mkdir -p $out/lazygit/{themes,themes-mergable} + cp "${sources.lazygit}/themes/${variant}/${variant}-${accent}.yml" "$out/lazygit/themes/" + cp "${sources.lazygit}/themes-mergable/${variant}/${variant}-${accent}.yml" "$out/lazygit/themes-mergable/" + + '' + lib.optionalString (lib.elem "plymouth" themeList) '' + mkdir -p $out/share/plymouth/themes/catppuccin-${variant} + cp ${sources.plymouth}/themes/catppuccin-${variant}/* $out/share/plymouth/themes/catppuccin-${variant} + sed -i 's:\(^ImageDir=\)/usr:\1'"$out"':' $out/share/plymouth/themes/catppuccin-${variant}/catppuccin-${variant}.plymouth + + '' + lib.optionalString (lib.elem "rofi" themeList) '' + mkdir -p $out/rofi + cp ${sources.rofi}/basic/.local/share/rofi/themes/catppuccin-${variant}.rasi $out/rofi/ + + '' + lib.optionalString (lib.elem "refind" themeList) '' + mkdir -p $out/refind/assets + cp ${sources.refind}/${variant}.conf $out/refind/ + cp -r ${sources.refind}/assets/${variant} $out/refind/assets/ + + '' + lib.optionalString (lib.elem "waybar" themeList) '' + mkdir -p $out/waybar + cp ${sources.waybar}/${variant}.css $out/waybar/ + + '' + '' + runHook postInstall + ''; + + meta = { + description = "Soothing pastel themes"; + homepage = "https://github.com/catppuccin/catppuccin"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.khaneliman ]; + }; +} diff --git a/nixpkgs/pkgs/data/themes/sweet-nova/default.nix b/nixpkgs/pkgs/data/themes/sweet-nova/default.nix index 5c89964eeaf6..22a16fa9284d 100644 --- a/nixpkgs/pkgs/data/themes/sweet-nova/default.nix +++ b/nixpkgs/pkgs/data/themes/sweet-nova/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation { pname = "sweet-nova"; - version = "unstable-2023-04-02"; + version = "unstable-2023-09-30"; src = fetchFromGitHub { owner = "EliverLara"; repo = "Sweet"; - rev = "8a5d5a7d975567b5ae101b9f9d436fb1db2d9b24"; - hash = "sha256-FVcXBxcS5oFsvAUDcwit7EIfgIQznl8AYYxqQ797ddU="; + rev = "6e82150d7c3bb1e30ed9bd64de4d2ddd8e113205"; + hash = "sha256-vy4SO1j4y/cUmbQJNqW1/EPJljEtaRrigYIg4yMKXr4="; }; buildPhase = '' diff --git a/nixpkgs/pkgs/data/themes/vimix/default.nix b/nixpkgs/pkgs/data/themes/vimix/default.nix index 5bd01621ed36..1a49b5cff897 100644 --- a/nixpkgs/pkgs/data/themes/vimix/default.nix +++ b/nixpkgs/pkgs/data/themes/vimix/default.nix @@ -24,13 +24,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "flat" "grey" "mix" "translucent" ] twe stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-06-21"; + version = "2023-09-09"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "/LZj7iVWJI4U66XC15TuLnqXVEIF/lOlV+Jujf54NV0="; + sha256 = "dfdPEJnSmD0eqzx4ysiGPp77Beo32l2Tz1qSrbShLlc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/themes/where-is-my-sddm-theme/default.nix b/nixpkgs/pkgs/data/themes/where-is-my-sddm-theme/default.nix index 8151ca0cc133..13ea576b3fbf 100644 --- a/nixpkgs/pkgs/data/themes/where-is-my-sddm-theme/default.nix +++ b/nixpkgs/pkgs/data/themes/where-is-my-sddm-theme/default.nix @@ -23,13 +23,13 @@ in stdenvNoCC.mkDerivation rec { pname = "where-is-my-sddm-theme"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "stepanzubkov"; repo = pname; rev = "v${version}"; - hash = "sha256-kW6W8DELi9Xqn9xWLlcKmxk4tO5FKdApaYTZimQ+7B0="; + hash = "sha256-T6b+rxjlxZCQ/KDaxBM8ZryA3n6a+3jo+J2nETBYslM="; }; propagatedUserEnvPkgs = [ qtgraphicaleffects ]; diff --git a/nixpkgs/pkgs/data/themes/whitesur/default.nix b/nixpkgs/pkgs/data/themes/whitesur/default.nix index c01c8e08166e..518bf72d5bdd 100644 --- a/nixpkgs/pkgs/data/themes/whitesur/default.nix +++ b/nixpkgs/pkgs/data/themes/whitesur/default.nix @@ -33,13 +33,13 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin stdenv.mkDerivation rec { pname = "whitesur-gtk-theme"; - version = "2023-02-07"; + version = "2023-06-30"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-RGYD2+ZTUTPyFbaHvXU9VD3W6WTNeg3ifY+DAR3MmtI="; + sha256 = "sha256-ctEaS+zWkmiVoq0WVA3ecHc2rm8LFQC/kqi/KEXAyXw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/themes/yaru/default.nix b/nixpkgs/pkgs/data/themes/yaru/default.nix index b72bcd6c7c35..93802c6b8874 100644 --- a/nixpkgs/pkgs/data/themes/yaru/default.nix +++ b/nixpkgs/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "23.04.4"; + version = "23.10.0"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - hash = "sha256-8MtRYNJJVhZzE5Ds1HSk+Ej3FUD/z2hGZAsuCeGzWb4="; + hash = "sha256-+Szk77QeoM4PwusxKflTh83h16qz6Es6UwDXpbydJUE="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; |