Merge pull request #116535 from SuperSandro2000/fix-collection27

authored by Sandro and committed by GitHub 77942858 5564ef77

+64 -58
-1
pkgs/applications/audio/ardour/5.nix
··· 8 , doxygen 9 , fftwSinglePrec 10 , flac 11 - , glibc 12 , glibmm 13 , graphviz 14 , gtkmm2
··· 8 , doxygen 9 , fftwSinglePrec 10 , flac 11 , glibmm 12 , graphviz 13 , gtkmm2
+2
pkgs/applications/audio/gnome-podcasts/default.nix
··· 75 license = licenses.gpl3Plus; 76 maintainers = teams.gnome.members; 77 platforms = platforms.unix; 78 }; 79 }
··· 75 license = licenses.gpl3Plus; 76 maintainers = teams.gnome.members; 77 platforms = platforms.unix; 78 + # couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2) 79 + broken = true; 80 }; 81 }
+2
pkgs/applications/audio/sunvox/default.nix
··· 44 homepage = "http://www.warmplace.ru/soft/sunvox/"; 45 maintainers = with maintainers; [ puffnfresh ]; 46 platforms = [ "i686-linux" "x86_64-linux" ]; 47 }; 48 }
··· 44 homepage = "http://www.warmplace.ru/soft/sunvox/"; 45 maintainers = with maintainers; [ puffnfresh ]; 46 platforms = [ "i686-linux" "x86_64-linux" ]; 47 + # hash mismatch 48 + broken = true; 49 }; 50 }
+3 -5
pkgs/applications/blockchains/monero-gui/default.nix
··· 10 , randomx, zeromq, libgcrypt, libgpgerror 11 , hidapi, rapidjson, quirc 12 , trezorSupport ? true 13 - , libusb1 ? null 14 - , protobuf ? null 15 - , python3 ? null 16 }: 17 18 with lib; 19 - 20 - assert trezorSupport -> all (x: x!=null) [ libusb1 protobuf python3 ]; 21 22 let 23 arch = if stdenv.isx86_64 then "x86-64"
··· 10 , randomx, zeromq, libgcrypt, libgpgerror 11 , hidapi, rapidjson, quirc 12 , trezorSupport ? true 13 + , libusb1 14 + , protobuf 15 + , python3 16 }: 17 18 with lib; 19 20 let 21 arch = if stdenv.isx86_64 then "x86-64"
+3 -2
pkgs/applications/networking/instant-messengers/fractal/default.nix
··· 87 meta = with lib; { 88 description = "Matrix group messaging app"; 89 homepage = "https://gitlab.gnome.org/GNOME/fractal"; 90 - license = licenses.gpl3Plus; 91 - broken = stdenv.isDarwin; 92 maintainers = with maintainers; [ dtzWill worldofpeace ]; 93 }; 94 }
··· 87 meta = with lib; { 88 description = "Matrix group messaging app"; 89 homepage = "https://gitlab.gnome.org/GNOME/fractal"; 90 + license = licenses.gpl3; 91 + # couldn't read /build/source/build/podcasts-gtk/resources/resources.gresource: No such file or directory (os error 2) 92 + broken = true; 93 maintainers = with maintainers; [ dtzWill worldofpeace ]; 94 }; 95 }
+2
pkgs/applications/networking/p2p/gnunet/gtk.nix
··· 39 meta = gnunet.meta // { 40 description = "GNUnet GTK User Interface"; 41 homepage = "https://git.gnunet.org/gnunet-gtk.git"; 42 }; 43 }
··· 39 meta = gnunet.meta // { 40 description = "GNUnet GTK User Interface"; 41 homepage = "https://git.gnunet.org/gnunet-gtk.git"; 42 + # configure: error: compiling gnunet-gtk requires GNUnet core headers 43 + broken = true; 44 }; 45 }
-2
pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
··· 2 , yacc, libtool, fontconfig, pango, gd, libwebp 3 }: 4 5 - assert libpng != null && libjpeg != null && expat != null; 6 - 7 stdenv.mkDerivation rec { 8 name = "graphviz-2.0"; 9
··· 2 , yacc, libtool, fontconfig, pango, gd, libwebp 3 }: 4 5 stdenv.mkDerivation rec { 6 name = "graphviz-2.0"; 7
+4 -4
pkgs/applications/virtualization/docker-compose/default.nix
··· 21 nativeBuildInputs = [ installShellFiles ]; 22 checkInputs = [ mock pytest nose ]; 23 propagatedBuildInputs = [ 24 - pyyaml backports_ssl_match_hostname colorama dockerpty docker 25 ipaddress jsonschema requests six texttable websocket_client 26 docopt cached-property paramiko distro python-dotenv 27 - ] ++ 28 - lib.optional (pythonOlder "3.4") enum34 ++ 29 - lib.optional (pythonOlder "3.2") functools32; 30 31 postPatch = '' 32 # Remove upper bound on requires, see also
··· 21 nativeBuildInputs = [ installShellFiles ]; 22 checkInputs = [ mock pytest nose ]; 23 propagatedBuildInputs = [ 24 + pyyaml colorama dockerpty docker 25 ipaddress jsonschema requests six texttable websocket_client 26 docopt cached-property paramiko distro python-dotenv 27 + ] ++ lib.optional (pythonOlder "3.7") backports_ssl_match_hostname 28 + ++ lib.optional (pythonOlder "3.4") enum34 29 + ++ lib.optional (pythonOlder "3.2") functools32; 30 31 postPatch = '' 32 # Remove upper bound on requires, see also
+2
pkgs/development/compilers/crystal/default.nix
··· 214 license = licenses.asl20; 215 maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ]; 216 platforms = builtins.attrNames archs; 217 }; 218 }) 219 );
··· 214 license = licenses.asl20; 215 maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ]; 216 platforms = builtins.attrNames archs; 217 + # Error running at_exit handler: Nil assertion failed 218 + broken = lib.versions.minor version == "32" && stdenv.isDarwin; 219 }; 220 }) 221 );
+2
pkgs/development/compilers/dmd/default.nix
··· 171 license = licenses.boost; 172 maintainers = with maintainers; [ ThomasMader lionello ]; 173 platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; 174 }; 175 }
··· 171 license = licenses.boost; 172 maintainers = with maintainers; [ ThomasMader lionello ]; 173 platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; 174 + # many tests are failing 175 + broken = true; 176 }; 177 }
+2 -1
pkgs/development/python-modules/backports_ssl_match_hostname/default.nix
··· 1 - { lib, buildPythonPackage, fetchPypi }: 2 3 buildPythonPackage rec { 4 pname = "backports.ssl_match_hostname"; 5 version = "3.7.0.1"; 6 7 src = fetchPypi { 8 inherit pname version;
··· 1 + { lib, buildPythonPackage, fetchPypi, pythonAtLeast }: 2 3 buildPythonPackage rec { 4 pname = "backports.ssl_match_hostname"; 5 version = "3.7.0.1"; 6 + disabled = pythonAtLeast "3.7"; 7 8 src = fetchPypi { 9 inherit pname version;
+3 -1
pkgs/development/python-modules/geventhttpclient/default.nix
··· 6 , certifi 7 , six 8 , backports_ssl_match_hostname 9 }: 10 11 buildPythonPackage rec { ··· 18 }; 19 20 buildInputs = [ pytest ]; 21 - propagatedBuildInputs = [ gevent certifi six backports_ssl_match_hostname ]; 22 23 # Several tests fail that require network 24 doCheck = false;
··· 6 , certifi 7 , six 8 , backports_ssl_match_hostname 9 + , pythonOlder 10 }: 11 12 buildPythonPackage rec { ··· 19 }; 20 21 buildInputs = [ pytest ]; 22 + propagatedBuildInputs = [ gevent certifi six ] 23 + ++ lib.optionals (pythonOlder "3.7") [ backports_ssl_match_hostname ]; 24 25 # Several tests fail that require network 26 doCheck = false;
+1 -1
pkgs/development/python-modules/gradient-utils/default.nix
··· 26 substituteInPlace pyproject.toml \ 27 --replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \ 28 --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \ 29 - --replace 'wheel = "^0.35.1"' 'wheel = "^0.36"' 30 ''; 31 32 nativeBuildInputs = [ poetry-core ];
··· 26 substituteInPlace pyproject.toml \ 27 --replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \ 28 --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \ 29 + --replace 'wheel = "^0.35.1"' 'wheel = "*"' 30 ''; 31 32 nativeBuildInputs = [ poetry-core ];
+6 -4
pkgs/development/python-modules/soco/default.nix
··· 30 sha256 = "sha256-CCgkzUkt9YqTJt9tPBLmYXW6ZuRoMDd7xahYmNXgfM0="; 31 }; 32 33 - patches = [(fetchpatch { 34 - url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch"; 35 - sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4="; 36 - })]; 37 38 # N.B. These exist because: 39 # 1. Upstream's pinning isn't well maintained, leaving dependency versions no
··· 30 sha256 = "sha256-CCgkzUkt9YqTJt9tPBLmYXW6ZuRoMDd7xahYmNXgfM0="; 31 }; 32 33 + patches = [ 34 + (fetchpatch { 35 + url = "https://patch-diff.githubusercontent.com/raw/SoCo/SoCo/pull/811.patch"; 36 + sha256 = "sha256-GBd74c8zc25ROO411SZ9TTa+bi8yXJaaOQqY9FM1qj4="; 37 + }) 38 + ]; 39 40 # N.B. These exist because: 41 # 1. Upstream's pinning isn't well maintained, leaving dependency versions no
+1 -2
pkgs/development/tools/build-managers/sbt/default.nix
··· 11 version = "1.4.9"; 12 13 src = fetchurl { 14 - url = 15 - "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; 16 sha256 = "sha256-lUaBGfdkFJk2czCmCkuKYhHm6n+L3n1kfGexndj9224="; 17 }; 18
··· 11 version = "1.4.9"; 12 13 src = fetchurl { 14 + url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; 15 sha256 = "sha256-lUaBGfdkFJk2czCmCkuKYhHm6n+L3n1kfGexndj9224="; 16 }; 17
+2
pkgs/games/spring/default.nix
··· 60 license = licenses.gpl2; 61 maintainers = with maintainers; [ phreedom qknight domenkozar sorki ]; 62 platforms = platforms.linux; 63 }; 64 }
··· 60 license = licenses.gpl2; 61 maintainers = with maintainers; [ phreedom qknight domenkozar sorki ]; 62 platforms = platforms.linux; 63 + # error: 'snprintf' was not declared in this scope 64 + broken = true; 65 }; 66 }
+3 -3
pkgs/tools/audio/essentia-extractor/default.nix
··· 14 15 arch = arch_table.${stdenv.system}; 16 sha = sha_table.${stdenv.system}; 17 - in stdenv.mkDerivation rec { 18 pname = "essentia-extractor"; 19 version = "2.1_beta2"; 20 21 src = fetchurl { 22 - url = 23 - "ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz"; 24 sha256 = sha; 25 }; 26
··· 14 15 arch = arch_table.${stdenv.system}; 16 sha = sha_table.${stdenv.system}; 17 + in 18 + stdenv.mkDerivation rec { 19 pname = "essentia-extractor"; 20 version = "2.1_beta2"; 21 22 src = fetchurl { 23 + url = "ftp://ftp.acousticbrainz.org/pub/acousticbrainz/essentia-extractor-v${version}-${arch}.tar.gz"; 24 sha256 = sha; 25 }; 26
+1 -3
pkgs/tools/graphics/graphviz/base.nix
··· 2 3 { lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex 4 , fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango 5 - , yacc, fetchpatch, xorg ? null, ApplicationServices ? null }: 6 - 7 - assert stdenv.isDarwin -> ApplicationServices != null; 8 9 let 10 inherit (lib) optional optionals optionalString;
··· 2 3 { lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex 4 , fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango 5 + , yacc, fetchpatch, xorg ? null, ApplicationServices }: 6 7 let 8 inherit (lib) optional optionals optionalString;
+1 -2
pkgs/tools/networking/dd-agent/5.nix
··· 19 requests 20 websocket_client 21 ipaddress 22 - backports_ssl_match_hostname 23 docker_pycreds 24 uptime 25 - ]; 26 27 # due to flake8 28 doCheck = false;
··· 19 requests 20 websocket_client 21 ipaddress 22 docker_pycreds 23 uptime 24 + ] ++ lib.optionals (self.pythonOlder "3.7") [ backports_ssl_match_hostname ]; 25 26 # due to flake8 27 doCheck = false;
+4 -7
pkgs/tools/networking/openvpn/default.nix
··· 3 , pkg-config 4 , makeWrapper 5 , runtimeShell 6 - , iproute ? null 7 , lzo 8 , openssl 9 , pam 10 , useSystemd ? stdenv.isLinux 11 - , systemd ? null 12 - , util-linux ? null 13 , pkcs11Support ? false 14 - , pkcs11helper ? null 15 }: 16 - 17 - assert useSystemd -> (systemd != null); 18 - assert pkcs11Support -> (pkcs11helper != null); 19 20 with lib; 21 let
··· 3 , pkg-config 4 , makeWrapper 5 , runtimeShell 6 + , iproute 7 , lzo 8 , openssl 9 , pam 10 , useSystemd ? stdenv.isLinux 11 + , systemd 12 + , util-linux 13 , pkcs11Support ? false 14 + , pkcs11helper 15 }: 16 17 with lib; 18 let
+12 -13
pkgs/tools/networking/wireguard-tools/default.nix
··· 1 - { lib, stdenv 2 , fetchzip 3 , nixosTests 4 - , iptables ? null 5 - , iproute ? null 6 - , makeWrapper ? null 7 - , openresolv ? null 8 - , procps ? null 9 - , wireguard-go ? null 10 }: 11 - 12 - with lib; 13 14 stdenv.mkDerivation rec { 15 pname = "wireguard-tools"; ··· 37 postFixup = '' 38 substituteInPlace $out/lib/systemd/system/wg-quick@.service \ 39 --replace /usr/bin $out/bin 40 - '' + optionalString stdenv.isLinux '' 41 for f in $out/bin/*; do 42 - wrapProgram $f --prefix PATH : ${makeBinPath [procps iproute iptables openresolv]} 43 done 44 - '' + optionalString stdenv.isDarwin '' 45 for f in $out/bin/*; do 46 wrapProgram $f --prefix PATH : ${wireguard-go}/bin 47 done ··· 52 tests = nixosTests.wireguard; 53 }; 54 55 - meta = { 56 description = "Tools for the WireGuard secure network tunnel"; 57 downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/"; 58 homepage = "https://www.wireguard.com/";
··· 1 + { lib 2 + , stdenv 3 , fetchzip 4 , nixosTests 5 + , iptables 6 + , iproute 7 + , makeWrapper 8 + , openresolv 9 + , procps 10 + , wireguard-go 11 }: 12 13 stdenv.mkDerivation rec { 14 pname = "wireguard-tools"; ··· 36 postFixup = '' 37 substituteInPlace $out/lib/systemd/system/wg-quick@.service \ 38 --replace /usr/bin $out/bin 39 + '' + lib.optionalString stdenv.isLinux '' 40 for f in $out/bin/*; do 41 + wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute iptables openresolv ]} 42 done 43 + '' + lib.optionalString stdenv.isDarwin '' 44 for f in $out/bin/*; do 45 wrapProgram $f --prefix PATH : ${wireguard-go}/bin 46 done ··· 51 tests = nixosTests.wireguard; 52 }; 53 54 + meta = with lib; { 55 description = "Tools for the WireGuard secure network tunnel"; 56 downloadPage = "https://git.zx2c4.com/wireguard-tools/refs/"; 57 homepage = "https://www.wireguard.com/";
+8 -7
pkgs/tools/security/pcsclite/default.nix
··· 1 - { lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3 2 - , IOKit ? null }: 3 4 stdenv.mkDerivation rec { 5 pname = "pcsclite"; ··· 19 "--enable-usbdropdir=/var/lib/pcsc/drivers" 20 "--enable-confdir=/etc" 21 ] ++ lib.optional stdenv.isLinux 22 - "--with-systemdsystemunitdir=\${out}/etc/systemd/system" 23 - ++ lib.optional (!stdenv.isLinux) 24 - "--disable-libsystemd"; 25 26 postConfigure = '' 27 sed -i -re '/^#define *PCSCLITE_HP_DROPDIR */ { ··· 35 ''; 36 37 nativeBuildInputs = [ pkg-config perl ]; 38 - buildInputs = [ python3 ] ++ lib.optionals stdenv.isLinux [ udev dbus ] 39 - ++ lib.optionals stdenv.isDarwin [ IOKit ]; 40 41 meta = with lib; { 42 description = "Middleware to access a smart card using SCard API (PC/SC)";
··· 1 + { lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3, IOKit }: 2 3 stdenv.mkDerivation rec { 4 pname = "pcsclite"; ··· 18 "--enable-usbdropdir=/var/lib/pcsc/drivers" 19 "--enable-confdir=/etc" 20 ] ++ lib.optional stdenv.isLinux 21 + "--with-systemdsystemunitdir=\${out}/etc/systemd/system" 22 + ++ lib.optional (!stdenv.isLinux) 23 + "--disable-libsystemd"; 24 25 postConfigure = '' 26 sed -i -re '/^#define *PCSCLITE_HP_DROPDIR */ { ··· 34 ''; 35 36 nativeBuildInputs = [ pkg-config perl ]; 37 + 38 + buildInputs = [ python3 ] 39 + ++ lib.optionals stdenv.isLinux [ udev dbus ] 40 + ++ lib.optionals stdenv.isDarwin [ IOKit ]; 41 42 meta = with lib; { 43 description = "Middleware to access a smart card using SCard API (PC/SC)";