diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-08 11:56:52 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-08 11:56:52 +0200 |
commit | a0c34f54cc61dc20ae1ec91766b9efad102f5b36 (patch) | |
tree | 96aeb2b4fb3aeff9ecc8c52d173c3b8d57a0ce59 /pkgs/data | |
parent | 0913e30c859f0071d0f0529c309d4256713acc41 (diff) | |
parent | 60b2fe660e2bcb605650173b7b0a59a47bc6a7e5 (diff) | |
download | nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.gz nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.bz2 nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.lz nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.xz nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.tar.zst nixpkgs-a0c34f54cc61dc20ae1ec91766b9efad102f5b36.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
-rw-r--r-- | pkgs/data/fonts/ibm-plex/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/nerdfonts/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/icons/numix-icon-theme-circle/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/icons/numix-icon-theme-square/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/icons/numix-icon-theme/default.nix | 6 | ||||
-rw-r--r-- | pkgs/data/themes/matcha/default.nix | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index 7401c569462..d4a673533af 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "2.0.0"; + version = "3.0.0"; in fetchzip { name = "ibm-plex-${version}"; url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; @@ -9,7 +9,7 @@ in fetchzip { mkdir -p $out/share/fonts unzip -j $downloadedFile "OpenType/*/*.otf" -d $out/share/fonts/opentype ''; - sha256 = "0m4paww4349d37s7j20a00hp514p1jq54xrnz45wyrafb8pkah4g"; + sha256 = "1vv0lf2fn0y0ln14s4my8x2mykq1lwqpmkjkhs6cm48mzf740nhs"; meta = with lib; { description = "IBM Plex Typeface"; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index 59b0f89e45e..454cbc09281 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, bash, which, withFont ? "" }: +{ stdenv, fetchFromGitHub, which, withFont ? "" }: stdenv.mkDerivation rec { version = "2.0.0"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; buildInputs = [ which ]; patchPhase = '' - sed -i -e 's|/bin/bash|${bash}/bin/bash|g' install.sh + patchShebangs install.sh sed -i -e 's|font_dir="\$HOME/.local/share/fonts|font_dir="$out/share/fonts/truetype|g' install.sh ''; installPhase = '' diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index c17e14bb3c1..221974c7941 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; - version = "0.13.1"; + version = "0.14"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "elementary-xfce"; rev = "v${version}"; - sha256 = "16msdrazhbv80cvh5ffvgj13xmkpf87r7mq6xz071fza6nv7g0jn"; + sha256 = "00sk6sv0kkfb3q0jqwcllzawi30rw8nfkkfn5l1qwqha48izw3r4"; }; nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 ]; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 726023caef5..5658f20c744 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 = "19.05.07"; + version = "19.09.20"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "04h7kp1895rkfaqrgzrpqjmqamkxv3dkmhslgm2cxsa6qc0wammg"; + sha256 = "1pmz2dy1580ln5m57xw3vhqrjhviayisgbs2km3i77hyx66hiivi"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 6ae27a11e3a..76176f9ad04 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 = "19.05.07"; + version = "19.09.20"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "13wxy36qys439pv0xaynqvmjshnfrk9wa89iw878ibvfj506ji2s"; + sha256 = "0q3d4d4wndknz3043bh8ardjvdpds2hkzk73kyyh1848wg4ff0ly"; }; nativeBuildInputs = [ gtk3 numix-icon-theme ]; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 8b2f07ce00a..d3bcdb12d3d 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme"; - version = "18.07.17"; + version = "19.09.20"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0clh55kmhc52d33dfm2c6h3lg6ddfh8a088ir9lv1camn9kj55bd"; + sha256 = "0pn3x0mmsph777lwhg890ck366p31bjl3755h4pv161ym08d4z9w"; }; nativeBuildInputs = [ gtk3 ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/share/icons - mv Numix{,-Light} $out/share/icons + cp -a Numix{,-Light} $out/share/icons/ ''; postFixup = '' diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index b5882eb98d0..0c92eb110d2 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha"; - version = "2019-09-30"; + version = "2019-10-03"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1zp8s2hr33lpdyc4nihfmsc728672fa2dcji4xk6dv6b64cp1xyx"; + sha256 = "1fxlpq3hgp6brgjkhv0g8k4gsdg6jw2z467awqgfr8a1p3ksmxpw"; }; buildInputs = [ gdk-pixbuf librsvg ]; |