neko: 2.3.0 -> 2.4.1, modernize (#411071)

authored by K900 and committed by GitHub c529ad0c e168e0d4

+24 -29
+24 -29
pkgs/by-name/ne/neko/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 - fetchpatch, 6 5 boehmgc, 7 6 zlib, 8 7 sqlite, 9 - pcre, 8 + pcre2, 10 9 cmake, 11 10 pkg-config, 12 11 git, ··· 14 13 apr, 15 14 aprutil, 16 15 libmysqlclient, 17 - mbedtls_2, 16 + mbedtls, 18 17 openssl, 19 - pkgs, 20 - gtk2, 18 + gtk3, 21 19 libpthreadstubs, 20 + nix-update-script, 22 21 }: 23 22 24 23 stdenv.mkDerivation rec { 25 24 pname = "neko"; 26 - version = "2.3.0"; 25 + version = "2.4.1"; 27 26 28 27 src = fetchFromGitHub { 29 28 owner = "HaxeFoundation"; 30 29 repo = "neko"; 31 30 rev = "v${lib.replaceStrings [ "." ] [ "-" ] version}"; 32 - sha256 = "19rc59cx7qqhcqlb0znwbnwbg04c1yq6xmvrwm1xi46k3vxa957g"; 31 + hash = "sha256-cTu+AlDnpXAow6jM77Ct9DM8p//z6N1utk7Wsd+0g9U="; 33 32 }; 34 33 35 - patches = [ 36 - # https://github.com/HaxeFoundation/neko/pull/224 37 - (fetchpatch { 38 - url = "https://github.com/HaxeFoundation/neko/commit/ff5da9b0e96cc0eabc44ad2c10b7a92623ba49ee.patch"; 39 - sha256 = "sha256-isM7QGPiyXgT2zpIGd+r12vKg7I1rOWYTTWxuECafro="; 40 - }) 41 - ]; 42 - 43 34 nativeBuildInputs = [ 44 35 cmake 45 36 pkg-config ··· 49 40 boehmgc 50 41 zlib 51 42 sqlite 52 - pcre 43 + pcre2 53 44 apacheHttpd 54 45 apr 55 46 aprutil 56 47 libmysqlclient 57 - mbedtls_2 48 + mbedtls 58 49 openssl 59 50 libpthreadstubs 60 - ] ++ lib.optional stdenv.hostPlatform.isLinux gtk2; 51 + ] ++ lib.optional stdenv.hostPlatform.isLinux gtk3; 61 52 cmakeFlags = [ "-DRUN_LDCONFIG=OFF" ]; 53 + 62 54 env = lib.optionalAttrs stdenv.cc.isClang { 63 55 NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; 64 56 }; ··· 73 65 dontPatchELF = true; 74 66 dontStrip = true; 75 67 76 - meta = with lib; { 68 + passthru.updateScript = nix-update-script { }; 69 + 70 + meta = { 77 71 description = "High-level dynamically typed programming language"; 78 72 homepage = "https://nekovm.org"; 79 73 license = [ 80 74 # list based on https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE 81 - licenses.gpl2Plus # nekoc, nekoml 82 - licenses.lgpl21Plus # mysql.ndll 83 - licenses.bsd3 # regexp.ndll 84 - licenses.zlib # zlib.ndll 85 - licenses.asl20 # mod_neko, mod_tora, mbedTLS 86 - licenses.mit # overall, other libs 75 + lib.licenses.gpl2Plus # nekoc, nekoml 76 + lib.licenses.lgpl21Plus # mysql.ndll 77 + lib.licenses.bsd3 # regexp.ndll 78 + lib.licenses.zlib # zlib.ndll 79 + lib.licenses.asl20 # mod_neko, mod_tora, mbedTLS 80 + lib.licenses.mit # overall, other libs 87 81 "https://github.com/HaxeFoundation/neko/blob/v2-3-0/LICENSE#L24-L40" # boehm gc 88 82 ]; 89 - maintainers = [ 90 - maintainers.marcweber 91 - maintainers.locallycompact 83 + maintainers = with lib.maintainers; [ 84 + marcweber 85 + locallycompact 92 86 ]; 93 - platforms = platforms.linux ++ platforms.darwin; 87 + platforms = lib.platforms.linux ++ lib.platforms.darwin; 88 + broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform; 94 89 }; 95 90 }