public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
Fixed trivial conflicts caused by removing rec.
This commit is contained in:
Jan Tojnar
2019-09-06 03:20:09 +02:00
parent e7cccdbb13 ed54a5b51d
commit cdf426488b
247 changed files with 3153 additions and 2159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/data/fonts/sudo/default.nix
View File

@@ -1,11 +1,11 @@
{ lib, fetchzip }:
let
version = "0.37";
version = "0.40";
in fetchzip {
name = "sudo-font-${version}";
url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip";
sha256 = "16x6vs016wz6rmd4p248ri9fn35xq7r3dc8hv4w2c4rz1xl8c099";
sha256 = "1nf025sjps4yysf6zkns5fzjgls6xdpifh7bz4ray9x8h5pz0z64";
postFetch = ''
mkdir -p $out/share/fonts/truetype/

4
pkgs/data/fonts/victor-mono/default.nix
View File

@@ -2,7 +2,7 @@
let
pname = "victor-mono";
version = "1.2.1";
version = "1.2.5";
in fetchFromGitHub rec {
name = "${pname}-${version}";
@@ -26,7 +26,7 @@ in fetchFromGitHub rec {
unzip -j VictorMonoAll.zip \*.otf -d $out/share/fonts/opentype/${pname}
'';
sha256 = "0347n3kdyrbg42rxcgnyghi21qz5iz6w30v7ms2vjal7pfm6h2vn";
sha256 = "0dj5h45qk6abggj6mgm19sb0a7q0v4x41f2zds1ab79yd22gbjns";
meta = with lib; {
description = "Free programming font with cursive italics and ligatures";

2
pkgs/data/icons/elementary-xfce-icon-theme/default.nix
View File

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';
meta = with stdenv.lib; {
description = "Elementary icons for Xfce and other GTK+ desktops like GNOME";
description = "Elementary icons for Xfce and other GTK desktops like GNOME";
homepage = https://github.com/shimmerproject/elementary-xfce;
license = licenses.gpl2;
# darwin cannot deal with file names differing only in case

2
pkgs/data/themes/adementary/default.nix
View File

@@ -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 ];

2
pkgs/data/themes/greybird/default.nix
View File

@@ -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;

2
pkgs/data/themes/materia-theme/default.nix
View File

@@ -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;

2
pkgs/data/themes/plata/default.nix
View File

@@ -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;