diff options
author | maxine <35892750+amaxine@users.noreply.github.com> | 2024-01-16 17:58:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-16 17:58:26 +0100 |
commit | d7dd2b75a5e25f09d188412c74438319d5466201 (patch) | |
tree | 798be69412467ee3507acc3c49e9ad0b73004636 | |
parent | bd4233863c913b8a8d802597d4d3509c5852bacc (diff) | |
parent | d8cdaedc42ac25aa442833ea9eb36be6af2a8789 (diff) |
Merge pull request #280362 from amaxine/fragments_2.1.1
fragments: 2.1.0 → 2.1.1
-rw-r--r-- | pkgs/applications/networking/p2p/fragments/default.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/networking/p2p/fragments/gtk4-rs.patch | 28 |
2 files changed, 4 insertions, 33 deletions
diff --git a/pkgs/applications/networking/p2p/fragments/default.nix b/pkgs/applications/networking/p2p/fragments/default.nix index da74fd5e60acb..5034f401a98d7 100644 --- a/pkgs/applications/networking/p2p/fragments/default.nix +++ b/pkgs/applications/networking/p2p/fragments/default.nix @@ -32,22 +32,21 @@ let }); in stdenv.mkDerivation rec { pname = "fragments"; - version = "2.1"; + version = "2.1.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Fragments"; rev = version; - sha256 = "sha256-/KtUcj41s9WeHzIgGWhYQv6oD/Df7WOnJAPuS6yGLHk="; + sha256 = "sha256-tZcVw4rxmNPcKKgyRB+alEktktZfKK+7FYUVAAGA9bw="; }; - # https://github.com/gtk-rs/gtk4-rs/issues/1201 - patches = [ ./gtk4-rs.patch ]; + patches = []; cargoDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}"; - hash = "sha256-bhQHXx7kZFL+qb+k0gN1NZZ6LYjBUHuNqU528f0QAg0="; + hash = "sha256-nqVaYnL3jKGBsAsakIkgwksjH4yuMhwCQe0zq3jgjnA="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/p2p/fragments/gtk4-rs.patch b/pkgs/applications/networking/p2p/fragments/gtk4-rs.patch deleted file mode 100644 index 4e2a73554309b..0000000000000 --- a/pkgs/applications/networking/p2p/fragments/gtk4-rs.patch +++ /dev/null @@ -1,28 +0,0 @@ -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", |