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

Merge branch 'staging' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát 2019-02-22 17:49:58 +01:00
commit 821c0844d4
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
663 changed files with 2383 additions and 1677 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
doc/languages-frameworks/python.section.md
View File

@ -602,10 +602,9 @@ as the interpreter unless overridden otherwise.
All parameters from `stdenv.mkDerivation` function are still supported. The following are specific to `buildPythonPackage`: All parameters from `stdenv.mkDerivation` function are still supported. The following are specific to `buildPythonPackage`:
* `catchConflicts ? true`: If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. * `catchConflicts ? true`: If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`.
* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`.
* `disabled` ? false: If `true`, package is not build for the particular Python interpreter version. * `disabled` ? false: If `true`, package is not build for the particular Python interpreter version.
* `dontWrapPythonPrograms ? false`: Skip wrapping of python programs. * `dontWrapPythonPrograms ? false`: Skip wrapping of python programs.
* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]. * `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]`.
* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed. * `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed.
* `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. * `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
* `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications to `""`. * `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications to `""`.
@ -615,6 +614,14 @@ All parameters from `stdenv.mkDerivation` function are still supported. The foll
* `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`. * `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`.
* `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command. * `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command.
The `stdenv.mkDerivation` function accepts various parameters for describing build inputs (see "Specifying dependencies"). The following are of special
interest for Python packages, either because these are primarily used, or because their behaviour is different:
* `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables as well as the items listed in `setup_requires`.
* `buildInputs ? []`: Build and/or run-time dependencies that need to be be compiled for the host machine. Typically non-Python libraries which are being linked.
* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `nativeBuildInputs` when `doCheck = true`. Items listed in `tests_require` go here.
* `propagatedBuildInputs ? []`: Aside from propagating dependencies, `buildPythonPackage` also injects code into and wraps executables with the paths included in this list. Items listed in `install_requires` go here.
##### Overriding Python packages ##### Overriding Python packages
The `buildPythonPackage` function has a `overridePythonAttrs` method that The `buildPythonPackage` function has a `overridePythonAttrs` method that
@ -1123,6 +1130,14 @@ LLVM implementation. To use that one instead, Intel recommends users set it with
Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms; Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms;
moreover, Hydra is not building and distributing pre-compiled binaries using it. moreover, Hydra is not building and distributing pre-compiled binaries using it.
### What inputs do `setup_requires`, `install_requires` and `tests_require` map to?
In a `setup.py` or `setup.cfg` it is common to declare dependencies:
* `setup_requires` corresponds to `nativeBuildInputs`
* `install_requires` corresponds to `propagatedBuildInputs`
* `tests_require` corresponds to `checkInputs`
## Contributing ## Contributing
### Contributing guidelines ### Contributing guidelines

8
nixos/doc/manual/release-notes/rl-1903.xml
View File

@ -151,6 +151,14 @@
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
<listitem>
<para>
The <varname>buildPythonPackage</varname> now sets <varname>strictDeps = true</varname>
to help distinguish between native and non-native dependencies in order to
improve cross-compilation compatibility. Note however that this may break
user expressions.
</para>
</listitem>
<listitem> <listitem>
<para> <para>
The Syncthing state and configuration data has been moved from The Syncthing state and configuration data has been moved from

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

@ -53,7 +53,7 @@ in
# Supplies some abstract icons such as: # Supplies some abstract icons such as:
# utilities-terminal, accessories-text-editor # utilities-terminal, accessories-text-editor
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
hicolor-icon-theme hicolor-icon-theme
tango-icon-theme tango-icon-theme

8
nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix
View File

