diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-04 09:28:07 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-04 09:28:07 +0100 |
commit | 10c57af49c077493988b5bf123cb3f611e02322d (patch) | |
tree | 35c30f913782cd4131df023299e57c7deca8d921 /pkgs/data | |
parent | 4148fc489b29e826bd42ed05e12ba6fe64c2921e (diff) | |
parent | 9e6d7d3c744a5cbaba603b14cd0676c132e2d499 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/fraunces/default.nix | 25 | ||||
-rw-r--r-- | pkgs/data/icons/numix-cursor-theme/default.nix | 11 | ||||
-rw-r--r-- | pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/icons/numix-icon-theme-square/default.nix | 4 |
4 files changed, 39 insertions, 5 deletions
diff --git a/pkgs/data/fonts/fraunces/default.nix b/pkgs/data/fonts/fraunces/default.nix new file mode 100644 index 0000000000000..d5879d6c2bc47 --- /dev/null +++ b/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/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix index d0411a8c5697d..7ff3c4ca23c4f 100644 --- a/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/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/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index f43ca473f0dd7..ef06c2e2532ad 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ 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/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 51a2100d3aa39..b0b4e20073a45 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ 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 ]; |