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

Merge branch 'master' into staging-next

Browse Source 
There are several thousand rebuilds from master already.
Hydra nixpkgs: ?compare=1528940
This commit is contained in:
Vladimír Čunát
2019-07-06 13:40:38 +02:00
parent 8e97d0be6b d567c486ca
commit 0746c4dbb4
337 changed files with 11109 additions and 8836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/data/documentation/gnome-user-docs/default.nix
View File

@@ -17,4 +17,11 @@ stdenv.mkDerivation rec {
attrPath = "gnome3.gnome-user-docs";
};
};
meta = {
homepage = "https://gitlab.gnome.org/GNOME/gnome-user-docs";
description = "GNOME User Documentation";
license = stdenv.lib.licenses.cc-by-30;
maintainers = gnome3.maintainers;
};
}

2
pkgs/data/fonts/nerdfonts/default.nix
View File

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
'';
homepage = https://github.com/ryanoasis/nerd-fonts;
license = licenses.mit;
maintainers = with maintainers; [ garbas ];
maintainers = with maintainers; [ ];
hydraPlatforms = []; # 'Output limit exceeded' on Hydra
};
}