From b4096479faf7147e885e5a7abc03c35c23db88ea Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 10 Apr 2014 22:29:36 +0200 Subject: [PATCH] gnome-user-docs: new package licensed under the new licenses.cc-by-30 User and system administration help for the Gnome https://help.gnome.org/users/gnome-help/3.10 --- lib/licenses.nix | 6 ++++++ .../services/x11/desktop-managers/gnome3.nix | 1 + .../gnome-3/core/gnome-user-docs/default.nix | 20 +++++++++++++++++++ pkgs/desktops/gnome-3/default.nix | 2 ++ 4 files changed, 29 insertions(+) create mode 100644 pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index 603fddcb8577..20c1b2200315 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -64,6 +64,12 @@ url = https://fedoraproject.org/wiki/Licensing/BSD; }; + cc-by-30 = { + shortName = "CC BY 3.0"; + fullName = "Creative Commons Attribution 3.0"; + url = http://creativecommons.org/licenses/by/3.0; + }; + cddl = { shortName = "CDDL"; fullName = "Common Development Distribution License "; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index aa231f2bad7b..9f0d53bb6533 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -85,6 +85,7 @@ in { gnome3.gnome-system-log gnome3.gnome-system-monitor gnome3.gnome_terminal + gnome3.gnome-user-docs gnome3.file-roller ] config.environment.gnome3.excludePackages); diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix new file mode 100644 index 000000000000..d66863a22184 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: + +stdenv.mkDerivation rec { + name = "gnome-user-docs-3.10.3"; + + src = fetchurl { + url = "mirror://gnome/sources/gnome-user-docs/3.10/${name}.tar.xz"; + sha256 = "960b6373ea52e41e3deb3501930e024005b29d2cc958bfadc87450a291d2a905"; + }; + + buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; + + meta = with stdenv.lib; { + homepage = https://help.gnome.org/users/gnome-help/3.10; + description = "User and system administration help for the Gnome desktop"; + maintainers = with maintainers; [ lethalman ]; + license = licenses.cc-by-30; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index d8d510b0bb9f..5ac3fb75f169 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -86,6 +86,8 @@ rec { gnome_themes_standard = callPackage ./core/gnome-themes-standard { }; + gnome-user-docs = callPackage ./core/gnome-user-docs { }; + grilo = callPackage ./core/grilo { }; gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };