b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gjs: move to top-level

Browse source
This commit is contained in:
Jan Tojnar 2019-11-05 00:38:42 +01:00
parent c4821a82f8
commit 3d89ead7c6
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
9 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/tests/gjs.nix
View file

@ -3,13 +3,13 @@ import ./make-test.nix ({ pkgs, ... }: {
name = "gjs";
meta = {
maintainers = pkgs.gnome3.gjs.meta.maintainers;
maintainers = pkgs.gjs.meta.maintainers;
};
machine = { pkgs, ... }: {
imports = [ ./common/x11.nix ];
environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
environment.variables.XDG_DATA_DIRS = [ "${pkgs.gnome3.gjs.installedTests}/share" ];
environment.variables.XDG_DATA_DIRS = [ "${pkgs.gjs.installedTests}/share" ];
};
testScript = ''

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

@ -49,8 +49,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gdm = callPackage ./core/gdm { };
gjs = callPackage ./core/gjs { };
gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
@ -360,4 +358,6 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) vala; # added 2019-10-10
inherit (pkgs) gegl_0_4; # added 2019-10-31
inherit (pkgs) gjs; # added 2019-01-05
})

4
pkgs/desktops/gnome-3/devtools/anjuta/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, gjs, flex, bison, libxml2, intltool,
gdl, libgda, gtksourceview, gsettings-desktop-schemas,
itstool, python3, ncurses, makeWrapper }:
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
ncurses
];
buildInputs = [
flex bison gtk3 libxml2 gnome3.gjs gdl
flex bison gtk3 libxml2 gjs gdl
libgda gtksourceview
gsettings-desktop-schemas
];

5
pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, substituteAll, gnome3, vte }:
{ stdenv, fetchFromGitHub, substituteAll, gjs, vte }:
stdenv.mkDerivation rec {
pname = "gnome-shell-extension-drop-down-terminal";
@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
patches = [
(substituteAll {
src = ./fix_vte_and_gjs.patch;
inherit vte;
gjs = gnome3.gjs;
inherit gjs vte;
})
];

4
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, substituteAll, python3, openssl, folks, gsound
, meson, ninja, libxml2, pkgconfig, gobject-introspection, wrapGAppsHook
, glib, gtk3, at-spi2-core, upower, openssh, gnome3 }:
, glib, gtk3, at-spi2-core, upower, openssh, gnome3, gjs }:
stdenv.mkDerivation rec {
pname = "gnome-shell-gsconnect";
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
gsound
upower
gnome3.caribou
gnome3.gjs # for running daemon
gjs # for running daemon
gnome3.evolution-data-server # for libebook-contacts typelib
];

2
pkgs/desktops/gnome-3/core/gjs/default.nix → pkgs/development/libraries/gjs/default.nix
View file

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
passthru = {
updateScript = gnome3.updateScript { packageName = "gjs"; attrPath = "gnome3.gjs"; };
updateScript = gnome3.updateScript { packageName = "gjs"; };
};
outputs = [ "out" "installedTests" ];

4
pkgs/development/libraries/libsecret/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, glib, pkgconfig, gettext, libxslt, python3, docbook_xsl, docbook_xml_dtd_42
, libgcrypt, gobject-introspection, vala, gtk-doc, gnome3, libintl, dbus, xvfb_run }:
, libgcrypt, gobject-introspection, vala, gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }:
stdenv.mkDerivation rec {
pname = "libsecret";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
installCheckInputs = [ python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gnome3.gjs ];
installCheckInputs = [ python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 xvfb_run dbus gjs ];
# needs to run after install because typelibs point to absolute paths
doInstallCheck = false; # Failed to load shared library '/force/shared/libmock_service.so.0' referenced by the typelib

4
pkgs/tools/misc/ostree/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk-doc, gobject-introspection, gnome3
{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk-doc, gobject-introspection, gjs
, glib, systemd, xz, e2fsprogs, libsoup, gpgme, which, autoconf, automake, libtool, fuse, utillinuxMinimal, libselinux
, libarchive, libcap, bzip2, yacc, libxslt, docbook_xsl, docbook_xml_dtd_42, python3
}:
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
glib systemd e2fsprogs libsoup gpgme fuse libselinux libcap
libarchive bzip2 xz
utillinuxMinimal # for libmount
(python3.withPackages (p: with p; [ pyyaml ])) gnome3.gjs # for tests
(python3.withPackages (p: with p; [ pyyaml ])) gjs # for tests
];
preConfigure = ''

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

@ -877,6 +877,8 @@ in
gitter = callPackage ../applications/networking/instant-messengers/gitter { };
gjs = callPackage ../development/libraries/gjs { };
glasgow = with python3Packages; toPythonApplication glasgow;
gucci = callPackage ../tools/text/gucci { };