Merge pull request NixOS#112855 from SuperSandro2000/fix-collection10

Author: SuperSandro2000

pkgs/applications/audio/bambootracker/default.nix

@@ -40,5 +40,6 @@ mkDerivation rec {
     license = licenses.gpl2Only;
     platforms = platforms.all;
     maintainers = with maintainers; [ OPNA2608 ];
+    broken = stdenv.isDarwin;
   };
 }

pkgs/applications/audio/ncpamixer/default.nix

@@ -1,7 +1,6 @@
 { lib, stdenv, fetchFromGitHub, cmake, ncurses, libpulseaudio, pkg-config }:
 
 stdenv.mkDerivation rec {
-
   pname = "ncpamixer";
   version = "1.3.3.1";
 
@@ -12,22 +11,19 @@ stdenv.mkDerivation rec {
     sha256 = "1v3bz0vpgh18257hdnz3yvbnl51779g1h5b265zgc21ks7m1jw5z";
   };
 
-  buildInputs = [ ncurses libpulseaudio ];
   nativeBuildInputs = [ cmake pkg-config ];
 
-  configurePhase = ''
-    make PREFIX=$out build/Makefile
-  '';
+  buildInputs = [ ncurses libpulseaudio ];
 
-  buildPhase = ''
-    make build
+  configurePhase = ''
+    make PREFIX=$out USE_WIDE=1 RELEASE=1 build/Makefile
   '';
 
   meta = with lib; {
     description = "An ncurses mixer for PulseAudio inspired by pavucontrol";
     homepage = "https://github.com/fulhax/ncpamixer";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ StijnDW ];
+    maintainers = with maintainers; [ StijnDW SuperSandro2000 ];
   };
 }

pkgs/applications/misc/ranger/default.nix

