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

Merge pull request #113674 from SuperSandro2000/fix-collection16

Browse Source
This commit is contained in:
Sandro 2021-02-19 13:27:03 +01:00 committed by GitHub
commit 4b694d5e3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 25 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/printing/cupsd.nix
View File

@ -270,7 +270,7 @@ in
drivers = mkOption { drivers = mkOption {
type = types.listOf types.path; type = types.listOf types.path;
default = []; default = [];
example = literalExample "with pkgs; [ gutenprint hplip splix cups-googlecloudprint ]"; example = literalExample "with pkgs; [ gutenprint hplip splix ]";
description = '' description = ''
CUPS drivers to use. Drivers provided by CUPS, cups-filters, CUPS drivers to use. Drivers provided by CUPS, cups-filters,
Ghostscript and Samba are added unconditionally. If this list contains Ghostscript and Samba are added unconditionally. If this list contains

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

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash
, xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick , xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick
, libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }: , libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }:

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

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3 { lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3
, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts
, gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, pantheon , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas
, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2
}: }:

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

@ -1,7 +1,6 @@
{ lib, buildGoModule, fetchurl { lib, buildGoModule, fetchurl
, go, ncurses, notmuch, scdoc , ncurses, notmuch, scdoc
, python3, perl, w3m, dante , python3, w3m, dante
, fetchFromGitHub
}: }:
buildGoModule rec { buildGoModule rec {

6
pkgs/applications/networking/mailreaders/neomutt/default.nix
View File

@ -1,8 +1,6 @@
{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which
, ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl
, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, runtimeShell, sqlite, zlib , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib
, glibcLocales
, fetchpatch
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

4
pkgs/applications/networking/p2p/tribler/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgs, python3Packages, makeWrapper { stdenv, fetchurl, python3Packages, makeWrapper
, enablePlayer ? true, libvlc ? null, qt5, lib }: , enablePlayer ? true, libvlc, qt5, lib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tribler"; pname = "tribler";

1
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -1,5 +1,4 @@
{ fetchurl, lib, stdenv, buildPackages { fetchurl, lib, stdenv, buildPackages
, fetchpatch
, curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio
, gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
, openssh, pcre2 , openssh, pcre2

2
pkgs/data/fonts/iosevka/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal { stdenv, lib, nodejs, nodePackages, remarshal
, ttfautohint-nox , ttfautohint-nox
# Custom font set options. # Custom font set options.
# See https://typeof.net/Iosevka/customizer # See https://typeof.net/Iosevka/customizer

2
pkgs/data/icons/iso-flags/default.nix
View File

@ -1,9 +1,7 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, perl , perl
, perlPackages
, inkscape , inkscape
, pngcrush
, librsvg , librsvg
, targets ? [ "all" ] , targets ? [ "all" ]
}: }:

8
pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
View File

@ -11,18 +11,10 @@
, intltool , intltool
, libxslt , libxslt
, gtk3 , gtk3
, libnotify
, libxkbfile
, cinnamon-menus
, libgnomekbd , libgnomekbd
, libxklavier
, networkmanager
, libwacom
, gnome3 , gnome3
, libtool , libtool
, wrapGAppsHook , wrapGAppsHook
, tzdata
, glibc
, gobject-introspection , gobject-introspection
, python3 , python3
, pam , pam

1
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
View File

@ -2,7 +2,6 @@
, gettext , gettext
, fetchurl , fetchurl
, evolution-data-server , evolution-data-server
, fetchpatch
, pkg-config , pkg-config
, libxslt , libxslt
, docbook_xsl , docbook_xsl

1
pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
View File

@ -22,7 +22,6 @@
, gnome-color-manager , gnome-color-manager
, gnome-desktop , gnome-desktop
, gnome-online-accounts , gnome-online-accounts
, gnome-session
, gnome-settings-daemon , gnome-settings-daemon
, gnome3 , gnome3
, grilo , grilo

1
pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
View File

@ -30,7 +30,6 @@
, systemd , systemd
, libnma , libnma
, tzdata , tzdata
, yelp
, libgnomekbd , libgnomekbd
, gsettings-desktop-schemas , gsettings-desktop-schemas
, gnome-tour , gnome-tour

1
pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
View File

@ -16,7 +16,6 @@
, adwaita-icon-theme , adwaita-icon-theme
, libgweather , libgweather
, gucharmap , gucharmap
, tracker
, polkit , polkit
, gnome3 , gnome3
}: }:

1
pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
View File

@ -11,7 +11,6 @@
, wingpanel , wingpanel
, orca , orca
, onboard , onboard
, at-spi2-core
, elementary-default-settings , elementary-default-settings
, elementary-settings-daemon , elementary-settings-daemon
, runtimeShell , runtimeShell

2
pkgs/development/libraries/g2o/default.nix
View File

@ -43,5 +43,7 @@ mkDerivation rec {
license = with licenses; [ bsd3 lgpl3 gpl3 ]; license = with licenses; [ bsd3 lgpl3 gpl3 ];
maintainers = with maintainers; [ lopsided98 ]; maintainers = with maintainers; [ lopsided98 ];
platforms = platforms.all; platforms = platforms.all;
# fatal error: 'qglviewer.h' file not found
broken = stdenv.isDarwin;
}; };
} }

