diff options
Diffstat (limited to 'pkgs/applications/networking/p2p')
6 files changed, 45 insertions, 14 deletions
diff --git a/pkgs/applications/networking/p2p/fragments/default.nix b/pkgs/applications/networking/p2p/fragments/default.nix index ebeba4c010e84..932cfbbbe3a20 100644 --- a/pkgs/applications/networking/p2p/fragments/default.nix +++ b/pkgs/applications/networking/p2p/fragments/default.nix @@ -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 diff --git a/pkgs/applications/networking/p2p/fragments/gtk4-rs.patch b/pkgs/applications/networking/p2p/fragments/gtk4-rs.patch new file mode 100644 index 0000000000000..4e2a73554309b --- /dev/null +++ b/pkgs/applications/networking/p2p/fragments/gtk4-rs.patch @@ -0,0 +1,28 @@ +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", diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index 91a078590bf24..5a0cebc528191 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -65,5 +65,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ winter AndersonTorres ]; platforms = platforms.linux; + mainProgram = "rtorrent"; }; } diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 1291caa088ff8..7bc5e2f59679d 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { url = "https://github.com/ygrek/mldonkey/commit/a153f0f7a4826d86d51d4bacedc0330b70fcbc34.patch"; hash = "sha256-/Muk3mPFjQJ48FqaozGa7o8YSPhDLXRz9K1EyfxlzC8="; }) + # Fixes OCaml 4.14 compat + (fetchpatch { + url = "https://github.com/FabioLolix/AUR-artifacts/raw/6721c2d4ef0be9a99499ecf2787e378e50b915e9/mldonkey-fix-build.patch"; + hash = "sha256-HPW/CKfhywy+Km5/64Iok4tO9LJjAk53jVlsYzIRPfs="; + }) ]; preConfigure = '' @@ -28,7 +33,7 @@ stdenv.mkDerivation rec { ''; strictDeps = true; - nativeBuildInputs = with ocamlPackages; [ ocaml camlp4]; + nativeBuildInputs = with ocamlPackages; [ ocaml camlp4 ]; buildInputs = (with ocamlPackages; [ num ]) ++ [ zlib ]; meta = { diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index fa459137f1994..a6f59374db88b 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ebzzry codyopel ]; platforms = platforms.unix; + mainProgram = "rtorrent"; }; } diff --git a/pkgs/applications/networking/p2p/xd/default.nix b/pkgs/applications/networking/p2p/xd/default.nix index b73c962240fc7..8283a2ec4beee 100644 --- a/pkgs/applications/networking/p2p/xd/default.nix +++ b/pkgs/applications/networking/p2p/xd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "XD"; - version = "0.4.2"; + version = "0.4.4"; src = fetchFromGitHub { owner = "majestrate"; repo = "XD"; rev = "v${version}"; - sha256 = "sha256-AavNiFZlpX6XZQLP1kl9igA833i0gxOTYGubo3MvpSU="; + sha256 = "sha256-YUstYGIED6ivt+p+aHIK76dLCj+xjytWnZrra49cCi8="; }; - vendorSha256 = "sha256-mJZRk3p+D3tCKIYggD5jVBXcKqJotEexljDzLKpn4/E="; + vendorHash = "sha256-wO+IICtGVHhrPa1JUwlx+PuNS32FJNKYmboLd3lFl4w="; nativeCheckInputs = [ perl ]; |