@ -95,8 +95,8 @@ in
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.gnome3.defaultIconTheme; default = pkgs.gnome3.adwaita-icon-theme;
defaultText = "pkgs.gnome3.defaultIconTheme"; defaultText = "pkgs.gnome3.adwaita-icon-theme";
description = '' description = ''
The package path that contains the icon theme given in the name option. The package path that contains the icon theme given in the name option.
''; '';
@ -115,8 +115,8 @@ in
cursorTheme = { cursorTheme = {
package = mkOption { package = mkOption {
default = pkgs.gnome3.defaultIconTheme; default = pkgs.gnome3.adwaita-icon-theme;
defaultText = "pkgs.gnome3.defaultIconTheme"; defaultText = "pkgs.gnome3.adwaita-icon-theme";
description = '' description = ''
The package path that contains the cursor theme given in the name option. The package path that contains the cursor theme given in the name option.
''; '';

2
pkgs/applications/audio/audacious/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gettext glib gtk3 libmowgli dbus-glib libxml2 gettext glib gtk3 libmowgli dbus-glib libxml2
xorg.libXcomposite gnome3.defaultIconTheme alsaLib libjack2 xorg.libXcomposite gnome3.adwaita-icon-theme alsaLib libjack2
libpulseaudio fluidsynth libmad libogg libvorbis libcdio libpulseaudio fluidsynth libmad libogg libvorbis libcdio
libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile libcddb flac ffmpeg mpg123 libcue libmms libbs2b libsndfile
libmodplug libsamplerate soxr lirc curl wavpack neon faad2 libmodplug libsamplerate soxr lirc curl wavpack neon faad2

2
pkgs/applications/audio/cozy-audiobooks/default.nix
View File

@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec {
gtk3 gtk3
cairo cairo
gettext gettext
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
] ++ (with gst_all_1; [ ] ++ (with gst_all_1; [
gstreamer gstreamer
gst-plugins-good gst-plugins-good

2
pkgs/applications/audio/easytag/default.nix
View File

@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
buildInputs = [ buildInputs = [
gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac
gsettings-desktop-schemas gnome3.defaultIconTheme gsettings-desktop-schemas gnome3.adwaita-icon-theme
]; ];
doCheck = false; # fails 1 out of 9 tests doCheck = false; # fails 1 out of 9 tests

2
pkgs/applications/audio/gpodder/default.nix
View File

@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec {
buildInputs = [ buildInputs = [
python3 python3
gobject-introspection gobject-introspection
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
]; ];
checkInputs = with python3Packages; [ checkInputs = with python3Packages; [

2
pkgs/applications/audio/gtklick/default.nix
View File

@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
pyGtkGlade pyGtkGlade
]; ];
buildInputs = [ gettext ]; nativeBuildInputs = [ gettext ];
propagatedBuildInputs = [ klick ]; propagatedBuildInputs = [ klick ];

2
pkgs/applications/audio/gtkpod/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl gettext curl gettext
flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf
gdl gnome3.defaultIconTheme gnome3.anjuta gdl gnome3.adwaita-icon-theme gnome3.anjuta
] ++ (with perlPackages; [ perl XMLParser ]); ] ++ (with perlPackages; [ perl XMLParser ]);
patchPhase = '' patchPhase = ''

1
pkgs/applications/audio/lollypop/default.nix
View File

@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
]; ];
buildInputs = with gst_all_1; [ buildInputs = with gst_all_1; [
gobject-introspection
gst-libav gst-libav
gst-plugins-bad gst-plugins-bad
gst-plugins-base gst-plugins-base

2
pkgs/applications/audio/pavucontrol/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 makeWrapper
gnome3.defaultIconTheme ]; gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig intltool ];

2
pkgs/applications/audio/picard/default.nix
View File

@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec {
sha256 = "1p2bvfzby0nk1vh04yfmsvjcldgkj6m6s1hcv9v13hc8q1cbdfk5"; sha256 = "1p2bvfzby0nk1vh04yfmsvjcldgkj6m6s1hcv9v13hc8q1cbdfk5";
}; };
buildInputs = [ gettext ]; nativeBuildInputs = [ gettext ];
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
pyqt5 pyqt5

2
pkgs/applications/audio/quodlibet/default.nix
View File

@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ]; checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ];
buildInputs = [ gnome3.defaultIconTheme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
++ (if xineBackend then [ xineLib ] else with gst_all_1; ++ (if xineBackend then [ xineLib ] else with gst_all_1;
[ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);

2
pkgs/applications/audio/rhythmbox/default.nix
View File

@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
gtk3 gtk3
gnome3.libpeas gnome3.libpeas
totem-pl-parser totem-pl-parser
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base

2
pkgs/applications/audio/sonata/default.nix
View File

@ -19,7 +19,7 @@ in buildPythonApplication rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
intltool wrapGAppsHook intltool wrapGAppsHook
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas gnome3.gsettings-desktop-schemas
]; ];

2
pkgs/applications/audio/sound-juicer/default.nix
View File

@ -15,7 +15,7 @@ in stdenv.mkDerivation rec{
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
buildInputs = [ buildInputs = [
glib gtk3 brasero libcanberra-gtk3 gnome3.defaultIconTheme glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad

2
pkgs/applications/editors/bluefish/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
buildInputs = [ gnome3.defaultIconTheme gtk libxml2 buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2
enchant gucharmap python ]; enchant gucharmap python ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

6
pkgs/applications/editors/gnome-latex/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, wrapGAppsHook { stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee
, tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }: , tepl, amtk, gnome3, glib, pkgconfig, intltool, itstool, libxml2 }:
let let
version = "3.30.2"; version = "3.30.2";
@ -21,9 +21,9 @@ in stdenv.mkDerivation {
intltool intltool
]; ];
buildInputs = with gnome3; [ buildInputs = [
amtk amtk
defaultIconTheme gnome3.adwaita-icon-theme
glib glib
gsettings-desktop-schemas gsettings-desktop-schemas
gspell gspell

2
pkgs/applications/graphics/avocode/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2"; sha256 = "1slxxr3j0djqdnbk645sriwl99jp9imndyxiwd8aqggmmlp145a2";
}; };
libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome3; [ libPath = stdenv.lib.makeLibraryPath (with xorg; [
stdenv.cc.cc.lib stdenv.cc.cc.lib
gdk_pixbuf gdk_pixbuf
glib glib

2
pkgs/applications/graphics/dosage/default.nix
View File

@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591"; rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591";
sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh";
}; };
buildInputs = with pythonPackages; [ pytest responses ]; checkInputs = with pythonPackages; [ pytest responses ];
propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ]; propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ];
disabled = pythonPackages.pythonOlder "3.3"; disabled = pythonPackages.pythonOlder "3.3";

7
pkgs/applications/graphics/gthumb/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool, { stdenv, fetchurl, gnome3, itstool, libxml2, pkgconfig, intltool,
exiv2, libjpeg, libtiff, gst_all_1, libraw, libsoup, libsecret, exiv2, libjpeg, libtiff, gst_all_1, libraw, libsoup, libsecret,
glib, gtk3, gsettings-desktop-schemas,
libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison, libchamplain, librsvg, libwebp, json-glib, webkitgtk, lcms2, bison,
flex, wrapGAppsHook, shared-mime-info }: flex, wrapGAppsHook, shared-mime-info }:
@ -16,10 +17,10 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ]; nativeBuildInputs = [ itstool libxml2 intltool pkgconfig bison flex wrapGAppsHook ];
buildInputs = with gnome3; [ buildInputs = [
glib gtk gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base glib gtk3 gsettings-desktop-schemas gst_all_1.gstreamer gst_all_1.gst-plugins-base
exiv2 libjpeg libtiff libraw libsoup libsecret libchamplain exiv2 libjpeg libtiff libraw libsoup libsecret libchamplain
librsvg libwebp json-glib webkitgtk lcms2 defaultIconTheme librsvg libwebp json-glib webkitgtk lcms2 gnome3.adwaita-icon-theme
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/applications/graphics/shotwell/default.nix
View File

@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee
libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas libgudev gnome3.gexiv2 gnome3.gsettings-desktop-schemas
libraw json-glib glib gdk_pixbuf librsvg gnome3.rest libraw json-glib glib gdk_pixbuf librsvg gnome3.rest
gcr gnome3.defaultIconTheme libgdata gcr gnome3.adwaita-icon-theme libgdata
]; ];
postPatch = '' postPatch = ''

4
pkgs/applications/graphics/synfigstudio/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 { stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3
, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig , libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
, imagemagick, intltool, autoreconfHook, which, defaultIconTheme , imagemagick, intltool, autoreconfHook, which, gnome3
}: }:
let let
@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool
libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5
synfig which defaultIconTheme synfig which gnome3.adwaita-icon-theme
]; ];
postInstall = '' postInstall = ''

4
pkgs/applications/graphics/vimiv/default.nix
View File

@ -1,5 +1,5 @@
{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead
, hicolor-icon-theme, defaultIconTheme , hicolor-icon-theme, gnome3
# Test requirements # Test requirements
, dbus, xvfb_run, xdotool , dbus, xvfb_run, xdotool
@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec {
''; '';
checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];
buildInputs = [ hicolor-icon-theme defaultIconTheme librsvg ]; buildInputs = [ hicolor-icon-theme gnome3.adwaita-icon-theme librsvg ];
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
makeWrapperArgs = [ makeWrapperArgs = [

4
pkgs/applications/misc/electrum/ltc.nix
View File

@ -4,7 +4,7 @@
}: }:
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
name = "electrum-ltc-${version}"; pname = "electrum-ltc";
version = "3.1.3.1"; version = "3.1.3.1";
src = fetchurl { src = fetchurl {
@ -12,6 +12,8 @@ python3Packages.buildPythonApplication rec {
sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7"; sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7";
}; };
nativeBuildInputs = with python3Packages; [ pyqt5 ];
propagatedBuildInputs = with python3Packages; [ propagatedBuildInputs = with python3Packages; [
pyaes pyaes
ecdsa ecdsa

2
pkgs/applications/misc/font-manager/default.nix
View File

@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
sqlite sqlite
librsvg librsvg
gnome3.gtk gnome3.gtk
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
]; ];
patches = [ ./correct-post-install.patch ]; patches = [ ./correct-post-install.patch ];

4
pkgs/applications/misc/gnome-recipes/default.nix
View File

@ -13,7 +13,7 @@
, glib , glib
, libsoup , libsoup
, gnome-online-accounts , gnome-online-accounts
, rest , librest
, json-glib , json-glib
, gnome-autoar , gnome-autoar
, gspell , gspell
@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
glib glib
libsoup libsoup
gnome-online-accounts gnome-online-accounts
rest librest
json-glib json-glib
gnome-autoar gnome-autoar
gspell gspell

2
pkgs/applications/misc/gnome-usage/default.nix
View File

@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkgconfig vala gettext libxml2 desktop-file-utils wrapGAppsHook ];
buildInputs = [ glib gtk3 libgtop gnome3.defaultIconTheme ]; buildInputs = [ glib gtk3 libgtop gnome3.adwaita-icon-theme ];
postPatch = '' postPatch = ''
chmod +x build-aux/meson/postinstall.sh chmod +x build-aux/meson/postinstall.sh

2
pkgs/applications/misc/gummi/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler glib gnome2.gtksourceview gnome2.pango gtk2-x11 gtkspell2 poppler
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
]; ];
preConfigure = '' preConfigure = ''

