Merge pull request #205689 from panicgh/minizip2

minizip2 -> minizip-ng: 2.10.6 -> 3.0.7

authored by Robert Scott and committed by GitHub a8ce5381 41064f42

+82 -34
+3 -3
pkgs/applications/networking/instant-messengers/linphone/default.nix
··· 8 , liblinphone 9 , mediastreamer 10 , mediastreamer-openh264 11 - , minizip2 12 , mkDerivation 13 , qtgraphicaleffects 14 , qtquickcontrols2 ··· 70 mediastreamer 71 mediastreamer-openh264 72 73 - minizip2 74 qtgraphicaleffects 75 qtquickcontrols2 76 qttranslations ··· 81 ]; 82 83 cmakeFlags = [ 84 - "-DMINIZIP_INCLUDE_DIRS=${minizip2}/include" 85 "-DMINIZIP_LIBRARIES=minizip" 86 87 # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
··· 8 , liblinphone 9 , mediastreamer 10 , mediastreamer-openh264 11 + , minizip-ng 12 , mkDerivation 13 , qtgraphicaleffects 14 , qtquickcontrols2 ··· 70 mediastreamer 71 mediastreamer-openh264 72 73 + minizip-ng 74 qtgraphicaleffects 75 qtquickcontrols2 76 qttranslations ··· 81 ]; 82 83 cmakeFlags = [ 84 + "-DMINIZIP_INCLUDE_DIRS=${minizip-ng}/include" 85 "-DMINIZIP_LIBRARIES=minizip" 86 87 # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
+77
pkgs/development/libraries/minizip-ng/default.nix
···
··· 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , fetchpatch 5 + , cmake 6 + , gtest 7 + , pkg-config 8 + , zlib 9 + , bzip2 10 + , xz 11 + , zstd 12 + , openssl 13 + }: 14 + 15 + stdenv.mkDerivation (finalAttrs: { 16 + pname = "minizip-ng"; 17 + version = "3.0.7"; 18 + 19 + src = fetchFromGitHub { 20 + owner = "zlib-ng"; 21 + repo = finalAttrs.pname; 22 + rev = finalAttrs.version; 23 + sha256 = "sha256-m/zSVx8vYzLA23Cusd1p/ZSGd1mV3gM6UqDnmEXqpq4="; 24 + }; 25 + 26 + patches = [ 27 + (fetchpatch { 28 + name = "find-system-gtest.patch"; 29 + url = "https://github.com/zlib-ng/minizip-ng/commit/be23c8d3b7e2cb5ba619e60517cad277ee510fb7.patch"; 30 + sha256 = "sha256-azwrGj6kgTyTepGAmOlxDOFOwJKQE5J2bwUIn6sgKUY="; 31 + }) 32 + 33 + # otherwise signing unit tests fail 34 + (fetchpatch { 35 + name = "disable-mz-signing-by-default.patch"; 36 + url = "https://github.com/zlib-ng/minizip-ng/commit/60649ada97581afc0bc2fffc50ce402ff1e6df5d.patch"; 37 + sha256 = "sha256-bHGM4H8RPYkfAjxcS1bPohR9IFOFT0Mx4Mg34UnnD+w="; 38 + }) 39 + ]; 40 + 41 + nativeBuildInputs = [ cmake pkg-config ]; 42 + buildInputs = [ zlib bzip2 xz zstd openssl ]; 43 + 44 + cmakeFlags = [ 45 + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" 46 + "-DMZ_OPENSSL=ON" 47 + "-DMZ_BUILD_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" 48 + "-DMZ_BUILD_UNIT_TESTS=${if finalAttrs.doCheck then "ON" else "OFF"}" 49 + ] ++ lib.optionals stdenv.isDarwin [ 50 + # missing header file 51 + "-DMZ_LIBCOMP=OFF" 52 + ]; 53 + 54 + postInstall = let 55 + libext = if stdenv.hostPlatform.isStatic then ".a" else ".so"; 56 + in '' 57 + # make lib findable as libminizip-ng even if compat is enabled 58 + if [ ! -e $out/lib/libminizip-ng${libext} ]; then 59 + ln -s $out/lib/libminizip${libext} $out/lib/libminizip-ng${libext} 60 + fi 61 + if [ ! -e $out/include/minizip-ng ]; then 62 + ln -s $out/include $out/include/minizip-ng 63 + fi 64 + ''; 65 + 66 + doCheck = stdenv.buildPlatform == stdenv.hostPlatform; 67 + checkInputs = [ gtest ]; 68 + enableParallelChecking = false; 69 + 70 + meta = with lib; { 71 + description = "Fork of the popular zip manipulation library found in the zlib distribution"; 72 + homepage = "https://github.com/zlib-ng/minizip-ng"; 73 + license = licenses.zlib; 74 + maintainers = with maintainers; [ gebner ris ]; 75 + platforms = platforms.unix; 76 + }; 77 + })
-30
pkgs/development/libraries/minizip2/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, cmake, pkg-config, zlib, bzip2, xz, zstd, openssl }: 2 - 3 - stdenv.mkDerivation rec { 4 - pname = "minizip"; 5 - version = "2.10.6"; 6 - 7 - src = fetchFromGitHub { 8 - owner = "nmoinvaz"; 9 - repo = pname; 10 - rev = version; 11 - sha256 = "sha256-OAm4OZeQdP2Q/UKYI9bR7OV9RmLmYF/j2NpK5TPoE60="; 12 - }; 13 - 14 - nativeBuildInputs = [ cmake pkg-config ]; 15 - 16 - cmakeFlags = [ 17 - "-DBUILD_SHARED_LIBS=YES" 18 - "-DMZ_OPENSSL=ON" 19 - ]; 20 - 21 - buildInputs = [ zlib bzip2 xz zstd openssl ]; 22 - 23 - meta = with lib; { 24 - description = "Compression library implementing the deflate compression method found in gzip and PKZIP"; 25 - homepage = "https://github.com/nmoinvaz/minizip"; 26 - license = licenses.zlib; 27 - maintainers = with maintainers; [ gebner ]; 28 - platforms = platforms.unix; 29 - }; 30 - }
···
+1
pkgs/top-level/aliases.nix
··· 946 minetestserver_4 = throw "minetestserver_4 has been removed from Nixpkgs; current version is available at minetestserver"; # added 2022-02-01 947 minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14 948 miniupnpc_1 = throw "miniupnpc_1 has been removed; current version is available at miniupnpc"; # Added 2022-10-30 949 mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15 950 mlt-qt5 = throw "'mlt-qt5' has been renamed to/replaced by 'libsForQt5.mlt'"; # Converted to throw 2022-02-22 951 mobile_broadband_provider_info = throw "'mobile_broadband_provider_info' has been renamed to/replaced by 'mobile-broadband-provider-info'"; # Converted to throw 2022-02-22
··· 946 minetestserver_4 = throw "minetestserver_4 has been removed from Nixpkgs; current version is available at minetestserver"; # added 2022-02-01 947 minetime = throw "minetime has been removed from nixpkgs, because it was discontinued 2021-06-22"; # Added 2021-10-14 948 miniupnpc_1 = throw "miniupnpc_1 has been removed; current version is available at miniupnpc"; # Added 2022-10-30 949 + minizip2 = pkgs.minizip-ng; # Added 2022-12-28 950 mist = throw "mist has been removed as the upstream project has been abandoned, see https://github.com/ethereum/mist#mist-browser-deprecated"; # Added 2020-08-15 951 mlt-qt5 = throw "'mlt-qt5' has been renamed to/replaced by 'libsForQt5.mlt'"; # Converted to throw 2022-02-22 952 mobile_broadband_provider_info = throw "'mobile_broadband_provider_info' has been renamed to/replaced by 'mobile-broadband-provider-info'"; # Converted to throw 2022-02-22
+1 -1
pkgs/top-level/all-packages.nix
··· 21724 21725 minizip = callPackage ../development/libraries/minizip { }; 21726 21727 - minizip2 = callPackage ../development/libraries/minizip2 { }; 21728 21729 mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { }; 21730
··· 21724 21725 minizip = callPackage ../development/libraries/minizip { }; 21726 21727 + minizip-ng = callPackage ../development/libraries/minizip-ng { }; 21728 21729 mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { }; 21730