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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2021-05-08 20:59:05 +02:00
parent 252bf94a74 6d46d8a9b9
commit dd78ce1c53
730 changed files with 3907 additions and 1907 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/graphics/avocode/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, makeDesktopItem, fetchurl, unzip
, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome
, xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa
}:
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [makeWrapper wrapGAppsHook unzip];
buildInputs = [ gtk3 gnome3.adwaita-icon-theme ];
buildInputs = [ gtk3 gnome.adwaita-icon-theme ];
# src is producing multiple folder on unzip so we must
# override unpackCmd to extract it into newly created folder
pkgs/applications/graphics/darktable/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib
, ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg
, libpng, librsvg, libtiff, openexr, osm-gps-map, pkg-config, sqlite, libxslt
, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3
, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome
, ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif
libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt
libsoup graphicsmagick json-glib openjpeg lua pugixml
libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map pcre isocodes
libwebp libsecret gnome.adwaita-icon-theme osm-gps-map pcre isocodes
] ++ lib.optionals stdenv.isLinux [
colord colord-gtk libX11 ocl-icd
] ++ lib.optional stdenv.isDarwin gtk-mac-integration
pkgs/applications/graphics/fondo/default.nix
+1 -1
View File
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
description = "Find the most beautiful wallpapers for your desktop";
homepage = "https://github.com/calo001/fondo";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ worldofpeace ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/applications/graphics/gimp/wrapper.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}:
{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome, plugins ? null}:
let
allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins);
@@ -18,7 +18,7 @@ in symlinkJoin {
wrapProgram $out/bin/$each \
--set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \
--set GIMP2_DATADIR "$out/share/gimp/2.0" \
--prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \
--prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \
${toString extraArgs}
done
set +x
pkgs/applications/graphics/glabels/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, barcode, gnome3, autoreconfHook
{ lib, stdenv, fetchurl, barcode, gnome, autoreconfHook
, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas
, intltool, itstool, makeWrapper, pkg-config, yelp-tools
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ];
buildInputs = [
barcode gtk3 gtk-doc yelp-tools
gnome3.gnome-common gsettings-desktop-schemas
gnome.gnome-common gsettings-desktop-schemas
itstool libxml2 librsvg libe-book libtool
];
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "none";
};
pkgs/applications/graphics/glimpse/wrapper.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome3, plugins ? null }:
{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome, plugins ? null }:
let
allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues glimpsePlugins);
@@ -19,7 +19,7 @@ symlinkJoin {
wrapProgram $out/bin/$each \
--set GIMP2_PLUGINDIR "$out/lib/glimpse/2.0" \
--set GIMP2_DATADIR "$out/share/glimpse/2.0" \
--prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \
--prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \
${toString extraArgs}
done
pkgs/applications/graphics/gnome-photos/default.nix
+3 -3
View File
@@ -13,7 +13,7 @@
, gfbgraph
, glib
, gnome-online-accounts
, gnome3
, gnome
, gobject-introspection
, grilo
, grilo-plugins
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
gfbgraph
glib
gnome-online-accounts
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
grilo
grilo-plugins
gsettings-desktop-schemas
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
};
pkgs/applications/graphics/gscan2pdf/default.nix
+2 -2
View File
@@ -4,7 +4,7 @@
# runtime dependencies
imagemagick, libtiff, djvulibre, poppler_utils, ghostscript, unpaper, pdftk,
# test dependencies
xvfb_run, liberation_ttf, file, tesseract }:
xvfb-run, liberation_ttf, file, tesseract }:
with lib;
@@ -94,7 +94,7 @@ perlPackages.buildPerlPackage rec {
unpaper
pdftk
xvfb_run
xvfb-run
file
tesseract # tests are expecting tesseract 3.x precisely
] ++ (with perlPackages; [
pkgs/applications/graphics/gthumb/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchurl
, gnome3
, gnome
, pkg-config
, meson
, ninja
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
clutter-gtk
exiv2
glib
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
gsettings-desktop-schemas
gst_all_1.gst-plugins-base
(gst_all_1.gst-plugins-good.override { gtkSupport = true; })
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "odd-unstable";
};
pkgs/applications/graphics/kgraphviewer/default.nix
+1 -1
View File
@@ -30,7 +30,7 @@ mkDerivation rec {
meta = with lib; {
description = "A Graphviz dot graph viewer for KDE";
license = licenses.gpl2;
maintainers = with maintainers; [ lethalman ];
maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
pkgs/applications/graphics/megapixels/default.nix
+2 -2
View File
@@ -6,7 +6,7 @@
, pkg-config
, wrapGAppsHook
, gtk3
, gnome3
, gnome
, zbar
, tiffSupport ? true
, libraw
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ];
buildInputs = [ gtk3 gnome3.adwaita-icon-theme zbar ]
buildInputs = [ gtk3 gnome.adwaita-icon-theme zbar ]
++ optional tiffSupport libraw
++ optional jpgSupport graphicsmagick;
pkgs/applications/graphics/ocrfeeder/default.nix
+1 -1
View File
@@ -8,7 +8,7 @@
, intltool
, itstool
, libxml2
, gnome3
, gnome
, python3
, gobject-introspection
, wrapGAppsHook
pkgs/applications/graphics/shotwell/default.nix
+3 -3
View File
@@ -12,7 +12,7 @@
, sqlite
, webkitgtk
, pkg-config
, gnome3
, gnome
, gst_all_1
, libgudev
, libraw
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
librsvg
librest
gcr
gnome3.adwaita-icon-theme
gnome.adwaita-icon-theme
libgdata
libchamplain
libsecret
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome3.updateScript {
updateScript = gnome.updateScript {
packageName = pname;
versionPolicy = "none";
};
pkgs/applications/graphics/synfigstudio/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3
, libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkg-config
, imagemagick, intltool, autoreconfHook, which, gnome3
, imagemagick, intltool, autoreconfHook, which, gnome
}:
let
@@ -107,7 +107,7 @@ stdenv.mkDerivation {
buildInputs = [
ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool
libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5
synfig which gnome3.adwaita-icon-theme
synfig which gnome.adwaita-icon-theme
];
postInstall = ''
pkgs/applications/graphics/tev/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, cmake, wrapGAppsHook
, libX11, libzip, glfw, libpng, xorg, gnome3
, libX11, libzip, glfw, libpng, xorg, gnome
}:
stdenv.mkDerivation rec {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/tev \
"''${gappsWrapperArgs[@]}" \
--prefix PATH ":" "${gnome3.zenity}/bin"
--prefix PATH ":" "${gnome.zenity}/bin"
'';
meta = with lib; {
pkgs/applications/graphics/vimiv/default.nix
+4 -4
View File
@@ -1,8 +1,8 @@
{ lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead
, gnome3
, gnome
# Test requirements
, dbus, xvfb_run, xdotool
, dbus, xvfb-run, xdotool
}:
python3Packages.buildPythonApplication rec {
@@ -37,8 +37,8 @@ python3Packages.buildPythonApplication rec {
vimiv/imageactions.py
'';
checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ];
buildInputs = [ gnome3.adwaita-icon-theme librsvg ];
checkInputs = [ python3Packages.nose dbus.daemon xvfb-run xdotool ];
buildInputs = [ gnome.adwaita-icon-theme librsvg ];
propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ];
makeWrapperArgs = [