4
pkgs/applications/misc/hamster-time-tracker/default.nix
View File

@ -18,9 +18,9 @@ pythonPackages.buildPythonApplication rec {
sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g"; sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g";
}; };
nativeBuildInputs = [ wafHook ]; nativeBuildInputs = [ wafHook intltool ];
buildInputs = [ buildInputs = [
docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme docbook2x libxslt gnome-doc-utils dbus-glib hicolor-icon-theme
]; ];
propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ]; propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ];

6
pkgs/applications/misc/kitty/default.nix
View File

@ -7,8 +7,8 @@
with python3Packages; with python3Packages;
buildPythonApplication rec { buildPythonApplication rec {
pname = "kitty";
version = "0.13.3"; version = "0.13.3";
name = "kitty-${version}";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -24,7 +24,7 @@ buildPythonApplication rec {
wayland-protocols wayland dbus wayland-protocols wayland dbus
]; ];
nativeBuildInputs = [ pkgconfig which sphinx ]; nativeBuildInputs = [ pkgconfig which sphinx ncurses ];
outputs = [ "out" "terminfo" ]; outputs = [ "out" "terminfo" ];
@ -36,7 +36,7 @@ buildPythonApplication rec {
]; ];
buildPhase = '' buildPhase = ''
python3 setup.py linux-package ${python.interpreter} setup.py linux-package
''; '';
installPhase = '' installPhase = ''

11
pkgs/applications/misc/octoprint/default.nix
View File

@ -32,14 +32,17 @@ let
"flask" "flask"
"future" "future"
"futures" "futures"
"monotonic"
"pkginfo" "pkginfo"
"psutil" "psutil"
"pyserial" "pyserial"
"python-dateutil" "python-dateutil"
"requests" "requests"
"rsa" "rsa"
"sarge"
"scandir" "scandir"
"semantic_version" "semantic_version"
"watchdog"
"websocket-client" "websocket-client"
"werkzeug" "werkzeug"
"wrapt" "wrapt"
@ -47,13 +50,13 @@ let
in py.pkgs.buildPythonApplication rec { in py.pkgs.buildPythonApplication rec {
pname = "OctoPrint"; pname = "OctoPrint";
version = "1.3.9"; version = "1.3.10";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "foosel"; owner = "foosel";
repo = "OctoPrint"; repo = "OctoPrint";
rev = version; rev = version;
sha256 = "1yqbsfmkx4wiykjrh66a05lhn15qhpc9ay67l37kv8bhdqf2xkj4"; sha256 = "1pvh7ay76zrvfzcsadh3sl48sgf3by9vpiaqlrkscsw02zirx9r7";
}; };
propagatedBuildInputs = with py.pkgs; [ propagatedBuildInputs = with py.pkgs; [
@ -75,7 +78,9 @@ in py.pkgs.buildPythonApplication rec {
setup.py setup.py
''; '';
checkPhase = "nosetests"; checkPhase = ''
HOME=$(mktemp -d) nosetests
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://octoprint.org/; homepage = https://octoprint.org/;

2
pkgs/applications/misc/pcmanfm/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138"; sha256 = "0mb8hg76x1z0szdyl0w7jpz0bdblc6a29is1vvnh79z37qxh8138";
}; };
buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ]; buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
configureFlags = optional withGtk3 "--with-gtk=3"; configureFlags = optional withGtk3 "--with-gtk=3";

2
pkgs/applications/misc/safeeyes/default.nix
View File

@ -17,7 +17,7 @@ in buildPythonApplication rec {
buildInputs = [ buildInputs = [
gtk3 gtk3
gobject-introspection gobject-introspection
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
]; ];

4
pkgs/applications/misc/tootle/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, meson, ninja, pkgconfig, python3 , meson, ninja, pkgconfig, python3, libgee, gsettings-desktop-schemas
, gnome3, pantheon, gobject-introspection, wrapGAppsHook , gnome3, pantheon, gobject-introspection, wrapGAppsHook
, gtk3, json-glib, glib, glib-networking, hicolor-icon-theme , gtk3, json-glib, glib, glib-networking, hicolor-icon-theme
}: }:
@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk3 pantheon.granite json-glib glib glib-networking hicolor-icon-theme gtk3 pantheon.granite json-glib glib glib-networking hicolor-icon-theme
gnome3.libgee gnome3.libsoup gnome3.gsettings-desktop-schemas libgee gnome3.libsoup gsettings-desktop-schemas
]; ];
postPatch = '' postPatch = ''

2
pkgs/applications/networking/browsers/brave/default.nix
View File

@ -89,7 +89,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ dpkg wrapGAppsHook ]; nativeBuildInputs = [ dpkg wrapGAppsHook ];
buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme ]; buildInputs = [ glib gnome3.gsettings_desktop_schemas gnome3.adwaita-icon-theme ];
unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner";

2
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -84,7 +84,7 @@ in stdenv.mkDerivation {
gsettings-desktop-schemas glib gtk3 gsettings-desktop-schemas glib gtk3
# needed for XDG_ICON_DIRS # needed for XDG_ICON_DIRS
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
]; ];
outputs = ["out" "sandbox"]; outputs = ["out" "sandbox"];

1
pkgs/applications/networking/browsers/eolie/default.nix
View File

@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
buildInputs = with gst_all_1; [ buildInputs = with gst_all_1; [
glib-networking glib-networking
gobject-introspection
gst-libav gst-libav
gst-plugins-base gst-plugins-base
gst-plugins-ugly gst-plugins-ugly

4
pkgs/applications/networking/browsers/firefox-bin/default.nix
View File

@ -31,7 +31,7 @@
, libgnome , libgnome
, libgnomeui , libgnomeui
, libnotify , libnotify
, defaultIconTheme , gnome3
, libGLU_combined , libGLU_combined
, nspr , nspr
, nss , nss
@ -141,7 +141,7 @@ stdenv.mkDerivation {
inherit gtk3; inherit gtk3;
buildInputs = [ wrapGAppsHook gtk3 defaultIconTheme ]; buildInputs = [ wrapGAppsHook gtk3 gnome3.adwaita-icon-theme ];
# "strip" after "patchelf" may break binaries. # "strip" after "patchelf" may break binaries.
# See: https://github.com/NixOS/patchelf/issues/10 # See: https://github.com/NixOS/patchelf/issues/10

2
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -131,7 +131,7 @@ let
--set GDK_BACKEND "wayland" \ --set GDK_BACKEND "wayland" \
''}${lib.optionalString (browser ? gtk3) ''}${lib.optionalString (browser ? gtk3)
''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share' --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share'
'' ''
} }

2
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -77,7 +77,7 @@ in stdenv.mkDerivation rec {
gsettings-desktop-schemas glib gtk gsettings-desktop-schemas glib gtk
# needed for XDG_ICON_DIRS # needed for XDG_ICON_DIRS
gnome.defaultIconTheme gnome.adwaita-icon-theme
]; ];
unpackPhase = '' unpackPhase = ''

