diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-07-06 13:40:38 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-07-06 13:44:40 +0200 |
| commit | 0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4 (patch) | |
| tree | 146620da711f1221bbc226b5ffa36407b50a3fc3 /pkgs/data | |
| parent | 8e97d0be6bf0b381935e3b8429430d645dc2e226 (diff) | |
| parent | d567c486ca5ac5f0c83bb0264c325204a479a5bb (diff) | |
| download | nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.gz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.bz2 nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.lz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.xz nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.tar.zst nixlib-0746c4dbb46a49f002dbe0d854a0bf2ec8f126e4.zip | |
Merge branch 'master' into staging-next
There are several thousand rebuilds from master already. Hydra nixpkgs: ?compare=1528940
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/documentation/gnome-user-docs/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/data/fonts/nerdfonts/default.nix | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index f87fc1535554..4bdfa70c63ff 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -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; + }; } diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index 985f264f40e9..c08630335d4a 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -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 }; } |