diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-11-21 16:12:21 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-11-21 16:12:48 +0100 |
commit | 048a4cd441a59cbf89defb18bb45c9f0b4429b35 (patch) | |
tree | f8f5850ff05521ab82d65745894714a8796cbfb6 /pkgs/data | |
parent | 030c5028b07afcedce7c5956015c629486cc79d9 (diff) | |
parent | 4c2d05dd6435d449a3651a6dd314d9411b5f8146 (diff) | |
download | nixpkgs-rootfs.tar nixpkgs-rootfs.tar.gz nixpkgs-rootfs.tar.bz2 nixpkgs-rootfs.tar.lz nixpkgs-rootfs.tar.xz nixpkgs-rootfs.tar.zst nixpkgs-rootfs.zip |
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/data')
83 files changed, 1210 insertions, 572 deletions
diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index 08916f3e561..6eb1e3e7417 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/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/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 7d8adf6cc01..18f4d131973 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/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 ""' @@ -62,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://zealdocs.org/"; changelog = "https://github.com/zealdocs/zeal/releases"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ skeidel peterhoeg AndersonTorres ]; + maintainers = with lib.maintainers; [ peterhoeg AndersonTorres ]; inherit (qtbase.meta) platforms; }; }) diff --git a/pkgs/data/fonts/commit-mono/default.nix b/pkgs/data/fonts/commit-mono/default.nix index d735e64296e..895e70a544b 100644 --- a/pkgs/data/fonts/commit-mono/default.nix +++ b/pkgs/data/fonts/commit-mono/default.nix @@ -4,11 +4,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "commit-mono"; - version = "1.138"; + version = "1.141"; src = fetchzip { - url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/${version}/CommitMono-${version}.zip"; - sha256 = "sha256-ae2eeHh57i6d0kDMZ68aXvLGFj+rXhwg1CC8cV3ndAQ="; + url = "https://github.com/eigilnikolajsen/commit-mono/releases/download/v${version}/CommitMono-${version}.zip"; + hash = "sha256-ErC4ZM17rYq+5FRW9m9nIbQOjQGTCCoNhXHxb7Swd84="; stripRoot = false; }; @@ -20,8 +20,8 @@ stdenvNoCC.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm644 -t $out/share/fonts/opentype/ CommitMono-${version}/*.otf - install -Dm644 -t $out/share/fonts/truetype/ CommitMono-${version}/ttfautohint/*.ttf + install -Dm644 CommitMono-${version}/*.otf -t $out/share/fonts/opentype + install -Dm644 CommitMono-${version}/ttfautohint/*.ttf -t $out/share/fonts/truetype runHook postInstall ''; diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index f8ffc6a2b8e..059350da7d4 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -39,9 +39,11 @@ stdenv.mkDerivation { cabextract --lowercase viewer1.cab # rename to more standard names + # handle broken macOS file-system mv andalemo.ttf Andale_Mono.ttf mv ariblk.ttf Arial_Black.ttf - mv arial.ttf Arial.ttf + mv arial.ttf Arial.ttf.tmp + mv Arial.ttf.tmp Arial.ttf mv arialbd.ttf Arial_Bold.ttf mv arialbi.ttf Arial_Bold_Italic.ttf mv ariali.ttf Arial_Italic.ttf @@ -51,12 +53,15 @@ stdenv.mkDerivation { mv courbd.ttf Courier_New_Bold.ttf mv couri.ttf Courier_New_Italic.ttf mv courbi.ttf Courier_New_Bold_Italic.ttf - mv georgia.ttf Georgia.ttf + mv georgia.ttf Georgia.ttf.tmp + mv Georgia.ttf.tmp Georgia.ttf mv georgiab.ttf Georgia_Bold.ttf mv georgiai.ttf Georgia_Italic.ttf mv georgiaz.ttf Georgia_Bold_Italic.ttf - mv impact.ttf Impact.ttf - mv tahoma.ttf Tahoma.ttf + mv impact.ttf Impact.ttf.tmp + mv Impact.ttf.tmp Impact.ttf + mv tahoma.ttf Tahoma.ttf.tmp + mv Tahoma.ttf.tmp Tahoma.ttf mv times.ttf Times_New_Roman.ttf mv timesbd.ttf Times_New_Roman_Bold.ttf mv timesbi.ttf Times_New_Roman_Bold_Italic.ttf @@ -65,11 +70,13 @@ stdenv.mkDerivation { mv trebucbd.ttf Trebuchet_MS_Bold.ttf mv trebucit.ttf Trebuchet_MS_Italic.ttf mv trebucbi.ttf Trebuchet_MS_Italic.ttf - mv verdana.ttf Verdana.ttf + mv verdana.ttf Verdana.ttf.tmp + mv Verdana.ttf.tmp Verdana.ttf mv verdanab.ttf Verdana_Bold.ttf mv verdanai.ttf Verdana_Italic.ttf mv verdanaz.ttf Verdana_Bold_Italic.ttf - mv webdings.ttf Webdings.ttf + mv webdings.ttf Webdings.ttf.tmp + mv Webdings.ttf.tmp Webdings.ttf install -m444 -Dt $out/share/fonts/truetype *.ttf diff --git a/pkgs/data/fonts/curie/default.nix b/pkgs/data/fonts/curie/default.nix index 4f3ab7eb013..5e8195211b0 100644 --- a/pkgs/data/fonts/curie/default.nix +++ b/pkgs/data/fonts/curie/default.nix @@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/NerdyPepper/curie"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/fonts/edwin/default.nix b/pkgs/data/fonts/edwin/default.nix index 41926ac1b67..2ccb44d45d2 100644 --- a/pkgs/data/fonts/edwin/default.nix +++ b/pkgs/data/fonts/edwin/default.nix @@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/MuseScoreFonts/Edwin"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/fonts/fg-virgil/default.nix b/pkgs/data/fonts/fg-virgil/default.nix new file mode 100644 index 00000000000..fdf83df42e0 --- /dev/null +++ b/pkgs/data/fonts/fg-virgil/default.nix @@ -0,0 +1,31 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fg-virgil"; + version = "0.16.1"; + + src = fetchFromGitHub { + owner = "excalidraw"; + repo = "excalidraw"; + rev = "v${finalAttrs.version}"; + hash = "sha256-iziCCHacaShPqb0f5nI8cCinFFs5fB3TcMJrifNhg4I="; + }; + + installPhase = '' + runHook preInstall + + install -D -m 444 public/Virgil.woff2 -t $out/share/fonts/woff2 + install -D -m 444 public/FG_Virgil.woff2 -t $out/share/fonts/woff2 + install -D -m 444 public/FG_Virgil.ttf -t $out/share/fonts/ttf + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/excalidraw/virgil"; + description = "The font that powers Excalidraw"; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ drupol ]; + license = lib.licenses.ofl; + }; +}) diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix index 53592152a33..dec1ea062bb 100644 --- a/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -24,6 +24,6 @@ stdenvNoCC.mkDerivation rec { description = "Pan-unicode version of Fixedsys, a classic DOS font"; platforms = lib.platforms.all; license = lib.licenses.publicDomain; - maintainers = [ lib.maintainers.ninjatrappeur ]; + maintainers = [ lib.maintainers.picnoir ]; }; } diff --git a/pkgs/data/fonts/font-awesome/default.nix b/pkgs/data/fonts/font-awesome/default.nix index a6f748f2f07..dfc808971b6 100644 --- a/pkgs/data/fonts/font-awesome/default.nix +++ b/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/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 4503b09354a..d0f05516680 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -6,7 +6,7 @@ stdenvNoCC.mkDerivation { pname = "google-fonts"; - version = "unstable-2022-11-14"; + version = "unstable-2023-10-20"; # Adobe Blank is split out in a separate output, # because it causes crashes with `libfontconfig`. @@ -16,8 +16,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "google"; repo = "fonts"; - rev = "83e116a566eda04a2469a11ee562cef1d7b33e4f"; - sha256 = "sha256-sSabk+VWkoXj1Nzv9ufgIU/nkfKf4XkZU1SO+j+eSPA="; + rev = "990be3ed8f77e31c26bf07b148d6a74b8e6241cf"; + sha256 = "sha256-ffLXzaniHkWxGQpvlJpiO6/SAdbI3FONgTaq8Xu+WY0="; }; postPatch = '' @@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation { rm -rv ofl/cabincondensed \ ofl/signikanegative \ ofl/signikanegativesc \ + ofl/*_todelist \ axisregistry/tests/data if find . -name "*.ttf" | sed 's|.*/||' | sort | uniq -c | sort -n | grep -v '^.*1 '; then @@ -67,5 +68,6 @@ stdenvNoCC.mkDerivation { platforms = platforms.all; hydraPlatforms = []; maintainers = with maintainers; [ manveru ]; + sourceProvenance = [ sourceTypes.binaryBytecode ]; }; } diff --git a/pkgs/data/fonts/intel-one-mono/default.nix b/pkgs/data/fonts/intel-one-mono/default.nix index 1708534c637..f9876e8f0a2 100644 --- a/pkgs/data/fonts/intel-one-mono/default.nix +++ b/pkgs/data/fonts/intel-one-mono/default.nix @@ -2,16 +2,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "intel-one-mono"; - version = "1.2.1"; + version = "1.3.0"; srcs = [ (fetchurl { url = "https://github.com/intel/intel-one-mono/releases/download/V${finalAttrs.version}/otf.zip"; - hash = "sha256-RBJwIUkmAZIRaIEWUxFZlRMfFTUFdLbHCMRkagU0gU0="; + hash = "sha256-iZIfkXH+GplVwES4LaQBIaCWs7OKmEto9J2SpzvagSs="; }) (fetchurl { url = "https://github.com/intel/intel-one-mono/releases/download/V${finalAttrs.version}/ttf.zip"; - hash = "sha256-DV/PT+P+GGq/ejS5cx5ENuCy+iiE32AMOirwuTCP3vY="; + hash = "sha256-EeUTEMuoTHKmuO5Uj0jjiDRF9t7jxbIy45nTWozlgfc="; }) ]; diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index dc7d132884c..5d2be4826f4 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 = "27.0.1"; + version = "27.3.1"; 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/pkgs/data/fonts/iosevka/comfy.nix b/pkgs/data/fonts/iosevka/comfy.nix index fbe2f9533ba..fb788b28763 100644 --- a/pkgs/data/fonts/iosevka/comfy.nix +++ b/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/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 83dca924516..04f89b6d2a1 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 = "27.0.0"; + version = "27.3.5"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-LXQ7F+hEsPfve9yKEYav1O+ZN7uZqK8YmMT0Pr5FQpc="; + hash = "sha256-dqXr/MVOuEmAMueaRWsnzY9MabhnyBRtLR9IDVLN79I="; }; - npmDepsHash = "sha256-SAdKtX+BuU0/me4ECzrKLRJRW6LzGZO2ehAB9iWRVF8="; + npmDepsHash = "sha256-bux8aFBP1Pi5pAQY1jkNTqD2Ny2j+QQs+QRaXWJj6xg="; nativeBuildInputs = [ remarshal @@ -136,7 +136,6 @@ buildNpmPackage rec { license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ - cstrahan jfrankenau ttuegel babariviere diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 6b3d3d53c82..4035a0961a2 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 = "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 = "0l14c39r68x14maw9hyiqd0lqz7q2pq4drw68i0j4jwa58l0r2x1"; + iosevka-aile = "1pl59kga3ab2jm3y4lh0lqp9nqjggykqrpnh27s99abkf5cvgkzr"; + iosevka-curly = "1nv3r2c2zj9y3zgaa2r8s0w4l28a3pzkyvcm1br650mb4l469j6c"; + iosevka-curly-slab = "1ik3affc11w0q3xjrm9pdpzp6hdq9623f1nhsbc4ih5980mvki0j"; + iosevka-etoile = "16fsysywpf7zdkl0sszi5im42idlmxl273ml0zs9dajd5zdwhm08"; + iosevka-slab = "1xksbmzzfp6mnd90nfnqyg02ps36makrcr311l1xcl9v4drcnsiq"; + iosevka-ss01 = "1pzl1adnbi4m2bi4p754k82viqksxjd39q5sqljjrs60p5mwxbw6"; + iosevka-ss02 = "0r1vrg6b6c4ixw0fzi4g3q7c1hah2szw2rv5gkqmdg0kiw6sddl1"; + iosevka-ss03 = "0rg6hb0xjzmf8s410x7v5m1pv246p1xfxfggw4lhs19h6f7jcy0v"; + iosevka-ss04 = "1690xgfyk6gqxwx70dsvq5ba7vf5906pf1qrrd916fkg2a28fxxp"; + iosevka-ss05 = "1zbiq0hczg2dhld82nyw7x6rkh6y812cvawqqpjmhzxjhd2wn6hv"; + iosevka-ss06 = "0290w7812pqlix1zmpanksbinzkzv6gw0y5k5dvaf4jrg5c3163m"; + iosevka-ss07 = "0z7irkdcwwxpj52a6j1b4s1xz9nlib6jm66fxva7pqd9dhsjp1ph"; + iosevka-ss08 = "1jd12mjcnjs6md3lj182ph9zlb66cmmm2cz49fwdxpx54laawn3i"; + iosevka-ss09 = "0zggxrk2a315rzz684c06pk0vmp9cw5bcn9zkh61hcn0mii10xdv"; + iosevka-ss10 = "14mshgnpq5sn4z81a8cwsq6hjarlrmwfqyhkyzcmqymi6gyljs6k"; + iosevka-ss11 = "14p8fbvd4b4vddnmydyn0v5iffkq1s15pdxpmmwl2aplxnrgshiy"; + iosevka-ss12 = "1r2p1f0mdkx7sqkv29gdpq78c905gcc7kfbr8l907awhv80fzsgg"; + iosevka-ss13 = "0ara2w4zav48rk019hnhr3fq8kqzzvlgshq18cq5gralbcgjw883"; + iosevka-ss14 = "1yqmm13bafrz7siq7q95921ipn3p6ms3dmsxn5zbcmm3pdxxyq1c"; + iosevka-ss15 = "1y84vzqpwa060q3qrxc77kk3hnrgyjqwwxq4s9fq8hww9d01jb5d"; + iosevka-ss16 = "0cszx4s3bi9j5l46sh33dkn9cqn9s7v6rk23d4srlfg19bfs19ga"; + iosevka-ss17 = "0ld6pr8rx1ldszgdd2ixmfj341ry9ajfcpk6k1f9jmfilp4cjnzr"; + iosevka-ss18 = "19787429v0am3qsjyxlgqwbkn50s54w26481h46ybn7nrskgxl7a"; + sgr-iosevka = "1i5zg7wwyczf2ljxjvwk4n75j1nvn6wavc3w1zycfcgim458x8s6"; + sgr-iosevka-aile = "0m0imj778l6zb4y5kb882z4f6abw6q1ww0d8fn4vyqk2csm3kx9v"; + sgr-iosevka-curly = "071jpj9cj56hszqjy5cmj40gq6n47fp117ckypi0npk6cvrvrl7a"; + sgr-iosevka-curly-slab = "1f33iy0nrkm76alyzs7bjdfvc7c4j7cqrzrk769y40wx68l5sbji"; + sgr-iosevka-etoile = "19rgrrk4p9k94s887vv2kqb7zj1wjh5kjncalzbisjpv8ns6l3qq"; + sgr-iosevka-fixed = "03ccy1f8hswslr7n9dhj9l3zvfkahqi742giim34f360f5chpmdi"; + sgr-iosevka-fixed-curly = "14czka86s0yj1h0mq4ajn5yx1lnb9l3hp9yw8h558dy8hf6xk9pi"; + sgr-iosevka-fixed-curly-slab = "1i0hjw0121l83znyfq3zl0z1pl4p57yf2qqrp35qqp0vpsxnjlcy"; + sgr-iosevka-fixed-slab = "1cz1lj2qa8yiwbxpk3c6hdkgg44q9019yai3iz0c17gw8vwj6xxh"; + sgr-iosevka-fixed-ss01 = "1966jyi9j01s094kz1k67ds4k4z1sfahwfxsasi59bc4r5srq3p7"; + sgr-iosevka-fixed-ss02 = "1l08id1p2z2m8vrprlrg0rphspbz17lnc1l483wadffbfrlqrhpr"; + sgr-iosevka-fixed-ss03 = "0g98s0w2lvskq9fyh47b8rx7rha24k4vzza9svl25kx55ixznzjm"; + sgr-iosevka-fixed-ss04 = "0wjq34b6xv17ma75lysmwfqxyp57zr0h9hrxyl9c6sgdmlvf7jqx"; + sgr-iosevka-fixed-ss05 = "080i32z64y9dm19fagc5jh3gkynbim0w03i42bc19im07ryyq79h"; + sgr-iosevka-fixed-ss06 = "17ggkvz3y17zqkn1m864vgqbc5zvn63gsh39n4w1p9wi9v360984"; + sgr-iosevka-fixed-ss07 = "1nazbkhr46larr0hgxwx2h5zvi9yr3qlg2npnmpprwqrhvlvlpah"; + sgr-iosevka-fixed-ss08 = "08i420lx329py3slc99r73hysdnjbc12nm15fs17f505c2zj7war"; + sgr-iosevka-fixed-ss09 = "0zc9wmxjrpzss7cdczg6af6sckdr22k0q9gj90hggyyjlc08cvz0"; + sgr-iosevka-fixed-ss10 = "15qzf9zir1rqfpfspkgy9azf6m73lgpl79xhidf47hkvcw9zxjr7"; + sgr-iosevka-fixed-ss11 = "1z6kji0h5vb3my47h2ccdl2vafh58pyqwp83yy3xgsvsj2qd0835"; + sgr-iosevka-fixed-ss12 = "0wyk8kyllm35wlsqkxgh3sxvn3f52w7kicq64hdax8k8piaj584x"; + sgr-iosevka-fixed-ss13 = "052jrfqwi4qbs9k9mqmdk2s82qb8q6175ajy3f6186grnzd73nnq"; + sgr-iosevka-fixed-ss14 = "0wba9g5q8h5n5c50rncbbkbkc06xs9zxydxz1b0a6dl37drgmvkf"; + sgr-iosevka-fixed-ss15 = "1kds5pl4vxcniksfp4mslpfr0ba30m754w7vxvzvqamgazmyf0pp"; + sgr-iosevka-fixed-ss16 = "12hb9laxbhkbgf2rnbzq7zwwl7bg3n3n2yyjlr3vlsik5kd7aznz"; + sgr-iosevka-fixed-ss17 = "18rvf78xif6p06nzha9nvp725f6mr79f1rk0a6n7ifh1ygdy4lvx"; + sgr-iosevka-fixed-ss18 = "019gzj9s3wh3i9bxalazx9x8nfljf191idh6ygxpqjz4z3yzxh9n"; + sgr-iosevka-slab = "0l9bcvrfbxp0pi3hj3zlirq800h63dyqf8dy307r7xg8m3l48xgr"; + sgr-iosevka-ss01 = "1rb49rx12vgdjvkbyyg63pmxbwqd4v5cfvn5q3k2q4w5m3yhsbm9"; + sgr-iosevka-ss02 = "07xz0iayqk2hqalmrj8c7kp8b80d6qgazrxwvs22y8nymignzq2s"; + sgr-iosevka-ss03 = "0skq1kqmkwhs9d1p0lpksxqdgvpjz2krlfqa7idq1sdykpwsvmhi"; + sgr-iosevka-ss04 = "0cgjh4c3vmmcgb43g0l2dmwcwnwwwqkrr80b9rsbrx43v6lkavda"; + sgr-iosevka-ss05 = "16y8rm0byaf2xqh31h4vfan6il2m98a225nv3vsb7f42ga185vw0"; + sgr-iosevka-ss06 = "0v9nd1h0gzgwa5sw9lrxvd5g77y9wn3fqsw86ivpsqn1vmgpqrzq"; + sgr-iosevka-ss07 = "1h49qx02kn683ax3vh090r7fwlq7ya802zywcws2b9h2hs6p799x"; + sgr-iosevka-ss08 = "1zk08x7chnj1ach4ghh26kr9kndzlgzzsrrw9aa3f0s7qk1lx2yg"; + sgr-iosevka-ss09 = "12mrzd7viia71r9ixw1bzsqfaycxpl8zf20qv83ndbjsgzxh9ary"; + sgr-iosevka-ss10 = "1cq8ii94jdskd0p5g2iigprbzzs3qnjxj7m2rkhl8mricwxdxxs4"; + sgr-iosevka-ss11 = "1wmzaqcy0xy831010fsdhlm3aly2j01j7z10ka83ga3h8ymg1wla"; + sgr-iosevka-ss12 = "00xfyvf50ykippnr1cfxy17s0k0gqkgx61vf7x9dmsgl2y6qigpl"; + sgr-iosevka-ss13 = "0ynmx67c96qslzggjign8g3q7k11ny0mdrdwa7zwi2p0mm61n2jd"; + sgr-iosevka-ss14 = "19s3a6csc4wq4cjjc2qll8fv00hmzsp5z7hwaq09wls8swz5kmmq"; + sgr-iosevka-ss15 = "0d8ljkjcf0y263lwpnlh07305k6xlznk9gysk63dhcyxv0ajhrq1"; + sgr-iosevka-ss16 = "12jbanrv31zxkh5a3a4w2wv0gqvj03mcs7v0zpnylp8jgfmpf8qa"; + sgr-iosevka-ss17 = "1p088x66grn9bs4k1y6mxb0ka4y4vm74v6nbm74qsarjbyc0kx0a"; + sgr-iosevka-ss18 = "0ff8lnhhgknj2sq40fkx7pqmiklnjl9ryjrnjcjviwzvs2dgzbmh"; + sgr-iosevka-term = "0ny2p3hmzwbmzwxr8k1hbv0r3fqwngnz6kind1p3yddrqz8l5rrz"; + sgr-iosevka-term-curly = "0qdys5q9fw273q58yvs71kqhal2mrh1400kf33mjp80pm1dy0j5j"; + sgr-iosevka-term-curly-slab = "1bfn60arcb78lllf1lpdi2gscazvy3k9irp3ik0x12qdf9jgzgw0"; + sgr-iosevka-term-slab = "1grdywa132zl3m5vf7w47lq7wgk6p5n8nab6rgg7pim839f1cn9q"; + sgr-iosevka-term-ss01 = "14an4f8gm741zz22g854zxbfys2z33sf20kjrlzdp239376k72b7"; + sgr-iosevka-term-ss02 = "0lqzcn4ykvkvylnlp4c1cfcl72hy3i18q15zng79d8v439w7cbds"; + sgr-iosevka-term-ss03 = "0kmfmdv5rvfgm8p85dcqb28fsmkwsrgpjkjh1n787nvd2vs96l23"; + sgr-iosevka-term-ss04 = "0p6hspr95p8hxas05rgp2dq00425i7nnz3nbyfrv4mnjzj66ir60"; + sgr-iosevka-term-ss05 = "0izgz7rgjivzzvqywj3d2gma2sh83nhvc4scb7x3cbwwkzg9m5jx"; + sgr-iosevka-term-ss06 = "0syp2mqnqq2gs4zsa3vvx0yz7pa23s995jc8sjrh01la6kpdk332"; + sgr-iosevka-term-ss07 = "0dzfrw30aych0a0ic643w11ww42rncgyzvm5fkgqnkj1zjsdpgsw"; + sgr-iosevka-term-ss08 = "0d9b2rwcdpwbdlsyjcd3qd0pip9km4hg9ihjymsi3xj7bihd0wp5"; + sgr-iosevka-term-ss09 = "06bbj7c99wpjfh7ib7990nayxvbwy69ijlrjbi2mj45pm5i5lswq"; + sgr-iosevka-term-ss10 = "1i6cfzgbnga999851k7gg6b5awq1i9253fz8sngsb6b34c45zw5c"; + sgr-iosevka-term-ss11 = "1jb4lg0cjwv8xvhc5j9qp921zawgp2say6dnj6zncv0ys0rs6qwm"; + sgr-iosevka-term-ss12 = "01w3vj7pw0714r6xp4rq5rlirch9h2d22mk76hsnqb0igzhlkvhy"; + sgr-iosevka-term-ss13 = "0ywjr4j31v31z1cvvz7jvn7mcj2zhdpgljmvsfvix1j26cy5lr95"; + sgr-iosevka-term-ss14 = "1cxsxriayzvrxzr3i6k6dwq08ywl9dk78iz4jqgy5jvrh942km0w"; + sgr-iosevka-term-ss15 = "0j6rvsww2783hrdca3hfvv02s2whswwld7icf0bijdb3p799qi6w"; + sgr-iosevka-term-ss16 = "0hgi40g030s1ylnp1whxz47wg2lzzqwhblx894dzz7rpnwbgff38"; + sgr-iosevka-term-ss17 = "0hbdhc3z75n814r2xffnw6lnkwc31p0fmrvsan3z0db35c5kz54i"; + sgr-iosevka-term-ss18 = "18c3i4l4j9wi7rx191hzmhlc8zblyqpx7bhq9g2lxs9asp8svqsa"; } diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/data/fonts/iwona/default.nix index 0d3944b2da1..df5569f5379 100644 --- a/pkgs/data/fonts/iwona/default.nix +++ b/pkgs/data/fonts/iwona/default.nix @@ -1,10 +1,9 @@ { lib, stdenvNoCC, texlive }: -stdenvNoCC.mkDerivation { - pname = "iwona"; - version = "0.995b"; +stdenvNoCC.mkDerivation rec { + inherit (src) pname version; - src = lib.head (builtins.filter (p: p.tlType == "run") texlive.iwona.pkgs); + src = texlive.pkgs.iwona; installPhase = '' runHook preInstall @@ -20,7 +19,7 @@ stdenvNoCC.mkDerivation { # "[...] GUST Font License (GFL), which is a free license, legally # equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or # later." - GUST website - license = licenses.lppl13c; + license = src.meta.license; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; }; diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 4e42cf1c417..88ef4e588c7 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -1,22 +1,24 @@ -{ lib, stdenvNoCC, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchzip }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation rec { pname = "junicode"; - version = "1.003"; + version = "2.200"; - src = fetchFromGitHub { - owner = "psb1558"; - repo = "Junicode-font"; - rev = "55d816d91a5e19795d9b66edec478379ee2b9ddb"; - hash = "sha256-eTiMgI8prnpR4H6sqKRaB3Gcnt4C5QWZalRajWW49G4="; + src = fetchzip { + url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip"; + hash = "sha256-2K+zPq6Bjg+hZQhQrWWm1bxHVfwwRdsV7EseRGBnpUw="; }; + outputs = [ "out" "doc" ]; + installPhase = '' runHook preInstall - local out_ttf=$out/share/fonts/junicode-ttf - mkdir -p $out_ttf - cp legacy/*.ttf $out_ttf + install -Dm 444 -t $out/share/fonts/truetype TTF/*.ttf VAR/*.ttf + install -Dm 444 -t $out/share/fonts/opentype OTF/*.otf + install -Dm 444 -t $out/share/fonts/woff2 WOFF2/*.woff2 + + install -Dm 444 -t $doc/share/doc/${pname}-${version} docs/*.pdf runHook postInstall ''; diff --git a/pkgs/data/fonts/last-resort/default.nix b/pkgs/data/fonts/last-resort/default.nix index 1932fd6da8a..4ca06736052 100644 --- a/pkgs/data/fonts/last-resort/default.nix +++ b/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/pkgs/data/fonts/lxgw-neoxihei/default.nix b/pkgs/data/fonts/lxgw-neoxihei/default.nix index 5bc4b86c8ad..2fc6731b850 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.105"; + version = "1.106"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-rufBz5u6dV91oD211JuCUP2Km3RoFwkZ1OhRxyoGxpQ="; + hash = "sha256-AXEOoU9gvml1bqjPTYV+mmhVGLG4R6mH8e/h3wQgySo="; }; dontUnpack = true; diff --git a/pkgs/data/fonts/lxgw-wenkai/default.nix b/pkgs/data/fonts/lxgw-wenkai/default.nix index 65045dc6d28..cd15891f2f4 100644 --- a/pkgs/data/fonts/lxgw-wenkai/default.nix +++ b/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/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 25923f3cfc7..1a6537a0096 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "material-design-icons"; - version = "7.2.96"; + version = "7.3.67"; src = fetchFromGitHub { owner = "Templarian"; repo = "MaterialDesign-Webfont"; rev = "v${version}"; - sha256 = "sha256-4r/l7QkD04OR74FZBH0l81hDY5TexEIIJnECYFKsGxM="; + sha256 = "sha256-gQT+5MqYo1qUiLJTzlhF5dB5BZMtr34JWn9rMa9MJvQ="; sparseCheckout = [ "fonts" ]; }; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 79288cb5f4c..fee51ebacf4 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -35,13 +35,13 @@ rec { }: stdenvNoCC.mkDerivation rec { inherit pname; - version = "23.8.1"; + version = "23.11.1"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; rev = "noto-monthly-release-${version}"; - hash = "sha256-TYCJzioZcNFV8N5wLr7Fo69g/p5GQF/tbGgYoLUV7Us="; + hash = "sha256-qBHLCOfVBOn9CV194S4cYw9nhHyAe2AUBJHQMvyEfW8="; }; _variants = map (variant: builtins.replaceStrings [ " " ] [ "" ] variant) variants; @@ -160,8 +160,8 @@ rec { noto-fonts-cjk-serif = mkNotoCJK { typeface = "Serif"; - version = "2.001"; - sha256 = "sha256-y1103SS0qkZMhEL5+7kQZ+OBs5tRaqkqOcs4796Fzhg="; + version = "2.002"; + sha256 = "sha256-GLjpTAiHfygj1J4AdUVDJh8kykkFOglq+h4kyat5W9s="; }; noto-fonts-color-emoji = @@ -253,9 +253,11 @@ rec { metadata.files; installPhase = '' + runHook preInstall for src in $srcs; do install -D $src $out/share/fonts/noto/$(stripHash $src) done + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json b/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json index 2f22a24a34c..e9ad1c327f4 100644 --- a/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json +++ b/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json @@ -1,7 +1,7 @@ { - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf": "sha256-9ndQqJJzsCkR6KcYRNVW3wXWMxcH+0QzFgQQdCG8vSo=", - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf": "sha256-AXGLdWebddyJhTKMW/D/6tW8ODcaXrUM96m2hN9wYlg=", - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf": "sha256-wzF9kKNMeQTYZ2QUT5pIgauhl2qMpZ2nMLNTeAJuqtQ=", - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf": "sha256-NIelE8X+lKtH6yT3eFPZV7zYUR3Y5GnNobAbf7AckR0=", - "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf": "sha256-zkJuJ8YlTrUV+28wHIqny3yQvjvZqEPG4WXYmaLcY8A=" + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf": "sha256-B8XBpYycOYBjrhjlnyiz42YukIoOjGTd3NN3EY00NiQ=", + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf": "sha256-Zfwh9q2GrL5Dwp+J/8Ddd2IXCaUXpQ7dE3CqgCMMyPs=", + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf": "sha256-/O5b2DzM8g97NAdJgIC/RsQ7E5P7USKq7TXyDuUE3WQ=", + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf": "sha256-vrjB8GlhzWAe6jG/Srpy8R431VivNtWbCa5Uh4ATnmU=", + "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf": "sha256-EbnZt8h4Lcl0yJoOKmXlF1nfcP5hZv7n4cEQ10yBkcg=" } diff --git a/pkgs/data/fonts/noto-fonts/noto-emoji.json b/pkgs/data/fonts/noto-fonts/noto-emoji.json index 66b0292906b..c729634b9e1 100644 --- a/pkgs/data/fonts/noto-fonts/noto-emoji.json +++ b/pkgs/data/fonts/noto-fonts/noto-emoji.json @@ -13,18 +13,18 @@ "subsets": [ "emoji" ], - "version": "v46", - "lastModified": "2023-09-07", + "version": "v47", + "lastModified": "2023-09-27", "files": { - "300": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf", - "regular": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf", - "500": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf", - "600": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf", - "700": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf" + "300": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob_10jwvS-FGJCMY.ttf", + "regular": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0jwvS-FGJCMY.ttf", + "500": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-Z0jwvS-FGJCMY.ttf", + "600": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob911TwvS-FGJCMY.ttf", + "700": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob9M1TwvS-FGJCMY.ttf" }, "category": "sans-serif", "kind": "webfonts#webfont", - "menu": "http://fonts.gstatic.com/s/notoemoji/v46/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0gwuQeU.ttf" + "menu": "http://fonts.gstatic.com/s/notoemoji/v47/bMrnmSyK7YY-MEu6aWjPDs-ar6uWaGWuob-r0gwuQeU.ttf" } ] } diff --git a/pkgs/data/fonts/open-fonts/default.nix b/pkgs/data/fonts/open-fonts/default.nix index 6a628174f2e..3f768209794 100644 --- a/pkgs/data/fonts/open-fonts/default.nix +++ b/pkgs/data/fonts/open-fonts/default.nix @@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/kiwi0fruit/open-fonts"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/fonts/pretendard/default.nix b/pkgs/data/fonts/pretendard/default.nix index 8c4cbd10373..9f62ad8dd4e 100644 --- a/pkgs/data/fonts/pretendard/default.nix +++ b/pkgs/data/fonts/pretendard/default.nix @@ -1,7 +1,7 @@ { lib, stdenvNoCC, fetchzip }: let - version = "1.3.8"; + version = "1.3.9"; mkPretendard = { pname, typeface, hash }: stdenvNoCC.mkDerivation { @@ -35,24 +35,24 @@ in pretendard = mkPretendard { pname = "pretendard"; typeface = "Pretendard"; - hash = "sha256-Re4Td9uA8Qn/xv39Bo9i3gShYWQ1mRX44Vyx7/i4xwI="; + hash = "sha256-n7RQApffpL/8ojHcZbdxyanl9Tlc8HP8kxLFBdArUfY="; }; pretendard-gov = mkPretendard { pname = "pretendard-gov"; typeface = "PretendardGOV"; - hash = "sha256-GQv/Ia91QgXZwFX+WdE7aRFUJFWhCMLFY86gu4Ii2w8="; + hash = "sha256-qoDUBOmrk6WPKQgnapThfKC01xWup+HN82hcoIjEe0M="; }; pretendard-jp = mkPretendard { pname = "pretendard-jp"; typeface = "PretendardJP"; - hash = "sha256-7OLInF1XUQxyHyb9a0zyfCLZrdcxMTM2QeBe3lwLJ0A="; + hash = "sha256-1nTk1LPoRSfSDgDuGWkcs6RRIY4ZOqDBPMsxezMos6Q="; }; pretendard-std = mkPretendard { pname = "pretendard-std"; typeface = "PretendardStd"; - hash = "sha256-DCR6KUAblVjhapqMn2p0nzndEJm4OCawGV3nAWZvSBs="; + hash = "sha256-gkYqqxSICmSIrBuPRzBaOlGGM/rJU1z7FiFvu9RhK5s="; }; } diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 8d56554939f..14dc6514e81 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.41.10"; + version = "0.42.2"; 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-RkPHlOPXQiAswtekrOCmYcPNlNSvcqyaM4juSHJxEeY="; }; sourceRoot = "."; diff --git a/pkgs/data/fonts/scientifica/default.nix b/pkgs/data/fonts/scientifica/default.nix index 1f946ecb17a..1b57c9f286d 100644 --- a/pkgs/data/fonts/scientifica/default.nix +++ b/pkgs/data/fonts/scientifica/default.nix @@ -26,6 +26,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/NerdyPepper/scientifica"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/fonts/sil-abyssinica/default.nix b/pkgs/data/fonts/sil-abyssinica/default.nix index f01c50b4260..d0571fae0bf 100644 --- a/pkgs/data/fonts/sil-abyssinica/default.nix +++ b/pkgs/data/fonts/sil-abyssinica/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "sil-abyssinica"; - version = "2.200"; + version = "2.201"; src = fetchzip { url = "https://software.sil.org/downloads/r/abyssinica/AbyssinicaSIL-${version}.zip"; - hash = "sha256-IdWMZHm9VoLVDO0//ISujxlXUxe0O6+aEcdP63YRmPg="; + hash = "sha256-DJWp3T9uBLnztSq9r5YCSWaBjIK/0Aljg1IiU0FLrdE="; }; installPhase = '' diff --git a/pkgs/data/fonts/sketchybar-app-font/default.nix b/pkgs/data/fonts/sketchybar-app-font/default.nix index 58ae313542d..8364c84f1ff 100644 --- a/pkgs/data/fonts/sketchybar-app-font/default.nix +++ b/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.20"; src = fetchurl { url = "https://github.com/kvndrsslr/sketchybar-app-font/releases/download/v${finalAttrs.version}/sketchybar-app-font.ttf"; - hash = "sha256-GPxNMlG6a7newSXorh2RULZ5XHYFmQbcB46C0RytTTU="; + hash = "sha256-pf3SSxzlNIdbXXHfRauFCnrVUMOd5J9sSUE9MsfWrwo="; }; dontUnpack = true; diff --git a/pkgs/data/fonts/source-han/default.nix b/pkgs/data/fonts/source-han/default.nix index 0174324b016..573cfd6c5b9 100644 --- a/pkgs/data/fonts/source-han/default.nix +++ b/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/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 961f846a6c3..68b8eae40e2 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "sudo-font"; - version = "0.74"; + version = "0.77"; src = fetchzip { url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - hash = "sha256-WPoqWhCKk2gZ/cdIjvmiNZ95xZ9sqnGzZuw4OEHxtrI="; + hash = "sha256-xnIDCuCUP8ErUsWTJedWpy4lo77Ji+FO2vO9BRDAmV0="; }; installPhase = '' diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index fc39e2c8ec5..7f2e9a1b158 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "15.1.01"; + version = "15.1.04"; otf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.otf"; - hash = "sha256-JJi4D5Zk/vkeaYjX4IIUaiCCp+e7Si3rL7+aNlqilww="; + hash = "sha256-J8g8ojXDq5nV013zXXi1rEAYQhpCh7G06mV7IpmZbTg="; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - hash = "sha256-8ggUx6X1kwwd2qGl/XcqxkN35kaJbQYxoCMGIV0N6zU="; + hash = "sha256-XHKP8xx+GvhFYBW03Sambpd2gclKvQUz1JAjIlb59OI="; }; nativeBuildInputs = [ libfaketime xorg.fonttosfnt xorg.mkfontscale ]; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 267dc7d8977..e7820a85842 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "unifont_upper"; - version = "15.1.01"; + version = "15.1.04"; src = fetchurl { url = "mirror://gnu/unifont/unifont-${version}/${pname}-${version}.otf"; - hash = "sha256-+aSVF8taBuAmkrQDvCH5bqdnEo21LwidMSYaiWjTrOg="; + hash = "sha256-SUsG2xhrn47zrGpNzRn1g76qyt2vQyH/UBmYtzCD0UA="; }; dontUnpack = true; diff --git a/pkgs/data/fonts/vazir-fonts/default.nix b/pkgs/data/fonts/vazir-fonts/default.nix index d65b270c881..d65b270c881 100755..100644 --- a/pkgs/data/fonts/vazir-fonts/default.nix +++ b/pkgs/data/fonts/vazir-fonts/default.nix diff --git a/pkgs/data/fonts/whatsapp-emoji/default.nix b/pkgs/data/fonts/whatsapp-emoji/default.nix deleted file mode 100644 index 5e34282891b..00000000000 --- a/pkgs/data/fonts/whatsapp-emoji/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenvNoCC -, lib -, fetchFromGitHub -, imagemagick -, nix-update-script -, pngquant -, python3Packages -, which -, zopfli -}: - -stdenvNoCC.mkDerivation rec { - pname = "whatsapp-emoji-linux"; - version = "2.23.2.72-1"; - - src = fetchFromGitHub { - rev = "refs/tags/${version}"; - owner = "dmlls"; - repo = "whatsapp-emoji-linux"; - hash = "sha256-dwX+y8jCpR+SyiH13Os9VeXLDwmAYB7ARW2lAMl/7RE="; - }; - - 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/hackneyed/default.nix b/pkgs/data/icons/hackneyed/default.nix index 74aedaa3786..e26a32b159e 100644 --- a/pkgs/data/icons/hackneyed/default.nix +++ b/pkgs/data/icons/hackneyed/default.nix @@ -1,29 +1,41 @@ -{ lib, fetchzip, stdenvNoCC, fetchFromGitLab, xcursorgen, imagemagick6, inkscape }: +{ lib, stdenvNoCC, fetchFromGitLab, imagemagick, inkscape, xcursorgen }: stdenvNoCC.mkDerivation rec { pname = "hackneyed"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitLab { owner = "Enthymeme"; repo = "hackneyed-x11-cursors"; rev = version; - sha256 = "sha256-Wtrw/EzxCj4cAyfdBp0OJE4+c6FouW7+b6nFTLxdXNY="; + hash = "sha256-+7QtHgBuhJtQejiHeZ+QoedJo24LqSY51XRVLv9Ho2g="; }; - buildInputs = [ imagemagick6 inkscape xcursorgen ]; + nativeBuildInputs = [ imagemagick inkscape xcursorgen ]; postPatch = '' patchShebangs *.sh - substituteInPlace make-png.sh \ - --replace /usr/bin/inkscape ${inkscape}/bin/inkscape ''; enableParallelBuilding = true; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "INKSCAPE=inkscape" + "INSTALL=install" + "PREFIX=$(out)" + "VERBOSE=1" + "XCURSORGEN=xcursorgen" + ]; + buildFlags = [ "theme" "theme.left" ]; + # The Makefile declares a dependency on the value of $(INKSCAPE) for some reason; + # it's unnecessary for building though. + prePatch = '' + substituteInPlace GNUmakefile \ + --replace 'inkscape-version: $(INKSCAPE)' 'inkscape-version:' + ''; + meta = with lib; { homepage = "https://gitlab.com/Enthymeme/hackneyed-x11-cursors"; description = "A scalable cursor theme that resembles Windows 3.x/NT 3.x cursors"; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 1b6be1d9bb4..a5e65ed3443 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.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/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 395fd1ed31f..0868f1c159b 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.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/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index be53cafa434..1de1411cb75 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -41,6 +41,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.gpl3Only; # darwin gives hash mismatch in source, probably because of file names differing only in case platforms = platforms.linux; - maintainers = with maintainers; [ romildo fortuneteller2k ]; + maintainers = with maintainers; [ romildo moni ]; }; } diff --git a/pkgs/data/icons/phinger-cursors/default.nix b/pkgs/data/icons/phinger-cursors/default.nix index 5afd2fe228f..82742723806 100644 --- a/pkgs/data/icons/phinger-cursors/default.nix +++ b/pkgs/data/icons/phinger-cursors/default.nix @@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/phisch/phinger-cursors"; platforms = platforms.unix; license = licenses.cc-by-sa-40; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; }; } diff --git a/pkgs/data/icons/reversal-icon-theme/default.nix b/pkgs/data/icons/reversal-icon-theme/default.nix new file mode 100644 index 00000000000..b636bba4a30 --- /dev/null +++ b/pkgs/data/icons/reversal-icon-theme/default.nix @@ -0,0 +1,77 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, jdupes +, adwaita-icon-theme +, hicolor-icon-theme +, numix-icon-theme-circle +, gitUpdater +, allColorVariants ? false +, colorVariants ? [] +}: + +let + pname = "reversal-icon-theme"; +in +lib.checkListOfEnum "${pname}: color variants" [ "-blue" "-red" "-pink" "-purple" "-green" "-orange" "-brown" "-grey" "-black" "-cyan" ] colorVariants + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "unstable-2023-05-13"; + + src = fetchFromGitHub { + owner = "yeyushengfan258"; + repo = pname; + rev = "bdae2ea365731b25a869fc2c8c6a1fb849eaf5b2"; + hash = "sha256-Cd+1ggyS+Y2Sk8w5zifc4IFOwbFrbjL6S6awES/W0EE="; + }; + + nativeBuildInputs = [ + gtk3 + jdupes + ]; + + propagatedBuildInputs = [ + adwaita-icon-theme + hicolor-icon-theme + numix-icon-theme-circle + ]; + + dontDropIconThemeCache = true; + + # These fixup steps are slow and unnecessary for this package. + # Package may install many small files. + dontPatchELF = true; + dontRewriteSymlinks = true; + + postPatch = '' + patchShebangs install.sh + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/icons + + name= ./install.sh \ + ${if allColorVariants then "-a" else builtins.toString colorVariants} \ + -d $out/share/icons + + rm $out/share/icons/*/{AUTHORS,COPYING} + + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "A colorful Design Rectangle icon theme"; + homepage = "https://github.com/yeyushengfan258/Reversal-icon-theme"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/data/icons/tau-hydrogen/default.nix b/pkgs/data/icons/tau-hydrogen/default.nix index 3f7aa63526d..17a6d31b8a5 100644 --- a/pkgs/data/icons/tau-hydrogen/default.nix +++ b/pkgs/data/icons/tau-hydrogen/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tau-hydrogen"; - version = "1.0.11"; + version = "1.0.14"; src = fetchFromGitHub { owner = "tau-OS"; repo = "tau-hydrogen"; rev = finalAttrs.version; - hash = "sha256-ECrRWWS/Am0lfCIJw/BVZg53oLw79Im8d8KgAYxE+pw="; + hash = "sha256-8awcowBm0hwoYYm/wtKeqCWRhgXh2rI3UvAlL1tbj6c="; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/tela-circle-icon-theme/default.nix b/pkgs/data/icons/tela-circle-icon-theme/default.nix index 6e32d09dac6..9b1043467f1 100644 --- a/pkgs/data/icons/tela-circle-icon-theme/default.nix +++ b/pkgs/data/icons/tela-circle-icon-theme/default.nix @@ -2,7 +2,7 @@ , stdenvNoCC , fetchFromGitHub , adwaita-icon-theme -, libsForQt5 +, breeze-icons , gtk3 , hicolor-icon-theme , jdupes @@ -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="; + hash = "sha256-il+bYIcwm0BQF6U0J6h6rlzHSGSHYN/O8BezehYIpQ4="; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec { propagatedBuildInputs = [ adwaita-icon-theme - libsForQt5.breeze-icons + breeze-icons hicolor-icon-theme ]; diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix index 22b66b1c65d..6e391aa19ef 100644 --- a/pkgs/data/icons/vanilla-dmz/default.nix +++ b/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/pkgs/data/misc/clash-geoip/default.nix b/pkgs/data/misc/clash-geoip/default.nix index 3488bfc0a5f..c7ca80ccb00 100644 --- a/pkgs/data/misc/clash-geoip/default.nix +++ b/pkgs/data/misc/clash-geoip/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clash-geoip"; - version = "20230812"; + version = "20231112"; src = fetchurl { url = "https://github.com/Dreamacro/maxmind-geoip/releases/download/${version}/Country.mmdb"; - sha256 = "sha256-yO8zSQjNYGxaSXcOhFOIE4HsiMnCm3ZVYfVZg5xO96s="; + sha256 = "sha256-CTygf2/CbxNO/9e8OfxeGZFaSrKXdlQdvUgywZX1U9o="; }; dontUnpack = true; diff --git a/pkgs/data/misc/dbip-country-lite/default.nix b/pkgs/data/misc/dbip-country-lite/default.nix index e620280edbb..eefd161632d 100644 --- a/pkgs/data/misc/dbip-country-lite/default.nix +++ b/pkgs/data/misc/dbip-country-lite/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbip-country-lite"; - version = "2023-09"; + version = "2023-11"; src = fetchurl { url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz"; - hash = "sha256-3Mapa4qxUEMGUeqzoyzhatL43l1PPmw+Aye4bX92CAA="; + hash = "sha256-Nyje7hf5UdCMHbqZoLpHclDDa4pz+BAyqJcsmPBfSG8="; }; dontUnpack = true; diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 52e6c59285a..7574c16cba7 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol-db"; - version = "20230911"; + version = "20231004"; src = fetchFromGitHub { owner = "ddccontrol"; repo = pname; rev = version; - sha256 = "sha256-3lGzQ95ZS9yr9dX+wCTmX6Q+IsbMCfBa4zhcyxsG4+w="; + sha256 = "sha256-C/FqLczkQ9thoAdBI2aDDKgp5ByTWVOJ9bcD9ICqyFM="; }; nativeBuildInputs = [ autoreconfHook intltool ]; diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index 7ccfd59396b..cbfd42dfc87 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/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": "49d09494dd24eae895fe1260e2c26157f740e451", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/49d09494dd24eae895fe1260e2c26157f740e451.tar.gz", + "sha256": "1f0m4wni61v6679ya0mb9mw3vxhak9yvjxjm6wfs7wryayb4i5ba", + "msg": "Update from Hackage at 2023-10-21T19:49:07Z" } diff --git a/pkgs/data/misc/papirus-folders/default.nix b/pkgs/data/misc/papirus-folders/default.nix index 24fbeb0b0e2..a44a382c4b4 100644 --- a/pkgs/data/misc/papirus-folders/default.nix +++ b/pkgs/data/misc/papirus-folders/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-folders"; - version = "1.12.1"; + version = "1.13.1"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-folders"; rev = "v${version}"; - sha256 = "sha256-Dus9f2m5Wj46Url7N3UYEvBAankppzGzdJHGPH3CT3g="; + sha256 = "sha256-BY1hnAGz31Deffy/EGKy/nuPKmpAA0u8FzPYgr1Plfs="; }; buildInputs = [ diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 197793db6c6..8de13f2eaf3 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "shared-mime-info"; - version = "2.2"; + version = "2.3"; outputs = [ "out" "dev" ]; @@ -23,9 +23,15 @@ stdenv.mkDerivation rec { owner = "xdg"; repo = pname; rev = version; - sha256 = "sha256-QrRe/DcjpTMejHXDSOLbjpJywod8qIjP6/leTZ21rhE="; + sha256 = "sha256-cEfknRVtOJykEO9Iqlb0UoiayYtu+ugvmmZqAD5cGnE="; }; + patches = [ + # Submitted upstream at + # https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/211 + ./fix-clang-warnings.patch + ]; + nativeBuildInputs = [ meson ninja diff --git a/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch b/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch new file mode 100644 index 00000000000..2d185549c4e --- /dev/null +++ b/pkgs/data/misc/shared-mime-info/fix-clang-warnings.patch @@ -0,0 +1,31 @@ +diff --git a/meson.build b/meson.build +index 1780c44..7998a51 100644 +--- a/meson.build ++++ b/meson.build +@@ -49,12 +49,7 @@ endif + ############################################################################### + # Dependencies + +-check_functions = [ +- 'fdatasync', +-] +-foreach function : check_functions +- config.set('HAVE_'+function.to_upper(), cc.has_function(function)) +-endforeach ++config.set('HAVE_FDATASYNC', cc.has_function('fdatasync', prefix: '#include <unistd.h>')) + + + if get_option('build-translations') +diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp +index 733ba06..4ca6d06 100644 +--- a/src/update-mime-database.cpp ++++ b/src/update-mime-database.cpp +@@ -2158,7 +2158,7 @@ static void check_in_path_xdg_data(const char *mime_path) + + env = getenv("XDG_DATA_DIRS"); + if (!env) +- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/"; ++ env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/"; + dirs = g_strsplit(env, PATH_SEPARATOR, 0); + g_return_if_fail(dirs != NULL); + for (n = 0; dirs[n]; n++) diff --git a/pkgs/data/misc/sing-geosite/default.nix b/pkgs/data/misc/sing-geosite/default.nix index 55ba01c6155..900e5ef86c8 100644 --- a/pkgs/data/misc/sing-geosite/default.nix +++ b/pkgs/data/misc/sing-geosite/default.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo120Module , fetchFromGitHub , substituteAll , v2ray-domain-list-community @@ -11,7 +11,7 @@ let geosite_data = "${v2ray-domain-list-community}/share/v2ray/geosite.dat"; }; in -buildGoModule rec { +buildGo120Module { pname = "sing-geosite"; inherit (v2ray-domain-list-community) version; diff --git a/pkgs/data/misc/spdx-license-list-data/default.nix b/pkgs/data/misc/spdx-license-list-data/default.nix index 44b5e7423d5..e20872482d5 100644 --- a/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.21"; + version = "3.22"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - hash = "sha256-dv8aC4giD0JqaYN19eCHzEbmwXhqX+ZrKrwit9tzf5Y="; + hash = "sha256-ZADijP8TKMSXJApY7pVTJoqsEPPL8PX7dUFJHFX5utw="; }; # List of file formats to package. diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 211ee414750..40cce28dc5d 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,14 +3,14 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20230913074035"; + version = "20231031055637"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-A1401KSNkGoVEbiX2MyepesnyF0qVWZ7tuKLtoKUA/k="; + hash = "sha256-wdWmpWsWroA7ecNRSVh3hEUSXz/MW+9kYDWhThWL44k="; }; - vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; + vendorHash = "sha256-6167kRAC5m5FlBr7uk+qKUcjWsb45P5Vvovyb6hHSVQ="; meta = with lib; { description = "community managed domain list"; homepage = "https://github.com/v2fly/domain-list-community"; diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 5dbaa6c9c93..fb9064a437d 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -8,18 +8,18 @@ }: let - generator = pkgsBuildBuild.buildGoModule { + generator = pkgsBuildBuild.buildGo120Module { pname = "v2ray-geoip"; - version = "unstable-2023-03-27"; + version = "unstable-2023-10-11"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "9321a7f5e301a957228eba44845144b4555b6658"; - hash = "sha256-S30XEgzA9Vrq7I7REfO/WN/PKpcjcI7KZnrL4uw/Chs="; + rev = "3182dda7b38c900f28505b91a44b09ec486e6f36"; + hash = "sha256-KSRgof78jScwnUeMtryj34J0mBsM/x9hFE4H9WtZUuM="; }; - vendorHash = "sha256-bAXeA1pDIUuEvzTLydUIX6S6fm6j7CUQmBG+7xvxUcc="; + vendorHash = "sha256-rlRazevKnWy/Ig143s8TZgV3JlQMlHID9rnncLYhQDc="; meta = with lib; { description = "GeoIP for V2Ray"; diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix index 205fcabc713..646f4ae491b 100644 --- a/pkgs/data/misc/xorg-rgb/default.nix +++ b/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/pkgs/data/soundfonts/generaluser/default.nix b/pkgs/data/soundfonts/generaluser/default.nix index 5191199e647..abe1ea4ceac 100644 --- a/pkgs/data/soundfonts/generaluser/default.nix +++ b/pkgs/data/soundfonts/generaluser/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { # we can't use fetchurl since stdenv does not handle unpacking *.zip's by default. src = fetchzip { - # Linked on http://www.schristiancollins.com/generaluser.php: + # Linked on https://www.schristiancollins.com/generaluser.php: url = "https://www.dropbox.com/s/4x27l49kxcwamp5/GeneralUser_GS_${version}.zip"; sha256 = "sha256-lwUlWubXiVZ8fijKuNF54YQjT0uigjNAbjKaNjmC51s="; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "a SoundFont bank featuring 259 instrument presets and 11 drum kits"; - homepage = "http://www.schristiancollins.com/generaluser.php"; + homepage = "https://www.schristiancollins.com/generaluser.php"; license = licenses.generaluser; platforms = platforms.all; maintainers = with maintainers; [ ckie ]; diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/default.nix b/pkgs/data/themes/adi1090x-plymouth-themes/default.nix index 10356feed62..d5ff1d0018a 100644 --- a/pkgs/data/themes/adi1090x-plymouth-themes/default.nix +++ b/pkgs/data/themes/adi1090x-plymouth-themes/default.nix @@ -7,7 +7,7 @@ # reference ./shas.nix for available themes selected_themes ? [], }: let - version = "2020-12-28"; + version = "1.0"; # this file is generated via ./update.sh # borrowed from pkgs/data/fonts/nerdfonts themeShas = import ./shas.nix; diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix b/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix index cb128478cdf..51a7178f094 100644 --- a/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix +++ b/pkgs/data/themes/adi1090x-plymouth-themes/shas.nix @@ -1,322 +1,322 @@ { "abstract_ring" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/abstract_ring.tar.gz"; - sha = "133gifr4571b14ci44jmm49j91yhq785yx4b3h6yvx0188liibr2"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/abstract_ring.tar.gz"; + sha = "0hfrzm974nm8f237vzlyjjh4pikva3n7fqr1p7jmx04g857g4rjq"; }; "abstract_ring_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/abstract_ring_alt.tar.gz"; - sha = "157yg2y4vfwjfly2paq2xn1p6h2wrbvvzwy4lbpbhlmhyhrymjvj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/abstract_ring_alt.tar.gz"; + sha = "0gx6l6w9d9z6am3x99igp6v1kykpwd39sjhalfsl21x1ah2cfmbh"; }; "alienware" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/alienware.tar.gz"; - sha = "1i3i0gj927drbgivcx3fqj6fqdwm2gqy0wrwfkdqdjyqzq1286a5"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/alienware.tar.gz"; + sha = "0pq9zdhdz5vg97zfzsj9kh63szsm9qww2j7bgp2w4z6pg42xcswh"; }; "angular" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/angular.tar.gz"; - sha = "06n3ix7k8zpraqc75wy4fnk1bzcyhfajjxjq9kyy470wgsjrw6p4"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/angular.tar.gz"; + sha = "15rsljiv1nhgcsgjiwsb2jiwah1ghxa95dbj3hlddx8d337nxljc"; }; "angular_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/angular_alt.tar.gz"; - sha = "1l1iy9p0k4a8mcdps30avscjp6wfv20m9zy376r18y7xwcz19qbj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/angular_alt.tar.gz"; + sha = "12v4d7yjd81vch6cm2jphkb24gnc5d2kncfi4lsan6vhamija49f"; }; "black_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/black_hud.tar.gz"; - sha = "13y32zxcshnfyjxs0r7f1sz010sr6brsaap90im2cb4rlvp0ajsz"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/black_hud.tar.gz"; + sha = "07iy216xij19m6jy76z2rafmjm8mv4k7mwpp145xayz52zhs66s8"; }; "blockchain" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/blockchain.tar.gz"; - sha = "1f60nvrk506bqw47g90wzbvn3bp5h1gbi0ll5f3bd6wj77qfk05i"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/blockchain.tar.gz"; + sha = "1w0hz1fyj4p9qxwdhib9c7gxx582wb9fz2dyd77l9xqjkps78fjx"; }; "circle" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle.tar.gz"; - sha = "04085lkh4i5diszpr1w5xnhnngp8ba1ckalcjj5s8hm8lk6wd4nc"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle.tar.gz"; + sha = "16xrz3v85kpxc4palm8flc7lhscfl6psm1dz999r802yivxl5ikg"; }; "circle_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_alt.tar.gz"; - sha = "0awbjrd31fv2cb0q7n58h5iji29di8n550bmpz5qdg6xn55baqqx"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_alt.tar.gz"; + sha = "0hsia8rq059kyxrnikr6brwmg7pa5kbm3j9gj4ky1a83dwpx18lg"; }; "circle_flow" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_flow.tar.gz"; - sha = "0ffxgjmx5la55dn3nyqgxi8fyd1ci4wckmvfaa6s1kyd7xsk8785"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_flow.tar.gz"; + sha = "109m9hdirrr9a6gxgqpq80yz0lx4s7bv7nihdfjzg7rhl0icgw93"; }; "circle_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circle_hud.tar.gz"; - sha = "0sd28d0ac7wvkwmbrnvg42bccz6y4iyl2wp1pg7awwjxvag0azlf"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circle_hud.tar.gz"; + sha = "1xmc30z5k583zrknx2g7rmq41vw9chyxhdacpxvxzyvnp0828z0j"; }; "circuit" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/circuit.tar.gz"; - sha = "1jzlr6c47n3zs0f1cafgjy92sks5060d1gs0774kxc0c96bysypg"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/circuit.tar.gz"; + sha = "0linpkxhx01v7q2s3c7z8py0h697z7a4jhwbs2gp47p2923xggij"; }; "colorful" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful.tar.gz"; - sha = "18lbyffvhdav5cjh0xnidf09amryf5dcj5rizl9z7ghxpz2z57pr"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful.tar.gz"; + sha = "0m89prph31a0r0rxax989n72wdk3d5ywl8h3lygas8k7g908xr3p"; }; "colorful_loop" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful_loop.tar.gz"; - sha = "0qcn19gxl9w2q0w7lihi8wnlwlh8h3k0ddbp3ww9wcw1q0wsy1vi"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful_loop.tar.gz"; + sha = "0nbdh6v8zn1xxm44sgr1904wik8pv0yrqjg84dym10k7hvfnb1af"; }; "colorful_sliced" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/colorful_sliced.tar.gz"; - sha = "0d9lafg76w2y77ywj1f1p5n1ci2q9jnfqfd16akf6f28h0iz1f9r"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/colorful_sliced.tar.gz"; + sha = "1yadpyiwiixxily7wzhd8myxnrvhzdc9m6lj7g4ll3hlwygw7rz1"; }; "connect" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/connect.tar.gz"; - sha = "1a0z59l391xv795d8mhcwa816wlmzyl75pwiizvvra2a0i8g6wz0"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/connect.tar.gz"; + sha = "0gwd27vlr23zbf0mw34gd55f3s32a70q1s03z36dsf01bbyrvwz5"; }; "cross_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cross_hud.tar.gz"; - sha = "188wj6hkvryawmw4r3bwcsvqxx52h10jb4ddq3jx7sh2rz1kpvwa"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cross_hud.tar.gz"; + sha = "1j79c99n3r94vrf6f8n2a42jjfywaf7vf6q34awdqcl188hc3qzi"; }; "cubes" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cubes.tar.gz"; - sha = "0bydagjwfkvbhgr7sv903a7pjkrmrdz6vh22i4qjx5rhzw2wvvsk"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cubes.tar.gz"; + sha = "11r6q9f4vz64rxz8wshhhpyp7knwn2klw50z98bn3qbmwl3zfh8c"; }; "cuts" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cuts.tar.gz"; - sha = "0znz82zzgyqkfprvzhkzv974amcnxqdg38ajsm4d7wlagc52zs0d"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cuts.tar.gz"; + sha = "1bf8yrwha2bibnpf8abc0bxsj0g9sg3m1fpagxcpr61m0cl4i3vq"; }; "cuts_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_1/cuts_alt.tar.gz"; - sha = "1bgs4v5kkh96m1xh29wjmdxinfsxh4g7lg9fk1nqj87igdg7wwss"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cuts_alt.tar.gz"; + sha = "00yrhfnfnmirzij5wd592cfn90crw3774a6wdxq4s538wrpmzhik"; }; "cyanide" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/cyanide.tar.gz"; - sha = "04aklg9il310iv7zjpan6z4ha7gvh1b0yzgwi91679vm38cg0593"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cyanide.tar.gz"; + sha = "0bbrqg77m0655l9x90334b8yn60kni062p17h4rf6kp9qbi86gg0"; }; "cybernetic" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/cybernetic.tar.gz"; - sha = "0ad75fcra24bjzs4pqn89l19wb4rcjph63j71lv60m0rz75vgjfb"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/cybernetic.tar.gz"; + sha = "0chk52pfl81npffda6hy1pag6n8l5ssq61mc0qaa4nqfwpyvqqvw"; }; "dark_planet" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dark_planet.tar.gz"; - sha = "03i2knrfi56f8lbc8hs8rqa4jg432nsmjn74wibb04ppmvm8f47j"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dark_planet.tar.gz"; + sha = "1bbwdzgmvrdxkd379r1w2rkl0r5ixlh56xn59c47bmfbjl19927d"; }; "darth_vader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/darth_vader.tar.gz"; - sha = "0mlxy17l1hjf3nq390wc26n4x3c45n5hmks75zkzjz3l5ac1fah6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/darth_vader.tar.gz"; + sha = "1czq929j87zila0v49kikjqdw8bmssmn5cp573i3qb9kry5xdlm7"; }; "deus_ex" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/deus_ex.tar.gz"; - sha = "1mllj0xj9g1nn01vcq0xsfcwd0qnmk1s3vj5d03f9qp513k8qzdl"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/deus_ex.tar.gz"; + sha = "1la8rlvy9gh593vx2w9wjq2hmsp58fd2gx9l9g2222mmzpk1hmcc"; }; "dna" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dna.tar.gz"; - sha = "0xcf4vxd99w3d44bhrdk1yqsfcakix6cd7hdpjsgccgs1jd02hi1"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dna.tar.gz"; + sha = "1mkq23khwsbnz8spf00amk48fx5vnk3rpzapx37rpx1klgxpm89q"; }; "double" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/double.tar.gz"; - sha = "07gxkzqrp0cfisdkq0wqfiai37m2yr2fhcpdpazmzkkxnm4qf25y"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/double.tar.gz"; + sha = "11grxa2wblii4yxxrwfbbmwlwk26sm6mw9y00wfadijx2iyx30i1"; }; "dragon" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/dragon.tar.gz"; - sha = "0ypr1vyl6zilfzncymlh2s1ivxr7n88kfaygmz2y83l332asjs66"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/dragon.tar.gz"; + sha = "1hlvr2s8zhlf8mg9pskwby94kh15g8icxn3833cdqqhmgvc0d7l5"; }; "flame" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/flame.tar.gz"; - sha = "0kvly5rgp47a4lby3blb1dird9xwy9y9c8a0wg17qfvz3zr69r0g"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/flame.tar.gz"; + sha = "1yszmhmmjgdkjvqpij3gjwz8vxjhmklf7clbpz947254zgwxyn5g"; }; "glitch" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/glitch.tar.gz"; - sha = "0s0kmrw01wj9i7qd7zbwvmfbbh7r3jfkc4522jv44m4rl6r4h84c"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/glitch.tar.gz"; + sha = "15gwhfnrn0p80wdaymnlvrcig5cjb4m5qz56hbhg4jdwcjdlppbd"; }; "glowing" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/glowing.tar.gz"; - sha = "19nkbk2cw6j763idz5z7l71lx529xcgyx1dcd9qd356x9ifdw206"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/glowing.tar.gz"; + sha = "09h7dn805lrg04j5lp30l3qc6kb8xxilibdg0pxfadwyljblwl1f"; }; "green_blocks" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/green_blocks.tar.gz"; - sha = "0x8pgsyfbchy7z6d4rijsk2nml6fl1xwba0f0h3lw9i6359k7j3j"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/green_blocks.tar.gz"; + sha = "09xx5fbnby567s9s8hmryalm9k9vs520lymiprw06nig49rmy4v2"; }; "green_loader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/green_loader.tar.gz"; - sha = "00rdpy1gbc4ikxx487w3k27z622z2rjcsi0d18i23s5p3xqd1l3a"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/green_loader.tar.gz"; + sha = "09vw6c9albsv28y4bdlp54csq5bl0vrd20yjph00jxhvhizffk3k"; }; "hexagon" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon.tar.gz"; - sha = "0yk47hs5qfv09q5df4x6j82ivrxfxh1bxsw8p8x7hcmlb08dh6g6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon.tar.gz"; + sha = "17api8ndiqjxyj7prxz0bv1dpq0h0wvphnll4lb2dlhxp61bjmj3"; }; "hexagon_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_2.tar.gz"; - sha = "175im23q769s2if3xi8j669r0b5y0dagz8rsbvq7kghznzw4abc2"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_2.tar.gz"; + sha = "030yr5nb6q7bw1f1dh9kcdmd87x25f1fn60v45vmk7k07y1s10c8"; }; "hexagon_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_alt.tar.gz"; - sha = "1ayhw1gzrb98hf7f77b6ka5wi19ymp3mljhhgm5lx8w8pwawsxnb"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_alt.tar.gz"; + sha = "1f6i8signlscp0av3kcmdw0xm13pf2dy2lz3c6wq9d9203ibry1p"; }; "hexagon_dots" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_dots.tar.gz"; - sha = "0pdw9ih9fsxvv394yc5vfj7nlq7mca9w05y0s631gnsdzgqxsyd6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_dots.tar.gz"; + sha = "13mi9f8saw9zk8zdxp003ipigyd4y26iydn0pd1c0vr5fbz483rq"; }; "hexagon_dots_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_dots_alt.tar.gz"; - sha = "0aff3bgpva41b4jk4mp0fxdvli286x4pk3q9ysvps7z7srw4fvvn"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_dots_alt.tar.gz"; + sha = "1gkzh5i84cwv64f3r8rgpzyj8h1kpn92m4syf67kn5sdhqykvqkz"; }; "hexagon_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_hud.tar.gz"; - sha = "0wpmsffdp59dy2g5ggprgr7l50rf131c7v8pbgpir230lpn10xzi"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_hud.tar.gz"; + sha = "17k5378fsydvcps9rxd117rfqlijnrsj1ggyqx445a5yrwy6rx55"; }; "hexagon_red" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_2/hexagon_red.tar.gz"; - sha = "0fgmma5j6fnjykpwplji4rm57d07l9shfpay079gz1nhbhnq3rkl"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexagon_red.tar.gz"; + sha = "0x8i1k54qff7agwq9gqi2z59lww8qglck105bv87ylgy5z6150sx"; }; "hexa_retro" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hexa_retro.tar.gz"; - sha = "1cbyhqhv2ysx9w8cpbfidrm0w70wssp4fld0q1g01fgcbg93b7mf"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hexa_retro.tar.gz"; + sha = "0bwx2nvvr6bkqnmnv2kh9slbi11lv0h3hnzql99d9llr3vlid5ip"; }; "hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud.tar.gz"; - sha = "0s01p1n75ckwa69iy5v2z2cg85ipzgx356n4yvdyi1jh9pnl22k9"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud.tar.gz"; + sha = "0zng0rn4lacxf9v1azndzv5v7pl84f0amschccdlnymilyy564ck"; }; "hud_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_2.tar.gz"; - sha = "1bvkl5f0fwi7xzy23pj3p7c98fbz2zk8abz7frxr0pp0xj3ql87i"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_2.tar.gz"; + sha = "14ldw37gpysnw3k1cssh8q1hgxnrh954pgq5x5xhrlv2w6rsbfzq"; }; "hud_3" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_3.tar.gz"; - sha = "1n5qqkp0qb4mlpp7g20hpvazgwxw4gjb2p0ys0q2bglb3amzc2xr"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_3.tar.gz"; + sha = "0lc3x51gjfc58y45yzfnpy2i07vk9vdzbjl5yawv3wh97jy5x6x7"; }; "hud_space" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/hud_space.tar.gz"; - sha = "0dhajnica048smn5wpwc13ij0n9g6c10a0qxgi4rwiczr7p9vajj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/hud_space.tar.gz"; + sha = "13ipj1l737bs9rnhh5vviq6bm5hdghpyq6s5hc1fhg2cgldfnq0i"; }; "ibm" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/ibm.tar.gz"; - sha = "0xri6x716ma3y7d59yn9vm7skw5y53kn6s2ivfrvlfsac9n1zj4m"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/ibm.tar.gz"; + sha = "0acs1f468xfpsvzy400f8ba7890n3pp69c9b20lb8slamm9l4swd"; }; "infinite_seal" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/infinite_seal.tar.gz"; - sha = "0r9plydfdc35s2is1zi3pbx3s0bs5hqkim3laiav8fv3rzq0f3lq"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/infinite_seal.tar.gz"; + sha = "07g4qmkfc9yqjpbs0yr277ij3pbhc1p51gzpnnbc3viwm1zzrs6p"; }; "ironman" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/ironman.tar.gz"; - sha = "0af6qfdqj0n5qgsxg6nnrs2k8xas6cd18jw96mrwfcckpfz091cm"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/ironman.tar.gz"; + sha = "0w5z22529jrgd2ab7fqibm2sd57740qxyqqrzhyvgd4l5axn1yzd"; }; "liquid" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/liquid.tar.gz"; - sha = "0ghavh6nj68kwcgvrnwbabkzn44zq0m2ic1b2cl278d2vffzqv87"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/liquid.tar.gz"; + sha = "01lwzb2yid7hb1f2nc0jycll9kvq89jcz7s7w81vqirx4by8p8n8"; }; "loader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader.tar.gz"; - sha = "1zlba3mra45ii0gahlw8v1vq1j7nbfjq62pcjn43vb40zcc1j873"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader.tar.gz"; + sha = "0vx66kb56n6dy74k6yjk5w8apc8q1hmr8mrpgl420lzdqm4ggrgz"; }; "loader_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader_2.tar.gz"; - sha = "1yw4n9bw483pl7m3ks2ajgfldslgyc4gb1kw61fszfp5x4l3k4rg"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader_2.tar.gz"; + sha = "0rir3gfi8bq4m8s0xhbd2ppny6q60b42wq9vs826axk2g58jczrw"; }; "loader_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/loader_alt.tar.gz"; - sha = "1pi97pfhg13wq5s8hai4fd31s6bcfq09r969fl216yxksj8h69wj"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/loader_alt.tar.gz"; + sha = "0pfg304xmgc46ai9d5m51p05i7zbvhfzfsscn7yk6kiw09b21fpz"; }; "lone" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/lone.tar.gz"; - sha = "0413mxr8lqlznbps5c4qgbhm0zpz8dlkbdj67r9gvzi9v020qjgl"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/lone.tar.gz"; + sha = "0xx959215w8qcpbzn9w3ip4shq3ib7dcni43z4m9jwa28aa3v7y8"; }; "metal_ball" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/metal_ball.tar.gz"; - sha = "129q23q992fxfi976px5r68sf8wqbac3zby4yjh97s48zm83rzb5"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/metal_ball.tar.gz"; + sha = "18nbikv736yd1q4qf9nq0fzspmxlkq1z6kl0jzady8ifkny1kvlw"; }; "motion" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/motion.tar.gz"; - sha = "0g84ac8ps69ihic2z7gr4nlwib9ra86il2fdl7rl7w5nc8xzhx1y"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/motion.tar.gz"; + sha = "0nbvgsgkpkdx83v45fb4z6ywiz3cpdmbsx8jcxhaa0cpywvq40bh"; }; "optimus" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/optimus.tar.gz"; - sha = "1l4bmbiqqypwqvyhcd561nnxhrq5zif8pmkyk2hdwscbq6rlbc7r"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/optimus.tar.gz"; + sha = "0zxv3b21mxkl0dvhs6nzd94vlsphc8h1zzvkcgng6cqg9n1c206p"; }; "owl" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/owl.tar.gz"; - sha = "03gqqcvp4320qy1d3az1k2a8rj97alk8qzgkz6xg4akz9ccd731y"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/owl.tar.gz"; + sha = "1ylkpydmy65xilqzkdps18kr0yyqggkxaysmmik3sz01qs6xjrz6"; }; "pie" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/pie.tar.gz"; - sha = "1j479l428gq1b2g0g2ybkf81jzad69n59kphm0ns5gfv6khx10ga"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/pie.tar.gz"; + sha = "1x834k0qsa8c7z3ds0vk6cw2r1f4ydmyk8yz1hdw8lxys17n9rj8"; }; "pixels" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/pixels.tar.gz"; - sha = "13rfdd9v7h0k2wbwr428h2w8dv5vhhbw03wvirlmafsbhmgjz5xs"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/pixels.tar.gz"; + sha = "072ag60r2n3jjj64r1nzsj5p97gjcfrvd72axm1z741rz5xaigki"; }; "polaroid" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_3/polaroid.tar.gz"; - sha = "096iz34hpmicixrdrqaxmx8m83vggm90xqz4zyy5vkpcy3vl60mf"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/polaroid.tar.gz"; + sha = "0m748kj5qps9vwwww44i1lj64r0mg0hqnfkg7dhqrf7nl0saw4da"; }; "red_loader" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/red_loader.tar.gz"; - sha = "0n2jmfy558rma6knraskb7rgccvnayxh7csl0jaarx2xl9zxzzay"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/red_loader.tar.gz"; + sha = "18vvlknnp3kiviacmp0cbmagrqzbhli6qv6vbzw362cv2mxhid85"; }; "rings" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rings.tar.gz"; - sha = "1g9p2cdn1w7dmy2z017xdkv6rm50gdb5qqd8a0y0662fzph5adg0"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rings.tar.gz"; + sha = "0xhwnxr5hcxqr64vr45lkvwzbbcpzxfbdlad006r16m480ncripw"; }; "rings_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rings_2.tar.gz"; - sha = "07v4mq1lpw9vfzg0rfxmkyfhyhz3nv5zab5kf10bjjgpjq8c9fi3"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rings_2.tar.gz"; + sha = "0vdjby6kyazxy042ljyv59pg4zfsvzzssf20w4r7ircfyiqypajs"; }; "rog" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rog.tar.gz"; - sha = "13lcrsdk1v1xn7fxn54xbk1jkh55kmsf813q1v7x8a2l8p9pl0hp"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rog.tar.gz"; + sha = "0az3vxndzym39w7357mmr6zyzfy32pg036v6jim895z10093b0y0"; }; "rog_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/rog_2.tar.gz"; - sha = "0cgc1y1jrb689h9wd7jf3wvf9r996k4ik965v4wclmp9wra5gflk"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/rog_2.tar.gz"; + sha = "13yfqb06ihzma80lfsb0mlsaq0j6qakqx607pr5rmhl6765bz116"; }; "seal" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal.tar.gz"; - sha = "0ip23x69ljdj1bwxlhvz3fbg3ia47m2aw6d122v2rqhwqasmy40n"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal.tar.gz"; + sha = "14k98v41ng3had7n6q1z513yc53zzkji7gm4n2jpjj5rd1jd2xr8"; }; "seal_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal_2.tar.gz"; - sha = "1fc91n6ys2fl8xbzdj0ywck87xnyn1gp4jvjk307w49jmkpdzs15"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal_2.tar.gz"; + sha = "0kwn7njj7anci9ihf8aqs7k7qv2vsnqc81sj5db672qn4hxpy50v"; }; "seal_3" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/seal_3.tar.gz"; - sha = "1l2jlxhhaf5whbvbdf31ypcasalx4fsd4yn90xybmjq7b27bz5b2"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/seal_3.tar.gz"; + sha = "0pjqq7qlmb0mf0xnm001b1f5jcbfzd3a3hzsf0jysacb5wmpzspp"; }; "sliced" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/sliced.tar.gz"; - sha = "0363lwq3rwdcz3fg47f6kch150vxspvpjdqzg87aahli30kkjfdi"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/sliced.tar.gz"; + sha = "1xrlhg1glykj73x9spq609y4ygfy3xw4azk3npjfh3ky5l0jqxjg"; }; "sphere" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/sphere.tar.gz"; - sha = "1zjlwign7f2zd70qkg25adbbmq8ndm9b44gc4pa0ls64i6yfd6fz"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/sphere.tar.gz"; + sha = "1nav61fr7wba1vbas8wci3fpyx0pidgiv9wm4zxdrw7hqw8akkpn"; }; "spin" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/spin.tar.gz"; - sha = "0hwjc4i69zmzw7cpmsrhmx00w5k5y46m317m1imw2ycmhm0jicm5"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/spin.tar.gz"; + sha = "1yb39jmvifb1ijh5i804d06c97samhf8w4p0w1xwxq29j6ihsvw9"; }; "spinner_alt" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/spinner_alt.tar.gz"; - sha = "1ifs9xxd1cxvgjcnqjfw2zxkcapssv10hvchjrlf9nl60ayyp4m4"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/spinner_alt.tar.gz"; + sha = "136nhpxlc2kar9jwz4pdxpg30b66n7bqy5mk9lm4v90pwf5m3kbs"; }; "splash" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/splash.tar.gz"; - sha = "12l8hwzmi68mjqgl384wf1fscvnzwp4a3vmlsb2zcbfwhrs5q717"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/splash.tar.gz"; + sha = "1wnmqqm07yrbd5ha31dd2iihmrjr555hd8fgra9fy9zh2pw9wgf2"; }; "square" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/square.tar.gz"; - sha = "1mpyrivchsj2gr8flwj0g45vb792fvjjb5jmkn9xz1glrxxs7zww"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/square.tar.gz"; + sha = "1wkixypxchsi11d8qfackcbvcjhifys9xlsc61rd7hfgz2nwjmww"; }; "square_hud" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/square_hud.tar.gz"; - sha = "1lvv00r5rg8yjwibfqncka1s0p59fnpklhz3v6ifbs7ynlyp0kag"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/square_hud.tar.gz"; + sha = "13bbzxv4gq66z0h801m8fi3n2rk41212nhapa5xb3xgh7v23my04"; }; "target" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/target.tar.gz"; - sha = "1ipsd3rjclmwzg2l4bxpj0mgfl5bwxs1ihf498660zhm0bqqpgpr"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/target.tar.gz"; + sha = "0vk8abdxhs93bj9l21db2ai7w945z472rwwn1m4070vrhs2fvzn4"; }; "target_2" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/target_2.tar.gz"; - sha = "16lipy5c0pyyb1idwj1zchfr8g0cy6qr46c87b8g1kv2g96n5cn6"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/target_2.tar.gz"; + sha = "0n6f1lnmry5zv3y592gp0r2rn297h806zhcgd7yfp0z2zgay67nz"; }; "tech_a" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/tech_a.tar.gz"; - sha = "0fn8aib05kmjxnp7j2bmgrs3avaj6bn06kxz55bw8fdg8ihxnxg0"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/tech_a.tar.gz"; + sha = "13gdq6h3m7skryr95vi0a30ylrapxg1nkc8cv8vn025gj6bafa83"; }; "tech_b" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/tech_b.tar.gz"; - sha = "03i8jcvql76mhcq0dqaj2wygfza72fc7c22vfcyp38cx1lm6ilbv"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/tech_b.tar.gz"; + sha = "1l383plabzlkccqjhf8x02jskykr4wkj2wy6knk9kg6qrq8w870l"; }; "unrap" = { - url = "https://github.com/adi1090x/files/raw/1f8b8d834eb0978d8b0260ffd161e9997b3ee0a2/plymouth-themes/themes/pack_4/unrap.tar.gz"; - sha = "08gqwb11539kz5178ga6f96jv82xmyyzv44q6d05ajcw3pxk5j4c"; + url = "https://github.com/adi1090x/plymouth-themes/releases/download/v1.0/unrap.tar.gz"; + sha = "0571pvnhmny9642rfg7sw6csrz7bka2424zfryg858c0hg6aqrnk"; }; } diff --git a/pkgs/data/themes/adi1090x-plymouth-themes/update.sh b/pkgs/data/themes/adi1090x-plymouth-themes/update.sh index 82eb9916553..0fe5db726b3 100755 --- a/pkgs/data/themes/adi1090x-plymouth-themes/update.sh +++ b/pkgs/data/themes/adi1090x-plymouth-themes/update.sh @@ -8,27 +8,21 @@ curl_args=( '--silent' ) # optionally takes a GITHUB_TOKEN to overcome api rate limiting. if [ -n "$GITHUB_TOKEN" ]; then curl_args+=( --header "authorization: Bearer ${GITHUB_TOKEN}" ); fi -# get last master ref -curl_args+=( --url https://api.github.com/repos/adi1090x/files/commits/master ) -last_ref=$(curl "${curl_args[@]}" | jq -r '.sha' ) - -unset curl_args[-1] -curl_args+=( https://api.github.com/repos/adi1090x/files/git/trees/$last_ref\?recursive=1 ) - -theme_archives=$(curl "${curl_args[@]}" \ - | jq '.tree | map(select(.path| test("^plymouth-themes/themes/pack_.*tar.gz$"))| .path)') +# get latest release assets +curl_args+=( --url https://api.github.com/repos/adi1090x/plymouth-themes/releases/latest ) +theme_archives=$(curl "${curl_args[@]}" | jq -r '.assets' ) dirname="$(dirname "$0")" printf '{\n' > "$dirname/shas.nix" -repo_url="https://github.com/adi1090x/files/raw/$last_ref" - while read -r file_path do - name=$(basename $file_path) - printf ' "%s" = {\n url = "%s";\n sha = "%s";\n };\n' "${name%%.*}" "$repo_url/$file_path" "$(nix-prefetch-url "$repo_url/$file_path")" >>"$dirname/shas.nix" -done < <(jq -r '.[]' <<<"$theme_archives") + name="$(basename $file_path)" + name="${name/.tar.gz/}" + + printf ' "%s" = {\n url = "%s";\n sha = "%s";\n };\n' "${name}" "$file_path" "$(nix-prefetch-url "$file_path")" >>"$dirname/shas.nix" +done < <(jq -r '.[].browser_download_url' <<<"$theme_archives") printf '}\n' >> "$dirname/shas.nix" diff --git a/pkgs/data/themes/adw-gtk3/default.nix b/pkgs/data/themes/adw-gtk3/default.nix index b7c14444110..79dcc88a6f5 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.5"; + version = "5.1"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x6ul5NZDWqEQfLzmpR7X5HgUmHNSbpuTnCquVEHFHL8="; + sha256 = "sha256-vRB6+C27M4u7v10c6dqGsKpxHMGfpCSiScZ+8qlJRr0="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/alacritty-theme/default.nix b/pkgs/data/themes/alacritty-theme/default.nix new file mode 100644 index 00000000000..203b260e251 --- /dev/null +++ b/pkgs/data/themes/alacritty-theme/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, nix-update-script +, stdenvNoCC +, ... }: + +stdenvNoCC.mkDerivation (self: { + name = "alacritty-theme"; + version = "unstable-2023-10-26"; + + src = fetchFromGitHub { + owner = "alacritty"; + repo = "alacritty-theme"; + rev = "e1b08b5bc06d07dd65f5e72b12fd7f736e0e7928"; + hash = "sha256-wf0aT2uGe/6Ifv//lQStTm24yt2FX3kWQq5ebdmdPJ0="; + }; + + dontConfigure = true; + dontBuild = true; + preferLocalBuild = true; + + sourceRoot = "${self.src.name}/themes"; + installPhase = '' + runHook preInstall + install -Dt $out *.yaml + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = with lib; { + description = "Collection of Alacritty color schemes"; + homepage = "https://alacritty.org/"; + license = licenses.asl20; + maintainers = [ maintainers.nicoo ]; + platforms = platforms.all; + }; +}) diff --git a/pkgs/data/themes/catppuccin-gtk/default.nix b/pkgs/data/themes/catppuccin-gtk/default.nix index 1e62dd73746..6459f50fe78 100644 --- a/pkgs/data/themes/catppuccin-gtk/default.nix +++ b/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.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "catppuccin"; repo = "gtk"; rev = "v${version}"; - hash = "sha256-BjdPe3wQBSVMYpeCifq93Cqt/G4bzsZYgOPBTilHqD8="; + hash = "sha256-J1iLN2FF3Ml/3zmntXYlfkv6dZcwl62A9X4ruAH1ll4="; }; nativeBuildInputs = [ gtk3 sassc ]; @@ -79,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/pkgs/data/themes/catppuccin/default.nix b/pkgs/data/themes/catppuccin/default.nix new file mode 100644 index 00000000000..59e030eb9e0 --- /dev/null +++ b/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/pkgs/data/themes/colloid-gtk-theme/default.nix b/pkgs/data/themes/colloid-gtk-theme/default.nix index 6b56064b873..71e7fb9a286 100644 --- a/pkgs/data/themes/colloid-gtk-theme/default.nix +++ b/pkgs/data/themes/colloid-gtk-theme/default.nix @@ -1,7 +1,6 @@ { lib , stdenvNoCC , fetchFromGitHub -, gitUpdater , gnome-themes-extra , gtk-engine-murrine , jdupes @@ -23,13 +22,13 @@ lib.checkListOfEnum "${pname}: tweaks" [ "nord" "dracula" "gruvbox" "all" "black stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-08-12"; + version = "2023-10-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-Ss6IXd4vYUvIF5/Hn4IVLNvDSaewTY0GNZp7X5Lmz/c="; + hash = "sha256-NxIWH3qLW8sEguovAv9wfgnlnmPlTipRJTmMo3rSHNY="; }; nativeBuildInputs = [ @@ -64,8 +63,6 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater { }; - meta = with lib; { description = "A modern and clean Gtk theme"; homepage = "https://github.com/vinceliuice/Colloid-gtk-theme"; diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/data/themes/flat-remix-gnome/default.nix index 7a8444afbe3..61ddd00abd3 100644 --- a/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/pkgs/data/themes/flat-remix-gnome/default.nix @@ -7,25 +7,25 @@ let # make install will use dconf to find desktop background file uri. # consider adding an args to allow specify pictures manually. - # https://github.com/daniruiz/flat-remix-gnome/blob/20230606/Makefile#L38 + # https://github.com/daniruiz/flat-remix-gnome/blob/20231026/Makefile#L38 fake-dconf = writeScriptBin "dconf" "echo -n"; in stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20230606"; + version = "20231026"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-NnCRWADyAOR5yyOjB18zSQov+5FfKhhCSkDXBAL80wo="; + hash = "sha256-sKQOq0GMslkzND2ayL5M6XIxJv8t0yj6XCP3poA6wRc="; }; nativeBuildInputs = [ glib fake-dconf ]; makeFlags = [ "PREFIX=$(out)" ]; # make install will back up this file, it will fail if the file doesn't exist. - # https://github.com/daniruiz/flat-remix-gnome/blob/20230606/Makefile#L56 + # https://github.com/daniruiz/flat-remix-gnome/blob/20231026/Makefile#L56 preInstall = '' mkdir -p $out/share/gnome-shell/ touch $out/share/gnome-shell/gnome-shell-theme.gresource diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix index 31422625a48..b59b1393c6d 100644 --- a/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -63,7 +63,7 @@ stdenvNoCC.mkDerivation rec { ${lib.optionalString wallpapers '' mkdir -p $out/share/backgrounds - cp -a wallpaper/Graphite-normal/*.png $out/share/backgrounds/ + cp -a wallpaper/Graphite/*.png $out/share/backgrounds/ ${lib.optionalString (builtins.elem "nord" tweaks) '' cp -a wallpaper/Graphite-nord/*.png $out/share/backgrounds/ ''} diff --git a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix index 6e9db943c91..46d6af5f24c 100644 --- a/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix +++ b/pkgs/data/themes/kwin-decorations/sierra-breeze-enhanced/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=$out" - "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_TESTING=OFF" "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON" ]; diff --git a/pkgs/data/themes/marwaita-peppermint/default.nix b/pkgs/data/themes/marwaita-peppermint/default.nix index 6873cd31f8d..16a60de9287 100644 --- a/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/pkgs/data/themes/marwaita-peppermint/default.nix @@ -5,17 +5,18 @@ , gtk-engine-murrine , gtk_engines , librsvg +, gitUpdater }: stdenv.mkDerivation rec { pname = "marwaita-peppermint"; - version = "10.3"; + version = "17.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = version; - sha256 = "09lqp82aymj3silpwmjkkf4mgv3b1xw7181ck89lz2nxb98sr9im"; + rev = "247f9c539d6eef8ae3a5f59beed42a40b1f10434"; + hash = "sha256-uT7KnpIdxypUqKhXOao3Bz3vJecJKK+GjcAp9biNyHc="; }; buildInputs = [ @@ -37,6 +38,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Marwaita GTK theme with Peppermint Os Linux style"; homepage = "https://www.pling.com/p/1399569/"; diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index eccff020ce5..d19ed938bf5 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: theme variants" [ "aliz" "azul" "sea" "pueril" "a stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-04-03"; + version = "2023-10-30"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "mr9X7p/H8H2QKZxAQC9j/8OLK4D3EnWLxriFlh16diE="; + sha256 = "+sWYUCFp5J+fhPHxicwtsHCQkFTpKwjj9H3GAXqNaYo="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index 8d977671fe7..16eefee7bbb 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -2,119 +2,151 @@ , stdenv , fetchFromGitHub , gtk-engine-murrine +, breeze-icons +, plasma-framework +, plasma-workspace , jdupes }: stdenv.mkDerivation rec { pname = "nordic"; - version = "unstable-2023-05-12"; + version = "unstable-2023-10-17"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "399246cdcbdb1a714c5bb294857cd5a6494b6006"; - sha256 = "sha256-0yZ4QYcdcGHEw6tdcXAKZ4e+mhNNmvihBxp2sLgTuu8="; + rev = "e97d2bcf4494f8ab502e33d13c74b396469a42f4"; + hash = "sha256-7WfCE3eoJ7maAYqgQNb0mlw8u3zc6NAwTJN+PVojDcE="; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "3599ddb6f8b7de936cf106bddd4f929ddfe88b1c"; - sha256 = "sha256-ft5UbBnjP0xNFFVwk5Elvrpcj273OupjM+MGJVlvJZQ="; + rev = "73ed3490c13b2df6c3d27d6b3bcba0c087297f4a"; + hash = "sha256-fRmGiqtjfGFIfr5hRBS3ZPFYEpQx391WoxphB5gRTJo="; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "b03b66d5badadc2e5ff27b8745a2308b8fafaa61"; - sha256 = "sha256-6dORsGfYi7q8z7JWA3Y9oqVs9bhT/gbdSrcgJcebGP8="; + rev = "4b1fc2942bad203a0aa035cbb688b28005bb1011"; + hash = "sha256-VU5Bo39l8xdR6QmbTR0Qic6XkSfDFrhyjoHaMm9SBYM="; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "e19b75f56e5c328352c183fc960a0be54e99836e"; - sha256 = "sha256-deKHT0dE5tsUo7+vkzxQ/eRon7COrOAWolw17VtKhiE="; + rev = "6d57a16eef66c25f0212b7d2f02e208f2afdf4f9"; + hash = "sha256-Sq5ZXOh+HA+udQHL2wUw5azgKwAVVvHGNb3SiuOn0nQ="; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "b134b4a1299b3c4a2d9543707ec2b5a0fc97987c"; - sha256 = "sha256-XSDwc0/59sUHkS0holvujmr/p6vX79648l9cxJqunuM="; + rev = "566e38c40bca86df93d0e9226c33d5d525d34454"; + hash = "sha256-Wl/m2O0tVCFgZhPC/gcNgKr0JqQbiyQBpGEcp8g6kvY="; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "a4efbc09470b36f4cf6af60b5fdfeb8e09282fb3"; - sha256 = "sha256-Qgrl6p0AhbhK0+aM8hu85Kz/Lz/b2Nn8uWS+WpTGjU4="; + rev = "b43efee28129634fdefe70f2a03c401efc7dc22f"; + hash = "sha256-rLOWkfTMFEnVU2tuw5M2fvbNMPfxIu+gzi+3gnBEhx4="; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "0d44fb16d0f07ef8615fd7740317a518d2b9411f"; - sha256 = "sha256-388251/Tg4jyn7c8zkrUxVFooN9O67xk2NTSeYa0VvI="; + rev = "2192acfce55fbb9a2982886abe25e623d0e7ff66"; + hash = "sha256-B/sAy4I+9gX9dHXUldcN5t0vlOL2Jnoan/hRV+tNnSo="; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "0eea9185946fee20b6d7472548226a3652dea7ae"; - sha256 = "sha256-8JFrmGKn8cl1x3TeDPee1zbMmtypJ9kALv/PRqRHGAU="; + rev = "a24b42411d8ea0dc63bf0778e443be251858e586"; + hash = "sha256-02z4eMFtok1+SeW+ai7vZCXZb6ZhU4l4ch1Zc/GyhYM="; name = "Nordic-Polar-standard-buttons"; }) ]; sourceRoot = "."; + outputs = [ "out" "sddm" ]; + nativeBuildInputs = [ jdupes ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + dontWrapQtApps = true; + installPhase = '' runHook preInstall + # install theme files mkdir -p $out/share/themes cp -a Nordic* $out/share/themes + + # remove uneeded files rm -r $out/share/themes/*/.gitignore rm -r $out/share/themes/*/Art + rm -r $out/share/themes/*/FUNDING.yml rm -r $out/share/themes/*/LICENSE rm -r $out/share/themes/*/README.md rm -r $out/share/themes/*/{package.json,package-lock.json,Gulpfile.js} rm -r $out/share/themes/*/src rm -r $out/share/themes/*/cinnamon/*.scss - rm -r $out/share/themes/*/gnome-shell/{extensions,*.scss} + rm -r $out/share/themes/*/gnome-shell/{earlier-versions,extensions,*.scss} rm -r $out/share/themes/*/gtk-2.0/{assets.svg,assets.txt,links.fish,render-assets.sh} rm -r $out/share/themes/*/gtk-3.0/{apps,widgets,*.scss} + rm -r $out/share/themes/*/gtk-4.0/{apps,widgets,*.scss} rm -r $out/share/themes/*/xfwm4/{assets,render_assets.fish} + # move wallpapers to appropriate directory + mkdir -p $out/share/wallpapers/Nordic + mv -v $out/share/themes/Nordic/extras/wallpapers/* $out/share/wallpapers/Nordic/ + rmdir $out/share/themes/Nordic/extras{/wallpapers,} + # move kde related contents to appropriate directories - mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,sddm/themes/Nordic} + mkdir -p $out/share/{aurorae/themes,color-schemes,Kvantum,plasma,icons} mv -v $out/share/themes/Nordic/kde/aurorae/* $out/share/aurorae/themes/ mv -v $out/share/themes/Nordic/kde/colorschemes/* $out/share/color-schemes/ mv -v $out/share/themes/Nordic/kde/konsole $out/share/ mv -v $out/share/themes/Nordic/kde/kvantum/* $out/share/Kvantum/ mv -v $out/share/themes/Nordic/kde/plasma/look-and-feel $out/share/plasma/ - mv -v $out/share/themes/Nordic/kde/sddm/* $out/share/sddm/themes/Nordic/ + mv -v $out/share/themes/Nordic/kde/folders/* $out/share/icons/ + mv -v $out/share/themes/Nordic/kde/cursors/*-cursors $out/share/icons/ + + mkdir -p $sddm/share/sddm/themes + mv -v $out/share/themes/Nordic/kde/sddm/* $sddm/share/sddm/themes/ + rm -rf $out/share/themes/Nordic/kde - # Replace duplicate files with hardlinks to the first file in each - # set of duplicates, reducing the installed size in about 65% - jdupes -L -r $out/share + # Replace duplicate files with symbolic links to the first file in + # each set of duplicates, reducing the installed size in about 53% + jdupes --quiet --link-soft --recurse $out/share runHook postInstall ''; + postFixup = '' + # Propagate sddm theme dependencies to user env otherwise sddm + # does find them. Putting them in buildInputs is not enough. + + mkdir -p $sddm/nix-support + + printWords ${breeze-icons} ${plasma-framework} ${plasma-workspace} \ + >> $sddm/nix-support/propagated-user-env-packages + ''; + meta = with lib; { description = "Gtk and KDE themes using the Nord color pallete"; homepage = "https://github.com/EliverLara/Nordic"; diff --git a/pkgs/data/themes/onestepback/default.nix b/pkgs/data/themes/onestepback/default.nix index 9547e354389..c18d55db5b4 100644 --- a/pkgs/data/themes/onestepback/default.nix +++ b/pkgs/data/themes/onestepback/default.nix @@ -2,20 +2,16 @@ stdenv.mkDerivation rec { pname = "onestepback"; - version = "0.991"; + version = "0.994"; srcs = [ (fetchurl { url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip"; - sha256 = "1jfgcgzbb6ra9qs3zcp6ij0hfldzg3m0yjw6l6vf4kq1mdby1ghm"; + hash = "sha256-kjGiGo4bF1mWJPnaPv2lf7rGG/uAntHK61mH6lcJ6e4="; }) (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-grey-brown-green-blue-v${version}.zip"; - sha256 = "0i006h1asbpfdzajws0dvk9acplvcympzgxq5v3n8hmizd6yyh77"; - }) - (fetchurl { - url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-green-brown-v${version}.zip"; - sha256 = "16p002lak6425gcskny4hzws8x9dgsm6j3a1r08y11rsz7d2hnmy"; + url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-darker-v${version}.zip"; + hash = "sha256-AuurSa45uF5GbPqaMXKblWkv3YGkYL1z0VjWrbnsB/I="; }) ]; @@ -24,15 +20,17 @@ stdenv.mkDerivation rec { sourceRoot = "."; installPhase = '' + runHook preInstall mkdir -p $out/share/themes cp -a OneStepBack* $out/share/themes/ rm $out/share/themes/*/{LICENSE,README*} + runHook postInstall ''; meta = with lib; { description = "Gtk theme inspired by the NextStep look"; homepage = "http://www.vide.memoire.free.fr/perso/OneStepBack"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/data/themes/orchis-theme/default.nix b/pkgs/data/themes/orchis-theme/default.nix index 2d07ac3ae38..351c1c22207 100644 --- a/pkgs/data/themes/orchis-theme/default.nix +++ b/pkgs/data/themes/orchis-theme/default.nix @@ -26,13 +26,13 @@ lib.checkListOfEnum "${pname}: theme tweaks" validTweaks tweaks stdenvNoCC.mkDerivation rec { inherit pname; - version = "2023-05-27"; + version = "2023-10-20"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - hash = "sha256-I1a8y9dAJqFgnhyMqfupSdGvbbScf6tSYKlAhAzY4Dk="; + hash = "sha256-GhSzTtbuvbAuXxKNm29sJX5kXE2s2jMDB6Ww6Q7GNSo="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/pkgs/data/themes/sweet-nova/default.nix b/pkgs/data/themes/sweet-nova/default.nix index 5c89964eeaf..22a16fa9284 100644 --- a/pkgs/data/themes/sweet-nova/default.nix +++ b/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/pkgs/data/themes/tokyo-night-gtk/default.nix b/pkgs/data/themes/tokyo-night-gtk/default.nix index a117562174e..dc3273e695b 100644 --- a/pkgs/data/themes/tokyo-night-gtk/default.nix +++ b/pkgs/data/themes/tokyo-night-gtk/default.nix @@ -1,38 +1,38 @@ { lib -, stdenvNoCC -, fetchFromGitHub +, callPackage +, runCommand , gtk-engine-murrine +, gnome-themes-extra }: -stdenvNoCC.mkDerivation { - pname = "tokyo-night-gtk"; - version = "2023.01.17"; +let + prefix = "tokyo-night-gtk"; - src = fetchFromGitHub { - owner = "Fausto-Korpsvart"; - repo = "Tokyo-Night-GTK-Theme"; - rev = "f7ae3421ac0d415ca57fb6224e093e12b8a980bb"; - sha256 = "sha256-90V55pRfgiaP1huhD+3456ziJ2EU24iNQHt5Ro+g+M0="; - }; + packages = lib.mapAttrs' (type: content: { + name = type; - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + value = lib.mapAttrs' (variantName: variant: { + name = variantName; + value = callPackage ./generic.nix { inherit prefix type variantName variant; }; + }) content; + }) (lib.importJSON ./variants.json); +in packages // { + # Not using `symlinkJoin` because it's massively inefficient in this case + full = runCommand "${prefix}_full" { + preferLocalBuild = true; - dontBuild = true; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + gnome-themes-extra + ]; + } '' + mkdir -p $out/share/{icons,themes,${prefix}} - installPhase = '' - runHook preInstall - mkdir -p $out/share/themes - cp -a themes/* $out/share/themes - runHook postInstall + ${lib.concatStrings (lib.forEach (lib.attrValues (lib.attrsets.mergeAttrsList (lib.attrValues packages))) (variant: + '' + ln -s ${variant}/share/${variant.ptype}/Tokyonight-${variant.pvariant} $out/share/${variant.ptype}/Tokyonight-${variant.pvariant} + ln -s ${variant}/share/${prefix}/LICENSE $out/share/${prefix}/LICENSE 2>/dev/null || true + '' + ))} ''; - - meta = with lib; { - description = "A GTK theme based on the Tokyo Night colour palette."; - homepage = "www.pling.com/p/1681315/"; - license = licenses.gpl3Only; - platforms = platforms.unix; - maintainers = with lib.maintainers; [ garaiza-93 ]; - }; } diff --git a/pkgs/data/themes/tokyo-night-gtk/generic.nix b/pkgs/data/themes/tokyo-night-gtk/generic.nix new file mode 100644 index 00000000000..35bf498666d --- /dev/null +++ b/pkgs/data/themes/tokyo-night-gtk/generic.nix @@ -0,0 +1,77 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, writeScript +, gtk-engine-murrine +, gnome-themes-extra +, prefix ? "" +, type ? "" +, variantName ? "" +, variant ? "" +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "${prefix}_${type}-${variantName}"; + version = "unstable-2023-05-30"; + + src = fetchFromGitHub { + owner = "Fausto-Korpsvart"; + repo = "Tokyo-Night-GTK-Theme"; + rev = "e9790345a6231cd6001f1356d578883fac52233a"; + hash = "sha256-Q9UnvmX+GpvqSmTwdjU4hsEsYhA887wPqs5pyqbIhmc="; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + gnome-themes-extra + ]; + + dontPatch = true; + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{${type},${prefix}} + cp -a ${type}/Tokyonight-${variant} $out/share/${type} + cp -a LICENSE $out/share/${prefix} + + runHook postInstall + ''; + + passthru = { + updateScript = writeScript "update.sh" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts tree jq + res="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -sL "https://api.github.com/repos/${finalAttrs.src.owner}/${finalAttrs.src.repo}/commits/HEAD")" + + rev="$(echo $res | jq '.sha' --raw-output)" + version="unstable-$(echo $res | jq '.commit | .author | .date' --raw-output | sed 's/T.*$//')" + update-source-version ${prefix}-variants.${type}.${variantName} "$version" "$rev" --ignore-same-hash + + commonjq1='.[] .contents .[] | {(.name): .name} | walk(if type=="object" then with_entries(.key|=ascii_downcase) else . end)' + commonjq2='reduce inputs as $in (.; . + $in)' + commontree="-dJ -L 1 --noreport ${finalAttrs.src}" + + echo $(tree $commontree/icons | jq "$commonjq1" | jq "$commonjq2" | jq '{icons: .}') \ + $(tree $commontree/themes | jq "$commonjq1" | jq "$commonjq2" | jq '{themes: .}') | \ + jq 'reduce inputs as $in (.; . + $in)' | sed "s/[tT]okyonight-//g" > \ + "$(git rev-parse --show-toplevel)/pkgs/data/themes/${prefix}/variants.json" + ''; + + # For "full" in default.nix + ptype = type; + pvariant = variant; + }; + + meta = with lib; { + description = "A GTK theme based on the Tokyo Night colour palette"; + homepage = "https://www.pling.com/p/1681315"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ garaiza-93 Madouura ]; + }; +}) diff --git a/pkgs/data/themes/tokyo-night-gtk/variants.json b/pkgs/data/themes/tokyo-night-gtk/variants.json new file mode 100644 index 00000000000..6489d9c649d --- /dev/null +++ b/pkgs/data/themes/tokyo-night-gtk/variants.json @@ -0,0 +1,18 @@ +{ + "icons": { + "dark": "Dark", + "dark-cyan": "Dark-Cyan", + "light": "Light", + "moon": "Moon" + }, + "themes": { + "dark-b": "Dark-B", + "dark-bl": "Dark-BL", + "dark-b-lb": "Dark-B-LB", + "dark-bl-lb": "Dark-BL-LB", + "storm-b": "Storm-B", + "storm-bl": "Storm-BL", + "storm-b-lb": "Storm-B-LB", + "storm-bl-lb": "Storm-BL-LB" + } +} diff --git a/pkgs/data/themes/utterly-nord-plasma/default.nix b/pkgs/data/themes/utterly-nord-plasma/default.nix new file mode 100644 index 00000000000..4fbb0f5b8a8 --- /dev/null +++ b/pkgs/data/themes/utterly-nord-plasma/default.nix @@ -0,0 +1,63 @@ +{ lib +, stdenv +, fetchFromGitHub +, breeze-icons +, kdeclarative +, kirigami2 +, plasma-framework +, plasma-workspace +}: + +stdenv.mkDerivation rec { + pname = "utterly-nord-plasma"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "HimDek"; + repo = pname; + rev = "6d9ffe008f0bee47c8346c9a7ec71f206d999fd0"; + hash = "sha256-B5pIwV0BHxDluKWKTy+xuBPaE3N6UOHXip1SIAm2kM8="; + }; + + propagatedUserEnvPkgs = [ + breeze-icons + kdeclarative.bin + kirigami2 + plasma-framework.bin + plasma-workspace + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{color-schemes,Kvantum,plasma/look-and-feel,sddm/themes,wallpapers,konsole} + + cp -a look-and-feel $out/share/plasma/look-and-feel/Utterly-Nord + cp -a look-and-feel-solid $out/share/plasma/look-and-feel/Utterly-Nord-solid + cp -a look-and-feel-light $out/share/plasma/look-and-feel/Utterly-Nord-light + cp -a look-and-feel-light-solid $out/share/plasma/look-and-feel/Utterly-Nord-light-solid + + cp -a *.colors $out/share/color-schemes/ + + cp -a wallpaper $out/share/wallpapers/Utterly-Nord + + cp -a kvantum $out/share/Kvantum/Utterly-Nord + cp -a kvantum-solid $out/share/Kvantum/Utterly-Nord-Solid + cp -a kvantum-light $out/share/Kvantum/Utterly-Nord-Light + cp -a kvantum-light-solid $out/share/Kvantum/Utterly-Nord-Light-Solid + + cp -a *.colorscheme $out/share/konsole/ + + cp -a sddm $out/share/sddm/themes/Utterly-Nord + + runHook postInstall + ''; + + meta = with lib; { + description = "A Plasma theme with Nordic Colors, transparency, blur and round edges for UI elements"; + homepage = "https://himdek.com/Utterly-Nord-Plasma/"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/utterly-round-plasma-style/default.nix b/pkgs/data/themes/utterly-round-plasma-style/default.nix new file mode 100644 index 00000000000..40bdb2f71d8 --- /dev/null +++ b/pkgs/data/themes/utterly-round-plasma-style/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "utterly-round-plasma-style"; + version = "2.1"; + + src = fetchFromGitHub { + owner = "HimDek"; + repo = pname; + rev = "c3677d5223286f69871f6745cdb3b71367229d40"; + hash = "sha256-mlqRMz0cAZnnM4xE6p7fMzhGlqCQcM4FxmDlVnbGUgQ="; + }; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/{aurorae/themes,plasma/desktoptheme} + + cp -a aurorae/dark/translucent $out/share/aurorae/themes/Utterly-Round-Dark + cp -a aurorae/dark/solid $out/share/aurorae/themes/Utterly-Round-Dark-Solid + cp -a aurorae/light/translucent $out/share/aurorae/themes/Utterly-Round-Light + cp -a aurorae/light/solid $out/share/aurorae/themes/Utterly-Round-Light-Solid + + cp -a desktoptheme/translucent $out/share/plasma/desktoptheme/Utterly-Round + cp -a desktoptheme/solid $out/share/plasma/desktoptheme/Utterly-Round-Solid + + runHook postInstall + ''; + + meta = with lib; { + description = "A rounded desktop theme and window borders for Plasma 5 that follows any color scheme"; + homepage = "https://himdek.com/Utterly-Round-Plasma-Style/"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/themes/where-is-my-sddm-theme/default.nix b/pkgs/data/themes/where-is-my-sddm-theme/default.nix index 8151ca0cc13..13ea576b3fb 100644 --- a/pkgs/data/themes/where-is-my-sddm-theme/default.nix +++ b/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/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index c01c8e08166..fb9a63b21f1 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/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-10-13"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "sha256-RGYD2+ZTUTPyFbaHvXU9VD3W6WTNeg3ifY+DAR3MmtI="; + sha256 = "sha256-H8QdKCX6C36J7AfFd0VV9Rnm8LGXSfkxj5Yp2p+PduE="; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index b72bcd6c7c3..1490b5db79d 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 = "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 ]; @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ubuntu/yaru"; license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ]; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k amaxine ]; + maintainers = with maintainers; [ moni amaxine ]; }; } |