mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 23:13:19 +00:00
Merge staging-next into staging
This commit is contained in:
Frederik Rietdijk
commit
e45ca47f14
@ -17,7 +17,7 @@
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="http://thread.gmane.org/gmane.linux.distributions.nixos/15165">
|
||||
<link xlink:href="https://www.mail-archive.com/nix-dev@lists.science.uu.nl/msg13957.html">
|
||||
Nix has been updated to 1.8.</link>
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
@ -61,6 +61,8 @@ in
|
||||
wantedBy = [ "default.target" ];
|
||||
};
|
||||
};
|
||||
|
||||
environment.etc."geoclue/geoclue.conf".source = "${package}/etc/geoclue/geoclue.conf";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -555,12 +555,12 @@ rec {
|
||||
|
||||
spotbugs = buildEclipseUpdateSite rec {
|
||||
name = "spotbugs-${version}";
|
||||
version = "3.1.9";
|
||||
version = "3.1.10";
|
||||
|
||||
src = fetchzip {
|
||||
stripRoot = false;
|
||||
url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip";
|
||||
sha256 = "0m68jbyaiz0rm4qq3nnwnvgndzv2c6ay6i29kh0p0vdbanggq3xz";
|
||||
sha256 = "0xrflgw0h05z3za784ach2fx6dh04lgmfr426m1q235vv2ibds5y";
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "girara-${version}";
|
||||
version = "0.3.1";
|
||||
version = "0.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://pwmt.org/projects/girara/download/${name}.tar.xz";
|
||||
sha256 = "1ddwap5q5cnfdr1q1b110wy7mw1z3khn86k01jl8lqmn02n9nh1w";
|
||||
sha256 = "1kc6n1mxjxa7wvwnqy94qfg8l9jvx9qrvrr2kc7m4g0z20x3a00p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig gettext ];
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, makeWrapper }:
|
||||
|
||||
let
|
||||
version = "5.1.60";
|
||||
version = "5.2.20";
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "masterpdfeditor-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
|
||||
sha256 = "0br5f04klzpbd25igbjjj1dqasmrcrw2zsan5bv0ydnr2lmpb2fz";
|
||||
sha256 = "1399zv3m7a2rxvmy213f5yii3krsqyahpwdzsw8j535xrb9f3z1m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
||||
|
||||
@ -5,13 +5,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "psi-plus-${version}";
|
||||
version = "1.4.404";
|
||||
version = "1.4.504";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "psi-plus";
|
||||
repo = "psi-plus-snapshots";
|
||||
rev = "${version}";
|
||||
sha256 = "05dcr1i7ic6nff70w4zfpdcmwf19kkhgxm7mcznmlr484d5i1v2m";
|
||||
sha256 = "1nv1ynad2gcn7r8mm2w3kixmahaql7xax1lccsqyxqmj1r0klk8q";
|
||||
};
|
||||
|
||||
resources = fetchFromGitHub {
|
||||
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
name = "skrooge-${version}";
|
||||
version = "2.16.2";
|
||||
version = "2.17.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
|
||||
sha256 = "0idvqbra8a71jb5kq9y5v377l7k3shf4z7w71apc3rjvb4l0jkhj";
|
||||
sha256 = "0v83bcabchsz5fs0iv5i75ps01sga48hq4cx29dajcq3kf9xgwhr";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -152,7 +152,7 @@ checkout_ref(){
|
||||
if "$deepClone"; then
|
||||
# The caller explicitly asked for a deep clone. Deep clones
|
||||
# allow "git describe" and similar tools to work. See
|
||||
# http://thread.gmane.org/gmane.linux.distributions.nixos/3569
|
||||
# https://marc.info/?l=nix-dev&m=139641582514772
|
||||
# for a discussion.
|
||||
return 1
|
||||
fi
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "jsonnet-${version}";
|
||||
version = "0.11.2";
|
||||
version = "0.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "google";
|
||||
repo = "jsonnet";
|
||||
sha256 = "05rl5i4g36k2ikxv4sw726mha1qf5bb66wiqpi0s09wj9azm7vym";
|
||||
sha256 = "13a0sf1k8ivxhc28w0d0axzr0sj3jccl9sjq6l0dkyzrnmbxzmkb";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -26,7 +26,7 @@ with stdenv.lib;
|
||||
|
||||
let
|
||||
majorVersion = "3.6";
|
||||
minorVersion = "7";
|
||||
minorVersion = "8";
|
||||
minorVersionSuffix = "";
|
||||
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
|
||||
libPrefix = "python${majorVersion}";
|
||||
@ -51,7 +51,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
|
||||
sha256 = "0zgp8nvz3rkiz5cxd42vgpah4rvw3kmg9qz9lfq36rfnm40i9zc1";
|
||||
sha256 = "14qi6n5gpcjnwy165wi9hkfcmbadc95ny6bxxldknxwmx50n4i1m";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
|
||||
|
||||
@ -27,7 +27,7 @@ with stdenv.lib;
|
||||
|
||||
let
|
||||
majorVersion = "3.7";
|
||||
minorVersion = "1";
|
||||
minorVersion = "2";
|
||||
minorVersionSuffix = "";
|
||||
version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
|
||||
libPrefix = "python${majorVersion}";
|
||||
@ -56,7 +56,7 @@ in stdenv.mkDerivation {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
|
||||
sha256 = "0v9x4h22rh5cwpsq1mwpdi3c9lc9820lzp2nmn9g20llij72nzps";
|
||||
sha256 = "1fzi9d2gibh0wzwidyckzbywsxcsbckgsl05ryxlifxia77fhgyq";
|
||||
};
|
||||
|
||||
NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
|
||||
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
preConfigure =
|
||||
stdenv.lib.optionalString stdenv.isDarwin "sed -i -e 's|-Wl,-soname=$(SHLIBSONAME)||' configure";
|
||||
|
||||
# http://thread.gmane.org/gmane.linux.distributions.nixos/1328 for details.
|
||||
# https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01347.html for details.
|
||||
doCheck = false;
|
||||
|
||||
postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -7,7 +7,7 @@
|
||||
conf.set('demo_agent', '')
|
||||
endif
|
||||
|
||||
- conf_dir = join_paths(get_option('sysconfdir'), 'geoclue')
|
||||
+ conf_dir = join_paths(sysconfdir_install, 'geoclue')
|
||||
configure_file(output: 'geoclue.conf',
|
||||
input: 'geoclue.conf.in',
|
||||
configuration: conf,
|
||||
@@ -26,7 +26,7 @@
|
||||
# DBus Service policy file
|
||||
dbus_service_dir = get_option('dbus-sys-dir')
|
||||
if dbus_service_dir == ''
|
||||
- dbus_service_dir = join_paths(get_option('sysconfdir'), 'dbus-1', 'system.d')
|
||||
+ dbus_service_dir = join_paths(sysconfdir_install, 'dbus-1', 'system.d')
|
||||
endif
|
||||
configure_file(output: 'org.freedesktop.GeoClue2.conf',
|
||||
input: 'org.freedesktop.GeoClue2.conf.in',
|
||||
--- a/demo/meson.build
|
||||
+++ b/demo/meson.build
|
||||
@@ -56,8 +56,7 @@
|
||||
install_dir: desktop_dir)
|
||||
|
||||
# Also install in the autostart directory.
|
||||
- autostart_dir = join_paths(get_option('prefix'),
|
||||
- get_option('sysconfdir'),
|
||||
+ autostart_dir = join_paths(sysconfdir_install,
|
||||
'xdg', 'autostart')
|
||||
meson.add_install_script('install-file.py',
|
||||
desktop_file.full_path(),
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -22,6 +22,11 @@
|
||||
datadir = join_paths(get_option('prefix'), get_option('datadir'))
|
||||
conf.set_quoted('LOCALEDIR', datadir + '/locale')
|
||||
conf.set_quoted('SYSCONFDIR', get_option('sysconfdir'))
|
||||
+if get_option('sysconfdir_install') != ''
|
||||
+ sysconfdir_install = join_paths(get_option('prefix'), get_option('sysconfdir_install'))
|
||||
+else
|
||||
+ sysconfdir_install = get_option('sysconfdir')
|
||||
+endif
|
||||
|
||||
configure_file(output: 'config.h', configuration : conf)
|
||||
configinc = include_directories('.')
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -34,3 +34,6 @@
|
||||
option('dbus-srv-user',
|
||||
type: 'string', value: 'root',
|
||||
description: 'The user (existing) as which the service will run')
|
||||
+option('sysconfdir_install',
|
||||
+ type: 'string', value: '',
|
||||
+ description: 'sysconfdir to use during installation')
|
||||
@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0vww6irijw5ss7vawkdi5z5wdpcgw4iqljn5vs3vbd4y3d0lzrbs";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./add-option-for-installation-sysconfdir.patch
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "devdoc" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -36,6 +40,8 @@ stdenv.mkDerivation rec {
|
||||
mesonFlags = [
|
||||
"-Dsystemd-system-unit-dir=${placeholder "out"}/etc/systemd/system"
|
||||
"-Ddemo-agent=${if withDemoAgent then "true" else "false"}"
|
||||
"--sysconfdir=/etc"
|
||||
"-Dsysconfdir_install=${placeholder "out"}/etc"
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
"-D3g-source=false"
|
||||
"-Dcdma-source=false"
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- a/sample/gnomevfs/Makefile.in 2009-03-03 16:09:52.000000000 +0000
|
||||
+++ b/sample/gnomevfs/Makefile.in 2014-10-14 13:35:51.020427244 +0100
|
||||
@@ -218,7 +218,7 @@
|
||||
|
||||
@ENABLE_GNOMEVFS_FALSE@EXTRA_TARGETS =
|
||||
@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_FALSE@EXTRA_TARGETS =
|
||||
-@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS = TestXfer.exe
|
||||
+@ENABLE_GNOMEVFS_TRUE@@ENABLE_MONOGETOPTIONS_TRUE@EXTRA_TARGETS =
|
||||
assemblies = ../../gnomevfs/gnome-vfs-sharp.dll
|
||||
references = $(GTKSHARP_LIBS) $(addprefix /r:, $(assemblies))
|
||||
noinst_SCRIPTS = $(TARGETS) $(EXTRA_TARGETS)
|
||||
@ -1,17 +1,35 @@
|
||||
{stdenv, fetchurl, pkgconfig, gtk2, mono, gtk-sharp-2_0, gnome2}:
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkgconfig
|
||||
, gtk2
|
||||
, mono
|
||||
, gtk-sharp-2_0
|
||||
, gnome2
|
||||
, autoconf
|
||||
, automake
|
||||
, libtool
|
||||
, which
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gnome-sharp-2.24.1";
|
||||
src = fetchurl {
|
||||
url = http://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/gnome-sharp-2.24.1.tar.gz;
|
||||
sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gnome-sharp-${version}";
|
||||
version = "2.24.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mono";
|
||||
repo = "gnome-sharp";
|
||||
rev = "${version}";
|
||||
sha256 = "15jsm6n0sih0nf3w8vmvik97q7l3imz4vkdzmp9k7bssiz4glj1z";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig autoconf automake libtool which ];
|
||||
buildInputs = [ gtk2 mono gtk-sharp-2_0 ]
|
||||
++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]);
|
||||
++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui ]);
|
||||
|
||||
patches = [ ./Makefile.in.patch ];
|
||||
preConfigure = ''
|
||||
./bootstrap-${lib.versions.majorMinor version}
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
|
||||
@ -3,6 +3,8 @@ stdenv.mkDerivation rec {
|
||||
name = "gtest-${version}";
|
||||
version = "1.8.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "googletest";
|
||||
@ -12,6 +14,10 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Google's framework for writing C++ tests";
|
||||
homepage = https://github.com/google/googletest;
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
{ stdenv, fetchurl, pkgconfig, mono
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, pkgconfig
|
||||
, mono
|
||||
, glib
|
||||
, pango
|
||||
, gtk2
|
||||
@ -12,32 +16,44 @@
|
||||
, libgnomeprintui ? null
|
||||
, libxml2
|
||||
, monoDLLFixer
|
||||
, autoconf
|
||||
, automake
|
||||
, libtool
|
||||
, which
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "gtk-sharp-2.12.10";
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtk-sharp-${version}";
|
||||
version = "2.12.45";
|
||||
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = mirror://gnome/sources/gtk-sharp/2.12/gtk-sharp-2.12.10.tar.gz;
|
||||
sha256 = "1y55vc2cp4lggmbil2lb28d0gn71iq6wfyja1l9mya5xll8svzwc";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mono";
|
||||
repo = "gtk-sharp";
|
||||
rev = version;
|
||||
sha256 = "1vy6yfwkfv6bb45bzf4g6dayiqkvqqvlr02rsnhd10793hlpqlgg";
|
||||
};
|
||||
|
||||
# patches = [ ./dllmap-glue.patch ];
|
||||
|
||||
# patch bad usage of glib, which wasn't tolerated anymore
|
||||
prePatch = ''
|
||||
for f in glib/glue/{thread,list,slist}.c; do
|
||||
sed -i 's,#include <glib/.*\.h>,#include <glib.h>,g' "$f"
|
||||
postInstall = ''
|
||||
pushd $out/bin
|
||||
for f in gapi2-*
|
||||
do
|
||||
substituteInPlace $f --replace mono ${mono}/bin/mono
|
||||
done
|
||||
popd
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkgconfig autoconf automake libtool which ];
|
||||
|
||||
buildInputs = [
|
||||
mono glib pango gtk2 GConf libglade libgnomecanvas
|
||||
libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
./bootstrap-${lib.versions.majorMinor version}
|
||||
'';
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
inherit monoDLLFixer;
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
pname = "libhandy";
|
||||
version = "0.0.5";
|
||||
version = "0.0.6";
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
|
||||
owner = "Librem5";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0h25ckdfx3slc2mn4vi06bhw42nrqpzn75i9d7wby9iq0cl13l08";
|
||||
sha256 = "0gmqsxkpi288qjfdczfrbvjqyy9sbn3gligqwgqj27ask95zl1q5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libqmatrixclient-${version}";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "QMatrixClient";
|
||||
repo = "libqmatrixclient";
|
||||
rev = "v${version}";
|
||||
sha256 = "1llzqjagvp91kcg26q5c4qw9aaz7wna3rh6k06rc3baivrjqf3cn";
|
||||
sha256 = "16hi2xqlb4afspqw31c5w63qp0j4gkd6sl7j637b8cac2yigbbns";
|
||||
};
|
||||
|
||||
buildInputs = [ qtbase ];
|
||||
|
||||
@ -1,25 +1,31 @@
|
||||
{ stdenv, fetchFromGitHub, cmake }:
|
||||
{ stdenv, fetchurl, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libuchardet-${version}";
|
||||
pname = "uchardet";
|
||||
version = "0.0.6";
|
||||
|
||||
version = "0.0.5";
|
||||
outputs = [ "bin" "out" "man" "dev" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BYVoid";
|
||||
repo = "uchardet";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rkym5bhq3hn7623fy0fggw0qaghha71k8bi41ywqd2lchpahrrm";
|
||||
src = fetchurl {
|
||||
url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3";
|
||||
};
|
||||
|
||||
buildInputs = [ cmake ];
|
||||
|
||||
doCheck = false; # fails all the tests (ctest)
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests
|
||||
# TODO: move the following to CMake setup hook
|
||||
"-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin"
|
||||
"-DCMAKE_INSTALL_MANDIR=${placeholder "man"}/share/man"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Mozilla's Universal Charset Detector C/C++ API";
|
||||
homepage = https://www.byvoid.com/zht/project/uchardet;
|
||||
license = licenses.mpl11;
|
||||
homepage = https://www.freedesktop.org/wiki/Software/uchardet/;
|
||||
license = licenses.mpl11;
|
||||
maintainers = with maintainers; [ cstrahan ];
|
||||
platforms = with platforms; unix;
|
||||
};
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, lib, buildPythonPackage, fetchPypi, makeWrapper, isPy3k,
|
||||
python, twisted, jinja2, zope_interface, future, sqlalchemy,
|
||||
sqlalchemy_migrate, dateutil, txaio, autobahn, pyjwt, treq, txrequests,
|
||||
txgithub, pyjade, boto3, moto, mock, lz4, setuptoolsTrial, isort, pylint,
|
||||
txgithub, pyjade, boto3, moto, mock, python-lz4, setuptoolsTrial, isort, pylint,
|
||||
flake8, buildbot-worker, buildbot-pkg, glibcLocales }:
|
||||
|
||||
let
|
||||
@ -55,7 +55,7 @@ let
|
||||
boto3
|
||||
moto
|
||||
mock
|
||||
lz4
|
||||
python-lz4
|
||||
setuptoolsTrial
|
||||
isort
|
||||
pylint
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
, isPy3k
|
||||
, oauth2client
|
||||
, gdata
|
||||
, google_api_python_client
|
||||
, simplejson
|
||||
, httplib2
|
||||
, keyring
|
||||
@ -21,7 +22,7 @@ buildPythonPackage rec {
|
||||
sha256 = "139a98d646d5c5963670944d5cfcc1a107677ee11fa98329221bd600457fda6d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ oauth2client gdata simplejson httplib2 keyring six rsa ];
|
||||
propagatedBuildInputs = [ oauth2client gdata google_api_python_client simplejson httplib2 keyring six rsa ];
|
||||
|
||||
preConfigure = ''
|
||||
sed -i '/distribute/d' setup.py
|
||||
|
||||
@ -12,6 +12,8 @@ buildPythonPackage rec {
|
||||
sha256 = "14d288d1b3d3273cf96a729dd21a2470851c4962be8509f3dd62f0137ff90339";
|
||||
};
|
||||
|
||||
doCheck = false; # test_suite="tests" in setup.py but no tests in pypi.
|
||||
|
||||
meta = with lib; {
|
||||
description = "JSON RPC client library - Pelix compatible fork";
|
||||
homepage = https://pypi.python.org/pypi/jsonrpclib-pelix/;
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestrunner
|
||||
, pytest
|
||||
, psutil
|
||||
, pkgconfig
|
||||
, setuptools_scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lz4";
|
||||
version = "2.1.2";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ec265f7c3fc3df706e9579bde632ceeef9278858d7ae87c376a2954d11e9ea39";
|
||||
};
|
||||
|
||||
buildInputs = [ setuptools_scm pytestrunner pkgconfig ];
|
||||
checkInputs = [ pytest psutil ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Compression library";
|
||||
homepage = https://github.com/python-lz4/python-lz4;
|
||||
license = licenses.bsd3;
|
||||
};
|
||||
|
||||
}
|
||||
@ -3,6 +3,7 @@
|
||||
, fetchPypi
|
||||
, six
|
||||
, beautifulsoup4
|
||||
, lxml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -14,7 +15,7 @@ buildPythonPackage rec {
|
||||
sha256 = "d8c81fd5089332106da1a2e8919c412c7c677f08af04d557ca767701a04e0918";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six beautifulsoup4 ];
|
||||
propagatedBuildInputs = [ six beautifulsoup4 lxml ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "http://sites.google.com/site/ofxparse";
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
{ stdenv
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytest
|
||||
, pytestrunner
|
||||
, functools32
|
||||
, six
|
||||
, w3lib
|
||||
, lxml
|
||||
@ -19,13 +20,13 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
buildInputs = [ pytest pytestrunner ];
|
||||
propagatedBuildInputs = [ six w3lib lxml cssselect ];
|
||||
propagatedBuildInputs = [ functools32 six w3lib lxml cssselect ];
|
||||
|
||||
checkPhase = ''
|
||||
py.test
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/scrapy/parsel";
|
||||
description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors";
|
||||
license = licenses.bsd3;
|
||||
|
||||
@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-lz4";
|
||||
version = "2.1.0";
|
||||
version = "2.1.2";
|
||||
|
||||
# get full repository inorder to run tests
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1vjfplj37jcw1mf8l810dv76dx0raia3ylgyfy7sfsb3g17brjq6";
|
||||
sha256 = "1kzzdfkrq9nnlh0wssa6ccncvv0sk4wmhivhgyndjxz6d6przl5d";
|
||||
};
|
||||
|
||||
buildInputs = [ setuptools_scm pkgconfig pytestrunner ];
|
||||
@ -34,7 +34,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "LZ4 Bindings for Python";
|
||||
homepage = https://github.com/python-lz4/python-lz4;
|
||||
license = lib.licenses.bsd0;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [ costrouc ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ buildPythonPackage, pythonOlder,
|
||||
{ stdenv, fetchurl, buildPythonPackage, pythonOlder,
|
||||
cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
|
||||
fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake,
|
||||
fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis, numactl,
|
||||
linkFarm, symlinkJoin,
|
||||
utillinux, which }:
|
||||
|
||||
@ -25,7 +25,7 @@ let
|
||||
"LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ";
|
||||
|
||||
in buildPythonPackage rec {
|
||||
version = "0.4.1";
|
||||
version = "1.0.0";
|
||||
pname = "pytorch";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
@ -33,9 +33,17 @@ in buildPythonPackage rec {
|
||||
repo = "pytorch";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1cr8h47jxgfar5bamyvlayvqymnb2qvp7rr0ka2d2d4rdldf9lrp";
|
||||
sha256 = "076cpbig4sywn9vv674c0xdg832sdrd5pk1d0725pjkm436kpvlm";
|
||||
};
|
||||
|
||||
patches =
|
||||
[ # Skips two tests that are only meant to run on multi GPUs
|
||||
(fetchurl {
|
||||
url = "https://github.com/pytorch/pytorch/commit/bfa666eb0deebac21b03486e26642fd70d66e478.patch";
|
||||
sha256 = "1fgblcj02gjc0y62svwc5gnml879q3x2z7m69c9gax79dpr37s9i";
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString cudaSupport ''
|
||||
export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
|
||||
'' + lib.optionalString (cudaSupport && cudnn != null) ''
|
||||
@ -58,12 +66,24 @@ in buildPythonPackage rec {
|
||||
done
|
||||
'';
|
||||
|
||||
# Override the (weirdly) wrong version set by default. See
|
||||
# https://github.com/NixOS/nixpkgs/pull/52437#issuecomment-449718038
|
||||
# https://github.com/pytorch/pytorch/blob/v1.0.0/setup.py#L267
|
||||
PYTORCH_BUILD_VERSION = version;
|
||||
PYTORCH_BUILD_NUMBER = 0;
|
||||
|
||||
# Suppress a weird warning in mkl-dnn, part of ideep in pytorch
|
||||
# (upstream seems to have fixed this in the wrong place?)
|
||||
# https://github.com/intel/mkl-dnn/commit/8134d346cdb7fe1695a2aa55771071d455fae0bc
|
||||
NIX_CFLAGS_COMPILE = lib.optionals (numpy.blasImplementation == "mkl") [ "-Wno-error=array-bounds" ];
|
||||
|
||||
buildInputs = [
|
||||
cmake
|
||||
numpy.blas
|
||||
utillinux
|
||||
which
|
||||
] ++ lib.optionals cudaSupport [cudatoolkit_joined cudnn];
|
||||
] ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn ]
|
||||
++ lib.optionals stdenv.isLinux [ numactl ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cffi
|
||||
@ -71,15 +91,16 @@ in buildPythonPackage rec {
|
||||
pyyaml
|
||||
] ++ lib.optional (pythonOlder "3.5") typing;
|
||||
|
||||
checkInputs = [ hypothesis ];
|
||||
checkPhase = ''
|
||||
${cudaStubEnv}python test/run_test.py --exclude dataloader sparse torch utils distributed
|
||||
${cudaStubEnv}python test/run_test.py --exclude dataloader sparse torch utils thd_distributed distributed cpp_extensions
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Tensors and Dynamic neural networks in Python with strong GPU acceleration.";
|
||||
homepage = https://pytorch.org/;
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ teh ];
|
||||
description = "Open source, prototype-to-production deep learning platform";
|
||||
homepage = https://pytorch.org/;
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = with lib.maintainers; [ teh thoughtpolice ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, isPy27
|
||||
, fetchPypi
|
||||
, six
|
||||
, pillow
|
||||
@ -18,6 +19,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ six pillow pymaging_png ];
|
||||
checkInputs = [ mock ];
|
||||
doCheck = isPy27; # https://github.com/lincolnloop/python-qrcode/issues/163
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Quick Response code generation for Python";
|
||||
|
||||
24
pkgs/development/python-modules/secretstorage/2.nix
Normal file
24
pkgs/development/python-modules/secretstorage/2.nix
Normal file
@ -0,0 +1,24 @@
|
||||
{ lib, fetchPypi, buildPythonPackage, cryptography, dbus-python }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "secretstorage";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "SecretStorage";
|
||||
inherit version;
|
||||
sha256 = "1di9gx4m27brs6ar774m64s017iz742mnmw39kvfc8skfs3mrxis";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ cryptography dbus-python ];
|
||||
|
||||
# Needs a D-Bus Sesison
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://github.com/mitya57/secretstorage;
|
||||
description = "Python bindings to FreeDesktop.org Secret Service API";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ orivej ];
|
||||
};
|
||||
}
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
homepage = https://github.com/mitya57/secretstorage;
|
||||
description = "Python bindings to FreeDesktop.org Secret Service API";
|
||||
license = licenses.bsdOriginal;
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ teto ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
, tox
|
||||
, six
|
||||
, dateutil
|
||||
, kitchen
|
||||
, pytz
|
||||
, pkgs
|
||||
}:
|
||||
@ -28,7 +29,7 @@ buildPythonPackage rec {
|
||||
doCheck = false;
|
||||
|
||||
buildInputs = [ nose pkgs.taskwarrior tox ];
|
||||
propagatedBuildInputs = [ six dateutil pytz ];
|
||||
propagatedBuildInputs = [ six dateutil kitchen pytz ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://github.com/ralphbean/taskw;
|
||||
|
||||
@ -4,45 +4,11 @@ Date: Sun Nov 16 15:19:38 2014 +0100
|
||||
|
||||
Use a template for taskwarrior install path.
|
||||
|
||||
diff --git a/taskw/warrior.py b/taskw/warrior.py
|
||||
index 21dde88..e0509f2 100644
|
||||
--- a/taskw/warrior.py
|
||||
+++ b/taskw/warrior.py
|
||||
@@ -451,17 +451,17 @@ class TaskWarriorShellout(TaskWarriorBase):
|
||||
def _execute(self, *args):
|
||||
""" Execute a given taskwarrior command with arguments
|
||||
|
||||
Returns a 2-tuple of stdout and stderr (respectively).
|
||||
|
||||
"""
|
||||
command = (
|
||||
[
|
||||
@@ -449 +449 @@ class TaskWarriorShellout(TaskWarriorBase):
|
||||
- 'task',
|
||||
+ '@@taskwarrior@@/bin/task',
|
||||
'rc:%s' % self.config_filename,
|
||||
]
|
||||
+ self.get_configuration_override_args()
|
||||
+ [six.text_type(arg) for arg in args]
|
||||
)
|
||||
|
||||
# subprocess is expecting bytestrings only, so nuke unicode if present
|
||||
for i in range(len(command)):
|
||||
@@ -525,17 +525,17 @@ class TaskWarriorShellout(TaskWarriorBase):
|
||||
except OSError:
|
||||
# OSError is raised if subprocess.Popen fails to find
|
||||
# the executable.
|
||||
return False
|
||||
|
||||
@classmethod
|
||||
def get_version(cls):
|
||||
taskwarrior_version = subprocess.Popen(
|
||||
- ['task', '--version'],
|
||||
+ ['@@taskwarrior@@/bin/task', '--version'],
|
||||
stdout=subprocess.PIPE
|
||||
).communicate()[0]
|
||||
return LooseVersion(taskwarrior_version.decode())
|
||||
|
||||
def sync(self, init=False):
|
||||
if self.get_version() < LooseVersion('2.3'):
|
||||
raise UnsupportedVersionException(
|
||||
"'sync' requires version 2.3 of taskwarrior or later."
|
||||
@@ -553 +553 @@ class TaskWarriorShellout(TaskWarriorBase):
|
||||
- ['task', '--version'],
|
||||
+ ['@@taskwarrior@@/bin/task', '--version'],
|
||||
|
||||
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
# Note: The test-suite *requires* /dev/pts among the `build-chroot-dirs' of
|
||||
# the build daemon when building in a chroot. See
|
||||
# <http://thread.gmane.org/gmane.linux.distributions.nixos/1036> for
|
||||
# <https://www.mail-archive.com/nix-dev@cs.uu.nl/msg01056.html> for
|
||||
# details.
|
||||
|
||||
# The test-suite needs to have a non-empty stdin:
|
||||
|
||||
@ -19,7 +19,7 @@ with stdenv.lib;
|
||||
# make sure libglx.so of ati is used. xorg.xorgserver does provide it as well
|
||||
# which is a problem because it doesn't contain the xorgserver patch supporting
|
||||
# the XORG_DRI_DRIVER_PATH env var.
|
||||
# See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a
|
||||
# See https://marc.info/?l=nix-dev&m=139641585515351 for a
|
||||
# workaround (TODO)
|
||||
|
||||
# The gentoo ebuild contains much more "magic" and is usually a great resource to
|
||||
|
||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
||||
perlarchname=$(perl -e 'use Config; print $Config{archname};')
|
||||
installFlags="INSTALLSITEARCH=$out/${perl.libPrefix}/${perl.version}/$perlarchname INSTALLSITEMAN3DIR=$out/share/man/man3"
|
||||
|
||||
# http://comments.gmane.org/gmane.network.net-snmp.user/32434
|
||||
# http://article.gmane.org/gmane.network.net-snmp.user/32434
|
||||
substituteInPlace "man/Makefile.in" --replace 'grep -vE' '@EGREP@ -v'
|
||||
'';
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
|
||||
{ fetchbower, buildEnv }:
|
||||
buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
|
||||
(fetchbower "uchiwa-web" "1.3.1" "1.3.1" "0vhfwm4z3d4v4p2vfq1vvk4fifxm43f8lyccwpgmw153z4gj14gk")
|
||||
(fetchbower "uchiwa-web" "1.5.0" "1.5.0" "0z7g4nb7cm5w5l8w1856sbib15sx022mqpap9d49s6ppnn53vcs1")
|
||||
(fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws")
|
||||
(fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d")
|
||||
(fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn")
|
||||
@ -19,7 +19,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
|
||||
(fetchbower "highlightjs" "9.1.0" "~9.1.0" "0ld1da3h416a5j8v3v50rrpm4xwvvq8k8y2vwncvaqm9cqddz4s3")
|
||||
(fetchbower "moment" "2.16.0" "~2.16.0" "1mji892i60f2aw3vhl6878acrcgh0ycn3r4af0ivnjf8az2b9n71")
|
||||
(fetchbower "moment-picker" "0.9.11" "~0.9.7" "0p2g6rp2kcixydrga9lfihg4bxb598rvpi8n8l59mp549diy7vsb")
|
||||
(fetchbower "ua-parser-js" "0.7.18" "~0.7.12" "0qi7y5yrsdh2brpmwx0xs53bzr4pja5x1k2875x6zh259ag3zdkn")
|
||||
(fetchbower "ua-parser-js" "0.7.19" "~0.7.12" "0s1yaspccz234hm772hlybjsi0kndzwpjx5lzy3y1s4wfk248ks4")
|
||||
(fetchbower "jsoneditor" "5.5.11" "~5.5.10" "1gfsf8jqnd3hb3r9s9246mg40iqxk2ix8k4bjnrsbfmg6cd3xw6x")
|
||||
(fetchbower "jquery" "3.3.1" ">= 1.9.0" "1l891s3vgnpi1g8ksplid9jvrvnnv6lci8vraix4ssy50i264rkx")
|
||||
]; }
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
version = "1.3.1-1";
|
||||
sha256 = "1cjb7k19iy79hh9gbjx67yrz44y92s516d0h403bf6w272g23yzi";
|
||||
version = "1.5.0-1";
|
||||
sha256 = "05idwiv47zav46wi1hfly6rylpw8qryr12xlz47ic04ggdlga13b";
|
||||
}
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
{stdenv, fetchurl, python3, pylz4}:
|
||||
{ stdenv, fetchurl, python3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
pname = "mozlz4a";
|
||||
@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
chmod a+x "$out/bin/mozlz4a"
|
||||
'';
|
||||
|
||||
buildInputs = [ pylz4 python3 ];
|
||||
buildInputs = [ python3 python3.pkgs.python-lz4 ];
|
||||
|
||||
meta = {
|
||||
inherit version;
|
||||
|
||||
@ -74,8 +74,8 @@ stdenv.mkDerivation rec {
|
||||
++ optional (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc != "glibc") libiconv;
|
||||
|
||||
# The tests are known broken on Cygwin
|
||||
# (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
|
||||
# Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
|
||||
# (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19025),
|
||||
# Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
|
||||
# and {Open,Free}BSD.
|
||||
# With non-standard storeDir: https://github.com/NixOS/nix/issues/512
|
||||
doCheck = stdenv.hostPlatform == stdenv.buildPlatform
|
||||
|
||||
@ -1690,9 +1690,7 @@ in
|
||||
|
||||
mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
|
||||
|
||||
mozlz4a = callPackage ../tools/compression/mozlz4a {
|
||||
pylz4 = python3Packages.lz4;
|
||||
};
|
||||
mozlz4a = callPackage ../tools/compression/mozlz4a { };
|
||||
|
||||
msr-tools = callPackage ../os-specific/linux/msr-tools { };
|
||||
|
||||
@ -4780,7 +4778,7 @@ in
|
||||
|
||||
fmodex = callPackage ../games/zandronum/fmod.nix { };
|
||||
|
||||
pdfmod = callPackage ../applications/misc/pdfmod { mono = mono4; };
|
||||
pdfmod = callPackage ../applications/misc/pdfmod { };
|
||||
|
||||
pdf-quench = callPackage ../applications/misc/pdf-quench { };
|
||||
|
||||
@ -10284,7 +10282,7 @@ in
|
||||
|
||||
hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
|
||||
|
||||
hyena = callPackage ../development/libraries/hyena { mono = mono4; };
|
||||
hyena = callPackage ../development/libraries/hyena { };
|
||||
|
||||
hyperscan = callPackage ../development/libraries/hyperscan { };
|
||||
|
||||
|
||||
@ -648,6 +648,7 @@ in {
|
||||
python-hosts = callPackage ../development/python-modules/python-hosts { };
|
||||
|
||||
python-lz4 = callPackage ../development/python-modules/python-lz4 { };
|
||||
lz4 = self.python-lz4; # alias 2018-12-05
|
||||
|
||||
python-ldap-test = callPackage ../development/python-modules/python-ldap-test { };
|
||||
|
||||
@ -3268,8 +3269,6 @@ in {
|
||||
|
||||
ldappool = callPackage ../development/python-modules/ldappool { };
|
||||
|
||||
lz4 = callPackage ../development/python-modules/lz4 { };
|
||||
|
||||
retrying = callPackage ../development/python-modules/retrying { };
|
||||
|
||||
fasteners = callPackage ../development/python-modules/fasteners { };
|
||||
@ -4259,7 +4258,9 @@ in {
|
||||
|
||||
blessings = callPackage ../development/python-modules/blessings { };
|
||||
|
||||
secretstorage = callPackage ../development/python-modules/secretstorage { };
|
||||
secretstorage = if isPy3k
|
||||
then callPackage ../development/python-modules/secretstorage { }
|
||||
else callPackage ../development/python-modules/secretstorage/2.nix { };
|
||||
|
||||
semantic = callPackage ../development/python-modules/semantic { };
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user