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

Merge pull request #116535 from SuperSandro2000/fix-collection27

Browse Source
This commit is contained in:
Sandro 2021-03-18 13:43:53 +01:00 committed by GitHub
commit 779428586c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 64 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/audio/ardour/5.nix
View File

@ -8,7 +8,6 @@
, doxygen , doxygen
, fftwSinglePrec , fftwSinglePrec
, flac , flac
, glibc
, glibmm , glibmm
, graphviz , graphviz
, gtkmm2 , gtkmm2

2
pkgs/applications/audio/gnome-podcasts/default.nix
View File

@ -75,5 +75,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
maintainers = teams.gnome.members; maintainers = teams.gnome.members;
platforms = platforms.unix; platforms = platforms.unix;
# couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2)
broken = true;
}; };
} }

2
pkgs/applications/audio/sunvox/default.nix
View File

@ -44,5 +44,7 @@ stdenv.mkDerivation rec {
homepage = "http://www.warmplace.ru/soft/sunvox/"; homepage = "http://www.warmplace.ru/soft/sunvox/";
maintainers = with maintainers; [ puffnfresh ]; maintainers = with maintainers; [ puffnfresh ];
platforms = [ "i686-linux" "x86_64-linux" ]; platforms = [ "i686-linux" "x86_64-linux" ];
# hash mismatch
broken = true;
}; };
} }

8
pkgs/applications/blockchains/monero-gui/default.nix
View File

@ -10,15 +10,13 @@
, randomx, zeromq, libgcrypt, libgpgerror , randomx, zeromq, libgcrypt, libgpgerror
, hidapi, rapidjson, quirc , hidapi, rapidjson, quirc
, trezorSupport ? true , trezorSupport ? true
, libusb1 ? null , libusb1
, protobuf ? null , protobuf
, python3 ? null , python3
}: }:
with lib; with lib;
assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ];
let let
arch = if stdenv.isx86_64 then "x86-64" arch = if stdenv.isx86_64 then "x86-64"
else if stdenv.isi686 then "i686" else if stdenv.isi686 then "i686"

5
pkgs/applications/networking/instant-messengers/fractal/default.nix
View File

@ -87,8 +87,9 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Matrix group messaging app"; description = "Matrix group messaging app";
homepage = "https://gitlab.gnome.org/GNOME/fractal"; homepage = "https://gitlab.gnome.org/GNOME/fractal";
license = licenses.gpl3Plus; license = licenses.gpl3;
broken = stdenv.isDarwin; # 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 ]; maintainers = with maintainers; [ dtzWill worldofpeace ];
}; };
} }

2
pkgs/applications/networking/p2p/gnunet/gtk.nix
View File

@ -39,5 +39,7 @@ stdenv.mkDerivation rec {
meta = gnunet.meta // { meta = gnunet.meta // {
description = "GNUnet GTK User Interface"; description = "GNUnet GTK User Interface";
homepage = "https://git.gnunet.org/gnunet-gtk.git"; homepage = "https://git.gnunet.org/gnunet-gtk.git";
# configure: error: compiling gnunet-gtk requires GNUnet core headers
broken = true;
}; };
} }

2
pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
View File

@ -2,8 +2,6 @@
, yacc, libtool, fontconfig, pango, gd, libwebp , yacc, libtool, fontconfig, pango, gd, libwebp
}: }:
assert libpng != null && libjpeg != null && expat != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "graphviz-2.0"; name = "graphviz-2.0";

8
pkgs/applications/virtualization/docker-compose/default.nix
View File

