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

gnome-user-docs: move to top-level again

Browse Source
This commit is contained in:
Jan Tojnar 2019-11-20 04:25:38 +01:00
parent 5b11829a63
commit a7f4c78792
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
6 changed files with 29 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -309,7 +309,7 @@ in
gnome-shell gnome-shell
gnome-shell-extensions gnome-shell-extensions
gnome-themes-extra gnome-themes-extra
gnome-user-docs pkgs.gnome-user-docs
pkgs.orca pkgs.orca
pkgs.glib # for gsettings pkgs.glib # for gsettings
pkgs.gnome-menus pkgs.gnome-menus

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

@ -1,27 +1,41 @@
{ stdenv, fetchurl, itstool, libxml2, gettext, gnome3 }: { stdenv
, fetchurl
, gettext
, gnome3
, itstool
, libxml2
, yelp-tools
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-user-docs"; pname = "gnome-user-docs";
version = "3.2.2"; version = "3.34.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ka0nw2kc85p10y8x31v0wv06a88k7qrgafp4ys04y9fzz0rkcjj"; sha256 = "11m9fv8k2hynrcgah4jvbm6yczg0s1ly302mipysbwpn6gbdkvf2";
}; };
nativeBuildInputs = [ itstool libxml2 gettext ]; nativeBuildInputs = [
gettext
itstool
libxml2
yelp-tools
];
enableParallelBuilding = true;
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;
attrPath = "gnome3.gnome-user-docs";
}; };
}; };
meta = { meta = with stdenv.lib; {
homepage = "https://gitlab.gnome.org/GNOME/gnome-user-docs"; description = "User and system administration help for the GNOME desktop";
description = "GNOME User Documentation"; homepage = "https://help.gnome.org/users/gnome-help/";
license = stdenv.lib.licenses.cc-by-30; license = licenses.cc-by-30;
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;
platforms = platforms.linux;
}; };
} }

42
pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
View File

@ -1,42 +0,0 @@
{ stdenv
, fetchurl
, gettext
, gnome3
, itstool
, libxml2
, yelp-tools
}:
stdenv.mkDerivation rec {
pname = "gnome-user-docs";
version = "3.34.1";
src = fetchurl {
url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "11m9fv8k2hynrcgah4jvbm6yczg0s1ly302mipysbwpn6gbdkvf2";
};
nativeBuildInputs = [
gettext
itstool
libxml2
yelp-tools
];
enableParallelBuilding = true;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
attrPath = "gnome3.${pname}";
};
};
meta = with stdenv.lib; {
description = "User and system administration help for the GNOME desktop";
homepage = "https://help.gnome.org/users/gnome-help/";
license = licenses.cc-by-30;
maintainers = gnome3.maintainers;
platforms = platforms.linux;
};
}

4
pkgs/desktops/gnome-3/default.nix
View File

@ -99,8 +99,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome-themes-extra = callPackage ./core/gnome-themes-extra { }; gnome-themes-extra = callPackage ./core/gnome-themes-extra { };
gnome-user-docs = callPackage ./core/gnome-user-docs { };
gnome-user-share = callPackage ./core/gnome-user-share { }; gnome-user-share = callPackage ./core/gnome-user-share { };
gucharmap = callPackage ./core/gucharmap { }; gucharmap = callPackage ./core/gucharmap { };
@ -355,6 +353,8 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) vala; # added 2019-10-10 inherit (pkgs) vala; # added 2019-10-10
inherit (pkgs) gnome-user-docs; # added 2019-11-20
inherit (pkgs) gegl_0_4; # added 2019-10-31 inherit (pkgs) gegl_0_4; # added 2019-10-31
inherit (pkgs) gjs; # added 2019-01-05 inherit (pkgs) gjs; # added 2019-01-05

1
pkgs/top-level/aliases.nix
View File

@ -428,6 +428,7 @@ mapAliases ({
xpraGtk3 = xpra; # added 2018-09-13 xpraGtk3 = xpra; # added 2018-09-13
youtubeDL = youtube-dl; # added 2014-10-26 youtubeDL = youtube-dl; # added 2014-10-26
zdfmediathk = mediathekview; # added 2019-01-19 zdfmediathk = mediathekview; # added 2019-01-19
gnome_user_docs = gnome-user-docs; # added 2019-11-20
# TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03
# branch-off # branch-off

2
pkgs/top-level/all-packages.nix
View File

@ -17265,7 +17265,7 @@ in
gohufont = callPackage ../data/fonts/gohufont { }; gohufont = callPackage ../data/fonts/gohufont { };
gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { }; gnome-user-docs = callPackage ../data/documentation/gnome-user-docs { };
gsettings-desktop-schemas = callPackage ../development/libraries/gsettings-desktop-schemas { }; gsettings-desktop-schemas = callPackage ../development/libraries/gsettings-desktop-schemas { };