4
pkgs/applications/networking/browsers/midori/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr { stdenv, fetchurl, cmake, ninja, pkgconfig, intltool, vala, wrapGAppsHook, gcr, libpeas
, gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3 , gtk3, webkitgtk, sqlite, gsettings-desktop-schemas, libsoup, glib-networking, gnome3
}: }:
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr gtk3 webkitgtk sqlite gsettings-desktop-schemas gcr
(libsoup.override { gnomeSupport = true; }) gnome3.libpeas (libsoup.override { gnomeSupport = true; }) libpeas
glib-networking glib-networking
]; ];

4
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@ -39,7 +39,7 @@
# Wrapper runtime # Wrapper runtime
, coreutils , coreutils
, glibcLocales , glibcLocales
, defaultIconTheme , gnome3
, runtimeShell , runtimeShell
, shared-mime-info , shared-mime-info
, gsettings-desktop-schemas , gsettings-desktop-schemas
@ -252,7 +252,7 @@ stdenv.mkDerivation rec {
EOF EOF
WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [
defaultIconTheme gnome3.adwaita-icon-theme
shared-mime-info shared-mime-info
]} ]}
WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [

6
pkgs/applications/networking/feedreaders/feedreader/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala_0_40, gettext, python3 { stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkgconfig, vala_0_40, gettext, python3
, appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook , appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo
}: }:
@ -29,10 +30,9 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl glib json-glib libnotify libsecret sqlite gumbo curl glib json-glib libnotify libsecret sqlite gumbo
] ++ (with gnome3; [ gtk3 libgee libpeas gnome3.libsoup librest webkitgtk gnome3.gnome-online-accounts
gtk libgee libpeas libsoup rest webkitgtk gnome-online-accounts
gsettings-desktop-schemas gsettings-desktop-schemas
]) ++ (with gst_all_1; [ ] ++ (with gst_all_1; [
gstreamer gst-plugins-base gst-plugins-good gstreamer gst-plugins-base gst-plugins-good
]); ]);

4
pkgs/applications/networking/ftp/taxi/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3 { stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, ninja, python3
, gtk3, gnome3, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: , gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "taxi"; pname = "taxi";
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pantheon.granite pantheon.granite
gnome3.libgee libgee
gtk3 gtk3
libsecret libsecret
libsoup libsoup

4
pkgs/applications/networking/instant-messengers/coyim/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook }: cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
buildGoPackage rec { buildGoPackage rec {
name = "coyim-${version}"; name = "coyim-${version}";
@ -14,7 +14,7 @@ buildGoPackage rec {
sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl"; sha256 = "1sna1n9dz1crws6cb1yjhy2kznbngjlbiw2diycshvbfigf7y7xl";
}; };
nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gnome3.gtk gnome3.defaultIconTheme ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gtk3 gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "a safe and secure chat client"; description = "a safe and secure chat client";

6
pkgs/applications/networking/instant-messengers/dino/default.nix
View File

@ -2,7 +2,7 @@
, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext
, gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking , gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking
, xorg, libXdmcp, libxkbcommon , xorg, libXdmcp, libxkbcommon
, libnotify, libsoup , libnotify, libsoup, libgee
, libgcrypt , libgcrypt
, epoxy , epoxy
, at-spi2-core , at-spi2-core
@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
gobject-introspection gobject-introspection
glib-networking glib-networking
glib glib
gnome3.libgee libgee
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
sqlite sqlite
gdk_pixbuf gdk_pixbuf
gtk3 gtk3

2
pkgs/applications/networking/instant-messengers/ekiga/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool buildInputs = [ cyrus_sasl gettext openldap ptlib opal libXv rarian intltool
evolution-data-server gnome-doc-utils avahi evolution-data-server gnome-doc-utils avahi
libsigcxx gtk dbus-glib libnotify libXext xorgproto sqlite libsigcxx gtk dbus-glib libnotify libXext xorgproto sqlite
gnome3.libsoup glib gnome3.defaultIconTheme boost gnome3.libsoup glib gnome3.adwaita-icon-theme boost
autoreconfHook pkgconfig libxml2 unixODBC db nspr autoreconfHook pkgconfig libxml2 unixODBC db nspr
nss zlib libsecret libXrandr which libxslt libtasn1 nss zlib libsecret libXrandr which libxslt libtasn1
gmp nettle makeWrapper ] gmp nettle makeWrapper ]

4
pkgs/applications/networking/instant-messengers/gajim/default.nix
View File

