Merge pull request #113522 from SuperSandro2000/fix-collection15
This commit is contained in:
Sandro
GitHub
commit
983f4d6894
@ -2,7 +2,6 @@
|
||||
, poetry2nix
|
||||
, lib
|
||||
, overrides ? (self: super: {})
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
|
||||
, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
|
||||
, 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
|
||||
# the shipped alternative sources (assembly).
|
||||
, open-watcom-bin ? null
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus
|
||||
, 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 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -15,7 +15,6 @@
|
||||
, gnome3
|
||||
, gjs
|
||||
, nixosTests
|
||||
, gsettings-desktop-schemas
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, isPy3k
|
||||
, fetchPypi
|
||||
@ -72,5 +73,7 @@ buildPythonPackage rec {
|
||||
description = "A modular, fast, simple, static website and blog generator";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ jluttine ];
|
||||
# all tests fail
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, alembic
|
||||
@ -47,10 +46,7 @@
|
||||
, tzlocal
|
||||
, unicodecsv
|
||||
, zope_deprecation
|
||||
, enum34
|
||||
, typing
|
||||
, nose
|
||||
, python
|
||||
, pythonOlder
|
||||
, pythonAtLeast
|
||||
}:
|
||||
|
||||
@ -6,7 +6,6 @@
|
||||
, six
|
||||
# test dependencies
|
||||
, coverage
|
||||
, flake8
|
||||
, mock
|
||||
, nose
|
||||
, pycodestyle
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
buildPythonPackage rec {
|
||||
pname = "intake";
|
||||
version = "0.6.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
@ -73,7 +72,7 @@ buildPythonPackage rec {
|
||||
"http"
|
||||
|
||||
# broken test
|
||||
"test_read_pattern_with"
|
||||
"test_read_pattern"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
@ -155,5 +156,7 @@ buildPythonPackage rec {
|
||||
homepage = "https://jupyter.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ ixxie cstrahan ];
|
||||
# E OSError: dlopen(/nix/store/43zml0mlr17r5jsagxr00xxx91hz9lky-openpam-20170430/lib/libpam.so, 6): image not found
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
@ -49,7 +49,7 @@ buildPythonPackage rec {
|
||||
"test_filter_cmd_invalid_filter"
|
||||
"test_inline_merge"
|
||||
"test_interrogate_filter_no_repo"
|
||||
"test_merge_input_strategy_inline_source_conflict"
|
||||
"test_merge"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, isPy27
|
||||
, future, python-language-server, mypy, configparser
|
||||
, pytestCheckHook, mock, isPy3k, pytestcov, coverage
|
||||
, pytestCheckHook, mock, pytestcov, coverage
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
, fetchFromGitHub
|
||||
, maturin
|
||||
, buildPythonPackage
|
||||
, isPy38
|
||||
, python
|
||||
}:
|
||||
let
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
}:
|
||||
@ -16,6 +17,7 @@ buildPythonPackage rec {
|
||||
homepage = "http://yapsy.sourceforge.net/";
|
||||
description = "Yet another plugin system";
|
||||
license = licenses.bsd0;
|
||||
# tests fail and are not using pytest to easily disable them
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,38 +1,35 @@
|
||||
{
|
||||
pkgs
|
||||
, stdenv
|
||||
{ stdenv
|
||||
, libusb-compat-0_1
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "micronucleus";
|
||||
version = "2.04";
|
||||
pname = "micronucleus";
|
||||
version = "2.04";
|
||||
|
||||
sourceRoot = "source/commandline";
|
||||
sourceRoot = "source/commandline";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "micronucleus";
|
||||
repo = "micronucleus";
|
||||
rev = version;
|
||||
sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in";
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "micronucleus";
|
||||
repo = "micronucleus";
|
||||
rev = version;
|
||||
sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in";
|
||||
};
|
||||
|
||||
buildInputs = [ libusb-compat-0_1 ];
|
||||
makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
|
||||
buildInputs = [ libusb-compat-0_1 ];
|
||||
makeFlags = lib.optionals stdenv.isDarwin [ "CC=cc" ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/lib/udev
|
||||
cp micronucleus $out/bin
|
||||
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 ];
|
||||
};
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/lib/udev
|
||||
cp micronucleus $out/bin
|
||||
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 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub
|
||||
, autoreconfHook269, util-linux, nukeReferences, coreutils
|
||||
, perl, buildPackages, nixosTests
|
||||
, perl, nixosTests
|
||||
, configFile ? "all"
|
||||
|
||||
# Userspace dependencies
|
||||
@ -9,7 +9,7 @@
|
||||
, nfs-utils
|
||||
, gawk, gnugrep, gnused, systemd
|
||||
, smartmontools, enableMail ? false
|
||||
, sysstat, sudo, pkg-config
|
||||
, sysstat, pkg-config
|
||||
|
||||
# Kernel dependencies
|
||||
, kernel ? null
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, coreutils, zfs
|
||||
, perlPackages, procps, which, openssh, sudo, mbuffer, pv, lzop, gzip, pigz }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, zfs
|
||||
, perlPackages, procps, which, openssh, mbuffer, pv, lzop, gzip, pigz }:
|
||||
|
||||
with lib;
|
||||
|
||||
|
||||
@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [ pythonPackages.python qtbase qtgraphicaleffects qtquickcontrols qtquickcontrols2 pyotherside ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
pythonPath = [ yubikey-manager ];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user