Unverified Commit 733453ac authored by Masum Reza's avatar Masum Reza Committed by GitHub
Browse files

Merge pull request #329885 from ryand56/update-cinny 

cinny, cinny-desktop: 3.2.0 -> 4.0.3
parents f5b58de9 bc12941f

pkgs/applications/networking/instant-messengers/cinny-desktop/Cargo.lock

deleted100644 → 0
+0 −4801

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix

+7 −8
Original line number Diff line number Diff line
@@ -21,19 +21,18 @@ 
rustPlatform.buildRustPackage rec {

  pname = "cinny-desktop";

  # We have to be using the same version as cinny-web or this isn't going to work.

  version = "3.2.0";

  version = "4.0.3";



  src = fetchFromGitHub {

    owner = "cinnyapp";

    repo = "cinny-desktop";

    rev = "v${version}";

    hash = "sha256-uHGqvulH7/9JpUjkpcbCh1pPvX4/ndVIKcBXzWmDo+s=";

    hash = "sha256-05T/2e5+st+vGQuO8lRw6KWz3+Qiqd14dCPvayyz5mo=";

  };



  sourceRoot = "${src.name}/src-tauri";



  # modififying $cargoDepsCopy requires the lock to be vendored

  cargoLock.lockFile = ./Cargo.lock;

  cargoHash = "sha256-bM+V37PJAob/DA2jy2g69zUY99ZyZBzgO6djadbdiJw=";



  postPatch = let

    cinny' =
@@ -94,12 +93,12 @@ rustPlatform.buildRustPackage rec { 
    })

  ];



  meta = with lib; {

  meta = {

    description = "Yet another matrix client for desktop";

    homepage = "https://github.com/cinnyapp/cinny-desktop";

    maintainers = with maintainers; [ qyriad ];

    license = licenses.agpl3Only;

    platforms = platforms.linux ++ platforms.darwin;

    maintainers = with lib.maintainers; [ qyriad ];

    license = lib.licenses.agpl3Only;

    platforms = lib.platforms.linux ++ lib.platforms.darwin;

    mainProgram = "cinny";

  };

}

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

+7 −7
Original line number Diff line number Diff line
@@ -18,16 +18,16 @@ let 
in

buildNpmPackage rec {

  pname = "cinny";

  version = "3.2.0";

  version = "4.0.3";



  src = fetchFromGitHub {

    owner = "cinnyapp";

    repo = "cinny";

    rev = "v${version}";

    hash = "sha256-wAa7y2mXPkXAfirRSFqwZYIJK0CKDzZG8ULzXzr4zZ4=";

    hash = "sha256-5Tf1CgB/YAyGVpopHERQ8xNGwklB+f2l+yfgCKsR3I8=";

  };



  npmDepsHash = "sha256-dVdylvclUIHvF5syVumdxkXR4bG1FA4LOYg3GmnNzXE=";

  npmDepsHash = "sha256-wtHFqnz5BtMUikdFZyTiLrw+e69WErowYBhu8cnEjkI=";



  # Fix error: no member named 'aligned_alloc' in the global namespace

  env.NIX_CFLAGS_COMPILE = lib.optionalString (
@@ -57,11 +57,11 @@ buildNpmPackage rec { 
    runHook postInstall

  '';



  meta = with lib; {

  meta = {

    description = "Yet another Matrix client for the web";

    homepage = "https://cinny.in/";

    maintainers = with maintainers; [ abbe ];

    license = licenses.agpl3Only;

    platforms = platforms.all;

    maintainers = with lib.maintainers; [ abbe ];

    license = lib.licenses.agpl3Only;

    platforms = lib.platforms.all;

  };

}