@ -1,7 +1,7 @@
{ lib, fetchurl, gettext, wrapGAppsHook { lib, fetchurl, gettext, wrapGAppsHook
# Native dependencies # Native dependencies
, python3, gtk3, gobject-introspection, defaultIconTheme , python3, gtk3, gobject-introspection, gnome3
# Test dependencies # Test dependencies
, xvfb_run, dbus , xvfb_run, dbus
@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec {
''; '';
buildInputs = [ buildInputs = [
gobject-introspection gtk3 defaultIconTheme gobject-introspection gtk3 gnome3.adwaita-icon-theme
] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ] ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
++ lib.optional enableSecrets libsecret ++ lib.optional enableSecrets libsecret
++ lib.optional enableSpelling gspell ++ lib.optional enableSpelling gspell

11
pkgs/applications/networking/mailreaders/astroid/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk { stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk
, libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable
, gtkmm3, libpeas, gsettings-desktop-schemas
, makeWrapper, python3, python3Packages , makeWrapper, python3, python3Packages
, vim ? vim_configurable.override { , vim ? vim_configurable.override {
features = "normal"; features = "normal";
@ -21,10 +22,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ cmake ronn pkgconfig wrapGAppsHook ];
buildInputs = [ gnome3.gtkmm gmime3 webkitgtk libsass gnome3.libpeas buildInputs = [
python3 python3Packages.pygobject3 gtkmm3 gmime3 webkitgtk libsass libpeas
notmuch boost gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme python3 python3Packages.pygobject3
glib-networking protobuf ] ++ (if vim == null then [] else [ vim ]); notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme
glib-networking protobuf
] ++ (if vim == null then [] else [ vim ]);
postPatch = '' postPatch = ''
sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc

5
pkgs/applications/networking/mailreaders/mailnag/default.nix
View File

@ -18,13 +18,14 @@ in pythonPackages.buildPythonApplication rec {
}; };
buildInputs = [ buildInputs = [
gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-bad
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3; ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3;
nativeBuildInputs = [ nativeBuildInputs = [
gettext
wrapGAppsHook wrapGAppsHook
]; ];

4
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
View File

@ -30,7 +30,7 @@
, libcanberra-gtk2 , libcanberra-gtk2
, libgnome , libgnome
, libgnomeui , libgnomeui
, defaultIconTheme , gnome3
, libGLU_combined , libGLU_combined
, nspr , nspr
, nss , nss
@ -117,7 +117,7 @@ stdenv.mkDerivation {
stdenv.cc.cc stdenv.cc.cc
]; ];
buildInputs = [ gtk3 defaultIconTheme ]; buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

2
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
hunspell libevent libstartup_notification /* cairo */ hunspell libevent libstartup_notification /* cairo */
icu libpng jemalloc icu libpng jemalloc
] ]
++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ]; ++ lib.optionals enableGTK3 [ gtk3 gnome3.adwaita-icon-theme ];
# from firefox + m4 + wrapperTool # from firefox + m4 + wrapperTool
nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ];

4
pkgs/applications/networking/remote/remmina/default.nix
View File

@ -6,7 +6,7 @@
, libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core
, openssl, gsettings-desktop-schemas, json-glib , openssl, gsettings-desktop-schemas, json-glib
# The themes here are soft dependencies; only icons are missing without them. # The themes here are soft dependencies; only icons are missing without them.
, hicolor-icon-theme, adwaita-icon-theme , hicolor-icon-theme, gnome3
}: }:
with stdenv.lib; with stdenv.lib;
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
pcre libdbusmenu-gtk3 libappindicator-gtk3 pcre libdbusmenu-gtk3 libappindicator-gtk3
libvncserver libpthreadstubs libXdmcp libxkbcommon libvncserver libpthreadstubs libXdmcp libxkbcommon
libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core
openssl hicolor-icon-theme adwaita-icon-theme json-glib openssl hicolor-icon-theme gnome3.adwaita-icon-theme json-glib
]; ];
cmakeFlags = [ cmakeFlags = [

4
pkgs/applications/networking/weather/meteo/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3 { stdenv, fetchFromGitLab, vala, python3, pkgconfig, meson, ninja, gtk3
, gnome3, json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk , json-glib, libsoup, clutter, clutter-gtk, libchamplain, webkitgtk, geocode-glib
, libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }: , libappindicator, desktop-file-utils, appstream, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
clutter clutter
clutter-gtk clutter-gtk
gnome3.geocode-glib geocode-glib
gtk3 gtk3
json-glib json-glib
libappindicator libappindicator

4
pkgs/applications/office/abiword/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, gtk3, fribidi { stdenv, fetchurl, pkgconfig, gtk3, fribidi
, libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl
, boost, libxslt, goffice, wrapGAppsHook, iconTheme , boost, libxslt, goffice, wrapGAppsHook, gnome3
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 librsvg bzip2 fribidi libpng popt gtk3 librsvg bzip2 fribidi libpng popt
libgsf enchant wv libjpeg perl boost libxslt goffice iconTheme libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/applications/office/gnumeric/default.nix
View File

@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
# ToDo: optional libgda, introspection? # ToDo: optional libgda, introspection?
buildInputs = [ buildInputs = [
goffice gtk3 gnome3.defaultIconTheme goffice gtk3 gnome3.adwaita-icon-theme
python pygobject3 python pygobject3
] ++ (with perlPackages; [ perl XMLParser ]); ] ++ (with perlPackages; [ perl XMLParser ]);

2
pkgs/applications/office/grisbi/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup
gnome3.defaultIconTheme ]; gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A personnal accounting application."; description = "A personnal accounting application.";

2
pkgs/applications/office/homebank/default.nix
View File

@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup buildInputs = [ gtk libofx intltool hicolor-icon-theme libsoup
gnome3.defaultIconTheme ]; gnome3.adwaita-icon-theme ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Free, easy, personal accounting for everyone"; description = "Free, easy, personal accounting for everyone";

4
pkgs/applications/office/libreoffice/default.nix
View File

@ -12,7 +12,7 @@
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, defaultIconTheme, glib, ncurses, epoxy, gpgme , gnome3, glib, ncurses, epoxy, gpgme
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ] , langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ]
, withHelp ? true , withHelp ? true
, kdeIntegration ? false , kdeIntegration ? false
@ -277,7 +277,7 @@ in stdenv.mkDerivation rec {
mdds bluez5 libcmis libwps libabw libzmf libtool mdds bluez5 libcmis libwps libabw libzmf libtool
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses epoxy librevenge libe-book libmwaw glm glew ncurses epoxy
libodfgen CoinMP librdf_rasqal defaultIconTheme gettext libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
] ]
++ lib.optional kdeIntegration kdelibs4; ++ lib.optional kdeIntegration kdelibs4;
nativeBuildInputs = [ wrapGAppsHook gdb ]; nativeBuildInputs = [ wrapGAppsHook gdb ];

4
pkgs/applications/office/libreoffice/still.nix
View File

@ -12,7 +12,7 @@
, libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
, librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
, gdb, commonsLogging, librdf_rasqal, wrapGAppsHook , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook
, defaultIconTheme, glib, ncurses, epoxy, gpgme , gnome3, glib, ncurses, epoxy, gpgme
, langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ] , langs ? [ "ca" "cs" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "nl" "pl" "ru" "sl" "zh-CN" ]
, withHelp ? true , withHelp ? true
, kdeIntegration ? false , kdeIntegration ? false
@ -272,7 +272,7 @@ in stdenv.mkDerivation rec {
mdds bluez5 libcmis libwps libabw libzmf libtool mdds bluez5 libcmis libwps libabw libzmf libtool
libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux
librevenge libe-book libmwaw glm glew ncurses epoxy librevenge libe-book libmwaw glm glew ncurses epoxy
libodfgen CoinMP librdf_rasqal defaultIconTheme gettext libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext
] ]
++ lib.optional kdeIntegration kdelibs4; ++ lib.optional kdeIntegration kdelibs4;
nativeBuildInputs = [ wrapGAppsHook gdb ]; nativeBuildInputs = [ wrapGAppsHook gdb ];

8
pkgs/applications/office/paperwork/default.nix
View File

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
inherit (python3Packages.paperwork-backend) version src; inherit (python3Packages.paperwork-backend) version src;
name = "paperwork-${version}"; pname = "paperwork";
sourceRoot = "source/paperwork-gtk"; sourceRoot = "source/paperwork-gtk";
# Patch out a few paths that assume that we're using the FHS: # Patch out a few paths that assume that we're using the FHS:
postPatch = '' postPatch = ''
themeDir="$(echo "${gnome3.defaultIconTheme}/share/icons/"*)" themeDir="$(echo "${gnome3.adwaita-icon-theme}/share/icons/"*)"
sed -i -e "s,/usr/share/icons/gnome,$themeDir," src/paperwork/deps.py sed -i -e "s,/usr/share/icons/gnome,$themeDir," src/paperwork/deps.py
sed -i -e 's,sys\.prefix,"",g' \ sed -i -e 's,sys\.prefix,"",g' \
@ -46,9 +46,9 @@ python3Packages.buildPythonApplication rec {
paths = lib.collect lib.isDerivation aspellDicts; paths = lib.collect lib.isDerivation aspellDicts;
}}/lib/aspell"; }}/lib/aspell";
checkInputs = [ xvfb_run dbus.daemon ]; checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]);
buildInputs = [ buildInputs = [
gnome3.defaultIconTheme hicolor-icon-theme libnotify librsvg gnome3.adwaita-icon-theme hicolor-icon-theme libnotify librsvg
]; ];
# A few parts of chkdeps need to have a display and a dbus session, so we not # A few parts of chkdeps need to have a display and a dbus session, so we not