1
pkgs/development/python-modules/androidtv/default.nix
View File

@ -7,7 +7,6 @@
, mock , mock
, pure-python-adb , pure-python-adb
, pytestCheckHook , pytestCheckHook
, python
}: }:
buildPythonPackage rec { buildPythonPackage rec {

1
pkgs/development/python-modules/graphene/default.nix
View File

@ -2,7 +2,6 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, aniso8601 , aniso8601
, iso8601
, graphql-core , graphql-core
, graphql-relay , graphql-relay
, promise , promise

2
pkgs/development/python-modules/lammps-cython/default.nix
View File

@ -47,5 +47,7 @@ buildPythonPackage rec {
homepage = "https://gitlab.com/costrouc/lammps-cython"; homepage = "https://gitlab.com/costrouc/lammps-cython";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ costrouc ]; maintainers = with lib.maintainers; [ costrouc ];
# fails import check
broken = true;
}; };
} }

2
pkgs/development/python-modules/lightparam/default.nix
View File

@ -1,4 +1,4 @@
{ lib, pkgs, buildPythonPackage, fetchFromGitHub, isPy3k { lib, buildPythonPackage, fetchFromGitHub, isPy3k
, ipython , ipython
, ipywidgets , ipywidgets
, numpy , numpy

1
pkgs/development/python-modules/moderngl_window/default.nix
View File

@ -7,7 +7,6 @@
, pyglet , pyglet
, pillow , pillow
, pyrr , pyrr
, pytest
}: }:
buildPythonPackage rec { buildPythonPackage rec {

2
pkgs/development/python-modules/nbdime/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, callPackage, isPy3k { lib, buildPythonPackage, fetchPypi, isPy3k
, hypothesis , hypothesis
, setuptools_scm , setuptools_scm
, six , six

1
pkgs/development/python-modules/nbsphinx/default.nix
View File

@ -7,7 +7,6 @@
, nbformat , nbformat
, sphinx , sphinx
, traitlets , traitlets
, python
, isPy3k , isPy3k
}: }:

2
pkgs/development/python-modules/ndjson/default.nix
View File

@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, wheel, watchdog, flake8 { lib, buildPythonPackage, fetchPypi, watchdog, flake8
, pytest, pytestrunner, coverage, sphinx, twine }: , pytest, pytestrunner, coverage, sphinx, twine }:
buildPythonPackage rec { buildPythonPackage rec {

1
pkgs/development/python-modules/notebook/default.nix
View File

@ -12,7 +12,6 @@
, tornado , tornado
, ipython_genutils , ipython_genutils
, traitlets , traitlets
, jupyter
, jupyter_core , jupyter_core
, jupyter_client , jupyter_client
, nbformat , nbformat

1
pkgs/development/python-modules/onnx/default.nix
View File

@ -1,5 +1,4 @@
{ lib { lib
, fetchpatch
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pythonOlder , pythonOlder

3
pkgs/development/python-modules/phonemizer/default.nix
View File

@ -2,14 +2,11 @@
, substituteAll , substituteAll
, buildPythonApplication , buildPythonApplication
, fetchPypi , fetchPypi
, python3Packages
, pkgs
, joblib , joblib
, segments , segments
, attrs , attrs
, espeak-ng , espeak-ng
, pytestCheckHook , pytestCheckHook
, pytestrunner
, pytestcov , pytestcov
}: }:

1
pkgs/development/python-modules/qiskit-aer/default.nix
View File

@ -6,7 +6,6 @@
, blas , blas
, catch2 , catch2
, cmake , cmake
, conan
, cython , cython
, fmt , fmt
, muparserx , muparserx

1
pkgs/development/python-modules/robotframework-tools/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, isPy3k
, robotframework , robotframework
, moretools , moretools
, pathpy , pathpy

4
pkgs/development/tools/misc/hydra/common.nix
View File

@ -1,7 +1,7 @@
{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub { stdenv, nix, perlPackages, buildEnv
, makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx , makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx
, top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt , top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json , perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
, rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null
, migration ? false, patches ? [] , migration ? false, patches ? []

4
pkgs/tools/filesystems/smbnetfs/default.nix
View File

@ -11,10 +11,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoconf ]; nativeBuildInputs = [ pkg-config autoconf ];
buildInputs = [ fuse samba glib attr libsecret ]; buildInputs = [ fuse samba glib attr libsecret ];
postPatch = ''
substituteInPlace src/function.c --replace "attr/xattr.h" "sys/xattr.h"
'';
meta = with lib; { meta = with lib; {
description = "A FUSE FS for mounting Samba shares"; description = "A FUSE FS for mounting Samba shares";
maintainers = with maintainers; [ raskin ]; maintainers = with maintainers; [ raskin ];

2
pkgs/tools/misc/bat-extras/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, bat { lib, stdenv, fetchFromGitHub, bash, makeWrapper, bat
# batdiff, batgrep, and batwatch # batdiff, batgrep, and batwatch
, coreutils , coreutils
, less , less

1
pkgs/tools/text/ripgrep/default.nix
View File

@ -1,5 +1,4 @@
{ lib, stdenv { lib, stdenv
, nixosTests
, fetchFromGitHub , fetchFromGitHub
, rustPlatform , rustPlatform
, asciidoctor , asciidoctor