@ -21,12 +21,12 @@ buildPythonApplication rec {
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
checkInputs = [ mock pytest nose ]; checkInputs = [ mock pytest nose ];
propagatedBuildInputs = [ propagatedBuildInputs = [
pyyaml backports_ssl_match_hostname colorama dockerpty docker pyyaml colorama dockerpty docker
ipaddress jsonschema requests six texttable websocket_client ipaddress jsonschema requests six texttable websocket_client
docopt cached-property paramiko distro python-dotenv docopt cached-property paramiko distro python-dotenv
] ++ ] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname
lib.optional (pythonOlder "3.4") enum34 ++ ++ lib.optional (pythonOlder "3.4") enum34
lib.optional (pythonOlder "3.2") functools32; ++ lib.optional (pythonOlder "3.2") functools32;
postPatch = '' postPatch = ''
# Remove upper bound on requires, see also # Remove upper bound on requires, see also

2
pkgs/development/compilers/crystal/default.nix
View File

@ -214,6 +214,8 @@ let
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ]; maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ];
platforms = builtins.attrNames archs; platforms = builtins.attrNames archs;
# Error running at_exit handler: Nil assertion failed
broken = lib.versions.minor version == "32" && stdenv.isDarwin;
}; };
}) })
); );

2
pkgs/development/compilers/dmd/default.nix
View File

@ -171,5 +171,7 @@ stdenv.mkDerivation rec {
license = licenses.boost; license = licenses.boost;
maintainers = with maintainers; [ ThomasMader lionello ]; maintainers = with maintainers; [ ThomasMader lionello ];
platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
# many tests are failing
broken = true;
}; };
} }

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

@ -1,8 +1,9 @@
{ lib, buildPythonPackage, fetchPypi }: { lib, buildPythonPackage, fetchPypi, pythonAtLeast }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "backports.ssl_match_hostname"; pname = "backports.ssl_match_hostname";
version = "3.7.0.1"; version = "3.7.0.1";
disabled = pythonAtLeast "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;

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

@ -6,6 +6,7 @@
, certifi , certifi
, six , six
, backports_ssl_match_hostname , backports_ssl_match_hostname
, pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -18,7 +19,8 @@ buildPythonPackage rec {
}; };
buildInputs = [ pytest ]; 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 # Several tests fail that require network
doCheck = false; doCheck = false;

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

@ -26,7 +26,7 @@ buildPythonPackage rec {
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \ --replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \
--replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \ --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 ]; nativeBuildInputs = [ poetry-core ];

6
pkgs/development/python-modules/soco/default.nix
View File

@ -30,10 +30,12 @@ buildPythonPackage rec {
sha256 = "sha256-CCgkzUkt9YqTJt9tPBLmYXW6ZuRoMDd7xahYmNXgfM0="; sha256 = "sha256-CCgkzUkt9YqTJt9tPBLmYXW6ZuRoMDd7xahYmNXgfM0=";
}; };
patches = [(fetchpatch { patches = [
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch"; url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch";
sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4="; sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4=";
})]; })
];
# N.B. These exist because: # N.B. These exist because:
# 1. Upstream's pinning isn't well maintained, leaving dependency versions no # 1. Upstream's pinning isn't well maintained, leaving dependency versions no

3
pkgs/development/tools/build-managers/sbt/default.nix
View File

@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
version = "1.4.9"; version = "1.4.9";
src = fetchurl { src = fetchurl {
url = url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
"https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz";
sha256 = "sha256-lUaBGfdkFJk2czCmCkuKYhHm6n+L3n1kfGexndj9224="; sha256 = "sha256-lUaBGfdkFJk2czCmCkuKYhHm6n+L3n1kfGexndj9224=";
}; };

2
pkgs/games/spring/default.nix
View File

@ -60,5 +60,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ phreedom qknight domenkozar sorki ]; maintainers = with maintainers; [ phreedom qknight domenkozar sorki ];
platforms = platforms.linux; platforms = platforms.linux;
# error: 'snprintf' was not declared in this scope
broken = true;
}; };
} }

6
pkgs/tools/audio/essentia-extractor/default.nix
View File

