Unverified Commit 41e48d66 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #220618 from chuangzhu/fragments 

fragments: 2.0.2 -> 2.1; unbreak
parents d5bea4fe d155c6b9

pkgs/applications/networking/p2p/fragments/default.nix

+6 −10
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
, ninja

, openssl

, pkg-config

, python3

, rustPlatform

, sqlite

, transmission
@@ -31,24 +30,22 @@ let 
  });

in stdenv.mkDerivation rec {

  pname = "fragments";

  version = "2.0.2";

  version = "2.1";



  src = fetchFromGitLab {

    domain = "gitlab.gnome.org";

    owner = "World";

    repo = "Fragments";

    rev = version;

    sha256 = "sha256-CMa1yka0kOxMhxSuazlJxTk4fzxuuwKYLBpEMwHbBUE=";

    sha256 = "sha256-/KtUcj41s9WeHzIgGWhYQv6oD/Df7WOnJAPuS6yGLHk=";

  };



  postPatch = ''

    patchShebangs build-aux/meson/postinstall.py

  '';



  # https://github.com/gtk-rs/gtk4-rs/issues/1201

  patches = [ ./gtk4-rs.patch ];

  cargoDeps = rustPlatform.fetchCargoTarball {

    inherit src;

    inherit src patches;

    name = "${pname}-${version}";

    hash = "sha256-/rFZcbpITYkpSCEZp9XH253u90RGmuVLEBGIRNBgI/o=";

    hash = "sha256-bhQHXx7kZFL+qb+k0gN1NZZ6LYjBUHuNqU528f0QAg0=";

  };



  nativeBuildInputs = [
@@ -58,7 +55,6 @@ in stdenv.mkDerivation rec { 
    meson

    ninja

    pkg-config

    python3

    wrapGAppsHook4

  ] ++ (with rustPlatform; [

    cargoSetupHook

pkgs/applications/networking/p2p/fragments/gtk4-rs.patch

0 → 100644
+28 −0
Original line number Diff line number Diff line 
diff --git a/Cargo.lock b/Cargo.lock

index c0dfa2a..2decf88 100644

--- a/Cargo.lock

+++ b/Cargo.lock

@@ -1158,9 +1158,9 @@ checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a"

 

 [[package]]

 name = "gtk4"

-version = "0.4.8"

+version = "0.4.9"

 source = "registry+https://github.com/rust-lang/crates.io-index"

-checksum = "c64f0c2a3d80e899dc3febddad5bac193ffcf74a0fd7e31037f30dd34d6f7396"

+checksum = "4e8ae5aef2793bc3551b5e5e3fa062a5de54bb1eccf10dfa4effe9e4384fbbbc"

 dependencies = [

  "bitflags",

  "cairo-rs",

@@ -1181,9 +1181,9 @@ dependencies = [

 

 [[package]]

 name = "gtk4-macros"

-version = "0.4.8"

+version = "0.4.9"

 source = "registry+https://github.com/rust-lang/crates.io-index"

-checksum = "fafbcc920af4eb677d7d164853e7040b9de5a22379c596f570190c675d45f7a7"

+checksum = "d9a4a8077b3a392dd7d637924529e1213d2e0c8e4d531177bc3355e86c257a54"

 dependencies = [

  "anyhow",

  "proc-macro-crate 1.2.1",