git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #113965 from SuperSandro2000/fix-collection17
commitad06c82b9c295ed75504e2ab255a378751774404 authorSandro <sandro.jaeckel@gmail.com> dateTue 23 Feb 2021, 08:44 (6 years ago) parentc670db30b70303
39 files changed+27−67
pkgs/applications/audio/gnome-podcasts/default.nix−1 pkgs/applications/audio/picard/default.nix−5 pkgs/applications/audio/shortwave/default.nix−1 pkgs/applications/audio/tuijam/default.nix−1 pkgs/applications/editors/gnome-builder/default.nix−1 pkgs/applications/graphics/gthumb/default.nix−1 pkgs/applications/misc/lutris/default.nix+1−1 pkgs/applications/misc/onboard/default.nix+1−3 pkgs/applications/misc/pdfpc/default.nix+1−1 pkgs/applications/networking/browsers/nyxt/default.nix+1−1 pkgs/applications/networking/calls/default.nix−2 pkgs/applications/office/bookworm/default.nix+1−1 pkgs/applications/office/libreoffice/default.nix+1−1 pkgs/applications/science/electronics/kicad/base.nix+2−4 pkgs/applications/science/electronics/kicad/default.nix−4 pkgs/applications/science/math/nasc/default.nix−1 pkgs/applications/system/glances/default.nix+1−1 pkgs/applications/video/kodi/default.nix+3−3 pkgs/applications/video/pitivi/default.nix−1 pkgs/desktops/cinnamon/cinnamon-control-center/default.nix−8 pkgs/desktops/gnome-3/apps/seahorse/default.nix−1 pkgs/desktops/gnome-3/misc/geary/default.nix−1 pkgs/development/libraries/gstreamer/bad/default.nix−2 pkgs/development/libraries/libhandy/default.nix−1 pkgs/development/libraries/libwnck/default.nix+3 pkgs/development/libraries/telepathy/qt/default.nix+1−1 pkgs/development/python-modules/aioguardian/default.nix−1 pkgs/development/python-modules/gmusicapi/default.nix+3 pkgs/development/python-modules/gpsoauth/default.nix+5 pkgs/development/python-modules/lsassy/default.nix−1 pkgs/development/python-modules/pubnub/default.nix−1 pkgs/development/python-modules/snowflake-connector-python/default.nix+1−5 pkgs/development/python-modules/wxPython/4.0.nix−3 pkgs/development/python-modules/wxPython/4.1.nix−1 pkgs/development/tools/eclipse-mat/default.nix+1−2 pkgs/development/web/cog/default.nix−2 pkgs/tools/audio/beets/default.nix−1 pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix−1 pkgs/tools/security/pass/extensions/import.nix+1−1
pkgs/applications/audio/gnome-podcasts/default.nix−1
@@ -1,7 +1,6 @@
11{ lib
22, rustPlatform
33, fetchFromGitLab
4−, fetchpatch
54, meson
65, ninja
76, gettext
pkgs/applications/audio/picard/default.nix−5
@@ -40,11 +40,6 @@ in pythonPackages.buildPythonApplication rec {
4040 dateutil
4141 ];
4242
43− prePatch = ''
44− # Pesky unicode punctuation.
45− substituteInPlace setup.cfg --replace "‘" "'"
46− '';
47−
4843 # In order to spare double wrapping, we use:
4944 preFixup = ''
5045 makeWrapperArgs+=("''${qtWrapperArgs[@]}")
pkgs/applications/audio/shortwave/default.nix−1
@@ -14,7 +14,6 @@
1414, openssl
1515, pkg-config
1616, python3
17−, rust
1817, rustc
1918, rustPlatform
2019, sqlite
pkgs/applications/audio/tuijam/default.nix−1
@@ -2,7 +2,6 @@
22, fetchFromGitHub
33, lib
44, python3Packages
5−, youtube-dl
65}:
76
87buildPythonApplication rec {
pkgs/applications/editors/gnome-builder/default.nix−1
@@ -35,7 +35,6 @@
3535, wrapGAppsHook
3636, dbus
3737, xvfb_run
38−, glib
3938}:
4039
4140stdenv.mkDerivation rec {
pkgs/applications/graphics/gthumb/default.nix−1
@@ -1,6 +1,5 @@
11{ lib, stdenv
22, fetchurl
3−, fetchpatch
43, gnome3
54, pkg-config
65, meson
pkgs/applications/misc/lutris/default.nix+1−1
@@ -1,4 +1,4 @@
1−{ buildPythonApplication, lib, fetchFromGitHub, fetchpatch
1+{ buildPythonApplication, lib, fetchFromGitHub
22
33# build inputs
44, atk
pkgs/applications/misc/onboard/default.nix+1−3
@@ -6,7 +6,6 @@
66, atspiSupport ? true
77, bash
88, glib
9−, glibcLocales
109, dconf
1110, gobject-introspection
1211, gsettings-desktop-schemas
@@ -130,8 +129,7 @@ python3.pkgs.buildPythonApplication rec {
130129 --replace "/etc" "$out/etc"
131130
132131 substituteInPlace ./Onboard/LanguageSupport.py \
133− --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes" \
134− --replace "/usr/bin/yelp" "${yelp}/bin/yelp"
132+ --replace "/usr/share/xml/iso-codes" "${isocodes}/share/xml/iso-codes"
135133
136134 substituteInPlace ./Onboard/Indicator.py \
137135 --replace "/usr/bin/yelp" "${yelp}/bin/yelp"
pkgs/applications/misc/pdfpc/default.nix+1−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee, fetchpatch
1+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee
22, poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook
33, webkitgtk, discount, json-glib }:
44
pkgs/applications/networking/browsers/nyxt/default.nix+1−1
@@ -1,4 +1,4 @@
1−{ stdenv, lib, lispPackages, sbcl
1+{ stdenv, lib, lispPackages
22, makeWrapper, wrapGAppsHook, gst_all_1
33, glib, gdk-pixbuf, cairo
44, mime-types, pango, gtk3
pkgs/applications/networking/calls/default.nix−2
@@ -19,9 +19,7 @@
1919, dbus
2020, vala
2121, wrapGAppsHook
22−, xorg
2322, xvfb_run
24−, libxml2
2523}:
2624
2725stdenv.mkDerivation rec {
pkgs/applications/office/bookworm/default.nix+1−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee
1+{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, glib, webkitgtk, libgee
22, gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook
33, appstream, desktop-file-utils }:
44
pkgs/applications/office/libreoffice/default.nix+1−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, fetchpatch, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext
1+{ stdenv, fetchurl, lib, pam, python3, libxslt, perl, ArchiveZip, box2d, gettext
22, IOCompress, zlib, libjpeg, expat, freetype, libwpd
33, libxml2, db, curl, fontconfig, libsndfile, neon
44, bison, flex, zip, unzip, gtk3, libmspack, getopt, file, cairo, which
pkgs/applications/science/electronics/kicad/base.nix+2−4
@@ -1,5 +1,5 @@
1−{ lib, stdenv
2−, fetchFromGitLab
1+{ lib
2+, stdenv
33, cmake
44, libGLU
55, libGL
@@ -18,9 +18,7 @@
1818, pcre
1919, libpthreadstubs
2020, libXdmcp
21−, fetchpatch
2221, lndir
23−, callPackage
2422
2523, stable
2624, baseName
pkgs/applications/science/electronics/kicad/default.nix−4
@@ -15,19 +15,15 @@
1515, stable ? true
1616, oceSupport ? false
1717, withOCE ? false
18−, opencascade
1918, withOCCT ? false
2019, withOCC ? true
21−, opencascade-occt
2220, ngspiceSupport ? false
2321, withNgspice ? true
2422, libngspice
2523, scriptingSupport ? false
2624, withScripting ? true
27−, swig
2825, python3
2926, debug ? false
30−, valgrind
3127, with3d ? true
3228, withI18n ? true
3329, srcs ? { }
pkgs/applications/science/math/nasc/default.nix−1
@@ -9,7 +9,6 @@
99, gtk3
1010, glib
1111, pantheon
12−, libsoup
1312, gtksourceview
1413, libgee
1514, nix-update-script
pkgs/applications/system/glances/default.nix+1−1
@@ -1,4 +1,4 @@
1−{ stdenv, buildPythonApplication, fetchFromGitHub, fetchpatch, isPyPy, lib
1+{ stdenv, buildPythonApplication, fetchFromGitHub, isPyPy, lib
22, future, psutil, setuptools
33# Optional dependencies:
44, bottle, pysnmp
pkgs/applications/video/kodi/default.nix+3−3
@@ -1,11 +1,11 @@
1−{ stdenv, lib, fetchpatch, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
1+{ stdenv, lib, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders
22, pkg-config, cmake, gnumake, yasm, python2Packages
33, libgcrypt, libgpgerror, libunistring
4−, boost, avahi, lame, autoreconfHook
4+, boost, avahi, lame
55, gettext, pcre-cpp, yajl, fribidi, which
66, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless
77, libxml2, systemd
8−, alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl
8+, alsaLib, libGLU, libGL, fontconfig, freetype, ftgl
99, libjpeg, libpng, libtiff
1010, libmpeg2, libsamplerate, libmad
1111, libogg, libvorbis, flac, libxslt
pkgs/applications/video/pitivi/default.nix−1
@@ -1,5 +1,4 @@
11{ lib
2−, fetchFromGitHub
32, fetchurl
43, pkg-config
54, gettext
pkgs/desktops/cinnamon/cinnamon-control-center/default.nix−8
@@ -8,18 +8,11 @@
88, intltool
99, gtk3
1010, libnotify
11−, gnome-menus
1211, libxml2
13−, systemd
14−, upower
1512, gnome-online-accounts
1613, cinnamon-settings-daemon
1714, colord
1815, polkit
19−, ibus
20−, libpulseaudio
21−, isocodes
22−, kerberos
2316, libxkbfile
2417, cinnamon-menus
2518, dbus-glib
@@ -27,7 +20,6 @@
2720, libxklavier
2821, networkmanager
2922, libwacom
30−, gnome3
3123, libtool
3224, wrapGAppsHook
3325, tzdata
pkgs/desktops/gnome-3/apps/seahorse/default.nix−1
@@ -1,6 +1,5 @@
11{ lib, stdenv
22, fetchurl
3−, fetchpatch
43, vala
54, meson
65, ninja
pkgs/desktops/gnome-3/misc/geary/default.nix−1
@@ -1,6 +1,5 @@
11{ lib, stdenv
22, fetchurl
3−, fetchpatch
43, pkg-config
54, gtk3
65, vala
pkgs/development/libraries/gstreamer/bad/default.nix−2
@@ -1,10 +1,8 @@
11{ lib, stdenv
22, fetchurl
3−, fetchpatch
43, meson
54, ninja
65, gettext
7−, config
86, pkg-config
97, python3
108, gst-plugins-base
pkgs/development/libraries/libhandy/default.nix−1
@@ -9,7 +9,6 @@
99, docbook_xsl
1010, docbook_xml_dtd_43
1111, gtk3
12−, gnome3
1312, glade
1413, dbus
1514, xvfb_run
pkgs/development/libraries/libwnck/default.nix+3
@@ -23,5 +23,8 @@ stdenv.mkDerivation rec {
2323 homepage = "https://gitlab.gnome.org/GNOME/libwnck";
2424 license = lib.licenses.lgpl21;
2525 maintainers = with lib.maintainers; [ johnazoidberg ];
26+ # ./xutils.h:31:10: fatal error: 'gdk/gdkx.h' file not found
27+ # #include <gdk/gdkx.h>
28+ broken = stdenv.isDarwin;
2629 };
2730}
pkgs/development/libraries/telepathy/qt/default.nix+1−1
@@ -1,5 +1,5 @@
11{ lib, stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus
2−, telepathy-farstream, telepathy-glib, fetchpatch }:
2+, telepathy-farstream, telepathy-glib }:
33
44let
55 inherit (python3Packages) python dbus-python;
pkgs/development/python-modules/aioguardian/default.nix−1
@@ -4,7 +4,6 @@
44, asyncio-dgram
55, asynctest
66, buildPythonPackage
7−, cryptography
87, fetchFromGitHub
98, poetry
109, pytest-aiohttp
pkgs/development/python-modules/gmusicapi/default.nix+3
@@ -29,6 +29,9 @@ buildPythonPackage rec {
2929
3030 propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ];
3131
32+ doCheck = false;
33+ pythonImportsCheck = [ "gmusicapi" ];
34+
3235 meta = with lib; {
3336 description = "An unofficial API for Google Play Music";
3437 homepage = "https://pypi.python.org/pypi/gmusicapi/";
pkgs/development/python-modules/gpsoauth/default.nix+5
@@ -26,6 +26,11 @@ buildPythonPackage rec {
2626
2727 propagatedBuildInputs = [ cffi cryptography enum34 idna ipaddress ndg-httpsclient pyopenssl pyasn1 pycparser pycryptodomex requests six ];
2828
29+ # no tests executed
30+ doCheck = false;
31+
32+ pythonImportsCheck = [ "gpsoauth" ];
33+
2934 meta = with lib; {
3035 description = "A python client library for Google Play Services OAuth";
3136 homepage = "https://github.com/simon-weber/gpsoauth";
pkgs/development/python-modules/lsassy/default.nix−1
@@ -4,7 +4,6 @@
44, impacket
55, netaddr
66, pypykatz
7−, pytestCheckHook
87}:
98
109buildPythonPackage rec {
pkgs/development/python-modules/pubnub/default.nix−1
@@ -5,7 +5,6 @@
55, fetchFromGitHub
66, pycryptodomex
77, pytestCheckHook
8−, pyyaml
98, pytest-vcr
109, pytest-asyncio
1110, requests
pkgs/development/python-modules/snowflake-connector-python/default.nix+1−5
@@ -57,11 +57,7 @@ buildPythonPackage rec {
5757
5858 postPatch = ''
5959 substituteInPlace setup.py \
60− --replace "'boto3>=1.4.4,<1.16'," "'boto3~=1.16'," \
61− --replace "'cryptography>=2.5.0,<3.0.0'," "'cryptography'," \
62− --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," \
63− --replace "'idna<2.10'," "'idna'," \
64− --replace "'requests<2.24.0'," "'requests',"
60+ --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL',"
6561 '';
6662
6763 # tests require encrypted secrets, see
pkgs/development/python-modules/wxPython/4.0.nix−3
@@ -10,9 +10,6 @@
1010, doxygen
1111, ncurses
1212, libintl
13−, numpy
14−, pillow
15−, six
1613, wxGTK
1714, wxmac
1815, IOKit
pkgs/development/python-modules/wxPython/4.1.nix−1
@@ -6,7 +6,6 @@
66, pkg-config
77, python
88, isPy27
9−, pyopengl
109, doxygen
1110, cairo
1211, ncurses
pkgs/development/tools/eclipse-mat/default.nix+1−2
@@ -1,5 +1,4 @@
1−{ buildEnv
2−, fetchurl
1+{ fetchurl
32, fontconfig
43, freetype
54, glib
pkgs/development/web/cog/default.nix−2
@@ -1,6 +1,5 @@
11{ stdenv
22, lib
3−, fetchpatch
43, fetchFromGitHub
54, cmake
65, pkg-config
@@ -8,7 +7,6 @@
87, wayland-protocols
98, libwpe
109, libwpe-fdo
11−, glib
1210, glib-networking
1311, webkitgtk
1412, makeWrapper
pkgs/tools/audio/beets/default.nix−1
@@ -1,7 +1,6 @@
11{ stdenv, lib, fetchFromGitHub, writeScript, glibcLocales, diffPlugins, substituteAll
22, pythonPackages, imagemagick, gobject-introspection, gst_all_1
33, runtimeShell
4−, fetchpatch
54, unstableGitUpdater
65
76# Attributes needed for tests of the external plugins
pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix−1
@@ -1,5 +1,4 @@
11{ lib, stdenv
2−, fetchurl
32, fetchFromGitHub
43, cmake
54, extra-cmake-modules
pkgs/tools/security/pass/extensions/import.nix+1−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }:
1+{ lib, stdenv, fetchFromGitHub, pythonPackages, makeWrapper, fetchpatch }:
22
33let
44 pythonEnv = pythonPackages.python.withPackages (p: [