diff options
Diffstat (limited to 'pkgs/development')
21 files changed, 349 insertions, 203 deletions
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index 0a748647a1f..e3c1791de6f 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -74,20 +74,20 @@ in { inherit wrapFlutter; stable = mkFlutter { - version = "3.13.0"; - engineVersion = "1ac611c64eadbd93c5f5aba5494b8fc3b35ee952"; - dartVersion = "3.1.0"; + version = "3.13.4"; + engineVersion = "9064459a8b0dcd32877107f6002cc429a71659d1"; + dartVersion = "3.1.2"; dartHash = { - x86_64-linux = "sha256-sGpRyuUTkZ0cpG/O21NCHaOsQRjNklsl9G6Ia1tZxAw="; - aarch64-linux = "sha256-wcDtL/Lh0NFC01QlnKwx8ovTHZ5ww+rb1sELn92R1uU="; - x86_64-darwin = "sha256-h+e7ABlLWCxc6wrbjiy5lgp6O/DnNKdXFNJtgnXBZNA="; - aarch64-darwin = "sha256-sAWnd09mbcRLP0WjSjjWF7+WQ7LP3tWsq5Kqw8e4APg="; + x86_64-linux = "sha256-kriMqIvS/ZPhCR+hDTZReW4MMBYCVzSO9xTuPrJ1cPg="; + aarch64-linux = "sha256-Fvg9Rr9Z7LYz8MjyzVCZwCzDiWPLDvH8vgD0oDZTksw="; + x86_64-darwin = "sha256-WL42AYjT2iriVP05Pm7288um+oFwS8o8gU5tCwSOvUM="; + aarch64-darwin = "sha256-BMbjSNJuh3RC+ObbJf2l6dacv2Hsn2/uygKDrP5EiuU="; }; flutterHash = rec { - x86_64-linux = "sha256-gXNQ9RuHVC/3puHNygWPRdezx8iiKmiOnxQmoX6XUFo="; + x86_64-linux = "sha256-BPEmO4c3H2bOa+sBAVDz5/qvajobK3YMnBfQWhJUydw="; aarch64-linux = x86_64-linux; - x86_64-darwin = "sha256-vI8TsXIfTg4PYf5dzxDaJt+PIdmVFBmd2slKK7c1By0="; - aarch64-darwin = "sha256-VhGJlp+HG8QLZx8u0xK+cgbneoDM7zhNvm3Oco4nBms="; + x86_64-darwin = "sha256-BpxeCE9vTnmlIp6OS7BTPkOFptidjXbf2qVOVUAqstY="; + aarch64-darwin = "sha256-rccuxrE9nzC86uKGL96Etxxs4qMbVXJ1jCn/wjp9WlQ="; }; patches = flutter3Patches; }; diff --git a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix index e3dc7864662..b027a2a8ce9 100644 --- a/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix +++ b/pkgs/development/compilers/flutter/engine-artifacts/hashes.nix @@ -1,118 +1,119 @@ { - "1ac611c64eadbd93c5f5aba5494b8fc3b35ee952" = { + "9064459a8b0dcd32877107f6002cc429a71659d1" = { skyNotice = "sha256-bJMktK26wC9fVzdhLNcTHqOg5sHRZ535LB5u5dgwjlY="; flutterNotice = "sha256-pZjblLYpD/vhC17PkRBXtqlDNRxyf92p5fKJHWhwCiA="; android-arm = { - "artifacts.zip" = "sha256-rAWcm/vjJ7P9q69z0bZNhBv/NO+sGhFJe+r/BHPR1To="; + "artifacts.zip" = "sha256-AABHJH/EOOQzEcD0O/XftA1AAV8tNFX3dj0OsJJ3/9A="; }; android-arm-profile = { - "artifacts.zip" = "sha256-08+LDA7qNcMFH4xk+WfAXYqIDueCSHNmD/i/XaDeTrA="; - "linux-x64.zip" = "sha256-LWdrWdSGDAfX0gGtqQ2mSschBW3EAgaBldL/Cw99ft8="; - "darwin-x64.zip" = "sha256-FeBLBp3U2BPun/iPpTmHvaj3ZO8l7DQhwArqKN+D1m0="; + "artifacts.zip" = "sha256-MLlQFtjrGDQc3mH2T7CUlR/wDOPS7HRfgUuoLXjtd+E="; + "linux-x64.zip" = "sha256-S2/5ZFhNkDxUqsUZCFrwTERTUZIZpOiFijhcLZnozLI="; + "darwin-x64.zip" = "sha256-IwtYSpcg+5JmnkHuj6LGVp7GWiuUzETOPgKYRQczWzc="; }; android-arm-release = { - "artifacts.zip" = "sha256-VCWSWfL74PJ6F6N18mOHjOkN8oTkL8coDfemV0Pc/Fw="; - "linux-x64.zip" = "sha256-xtQJ9merALKe20LZai+5ApJNOXR3uweIYQFWSyjmBEE="; - "darwin-x64.zip" = "sha256-YuEY7ZQAqpo0wbvI/iK3YYUSguZGi/wSl/DLPzmlNj8="; + "artifacts.zip" = "sha256-NLvwaB4UkYBRzg4cxzNZkileDFQk6GT/8nRugHU98Is="; + "linux-x64.zip" = "sha256-dua4xvVqsJY1d/eyA8j6NPnpAbotigPIs8SRj28F87w="; + "darwin-x64.zip" = "sha256-2B1+s6sngbN0+sPP1qKVpeMF6RIZZToF88baiqcNQT4="; }; android-arm64 = { - "artifacts.zip" = "sha256-z4gvkNofQaFv8tFAXcLepsge9CV1T7cBe3EZRdBT7Ms="; + "artifacts.zip" = "sha256-Hf+S8XuAzD9HCU4FVmjN0jvTTxPtzEm+k++8IgaXOyM="; }; android-arm64-profile = { - "artifacts.zip" = "sha256-7DHKcgwdaG6+MH7uVqSk2UGxLM4VsHVk5vUtYMn11kQ="; - "linux-x64.zip" = "sha256-3ZahRPzDVBff2pGUjjoIABH1lmwyrx05GnaJNyF4OiY="; - "darwin-x64.zip" = "sha256-Pmil9S314EoWJhfo0nrtBh1VLUeiavKvp/LIPZJoy6U="; + "artifacts.zip" = "sha256-k4miTzdDL+gg9LxzjBVRtAuwhKELBiVDsvQ+aVeWTeI="; + "linux-x64.zip" = "sha256-2ErIxNdX1NfHrjiqZzNwISKybeS9SGOlqFh7G8KCAcE="; + "darwin-x64.zip" = "sha256-1FdvI6llPjAeSc7+e97rvG7SvvFHqZH+4MREuRyF1DA="; }; android-arm64-release = { - "artifacts.zip" = "sha256-GI+ADau8sbD9+ctXrciraeXNPGMto2+bBDyJcKt9YTE="; - "linux-x64.zip" = "sha256-riHs2bbOFNH7VqD3snEu5RuKrMqbsuFnDBZ9Apxq/+g="; - "darwin-x64.zip" = "sha256-DwTskXkcNqNsU3I+t9UMvKjxG4O2mN4cUGLB4dSWBHM="; + "artifacts.zip" = "sha256-y64Xhi5QFirZadU+fW8MOpkEarq/KPoEmmo0XRYf3/E="; + "linux-x64.zip" = "sha256-8dKrP9wQ9hDHNNrz1ZiYLV6zeGB60ikyrRFS6xdu+4Q="; + "darwin-x64.zip" = "sha256-2/eyFFAAUnuDtDoVh6L5emRXaQ03kwNRf6yIceWX3eU="; }; android-x64 = { - "artifacts.zip" = "sha256-0dkDhr/TJi4ROcN1BV1OsUwWSnZuEHzgM0DKSeUIrnA="; + "artifacts.zip" = "sha256-b3AtOxad05vaXQzeCBtSf3G8ZiM0tOG0JRu4vbNtfgI="; }; android-x64-profile = { - "artifacts.zip" = "sha256-2g+GaZHO17/rLa6Y1DHfDEq0Q05NRxQ5ese2Eo5rvNA="; - "linux-x64.zip" = "sha256-O3bHS/UHz8ymXq8ZEutLIj7K8wVTdt7vTo3OLGAkkh8="; - "darwin-x64.zip" = "sha256-vEzg6vxm1CbvVBSAoWwZhAS/bsuDlesmo30zWwK2a7g="; + "artifacts.zip" = "sha256-TVOtSjKc8WkvYsY+aK7OH9eTA/q7tmtnSdQArPWS2vM="; + "linux-x64.zip" = "sha256-IHv3TGI1Yvhoq1ehVyVUn3JtPTCFyEtxdysvr/SWFxY="; + "darwin-x64.zip" = "sha256-B4XooSrLRJh3XADfIAv/YBDCT/Mpg2di0oE4SZlU8I8="; }; android-x64-release = { - "artifacts.zip" = "sha256-nlYI2ffULiDrehOSFEZkZoav/RJ0VykwREQkUwNX2/I="; - "linux-x64.zip" = "sha256-iUy8tjpkFd3V/RIVRPbNNEsa/GAXhtLsNAkEOvdKhks="; - "darwin-x64.zip" = "sha256-xZf2f4L/hSJEN63hQqtP0rbXkB2iw/Co4vLXYe/oeI4="; + "artifacts.zip" = "sha256-EaImhQlUnG/zYHDROkdgQdGHD9AfDJULowS785aVoCM="; + "linux-x64.zip" = "sha256-ZBvtCVUNf0D1P1lz4vmIrhsn9hZmJZ5Tn65v9Wot6bk="; + "darwin-x64.zip" = "sha256-IbMANAKyz7uFG5oqOKMj0KTVhaCBryBKdobvgS9bOgI="; }; android-x86 = { - "artifacts.zip" = "sha256-OIB7VnhCasOflVtGFOe1DgCLP4Os82R6H7ucp0Wrez0="; + "artifacts.zip" = "sha256-ElFkaxlyLVbexdocyQ1AIKgfr93ol1EDyf+aFDt4I10="; }; android-x86-jit-release = { - "artifacts.zip" = "sha256-dyjGkQJu73sOaxKvmIlbS5j0zO78RXHZrJQVi7qpBAU="; + "artifacts.zip" = "sha256-ptrhyXrx8xGuRQYs8nBryzyDuCiIMsgMmqxi3kHXQ4s="; }; darwin-arm64 = { - "artifacts.zip" = "sha256-Ro+N5e5RhXgfqVDSEvqCKPdXRK1QnYCvIqmtlEW4s8c="; - "font-subset.zip" = "sha256-yCboANBEarWZDtoTwDFbtnlsPW2kPwZ5Jp31V2hbga4="; + "artifacts.zip" = "sha256-nG23DmYeKoMJnuTPMnvouPHzK3XNKBrEIZ5zijiCoAg="; + "font-subset.zip" = "sha256-Kx3G5FmN2bVgIvYiQP9og8kgl28ZCXThpcmByAv+f6U="; }; darwin-arm64-profile = { - "artifacts.zip" = "sha256-Lf3LLkRhtGNA9cWZwv4Q9MncXzOoVCgmp+6osWRUCE0="; + "artifacts.zip" = "sha256-Uzg5F2NPlVN/cui4ixJ3JxBttn0KQMEyKEVLmecssuU="; }; darwin-arm64-release = { - "artifacts.zip" = "sha256-6BSQ2zodrQmZKkHeaGVVT4D7jNekhwNOul5C6qwLbO8="; + "artifacts.zip" = "sha256-qZ1jYvvkBcaIHqZszFTOcuCDWnEmm/vsJt2aSZvgO+s="; }; darwin-x64 = { - "FlutterEmbedder.framework.zip" = "sha256-4jYk+aYjOS/CZajS1oVBexg2+C9fy0OmfaI6i3rrhXo="; - "FlutterMacOS.framework.zip" = "sha256-Im7DTFf1zXrG6n1OtM4Jixd992mS2r47GRnAa7/urNc="; - "artifacts.zip" = "sha256-SdnPPnx4NOfOlJU1234977/cVRCa/5KTI/1kqCtTxG0="; - "font-subset.zip" = "sha256-F7qt7X0FNXODb3rvTkXacK3wG/aEVn+ny8DHFL3gEkI="; - "gen_snapshot.zip" = "sha256-czdCi1cPdD/nu0LJIsgUj42O6D5x5xTKfM8l/UiKZqw="; + "FlutterEmbedder.framework.zip" = "sha256-6ApkTiLh++bwgfYOGRoqnXglboqCWxc0VpNcYitjLLk="; + "FlutterMacOS.framework.zip" = "sha256-PP2E+PY1HB2OkX8a8/E/HpUBPRoDJyo/2BNUKd1Xd2s="; + "artifacts.zip" = "sha256-aZf99m1KlIpEuwwMMWAksp9d/SQQXt8jOTs/6GJUhcw="; + "font-subset.zip" = "sha256-ZfdDnRPDOqNsj3dCHStLWXWCMOzodmR4ojQrMQt6hQY="; + "gen_snapshot.zip" = "sha256-1xi4EJsiOIJSaBSIhl7p4L0aWtLYR1vGz4yYzNdVuQw="; }; darwin-x64-profile = { - "FlutterMacOS.framework.zip" = "sha256-gdfoq6jdHFDb2JXCf45qJ2ekTildUptLb/k0XuHYuh8="; - "artifacts.zip" = "sha256-aEoenQh0Q8xuLU6OeFND3GBbOvhMNsovbbFQwQfudm0="; - "gen_snapshot.zip" = "sha256-tY3qmpdF7MP4iEfqgouzLehr901H3QTLxeV28RoLPDY="; + "FlutterMacOS.framework.zip" = "sha256-zDTey1dN4TYfi2/tDlxHPZhW3szZuGTMSaObNNH4zZo="; + "artifacts.zip" = "sha256-kZ6io/+ohx5jKhu1i/l0UZbTB1gk6BSn1VryZJxPcjU="; + "gen_snapshot.zip" = "sha256-5AUul5CQ6A8YGb6/PAfbPH7G/c+9rElDftmL3WIi4ZQ="; }; darwin-x64-release = { - "FlutterMacOS.dSYM.zip" = "sha256-dNlx9PsXeJeV6FMPOliRyuc5p58DeEmXus2zP1dOqPs="; - "FlutterMacOS.framework.zip" = "sha256-ibmcuVjd3kswmUvXzZi8vl5uNEbnWvMAwzWYxs8i1zw="; - "artifacts.zip" = "sha256-KCXwR/ZZK1jyLQaIAsb+wAz4awVU1QozydIQt10M30A="; - "gen_snapshot.zip" = "sha256-hZT+IMHbvSTjk2WcNvfPl+vdXZ2vbB/MjiYP1Q+cKD8="; + "FlutterMacOS.dSYM.zip" = "sha256-DN5R/U+pcCgFyR6wLcp11Bjvov4sS0J3crMWOx0dNBI="; + "FlutterMacOS.framework.zip" = "sha256-9rEkGe0iz51aVXtCXK+KolJqjNUOEMwjeRHdF6kBjPs="; + "artifacts.zip" = "sha256-Lpz0WLAdspPybLhTnS2fsReTAZ0qkJmMvY+u8iCe53s="; + "gen_snapshot.zip" = "sha256-RLO5V6B/xzI5ljbIY7Yj4m1aFYYJ0PeO6nAyAN/ufnM="; }; - "flutter_patched_sdk.zip" = "sha256-vm9Zt+obBuYHQchQlqlinGYg9mwmoo41HwqYzy8QXP0="; - "flutter_patched_sdk_product.zip" = "sha256-JjMQ2zEGXKIcyYqYfCxDYlRbwglVMQ8H1zs5h6To1es=" + "flutter_patched_sdk.zip" = "sha256-d1KBJex2XgFbM0GgtcMFGDG2MN00zPd5HyAP54vBIaw="; + "flutter_patched_sdk_product.zip" = "sha256-TG0OfcYQHy7Um1nl7xHXGl0oGGkna1tKSWhtnLTo2Ic=" ; ios = { - "artifacts.zip" = "sha256-9/GWCsOvwEXVWYMYn48sZTe44GhB2JBJtPDRFUqgTek="; + "artifacts.zip" = "sha256-bTtAJ4mrJZmT9IcDppfvm1ih3lNqJqywgatN3k48hoI="; }; ios-profile = { - "artifacts.zip" = "sha256-XZ4AFdG60gUx2xv3qZdk8Hh/0ZuIeJXeBxBoWlmhP4I="; + "artifacts.zip" = "sha256-4bqMbZ0ASURIRp6Zfs25Nww+5FasRqdXcppX2KSWK0g="; }; ios-release = { - "Flutter.dSYM.zip" = "sha256-QWCVU518mUHDXDdUm58XfS1TWYNkXI8LnfOIZ0PYLjs="; - "artifacts.zip" = "sha256-tFmIpEogaqCcx4ftVRah3Bw3CeB0dTku0xUMvUVfR00="; + "Flutter.dSYM.zip" = "sha256-LsYX9BTj9FXaW4f+7q6S/raZNx97FmGdJvegYrFiCAc="; + "artifacts.zip" = "sha256-KZBpNSeXCqfRydOdFzcaYdde3OCw7oI7x9/1l/4WlSk="; }; linux-arm64 = { - "artifacts.zip" = "sha256-MFsYOUIYLRINLNOjsDLFX4WPwcW3FTQ7P55/i8xQqcI="; - "font-subset.zip" = "sha256-nIWE1Mep1R1EMS3vS31qdTybhFOCyr7/agPEjlAodOQ="; + "artifacts.zip" = "sha256-YBXe02wlxxpWT2pDUSILK/GXpKGx2vQo55E8zDOd4IQ="; + "font-subset.zip" = "sha256-02PHMUCPn6VBaQazfjEqVCGDPeGRXVTMXW8eAOuQRhY="; }; linux-arm64-debug = { - "linux-arm64-flutter-gtk.zip" = "sha256-2zYHns8gycYy7VNjXfJdf/yl71VJSDFSIMb6lQ0JuKI="; + "linux-arm64-flutter-gtk.zip" = "sha256-ZTWenA3msfvFjoPA5ByX1/kXTDtd6H0H6i8AP2K9Zt8="; }; linux-arm64-profile = { - "linux-arm64-flutter-gtk.zip" = "sha256-doGUIbTinn5kfw20NZRyph96ZkSa77Vm+y1Z/jBUi/E="; + "linux-arm64-flutter-gtk.zip" = "sha256-CDXfWkg/WHT9A8EAzo78KiUI3uN1rZyvrPSDH5fyiQU="; }; linux-arm64-release = { - "linux-arm64-flutter-gtk.zip" = "sha256-3zeRvhTZ3nFhOuiacJLTTlPBkyP1u3lh00j3e4jJpXU="; + "linux-arm64-flutter-gtk.zip" = "sha256-62dlbrqCj5mbIQXxMPzXTXHSJdJH4nao1a1c1WOSB1Y="; }; linux-x64 = { - "artifacts.zip" = "sha256-L8DrlHTLYneYo5yMdgXVZw3YikF0qBKijGVLJZJLTEA="; - "font-subset.zip" = "sha256-KC733fwlRIK6DhjAJopnKdzjaC1JhvJ8nK74x+5DtIE="; + "artifacts.zip" = "sha256-YVKajJeP6hFkLJk0HPIrEg/ig0tzkGj34z3ZA3VB8fE="; + "font-subset.zip" = "sha256-OFWcMnVi6AQoXKYcyMU8JN4/XM3OgSes0hzz8odTc8w="; }; linux-x64-debug = { - "linux-x64-flutter-gtk.zip" = "sha256-5hu5uRB4gOnZyH4zWBj/b2Flz6+5DUK2ytTHWGVfp4A="; + "linux-x64-flutter-gtk.zip" = "sha256-Z8xCDor+sBwXg63r0o7RudzoWj5AsAUkc53F6dvEsLY="; }; linux-x64-profile = { - "linux-x64-flutter-gtk.zip" = "sha256-gYGBrExyYlIl+nYnCvlGBq13bP0E5bzzM089THEqHBM="; + "linux-x64-flutter-gtk.zip" = "sha256-x7n84R4y7/jH/rUbe86Gm0oLM5aLSTB2UjjeIpRJ1zQ="; }; linux-x64-release = { - "linux-x64-flutter-gtk.zip" = "sha256-Hw/hAMohLko1AMu3sr4Dq5OwvmrBP2PPJcJRVMgy6B4="; + "linux-x64-flutter-gtk.zip" = "sha256-B/Rtkln/rLS9M1gciXRnKvhPwR6bJrjGhrE9o1waamI="; }; }; } + diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix index a650b1853fd..47b64fe4740 100644 --- a/pkgs/development/compilers/flutter/wrapper.nix +++ b/pkgs/development/compilers/flutter/wrapper.nix @@ -33,6 +33,7 @@ , makeWrapper , runCommandLocal , writeShellScript +, wrapGAppsHook , git , which , pkg-config @@ -166,30 +167,43 @@ let includeFlags = map (pkg: "-isystem ${lib.getOutput "dev" pkg}/include") (appStaticBuildDeps ++ extraIncludes); linkerFlags = (map (pkg: "-rpath,${lib.getOutput "lib" pkg}/lib") appRuntimeDeps) ++ extraLinkerFlags; in -(callPackage ./sdk-symlink.nix { }) (runCommandLocal "flutter-wrapped" +(callPackage ./sdk-symlink.nix { }) (stdenv.mkDerivation { - nativeBuildInputs = [ - makeWrapper - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; + pname = "flutter-wrapped"; + inherit (flutter) version; + + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ] + ++ lib.optionals supportsLinuxDesktop [ glib wrapGAppsHook ]; passthru = flutter.passthru // { - inherit (flutter) version; unwrapped = flutter; + inherit engineArtifacts; }; + dontUnpack = true; + dontWrapGApps = true; + + installPhase = '' + runHook preInstall + + for path in ${builtins.concatStringsSep " " (builtins.foldl' (paths: pkg: paths ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") ["lib" "share"])) [ ] pkgConfigPackages)}; do + addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path" + done + + mkdir -p $out/bin + makeWrapper '${immutableFlutter}' $out/bin/flutter \ + --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ + --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ + --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \ + --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \ + --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \ + --prefix CFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCFlags)}' \ + --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}' \ + ''${gappsWrapperArgs[@]} + + runHook postInstall + ''; + inherit (flutter) meta; -} '' - for path in ${builtins.concatStringsSep " " (builtins.foldl' (paths: pkg: paths ++ (map (directory: "'${pkg}/${directory}/pkgconfig'") ["lib" "share"])) [ ] pkgConfigPackages)}; do - addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path" - done - - mkdir -p $out/bin - makeWrapper '${immutableFlutter}' $out/bin/flutter \ - --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \ - --suffix PATH : '${lib.makeBinPath (tools ++ buildTools)}' \ - --suffix PKG_CONFIG_PATH : "$FLUTTER_PKG_CONFIG_PATH" \ - --suffix LIBRARY_PATH : '${lib.makeLibraryPath appStaticBuildDeps}' \ - --prefix CXXFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCxxFlags)}' \ - --prefix CFLAGS "''\t" '${builtins.concatStringsSep " " (includeFlags ++ extraCFlags)}' \ - --prefix LDFLAGS "''\t" '${builtins.concatStringsSep " " (map (flag: "-Wl,${flag}") linkerFlags)}' -'') +}) diff --git a/pkgs/development/interpreters/expr/default.nix b/pkgs/development/interpreters/expr/default.nix index dd5f26d60cf..be783c6a041 100644 --- a/pkgs/development/interpreters/expr/default.nix +++ b/pkgs/development/interpreters/expr/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "expr"; - version = "1.15.2"; + version = "1.15.3"; src = fetchFromGitHub { owner = "antonmedv"; repo = "expr"; rev = "v${version}"; - hash = "sha256-cPgVpoixZKFVquT2XehVn+j288HWuWKeGeAaTKfoQs4="; + hash = "sha256-r+XlcDvCQarzh8wO3NL87PJThnioeVC73OZdJ8kW4RM="; }; sourceRoot = "${src.name}/repl"; - vendorHash = "sha256-bmWaSemyihr/zTQ1BE/dzCrCYdOWGzs3W3+kwrV5N0U="; + vendorHash = "sha256-WxYqP8L64U5MAYG7XTpKrRW1aaqGB4hJr+e/RKdb1lU="; ldflags = [ "-s" "-w" ]; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index f80f2f16ccd..902015ecfb6 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -45,9 +45,9 @@ in { major = "2"; minor = "7"; patch = "18"; - suffix = ".6"; # ActiveState's Python 2 extended support + suffix = ".7"; # ActiveState's Python 2 extended support }; - hash = "sha256-+I0QOBkuTHMIQz71lgNn1X1vjPsjJMtFbgC0xcGTwWY="; + hash = "sha256-zcjAoSq6491ePiDySBCKrLIyYoO/5fdH6aBTNg/NH8s="; inherit (darwin) configd; inherit passthruFun; }; @@ -96,9 +96,9 @@ in { major = "3"; minor = "12"; patch = "0"; - suffix = "rc2"; + suffix = "rc3"; }; - hash = "sha256-EesQN25rr3vqUwAfUYHq7heXeIxNtug6Bh5CI1eSdnQ="; + hash = "sha256-ljl+iR6YgCsdOZ3uPOrrm88KolZsinsczk0BlsJ3UGo="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix deleted file mode 100644 index fe1b789fc42..00000000000 --- a/pkgs/development/libraries/libburn/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation rec { - pname = "libburn"; - version = "1.5.6"; - - src = fetchurl { - url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-cpVJG0vl7qxeej+yBn4jbilV/9xrvUX1RkZu3uMhZEs="; - }; - - meta = with lib; { - description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; - homepage = "http://libburnia-project.org/"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ abbradar vrthra ]; - mainProgram = "cdrskin"; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix deleted file mode 100644 index c3fb4a05386..00000000000 --- a/pkgs/development/libraries/libisoburn/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, acl, attr, zlib, libburn, libisofs }: - -stdenv.mkDerivation rec { - pname = "libisoburn"; - version = "1.5.6"; - - src = fetchurl { - url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-K4Cm9z3WM6XSQ/rL6XoV5cmgdkSl4aJCwhm5N1pF9xs="; - }; - - buildInputs = [ attr zlib libburn libisofs ]; - propagatedBuildInputs = [ acl ]; - - meta = with lib; { - homepage = "http://libburnia-project.org/"; - description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD "; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ vrthra ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix deleted file mode 100644 index a9db714a5bb..00000000000 --- a/pkgs/development/libraries/libisofs/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, acl, attr, libiconv, zlib }: - -stdenv.mkDerivation rec { - pname = "libisofs"; - version = "1.5.6.pl01"; - - outputs = [ "out" "dev" ]; - - src = fetchurl { - url = "http://files.libburnia-project.org/releases/${pname}-${version}.tar.gz"; - hash = "sha256-rB/TONZBdEyh+xVnkXGIt5vIwlBoMt1WiF/smGVrnyU="; - }; - - buildInputs = lib.optionals stdenv.isLinux [ - acl - attr - ] ++ lib.optionals stdenv.isDarwin [ - libiconv - ] ++ [ - zlib - ]; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "http://libburnia-project.org/"; - description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ abbradar vrthra ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index e79b1a3ccb5..fe947f47077 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -29,7 +29,7 @@ final: prev: { buildInputs = [ final.node-gyp-build ]; }; - "@forge/cli" = prev."@forge/cli".override { + "@forge/cli" = prev."@forge/cli".override (old: { nativeBuildInputs = [ pkgs.pkg-config ]; buildInputs = with pkgs; [ libsecret @@ -39,7 +39,10 @@ final: prev: { darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.Security ]; - }; + meta = old.meta // { + license = lib.licenses.unfree; # unlicensed + }; + }); autoprefixer = prev.autoprefixer.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; @@ -97,7 +100,7 @@ final: prev: { }; - graphite-cli = prev."@withgraphite/graphite-cli".override { + graphite-cli = prev."@withgraphite/graphite-cli".override (old: { name = "graphite-cli"; nativeBuildInputs = with pkgs; [ installShellFiles pkg-config ]; buildInputs = with pkgs; [ cairo pango pixman ]; @@ -108,7 +111,10 @@ final: prev: { --bash <($out/bin/gt completion) \ --zsh <(ZSH_NAME=zsh $out/bin/gt completion) ''; - }; + meta = old.meta // { + license = lib.licenses.unfree; # no license specified + }; + }); graphql-language-service-cli = prev.graphql-language-service-cli.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; diff --git a/pkgs/development/php-packages/phan/default.nix b/pkgs/development/php-packages/phan/default.nix index 570d96ac2df..936853ab8a1 100644 --- a/pkgs/development/php-packages/phan/default.nix +++ b/pkgs/development/php-packages/phan/default.nix @@ -9,11 +9,11 @@ let in mkDerivation rec { pname = "phan"; - version = "5.4.1"; + version = "5.4.2"; src = fetchurl { url = "https://github.com/phan/phan/releases/download/${version}/phan.phar"; - hash = "sha256-DJr1BWAfNI3hYvmBui5Dp+n7ec+f+gkOso21KEd6m8I="; + hash = "sha256-9fpmsv2ia5ad+QtaicdZ0XpOZw7T5LWhfd2miYfSpWM="; }; dontUnpack = true; diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index abc9aa64b22..d57082feccd 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -4,32 +4,29 @@ , buildPythonPackage , fetchPypi , isodate -, msrestazure +, msrest , pythonOlder -, six , typing-extensions , uamqp }: buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.11.1"; + version = "7.11.2"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - hash = "sha256-iWbHtpFSiQTcpSQ6S8lrUWAi9kjesh1ZvKPVvNquxYU="; + hash = "sha256-0iKPBVxP6tP+vnU37QD8vDHeMsfULO02pxt6hg/RIw8="; }; propagatedBuildInputs = [ azure-common azure-core isodate - msrestazure - six + msrest typing-extensions uamqp ]; @@ -44,6 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Microsoft Azure Service Bus Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; + changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-servicebus_${version}/sdk/servicebus/azure-servicebus/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ maxwilson ]; }; diff --git a/pkgs/development/python-modules/curlify/default.nix b/pkgs/development/python-modules/curlify/default.nix new file mode 100644 index 00000000000..dbe335c71de --- /dev/null +++ b/pkgs/development/python-modules/curlify/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, requests }: + +buildPythonPackage { + pname = "curlify"; + version = "2.2.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "ofw"; + repo = "curlify"; + rev = "b914625b12f9b05c39f305b47ebd0d1f061af24d"; + hash = "sha256-yDHmH35TtQDJB0na1V98RtBuVHX5TmKC72hzzs1DQK8="; + }; + + propagatedBuildInputs = [ + requests + ]; + + meta = with lib; { + description = "Convert python requests request object to cURL command"; + homepage = "https://github.com/ofw/curlify"; + license = licenses.mit; + maintainers = with maintainers; [ chrpinedo ]; + }; +} diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 2868ac81c0a..fe237114952 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -1,29 +1,38 @@ { lib -, fetchPypi +, fetchFromGitHub , buildPythonPackage +, isPyPy +, setuptools , setuptools-scm , flask , brotli +, brotlicffi , pytestCheckHook }: buildPythonPackage rec { - version = "1.13"; + version = "1.14"; pname = "Flask-Compress"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - hash = "sha256-7pbxi/mwDy3rTjQGykoFCTqoDi7wV4Ulo7TTLs3/Ep0="; + src = fetchFromGitHub { + owner = "colour-science"; + repo = "flask-compress"; + rev = "refs/tags/v${version}"; + hash = "sha256-eP6i4h+O4vkjlhfy3kyB+PY7iHVzOnRBRD8lj5yHehU="; }; nativeBuildInputs = [ + setuptools setuptools-scm ]; propagatedBuildInputs = [ flask + ] ++ lib.optionals (!isPyPy) [ brotli + ] ++ lib.optionals isPyPy [ + brotlicffi ]; nativeCheckInputs = [ @@ -34,10 +43,13 @@ buildPythonPackage rec { "flask_compress" ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + meta = with lib; { - description = "Compress responses in your Flask app with gzip"; + description = "Compress responses in your Flask app with gzip, deflate or brotli"; homepage = "https://github.com/colour-science/flask-compress"; changelog = "https://github.com/colour-science/flask-compress/blob/v${version}/CHANGELOG.md"; license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/pkgs/development/python-modules/manuf/default.nix b/pkgs/development/python-modules/manuf/default.nix new file mode 100644 index 00000000000..6d237ab396f --- /dev/null +++ b/pkgs/development/python-modules/manuf/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, runCommand +, python3 +, wireshark-cli +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "manuf"; + version = "1.1.5"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "coolbho3k"; + repo = "manuf"; + rev = "${version}"; + hash = "sha256-3CFs3aqwE8rZPwU1QBqAGxNHT5jg7ymG12yBD56gTNI="; + }; + + nativeBuildInputs = [ wireshark-cli ]; + + patches = [ + # Do update while building package from wireshark-cli + ./internal_db_update_nix.patch + # Fix MANUF_URL for external db update functionality (https://github.com/coolbho3k/manuf/issues/34) + ./fix_manuf_url.patch + ]; + + postPatch = '' + cat ${wireshark-cli}/share/wireshark/{manuf,wka} > manuf/manuf + ''; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + "test_update_update" + ]; + + pythonImportsCheck = [ "manuf" ]; + + passthru.tests = { + testMacAddress = runCommand "${pname}-test" {} '' + ${python3.pkgs.manuf}/bin/manuf BC:EE:7B:00:00:00 > $out + [ "$(cat $out | tr -d '\n')" = "Vendor(manuf='ASUSTekC', manuf_long='ASUSTek COMPUTER INC.', comment=None)" ] + ''; + }; + + meta = with lib; { + homepage = "https://github.com/coolbho3k/manuf"; + description = " Parser library for Wireshark's OUI database"; + mainProgram = "manuf"; + platforms = platforms.linux; + license = with licenses; [ lgpl3Plus asl20 ]; + maintainers = with maintainers; [ dsuetin ]; + }; +} diff --git a/pkgs/development/python-modules/manuf/fix_manuf_url.patch b/pkgs/development/python-modules/manuf/fix_manuf_url.patch new file mode 100644 index 00000000000..e858649b90f --- /dev/null +++ b/pkgs/development/python-modules/manuf/fix_manuf_url.patch @@ -0,0 +1,14 @@ +diff --git a/manuf/manuf.py b/manuf/manuf.py +index 09e9687..0ac9296 100755 +--- a/manuf/manuf.py ++++ b/manuf/manuf.py +@@ -61,7 +61,8 @@ class MacParser(object): + IOError: If manuf file could not be found. + + """ +- MANUF_URL = "https://gitlab.com/wireshark/wireshark/raw/master/manuf" ++ # https://github.com/coolbho3k/manuf/issues/34 ++ MANUF_URL = "https://www.wireshark.org/download/automated/data/manuf" + WFA_URL = "https://gitlab.com/wireshark/wireshark/raw/master/wka" + + def __init__(self, manuf_name=None, update=False): diff --git a/pkgs/development/python-modules/manuf/internal_db_update_nix.patch b/pkgs/development/python-modules/manuf/internal_db_update_nix.patch new file mode 100644 index 00000000000..174c71e4692 --- /dev/null +++ b/pkgs/development/python-modules/manuf/internal_db_update_nix.patch @@ -0,0 +1,31 @@ +diff --git a/manuf/manuf.py b/manuf/manuf.py +index e5e9193..09e9687 100755 +--- a/manuf/manuf.py ++++ b/manuf/manuf.py +@@ -65,8 +65,14 @@ class MacParser(object): + WFA_URL = "https://gitlab.com/wireshark/wireshark/raw/master/wka" + + def __init__(self, manuf_name=None, update=False): +- self._manuf_name = manuf_name or self.get_packaged_manuf_file_path() +- if update: ++ if manuf_name is not None: ++ self._manuf_name = manuf_name ++ self.external_db = True ++ else: ++ self._manuf_name = self.get_packaged_manuf_file_path() ++ self.external_db = False ++ ++ if update and self.external_db: + self.update() + else: + self.refresh() +@@ -134,6 +140,9 @@ class MacParser(object): + URLError: If the download fails + + """ ++ if manuf_url is None and not self.external_db: ++ return ++ + if not manuf_url: + manuf_url = self.MANUF_URL + if not manuf_name: diff --git a/pkgs/development/python-modules/pgvector/default.nix b/pkgs/development/python-modules/pgvector/default.nix index a521038ef03..03fbef0bd48 100644 --- a/pkgs/development/python-modules/pgvector/default.nix +++ b/pkgs/development/python-modules/pgvector/default.nix @@ -4,6 +4,7 @@ , django , fetchFromGitHub , numpy +, peewee , postgresql , postgresqlTestHook , psycopg @@ -16,7 +17,7 @@ buildPythonPackage rec { pname = "pgvector"; - version = "0.2.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "pgvector"; repo = "pgvector-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Phe8iAdOCVp4wpLuLfO+fQMD1MOD47OEIQJ45rYQzug="; + hash = "sha256-qvLDFnrTYibdhjSeeIFI4YdpPRsvNBnQ23uqsLCblEo="; }; propagatedBuildInputs = [ @@ -35,6 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ asyncpg django + peewee (postgresql.withPackages (p: with p; [ pgvector ])) postgresqlTestHook psycopg diff --git a/pkgs/development/python-modules/pydateinfer/default.nix b/pkgs/development/python-modules/pydateinfer/default.nix new file mode 100644 index 00000000000..a2fb97236df --- /dev/null +++ b/pkgs/development/python-modules/pydateinfer/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, unittestCheckHook +, pytz +, pyyaml +, argparse +}: + +buildPythonPackage rec { + pname = "pydateinfer"; + version = "0.3.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "wdm0006"; + repo = "dateinfer"; + rev = "${version},"; # yes the comma is required, this is correct name of git tag + hash = "sha256-0gy7wfT/uMTmpdIF2OPGVeUh+4yqJSI2Ebif0Lf/DLM="; + }; + + propagatedBuildInputs = [ + pytz + ]; + + preCheck = "cd dateinfer"; + nativeCheckInputs = [ + unittestCheckHook + pyyaml + argparse + ]; + pythonImportsCheck = [ "dateinfer" ]; + + meta = with lib; { + description = "Infers date format from examples"; + homepage = "https://pypi.org/project/pydateinfer/"; + license = licenses.asl20; + maintainers = with maintainers; [ mbalatsko ]; + }; +} diff --git a/pkgs/development/tools/fx/default.nix b/pkgs/development/tools/fx/default.nix index f0694a6b95a..872485d8450 100644 --- a/pkgs/development/tools/fx/default.nix +++ b/pkgs/development/tools/fx/default.nix @@ -1,25 +1,16 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "fx"; - version = "30.0.2"; + version = "30.0.3"; src = fetchFromGitHub { owner = "antonmedv"; repo = pname; rev = version; - hash = "sha256-dpIkWgABATDyG3pCdeDKVar53eBHFP3f9XNKkTrr96c="; + hash = "sha256-bTXxzGf7mXQ0VfAQhaKAOYtOVAEVC71R3eRJej0zfJs="; }; - patches = [ - # fix failing test - (fetchpatch { - name = "fix-dig-test.patch"; - url = "https://github.com/antonmedv/fx/commit/adf3775828157d903e3f32ab4023fe750fa85e68.patch"; - hash = "sha256-/6UfI0IW/+ZbgXi3W6BRTfVPko7V4s/NnaunvLDcw2A="; - }) - ]; - vendorHash = "sha256-FyV3oaI4MKl0LKJf23XIeUmvFsa1DvQw2pq5Heza3Ws="; meta = with lib; { diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index 741a610c890..3ead4400afa 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "wasmedge"; - version = "0.13.3"; + version = "0.13.4"; src = fetchFromGitHub { owner = "WasmEdge"; repo = "WasmEdge"; rev = finalAttrs.version; - sha256 = "sha256-IZMYeuneKtcuvbEVgkF2C3gbxJe7GlXRNEYwpFxtiKA="; + sha256 = "sha256-2EKUnRvd1w1TxO7OFKYpTzSXC3fdIU7Jk0MIPPTY96U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/web/nodejs/corepack.nix b/pkgs/development/web/nodejs/corepack.nix new file mode 100644 index 00000000000..c83d3f1645f --- /dev/null +++ b/pkgs/development/web/nodejs/corepack.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, nodejs }: + +stdenv.mkDerivation { + pname = "corepack-nodejs"; + inherit (nodejs) version; + + nativeBuildInputs = [ nodejs ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin + corepack enable --install-directory $out/bin + # Enabling npm caused some crashes - leaving out for now + # corepack enable --install-directory $out/bin npm + ''; + + meta = { + description = "Wrappers for npm, pnpm and Yarn via Node.js Corepack"; + homepage = "https://nodejs.org/api/corepack.html"; + changelog = "https://github.com/nodejs/node/releases/tag/v${nodejs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wmertens ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} |