tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork atom

Merge pull request #113674 from SuperSandro2000/fix-collection16

authored by

Sandro and committed by
GitHub 4b694d5e 53cdc362

+25 -56
+1 -1
nixos/modules/services/printing/cupsd.nix
··· 270 270 drivers = mkOption { 271 271 type = types.listOf types.path; 272 272 default = []; 273 - example = literalExample "with pkgs; [ gutenprint hplip splix cups-googlecloudprint ]"; 273 + example = literalExample "with pkgs; [ gutenprint hplip splix ]"; 274 274 description = '' 275 275 CUPS drivers to use. Drivers provided by CUPS, cups-filters, 276 276 Ghostscript and Samba are added unconditionally. If this list contains
+5 -5
nixos/modules/system/boot/loader/grub/install-grub.pl
··· 356 356 if ($suffix eq ".jpg") { 357 357 $suffix = ".jpeg"; 358 358 } 359 - if ($backgroundColor) { 360 - $conf .= " 361 - background_color '$backgroundColor' 362 - "; 363 - } 359 + if ($backgroundColor) { 360 + $conf .= " 361 + background_color '$backgroundColor' 362 + "; 363 + } 364 364 copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath: $!\n"; 365 365 $conf .= " 366 366 insmod " . substr($suffix, 1) . "
+1 -1
pkgs/applications/misc/far2l/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash 1 + { lib, stdenv, fetchFromGitHub, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash 2 2 , xdg-utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick 3 3 , libuchardet, spdlog, xercesc, fmt, openssl, libssh, samba, neon, libnfs, libarchive }: 4 4
+1 -1
pkgs/applications/networking/feedreaders/feedreader/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3 2 2 , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts 3 - , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, pantheon 3 + , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas 4 4 , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 5 5 }: 6 6
+2 -3
pkgs/applications/networking/mailreaders/aerc/default.nix
··· 1 1 { lib, buildGoModule, fetchurl 2 - , go, ncurses, notmuch, scdoc 3 - , python3, perl, w3m, dante 4 - , fetchFromGitHub 2 + , ncurses, notmuch, scdoc 3 + , python3, w3m, dante 5 4 }: 6 5 7 6 buildGoModule rec {
+2 -4
pkgs/applications/networking/mailreaders/neomutt/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript 1 + { lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which 2 2 , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl 3 - , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, runtimeShell, sqlite, zlib 4 - , glibcLocales 5 - , fetchpatch 3 + , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib 6 4 }: 7 5 8 6 stdenv.mkDerivation rec {
+2 -2
pkgs/applications/networking/p2p/tribler/default.nix
··· 1 - { stdenv, fetchurl, pkgs, python3Packages, makeWrapper 2 - , enablePlayer ? true, libvlc ? null, qt5, lib }: 1 + { stdenv, fetchurl, python3Packages, makeWrapper 2 + , enablePlayer ? true, libvlc, qt5, lib }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 pname = "tribler";
-1
pkgs/applications/version-management/git-and-tools/git/default.nix
··· 1 1 { fetchurl, lib, stdenv, buildPackages 2 - , fetchpatch 3 2 , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio 4 3 , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc 5 4 , openssh, pcre2
+1 -1
pkgs/data/fonts/iosevka/default.nix
··· 1 - { stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal 1 + { stdenv, lib, nodejs, nodePackages, remarshal 2 2 , ttfautohint-nox 3 3 # Custom font set options. 4 4 # See https://typeof.net/Iosevka/customizer
-2
pkgs/data/icons/iso-flags/default.nix
··· 1 1 { lib, stdenv 2 2 , fetchFromGitHub 3 3 , perl 4 - , perlPackages 5 4 , inkscape 6 - , pngcrush 7 5 , librsvg 8 6 , targets ? [ "all" ] 9 7 }:
-8
pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix
··· 11 11 , intltool 12 12 , libxslt 13 13 , gtk3 14 - , libnotify 15 - , libxkbfile 16 - , cinnamon-menus 17 14 , libgnomekbd 18 - , libxklavier 19 - , networkmanager 20 - , libwacom 21 15 , gnome3 22 16 , libtool 23 17 , wrapGAppsHook 24 - , tzdata 25 - , glibc 26 18 , gobject-introspection 27 19 , python3 28 20 , pam
-1
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
··· 2 2 , gettext 3 3 , fetchurl 4 4 , evolution-data-server 5 - , fetchpatch 6 5 , pkg-config 7 6 , libxslt 8 7 , docbook_xsl
-1
pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
··· 22 22 , gnome-color-manager 23 23 , gnome-desktop 24 24 , gnome-online-accounts 25 - , gnome-session 26 25 , gnome-settings-daemon 27 26 , gnome3 28 27 , grilo
-1
pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix
··· 30 30 , systemd 31 31 , libnma 32 32 , tzdata 33 - , yelp 34 33 , libgnomekbd 35 34 , gsettings-desktop-schemas 36 35 , gnome-tour
-1
pkgs/desktops/gnome-3/misc/gnome-applets/default.nix
··· 16 16 , adwaita-icon-theme 17 17 , libgweather 18 18 , gucharmap 19 - , tracker 20 19 , polkit 21 20 , gnome3 22 21 }:
-1
pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
··· 11 11 , wingpanel 12 12 , orca 13 13 , onboard 14 - , at-spi2-core 15 14 , elementary-default-settings 16 15 , elementary-settings-daemon 17 16 , runtimeShell
+2
pkgs/development/libraries/g2o/default.nix
··· 43 43 license = with licenses; [ bsd3 lgpl3 gpl3 ]; 44 44 maintainers = with maintainers; [ lopsided98 ]; 45 45 platforms = platforms.all; 46 + # fatal error: 'qglviewer.h' file not found 47 + broken = stdenv.isDarwin; 46 48 }; 47 49 }
-1
pkgs/development/python-modules/androidtv/default.nix
··· 7 7 , mock 8 8 , pure-python-adb 9 9 , pytestCheckHook 10 - , python 11 10 }: 12 11 13 12 buildPythonPackage rec {
-1
pkgs/development/python-modules/graphene/default.nix
··· 2 2 , buildPythonPackage 3 3 , fetchFromGitHub 4 4 , aniso8601 5 - , iso8601 6 5 , graphql-core 7 6 , graphql-relay 8 7 , promise
+2
pkgs/development/python-modules/lammps-cython/default.nix
··· 47 47 homepage = "https://gitlab.com/costrouc/lammps-cython"; 48 48 license = lib.licenses.mit; 49 49 maintainers = with lib.maintainers; [ costrouc ]; 50 + # fails import check 51 + broken = true; 50 52 }; 51 53 }
+1 -1
pkgs/development/python-modules/lightparam/default.nix
··· 1 - { lib, pkgs, buildPythonPackage, fetchFromGitHub, isPy3k 1 + { lib, buildPythonPackage, fetchFromGitHub, isPy3k 2 2 , ipython 3 3 , ipywidgets 4 4 , numpy
-1
pkgs/development/python-modules/moderngl_window/default.nix
··· 7 7 , pyglet 8 8 , pillow 9 9 , pyrr 10 - , pytest 11 10 }: 12 11 13 12 buildPythonPackage rec {
+1 -1
pkgs/development/python-modules/nbdime/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi, callPackage, isPy3k 1 + { lib, buildPythonPackage, fetchPypi, isPy3k 2 2 , hypothesis 3 3 , setuptools_scm 4 4 , six
-1
pkgs/development/python-modules/nbsphinx/default.nix
··· 7 7 , nbformat 8 8 , sphinx 9 9 , traitlets 10 - , python 11 10 , isPy3k 12 11 }: 13 12
+1 -1
pkgs/development/python-modules/ndjson/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi, wheel, watchdog, flake8 1 + { lib, buildPythonPackage, fetchPypi, watchdog, flake8 2 2 , pytest, pytestrunner, coverage, sphinx, twine }: 3 3 4 4 buildPythonPackage rec {
-1
pkgs/development/python-modules/notebook/default.nix
··· 12 12 , tornado 13 13 , ipython_genutils 14 14 , traitlets 15 - , jupyter 16 15 , jupyter_core 17 16 , jupyter_client 18 17 , nbformat
-1
pkgs/development/python-modules/onnx/default.nix
··· 1 1 { lib 2 - , fetchpatch 3 2 , buildPythonPackage 4 3 , fetchPypi 5 4 , pythonOlder
-3
pkgs/development/python-modules/phonemizer/default.nix
··· 2 2 , substituteAll 3 3 , buildPythonApplication 4 4 , fetchPypi 5 - , python3Packages 6 - , pkgs 7 5 , joblib 8 6 , segments 9 7 , attrs 10 8 , espeak-ng 11 9 , pytestCheckHook 12 - , pytestrunner 13 10 , pytestcov 14 11 }: 15 12
-1
pkgs/development/python-modules/qiskit-aer/default.nix
··· 6 6 , blas 7 7 , catch2 8 8 , cmake 9 - , conan 10 9 , cython 11 10 , fmt 12 11 , muparserx
-1
pkgs/development/python-modules/robotframework-tools/default.nix
··· 1 1 { lib 2 2 , buildPythonPackage 3 3 , fetchPypi 4 - , isPy3k 5 4 , robotframework 6 5 , moretools 7 6 , pathpy
+2 -2
pkgs/development/tools/misc/hydra/common.nix
··· 1 - { stdenv, nix, perlPackages, buildEnv, fetchFromGitHub 1 + { stdenv, nix, perlPackages, buildEnv 2 2 , makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx 3 3 , top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt 4 - , guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json 4 + , perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json 5 5 , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar 6 6 , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null 7 7 , migration ? false, patches ? []
-4
pkgs/tools/filesystems/smbnetfs/default.nix
··· 11 11 nativeBuildInputs = [ pkg-config autoconf ]; 12 12 buildInputs = [ fuse samba glib attr libsecret ]; 13 13 14 - postPatch = '' 15 - substituteInPlace src/function.c --replace "attr/xattr.h" "sys/xattr.h" 16 - ''; 17 - 18 14 meta = with lib; { 19 15 description = "A FUSE FS for mounting Samba shares"; 20 16 maintainers = with maintainers; [ raskin ];
+1 -1
pkgs/tools/misc/bat-extras/default.nix
··· 1 - { lib, stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, bat 1 + { lib, stdenv, fetchFromGitHub, bash, makeWrapper, bat 2 2 # batdiff, batgrep, and batwatch 3 3 , coreutils 4 4 , less
-1
pkgs/tools/text/ripgrep/default.nix
··· 1 1 { lib, stdenv 2 - , nixosTests 3 2 , fetchFromGitHub 4 3 , rustPlatform 5 4 , asciidoctor