Merge pull request #116535 from SuperSandro2000/fix-collection27
This commit is contained in:
commit
779428586c
@ -8,7 +8,6 @@
|
||||
, doxygen
|
||||
, fftwSinglePrec
|
||||
, flac
|
||||
, glibc
|
||||
, glibmm
|
||||
, graphviz
|
||||
, gtkmm2
|
||||
|
@ -75,5 +75,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
# couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2)
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
@ -44,5 +44,7 @@ stdenv.mkDerivation rec {
|
||||
homepage = "http://www.warmplace.ru/soft/sunvox/";
|
||||
maintainers = with maintainers; [ puffnfresh ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
# hash mismatch
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
@ -10,15 +10,13 @@
|
||||
, randomx, zeromq, libgcrypt, libgpgerror
|
||||
, hidapi, rapidjson, quirc
|
||||
, trezorSupport ? true
|
||||
, libusb1 ? null
|
||||
, protobuf ? null
|
||||
, python3 ? null
|
||||
, libusb1
|
||||
, protobuf
|
||||
, python3
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
|
||||
|
||||
let
|
||||
arch = if stdenv.isx86_64 then "x86-64"
|
||||
else if stdenv.isi686 then "i686"
|
||||
|
@ -87,8 +87,9 @@ stdenv.mkDerivation rec {
|
||||
meta = with lib; {
|
||||
description = "Matrix group messaging app";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/fractal";
|
||||
license = licenses.gpl3Plus;
|
||||
broken = stdenv.isDarwin;
|
||||
license = licenses.gpl3;
|
||||
# couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2)
|
||||
broken = true;
|
||||
maintainers = with maintainers; [ dtzWill worldofpeace ];
|
||||
};
|
||||
}
|
||||
|
@ -39,5 +39,7 @@ stdenv.mkDerivation rec {
|
||||
meta = gnunet.meta // {
|
||||
description = "GNUnet GTK User Interface";
|
||||
homepage = "https://git.gnunet.org/gnunet-gtk.git";
|
||||
# configure: error: compiling gnunet-gtk requires GNUnet core headers
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
@ -2,8 +2,6 @@
|
||||
, yacc, libtool, fontconfig, pango, gd, libwebp
|
||||
}:
|
||||
|
||||
assert libpng != null && libjpeg != null && expat != null;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "graphviz-2.0";
|
||||
|
||||
|
@ -21,12 +21,12 @@ buildPythonApplication rec {
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
checkInputs = [ mock pytest nose ];
|
||||
propagatedBuildInputs = [
|
||||
pyyaml backports_ssl_match_hostname colorama dockerpty docker
|
||||
pyyaml colorama dockerpty docker
|
||||
ipaddress jsonschema requests six texttable websocket_client
|
||||
docopt cached-property paramiko distro python-dotenv
|
||||
] ++
|
||||
lib.optional (pythonOlder "3.4") enum34 ++
|
||||
lib.optional (pythonOlder "3.2") functools32;
|
||||
] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname
|
||||
++ lib.optional (pythonOlder "3.4") enum34
|
||||
++ lib.optional (pythonOlder "3.2") functools32;
|
||||
|
||||
postPatch = ''
|
||||
# Remove upper bound on requires, see also
|
||||
|
@ -214,6 +214,8 @@ let
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ];
|
||||
platforms = builtins.attrNames archs;
|
||||
# Error running at_exit handler: Nil assertion failed
|
||||
broken = lib.versions.minor version == "32" && stdenv.isDarwin;
|
||||
};
|
||||
})
|
||||
);
|
||||
|
@ -171,5 +171,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.boost;
|
||||
maintainers = with maintainers; [ ThomasMader lionello ];
|
||||
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
|
||||
# many tests are failing
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
@ -1,8 +1,9 @@
|
||||
{ lib, buildPythonPackage, fetchPypi }:
|
||||
{ lib, buildPythonPackage, fetchPypi, pythonAtLeast }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "backports.ssl_match_hostname";
|
||||
version = "3.7.0.1";
|
||||
disabled = pythonAtLeast "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
@ -6,6 +6,7 @@
|
||||
, certifi
|
||||
, six
|
||||
, backports_ssl_match_hostname
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -18,7 +19,8 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
propagatedBuildInputs = [ gevent certifi six backports_ssl_match_hostname ];
|
||||
propagatedBuildInputs = [ gevent certifi six ]
|
||||
++ lib.optionals (pythonOlder "3.7") [ backports_ssl_match_hostname ];
|
||||
|
||||
# Several tests fail that require network
|
||||
doCheck = false;
|
||||
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \
|
||||
--replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \
|
||||
--replace 'wheel = "^0.35.1"' 'wheel = "^0.36"'
|
||||
--replace 'wheel = "^0.35.1"' 'wheel = "*"'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
|
@ -30,10 +30,12 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-CCgkzUkt9YqTJt9tPBLmYXW6ZuRoMDd7xahYmNXgfM0=";
|
||||
};
|
||||
|
||||
patches = [(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch";
|
||||
sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4=";
|
||||
})];
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch";
|
||||
sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4=";
|
||||
})
|
||||
];
|
||||
|
||||
# N.B. These exist because:
|
||||
# 1. Upstream's pinning isn't well maintained, leaving dependency versions no
|
||||
|
@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
|
||||
version = "1.4.9";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
|
||||
url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
|
||||
sha256 = "sha256-lUaBGfdkFJk2czCmCkuKYhHm6n+L3n1kfGexndj9224=";
|
||||
};
|
||||
|
||||
|
@ -60,5 +60,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ phreedom qknight domenkozar sorki ];
|
||||
platforms = platforms.linux;
|
||||
# error: 'snprintf' was not declared in this scope
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
@ -14,13 +14,13 @@ let
|
||||
|
||||
arch = arch_table.${stdenv.system};
|
||||
sha = sha_table.${stdenv.system};
|
||||
in stdenv.mkDerivation rec {
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "essentia-extractor";
|
||||
version = "2.1_beta2";
|
||||
|
||||
src = fetchurl {
|
||||
url =
|
||||
"ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz";
|
||||
url = "ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz";
|
||||
sha256 = sha;
|
||||
};
|
||||
|
||||
|
@ -2,9 +2,7 @@
|
||||
|
||||
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex
|
||||
, fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango
|
||||
, yacc, fetchpatch, xorg ? null, ApplicationServices ? null }:
|
||||
|
||||
assert stdenv.isDarwin -> ApplicationServices != null;
|
||||
, yacc, fetchpatch, xorg ? null, ApplicationServices }:
|
||||
|
||||
let
|
||||
inherit (lib) optional optionals optionalString;
|
||||
|
@ -19,10 +19,9 @@ let
|
||||
requests
|
||||
websocket_client
|
||||
ipaddress
|
||||
backports_ssl_match_hostname
|
||||
docker_pycreds
|
||||
uptime
|
||||
];
|
||||
] ++ lib.optionals (self.pythonOlder "3.7") [ backports_ssl_match_hostname ];
|
||||
|
||||
# due to flake8
|
||||
doCheck = false;
|
||||
|
@ -3,20 +3,17 @@
|
||||
, pkg-config
|
||||
, makeWrapper
|
||||
, runtimeShell
|
||||
, iproute ? null
|
||||
, iproute
|
||||
, lzo
|
||||
, openssl
|
||||
, pam
|
||||
, useSystemd ? stdenv.isLinux
|
||||
, systemd ? null
|
||||
, util-linux ? null
|
||||
, systemd
|
||||
, util-linux
|
||||
, pkcs11Support ? false
|
||||
, pkcs11helper ? null
|
||||
, pkcs11helper
|
||||
}:
|
||||
|
||||
assert useSystemd -> (systemd != null);
|
||||
assert pkcs11Support -> (pkcs11helper != null);
|
||||
|
||||
with lib;
|
||||
let
|
||||
# Check if the script needs to have other binaries wrapped when changing this.
|
||||
|
@ -1,16 +1,15 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, nixosTests
|
||||
, iptables ? null
|
||||
, iproute ? null
|
||||
, makeWrapper ? null
|
||||
, openresolv ? null
|
||||
, procps ? null
|
||||
, wireguard-go ? null
|
||||
, iptables
|
||||
, iproute
|
||||
, makeWrapper
|
||||
, openresolv
|
||||
, procps
|
||||
, wireguard-go
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wireguard-tools";
|
||||
version = "1.0.20210315";
|
||||
@ -37,11 +36,11 @@ stdenv.mkDerivation rec {
|
||||
postFixup = ''
|
||||
substituteInPlace $out/lib/systemd/system/wg-quick@.service \
|
||||
--replace /usr/bin $out/bin
|
||||
'' + optionalString stdenv.isLinux ''
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
for f in $out/bin/*; do
|
||||
wrapProgram $f --prefix PATH : ${makeBinPath [procps iproute iptables openresolv]}
|
||||
wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute iptables openresolv ]}
|
||||
done
|
||||
'' + optionalString stdenv.isDarwin ''
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
for f in $out/bin/*; do
|
||||
wrapProgram $f --prefix PATH : ${wireguard-go}/bin
|
||||
done
|
||||
@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
|
||||
tests = nixosTests.wireguard;
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Tools for the WireGuard secure network tunnel";
|
||||
downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
|
||||
homepage = "https://www.wireguard.com/";
|
||||
|
@ -1,5 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3
|
||||
, IOKit ? null }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3, IOKit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pcsclite";
|
||||
@ -19,9 +18,9 @@ stdenv.mkDerivation rec {
|
||||
"--enable-usbdropdir=/var/lib/pcsc/drivers"
|
||||
"--enable-confdir=/etc"
|
||||
] ++ lib.optional stdenv.isLinux
|
||||
"--with-systemdsystemunitdir=\${out}/etc/systemd/system"
|
||||
++ lib.optional (!stdenv.isLinux)
|
||||
"--disable-libsystemd";
|
||||
"--with-systemdsystemunitdir=\${out}/etc/systemd/system"
|
||||
++ lib.optional (!stdenv.isLinux)
|
||||
"--disable-libsystemd";
|
||||
|
||||
postConfigure = ''
|
||||
sed -i -re '/^#define *PCSCLITE_HP_DROPDIR */ {
|
||||
@ -35,8 +34,10 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config perl ];
|
||||
buildInputs = [ python3 ] ++ lib.optionals stdenv.isLinux [ udev dbus ]
|
||||
++ lib.optionals stdenv.isDarwin [ IOKit ];
|
||||
|
||||
buildInputs = [ python3 ]
|
||||
++ lib.optionals stdenv.isLinux [ udev dbus ]
|
||||
++ lib.optionals stdenv.isDarwin [ IOKit ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Middleware to access a smart card using SCard API (PC/SC)";
|
||||
|
Loading…
Reference in New Issue
Block a user