nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-04 03:03:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
github-actions[bot] 2024-04-25 12:01:54 +00:00 committed by GitHub
commit b4433285bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/applications/networking/p2p/fragments/default.nix → pkgs/by-name/fr/fragments/package.nix
View File

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitLab , fetchFromGitLab
, fetchpatch
, appstream-glib , appstream-glib
, cargo , cargo
, dbus , dbus
@ -17,36 +16,26 @@
, rustPlatform , rustPlatform
, rustc , rustc
, sqlite , sqlite
, transmission , transmission_4
, wrapGAppsHook4 , wrapGAppsHook4
}: }:
let stdenv.mkDerivation rec {
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 {
pname = "fragments"; pname = "fragments";
version = "2.1.1"; version = "3.0.0";
src = fetchFromGitLab { src = fetchFromGitLab {
domain = "gitlab.gnome.org"; domain = "gitlab.gnome.org";
owner = "World"; owner = "World";
repo = "Fragments"; repo = "Fragments";
rev = version; rev = version;
sha256 = "sha256-tZcVw4rxmNPcKKgyRB+alEktktZfKK+7FYUVAAGA9bw="; hash = "sha256-HtulyB1XYBsA595ghJN0EmyJT7DjGUbtJKaMGM3f0I8=";
}; };
patches = [];
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src patches; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
hash = "sha256-nqVaYnL3jKGBsAsakIkgwksjH4yuMhwCQe0zq3jgjnA="; hash = "sha256-EUE+Qc+MqsKPqHMYJflZQ6zm3ErW+KLuJq/7HEBf8VM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -71,9 +60,9 @@ in stdenv.mkDerivation rec {
sqlite sqlite
]; ];
preFixup = '' preFixup = ''
gappsWrapperArgs+=( gappsWrapperArgs+=(
--prefix PATH : "${lib.makeBinPath [ patchedTransmission ]}" --prefix PATH : "${lib.makeBinPath [ transmission_4 ]}"
) )
''; '';

2
pkgs/top-level/all-packages.nix
View File

@ -31317,8 +31317,6 @@ with pkgs;
fractal = callPackage ../applications/networking/instant-messengers/fractal { }; fractal = callPackage ../applications/networking/instant-messengers/fractal { };
fragments = callPackage ../applications/networking/p2p/fragments { };
freedv = callPackage ../applications/radio/freedv { freedv = callPackage ../applications/radio/freedv {
inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia; inherit (darwin.apple_sdk.frameworks) AppKit AVFoundation Cocoa CoreMedia;
codec2 = codec2.override { codec2 = codec2.override {