2
pkgs/applications/office/tryton/default.nix
View File

@ -32,7 +32,7 @@ python2Packages.buildPythonApplication rec {
buildInputs = [ buildInputs = [
atk atk
gtk3 gtk3
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
gtkspell3 gtkspell3
goocanvas2 goocanvas2
]; ];

6
pkgs/applications/science/math/nasc/default.nix
View File

@ -4,6 +4,8 @@
, gtk3 , gtk3
, pantheon , pantheon
, gnome3 , gnome3
, gtksourceview
, libgee
, cmake , cmake
, libqalculate , libqalculate
, gobject-introspection , gobject-introspection
@ -35,8 +37,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
pantheon.elementary-icon-theme pantheon.elementary-icon-theme
gnome3.gtksourceview gtksourceview
gnome3.libgee libgee
gnome3.libsoup gnome3.libsoup
pantheon.granite pantheon.granite
gtk3 gtk3

2
pkgs/applications/science/math/wxmaxima/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa"; sha256 = "0s7bdykc77slqix28cyaa6x8wvxrn8461mkdgxflvi2apwsl56aa";
}; };
buildInputs = [ wxGTK maxima gnome3.defaultIconTheme ]; buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ];
nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; nativeBuildInputs = [ wrapGAppsHook cmake gettext ];

42
pkgs/applications/science/spyder/default.nix
View File

@ -1,22 +1,44 @@
{ stdenv, python3, makeDesktopItem }: { stdenv, python3, makeDesktopItem }:
python3.pkgs.buildPythonApplication rec { let
spyder-kernels = with python3.pkgs; buildPythonPackage rec {
pname = "spyder-kernels";
version = "0.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b";
};
propagatedBuildInputs = [
cloudpickle
ipykernel
wurlitzer
];
# No tests
doCheck = false;
meta = {
description = "Jupyter kernels for Spyder's console";
homepage = https://github.com/spyder-ide/spyder-kernels;
license = stdenv.lib.licenses.mit;
};
};
in python3.pkgs.buildPythonApplication rec {
pname = "spyder"; pname = "spyder";
version = "3.2.8"; version = "3.3.3";
src = python3.pkgs.fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5"; sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba";
}; };
# Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?
postPatch = ''
sed -i -e '/pyqt5/d' setup.py
'';
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python3.pkgs; [
jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
]; ];
# There is no test for spyder # There is no test for spyder

2
pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
View File

@ -15,6 +15,8 @@ python2Packages.buildPythonApplication rec {
buildInputs = [ git graphviz ]; buildInputs = [ git graphviz ];
checkInputs = [ git ];
postFixup = '' postFixup = ''
wrapProgram $out/bin/git-big-picture \ wrapProgram $out/bin/git-big-picture \
--prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs } --prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs }

2
pkgs/applications/version-management/meld/default.nix
View File

@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
intltool itstool libxml2 gobject-introspection wrapGAppsHook intltool itstool libxml2 gobject-introspection wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme gtk3 gtksourceview gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme
]; ];
propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ]; propagatedBuildInputs = with python3.pkgs; [ pygobject3 pycairo ];
checkInputs = [ xvfb_run python3.pkgs.pytest dbus ]; checkInputs = [ xvfb_run python3.pkgs.pytest dbus ];

2
pkgs/applications/video/pitivi/default.nix
View File

@ -48,7 +48,7 @@ in python3Packages.buildPythonApplication rec {
buildInputs = [ buildInputs = [
gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libnotify gnome3.gsettings-desktop-schemas libnotify
gst-transcoder gst-transcoder
] ++ (with gst_all_1; [ ] ++ (with gst_all_1; [

4
pkgs/applications/video/screenkey/default.nix
View File

@ -9,7 +9,7 @@
, libX11 , libX11
, libXtst , libXtst
, wrapGAppsHook , wrapGAppsHook
, defaultIconTheme , gnome3
, hicolor-icon-theme , hicolor-icon-theme
}: }:
buildPythonApplication rec { buildPythonApplication rec {
@ -39,7 +39,7 @@ buildPythonApplication rec {
]; ];
buildInputs = [ buildInputs = [
defaultIconTheme gnome3.adwaita-icon-theme
hicolor-icon-theme hicolor-icon-theme
]; ];

4
pkgs/applications/virtualization/open-vm-tools/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook,
fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps,
libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst,
pkgconfig, glib, gtk, gtkmm, iproute, dbus, systemd, which, pkgconfig, glib, gtk3, gtkmm3, iproute, dbus, systemd, which,
withX ? true }: withX ? true }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ] buildInputs = [ fuse glib icu libdnet libmspack openssl pam procps xercesc ]
++ lib.optionals withX [ gtk gtkmm libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; ++ lib.optionals withX [ gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ];
patches = [ ./recognize_nixos.patch ]; patches = [ ./recognize_nixos.patch ];
postPatch = '' postPatch = ''

2
pkgs/applications/virtualization/virt-manager/default.nix
View File

@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec {
]; ];
buildInputs = buildInputs =
[ libvirt-glib vte dconf gtk-vnc gnome3.defaultIconTheme avahi [ libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi
gsettings-desktop-schemas libosinfo gtk3 gsettings-desktop-schemas libosinfo gtk3
] ++ optional spiceSupport spice-gtk; ] ++ optional spiceSupport spice-gtk;

1
pkgs/build-support/build-fhs-userenv/env.nix
View File

@ -196,4 +196,5 @@ in stdenv.mkDerivation {
${if isMultiBuild then extraBuildCommandsMulti else ""} ${if isMultiBuild then extraBuildCommandsMulti else ""}
''; '';
preferLocalBuild = true; preferLocalBuild = true;
allowSubstitutes = false;
} }

12
pkgs/build-support/buildenv/builder.pl
View File

@ -26,6 +26,13 @@ sub isInPathsToLink {
return 0; return 0;
} }
# Similar to `lib.isStorePath`
sub isStorePath {
my $path = shift;
my $storePath = "@storeDir@";
return substr($path, 0, 1) eq "/" && dirname($path) eq $storePath;
}
# For each activated package, determine what symlinks to create. # For each activated package, determine what symlinks to create.
@ -84,6 +91,11 @@ sub checkCollision {
sub findFiles { sub findFiles {
my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_; my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
# The store path must not be a file
if (-f $target && isStorePath $target) {
die "The store path $target is a file and can't be merged into an environment using pkgs.buildEnv!";
}
# Urgh, hacky... # Urgh, hacky...
return if return if
$relName eq "/propagated-build-inputs" || $relName eq "/propagated-build-inputs" ||

12
pkgs/build-support/buildenv/default.nix
View File

@ -2,7 +2,7 @@
# a fork of the buildEnv in the Nix distribution. Most changes should # a fork of the buildEnv in the Nix distribution. Most changes should
# eventually be merged back into the Nix distribution. # eventually be merged back into the Nix distribution.
{ buildPackages, runCommand, lib }: { buildPackages, runCommand, lib, substituteAll }:
lib.makeOverridable lib.makeOverridable
({ name ({ name
@ -43,6 +43,13 @@ lib.makeOverridable
, meta ? {} , meta ? {}
}: }:
let
builder = substituteAll {
src = ./builder.pl;
inherit (builtins) storeDir;
};
in
runCommand name runCommand name
rec { rec {
inherit manifest ignoreCollisions checkCollisionContents passthru inherit manifest ignoreCollisions checkCollisionContents passthru
@ -63,10 +70,11 @@ runCommand name
priority = drv.meta.priority or 5; priority = drv.meta.priority or 5;
}) paths); }) paths);
preferLocalBuild = true; preferLocalBuild = true;
allowSubstitutes = false;
# XXX: The size is somewhat arbitrary # XXX: The size is somewhat arbitrary
passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null; passAsFile = if builtins.stringLength pkgs >= 128*1024 then [ "pkgs" ] else null;
} }
'' ''
${buildPackages.perl}/bin/perl -w ${./builder.pl} ${buildPackages.perl}/bin/perl -w ${builder}
eval "$postBuild" eval "$postBuild"
'') '')

