public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

This commit is contained in:
github-actions[bot] 2021-10-02 18:02:51 +00:00 committed by GitHub
parent 7150f605ae ab96577bde
commit b7f5285467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 7 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/networking/p2p/dht/default.nix
View File

@ -1,24 +0,0 @@
{ stdenv, lib, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "dht";
version = "0.25";
src = fetchFromGitHub {
# Use transmission fork from post-0.25-transmission branch
owner = "transmission";
repo = pname;
rev = "25e12bb39eea3d433602de6390796fec8a8f3620";
sha256 = "fksi8WBQPydgSlISaZMMnxzt4xN7/Hh7aN6QQ+g/L7s=";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "BitTorrent DHT library";
homepage = "https://github.com/transmission/dht";
license = licenses.mit;
maintainers = with maintainers; [ angustrau ];
platforms = platforms.unix;
};
}

78
pkgs/applications/networking/p2p/fragments/default.nix
View File

@ -1,78 +0,0 @@
{ lib
, stdenv
, fetchFromGitLab
, meson
, vala
, ninja
, pkg-config
, wrapGAppsHook
, desktop-file-utils
, appstream-glib
, python3
, glib
, gtk3
, libhandy
, libtransmission
, libb64
, libutp
, miniupnpc
, dht
, libnatpmp
, libevent
, curl
, openssl
, zlib
}:
stdenv.mkDerivation rec {
pname = "fragments";
version = "1.5";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "Fragments";
rev = version;
sha256 = "0x1kafhlgyi65l4w67c24r8mpvasg3q3c4wlgnjc9sxvp6ki7xbn";
};
patches = [
# Fix dependency resolution
./dependency-resolution.patch
];
nativeBuildInputs = [
meson
vala
ninja
pkg-config
wrapGAppsHook
desktop-file-utils
appstream-glib
python3
];
buildInputs = [
glib
gtk3
libhandy
libtransmission
libb64
libutp
miniupnpc
dht
libnatpmp
libevent
curl
openssl
zlib
];
meta = with lib; {
homepage = "https://gitlab.gnome.org/World/Fragments";
description = "A GTK3 BitTorrent Client";
maintainers = with maintainers; [ angustrau ];
license = licenses.gpl3Plus;
platforms = platforms.linux;
};
}

25
pkgs/applications/networking/p2p/fragments/dependency-resolution.patch
View File

@ -1,25 +0,0 @@
diff --git a/meson.build b/meson.build
index 5030d0c..6de7a20 100644
--- a/meson.build
+++ b/meson.build
@@ -32,10 +32,11 @@ transmission_dep = declare_dependency(
meson.get_compiler('c').find_library('dht'),
meson.get_compiler('c').find_library('natpmp'),
meson.get_compiler('c').find_library('event'),
- meson.get_compiler('c').find_library('libcurl'),
- meson.get_compiler('c').find_library('libcrypto'),
+ meson.get_compiler('c').find_library('curl'),
+ meson.get_compiler('c').find_library('crypto'),
+ meson.get_compiler('c').find_library('ssl'),
meson.get_compiler('c').find_library('libpthread'),
- meson.get_compiler('c').find_library('libz'),
+ meson.get_compiler('c').find_library('z'),
transmission_vapi,
transmission_lib
])
@@ -45,4 +46,4 @@ subdir('data')
subdir('po')
subdir('src')
-meson.add_install_script('build-aux/postinstall.py')
+meson.add_install_script('python3', '../build-aux/postinstall.py')

24
pkgs/applications/networking/p2p/libutp/default.nix
View File

@ -1,24 +0,0 @@
{ stdenv, lib, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "libutp";
version = "unstable-2017-01-02";
src = fetchFromGitHub {
# Use transmission fork from post-3.3-transmission branch
owner = "transmission";
repo = pname;
rev = "fda9f4b3db97ccb243fcbed2ce280eb4135d705b";
sha256 = "CvuZLOBksIl/lS6LaqOIuzNvX3ihlIPjI3Eqwo7YJH0=";
};
nativeBuildInputs = [ cmake ];
meta = with lib; {
description = "uTorrent Transport Protocol library";
homepage = "https://github.com/transmission/libutp";
license = licenses.mit;
maintainers = with maintainers; [ angustrau ];
platforms = platforms.unix;
};
}

14
pkgs/applications/networking/p2p/transmission/default.nix
View File

@ -10,11 +10,6 @@
, systemd
, zlib
, pcre
, libb64
, libutp
, miniupnpc
, dht
, libnatpmp
# Build options
, enableGTK3 ? false
, gtk3
@ -74,11 +69,6 @@ in stdenv.mkDerivation {
libevent
zlib
pcre
libb64
libutp
miniupnpc
dht
libnatpmp
]
++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ]
++ lib.optionals enableGTK3 [ gtk3 xorg.libpthreadstubs ]
@ -97,7 +87,7 @@ in stdenv.mkDerivation {
include <abstractions/nameservice>
include <abstractions/ssl_certs>
include "${apparmorRulesFromClosure { name = "transmission-daemon"; } ([
curl libevent openssl pcre zlib libnatpmp miniupnpc
curl libevent openssl pcre zlib
] ++ lib.optionals enableSystemd [ systemd ]
++ lib.optionals stdenv.isLinux [ inotify-tools ]
)}"
@ -134,7 +124,7 @@ in stdenv.mkDerivation {
* Full encryption, DHT, and PEX support
'';
homepage = "http://www.transmissionbt.com/";
license = lib.licenses.gpl2Plus; # parts are under MIT
license = lib.licenses.gpl2; # parts are under MIT
maintainers = with lib.maintainers; [ astsmtl vcunat wizeman ];
platforms = lib.platforms.unix;
};

5
pkgs/development/interpreters/php/7.4.nix
View File

@ -4,8 +4,9 @@ let
generic = (import ./generic.nix) _args;
base = callPackage generic (_args // {
version = "7.4.23";
sha256 = "d1e094fe6e4f832e0a64be9c69464ba5d593fb216f914efa8bbb084e0a7a5727";
version = "7.4.24";
sha256 = "0cigvwp469kmc27r28liq5dwdz5icp61vqqr3w24jhw6i2vk43pm";
});
in base.withExtensions ({ all, ... }: with all; ([

4
pkgs/development/interpreters/php/8.0.nix
View File

@ -4,8 +4,8 @@ let
generic = (import ./generic.nix) _args;
base = callPackage generic (_args // {
version = "8.0.10";
sha256 = "sha256-yUVHJxQQkAhFsITsK8s0Zq82PuypLLJL1hHcvcJvFYc=";
version = "8.0.11";
sha256 = "0fj0yk0h0fvr9ckszp496wdyvf8kdfsvydw95qg0q0g4hm18gvbh";
});
in base.withExtensions ({ all, ... }: with all; ([

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

@ -23047,8 +23047,6 @@ in
dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { };
dht = callPackage ../applications/networking/p2p/dht { };
dia = callPackage ../applications/graphics/dia {
inherit (pkgs.gnome2) libart_lgpl libgnomeui;
};
@ -23732,8 +23730,6 @@ in
fractal = callPackage ../applications/networking/instant-messengers/fractal { };
fragments = callPackage ../applications/networking/p2p/fragments { };
freecad = libsForQt5.callPackage ../applications/graphics/freecad {
inherit (python3Packages)
GitPython
@ -24830,8 +24826,6 @@ in
libvmi = callPackage ../development/libraries/libvmi { };
libutp = callPackage ../applications/networking/p2p/libutp { };
lifelines = callPackage ../applications/misc/lifelines { };
liferea = callPackage ../applications/networking/newsreaders/liferea { };