Unverified Commit 60309310 authored by nicoo's avatar nicoo Committed by GitHub
Browse files

Merge #308079: fluffychat 1.18.0 -> 1.20.0

parents badf4fca b8e0b18b

pkgs/applications/networking/instant-messengers/fluffychat/default.nix

+2 −3
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ let 
in

flutter.buildFlutterApplication (rec {

  pname = "fluffychat-${targetFlutterPlatform}";

  version = "1.18.0";

  version = "1.20.0";



  src = fetchFromGitHub {

    owner = "krille-chan";

    repo = "fluffychat";

    rev = "refs/tags/v${version}";

    hash = "sha256-xm3+zBqg/mW2XxqFDXxeC+gIc+TgeciJmQf8w1kcW5Y=";

    hash = "sha256-eHwzvWKWJ9Q2OgCvgZTt+Bcph2w2pTqyOtwXFbZ4LEg=";

  };



  inherit pubspecLock;
@@ -32,7 +32,6 @@ flutter.buildFlutterApplication (rec { 
  gitHashes = {

    flutter_shortcuts = "sha256-4nptZ7/tM2W/zylk3rfQzxXgQ6AipFH36gcIb/0RbHo=";

    keyboard_shortcuts = "sha256-U74kRujftHPvpMOIqVT0Ph+wi1ocnxNxIFA1krft4Os=";

    wakelock_windows = "sha256-Dfwe3dSScD/6kvkP67notcbb+EgTQ3kEYcH7wpra2dI=";

  };



  inherit targetFlutterPlatform;

pkgs/applications/networking/instant-messengers/fluffychat/pubspec.lock.json

+542 −283

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/development/compilers/dart/package-source-builders/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
  matrix = callPackage ./matrix { };

  media_kit_libs_linux = callPackage ./media_kit_libs_linux { };

  olm = callPackage ./olm { };

  sqlcipher_flutter_libs = callPackage ./sqlcipher_flutter_libs { };

  sqlite3 = callPackage ./sqlite3 { };

  system_tray = callPackage ./system-tray { };

}

pkgs/development/compilers/dart/package-source-builders/sqlcipher_flutter_libs/default.nix

0 → 100644
+45 −0
Original line number Diff line number Diff line 
{ stdenv

, fetchurl

, lib

}:



{ version, src, ... }:



let

  artifacts = lib.mapAttrs (version: sha512:

    fetchurl {

      url = "https://storage.googleapis.com/simon-public-euw3/assets/sqlcipher/${version}.c";

      inherit sha512;

    })

    {

      v4_5_7 = "11bb454d761b994f7e44f35dabd3fc8ac3b40499d6fdc29d58a38fb9b4dcdd6eb14ff3978ceb7c6f3bd5eee4a5abeec5f0453b944268f9aaf942b0366df1e73d";

      v4_5_6 = "939ae692239adc0581211a37ed9ffa8b37c8f771c830977ecb06dc6accc4c3db767ce6abeaf91133815e2ae837785affa92f4c95b2e68cb6d563bd761f3e0cb1";

    };

in

stdenv.mkDerivation rec {

  pname = "sqlcipher_flutter_libs";

  inherit version src;

  inherit (src) passthru;



  installPhase = ''

    runHook preInstall



    cp -r "$src" "$out"

    _replace() {

      URL="https://storage.googleapis.com/simon-public-euw3/assets/sqlcipher/v$1.c"

      # --replace-fail messes with the file if it fails (is empty afterwards) so we do this instead

      if cat "$out/linux/CMakeLists.txt" | grep "$URL" >/dev/null 2>/dev/null; then

        substituteInPlace "$out/linux/CMakeLists.txt" --replace "$URL" "file://$2"

      else

        return 2

      fi

    }

    _replace "4_5_7" "${artifacts.v4_5_7}" || \

    _replace "4_5_6" "${artifacts.v4_5_6}" || \

    (echo "unknown version of sqlcipher, please add to pkgs/development/compilers/dart/package-source-builders/sqlcipher_flutter_libs" && cat linux/CMakeLists.txt | grep "https://storage.*" -o && exit 2)



    runHook postInstall

  '';



  meta.sourceProvenance = [ lib.sourceTypes.binaryBytecode ];

}