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

Merge pull request #113522 from SuperSandro2000/fix-collection15

This commit is contained in:
Sandro 2021-02-18 01:45:41 +01:00 committed by GitHub
parent 6287181218 e20952b311
commit 983f4d6894
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 42 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/networking/cluster/nixops/default.nix
View File

@ -2,7 +2,6 @@
, poetry2nix , poetry2nix
, lib , lib
, overrides ? (self: super: {}) , overrides ? (self: super: {})
, stdenv
}: }:
let let

2
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -2,7 +2,7 @@
, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
, alsaLib, curl, libvpx, nettools, dbus, substituteAll, fetchpatch , alsaLib, curl, libvpx, nettools, dbus, substituteAll
# If open-watcom-bin is not passed, VirtualBox will fall back to use # If open-watcom-bin is not passed, VirtualBox will fall back to use
# the shipped alternative sources (assembly). # the shipped alternative sources (assembly).
, open-watcom-bin ? null , open-watcom-bin ? null

2
pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus { lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus
, gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala , gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala
, desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2 , desktop-file-utils, itstool, wrapGAppsHook, pcre2
, libxslt, docbook-xsl-nons }: , libxslt, docbook-xsl-nons }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

1
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix
View File

@ -15,7 +15,6 @@
, gnome3 , gnome3
, gjs , gjs
, nixosTests , nixosTests
, gsettings-desktop-schemas
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {

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

@ -1,4 +1,5 @@
{ lib { lib
, stdenv
, buildPythonPackage , buildPythonPackage
, isPy3k , isPy3k
, fetchPypi , fetchPypi
@ -72,5 +73,7 @@ buildPythonPackage rec {
description = "A modular, fast, simple, static website and blog generator"; description = "A modular, fast, simple, static website and blog generator";
license = lib.licenses.mit; license = lib.licenses.mit;
maintainers = with lib.maintainers; [ jluttine ]; maintainers = with lib.maintainers; [ jluttine ];
# all tests fail
broken = stdenv.isDarwin;
}; };
} }

4
pkgs/development/python-modules/apache-airflow/default.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, buildPythonPackage , buildPythonPackage
, fetchPypi
, fetchFromGitHub , fetchFromGitHub
, fetchpatch , fetchpatch
, alembic , alembic
@ -47,10 +46,7 @@
, tzlocal , tzlocal
, unicodecsv , unicodecsv
, zope_deprecation , zope_deprecation
, enum34
, typing
, nose , nose
, python
, pythonOlder , pythonOlder
, pythonAtLeast , pythonAtLeast
}: }:

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

@ -6,7 +6,6 @@
, six , six
# test dependencies # test dependencies
, coverage , coverage
, flake8
, mock , mock
, nose , nose
, pycodestyle , pycodestyle

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

@ -24,7 +24,6 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "intake"; pname = "intake";
version = "0.6.0"; version = "0.6.0";
disabled = pythonOlder "3.6"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
@ -73,7 +72,7 @@ buildPythonPackage rec {
"http" "http"
# broken test # broken test
"test_read_pattern_with" "test_read_pattern"
]; ];
meta = with lib; { meta = with lib; {

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

@ -1,4 +1,5 @@
{ lib { lib
, stdenv
, buildPythonPackage , buildPythonPackage
, pythonOlder , pythonOlder
, fetchPypi , fetchPypi
@ -155,5 +156,7 @@ buildPythonPackage rec {
homepage = "https://jupyter.org/"; homepage = "https://jupyter.org/";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ ixxie cstrahan ]; maintainers = with maintainers; [ ixxie cstrahan ];
# E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found
broken = stdenv.isDarwin;
}; };
} }

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

@ -49,7 +49,7 @@ buildPythonPackage rec {
"test_filter_cmd_invalid_filter" "test_filter_cmd_invalid_filter"
"test_inline_merge" "test_inline_merge"
"test_interrogate_filter_no_repo" "test_interrogate_filter_no_repo"
"test_merge_input_strategy_inline_source_conflict" "test_merge"
]; ];
nativeBuildInputs = [ setuptools_scm ]; nativeBuildInputs = [ setuptools_scm ];

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

