diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 03:20:09 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 03:20:09 +0200 |
| commit | cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f (patch) | |
| tree | 3fdd8ed1c086fb0ddf93941114bb1cbbb4659af9 /pkgs/data/themes | |
| parent | e7cccdbb139ccf2f9f170500f40c04a6237a2da1 (diff) | |
| parent | ed54a5b51dc9542df94f70b25a13d86d1f494e64 (diff) | |
| download | nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.gz nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.bz2 nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.lz nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.xz nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.tar.zst nixpkgs-cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f.zip | |
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
Diffstat (limited to 'pkgs/data/themes')
| -rw-r--r-- | pkgs/data/themes/adementary/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/themes/greybird/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/themes/materia-theme/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/data/themes/plata/default.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/data/themes/adementary/default.nix b/pkgs/data/themes/adementary/default.nix index 40190d65d5e..1cb7ac53432 100644 --- a/pkgs/data/themes/adementary/default.nix +++ b/pkgs/data/themes/adementary/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Adwaita-based gtk+ theme with design influence from elementary OS and Vertex gtk+ theme"; + description = "Adwaita-based GTK theme with design influence from elementary OS and Vertex GTK theme"; homepage = https://github.com/hrdwrrsk/adementary-theme; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix index d573603ce90..1c5a631a48c 100644 --- a/pkgs/data/themes/greybird/default.nix +++ b/pkgs/data/themes/greybird/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "Grey and blue theme from the Shimmer Project for GTK+-based environments"; + description = "Grey and blue theme from the Shimmer Project for GTK-based environments"; homepage = https://github.com/shimmerproject/Greybird; license = with licenses; [ gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 platforms = platforms.linux; diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index 9e69d78933b..02c1b91a3eb 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Material Design theme for GNOME/GTK+ based desktop environments"; + description = "Material Design theme for GNOME/GTK based desktop environments"; homepage = https://github.com/nana-4/materia-theme; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix index cf2eb5447f7..d026e06e39d 100644 --- a/pkgs/data/themes/plata/default.nix +++ b/pkgs/data/themes/plata/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "A Gtk+ theme based on Material Design Refresh"; + description = "A GTK theme based on Material Design Refresh"; homepage = https://gitlab.com/tista500/plata-theme; license = with licenses; [ gpl2 cc-by-sa-40 ]; platforms = platforms.linux; |