@@ -1,12 +1,8 @@
 { lib, fetchFromGitHub, python3Packages, file, less, highlight
-, imagePreviewSupport ? true, w3m ? null}:
-
-with lib;
-
-assert imagePreviewSupport -> w3m != null;
+, imagePreviewSupport ? true, w3m }:
 
 python3Packages.buildPythonApplication rec {
-  name = "ranger-${version}";
+  pname = "ranger";
   version = "1.9.3";
 
   src = fetchFromGitHub {
@@ -18,14 +14,10 @@ python3Packages.buildPythonApplication rec {
 
   LC_ALL = "en_US.UTF-8";
 
-  checkInputs = with python3Packages; [ pytest ];
+  checkInputs = with python3Packages; [ pytestCheckHook ];
   propagatedBuildInputs = [ file ]
     ++ lib.optionals (imagePreviewSupport) [ python3Packages.pillow ];
 
-  checkPhase = ''
-    py.test tests
-  '';
-
   preConfigure = ''
     ${lib.optionalString (highlight != null) ''
       sed -i -e 's|^\s*highlight\b|${highlight}/bin/highlight|' \
@@ -45,7 +37,7 @@ python3Packages.buildPythonApplication rec {
     # give file previews out of the box
     substituteInPlace ranger/config/rc.conf \
       --replace "#set preview_script ~/.config/ranger/scope.sh" "set preview_script $out/share/doc/ranger/config/scope.sh"
-  '' + optionalString imagePreviewSupport ''
+  '' + lib.optionalString imagePreviewSupport ''
     substituteInPlace ranger/ext/img_display.py \
       --replace /usr/lib/w3m ${w3m}/libexec/w3m
 
@@ -57,8 +49,8 @@ python3Packages.buildPythonApplication rec {
   meta =  with lib; {
     description = "File manager with minimalistic curses interface";
     homepage = "http://ranger.github.io/";
-    license = licenses.gpl3;
+    license = licenses.gpl3Only;
     platforms = platforms.unix;
-    maintainers = [ maintainers.toonn maintainers.magnetophon ];
+    maintainers = with maintainers; [ toonn magnetophon ];
   };
 }

pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix

@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
   meta = with lib; {
     description = "Command-line tool to delete merged Git branches";
     homepage = "https://pypi.org/project/git-delete-merged-branches/";
-    license = licenses.gpl3;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }

pkgs/applications/version-management/git-and-tools/git-extras/default.nix

@@ -1,11 +1,13 @@
-{ lib, stdenv, fetchzip, unixtools, which }:
+{ lib, stdenv, fetchFromGitHub, unixtools, which }:
 
 stdenv.mkDerivation rec {
   pname = "git-extras";
   version = "6.1.0";
 
-  src = fetchzip {
-    url = "https://github.com/tj/git-extras/archive/${version}.tar.gz";
+  src = fetchFromGitHub {
+    owner = "tj";
+    repo = "git-extras";
+    rev = version;
     sha256 = "12ff9rhgqd71xm72r385hx0h8g75hz0ag0adzqcwfa54k0lhrrrz";
   };
 
@@ -29,6 +31,6 @@ stdenv.mkDerivation rec {
     description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = [ maintainers.spwhitt maintainers.cko ];
+    maintainers = with maintainers; [ spwhitt cko ];
   };
 }

pkgs/applications/version-management/git-and-tools/tig/default.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   # those files are inherently impure, we'll handle the corresponding dependencies.
   postPatch = ''
-      rm -f contrib/config.make-*
+      rm contrib/config.make-*
   '';
 
   enableParallelBuilding = true;
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     homepage = "https://jonas.github.io/tig/";
     description = "Text-mode interface for git";
     maintainers = with maintainers; [ bjornfor domenkozar qknight globin ];
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.unix;
   };
 }

pkgs/development/libraries/libcanberra/default.nix

@@ -47,22 +47,21 @@ stdenv.mkDerivation rec {
     gtkModule = "/lib/gtk-2.0/";
   };
 
-  meta = {
+  meta = with lib; {
     description = "An implementation of the XDG Sound Theme and Name Specifications";
-
     longDescription = ''
       libcanberra is an implementation of the XDG Sound Theme and Name
       Specifications, for generating event sounds on free desktops
       such as GNOME.  It comes with several backends (ALSA,
       PulseAudio, OSS, GStreamer, null) and is designed to be
       portable.
     '';
-
     homepage = "http://0pointer.de/lennart/projects/libcanberra/";
-
-    license = lib.licenses.lgpl2Plus;
-
+    license = licenses.lgpl2Plus;
     maintainers = [ ];
-    platforms = lib.platforms.unix;
+    platforms = platforms.unix;
+    # canberra-gtk-module.c:28:10: fatal error: 'gdk/gdkx.h' file not found
+    # #include <gdk/gdkx.h>
+    broken = stdenv.isDarwin;
   };
 }

pkgs/development/python-modules/nmigen-boards/default.nix

@@ -26,6 +26,9 @@ buildPythonPackage rec {
     export SETUPTOOLS_SCM_PRETEND_VERSION="${realVersion}"
   '';
 
+  # no tests
+  doCheck = false;
+
   meta = with lib; {
     description = "Board and connector definitions for nMigen";
     homepage = "https://github.com/nmigen/nmigen-boards";

pkgs/development/python-modules/python-xmp-toolkit/default.nix

@@ -35,6 +35,9 @@ buildPythonPackage {
       --replace "ctypes.util.find_library('exempi')" "'${exempi}/lib/libexempi${stdenv.hostPlatform.extensions.sharedLibrary}'"
   '';
 
+  # hangs on darwin + sandbox
+  doCheck = !stdenv.isDarwin;
+
   meta = with lib; {
     homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit";
     description = "Python XMP Toolkit for working with metadata";

pkgs/development/python-modules/transmissionrpc/default.nix

@@ -15,10 +15,12 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ six ];
 
+  # no tests
+  doCheck = false;
+
   meta = with lib; {
     description = "Python implementation of the Transmission bittorent client RPC protocol";
     homepage = "https://pypi.python.org/pypi/transmissionrpc/";
     license = licenses.mit;
   };
-
 }