@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchFromGitHub, isPy27 { lib, buildPythonPackage, fetchFromGitHub, isPy27
, future, python-language-server, mypy, configparser , future, python-language-server, mypy, configparser
, pytestCheckHook, mock, isPy3k, pytestcov, coverage , pytestCheckHook, mock, pytestcov, coverage
, fetchpatch , fetchpatch
}: }:

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

@ -1,6 +1,5 @@
{ lib { lib
, aiohttp , aiohttp
, async-timeout
, aresponses , aresponses
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub

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

@ -3,7 +3,6 @@
, fetchFromGitHub , fetchFromGitHub
, maturin , maturin
, buildPythonPackage , buildPythonPackage
, isPy38
, python , python
}: }:
let let

4
pkgs/development/python-modules/yapsy/default.nix
View File

@ -1,4 +1,5 @@
{ lib { lib
, stdenv
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
}: }:
@ -16,6 +17,7 @@ buildPythonPackage rec {
homepage = "http://yapsy.sourceforge.net/"; homepage = "http://yapsy.sourceforge.net/";
description = "Yet another plugin system"; description = "Yet another plugin system";
license = licenses.bsd0; license = licenses.bsd0;
# tests fail and are not using pytest to easily disable them
broken = stdenv.isDarwin;
}; };
} }

51
pkgs/development/tools/misc/micronucleus/default.nix
View File

@ -1,38 +1,35 @@
{ { stdenv
pkgs
, stdenv
, libusb-compat-0_1 , libusb-compat-0_1
, fetchFromGitHub , fetchFromGitHub
, lib , lib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "micronucleus"; pname = "micronucleus";
version = "2.04"; version = "2.04";
sourceRoot = "source/commandline"; sourceRoot = "source/commandline";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "micronucleus"; owner = "micronucleus";
repo = "micronucleus"; repo = "micronucleus";
rev = version; rev = version;
sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in"; sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in";
}; };
buildInputs = [ libusb-compat-0_1 ]; buildInputs = [ libusb-compat-0_1 ];
makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ]; makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
mkdir -p $out/lib/udev mkdir -p $out/lib/udev
cp micronucleus $out/bin cp micronucleus $out/bin
cp 49-micronucleus.rules $out/lib/udev cp 49-micronucleus.rules $out/lib/udev
''; '';
meta = with lib; {
description = "Upload tool for micronucleus";
homepage = "https://github.com/micronucleus/micronucleus";
license = licenses.gpl3;
maintainers = [ maintainers.cab404 ];
};
meta = with lib; {
description = "Upload tool for micronucleus";
homepage = "https://github.com/micronucleus/micronucleus";
license = licenses.gpl3;
maintainers = [ maintainers.cab404 ];
};
} }

4
pkgs/os-specific/linux/zfs/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub { lib, stdenv, fetchFromGitHub
, autoreconfHook269, util-linux, nukeReferences, coreutils , autoreconfHook269, util-linux, nukeReferences, coreutils
, perl, buildPackages, nixosTests , perl, nixosTests
, configFile ? "all" , configFile ? "all"
# Userspace dependencies # Userspace dependencies
@ -9,7 +9,7 @@
, nfs-utils , nfs-utils
, gawk, gnugrep, gnused, systemd , gawk, gnugrep, gnused, systemd
, smartmontools, enableMail ? false , smartmontools, enableMail ? false
, sysstat, sudo, pkg-config , sysstat, pkg-config
# Kernel dependencies # Kernel dependencies
, kernel ? null , kernel ? null

4
pkgs/tools/backup/sanoid/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, coreutils, zfs { lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, zfs
, perlPackages, procps, which, openssh, sudo, mbuffer, pv, lzop, gzip, pigz }: , perlPackages, procps, which, openssh, mbuffer, pv, lzop, gzip, pigz }:
with lib; with lib;

2
pkgs/tools/misc/yubikey-manager-qt/default.nix
View File

@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
buildInputs = [ pythonPackages.python qtbase qtgraphicaleffects qtquickcontrols qtquickcontrols2 pyotherside ]; buildInputs = [ pythonPackages.python qtbase qtgraphicaleffects qtquickcontrols qtquickcontrols2 pyotherside ];
enableParallelBuilding = true;
pythonPath = [ yubikey-manager ]; pythonPath = [ yubikey-manager ];
dontWrapQtApps = true; dontWrapQtApps = true;