1
pkgs/build-support/substitute-files/substitute-all-files.nix
View File

@ -22,4 +22,5 @@ stdenv.mkDerivation ({
eval "$postInstall" eval "$postInstall"
''; '';
preferLocalBuild = true; preferLocalBuild = true;
allowSubstitutes = false;
} // args) } // args)

1
pkgs/build-support/substitute/substitute-all.nix
View File

@ -8,4 +8,5 @@ stdenvNoCC.mkDerivation ({
builder = ./substitute-all.sh; builder = ./substitute-all.sh;
inherit (args) src; inherit (args) src;
preferLocalBuild = true; preferLocalBuild = true;
allowSubstitutes = false;
} // args) } // args)

2
pkgs/desktops/gnome-3/apps/accerciser/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 libxml2 python3Packages.python python3Packages.pyatspi gtk3 libxml2 python3Packages.python python3Packages.pyatspi
python3Packages.pygobject3 python3Packages.ipython python3Packages.pygobject3 python3Packages.ipython
at-spi2-core dbus libwnck3 gnome3.defaultIconTheme at-spi2-core dbus libwnck3 gnome3.adwaita-icon-theme
]; ];
wrapPrefixVariables = [ "PYTHONPATH" ]; wrapPrefixVariables = [ "PYTHONPATH" ];

20
pkgs/desktops/gnome-3/apps/evolution/default.nix
View File

@ -1,5 +1,7 @@
{ stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight { stdenv, cmake, ninja, intltool, fetchurl, libxml2, webkitgtk, highlight
, pkgconfig, gtk3, glib, libnotify, gtkspell3 , pkgconfig, gtk3, glib, libnotify, gtkspell3, evolution-data-server
, adwaita-icon-theme, gnome-desktop, libgdata
, libgweather, glib-networking, gsettings-desktop-schemas
, wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite , wrapGAppsHook, itstool, shared-mime-info, libical, db, gcr, sqlite
, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu
, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }: , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
@ -14,17 +16,17 @@ in stdenv.mkDerivation rec {
sha256 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h"; sha256 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h";
}; };
propagatedUserEnvPkgs = [ gnome3.evolution-data-server ]; propagatedUserEnvPkgs = [ evolution-data-server ];
buildInputs = [ buildInputs = [
gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu gtk3 glib gdk_pixbuf adwaita-icon-theme librsvg db icu
gnome3.evolution-data-server libsecret libical gcr evolution-data-server libsecret libical gcr
webkitgtk shared-mime-info gnome3.gnome-desktop gtkspell3 webkitgtk shared-mime-info gnome-desktop gtkspell3
libcanberra-gtk3 bogofilter gnome3.libgdata sqlite libcanberra-gtk3 bogofilter libgdata sqlite
gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit gst_all_1.gstreamer gst_all_1.gst-plugins-base p11-kit
nss nspr libnotify procps highlight gnome3.libgweather nss nspr libnotify procps highlight libgweather
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
gnome3.glib-networking openldap glib-networking openldap
]; ];
nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ cmake ninja intltool itstool libxml2 pkgconfig wrapGAppsHook ];

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glib, gtk, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive { stdenv, fetchurl, glib, gtk3, meson, ninja, pkgconfig, gnome3, gettext, itstool, libxml2, libarchive
, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ];
buildInputs = [ glib gtk json-glib libarchive file gnome3.defaultIconTheme libnotify nautilus ]; buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ];
PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";

9
pkgs/desktops/gnome-3/apps/gedit/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, intltool, fetchurl { stdenv, intltool, fetchurl
, pkgconfig, gtk3, glib , pkgconfig, gtk3, glib, adwaita-icon-theme
, libpeas, gtksourceview, gsettings-desktop-schemas
, wrapGAppsHook, itstool, libsoup, libxml2 , wrapGAppsHook, itstool, libsoup, libxml2
, gnome3, gspell }: , gnome3, gspell }:
@ -16,9 +17,9 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 glib gtk3 glib
gnome3.defaultIconTheme libsoup adwaita-icon-theme libsoup
gnome3.libpeas gnome3.gtksourceview libpeas gtksourceview
gnome3.gsettings-desktop-schemas gspell gsettings-desktop-schemas gspell
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

15
pkgs/desktops/gnome-3/apps/ghex/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, { stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, libxml2, gtk3,
wrapGAppsHook }: wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -10,13 +10,16 @@ stdenv.mkDerivation rec {
sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3"; sha256 = "c67450f86f9c09c20768f1af36c11a66faf460ea00fbba628a9089a6804808d3";
}; };
passthru = {
updateScript = gnome3.updateScript { packageName = "ghex"; attrPath = "gnome3.ghex"; };
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = [ gnome3.gtk intltool itstool libxml2 ]; buildInputs = [ gtk3 intltool itstool libxml2 ];
passthru = {
updateScript = gnome3.updateScript {
packageName = "ghex";
attrPath = "gnome3.ghex";
};
};
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://wiki.gnome.org/Apps/Ghex; homepage = https://wiki.gnome.org/Apps/Ghex;

2
pkgs/desktops/gnome-3/apps/glade/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 glib libxml2 python3 python3.pkgs.pygobject3 gtk3 glib libxml2 python3 python3.pkgs.pygobject3
gnome3.gsettings-desktop-schemas gnome3.gsettings-desktop-schemas
gdk_pixbuf gnome3.defaultIconTheme gdk_pixbuf gnome3.adwaita-icon-theme
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;

2
pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
View File

@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
libvirt-glib glib gtk3 gtk-vnc freerdp libxml2 libvirt-glib glib gtk3 gtk-vnc freerdp libxml2
libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
gnome3.defaultIconTheme librsvg acl libgudev libsecret gnome3.adwaita-icon-theme librsvg acl libgudev libsecret
libcap_ng numactl xen libapparmor libcap_ng numactl xen libapparmor
]; ];

6
pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3 { stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3
, gettext, libxml2, gnome3, gtk, evolution-data-server, libsoup , gettext, libxml2, gnome3, gtk3, evolution-data-server, libsoup
, glib, gnome-online-accounts, gsettings-desktop-schemas }: , glib, gnome-online-accounts, gsettings-desktop-schemas }:
let let
@ -22,8 +22,8 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ]; nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ];
buildInputs = [ buildInputs = [
gtk evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib gtk3 evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib
gsettings-desktop-schemas gnome3.defaultIconTheme gsettings-desktop-schemas gnome3.adwaita-icon-theme
]; ];
postPatch = '' postPatch = ''