@ -14,13 +14,13 @@ let
arch = arch_table.${stdenv.system}; arch = arch_table.${stdenv.system};
sha = sha_table.${stdenv.system}; sha = sha_table.${stdenv.system};
in stdenv.mkDerivation rec { in
stdenv.mkDerivation rec {
pname = "essentia-extractor"; pname = "essentia-extractor";
version = "2.1_beta2"; version = "2.1_beta2";
src = fetchurl { src = fetchurl {
url = url = "ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz";
"ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz";
sha256 = sha; sha256 = sha;
}; };

4
pkgs/tools/graphics/graphviz/base.nix
View File

@ -2,9 +2,7 @@
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex { lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex
, fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango , fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango
, yacc, fetchpatch, xorg ? null, ApplicationServices ? null }: , yacc, fetchpatch, xorg ? null, ApplicationServices }:
assert stdenv.isDarwin -> ApplicationServices != null;
let let
inherit (lib) optional optionals optionalString; inherit (lib) optional optionals optionalString;

3
pkgs/tools/networking/dd-agent/5.nix
View File

@ -19,10 +19,9 @@ let
requests requests
websocket_client websocket_client
ipaddress ipaddress
backports_ssl_match_hostname
docker_pycreds docker_pycreds
uptime uptime
]; ] ++ lib.optionals (self.pythonOlder "3.7") [ backports_ssl_match_hostname ];
# due to flake8 # due to flake8
doCheck = false; doCheck = false;

11
pkgs/tools/networking/openvpn/default.nix
View File

@ -3,20 +3,17 @@
, pkg-config , pkg-config
, makeWrapper , makeWrapper
, runtimeShell , runtimeShell
, iproute ? null , iproute
, lzo , lzo
, openssl , openssl
, pam , pam
, useSystemd ? stdenv.isLinux , useSystemd ? stdenv.isLinux
, systemd ? null , systemd
, util-linux ? null , util-linux
, pkcs11Support ? false , pkcs11Support ? false
, pkcs11helper ? null , pkcs11helper
}: }:
assert useSystemd -> (systemd != null);
assert pkcs11Support -> (pkcs11helper != null);
with lib; with lib;
let let
# Check if the script needs to have other binaries wrapped when changing this. # Check if the script needs to have other binaries wrapped when changing this.

25
pkgs/tools/networking/wireguard-tools/default.nix
View File

@ -1,16 +1,15 @@
{ lib, stdenv { lib
, stdenv
, fetchzip , fetchzip
, nixosTests , nixosTests
, iptables ? null , iptables
, iproute ? null , iproute
, makeWrapper ? null , makeWrapper
, openresolv ? null , openresolv
, procps ? null , procps
, wireguard-go ? null , wireguard-go
}: }:
with lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wireguard-tools"; pname = "wireguard-tools";
version = "1.0.20210315"; version = "1.0.20210315";
@ -37,11 +36,11 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
substituteInPlace $out/lib/systemd/system/wg-quick@.service \ substituteInPlace $out/lib/systemd/system/wg-quick@.service \
--replace /usr/bin $out/bin --replace /usr/bin $out/bin
'' + optionalString stdenv.isLinux '' '' + lib.optionalString stdenv.isLinux ''
for f in $out/bin/*; do 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 done
'' + optionalString stdenv.isDarwin '' '' + lib.optionalString stdenv.isDarwin ''
for f in $out/bin/*; do for f in $out/bin/*; do
wrapProgram $f --prefix PATH : ${wireguard-go}/bin wrapProgram $f --prefix PATH : ${wireguard-go}/bin
done done
@ -52,7 +51,7 @@ stdenv.mkDerivation rec {
tests = nixosTests.wireguard; tests = nixosTests.wireguard;
}; };
meta = { meta = with lib; {
description = "Tools for the WireGuard secure network tunnel"; description = "Tools for the WireGuard secure network tunnel";
downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/"; downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/";
homepage = "https://www.wireguard.com/"; homepage = "https://www.wireguard.com/";

7
pkgs/tools/security/pcsclite/default.nix
View File

@ -1,5 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3 { lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3, IOKit }:
, IOKit ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pcsclite"; pname = "pcsclite";
@ -35,7 +34,9 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ pkg-config perl ]; nativeBuildInputs = [ pkg-config perl ];
buildInputs = [ python3 ] ++ lib.optionals stdenv.isLinux [ udev dbus ]
buildInputs = [ python3 ]
++ lib.optionals stdenv.isLinux [ udev dbus ]
++ lib.optionals stdenv.isDarwin [ IOKit ]; ++ lib.optionals stdenv.isDarwin [ IOKit ];
meta = with lib; { meta = with lib; {