Merge master into staging-next

2021-05-17 06:22:23 +00:00
parent d8e62d8e41 e906410c9a
commit 3ff6965554
154 changed files with 1062 additions and 1089 deletions
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "ace";
-  version = "7.0.1";
+  version = "7.0.2";

  src = fetchurl {
    url = "https://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
-    sha256 = "sha256-5nH5a0tBOcGfA07eeh9EjH0vgT3gTRWYHXoeO+QFQjQ=";
+    sha256 = "sha256-IftPSQOrZOqMLHHlUFEFa3WcvsqN5kdS5rSlGE8ETC4=";
  };

  enableParallelBuilding = true;
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
    description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto";
    homepage = "https://github.com/ethereum/ethash";
    platforms = platforms.unix;
-    maintainers = with maintainers; [ nand0p ];
+    maintainers = with maintainers; [ ];
    license = licenses.asl20;
  };
 }
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
+{ lib, stdenv, fetchurl, libjpeg, libtiff, zlib
 , postgresql, libmysqlclient, libgeotiff, python2Packages, proj, geos, openssl
 , libpng, sqlite, libspatialite, poppler, hdf4, qhull, giflib, expat
 , libiconv, libxml2
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
    sha256 = "1n6w0m2603q9cldlz0wyscp75ci561dipc36jqbf3mjmylybv0x3";
  };

-  nativeBuildInputs = [ unzip ];
  buildInputs = [ libjpeg libtiff libgeotiff libpng proj openssl sqlite
    libspatialite poppler hdf4 qhull giflib expat libxml2 proj ]
  ++ (with python2Packages; [ python numpy wrapPython ])
@@ -16,6 +16,6 @@ stdenv.mkDerivation {
    description = "Original Bluecurve engine from Red Hat's artwork package";
    license = lib.licenses.gpl2;
    platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.gnidorah ];
+    maintainers = [ ];
  };
 }
@@ -1,10 +1,10 @@
-{ lib, mkDerivation, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }:
+{ lib, mkDerivation, fetchFromGitHub, qmake, qtmultimedia, qtbase }:

 mkDerivation rec {
  version = "unstable-20-06-26";
  pname = "herqq";

-  nativeBuildInputs = [ qmake unzip ];
+  nativeBuildInputs = [ qmake ];
  buildInputs = [ qtbase qtmultimedia ];

  outputs = [ "out" "dev" ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
    description = "Hot patching executables on Linux using .so file injection";
    homepage = src.meta.homepage;
    license = licenses.bsd3;
-    maintainers = [ maintainers.gnidorah ];
+    maintainers = [ ];
    platforms = ["i686-linux" "x86_64-linux"];
  };
 }
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, libGLU, libGL, unzip, libXrandr, libX11, libXxf86vm }:
+{ lib, stdenv, fetchzip, libGLU, libGL, libXrandr, libX11, libXxf86vm }:

 let
  common = import ./common.nix { inherit fetchzip; };
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
    mkdir -p $out/lib
  '';

-  nativeBuildInputs = [ unzip ];
  buildInputs = [ libGLU libGL libXrandr libX11 libXxf86vm ];

  meta = {
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, libGLU, libGL, unzip, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:
+{ lib, stdenv, fetchzip, libGLU, libGL, fetchFromGitHub, cmake, Cocoa, OpenGL, IOKit }:

 let
  common = import ./common.nix { inherit fetchzip; };
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
    "-DIRRLICHT_BUILD_TOOLS=OFF"
  ];

-  nativeBuildInputs = [ cmake unzip ];
+  nativeBuildInputs = [ cmake ];
  buildInputs = [ OpenGL Cocoa IOKit ];

  meta = {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
    inherit version;
    homepage = "https://github.com/open-source-parsers/jsoncpp";
    description = "A C++ library for interacting with JSON";
-    maintainers = with maintainers; [ ttuegel cpages nand0p ];
+    maintainers = with maintainers; [ ttuegel cpages ];
    license = licenses.mit;
    platforms = platforms.all;
  };
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
    description = "C++11 library, utilities and python bindings for Linux kernel mode setting";
    homepage = "https://github.com/tomba/kmsxx";
    license = licenses.mpl20;
-    maintainers = with maintainers; [ gnidorah ];
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
    broken = true; # marked broken 2021-03-26
  };
@@ -1,4 +1,4 @@
-{  lib, stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid,
+{  lib, stdenv, fetchFromGitHub, libX11, cmake, ois, freetype, libuuid,
   boost, pkg-config, withOgre ? false, ogre ? null, libGL, libGLU ? null } :

 let
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
    sha256 = "0a4zi8w18pjj813n7kmxldl1d9r1jp0iyhkw7pbqgl8f7qaq994w";
  };

-  nativeBuildInputs = [ cmake pkg-config unzip ];
+  nativeBuildInputs = [ cmake pkg-config ];
  buildInputs = [ libX11 ois freetype libuuid boost ]
    ++ (if withOgre then [ ogre ] else [ libGL libGLU ]);

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }:
+{ lib, stdenv, fetchFromGitHub, re2, openfx, zlib, ilmbase, libGLU, libGL, openexr }:

 stdenv.mkDerivation {
  pname = "openexrid-unstable";
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
                       -I${openfx.dev}/include/OpenFX
                      '';

-  nativeBuildInputs = [ unzip ];
  buildInputs = [ re2 openfx zlib ilmbase libGLU libGL openexr ];

  enableParallelBuilding = true;
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, unzip }:
+{ lib, stdenv, fetchFromGitHub }:

 stdenv.mkDerivation {
  pname = "openfx";
@@ -11,8 +11,6 @@ stdenv.mkDerivation {
    sha256 = "0k9ggzr6bisn77mipjfvawg3mv4bz50b63v8f7w1jhldi1sfy548";
  };

-  nativeBuildInputs = [ unzip ];
-
  outputs = [ "dev" "out" ];

  enableParallelBuilding = true;
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, unzip, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:
+{ lib, stdenv, fetchFromGitHub, openexr, boost, jemalloc, c-blosc, ilmbase, tbb }:

 stdenv.mkDerivation rec
 {
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec

  outputs = [ "out" ];

-  nativeBuildInputs = [ unzip ];
  buildInputs = [ openexr boost tbb jemalloc c-blosc ilmbase ];

  setSourceRoot = ''
@@ -83,13 +83,13 @@ stdenv.mkDerivation rec {
    cmake
    autoPatchelfHook
    addOpenGLRunpath
+    unzip
  ];

  buildInputs = [
    git
    protobuf
    opencv
-    unzip
    python
    tbb
    shellcheck
@@ -123,7 +123,7 @@ in stdenv.mkDerivation {
    '';
    license = licenses.unfree;
    platforms = [ "x86_64-linux" "x86_64-darwin" ];
-    maintainers = with maintainers; [ pesterhazy flokli ];
+    maintainers = with maintainers; [ flokli ];
    hydraPlatforms = [];
  };
 }
@@ -31,7 +31,7 @@ mkDerivation {
    description = "Additional style plugins for Qt5, including BB10, GTK, Cleanlooks, Motif, Plastique";
    homepage = "http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/";
    license = licenses.lgpl21;
-    maintainers = [ maintainers.gnidorah ];
+    maintainers = [ ];
    platforms = platforms.linux;
  };
 }
@@ -22,7 +22,7 @@ let
      inherit description homepage;
      downloadPage = http://sqlite.org/download.html;
      license = licenses.publicDomain;
-      maintainers = with maintainers; [ pesterhazy johnazoidberg ];
+      maintainers = with maintainers; [ johnazoidberg ];
      platforms = platforms.unix;
    };
  };