Merge pull request #113965 from SuperSandro2000/fix-collection17
This commit is contained in:
Sandro
GitHub
commit
ad06c82b9c
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitLab
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
|
||||
@ -40,11 +40,6 @@ in pythonPackages.buildPythonApplication rec {
|
||||
dateutil
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
# Pesky unicode punctuation.
|
||||
substituteInPlace setup.cfg --replace "‘" "'"
|
||||
'';
|
||||
|
||||
# In order to spare double wrapping, we use:
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
, openssl
|
||||
, pkg-config
|
||||
, python3
|
||||
, rust
|
||||
, rustc
|
||||
, rustPlatform
|
||||
, sqlite
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, python3Packages
|
||||
, youtube-dl
|
||||
}:
|
||||
|
||||
buildPythonApplication rec {
|
||||
|
||||
@ -35,7 +35,6 @@
|
||||
, wrapGAppsHook
|
||||
, dbus
|
||||
, xvfb_run
|
||||
, glib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, gnome3
|
||||
, pkg-config
|
||||
, meson
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ buildPythonApplication, lib, fetchFromGitHub, fetchpatch
|
||||
{ buildPythonApplication, lib, fetchFromGitHub
|
||||
|
||||
# build inputs
|
||||
, atk
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, atspiSupport ? true
|
||||
, bash
|
||||
, glib
|
||||
, glibcLocales
|
||||
, dconf
|
||||
, gobject-introspection
|
||||
, gsettings-desktop-schemas
|
||||
@ -130,8 +129,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
--replace "/etc" "$out/etc"
|
||||
|
||||
substituteInPlace ./Onboard/LanguageSupport.py \
|
||||
--replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" \
|
||||
--replace "/usr/bin/yelp" "${yelp}/bin/yelp"
|
||||
--replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes"
|
||||
|
||||
substituteInPlace ./Onboard/Indicator.py \
|
||||
--replace "/usr/bin/yelp" "${yelp}/bin/yelp"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee, fetchpatch
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee
|
||||
, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook
|
||||
, webkitgtk, discount, json-glib }:
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, lispPackages, sbcl
|
||||
{ stdenv, lib, lispPackages
|
||||
, makeWrapper, wrapGAppsHook, gst_all_1
|
||||
, glib, gdk-pixbuf, cairo
|
||||
, mime-types, pango, gtk3
|
||||
|
||||
@ -19,9 +19,7 @@
|
||||
, dbus
|
||||
, vala
|
||||
, wrapGAppsHook
|
||||
, xorg
|
||||
, xvfb_run
|
||||
, libxml2
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee
|
||||
{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, glib, webkitgtk, libgee
|
||||
, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook
|
||||
, appstream, desktop-file-utils }:
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext
|
||||
{ stdenv, fetchurl, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext
|
||||
, IOCompress, zlib, libjpeg, expat, freetype, libwpd
|
||||
, libxml2, db, curl, fontconfig, libsndfile, neon
|
||||
, bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitLab
|
||||
{ lib
|
||||
, stdenv
|
||||
, cmake
|
||||
, libGLU
|
||||
, libGL
|
||||
@ -18,9 +18,7 @@
|
||||
, pcre
|
||||
, libpthreadstubs
|
||||
, libXdmcp
|
||||
, fetchpatch
|
||||
, lndir
|
||||
, callPackage
|
||||
|
||||
, stable
|
||||
, baseName
|
||||
|
||||
@ -15,19 +15,15 @@
|
||||
, stable ? true
|
||||
, oceSupport ? false
|
||||
, withOCE ? false
|
||||
, opencascade
|
||||
, withOCCT ? false
|
||||
, withOCC ? true
|
||||
, opencascade-occt
|
||||
, ngspiceSupport ? false
|
||||
, withNgspice ? true
|
||||
, libngspice
|
||||
, scriptingSupport ? false
|
||||
, withScripting ? true
|
||||
, swig
|
||||
, python3
|
||||
, debug ? false
|
||||
, valgrind
|
||||
, with3d ? true
|
||||
, withI18n ? true
|
||||
, srcs ? { }
|
||||
|
||||
@ -9,7 +9,6 @@
|
||||
, gtk3
|
||||
, glib
|
||||
, pantheon
|
||||
, libsoup
|
||||
, gtksourceview
|
||||
, libgee
|
||||
, nix-update-script
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib
|
||||
{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib
|
||||
, future, psutil, setuptools
|
||||
# Optional dependencies:
|
||||
, bottle, pysnmp
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
{ stdenv, lib, fetchpatch, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
|
||||
{ stdenv, lib, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
|
||||
, pkg-config, cmake, gnumake, yasm, python2Packages
|
||||
, libgcrypt, libgpgerror, libunistring
|
||||
, boost, avahi, lame, autoreconfHook
|
||||
, boost, avahi, lame
|
||||
, gettext, pcre-cpp, yajl, fribidi, which
|
||||
, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless
|
||||
, libxml2, systemd
|
||||
, alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl
|
||||
, alsaLib, libGLU, libGL, fontconfig, freetype, ftgl
|
||||
, libjpeg, libpng, libtiff
|
||||
, libmpeg2, libsamplerate, libmad
|
||||
, libogg, libvorbis, flac, libxslt
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, gettext
|
||||
|
||||
@ -8,18 +8,11 @@
|
||||
, intltool
|
||||
, gtk3
|
||||
, libnotify
|
||||
, gnome-menus
|
||||
, libxml2
|
||||
, systemd
|
||||
, upower
|
||||
, gnome-online-accounts
|
||||
, cinnamon-settings-daemon
|
||||
, colord
|
||||
, polkit
|
||||
, ibus
|
||||
, libpulseaudio
|
||||
, isocodes
|
||||
, kerberos
|
||||
, libxkbfile
|
||||
, cinnamon-menus
|
||||
, dbus-glib
|
||||
@ -27,7 +20,6 @@
|
||||
, libxklavier
|
||||
, networkmanager
|
||||
, libwacom
|
||||
, gnome3
|
||||
, libtool
|
||||
, wrapGAppsHook
|
||||
, tzdata
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, vala
|
||||
, meson
|
||||
, ninja
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, gtk3
|
||||
, vala
|
||||
|
||||
@ -1,10 +1,8 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, meson
|
||||
, ninja
|
||||
, gettext
|
||||
, config
|
||||
, pkg-config
|
||||
, python3
|
||||
, gst-plugins-base
|
||||
|
||||
@ -9,7 +9,6 @@
|
||||
, docbook_xsl
|
||||
, docbook_xml_dtd_43
|
||||
, gtk3
|
||||
, gnome3
|
||||
, glade
|
||||
, dbus
|
||||
, xvfb_run
|
||||
|
||||
@ -23,5 +23,8 @@ stdenv.mkDerivation rec {
|
||||
homepage = "https://gitlab.gnome.org/GNOME/libwnck";
|
||||
license = lib.licenses.lgpl21;
|
||||
maintainers = with lib.maintainers; [ johnazoidberg ];
|
||||
# ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found
|
||||
# #include <gdk/gdkx.h>
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus
|
||||
, telepathy-farstream, telepathy-glib, fetchpatch }:
|
||||
, telepathy-farstream, telepathy-glib }:
|
||||
|
||||
let
|
||||
inherit (python3Packages) python dbus-python;
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, asyncio-dgram
|
||||
, asynctest
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, fetchFromGitHub
|
||||
, poetry
|
||||
, pytest-aiohttp
|
||||
|
||||
@ -29,6 +29,9 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ];
|
||||
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "gmusicapi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "An unofficial API for Google Play Music";
|
||||
homepage = "https://pypi.python.org/pypi/gmusicapi/";
|
||||
|
||||
@ -26,6 +26,11 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodomex requests six ];
|
||||
|
||||
# no tests executed
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "gpsoauth" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A python client library for Google Play Services OAuth";
|
||||
homepage = "https://github.com/simon-weber/gpsoauth";
|
||||
|
||||
@ -4,7 +4,6 @@
|
||||
, impacket
|
||||
, netaddr
|
||||
, pypykatz
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
, fetchFromGitHub
|
||||
, pycryptodomex
|
||||
, pytestCheckHook
|
||||
, pyyaml
|
||||
, pytest-vcr
|
||||
, pytest-asyncio
|
||||
, requests
|
||||
|
||||
@ -57,11 +57,7 @@ buildPythonPackage rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'boto3>=1.4.4,<1.16'," "'boto3~=1.16'," \
|
||||
--replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \
|
||||
--replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," \
|
||||
--replace "'idna<2.10'," "'idna'," \
|
||||
--replace "'requests<2.24.0'," "'requests',"
|
||||
--replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL',"
|
||||
'';
|
||||
|
||||
# tests require encrypted secrets, see
|
||||
|
||||
@ -10,9 +10,6 @@
|
||||
, doxygen
|
||||
, ncurses
|
||||
, libintl
|
||||
, numpy
|
||||
, pillow
|
||||
, six
|
||||
, wxGTK
|
||||
, wxmac
|
||||
, IOKit
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, pkg-config
|
||||
, python
|
||||
, isPy27
|
||||
, pyopengl
|
||||
, doxygen
|
||||
, cairo
|
||||
, ncurses
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ buildEnv
|
||||
, fetchurl
|
||||
{ fetchurl
|
||||
, fontconfig
|
||||
, freetype
|
||||
, glib
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
@ -8,7 +7,6 @@
|
||||
, wayland-protocols
|
||||
, libwpe
|
||||
, libwpe-fdo
|
||||
, glib
|
||||
, glib-networking
|
||||
, webkitgtk
|
||||
, makeWrapper
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll
|
||||
, pythonPackages, imagemagick, gobject-introspection, gst_all_1
|
||||
, runtimeShell
|
||||
, fetchpatch
|
||||
, unstableGitUpdater
|
||||
|
||||
# Attributes needed for tests of the external plugins
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }:
|
||||
{ lib, stdenv, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }:
|
||||
|
||||
let
|
||||
pythonEnv = pythonPackages.python.withPackages (p: [
|
||||
|
||||
Loading…
Reference in New Issue
Block a user