diff options
Diffstat (limited to 'nixpkgs/pkgs/data')
98 files changed, 987 insertions, 379 deletions
diff --git a/nixpkgs/pkgs/data/documentation/anarchism/default.nix b/nixpkgs/pkgs/data/documentation/anarchism/default.nix index 5b63e104d9db..3acb215db14a 100644 --- a/nixpkgs/pkgs/data/documentation/anarchism/default.nix +++ b/nixpkgs/pkgs/data/documentation/anarchism/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { domain = "salsa.debian.org"; owner = "debian"; repo = pname; - rev = "debian%2F${version}"; # %2F = urlquote("/") + rev = "debian/${version}"; sha256 = "04ylk0y5b3jml2awmyz7m1hnymni8y1n83m0k6ychdh0px8frhm5"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/share/doc/anarchism $out/share/applications $out/share/icons/hicolor/scalable/apps + mkdir -p $out/share/doc/anarchism $out/share/applications $out/share/icons/hicolor/scalable/apps cp -r {html,markdown} $out/share/doc/anarchism cp debian/anarchism.svg $out/share/icons/hicolor/scalable/apps cp debian/anarchism.desktop $out/share/applications diff --git a/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix b/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix index 294f210c21ff..a344dbca2f38 100644 --- a/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/nixpkgs/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "3.36.2"; + version = "3.38.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0n4rbrq5zww6gjjmicyw5hlvzi8azc6m4sisak15snkp6v4f93qr"; + sha256 = "1h9lyn80zccmgi6gpymabgrcj7km0sb1axll5z490qnx74xbn37m"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/documentation/man-pages/default.nix b/nixpkgs/pkgs/data/documentation/man-pages/default.nix index 58aaf8c47ca8..d4fc2eb98eb4 100644 --- a/nixpkgs/pkgs/data/documentation/man-pages/default.nix +++ b/nixpkgs/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "man-pages"; - version = "5.08"; + version = "5.09"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; - sha256 = "1xzp3f6wvw3wplk1a1x09zfv0jp0pdc9wh95czndh3h8z0qwv9yf"; + sha256 = "1whbxim4diyan97y9pz9k4ck16rmjalw5i1m0dg6ycv3pxv386nz"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; @@ -14,6 +14,10 @@ stdenv.mkDerivation rec { # conflict with shadow-utils rm $out/share/man/man5/passwd.5 \ $out/share/man/man3/getspnam.3 + + # The manpath executable looks up manpages from PATH. And this package won't + # appear in PATH unless it has a /bin folder + mkdir -p $out/bin ''; outputDocdev = "out"; diff --git a/nixpkgs/pkgs/data/fonts/agave/default.nix b/nixpkgs/pkgs/data/fonts/agave/default.nix index 0c2cd1609f61..39ef6e34aaae 100644 --- a/nixpkgs/pkgs/data/fonts/agave/default.nix +++ b/nixpkgs/pkgs/data/fonts/agave/default.nix @@ -2,7 +2,7 @@ let pname = "agave"; - version = "22"; + version = "35"; in fetchurl { name = "${pname}-${version}"; url = "https://github.com/agarick/agave/releases/download/v${version}/Agave-Regular.ttf"; @@ -13,7 +13,7 @@ in fetchurl { install -D $downloadedFile $out/share/fonts/truetype/Agave-Regular.ttf ''; - sha256 = "1jb8f0xcv5z0l5nyx733b6zclswi82vrh2nwyyhbqzgqrl4y1h6s"; + sha256 = "10shwsl1illdafnc352j439lklrxksip1vlh4jc934cr9qf4c1fz"; meta = with lib; { description = "truetype monospaced typeface designed for X environments"; diff --git a/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix b/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix index 30738a3c3cd3..7f934658479a 100644 --- a/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix +++ b/nixpkgs/pkgs/data/fonts/cascadia-code/default.nix @@ -1,13 +1,13 @@ { lib, fetchzip }: let - version = "2008.25"; + version = "2009.22"; in fetchzip { name = "cascadia-code-${version}"; url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip"; - sha256 = "182ssznm6f5fhykmqqvimq7ihmxkc64gh76faqxg1ihdyzqgi2y6"; + sha256 = "0wdkjzaf5a14yfiqqqn6wvi6db6r7g1m5r07cg9730b0mkzhfyhl"; postFetch = '' mkdir -p $out/share/fonts/ diff --git a/nixpkgs/pkgs/data/fonts/comic-neue/default.nix b/nixpkgs/pkgs/data/fonts/comic-neue/default.nix index d50e89743425..13a40b8c0a06 100644 --- a/nixpkgs/pkgs/data/fonts/comic-neue/default.nix +++ b/nixpkgs/pkgs/data/fonts/comic-neue/default.nix @@ -2,33 +2,26 @@ stdenv.mkDerivation rec { pname = "comic-neue"; - version = "2.5"; + version = "2.51"; src = fetchzip { url = "http://comicneue.com/${pname}-${version}.zip"; - sha256 = "1kc0yyha6cc584vcl9z1cq1z6prgkxk93g75mr8gapfdrj25dp3q"; + sha256 = "sha256-DjRZtFnJOtZnxhfpgU5ihZFAonRK608/BQztCAExIU0="; stripRoot = false; # because it comes with a __MACOSX directory }; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,EOT,WOFF,WOFF2}} + mkdir -pv $out/share/{doc/${pname}-${version},fonts/{opentype,truetype,WOFF,WOFF2}} cp -v ${pname}-${version}/{FONTLOG,OFL-FAQ,OFL}.txt $out/share/doc/ + cp -v ${pname}-${version}/Booklet-ComicNeue.pdf $out/share/doc/ cp -v ${pname}-${version}/OTF/ComicNeue-Angular/*.otf $out/share/fonts/opentype cp -v ${pname}-${version}/OTF/ComicNeue/*.otf $out/share/fonts/opentype cp -v ${pname}-${version}/TTF/ComicNeue-Angular/*.ttf $out/share/fonts/truetype cp -v ${pname}-${version}/TTF/ComicNeue/*.ttf $out/share/fonts/truetype - cp -v ${pname}-${version}/WebFonts/eot/ComicNeue-Angular/*.eot $out/share/fonts/EOT - cp -v ${pname}-${version}/WebFonts/eot/ComicNeue/*.eot $out/share/fonts/EOT - cp -v ${pname}-${version}/WebFonts/woff/ComicNeue-Angular/*.woff $out/share/fonts/WOFF - cp -v ${pname}-${version}/WebFonts/woff/ComicNeue/*.woff $out/share/fonts/WOFF - cp -v ${pname}-${version}/WebFonts/woff2/ComicNeue/*.woff2 $out/share/fonts/WOFF2 - - # Quick fix for conflicting names in upstream - for i in ${pname}-${version}/WebFonts/woff2/ComicNeue-Angular/*.woff2; do - cp -v $i $out/share/fonts/WOFF2/`basename $i|sed -e 's|ComicNeue|ComicNeue-Angular|'` - done + cp -v ${pname}-${version}/WebFonts/*.woff $out/share/fonts/WOFF + cp -v ${pname}-${version}/WebFonts/*.woff2 $out/share/fonts/WOFF2 ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/data/fonts/cozette/default.nix b/nixpkgs/pkgs/data/fonts/cozette/default.nix index a5bc752c4caf..3550facfc114 100644 --- a/nixpkgs/pkgs/data/fonts/cozette/default.nix +++ b/nixpkgs/pkgs/data/fonts/cozette/default.nix @@ -19,7 +19,7 @@ fetchzip rec { ''; meta = with lib; { - description = "A bitmap programming font optimized for coziness."; + description = "A bitmap programming font optimized for coziness"; homepage = "https://github.com/slavfox/cozette"; license = licenses.mit; platforms = platforms.all; diff --git a/nixpkgs/pkgs/data/fonts/eunomia/default.nix b/nixpkgs/pkgs/data/fonts/eunomia/default.nix index e68f528ff383..272649582c35 100644 --- a/nixpkgs/pkgs/data/fonts/eunomia/default.nix +++ b/nixpkgs/pkgs/data/fonts/eunomia/default.nix @@ -19,7 +19,7 @@ fetchzip { meta = with lib; { homepage = "http://dotcolon.net/font/eunomia/"; - description = "A futuristic decorative font."; + description = "A futuristic decorative font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; license = licenses.ofl; diff --git a/nixpkgs/pkgs/data/fonts/f5_6/default.nix b/nixpkgs/pkgs/data/fonts/f5_6/default.nix index 175648198cee..112111faa3d7 100644 --- a/nixpkgs/pkgs/data/fonts/f5_6/default.nix +++ b/nixpkgs/pkgs/data/fonts/f5_6/default.nix @@ -19,7 +19,7 @@ fetchzip { meta = with lib; { homepage = "http://dotcolon.net/font/${pname}/"; - description = "A weighted decorative font."; + description = "A weighted decorative font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; license = licenses.ofl; diff --git a/nixpkgs/pkgs/data/fonts/ferrum/default.nix b/nixpkgs/pkgs/data/fonts/ferrum/default.nix index fe40252ab23d..3f122d22daf5 100644 --- a/nixpkgs/pkgs/data/fonts/ferrum/default.nix +++ b/nixpkgs/pkgs/data/fonts/ferrum/default.nix @@ -19,7 +19,7 @@ fetchzip { meta = with lib; { homepage = "http://dotcolon.net/font/${pname}/"; - description = "A decorative font."; + description = "A decorative font"; platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; license = licenses.cc0; diff --git a/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix b/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix index c8d2d1c2a9ee..4222b802d55c 100644 --- a/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -21,7 +21,7 @@ in fetchurl rec { sha256 = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37"; meta = { - description = "Pan-unicode version of Fixedsys, a classic DOS font."; + description = "Pan-unicode version of Fixedsys, a classic DOS font"; homepage = "http://www.fixedsysexcelsior.com/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.publicDomain; diff --git a/nixpkgs/pkgs/data/fonts/fraunces/default.nix b/nixpkgs/pkgs/data/fonts/fraunces/default.nix new file mode 100644 index 000000000000..d5879d6c2bc4 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/fraunces/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchzip }: +let + version = "1.000"; +in +fetchzip { + name = "fraunces-${version}"; + + url = "https://github.com/undercasetype/Fraunces/releases/download/${version}/UnderCaseType_Fraunces_${version}.zip"; + + sha256 = "0qgl140qkn9p87x7pk60fd3lj206y5h0fq2xkcj2qiv3sxbqxwqb"; + + postFetch = '' + mkdir -p $out/share/fonts/ + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; + + meta = with lib; { + description = "A display, “Old Style” soft-serif typeface inspired by early 20th century typefaces"; + homepage = "https://github.com/undercasetype/Fraunces"; + license = licenses.ofl; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/google-fonts/default.nix b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix index 7a3b488212df..153f37c88e0a 100644 --- a/nixpkgs/pkgs/data/fonts/google-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/google-fonts/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation { pname = "google-fonts"; version = "2019-07-14"; + outputs = [ "out" "adobeBlank" ]; + src = fetchFromGitHub { owner = "google"; repo = "fonts"; @@ -39,6 +41,9 @@ stdenv.mkDerivation { ''; installPhase = '' + adobeBlankDest=$adobeBlank/share/fonts/truetype + install -m 444 -Dt $adobeBlankDest ofl/adobeblank/AdobeBlank-Regular.ttf + rm -r ofl/adobeblank dest=$out/share/fonts/truetype find . -name '*.ttf' -exec install -m 444 -Dt $dest '{}' + ''; diff --git a/nixpkgs/pkgs/data/fonts/inter/default.nix b/nixpkgs/pkgs/data/fonts/inter/default.nix index 9c7ef62c7690..ed8e9eb13a63 100644 --- a/nixpkgs/pkgs/data/fonts/inter/default.nix +++ b/nixpkgs/pkgs/data/fonts/inter/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "3.11"; + version = "3.15"; in fetchzip { name = "inter-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype ''; - sha256 = "1bk4q478jy84ylgm1mmh23n8cw1cd3k7gvfih77sd7ya1zv26vl1"; + sha256 = "0dnxczy2avc47wq5fc3psd1zbxbsjz5w24rkh5ynrfgw6n0753n0"; meta = with lib; { homepage = "https://rsms.me/inter/"; diff --git a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index 0f88aa05e4cf..fbae89bcf013 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -1,28 +1,39 @@ -{ stdenv, fetchzip }: +{ stdenv, lib, fetchurl, iosevka, unzip +, variant ? "" +}: let - version = "3.4.6"; -in fetchzip { - name = "iosevka-bin-${version}"; + name = "iosevka" + lib.optionalString (variant != "") "-" + variant; - url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-iosevka-${version}.zip"; + variantHashes = import ./variants.nix; + validVariants = map (lib.removePrefix "iosevka-") + (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); +in stdenv.mkDerivation rec { + pname = "${name}-bin"; + version = "4.2.0"; - postFetch = '' + src = fetchurl { + url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; + sha256 = variantHashes.${name} or (throw '' + No such variant "${variant}" for package iosevka-bin. + Valid variants are: ${lib.concatStringsSep ", " validVariants}. + ''); + }; + + nativeBuildInputs = [ unzip ]; + + phases = [ "unpackPhase" ]; + + unpackPhase = '' mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttc -d $out/share/fonts/truetype + unzip -d $out/share/fonts/truetype $src ''; - sha256 = "1nab49gkpxahwvvw39xcc32q425qkccr7ffmz87jbcdv71qy7pp9"; - - meta = with stdenv.lib; { - homepage = "https://be5invis.github.io/Iosevka/"; - downloadPage = "https://github.com/be5invis/Iosevka/releases"; - description = '' - Slender monospace sans-serif and slab-serif typeface inspired by Pragmata - Pro, M+ and PF DIN Mono, designed to be the ideal font for programming. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.cstrahan ]; + meta = iosevka.meta // { + maintainers = with lib.maintainers; [ + cstrahan + ]; }; + + passthru.updateScript = ./update-bin.sh; } diff --git a/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 5167c494fa07..989c2d39c19e 100644 --- a/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal -, ttfautohint-nox, otfcc +, ttfautohint-nox # Custom font set options. # See https://github.com/be5invis/Iosevka#build-your-own-style @@ -27,23 +27,30 @@ assert (privateBuildPlan != null) -> set != null; +let + # We don't know the attribute name for the Iosevka package as it + # changes not when our update script is run (which in turn updates + # node-packages.json, but when node-packages/generate.sh is run + # (which updates node-packages.nix). + # + # Doing it this way ensures that the package can always be built, + # although possibly an older version than ioseva-bin. + nodeIosevka = ( + lib.findSingle + (drv: drv ? packageName && drv.packageName == "iosevka") + (throw "no 'iosevka' package found in nodePackages") + (throw "multiple 'iosevka' packages found in nodePackages") + (lib.attrValues nodePackages) + ).override (drv: { dontNpmInstall = true; }); +in stdenv.mkDerivation rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - - version = "3.2.2"; - - src = fetchFromGitHub { - owner = "be5invis"; - repo = "Iosevka"; - rev = "v${version}"; - sha256 = "1wbnp6gr3ywvspwk6i0jn68zwjmsd38arn4n2dkh7mdkrmvah81k"; - }; + inherit (nodeIosevka) version src; nativeBuildInputs = [ nodejs - nodePackages."iosevka-build-deps-../../data/fonts/iosevka" + nodeIosevka remarshal - otfcc ttfautohint-nox ]; @@ -58,12 +65,10 @@ stdenv.mkDerivation rec { remarshal -i "$privateBuildPlanJSONPath" -o private-build-plans.toml -if json -of toml ''} ${lib.optionalString (extraParameters != null) '' - echo -e "\n" >> parameters.toml - cat "$extraParametersPath" >> parameters.toml + echo -e "\n" >> params/parameters.toml + cat "$extraParametersPath" >> params/parameters.toml ''} - ln -s ${ - nodePackages."iosevka-build-deps-../../data/fonts/iosevka" - }/lib/node_modules/iosevka-build-deps/node_modules . + ln -s ${nodeIosevka}/lib/node_modules/iosevka/node_modules . runHook postConfigure ''; @@ -74,13 +79,19 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall fontdir="$out/share/fonts/truetype" install -d "$fontdir" install "dist/$pname/ttf"/* "$fontdir" + runHook postInstall ''; enableParallelBuilding = true; + passthru = { + updateScript = ./update-default.sh; + }; + meta = with stdenv.lib; { homepage = "https://be5invis.github.io/Iosevka"; downloadPage = "https://github.com/be5invis/Iosevka/releases"; @@ -96,6 +107,7 @@ stdenv.mkDerivation rec { ttuegel babariviere rileyinman + AluisioASG ]; }; } diff --git a/nixpkgs/pkgs/data/fonts/iosevka/package.json b/nixpkgs/pkgs/data/fonts/iosevka/package.json deleted file mode 100644 index bc772960882d..000000000000 --- a/nixpkgs/pkgs/data/fonts/iosevka/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "iosevka-build-deps", - "version": "3.2.2", - "scripts": { - "build": "verda -f verdafile.js" - }, - "dependencies": { - "@iarna/toml": "^2.2.5", - "cldr": "^5.5.4", - "ejs": "^3.1.3", - "fs-extra": "^9.0.0", - "object-assign": "^4.1.1", - "otfcc-ttcize": "^0.10.2", - "patel": "^0.33.1", - "prettier": "^2.0.5", - "semver": "^7.1.3", - "spiro": "^2.0.0", - "stylus": "^0.54.7", - "topsort": "^0.0.2", - "ttf2woff": "^2.0.1", - "ttf2woff2": "^3.0.0", - "typo-geom": "^0.8.0", - "unicode-13.0.0": "^0.8.0", - "unorm": "^1.6.0", - "verda": "^1.0.1", - "which": "^2.0.2" - } -} diff --git a/nixpkgs/pkgs/data/fonts/iosevka/update-bin.sh b/nixpkgs/pkgs/data/fonts/iosevka/update-bin.sh new file mode 100755 index 000000000000..a402f152d8a1 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/iosevka/update-bin.sh @@ -0,0 +1,28 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq + +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +release=$(curl -s https://api.github.com/repos/be5invis/Iosevka/releases/latest) + +oldVersion=$(nix-instantiate --eval -E 'with import ../../../.. {}; lib.getVersion iosevka-bin' | tr -d '"') +version=$(echo "$release" | jq -r .tag_name | tr -d v) + +if test "$oldVersion" = "$version"; then + echo "New version same as old version, nothing to do." >&2 + exit 0 +fi + +sed -i "s/$oldVersion/$version/" bin.nix + +{ + echo '# This file was autogenerated. DO NOT EDIT!' + echo '{' + for asset in $(echo "$release" | jq -r '.assets[].name | select(startswith("ttc"))'); do + printf ' %s = "%s";\n' \ + $(echo "$asset" | sed -r "s/^ttc-(.*)-$version.zip$/\1/") \ + $(nix-prefetch-url "https://github.com/be5invis/Iosevka/releases/download/v$version/$asset") + done + echo '}' +} >variants.nix diff --git a/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh b/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh new file mode 100755 index 000000000000..208ea6101ac2 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts coreutils gawk replace +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +nixpkgs=../../../.. +repo=https://github.com/be5invis/Iosevka + +# Discover the latest version. +current_version=$(nix-instantiate "$nixpkgs" --eval --strict -A iosevka.version | tr -d '"') +new_version=$(list-git-tags "$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }') +if [[ "$new_version" == "$current_version" ]]; then + echo "iosevka: no update found" + exit +fi + +# Update the source package in nodePackages. +current_source="$repo/archive/v$current_version.tar.gz" +new_source="$repo/archive/v$new_version.tar.gz" +replace-literal -ef "$current_source" "$new_source" ../../../development/node-packages/node-packages.json +echo "iosevka: $current_version -> $new_version (after nodePackages update)" diff --git a/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix new file mode 100644 index 000000000000..5cb0b53114d1 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -0,0 +1,24 @@ +# This file was autogenerated. DO NOT EDIT! +{ + iosevka = "1s9nyq8gjmmah5rpflffl0wi0klnlsvzmy7b39vnpp2sp6ng9mv3"; + iosevka-aile = "0x2ccjnmi9hqms5jkfnkn30y9gd3adiwjvn9gzq8d6a563h61fik"; + iosevka-curly = "03n0f9nzjywb5q3w59ck5sq500ks5xxlgf9dpncr3c7i2dawss41"; + iosevka-curly-slab = "09qnd2vzl4v59c0d534mj06zxwa3rdwrhkwy191v6p79lfxp482x"; + iosevka-etoile = "0j3ah72dmk7fzcln9755y3xnzn7343lfrg95kb3xmqm2zyg0mbrw"; + iosevka-slab = "0prnm3nh8rgn6jivfj2fw7x12m8qqam8xnl45ip5ck4348piypx3"; + iosevka-sparkle = "1y180rwrxrvwd98hk1d07y0vs8h5rj7ipkhsqlv60h82pigxhl4a"; + iosevka-ss01 = "04q9vby5q9ylvv2myl3h2xfyq3s594wnwj0b956pivwwamhp0g3v"; + iosevka-ss02 = "14d5i88ls8zfbis5s7z95dcrpxqyqr2wzx90c5a4xpcdjd4n7fgg"; + iosevka-ss03 = "1zqqq11rcjmifc4qf5p2xcqhqp5ca2pgvzv8xirr6mq4knrvxrpq"; + iosevka-ss04 = "1xnnqyvyrz820dzfyjj84v3j1q8krykmwxw5xml4v7kk79agc7vk"; + iosevka-ss05 = "07w78jw23hxwzx65ampwzv691p12n0pvk8vnw2mnnspflirpm62r"; + iosevka-ss06 = "11brqklhk3sfhqyavyi5rggsn3286n404gphmh0frz65wj3k8lc6"; + iosevka-ss07 = "037vaxpgdpa6p9nmqcsa1mi7pn94300cd71kbr9lw8mql9wc2y9n"; + iosevka-ss08 = "0ga1bwb2d1rizr0910bcqabcj819dcd0bxp7cwbxnzq6i7ca4hj1"; + iosevka-ss09 = "1khjhn0lfpk8g1yx3558w6kkj0pd5b7kxbf0z97w1nvah3d5v50m"; + iosevka-ss10 = "0zp5173799vacssj0lsj3ck82b03qyk9cyfwa3j7xa2dhplrjfp2"; + iosevka-ss11 = "124a3i7iy9z7adxcb8yw3795gk52cw7ngsim8qjhrhcd2bjr0jvg"; + iosevka-ss12 = "1rd61ry3ihw311c926wjl9sc71bz0ligya07m7km1905dhlhirsv"; + iosevka-ss13 = "0jm3djc4rlzk22jn3syv4mwd0fz82z4lnyk3dkq815yyw6vmqkz0"; + iosevka-ss14 = "1a9a1bvzsbprmxfh19m78s82rfmxng4sambz6m4gd9mm14kjjp5r"; +} diff --git a/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix b/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix index b198486327d7..42012e43d4bf 100644 --- a/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/nixpkgs/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,26 +1,24 @@ { lib, fetchzip }: let - version = "2.002"; + version = "2.221"; in fetchzip { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "018lhxi9m8aprls6cnpndzdg5snijwzm22m2pxxi6zcqxrcxh8vb"; + sha256 = "1in3znnj0i0yfwj93ncxi3s1cp9lhgwnv2r14br47rr7vik4zjr6"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.eot -d $out/share/fonts/eot - unzip -j $downloadedFile \*.woff -d $out/share/fonts/woff - unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; meta = with lib; { description = "A typeface made for developers"; homepage = "https://jetbrains.com/mono/"; + changelog = "https://github.com/JetBrains/JetBrainsMono/blob/v${version}/Changelog.md"; license = licenses.ofl; maintainers = [ maintainers.marsam ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/data/fonts/joypixels/default.nix b/nixpkgs/pkgs/data/fonts/joypixels/default.nix index 1b107f9cb82f..c19a55400fcb 100644 --- a/nixpkgs/pkgs/data/fonts/joypixels/default.nix +++ b/nixpkgs/pkgs/data/fonts/joypixels/default.nix @@ -1,24 +1,103 @@ -{ stdenv, fetchurl }: +{ stdenv +, fetchurl +, config +, acceptLicense ? config.joypixels.acceptLicense or false +}: + +let + inherit (stdenv.hostPlatform.parsed) kernel; + + systemSpecific = { + darwin = rec { + systemTag = "nix-darwin"; + capitalized = systemTag; + fontFile = "JoyPixels-SBIX.ttf"; + }; + }.${kernel.name} or rec { + systemTag = "nixos"; + capitalized = "NixOS"; + fontFile = "joypixels-android.ttf"; + }; + + joypixels-free-license = with systemSpecific; { + spdxId = "LicenseRef-JoyPixels-Free-6.0"; + fullName = "JoyPixels Free License Agreement 6.0"; + url = "https://cdn.joypixels.com/distributions/${systemTag}/license/free-license.pdf"; + free = false; + }; + + joypixels-license-appendix = with systemSpecific; { + spdxId = "LicenseRef-JoyPixels-NixOS-Appendix"; + fullName = "JoyPixels ${capitalized} License Appendix"; + url = "https://cdn.joypixels.com/distributions/${systemTag}/appendix/joypixels-license-appendix.pdf"; + free = false; + }; + + throwLicense = throw '' + Use of the JoyPixels font requires acceptance of the license. + - ${joypixels-free-license.fullName} [1] + - ${joypixels-license-appendix.fullName} [2] + + You can express acceptance by setting acceptLicense to true in your + configuration. Note that this is not a free license so it requires allowing + unfree licenses. + + configuration.nix: + nixpkgs.config.allowUnfree = true; + nixpkgs.config.joypixels.acceptLicense = true; + + config.nix: + allowUnfree = true; + joypixels.acceptLicense = true; + + [1]: ${joypixels-free-license.url} + [2]: ${joypixels-license-appendix.url} + ''; + +in stdenv.mkDerivation rec { pname = "joypixels"; version = "6.0.0"; - src = fetchurl { - url = "https://cdn.joypixels.com/arch-linux/font/${version}/joypixels-android.ttf"; - sha256 = "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s"; - }; + src = assert !acceptLicense -> throwLicense; + with systemSpecific; fetchurl { + name = fontFile; + url = "https://cdn.joypixels.com/distributions/${systemTag}/font/${version}/${fontFile}"; + sha256 = { + darwin = "1s1dibgpv4lc9cwbgykgwjxxhg2rbn5g9fyd10r6apj9xhfn8cyn"; + }.${kernel.name} or "1vxqsqs93g4jyp01r47lrpcm0fmib2n1vysx32ksmfxmprimb75s"; + }; dontUnpack = true; - installPhase = '' - install -Dm644 $src $out/share/fonts/truetype/joypixels.ttf + installPhase = with systemSpecific; '' + runHook preInstall + + install -Dm644 $src $out/share/fonts/truetype/${fontFile} + + runHook postInstall ''; meta = with stdenv.lib; { - description = "Emoji as a Service (formerly EmojiOne)"; - homepage = "https://www.joypixels.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ jtojnar ]; + description = "The finest emoji you can use legally (formerly EmojiOne)"; + longDescription = '' + New for 2020! JoyPixels 6.0 includes 3,342 originally crafted icon + designs and is 100% Unicode 13 compatible. We offer the largest selection + of files ranging from png, svg, iconjar, sprites, and fonts. + ''; + homepage = "https://www.joypixels.com/fonts"; + license = + let + free-license = joypixels-free-license; + appendix = joypixels-license-appendix; + in with systemSpecific; { + spdxId = "LicenseRef-JoyPixels-Free-6.0-with-${capitalized}-Appendix"; + fullName = "${free-license.fullName} with ${appendix.fullName}"; + url = free-license.url; + appendixUrl = appendix.url; + free = false; + }; + maintainers = with maintainers; [ toonn jtojnar ]; }; } diff --git a/nixpkgs/pkgs/data/fonts/julia-mono/default.nix b/nixpkgs/pkgs/data/fonts/julia-mono/default.nix new file mode 100644 index 000000000000..8774913c83cc --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/julia-mono/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchzip }: + +let + version = "0.022"; +in fetchzip { + name = "JuliaMono-${version}"; + url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono.zip"; + sha256 = "sha256-/MVT6n842sSiuPZNYxN3q1vn6yvMvmcTEDyvAd2GikA="; + + postFetch = '' + mkdir -p $out/share/fonts/truetype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; + + meta = { + description = "A monospaced font for scientific and technical computing"; + maintainers = with lib.maintainers; [ suhr ]; + platforms = with lib.platforms; all; + homepage = "https://juliamono.netlify.app/"; + license = lib.licenses.ofl; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/lato/default.nix b/nixpkgs/pkgs/data/fonts/lato/default.nix index 2b9f6c1114f0..76effcf97cd0 100644 --- a/nixpkgs/pkgs/data/fonts/lato/default.nix +++ b/nixpkgs/pkgs/data/fonts/lato/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "lato-2.0"; - url = "http://www.latofonts.com/download/Lato2OFL.zip"; + url = "https://www.latofonts.com/download/Lato2OFL.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -13,7 +13,7 @@ fetchzip { sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5"; meta = with lib; { - homepage = "http://www.latofonts.com/"; + homepage = "https://www.latofonts.com/"; description = '' Sans-serif typeface family designed in Summer 2010 by Łukasz Dziedzic diff --git a/nixpkgs/pkgs/data/fonts/lmmath/default.nix b/nixpkgs/pkgs/data/fonts/lmmath/default.nix index a66bd48c897a..0530141317b8 100644 --- a/nixpkgs/pkgs/data/fonts/lmmath/default.nix +++ b/nixpkgs/pkgs/data/fonts/lmmath/default.nix @@ -15,7 +15,7 @@ in fetchzip rec { sha256 = "05k145bxgxjh7i9gx1ahigxfpc2v2vwzsy2mc41jvvg51kjr8fnn"; meta = with lib; { - description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth."; + description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth"; homepage = "http://www.gust.org.pl/projects/e-foundry/lm-math"; # "The Latin Modern Math font is licensed under the GUST Font License (GFL), # which is a free license, legally equivalent to the LaTeX Project Public diff --git a/nixpkgs/pkgs/data/fonts/merriweather/default.nix b/nixpkgs/pkgs/data/fonts/merriweather/default.nix index 1768c44bc03c..d1b3359df26e 100644 --- a/nixpkgs/pkgs/data/fonts/merriweather/default.nix +++ b/nixpkgs/pkgs/data/fonts/merriweather/default.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { homepage = "https://github.com/SorkinType/Merriweather"; - description = "Merriweather was designed to be a text face that is pleasant to read on screens"; + description = "A text face designed to be pleasant to read on screens"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ emily ]; diff --git a/nixpkgs/pkgs/data/fonts/meslo-lgs-nf/default.nix b/nixpkgs/pkgs/data/fonts/meslo-lgs-nf/default.nix new file mode 100644 index 000000000000..36ce33cd7d2d --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/meslo-lgs-nf/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "meslo-lgs-nf"; + version = "2020-03-22"; + + src = fetchFromGitHub { + owner = "romkatv"; + repo = "powerlevel10k-media"; + rev = "32c7d40239c93507277f14522be90b5750f442c9"; + sha256 = "10hq4whai1rqj495w4n80p0y21am8rihm4rc40xq7241d6dzilrd"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp $src/*.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "Meslo Nerd Font patched for Powerlevel10k"; + homepage = "https://github.com/romkatv/powerlevel10k-media"; + license = licenses.asl20; + maintainers = with maintainers; [ bbigras ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/monoid/default.nix b/nixpkgs/pkgs/data/fonts/monoid/default.nix index f62f4961fc7a..48dc121af459 100644 --- a/nixpkgs/pkgs/data/fonts/monoid/default.nix +++ b/nixpkgs/pkgs/data/fonts/monoid/default.nix @@ -1,19 +1,25 @@ -{ stdenv, fetchFromGitHub, python2 }: -# Python 3 support requires https://github.com/larsenwork/monoid/pull/233 to be merged +{ stdenv, fetchFromGitHub, fetchpatch, python3 }: stdenv.mkDerivation { pname = "monoid"; - version = "2016-07-21"; + version = "2018-06-03"; src = fetchFromGitHub { owner = "larsenwork"; repo = "monoid"; - rev = "e9d77ec18c337dc78ceae787a673328615f0b120"; - sha256 = "07h5q6cn6jjpmxp9vyag1bxx481waz344sr2kfs7d37bba8yjydj"; + rev = "a331c7c5f402c449f623e0d0895bd2fd8dc30ccf"; + sha256 = "sha256-RV6lxv5CjywTMcuPMj6rdjLKrap7zLJ7niaNeF//U1Y="; }; + patches = [ + (fetchpatch { + url = "https://github.com/larsenwork/monoid/pull/233/commits/f84f2ed61301ee84dadd16351314394f22ebed2f.patch"; + sha256 = "sha256-CxfFHlR7TB64pvrfzVfUDkPwuRO2UdGOhXwW98c+oQU="; + }) + ]; + nativeBuildInputs = [ - (python2.withPackages (pp: with pp; [ + (python3.withPackages (pp: with pp; [ fontforge ])) ]; diff --git a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix index e99060118026..25836b64cea0 100644 --- a/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix @@ -142,6 +142,10 @@ in # remove check for virtualenv, since we handle # python requirements using python.withPackages sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile + + # Make the build verbose so it won't get culled by Hydra thinking that + # it somehow got stuck doing nothing. + sed -i 's;\t@;\t;' Makefile ''; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/data/fonts/open-sans/default.nix b/nixpkgs/pkgs/data/fonts/open-sans/default.nix index e92f75802521..ecca50537f1d 100644 --- a/nixpkgs/pkgs/data/fonts/open-sans/default.nix +++ b/nixpkgs/pkgs/data/fonts/open-sans/default.nix @@ -9,7 +9,7 @@ in fetchFromGitLab { domain = "salsa.debian.org"; owner = "fonts-team"; repo = "fonts-open-sans"; - rev = "debian%2F1.11-1"; # URL-encoded form of "debian/1.11-1" tag + rev = "debian/1.11-1"; postFetch = '' tar xf $downloadedFile --strip=1 mkdir -p $out/share/fonts/truetype diff --git a/nixpkgs/pkgs/data/fonts/recursive/default.nix b/nixpkgs/pkgs/data/fonts/recursive/default.nix index 39d63e7dd990..ff5070b1bd7a 100644 --- a/nixpkgs/pkgs/data/fonts/recursive/default.nix +++ b/nixpkgs/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.064"; + version = "1.069"; in fetchzip { name = "recursive-${version}"; @@ -12,10 +12,9 @@ fetchzip { mkdir -p $out/share/fonts/ unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype - unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "1pbrqk848nkaambvsz0n8f88xdm8hyib83in27rmal739qh9d1z6"; + sha256 = "07l35vkarj8f748vbnca98zrl0yl456ddqf1wpmshs24r97cx96h"; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/nixpkgs/pkgs/data/fonts/scheherazade/default.nix b/nixpkgs/pkgs/data/fonts/scheherazade/default.nix index e7651f22d6a0..8639d29066c3 100644 --- a/nixpkgs/pkgs/data/fonts/scheherazade/default.nix +++ b/nixpkgs/pkgs/data/fonts/scheherazade/default.nix @@ -1,11 +1,16 @@ -{ lib, fetchzip }: +{ lib, fetchzip, version ? "3.000" }: let - version = "2.100"; + new = lib.versionAtLeast version "3.000"; + sha256 = { + "2.100" = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; + "3.000" = "12sd2mjqb80ijc73y7p0iw6j3wy9i60a3aar3ywrxz4khpya48jw"; + }."${version}"; + in fetchzip rec { - name = "scheherazade-${version}"; + name = "scheherazade${lib.optionalString new "-new"}-${version}"; - url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade-${version}.zip"; + url = "http://software.sil.org/downloads/r/scheherazade/Scheherazade${lib.optionalString new "New"}-${version}.zip"; postFetch = '' mkdir -p $out/share/{doc,fonts} @@ -15,16 +20,17 @@ in fetchzip rec { unzip -j $downloadedFile \*/documentation/\* -d $out/share/doc/${name}/documentation ''; - sha256 = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; + inherit sha256; meta = with lib; { homepage = "https://software.sil.org/scheherazade/"; description = "A font designed in a similar style to traditional Naskh typefaces"; longDescription = '' - Scheherazade, named after the heroine of the classic Arabian Nights tale, - is designed in a similar style to traditional typefaces such as Monotype - Naskh, extended to cover the Unicode Arabic repertoire through Unicode - 8.0. + + Scheherazade${lib.optionalString new " New"}, named after the heroine of + the classic Arabian Nights tale, is designed in a similar style to + traditional typefaces such as Monotype Naskh, extended to cover the + Unicode Arabic repertoire through Unicode ${if new then "13.0" else "8.0"}. Scheherazade provides a “simplified” rendering of Arabic script, using basic connecting glyphs but not including a wide variety of additional diff --git a/nixpkgs/pkgs/data/fonts/stix-two/default.nix b/nixpkgs/pkgs/data/fonts/stix-two/default.nix index e6e4009020ae..1e32ebbf16a9 100644 --- a/nixpkgs/pkgs/data/fonts/stix-two/default.nix +++ b/nixpkgs/pkgs/data/fonts/stix-two/default.nix @@ -1,25 +1,22 @@ -{ stdenv, fetchFromGitHub }: - +{ lib, fetchzip }: let - version = "2.0.2"; -in fetchFromGitHub { + version = "2.10"; +in +fetchzip { name = "stix-two-${version}"; - owner = "stipub"; - repo = "stixfonts"; - rev = "v${version}"; + url = "https://github.com/stipub/stixfonts/raw/v${version}/zipfiles/STIX${builtins.replaceStrings [ "." ] [ "_" ] version}-all.zip"; + + sha256 = "1xvh5c5asbasfa333mizimvdp209g0lppbwv2p0cg3ixfpxgq4dl"; postFetch = '' - tar xf $downloadedFile --strip=1 - install -m444 -Dt $out/share/fonts/opentype/ OTF/*.otf - install -m444 -Dt $out/share/fonts/woff/ WOFF/*.woff - install -m444 -Dt $out/share/fonts/woff2/ WOFF2/*.woff2 + mkdir -p $out/share/fonts/ + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "1ah8s0cb67yv4ll8zfs01mdh9m5i2lbkrfbmkhi1xdid6pxsk32x"; - - meta = with stdenv.lib; { - homepage = "http://www.stixfonts.org/"; + meta = with lib; { + homepage = "https://www.stixfonts.org/"; description = "Fonts for Scientific and Technical Information eXchange"; license = licenses.ofl; platforms = platforms.all; diff --git a/nixpkgs/pkgs/data/fonts/sudo/default.nix b/nixpkgs/pkgs/data/fonts/sudo/default.nix index 48ca0fea1e42..f21fdb184161 100644 --- a/nixpkgs/pkgs/data/fonts/sudo/default.nix +++ b/nixpkgs/pkgs/data/fonts/sudo/default.nix @@ -1,11 +1,11 @@ { lib, fetchzip }: let - version = "0.50"; + version = "0.52"; in fetchzip { name = "sudo-font-${version}"; - url = "https://github.com/jenskutilek/sudo-font/raw/v${version}/dist/sudo.zip"; - sha256 = "1mk81r9p7ks6av3rj06c6n9vx2qv2hwx6zfbc2mk1filxjirk1ll"; + url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; + sha256 = "1j5p7apclyy5gfj2kklmgcncdsp5iik4gd6mdl29anzijknd0kja"; postFetch = '' mkdir -p $out/share/fonts/ @@ -21,4 +21,3 @@ in fetchzip { platforms = platforms.all; }; } - diff --git a/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix b/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix new file mode 100644 index 000000000000..1115b48b7095 --- /dev/null +++ b/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchzip }: +let + version = "2020-11-14"; +in +fetchzip { + name = "ttf-tw-moe"; + + url = "https://github.com/Jiehong/TW-fonts/archive/${version}.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile TW-fonts-${version}/\*.ttf -d $out/share/fonts/truetype + ''; + + sha256 = "1jd3gjjfa4vadp6d499n0irz5b22z611kd7q5qgqf6s2fwbxfhiz"; + + meta = with stdenv.lib; { + homepage = "http://www.moe.gov.tw/"; + description = "Set of KAI and SONG fonts from the Ministry of Education of Taiwan"; + version = version; + longDescription = '' + Installs 2 TTF fonts: MOESongUN and TW-MOE-Std-Kai. + Both are provided by the Ministry of Education of Taiwan; each character's shape + closely follows the official recommendation, and can be used as for teaching purposes. + ''; + license = licenses.cc-by-nd-30; + maintainers = [ maintainers.jiehong ]; + platforms = platforms.all; + }; +} diff --git a/nixpkgs/pkgs/data/fonts/unifont/default.nix b/nixpkgs/pkgs/data/fonts/unifont/default.nix index 685b5c452f2d..3a9f107c4c7e 100644 --- a/nixpkgs/pkgs/data/fonts/unifont/default.nix +++ b/nixpkgs/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "13.0.01"; + version = "13.0.05"; ttf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; - sha256 = "0y5bd7i5hp9ks6d3qq0bshywba7g90i3074wckpn9m8shh98ngcg"; + sha256 = "0ff7zbyqi45q0171rl9ckj6lpfhcj8a9850d8j89m7wbwky32isf"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - sha256 = "05zgz00n514cijqh9qcvr4iz0bla4hd028cvi1jlh0ic6fkafix8"; + sha256 = "16n666p6rs6l4r8grh67gy4ls33qfnbb5xk7cksywzjwdh42js0r"; }; nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; diff --git a/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix b/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix index 153c6272ca20..04480aaeec72 100644 --- a/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix +++ b/nixpkgs/pkgs/data/fonts/unifont_upper/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "12.1.03"; + version = "13.0.05"; in fetchzip rec { name = "unifont_upper-${version}"; @@ -9,7 +9,7 @@ in fetchzip rec { postFetch = "install -Dm644 $downloadedFile $out/share/fonts/truetype/unifont_upper.ttf"; - sha256 = "1w0bg276cyv6xs6clld8gv4w88rj9fw9rc8zs9ahc6y9hv677knj"; + sha256 = "1cpi44fzsiq3yqg38763awgri1ma46421c3v8167bsxzsx7vzlkp"; meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; diff --git a/nixpkgs/pkgs/data/fonts/vegur/default.nix b/nixpkgs/pkgs/data/fonts/vegur/default.nix index af6c00e32c88..2f03dac3914b 100644 --- a/nixpkgs/pkgs/data/fonts/vegur/default.nix +++ b/nixpkgs/pkgs/data/fonts/vegur/default.nix @@ -18,7 +18,7 @@ in fetchzip { meta = with lib; { homepage = "http://dotcolon.net/font/vegur/"; - description = "A humanist sans serif font."; + description = "A humanist sans serif font"; platforms = platforms.all; maintainers = [ maintainers.samueldr ]; license = licenses.cc0; diff --git a/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix b/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix index df7a6e5383bf..3a5ee616a0ef 100644 --- a/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix +++ b/nixpkgs/pkgs/data/fonts/vista-fonts/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchzip, cabextract}: +{ stdenv, fetchzip, cabextract }: fetchzip { name = "vista-fonts-1"; @@ -21,7 +21,7 @@ fetchzip { done ''; - sha256 = "1l27zg5jraa16zm11d3qz1w7m6f1ih3xy5avww454ylm50fw6z11"; + sha256 = "sha256-x7JSXS9Q1fzlJTVR+MAS3f2+cmo/H0s1qkY9FPjx2zI="; meta = { description = "Some TrueType fonts from Microsoft Windows Vista (Calibri, Cambria, Candara, Consolas, Constantia, Corbel)"; diff --git a/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix b/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix index 09491b904ef1..e57482b191b7 100644 --- a/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix +++ b/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub +{ stdenv, fetchFromGitHub, fetchpatch, makeFontsConf , inkscape, xcursorgen, bc }: stdenv.mkDerivation rec { @@ -12,11 +12,23 @@ stdenv.mkDerivation rec { sha256 = "0652ydy73x29z7wc6ccyqihmfg4bk0ksl7yryycln6c7i0iqfmc9"; }; + patches = [ + # Fixes the build on inscape => 1.0, without this it generates empty cursor files + (fetchpatch { + name = "inkscape-1.0-compat"; + url = "https://github.com/keeferrourke/capitaine-cursors/commit/9da0b53e6098ed023c5c24c6ef6bfb1f68a79924.patch"; + sha256 = "0lx5i60ahy6a2pir4zzlqn5lqsv6claqg8mv17l1a028h9aha3cv"; + }) + ]; + postPatch = '' patchShebangs . ''; - buildInputs =[ + # Complains about not being able to find the fontconfig config file otherwise + FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; }; + + buildInputs = [ inkscape xcursorgen bc @@ -36,14 +48,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = '' - An x-cursor theme inspired by macOS and based on KDE Breeze - ''; + description = "An x-cursor theme inspired by macOS and based on KDE Breeze"; homepage = "https://github.com/keeferrourke/capitaine-cursors"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ - eadwu - ]; + maintainers = with maintainers; [ eadwu ]; }; } diff --git a/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix index b0b115f096f2..aea76738d82f 100644 --- a/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-icon-theme"; - version = "20200116"; + version = "20200710"; src = fetchFromGitHub { owner = "daniruiz"; repo = "flat-remix"; rev = version; - sha256 = "14n5wydhd5ifmsbj770s2qg2ksd3xa3m61qxydid6jq39k0lxbd8"; + sha256 = "0rlrmgimvs9rrj64g5jn04jgyi7wmn2dnsk7ckmxk6p8cdfjd0hx"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh index 0fd9bf85d831..df7cac08b058 100644 --- a/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh +++ b/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh @@ -28,17 +28,17 @@ symlinkParentIconThemes() { theme_name="${theme%/*}" theme_name="${theme_name##*/}" echo " theme: $theme_name" - inheritance=$(sed -rne 's,^Inherits=(.*)$,\1,p' $theme) + inheritance=$(sed -rne 's,^Inherits=(.*)$,\1,p' "$theme") IFS=',' read -ra parent_themes <<< "$inheritance" for parent_theme in "${parent_themes[@]}"; do parent_path="" if [ -e "$out/share/icons/$parent_theme" ]; then - parent_path="$(realpath $out/share/icons/$parent_theme)" + parent_path="$(realpath "$out/share/icons/$parent_theme")" else IFS=':' read -ra dirs <<< $XDG_ICON_DIRS for parent_dir in "${dirs[@]}"; do if [ -e "$parent_dir/icons/$parent_theme/index.theme" ]; then - parent_path=$(realpath "$parent_dir/icons/$parent_theme") + parent_path="$(realpath "$parent_dir/icons/$parent_theme")" ln -s "$parent_path" "$out/share/icons/" break fi diff --git a/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix b/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix index 619fd0205b51..4c6b84479a7a 100644 --- a/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix +++ b/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-jade"; - version = "1.23"; + version = "1.24"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1q29ikfssn1vmwws3dry4ssq6b44afd9sb7dwv3rdqg0frabpj1m"; + sha256 = "1bns1f3vv7d7ps08plnhl3432cy2l2mhv85h7n4fifjqqi8bll9x"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix index 8fe21aabe36f..165801f52eb8 100644 --- a/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iconpack-obsidian"; - version = "4.13"; + version = "4.14"; src = fetchFromGitHub { owner = "madmaxms"; repo = pname; rev = "v${version}"; - sha256 = "1hh0hnd2d08l4n5r73fkngv08f8230pp94k9qq8xgmchvjfg6j8y"; + sha256 = "1rhs8k88gh6673flr22cb3gbbw37wyzhd6jyysx6qgjjsnjvl2h8"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/nixpkgs/pkgs/data/icons/luna-icons/default.nix b/nixpkgs/pkgs/data/icons/luna-icons/default.nix index 3125df5fe1cf..b0de2ac3b132 100644 --- a/nixpkgs/pkgs/data/icons/luna-icons/default.nix +++ b/nixpkgs/pkgs/data/icons/luna-icons/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "luna-icons"; - version = "2020-08-09"; + version = "0.9.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; - rev = "d32aacabcc018212c460833327e1b54a716a5a23"; - sha256 = "1f1ypxcvmd97afn7612i8gxmbrj80vx45vqrrh3n0p65jw5lg7zc"; + rev = version; + sha256 = "0mz5cayjgsc109nv7kdkn3gn1n79bl3hb773lrzrr0k2zblxg353"; }; nativeBuildInputs = [ @@ -35,8 +35,14 @@ stdenv.mkDerivation rec { mkdir -p $out/share/icons cp -a Luna* $out/share/icons + # remove files with spaces in the name, otherwise + # gtk-update-icon-cache fails with the message "The generated cache + # was invalid" + # https://github.com/darkomarko42/Luna-Icons/issues/2 + rm "$out/share/icons/Luna/scalable/apps/yast-checkmedia (copia).svg" + for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme + gtk-update-icon-cache "$theme" done runHook postInstall diff --git a/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix index ee539981fbca..2a6dbc512acc 100644 --- a/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix @@ -1,4 +1,12 @@ -{ stdenv, fetchFromGitLab, cmake, extra-cmake-modules, gtk3, kdeFrameworks, hicolor-icon-theme }: +{ stdenv +, fetchFromGitLab +, cmake +, extra-cmake-modules +, gtk3 +, plasma-framework +, kwindowsystem +, hicolor-icon-theme +}: stdenv.mkDerivation { pname = "maia-icon-theme"; @@ -17,8 +25,8 @@ stdenv.mkDerivation { cmake extra-cmake-modules gtk3 - kdeFrameworks.plasma-framework - kdeFrameworks.kwindowsystem + plasma-framework + kwindowsystem ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix b/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix index d0411a8c5697..7ff3c4ca23c4 100644 --- a/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, inkscape, xcursorgen }: +{ stdenv, fetchFromGitHub, fetchpatch, inkscape, xcursorgen }: stdenv.mkDerivation rec { version = "1.1"; @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ inkscape xcursorgen ]; + patches = [ + # Remove when https://github.com/numixproject/numix-cursor-theme/pull/7 is merged + (fetchpatch { + url = "https://github.com/stephaneyfx/numix-cursor-theme/commit/3b647bf768cebb8f127b88e3786f6a9640460197.patch"; + sha256 = "174kmhlvv76wwvndkys78aqc32051sqg3wzc0xg6b7by4agrbg76"; + name = "support-inkscape-1-in-numix-cursor-theme.patch"; + }) + ]; + buildPhase = '' patchShebangs . HOME=$TMP ./build.sh diff --git a/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index f43ca473f0dd..ef06c2e2532a 100644 --- a/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "20.07.11"; + version = "20.09.19"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0vj3d3wb12ksnkm99s32k7nrf9m5j83zzvkd0rwk8l0b30df975j"; + sha256 = "1rqlq5ssxqj0nc0i8av7zprj94km5645xzqi5j5i0sxd3jbmyfjx"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index 51a2100d3aa3..b0b4e20073a4 100644 --- a/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "20.07.11"; + version = "20.09.19"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "07jy8l2r6grn7pabn3dnkc8j7xdykl7k57br30c6v61ss8paf2rw"; + sha256 = "0afraarfcd66mpidmn0l90wif8kmwzdj3s09g704kwszyijxs80z"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index 9227ceb49158..0f4d0d1d90c7 100644 --- a/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20200801"; + version = "20200901"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "0w9ks8izxv7mkh82fnclfcdf6mif991dsbbnxsqmcbvljrmjval2"; + sha256 = "00khqbd7jz97q1kd43kkm6yaa40ml36rh04s76sgbm58srs66v3c"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix index 2a9a895b6caf..1d677f1457df 100644 --- a/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-icon-theme"; - version = "2020-06-22"; + version = "2020-11-22"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "0s5fhwfhn4qgk198jw736byxdrfm42l5m681pllbhg02j8ld4iik"; + sha256 = "04rkpsiz8jg9i55mslsh7a6wgyp30ja3xss7qacqimdab236300d"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix b/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix index a8dc4539a7dd..d406ae50e1c3 100644 --- a/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix +++ b/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "zayronxio"; repo = pname; - rev = "${version}"; + rev = version; sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv"; }; diff --git a/nixpkgs/pkgs/data/misc/cacert/default.nix b/nixpkgs/pkgs/data/misc/cacert/default.nix index f72431c5a27c..ad8c39831736 100644 --- a/nixpkgs/pkgs/data/misc/cacert/default.nix +++ b/nixpkgs/pkgs/data/misc/cacert/default.nix @@ -1,6 +1,10 @@ { stdenv, fetchurl, nss, python3 , blacklist ? [] -, includeEmail ? false + +# Used for tests only +, runCommand +, cacert +, openssl }: with stdenv.lib; @@ -13,12 +17,17 @@ let sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy"; }; + version = "3.60"; + underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation { - name = "nss-cacert-${nss.version}"; + name = "nss-cacert-${version}"; - src = nss.src; + src = fetchurl { + url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/nss-${version}.tar.gz"; + sha256 = "hKvVV1q4dMU65RG9Rh5dCGjRobOE7kB1MVTN0dWQ/j0="; + }; outputs = [ "out" "unbundled" ]; @@ -32,11 +41,6 @@ stdenv.mkDerivation { EOF cat ${certdata2pem} > certdata2pem.py - patch -p1 < ${./fix-unicode-ca-names.patch} - ${optionalString includeEmail '' - # Disable CAs used for mail signing - substituteInPlace certdata2pem.py --replace \[\'CKA_TRUST_EMAIL_PROTECTION\'\] ''' - ''} ''; buildPhase = '' @@ -60,11 +64,60 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; + passthru.updateScript = ./update.sh; + passthru.tests = { + # Test that building this derivation with a blacklist works, and that UTF-8 is supported. + blacklist-utf8 = let + blacklistCAToFingerprint = { + # "blacklist" uses the CA name from the NSS bundle, but we check for presence using the SHA256 fingerprint. + "CFCA EV ROOT" = "5C:C3:D7:8E:4E:1D:5E:45:54:7A:04:E6:87:3E:64:F9:0C:F9:53:6D:1C:CC:2E:F8:00:F3:55:C4:C5:FD:70:FD"; + "NetLock Arany (Class Gold) Főtanúsítvány" = "6C:61:DA:C3:A2:DE:F0:31:50:6B:E0:36:D2:A6:FE:40:19:94:FB:D1:3D:F9:C8:D4:66:59:92:74:C4:46:EC:98"; + }; + mapBlacklist = f: concatStringsSep "\n" (mapAttrsToList f blacklistCAToFingerprint); + in runCommand "verify-the-cacert-filter-output" { + cacert = cacert.unbundled; + cacertWithExcludes = (cacert.override { + blacklist = builtins.attrNames blacklistCAToFingerprint; + }).unbundled; + + nativeBuildInputs = [ openssl ]; + } '' + isPresent() { + # isPresent <unbundled-dir> <ca name> <ca sha256 fingerprint> + for f in $1/etc/ssl/certs/*.crt; do + fingerprint="$(openssl x509 -in "$f" -noout -fingerprint -sha256 | cut -f2 -d=)" + if [[ "x$fingerprint" == "x$3" ]]; then + return 0 + fi + done + return 1 + } + + # Ensure that each certificate is in the main "cacert". + ${mapBlacklist (caName: caFingerprint: '' + isPresent "$cacert" "${caName}" "${caFingerprint}" || ({ + echo "CA fingerprint ${caFingerprint} (${caName}) is missing from the CA bundle. Consider picking a different CA for the blacklist test." >&2 + exit 1 + }) + '')} + + # Ensure that each certificate is NOT in the "cacertWithExcludes". + ${mapBlacklist (caName: caFingerprint: '' + isPresent "$cacertWithExcludes" "${caName}" "${caFingerprint}" && ({ + echo "CA fingerprint ${caFingerprint} (${caName}) is present in the cacertWithExcludes bundle." >&2 + exit 1 + }) + '')} + + touch $out + ''; + }; + meta = { homepage = "https://curl.haxx.se/docs/caextract.html"; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ andir fpletz lukegb ]; license = licenses.mpl20; }; } diff --git a/nixpkgs/pkgs/data/misc/cacert/fix-unicode-ca-names.patch b/nixpkgs/pkgs/data/misc/cacert/fix-unicode-ca-names.patch deleted file mode 100644 index 07d3629196a7..000000000000 --- a/nixpkgs/pkgs/data/misc/cacert/fix-unicode-ca-names.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/certdata2pem.py 2017-08-01 23:10:00.000000000 +0300 -+++ b/certdata2pem.py 2017-08-01 23:08:21.131297636 +0300 -@@ -88,7 +88,7 @@ - \# Read blacklist. - blacklist = [] - if os.path.exists('blacklist.txt'): -- for line in open('blacklist.txt', 'r'): -+ for line in io.open('blacklist.txt', 'r', encoding='utf-8'): - line = line.strip() - if line.startswith('#') or len(line) == 0: - continue -@@ -101,7 +101,7 @@ - if obj['CKA_CLASS'] != 'CKO_NSS_TRUST': - continue - if obj['CKA_LABEL'] in blacklist: -- print("Certificate %s blacklisted, ignoring." % obj['CKA_LABEL']) -+ print("Certificate %s blacklisted, ignoring." % unicode(obj['CKA_LABEL']).encode('utf-8')) - elif obj['CKA_TRUST_SERVER_AUTH'] == 'CKT_NSS_TRUSTED_DELEGATOR': - trust[obj['CKA_LABEL']] = True - elif obj['CKA_TRUST_EMAIL_PROTECTION'] == 'CKT_NSS_TRUSTED_DELEGATOR': diff --git a/nixpkgs/pkgs/data/misc/cacert/update.sh b/nixpkgs/pkgs/data/misc/cacert/update.sh new file mode 100755 index 000000000000..7bf3d46cb02f --- /dev/null +++ b/nixpkgs/pkgs/data/misc/cacert/update.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix common-updater-scripts jq + +# Build both the cacert package and an overriden version where we use the source attribute of NSS. +# Cacert and NSS are both from the same upstream sources. They are decoupled as +# the cacert output only cares about a few infrequently changing files in the +# sources while the NSS source code changes frequently. +# +# By having cacert on a older source revision that produces the same +# certificate output as a newer version we can avoid large amounts of +# unnecessary rebuilds. +# +# As of this writing there are a few magnitudes more packages depending on +# cacert than on nss. + + +set -ex + +BASEDIR="$(dirname "$0")/../../../.." + + +CURRENT_PATH=$(nix-build --no-out-link -A cacert.out) +PATCHED_PATH=$(nix-build --no-out-link -E "with import $BASEDIR {}; (cacert.overrideAttrs (_: { inherit (nss) src version; })).out") + +# Check the hash of the etc subfolder +# We can't check the entire output as that contains the nix-support folder +# which contains the output path itself. +CURRENT_HASH=$(nix-hash "$CURRENT_PATH/etc") +PATCHED_HASH=$(nix-hash "$PATCHED_PATH/etc") + +if [[ "$CURRENT_HASH" != "$PATCHED_HASH" ]]; then + NSS_VERSION=$(nix-instantiate --json --eval -E "with import $BASEDIR {}; nss.version" | jq -r .) + update-source-version cacert "$NSS_VERSION" +fi diff --git a/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix b/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix index 5df7343f3be7..a14e13749589 100644 --- a/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix +++ b/nixpkgs/pkgs/data/misc/combinatorial_designs/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { ''; license = licenses.publicDomain; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix b/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix index 48b538fe1833..d6413439dede 100644 --- a/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix +++ b/nixpkgs/pkgs/data/misc/conway_polynomials/default.nix @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Contains a small database of Conway polynomials."; + description = "Contains a small database of Conway polynomials"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix b/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix index 49b8736b0846..9b296487670d 100644 --- a/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix +++ b/nixpkgs/pkgs/data/misc/elliptic_curves/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/nixpkgs/pkgs/data/misc/fedora-backgrounds/default.nix b/nixpkgs/pkgs/data/misc/fedora-backgrounds/default.nix new file mode 100644 index 000000000000..31bc28a9f9c1 --- /dev/null +++ b/nixpkgs/pkgs/data/misc/fedora-backgrounds/default.nix @@ -0,0 +1,23 @@ +{ callPackage, lib, fetchurl }: + +let + fedoraBackground = callPackage ./generic.nix { }; +in { + f32 = fedoraBackground rec { + version = "32.2.2"; + src = fetchurl { + url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz"; + hash = "sha256-1F75aae7Jj7M2IPn/vWKcUF+O5mZ0Yey7hWuFj/4Fhg="; + }; + }; + + f33 = fedoraBackground rec { + version = "33.0.7"; + src = fetchurl { + url = "https://github.com/fedoradesign/backgrounds/releases/download/v${version}/f${lib.versions.major version}-backgrounds-${version}.tar.xz"; + hash = "sha256-lAn5diEYebCo2ZJCOn9rD87rOasUU0qnSOr0EnZKW4o="; + }; + # Fix broken symlinks in the Xfce background directory. + patches = [ ./f33-fix-xfce-path.patch ]; + }; +} diff --git a/nixpkgs/pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch b/nixpkgs/pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch new file mode 100644 index 000000000000..eabdacddaa53 --- /dev/null +++ b/nixpkgs/pkgs/data/misc/fedora-backgrounds/f33-fix-xfce-path.patch @@ -0,0 +1,15 @@ +diff --git a/default/Makefile b/default/Makefile +index ec8095a..9391f8f 100644 +--- a/default/Makefile ++++ b/default/Makefile +@@ -48,8 +48,8 @@ install: + + #~ XFCE background + $(MKDIR) $(XFCE_BG_DIR) +- $(LN_S) ../default/$(WP_NAME)-02-day.png \ ++ $(LN_S) ../../backgrounds/$(WP_NAME)/default/$(WP_NAME)-02-day.png \ + $(XFCE_BG_DIR)/$(WP_NAME).png + for tod in 01-dawn 03-dusk 04-night; do \ +- $(LN_S) ../default/$(WP_NAME)-$${tod}.png $(XFCE_BG_DIR)/$(WP_NAME)-$${tod}.png; \ ++ $(LN_S) ../../backgrounds/$(WP_NAME)/default/$(WP_NAME)-$${tod}.png $(XFCE_BG_DIR)/$(WP_NAME)-$${tod}.png; \ + done; diff --git a/nixpkgs/pkgs/data/misc/fedora-backgrounds/generic.nix b/nixpkgs/pkgs/data/misc/fedora-backgrounds/generic.nix new file mode 100644 index 000000000000..e191dd027e8f --- /dev/null +++ b/nixpkgs/pkgs/data/misc/fedora-backgrounds/generic.nix @@ -0,0 +1,42 @@ +{ stdenvNoCC +, coreutils +}: + +{ version +, src +, patches ? [ ] +}: + +stdenvNoCC.mkDerivation { + inherit patches src version; + + pname = "fedora${stdenvNoCC.lib.versions.major version}-backgrounds"; + + dontBuild = true; + + postPatch = '' + for f in default/Makefile extras/Makefile; do + substituteInPlace $f \ + --replace "usr/share" "share" \ + --replace "/usr/bin/" "" \ + --replace "/bin/" "" + done + + for f in $(find . -name '*.xml'); do + substituteInPlace $f \ + --replace "/usr/share" "$out/share" + done; + ''; + + installFlags = [ + "DESTDIR=$(out)" + ]; + + meta = with stdenvNoCC.lib; { + homepage = "https://github.com/fedoradesign/backgrounds"; + description = "A set of default and supplemental wallpapers for Fedora"; + license = licenses.cc-by-sa-40; + platforms = platforms.unix; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/nixpkgs/pkgs/data/misc/graphs/default.nix b/nixpkgs/pkgs/data/misc/graphs/default.nix index 14551c6a4a47..bf7f8d4fd0e8 100644 --- a/nixpkgs/pkgs/data/misc/graphs/default.nix +++ b/nixpkgs/pkgs/data/misc/graphs/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "A database of graphs"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/nixpkgs/pkgs/data/misc/hackage/default.nix b/nixpkgs/pkgs/data/misc/hackage/default.nix index 7089ca52a3c0..351ca123df20 100644 --- a/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/513c2f50baa5338bbe40a93cb328e1fe973df09c.tar.gz"; - sha256 = "1j5lch66x82ysqfq97jq5sm0f58cdm0vjvy4wpkcm1akgnkkycq3"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/f20dd1d767313d653d6f0c6dd9a82f92d36ecb4c.tar.gz"; + sha256 = "1prawfbp6390dlgfvd3hxvgdab7rfkr88j35m5cbk3a4hxghkyj3"; } diff --git a/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix index d12eec8d8e32..9721d0834758 100644 --- a/nixpkgs/pkgs/data/misc/osinfo-db/default.nix +++ b/nixpkgs/pkgs/data/misc/osinfo-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20200804"; + version = "20201119"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "1gx8yky41kz2f03r7gvxgq8naysnrf8apsss61xqaxmmyd080z0v"; + sha256 = "1a0c42rh3anl3wy4hpg36s8k37y8zxpi5lc67wjwnj4j6mwi7w3l"; }; nativeBuildInputs = [ osinfo-db-tools gettext libxml2 ]; diff --git a/nixpkgs/pkgs/data/misc/pari-galdata/default.nix b/nixpkgs/pkgs/data/misc/pari-galdata/default.nix index b07be5a0c050..644a50a8ddeb 100644 --- a/nixpkgs/pkgs/data/misc/pari-galdata/default.nix +++ b/nixpkgs/pkgs/data/misc/pari-galdata/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = "http://pari.math.u-bordeaux.fr/"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix b/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix index 01ffd6db64fb..a9c9a62839ce 100644 --- a/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix +++ b/nixpkgs/pkgs/data/misc/pari-seadata-small/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = "http://pari.math.u-bordeaux.fr/"; license = licenses.gpl2Plus; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/nixpkgs/pkgs/data/misc/polytopes_db/default.nix b/nixpkgs/pkgs/data/misc/polytopes_db/default.nix index 8fec9a854260..95ca8af82a7b 100644 --- a/nixpkgs/pkgs/data/misc/polytopes_db/default.nix +++ b/nixpkgs/pkgs/data/misc/polytopes_db/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Reflexive polytopes database"; license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ timokau ]; + maintainers = teams.sage.members; }; } diff --git a/nixpkgs/pkgs/data/misc/poppler-data/default.nix b/nixpkgs/pkgs/data/misc/poppler-data/default.nix index c06e63d3e692..717c948f7437 100644 --- a/nixpkgs/pkgs/data/misc/poppler-data/default.nix +++ b/nixpkgs/pkgs/data/misc/poppler-data/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, cmake, ninja }: stdenv.mkDerivation rec { - name = "poppler-data-0.4.9"; + name = "poppler-data-0.4.10"; src = fetchurl { url = "https://poppler.freedesktop.org/${name}.tar.gz"; - sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z"; + sha256 = "0c3vjs3p7rjc4yfacnhd865r27czmzwcr4j2z4jldi68dvvcwbvf"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix b/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix index 6d2c58afdb21..19f02a16f470 100644 --- a/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix +++ b/nixpkgs/pkgs/data/misc/spdx-license-list-data/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spdx-license-list-data"; - version = "3.10"; + version = "3.11"; src = fetchFromGitHub { owner = "spdx"; repo = "license-list-data"; rev = "v${version}"; - sha256 = "1zza0jrs82112dcjqgkyck2b7hv4kg9s10pmlripi6c1rs37av14"; + sha256 = "1iwyqhh6lh51a47mhfy98zvjan8yjsvlym8qz0isx2i1zzxlj47a"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/nixpkgs/pkgs/data/misc/tzdata/default.nix b/nixpkgs/pkgs/data/misc/tzdata/default.nix index 367ee06390cd..5065e3718cb2 100644 --- a/nixpkgs/pkgs/data/misc/tzdata/default.nix +++ b/nixpkgs/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2019c"; + version = "2020c"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr"; + sha256 = "1nab36g5ibs88wg2mzpzygi1wh5gh2al1qjvbk8sb90sbw8ar43q"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn"; + sha256 = "1r5zrk1k3jhhilkhrx82fd19rvysji8jk05gq5v0rndmyx07zacs"; }) ]; @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { "MANDIR=$(man)/share/man" "AWK=awk" "CFLAGS=-DHAVE_LINK=0" + "CFLAGS+=-DZIC_BLOAT_DEFAULT=\\\"fat\\\"" "cc=${stdenv.cc.targetPrefix}cc" "AR=${stdenv.cc.targetPrefix}ar" ]; diff --git a/nixpkgs/pkgs/data/themes/amber/default.nix b/nixpkgs/pkgs/data/themes/amber/default.nix index 589ce716f493..84eaee90fdbc 100644 --- a/nixpkgs/pkgs/data/themes/amber/default.nix +++ b/nixpkgs/pkgs/data/themes/amber/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "amber-theme"; - version = "3.36-1"; + version = "3.36-2"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0dn81ca3kyfz4ql15kl5108gw309cc0c1inmwlch1nq5dslmfjji"; + sha256 = "1g0hkv9sxfxfnpv8x7g64lr2by7wd4k216s3y9xpibsycdbwpyi5"; }; nativeBuildInputs = [ meson ninja sassc ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK, gnome-shell and Xfce theme based on Ubuntu Ambiance"; homepage = "https://github.com/lassekongo83/amber-theme"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/nixpkgs/pkgs/data/themes/ant-theme/ant-dracula.nix b/nixpkgs/pkgs/data/themes/ant-theme/ant-dracula.nix deleted file mode 100644 index e365ab94c300..000000000000 --- a/nixpkgs/pkgs/data/themes/ant-theme/ant-dracula.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, fetchurl, gtk-engine-murrine }: - -let - themeName = "Ant-Dracula"; -in -stdenv.mkDerivation rec { - pname = "ant-dracula-theme"; - version = "1.3.0"; - - src = fetchurl { - url = "https://github.com/EliverLara/${themeName}/releases/download/v${version}/${themeName}.tar"; - sha256 = "00b8w69xapqy8kc7zqwlfz1xpld6hibbh35djvhcnd905gzzymkd"; - }; - - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/themes/${themeName} - cp -a * $out/share/themes/${themeName} - rm -r $out/share/themes/${themeName}/{Art,LICENSE,README.md,gtk-2.0/render-assets.sh} - runHook postInstall - ''; - - meta = with stdenv.lib; { - description = "Dracula variant of the Ant theme"; - homepage = "https://github.com/EliverLara/${themeName}"; - license = licenses.gpl3; - platforms = platforms.all; - maintainers = with maintainers; [ alexarice ]; - }; -} diff --git a/nixpkgs/pkgs/data/themes/arc/default.nix b/nixpkgs/pkgs/data/themes/arc/default.nix index 66be070bdf4a..bbbfbe7fe5c6 100644 --- a/nixpkgs/pkgs/data/themes/arc/default.nix +++ b/nixpkgs/pkgs/data/themes/arc/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , sassc , autoreconfHook -, pkgconfig +, pkg-config , gtk3 , gnome3 , gtk-engine-murrine @@ -13,18 +13,18 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20200819"; + version = "20201013"; src = fetchFromGitHub { owner = "jnsh"; repo = pname; rev = version; - sha256 = "1l5sc4r5jp3526r4p32fszny0cw6pkb45cp424hq0s0k344z9px6"; + sha256 = "1x2l1mwjx68dwf3jb1i90c1q8nqsl1wf2zggcn8im6590k5yv39s"; }; nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config sassc optipng inkscape @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell"; homepage = "https://github.com/jnsh/arc-theme"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ simonvandel romildo ]; }; diff --git a/nixpkgs/pkgs/data/themes/canta/default.nix b/nixpkgs/pkgs/data/themes/canta/default.nix index 8534fe7a5064..c6a6678b98c7 100644 --- a/nixpkgs/pkgs/data/themes/canta/default.nix +++ b/nixpkgs/pkgs/data/themes/canta/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { description = "Flat Design theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/Canta-theme"; license = licenses.gpl2; - platforms = platforms.unix; + platforms = platforms.linux; # numix-icon-theme-circle unavailable in darwin maintainers = [ maintainers.romildo ]; }; } diff --git a/nixpkgs/pkgs/data/themes/dracula-theme/default.nix b/nixpkgs/pkgs/data/themes/dracula-theme/default.nix new file mode 100644 index 000000000000..87afbedf8fb6 --- /dev/null +++ b/nixpkgs/pkgs/data/themes/dracula-theme/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, gtk-engine-murrine }: + +let + themeName = "Dracula"; + version = "2.0"; +in +stdenv.mkDerivation { + pname = "dracula-theme"; + inherit version; + + src = fetchFromGitHub { + owner = "dracula"; + repo = "gtk"; + rev = "v${version}"; + sha256 = "10j706gnhdplhykdisp64vzzxpzgn48b5f1fkndcp340x7hf2mf3"; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes/${themeName} + cp -a {assets,cinnamon,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,index.theme,kde,metacity-1,unity,xfwm4} $out/share/themes/${themeName} + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Dracula variant of the Ant theme"; + homepage = "https://github.com/dracula/gtk"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ alexarice vonfry ]; + }; +} diff --git a/nixpkgs/pkgs/data/themes/greybird/default.nix b/nixpkgs/pkgs/data/themes/greybird/default.nix index 794034af7e7c..2f14988e1b25 100644 --- a/nixpkgs/pkgs/data/themes/greybird/default.nix +++ b/nixpkgs/pkgs/data/themes/greybird/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "greybird"; - version = "3.22.12"; + version = "3.22.13"; src = fetchFromGitHub { owner = "shimmerproject"; repo = pname; rev = "v${version}"; - sha256 = "1j66ddvl3pmwh2v8ajm8r5g5nbsr7r262ff1qn2nf3i0gy8b3lq8"; + sha256 = "154qawiga792iimkpk3a6q8f4gm4r158wmsagkbqqbhj33kxgxhg"; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/data/themes/jade1/default.nix b/nixpkgs/pkgs/data/themes/jade1/default.nix index 47bb7242db32..03dd7a49cda8 100644 --- a/nixpkgs/pkgs/data/themes/jade1/default.nix +++ b/nixpkgs/pkgs/data/themes/jade1/default.nix @@ -1,27 +1,29 @@ -{ stdenv, fetchFromGitHub, gtk-engine-murrine }: +{ stdenv, fetchurl, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.8"; + version = "1.10"; - src = fetchFromGitHub { - owner = "madmaxms"; - repo = "theme-jade-1"; - rev = "v${version}"; - sha256 = "1nvn2ghkdhilrsjpvl7r92aldvbs0nx0xc82jwrfaahi87dgfs8x"; + src = fetchurl { + url = "https://github.com/madmaxms/theme-jade-1/releases/download/v${version}/jade-1-theme.tar.xz"; + sha256 = "17s4r8yjhnz9wrnrma6m8qjp02r47xkjk062sdb8s91dxhh7l8q2"; }; + sourceRoot = "."; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; installPhase = '' + runHook preInstall mkdir -p $out/share/themes cp -a Jade* $out/share/themes + runHook postInstall ''; meta = with stdenv.lib; { description = "Based on Linux Mint theme with dark menus and more intensive green"; homepage = "https://github.com/madmaxms/theme-jade-1"; - license = with licenses; [ gpl3 ]; + license = with licenses; [ gpl3Only ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/nixpkgs/pkgs/data/themes/kde2/default.nix b/nixpkgs/pkgs/data/themes/kde2/default.nix index 547e4f30aa6c..7e33d371ebeb 100644 --- a/nixpkgs/pkgs/data/themes/kde2/default.nix +++ b/nixpkgs/pkgs/data/themes/kde2/default.nix @@ -5,15 +5,16 @@ mkDerivation rec { pname = "kde2-decoration"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "repos-holder"; repo = "kdecoration2-kde2"; rev = version; - sha256 = "1766z9wscybcqvr828xih93b3rab3hb0ghsf818iflhp1xy0js08"; + sha256 = "y2q1j36EURJc7k1huqhEH1Z82PnVSKlfx20bpQWY28c="; }; + outputs = [ "out" "dev" ]; enableParallelBuilding = true; nativeBuildInputs = [ cmake extra-cmake-modules ]; diff --git a/nixpkgs/pkgs/data/themes/lounge/default.nix b/nixpkgs/pkgs/data/themes/lounge/default.nix index cda1a4e7d0b1..a62ff72db6f6 100644 --- a/nixpkgs/pkgs/data/themes/lounge/default.nix +++ b/nixpkgs/pkgs/data/themes/lounge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lounge-gtk-theme"; - version = "1.22"; + version = "1.24"; src = fetchFromGitHub { owner = "monday15"; repo = pname; rev = version; - sha256 = "1y1wkfsv2zrxqcqr53lmr9743mvzcy4swi5j6sxmk1aykx6ccs1p"; + sha256 = "0ima0aa5j296xn4y0d1zj6vcdrdpnihqdidj7bncxzgbnli1vazs"; }; nativeBuildInputs = [ meson ninja sassc gtk3 ]; diff --git a/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix b/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix index 539d1a937bf5..6750c0119968 100644 --- a/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix +++ b/nixpkgs/pkgs/data/themes/marwaita-manjaro/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-manjaro"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0gd6dk7bfhnzmdsmdafc6f0kspnvzpvcmlb8h6q36ifvv0yg3jw4"; + sha256 = "133b9ri1yhvwrm9fm648mq0xnbr9mccy6yar7d390n4659j09v3s"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix b/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix index 1822c36f0770..c7c4efa777bb 100644 --- a/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita-peppermint"; - version = "0.3"; + version = "0.5"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0g1n84px69wjjxclw76d59v8ccs4bkml71kzkvh12s9jcjw4zkc6"; + sha256 = "04j210nw9w4m8n49cd8y3l0qp60rn00i8wdr6kvc7lhkvqwhpnlg"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/data/themes/marwaita-pop_os/default.nix b/nixpkgs/pkgs/data/themes/marwaita-pop_os/default.nix new file mode 100644 index 000000000000..487b54a53e71 --- /dev/null +++ b/nixpkgs/pkgs/data/themes/marwaita-pop_os/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "marwaita-pop_os"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = pname; + rev = version; + sha256 = "1fpzsch9rpq7dmg01ny7jc2vd6dks0fqxxp2rb9jcs0vx5d2fdc6"; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Marwaita* $out/share/themes + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Marwaita GTK theme with Pop_os Linux style"; + homepage = "https://www.pling.com/p/1377894/"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/nixpkgs/pkgs/data/themes/marwaita-ubuntu/default.nix b/nixpkgs/pkgs/data/themes/marwaita-ubuntu/default.nix new file mode 100644 index 000000000000..0241748bc432 --- /dev/null +++ b/nixpkgs/pkgs/data/themes/marwaita-ubuntu/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "marwaita-ubuntu"; + version = "1.5"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = pname; + rev = version; + sha256 = "0mld78s6gl5kfsdaqa7xs5mvfng9600pd2d9sp2b2q5axx7wjay5"; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Marwaita* $out/share/themes + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Ubuntu Style of Marwaita GTK theme"; + homepage = "https://www.pling.com/p/1352833/"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/nixpkgs/pkgs/data/themes/marwaita/default.nix b/nixpkgs/pkgs/data/themes/marwaita/default.nix index 291f437c3ea5..c3ff0bb433a6 100644 --- a/nixpkgs/pkgs/data/themes/marwaita/default.nix +++ b/nixpkgs/pkgs/data/themes/marwaita/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "7.6.1"; + version = "8.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "1n7flwrngwh6gmh72j40apf8qk52162m93hsfhgxzrivkhg37zi0"; + sha256 = "0ljigm5z13r0idfkjgy5ysq9pzdj66ql269p5phhp47aagmjcv3s"; }; buildInputs = [ diff --git a/nixpkgs/pkgs/data/themes/matcha/default.nix b/nixpkgs/pkgs/data/themes/matcha/default.nix index 69b1908b8129..75b9d0f65ed8 100644 --- a/nixpkgs/pkgs/data/themes/matcha/default.nix +++ b/nixpkgs/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha-gtk-theme"; - version = "2020-07-27"; + version = "2020-12-07"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "09kzxd92zqissk0bk3aw06hsa05riq88xvwhlxfw2agig13cfrhw"; + sha256 = "0ch05nz1hipi9fz4sx1pah61jkbjw2gz3binsqayhp76jmp344a1"; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/nixpkgs/pkgs/data/themes/materia-theme/default.nix b/nixpkgs/pkgs/data/themes/materia-theme/default.nix index a93c242d2daf..b5c13960be27 100644 --- a/nixpkgs/pkgs/data/themes/materia-theme/default.nix +++ b/nixpkgs/pkgs/data/themes/materia-theme/default.nix @@ -1,37 +1,55 @@ -{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: +{ stdenv +, fetchFromGitHub +, meson +, ninja +, sassc +, gnome3 +, gtk-engine-murrine +, gdk-pixbuf +, librsvg +}: stdenv.mkDerivation rec { pname = "materia-theme"; - version = "20190912"; + version = "20200916"; src = fetchFromGitHub { owner = "nana-4"; repo = pname; rev = "v${version}"; - sha256 = "07vbql1y9jfd0m34lw1674cfr6217dzg3irk0450kny8sjrrj6dx"; + sha256 = "0qaxxafsn5zd2ysgr0jyv5j73360mfdmxyd55askswlsfphssn74"; }; - nativeBuildInputs = [ glib libxml2 bc ]; + nativeBuildInputs = [ + meson + ninja + sassc + ]; - buildInputs = [ gnome3.gnome-themes-extra gdk-pixbuf librsvg ]; + buildInputs = [ + gnome3.gnome-themes-extra + gdk-pixbuf + librsvg + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; dontBuild = true; - installPhase = '' - patchShebangs install.sh - sed -i install.sh \ - -e "s|if .*which gnome-shell.*;|if true;|" \ - -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}|" - ./install.sh --dest $out/share/themes + mesonFlags = [ + "-Dgnome_shell_version=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}" + ]; + + postInstall = '' rm $out/share/themes/*/COPYING ''; meta = with stdenv.lib; { description = "Material Design theme for GNOME/GTK based desktop environments"; homepage = "https://github.com/nana-4/materia-theme"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = [ maintainers.mounium ]; }; diff --git a/nixpkgs/pkgs/data/themes/mojave/default.nix b/nixpkgs/pkgs/data/themes/mojave/default.nix index 751dd690d114..3d14f782c694 100644 --- a/nixpkgs/pkgs/data/themes/mojave/default.nix +++ b/nixpkgs/pkgs/data/themes/mojave/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "mojave-gtk-theme"; - version = "2020-03-19"; + version = "2020-11-29"; srcs = [ (fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1f120sx092i56q4dx2b8d3nnn9pdw67656446nw702rix7zc5jpx"; + sha256 = "07lcg28y0scpii29j85343kmcga4wyaayjpx9a118z838mnvb757"; }) (fetchurl { url = "https://github.com/vinceliuice/Mojave-gtk-theme/raw/11741a99d96953daf9c27e44c94ae50a7247c0ed/macOS_Mojave_Wallpapers.tar.xz"; diff --git a/nixpkgs/pkgs/data/themes/numix-solarized/default.nix b/nixpkgs/pkgs/data/themes/numix-solarized/default.nix index ae8a1d7145e7..356f7d33b260 100644 --- a/nixpkgs/pkgs/data/themes/numix-solarized/default.nix +++ b/nixpkgs/pkgs/data/themes/numix-solarized/default.nix @@ -1,33 +1,29 @@ -{ stdenv, fetchFromGitHub, python3, sass, glib, gdk-pixbuf, libxml2, - inkscape, optipng, gtk-engine-murrine -}: +{ stdenv, fetchFromGitHub, python3, sassc, glib, gdk-pixbuf, inkscape, gtk-engine-murrine }: stdenv.mkDerivation rec { - version = "20180913"; + version = "20200910"; pname = "numix-solarized-gtk-theme"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "numix-solarized-gtk-theme"; rev = version; - sha256 = "1kda0lyqi3cxh163fbj8yyi6jj6pf0y980k4s0cmyi3hkh4cqyd5"; + sha256 = "05h1563sy6sfz76jadxsf730mav6bbjsk9xnadv49r16b8n8p9a9"; }; - nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape optipng ]; + nativeBuildInputs = [ python3 sassc glib gdk-pixbuf inkscape ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; postPatch = '' patchShebangs . substituteInPlace Makefile --replace '$(DESTDIR)'/usr $out - substituteInPlace scripts/render-assets.sh \ - --replace /usr/bin/inkscape ${inkscape}/bin/inkscape \ - --replace /usr/bin/optipng ${optipng}/bin/optipng ''; buildPhase = "true"; installPhase = '' + HOME="$NIX_BUILD_ROOT" # shut up inkscape's warnings for theme in *.colors; do make THEME="''${theme/.colors/}" install done diff --git a/nixpkgs/pkgs/data/themes/obsidian2/default.nix b/nixpkgs/pkgs/data/themes/obsidian2/default.nix index cb6cd686aca5..79c8e221894b 100644 --- a/nixpkgs/pkgs/data/themes/obsidian2/default.nix +++ b/nixpkgs/pkgs/data/themes/obsidian2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.14"; + version = "2.17"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "0q713s6fwdvbiirzkm91y9xdpc7x7ay432km0fx90vn4s24p718y"; + sha256 = "1gff34xqypqjhh15lv4cc4ifsg07jx2znlsj9is4wmqf39a8h8n4"; }; sourceRoot = "."; diff --git a/nixpkgs/pkgs/data/themes/orion/default.nix b/nixpkgs/pkgs/data/themes/orion/default.nix index b44cc857c629..740b34889227 100644 --- a/nixpkgs/pkgs/data/themes/orion/default.nix +++ b/nixpkgs/pkgs/data/themes/orion/default.nix @@ -1,11 +1,13 @@ -{ stdenv, fetchgit, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, gtk-engine-murrine }: -stdenv.mkDerivation { - name = "orion-1.5"; +stdenv.mkDerivation rec { + pname = "orion"; + version = "1.5"; - src = fetchgit { - url = "https://github.com/shimmerproject/Orion.git"; - rev = "refs/tags/v1.5"; + src = fetchFromGitHub { + owner = "shimmerproject"; + repo = "Orion"; + rev = "refs/tags/v${version}"; sha256 = "1116yawv3fspkiq1ykk2wj0gza3l04b5nhldy0bayzjaj0y6fd89"; }; diff --git a/nixpkgs/pkgs/data/themes/plano/default.nix b/nixpkgs/pkgs/data/themes/plano/default.nix index 7ac245b920f2..534831e007ee 100644 --- a/nixpkgs/pkgs/data/themes/plano/default.nix +++ b/nixpkgs/pkgs/data/themes/plano/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "plano-theme"; - version = "3.36-1"; + version = "3.36-2"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "1rngn5a7hwjqpznbg5kvgs237d2q1anywg37k1cz153ipa96snrv"; + sha256 = "01dkjck9rlrf8wa30ad7kfv0gbpdf3l05rw7nxrvb1gh5d2vxig9"; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flat theme for GNOME and Xfce"; homepage = "https://github.com/lassekongo83/plano-theme"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/nixpkgs/pkgs/data/themes/qogir/default.nix b/nixpkgs/pkgs/data/themes/qogir/default.nix index 23afcf5ece22..44bb220d404d 100644 --- a/nixpkgs/pkgs/data/themes/qogir/default.nix +++ b/nixpkgs/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2020-02-26"; + version = "2020-11-16"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1s14knj0ral5a62ymwbg5k5g94v8cq0acq0kyam8ay0rfi7wycdm"; + sha256 = "0qp65py1p93f5bxbf0jgc1d2lwrjhb7d0vzkivm73haji197l9p5"; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/nixpkgs/pkgs/data/themes/qtcurve/default.nix b/nixpkgs/pkgs/data/themes/qtcurve/default.nix index 719b1ce1a487..cd5cb4170b8c 100644 --- a/nixpkgs/pkgs/data/themes/qtcurve/default.nix +++ b/nixpkgs/pkgs/data/themes/qtcurve/default.nix @@ -1,43 +1,47 @@ -{ stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation -, gtk2, qtbase, qtsvg, qtx11extras # Toolkit dependencies +{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation +, gtk2Support ? true, gtk2 +, qtbase, qtsvg, qtx11extras # Toolkit dependencies , karchive, kconfig, kconfigwidgets, kio, frameworkintegration , kguiaddons, ki18n, kwindowsystem, kdelibs4support, kiconthemes , libpthreadstubs, pcre, libXdmcp, libX11, libXau # X11 dependencies , fetchpatch }: -let - version = "1.9.1"; -in mkDerivation { +mkDerivation rec { pname = "qtcurve"; - inherit version; + version = "1.9.1"; src = fetchFromGitHub { owner = "KDE"; repo = "qtcurve"; rev = version; - sha256 = "0sm1fza68mwl9cvid4h2lsyxq5svia86l5v9wqk268lmx16mbzsw"; + sha256 = "XP9VTeiVIiMm5mkXapCKWxfcvaYCkhY3S5RXZNR3oWo="; }; + enableParallelBuilding = true; + patches = [ + # Remove unnecessary constexpr, this is not allowed in C++14 (fetchpatch { url = "https://github.com/KDE/qtcurve/commit/ee2228ea2f18ac5da9b434ee6089381df815aa94.patch"; sha256 = "1vz5frsrsps93awn84gk8d7injrqfcyhc1rji6s0gsgsp5z9sl34"; }) + # Fix build with Qt5.15 + (fetchpatch { + url = "https://github.com/KDE/qtcurve/commit/44e2a35ebb164dcab0bad1a9158b1219a3ff6504.patch"; + sha256 = "5I2fTxKRJX0cJcyUvYHWZx369FKk6ti9Se7AfYmB9ek="; + }) ]; - enableParallelBuilding = true; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ]; buildInputs = [ - gtk2 qtbase qtsvg qtx11extras karchive kconfig kconfigwidgets kio kiconthemes kguiaddons ki18n kwindowsystem kdelibs4support frameworkintegration libpthreadstubs pcre libXdmcp libX11 libXau - ]; + ] ++ lib.optional gtk2Support gtk2; preConfigure = '' for i in qt5/CMakeLists.txt qt5/config/CMakeLists.txt @@ -52,7 +56,12 @@ in mkDerivation { patchShebangs tools/gen-version.sh ''; - meta = with stdenv.lib; { + configureFlags = [ + "-DENABLE_GTK2=${if gtk2Support then "ON" else "OFF"}" + "-DENABLE_QT4=OFF" + ]; + + meta = with lib; { homepage = "https://github.com/QtCurve/qtcurve"; description = "Widget styles for Qt5/Plasma 5 and gtk2"; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/data/themes/skeu/default.nix b/nixpkgs/pkgs/data/themes/skeu/default.nix new file mode 100644 index 000000000000..1f2f869364ec --- /dev/null +++ b/nixpkgs/pkgs/data/themes/skeu/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "skeu"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = pname; + rev = version; + sha256 = "0lbl09p0h493ya978fh7cib68qlmxfxahmbj0mpa3b65ynxda645"; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Skeu* $out/share/themes + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "GTK theme with skeuomorphism design"; + homepage = "https://www.pling.com/p/1363834/"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/nixpkgs/pkgs/data/themes/stilo/default.nix b/nixpkgs/pkgs/data/themes/stilo/default.nix index ecef868f2875..066d122d4414 100644 --- a/nixpkgs/pkgs/data/themes/stilo/default.nix +++ b/nixpkgs/pkgs/data/themes/stilo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "stilo-themes"; - version = "3.36-2"; + version = "3.36-3"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "0w4il6rk1f8yjmdxpnzq6zll2jjqbyp9dckxhzxgs4zh8fy9pzvh"; + sha256 = "0haxzqxyfx3rc305w7f744fp2xb6j7yn28ldynnvmm47h7ga3as3"; }; nativeBuildInputs = [ meson ninja sassc ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimalistic GTK, gnome shell and Xfce themes"; homepage = "https://github.com/lassekongo83/stilo-themes"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/nixpkgs/pkgs/data/themes/sweet/default.nix b/nixpkgs/pkgs/data/themes/sweet/default.nix index 9d3603cbf520..6ba7ae40c682 100644 --- a/nixpkgs/pkgs/data/themes/sweet/default.nix +++ b/nixpkgs/pkgs/data/themes/sweet/default.nix @@ -1,46 +1,46 @@ -{ stdenv, fetchurl, unzip }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "sweet"; - version = "1.10.5"; + version = "2.0"; srcs = [ (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar-Blue.zip"; - sha256 = "11040hx8ci4vbnyaj63zj924v0ln7rjm9a28mcqdax60h3dp12lj"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Ambar-Blue.tar.xz"; + sha256 = "028pk07im7pab8a2vh3bvjm8jg37dpvn4c1mwn6vhb6wcr9v5c75"; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Ambar.zip"; - sha256 = "0lvnjmirpwdav8q0bfbhybwkr2h6dilc7lhhj18xd2k57xadjmxr"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Ambar.tar.xz"; + sha256 = "0zmdmqndj65kr43g3z57blrmv0y856zlfprm6y45zbf4xz3ybkg6"; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-Dark.zip"; - sha256 = "0a7mh1pgvi8w1ahsmvgnmpdawm30lcjqk4zqvg0lqadsd04dn4h1"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-Dark.tar.xz"; + sha256 = "02sw664fkrfpsygspq8fn4zgk8rxs9rd29nnx6nyvkji68mb51s6"; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet-mars.zip"; - sha256 = "0n2dkl35qrik10wvhvkayyra987p03g56pxhz5kc73cbsl5zd96l"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet-mars.tar.xz"; + sha256 = "14rl3il61jyqwiqlpgbh397q3rcs7jcf2pvr2763ar5a9czmy8h6"; }) (fetchurl { - url = "https://github.com/EliverLara/Sweet/releases/download/v${version}/Sweet.zip"; - sha256 = "0wwmc3wj2pjg4kimfkvcsimk3s4s7l7k000vxqi8yjlfs70f273c"; + url = "https://github.com/EliverLara/Sweet/releases/download/${version}/Sweet.tar.xz"; + sha256 = "0rza3yxwj256ibqimymjhd6lpjzr7fkhggq0ijdg1wab3q91x66q"; }) ]; - nativeBuildInputs = [ unzip ]; - sourceRoot = "."; installPhase = '' + runHook preInstall mkdir -p $out/share/themes/ cp -a Sweet* $out/share/themes/ rm $out/share/themes/*/{LICENSE,README*} + runHook postInstall ''; meta = with stdenv.lib; { description = "Light and dark colorful Gtk3.20+ theme"; homepage = "https://github.com/EliverLara/Sweet"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ fuzen ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/data/themes/vimix/default.nix b/nixpkgs/pkgs/data/themes/vimix/default.nix index 1b3d2005f08a..43636b584d3c 100644 --- a/nixpkgs/pkgs/data/themes/vimix/default.nix +++ b/nixpkgs/pkgs/data/themes/vimix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vimix-gtk-themes"; - version = "2020-02-24"; + version = "2020-11-28"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "18v7yhwzachjgy276rdhj5cg353f0qysa2kxk9gyc6s71q2gjzcv"; + sha256 = "1m84p4cs9dfwc27zfjnwgkfdnfmlzbimq3g5z4mhz23cijm178rf"; }; buildInputs = [ gtk_engines ]; diff --git a/nixpkgs/pkgs/data/themes/zuki/default.nix b/nixpkgs/pkgs/data/themes/zuki/default.nix index 628708b23870..40046c6c5b30 100644 --- a/nixpkgs/pkgs/data/themes/zuki/default.nix +++ b/nixpkgs/pkgs/data/themes/zuki/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zuki-themes"; - version = "3.36-3"; + version = "3.36-4"; src = fetchFromGitHub { owner = "lassekongo83"; repo = pname; rev = "v${version}"; - sha256 = "19cxbrjkyk7ndpd5hnznpprlbp7dqqrs0qg0ry80rpfj0nw0gyhi"; + sha256 = "14r8dhfycpmwp2nj6vj0b2cwaaphc9sxbzglc4sr4q566whrhbgd"; }; nativeBuildInputs = [ meson ninja sassc ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Themes for GTK, gnome-shell and Xfce"; homepage = "https://github.com/lassekongo83/zuki-themes"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; |