diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-12-02 18:01:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-02 18:01:11 +0000 |
| commit | bcc4d12e172d4e8f03571eefd74d73a0fa5bf10e (patch) | |
| tree | de8c26d613cfe90b7d5c10fcff8f93f219155852 /pkgs/data | |
| parent | a68e0fdca5a5ac73be0b19cd6d22432287afd8bc (diff) | |
| parent | 80c7745b4e8fae6e533475208fe947b0bcae3cdf (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/icons/flat-remix-icon-theme/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/data/icons/pop-icon-theme/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/data/themes/pop-gtk/default.nix | 9 |
3 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix index 743bcba54de21..69e18beec32db 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub , gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "flat-remix-icon-theme"; - version = "20200710"; + version = "20211106"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "daniruiz"; repo = "flat-remix"; rev = version; - sha256 = "0rlrmgimvs9rrj64g5jn04jgyi7wmn2dnsk7ckmxk6p8cdfjd0hx"; + sha256 = "1dlz88bg764zzd0s3yqci4m1awhwdrrql9l9plsjjzgdx9r7ndmf"; }; nativeBuildInputs = [ diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix index 1bcfab57b4a99..3f980539a110d 100644 --- a/pkgs/data/icons/pop-icon-theme/default.nix +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -11,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pop-icon-theme"; - version = "2020-03-04"; + version = "2021-11-17"; src = fetchFromGitHub { owner = "pop-os"; repo = "icon-theme"; - rev = "11f18cb48455b47b6535018f1968777100471be1"; - sha256 = "1s4pjwv2ynw400gnzgzczlxzw3gxh5s8cxxbi9zpxq4wzjg6jqyv"; + rev = "9998b20b78f3ff65ecbf2253bb863d1e669abe74"; + sha256 = "0lwdmaxs9xj4bm21ldh64bzyb6iz5d5k1256iwvyjp725l7686cl"; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix index ec17be3261d8a..022e1dd81b2fd 100644 --- a/pkgs/data/themes/pop-gtk/default.nix +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , meson , ninja @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "pop-gtk-theme"; - version = "2020-06-30"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "pop-os"; repo = "gtk-theme"; - rev = "8c31be9f9257375bf7a049069cb4ecbac7d281a1"; - sha256 = "16dxxazpllcxlbiblynqq4b65wfn9k1jab8dl69l819v73z303ky"; + rev = "6615e4510485c5dc0b379746acc40f538d987c86"; + sha256 = "16h03x2m4j4hfwp7pdmw1navcy5q7di38jvigfgf263wajyxbznr"; }; nativeBuildInputs = [ |