From 1fa40fac5e75faa2a02e885f2163742c2ab6b540 Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 14 Apr 2024 01:12:51 +0800 Subject: [PATCH] fragments: 2.1.1 -> 3.0.0 --- .../fr/fragments/package.nix} | 27 ++++++------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 8 insertions(+), 21 deletions(-) rename pkgs/{applications/networking/p2p/fragments/default.nix => by-name/fr/fragments/package.nix} (60%) diff --git a/pkgs/applications/networking/p2p/fragments/default.nix b/pkgs/by-name/fr/fragments/package.nix similarity index 60% rename from pkgs/applications/networking/p2p/fragments/default.nix rename to pkgs/by-name/fr/fragments/package.nix index edb31ba669577..7976a2add11b4 100644 --- a/pkgs/applications/networking/p2p/fragments/default.nix +++ b/pkgs/by-name/fr/fragments/package.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , appstream-glib , cargo , dbus @@ -17,36 +16,26 @@ , rustPlatform , rustc , sqlite -, transmission +, transmission_4 , wrapGAppsHook4 }: -let - patchedTransmission = transmission.overrideAttrs (oldAttrs: { - patches = (oldAttrs.patches or []) ++ [ - (fetchpatch { - url = "https://raw.githubusercontent.com/flathub/de.haeckerfelix.Fragments/2aee477c8e26a24570f8dbbdbd1c49e017ae32eb/transmission_pdeathsig.patch"; - sha256 = "sha256-/rCoA566tMmzqcIfffC082Y56TwEyyQJ0knxymtscbA="; - }) - ]; - }); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "fragments"; - version = "2.1.1"; + version = "3.0.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Fragments"; rev = version; - sha256 = "sha256-tZcVw4rxmNPcKKgyRB+alEktktZfKK+7FYUVAAGA9bw="; + hash = "sha256-HtulyB1XYBsA595ghJN0EmyJT7DjGUbtJKaMGM3f0I8="; }; - patches = []; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src patches; + inherit src; name = "${pname}-${version}"; - hash = "sha256-nqVaYnL3jKGBsAsakIkgwksjH4yuMhwCQe0zq3jgjnA="; + hash = "sha256-EUE+Qc+MqsKPqHMYJflZQ6zm3ErW+KLuJq/7HEBf8VM="; }; nativeBuildInputs = [ @@ -71,9 +60,9 @@ in stdenv.mkDerivation rec { sqlite ]; - preFixup = '' + preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ patchedTransmission ]}" + --prefix PATH : "${lib.makeBinPath [ transmission_4 ]}" ) ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b2db136f0ae1..1fc52459ce965 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31335,8 +31335,6 @@ with pkgs; fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - fragments = callPackage ../applications/networking/p2p/fragments { }; - freedv = callPackage ../applications/radio/freedv { inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia; codec2 = codec2.override {