8
pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, glib, gtk3, pango, wrapGAppsHook, python3
, gobject-introspection, gjs, libunistring }: , gobject-introspection, gjs, libunistring, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-characters-${version}"; name = "gnome-characters-${version}";
@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ]; nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 gobject-introspection ];
buildInputs = [ buildInputs = [
glib gtk3 gjs pango gnome3.gsettings-desktop-schemas glib gtk3 gjs pango gsettings-desktop-schemas
gnome3.defaultIconTheme libunistring adwaita-icon-theme libunistring
# typelib # typelib
gnome3.gnome-desktop gnome-desktop
]; ];
mesonFlags = [ mesonFlags = [

5
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl { stdenv, fetchurl
, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils
, vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop , vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop
, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, geocode-glib
, gnome3, gdk_pixbuf, geoclue2, libgweather }: , gnome3, gdk_pixbuf, geoclue2, libgweather }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -26,8 +27,8 @@ stdenv.mkDerivation rec {
gobject-introspection # for finding vapi files gobject-introspection # for finding vapi files
]; ];
buildInputs = [ buildInputs = [
gtk3 glib gnome3.gsettings-desktop-schemas gdk_pixbuf gnome3.defaultIconTheme gtk3 glib gsettings-desktop-schemas gdk_pixbuf adwaita-icon-theme
gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound gnome-desktop geocode-glib geoclue2 libgweather gsound
]; ];
preFixup = '' preFixup = ''

2
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
View File

@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk3 glib gnome3.gsettings-desktop-schemas gtk3 glib gnome3.gsettings-desktop-schemas
gdk_pixbuf gnome3.defaultIconTheme evince gdk_pixbuf gnome3.adwaita-icon-theme evince
libsoup webkitgtk gjs gobject-introspection libsoup webkitgtk gjs gobject-introspection
tracker tracker-miners libgdata tracker tracker-miners libgdata
gnome-desktop libzapojit libgepub gnome-desktop libzapojit libgepub

2
pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils
libxml2 libxslt docbook_xsl docbook_xml_dtd_43 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
]; ];
buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.defaultIconTheme ]; buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ];
postPatch = '' postPatch = ''
chmod +x meson_post_install.py chmod +x meson_post_install.py

2
pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
View File

@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
geocode-glib libchamplain libsoup geocode-glib libchamplain libsoup
gdk_pixbuf librsvg libgweather gdk_pixbuf librsvg libgweather
gnome3.gsettings-desktop-schemas evolution-data-server gnome3.gsettings-desktop-schemas evolution-data-server
gnome-online-accounts gnome3.defaultIconTheme gnome-online-accounts gnome3.adwaita-icon-theme
webkitgtk webkitgtk
]; ];

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

@ -17,8 +17,8 @@ python3.pkgs.buildPythonApplication rec {
nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
buildInputs = with gst_all_1; [ buildInputs = with gst_all_1; [
gtk3 glib libmediaart gnome-online-accounts gtk3 glib libmediaart gnome-online-accounts gobject-introspection
gdk_pixbuf gnome3.defaultIconTheme python3 gdk_pixbuf gnome3.adwaita-icon-theme python3
grilo grilo-plugins libnotify libdazzle libsoup grilo grilo-plugins libnotify libdazzle libsoup
gnome3.gsettings-desktop-schemas tracker gnome3.gsettings-desktop-schemas tracker
gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly

2
pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
gtk3 wrapGAppsHook libgtop intltool itstool libxml2 gtk3 wrapGAppsHook libgtop intltool itstool libxml2
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
]; ];
propagatedUserEnvPkgs = [ nmap inetutils ]; propagatedUserEnvPkgs = [ nmap inetutils ];

2
pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
View File

@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
gnome3.gnome-online-accounts zeitgeist gnome3.gnome-online-accounts zeitgeist
gnome3.gsettings-desktop-schemas gnome3.gsettings-desktop-schemas
evolution-data-server evolution-data-server
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
]; ];
mesonFlags = [ mesonFlags = [

2
pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
View File

@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 glib gegl babl libgdata libdazzle gtk3 glib gegl babl libgdata libdazzle
gnome3.gsettings-desktop-schemas gnome3.gsettings-desktop-schemas
gdk_pixbuf gnome3.defaultIconTheme gdk_pixbuf gnome3.adwaita-icon-theme
gfbgraph grilo-plugins grilo gfbgraph grilo-plugins grilo
gnome-online-accounts tracker gnome-online-accounts tracker
gexiv2 geocode-glib dleyna-renderer gexiv2 geocode-glib dleyna-renderer

2
pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix
View File

@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
gtk3 gtk3
glib glib
upower upower
gnome3.defaultIconTheme gnome3.adwaita-icon-theme
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

10
pkgs/desktops/gnome-3/apps/gnome-todo/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook { stdenv, fetchurl, meson, ninja, pkgconfig, python3, wrapGAppsHook
, gettext, gnome3, glib, gtk, libpeas , gettext, gnome3, glib, gtk3, libpeas
, gnome-online-accounts, gsettings-desktop-schemas , gnome-online-accounts, gsettings-desktop-schemas
, evolution-data-server, libxml2, libsoup, libical, rest, json-glib }: , evolution-data-server, libxml2, libsoup, libical, librest, json-glib }:
let let
pname = "gnome-todo"; pname = "gnome-todo";
@ -18,11 +18,11 @@ in stdenv.mkDerivation rec {
meson ninja pkgconfig gettext python3 wrapGAppsHook meson ninja pkgconfig gettext python3 wrapGAppsHook
]; ];
buildInputs = [ buildInputs = [
glib gtk libpeas gnome-online-accounts glib gtk3 libpeas gnome-online-accounts
gsettings-desktop-schemas gnome3.defaultIconTheme gsettings-desktop-schemas gnome3.adwaita-icon-theme
# Plug-ins # Plug-ins
evolution-data-server libxml2 libsoup libical evolution-data-server libxml2 libsoup libical
rest json-glib librest json-glib
]; ];
postPatch = '' postPatch = ''

2
pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
buildInputs = [ buildInputs = [
gtk3 gjs gobject-introspection gnome-desktop gtk3 gjs gobject-introspection gnome-desktop
libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings-desktop-schemas libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas
]; ];
# The .service file isn't wrapped with the correct environment # The .service file isn't wrapped with the correct environment

2
pkgs/desktops/gnome-3/apps/seahorse/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 glib gcr gtk3 glib gcr
gnome3.gsettings-desktop-schemas gnupg gnome3.gsettings-desktop-schemas gnupg
gnome3.defaultIconTheme gpgme gnome3.adwaita-icon-theme gpgme
libsecret avahi libsoup p11-kit libsecret avahi libsoup p11-kit
openssh openldap openssh openldap
]; ];

2
pkgs/desktops/gnome-3/apps/vinagre/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
buildInputs = [ buildInputs = [
gtk3 vte libxml2 gtk-vnc libsecret gnome3.defaultIconTheme librsvg gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg
]; ];
NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";

Some files were not shown because too many files have changed in this diff Show More