mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
Merge branch 'master' into unused5
This commit is contained in:
Jörg Thalheim
GitHub
commit
218298b30f
@ -3,9 +3,9 @@
|
||||
|
||||
let
|
||||
inherit (builtins) head tail length;
|
||||
inherit (lib.trivial) and or;
|
||||
inherit (lib.trivial) and;
|
||||
inherit (lib.strings) concatStringsSep;
|
||||
inherit (lib.lists) fold concatMap concatLists all deepSeqList;
|
||||
inherit (lib.lists) fold concatMap concatLists;
|
||||
in
|
||||
|
||||
rec {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{lib, pkgs}:
|
||||
let inherit (lib) nv nvs; in
|
||||
let inherit (lib) nvs; in
|
||||
{
|
||||
|
||||
# composableDerivation basically mixes these features:
|
||||
|
||||
@ -1,9 +1,4 @@
|
||||
{ lib }:
|
||||
let
|
||||
|
||||
inherit (builtins) attrNames;
|
||||
|
||||
in
|
||||
|
||||
rec {
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ with lib.trivial;
|
||||
with lib.strings;
|
||||
let
|
||||
|
||||
inherit (lib.modules) mergeDefinitions filterOverrides;
|
||||
inherit (lib.modules) mergeDefinitions;
|
||||
outer_types =
|
||||
rec {
|
||||
isType = type: x: (x._type or "") == type;
|
||||
|
||||
@ -61,6 +61,29 @@ in
|
||||
'';
|
||||
};
|
||||
|
||||
# Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
|
||||
pubkeyAcceptedKeyTypes = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [
|
||||
"+ssh-dss"
|
||||
];
|
||||
example = [ "ssh-ed25519" "ssh-rsa" ];
|
||||
description = ''
|
||||
Specifies the key types that will be used for public key authentication.
|
||||
'';
|
||||
};
|
||||
|
||||
hostKeyAlgorithms = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = [
|
||||
"+ssh-dss"
|
||||
];
|
||||
example = [ "ssh-ed25519" "ssh-rsa" ];
|
||||
description = ''
|
||||
Specifies the host key algorithms that the client wants to use in order of preference.
|
||||
'';
|
||||
};
|
||||
|
||||
extraConfig = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
@ -188,9 +211,8 @@ in
|
||||
|
||||
ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
|
||||
|
||||
# Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
|
||||
PubkeyAcceptedKeyTypes +ssh-dss
|
||||
HostKeyAlgorithms +ssh-dss
|
||||
${optionalString (cfg.pubkeyAcceptedKeyTypes != []) "PubkeyAcceptedKeyTypes ${concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}
|
||||
${optionalString (cfg.hostKeyAlgorithms != []) "HostKeyAlgorithms ${concatStringsSep "," cfg.hostKeyAlgorithms}"}
|
||||
|
||||
${cfg.extraConfig}
|
||||
'';
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
inherit (lib) mkOption mkEnableOption mkIf mkMerge types;
|
||||
inherit (lib) mkOption mkIf types;
|
||||
|
||||
cfg = config.programs.tmux;
|
||||
|
||||
|
||||
@ -4,8 +4,6 @@ with lib;
|
||||
|
||||
let
|
||||
|
||||
inherit (pkgs) pam_usb;
|
||||
|
||||
cfg = config.security.pam.usb;
|
||||
|
||||
anyUsbAuth = any (attrByPath ["usbAuth"] false) (attrValues config.security.pam.services);
|
||||
|
||||
@ -28,11 +28,14 @@ let
|
||||
# temperatures are read from the file.
|
||||
#
|
||||
# For example:
|
||||
# sensor /proc/acpi/ibm/thermal (0, 0, 10)
|
||||
# tp_thermal /proc/acpi/ibm/thermal (0, 0, 10)
|
||||
# will add a fixed value of 10 °C the 3rd value read from that file. Check out
|
||||
# http://www.thinkwiki.org/wiki/Thermal_Sensors to find out how much you may
|
||||
# want to add to certain temperatures.
|
||||
|
||||
|
||||
${cfg.fan}
|
||||
${cfg.sensors}
|
||||
|
||||
# Syntax:
|
||||
# (LEVEL, LOW, HIGH)
|
||||
# LEVEL is the fan level to use (0-7 with thinkpad_acpi)
|
||||
@ -41,8 +44,6 @@ let
|
||||
# All numbers are integers.
|
||||
#
|
||||
|
||||
sensor ${cfg.sensor} (0, 10, 15, 2, 10, 5, 0, 3, 0, 3)
|
||||
|
||||
${cfg.levels}
|
||||
'';
|
||||
|
||||
@ -53,20 +54,52 @@ in {
|
||||
services.thinkfan = {
|
||||
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to enable thinkfan, fan controller for IBM/Lenovo ThinkPads.
|
||||
'';
|
||||
};
|
||||
|
||||
sensor = mkOption {
|
||||
default = "/proc/acpi/ibm/thermal";
|
||||
sensors = mkOption {
|
||||
type = types.lines;
|
||||
default = ''
|
||||
tp_thermal /proc/acpi/ibm/thermal (0,0,10)
|
||||
'';
|
||||
description =''
|
||||
Sensor used by thinkfan
|
||||
thinkfan can read temperatures from three possible sources:
|
||||
|
||||
/proc/acpi/ibm/thermal
|
||||
Which is provided by the thinkpad_acpi kernel
|
||||
module (keyword tp_thermal)
|
||||
|
||||
/sys/class/hwmon/*/temp*_input
|
||||
Which may be provided by any hwmon drivers (keyword
|
||||
hwmon)
|
||||
|
||||
S.M.A.R.T. (since 0.9 and requires the USE_ATASMART compilation flag)
|
||||
Which reads the temperature directly from the hard
|
||||
disk using libatasmart (keyword atasmart)
|
||||
|
||||
Multiple sensors may be added, in which case they will be
|
||||
numbered in their order of appearance.
|
||||
'';
|
||||
};
|
||||
|
||||
fan = mkOption {
|
||||
type = types.str;
|
||||
default = "tp_fan /proc/acpi/ibm/fan";
|
||||
description =''
|
||||
Specifies the fan we want to use.
|
||||
On anything other than a Thinkpad you'll probably
|
||||
use some PWM control file in /sys/class/hwmon.
|
||||
A sysfs fan would be specified like this:
|
||||
pwm_fan /sys/class/hwmon/hwmon2/device/pwm1
|
||||
'';
|
||||
};
|
||||
|
||||
levels = mkOption {
|
||||
type = types.lines;
|
||||
default = ''
|
||||
(0, 0, 55)
|
||||
(1, 48, 60)
|
||||
@ -76,8 +109,12 @@ in {
|
||||
(7, 60, 85)
|
||||
(127, 80, 32767)
|
||||
'';
|
||||
description =''
|
||||
Sensor used by thinkfan
|
||||
description = ''
|
||||
(LEVEL, LOW, HIGH)
|
||||
LEVEL is the fan level to use (0-7 with thinkpad_acpi).
|
||||
LOW is the temperature at which to step down to the previous level.
|
||||
HIGH is the temperature at which to step up to the next level.
|
||||
All numbers are integers.
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
@ -4,8 +4,6 @@ with lib;
|
||||
|
||||
let
|
||||
|
||||
inherit (pkgs) stdenv writeText procps;
|
||||
|
||||
udev = config.systemd.package;
|
||||
|
||||
cfg = config.services.udev;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, pkgs, lib, ... } @ args:
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
inherit (lib) mkOption mkEnableOption mkIf mkMerge types optionalAttrs optional;
|
||||
inherit (lib) mkOption mkEnableOption mkIf mkMerge types optional;
|
||||
|
||||
cfg = config.services.uptime;
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ config, lib, pkgs, ...}:
|
||||
|
||||
let
|
||||
inherit (lib) concatStringsSep getBin mkOption types;
|
||||
inherit (lib) concatStringsSep mkOption types;
|
||||
|
||||
in rec {
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
with import ./lib.nix { inherit config lib pkgs; };
|
||||
|
||||
let
|
||||
inherit (lib) concatStringsSep intersperse mapAttrsToList mkForce mkIf mkMerge mkOption optionalString types;
|
||||
inherit (lib) concatStringsSep mkIf mkOption optionalString types;
|
||||
|
||||
bosConfig = pkgs.writeText "BosConfig" (''
|
||||
restrictmode 1
|
||||
|
||||
@ -4,8 +4,6 @@ with lib;
|
||||
|
||||
let
|
||||
|
||||
inherit (pkgs) chrony;
|
||||
|
||||
stateDir = "/var/lib/chrony";
|
||||
|
||||
keyFile = "/etc/chrony.keys";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
|
||||
inherit (lib) mkOption mkIf singleton;
|
||||
inherit (lib) mkOption mkIf;
|
||||
|
||||
inherit (pkgs) heimdalFull;
|
||||
|
||||
|
||||
@ -7,8 +7,6 @@ let
|
||||
nssModulesPath = config.system.nssModules.path;
|
||||
cfg = config.services.nscd;
|
||||
|
||||
inherit (lib) singleton;
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
inherit (lib) mkOption types mkIf optionalString;
|
||||
inherit (lib) mkOption types mkIf;
|
||||
|
||||
cfg = config.services.kmscon;
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ let
|
||||
xcfg = config.services.xserver;
|
||||
cfg = xcfg.desktopManager.plasma5;
|
||||
|
||||
inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg;
|
||||
inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5;
|
||||
|
||||
in
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@ let
|
||||
ldmcfg = dmcfg.lightdm;
|
||||
cfg = ldmcfg.greeters.gtk;
|
||||
|
||||
inherit (pkgs) stdenv lightdm writeScript writeText;
|
||||
inherit (pkgs) writeText;
|
||||
|
||||
theme = cfg.theme.package;
|
||||
icons = cfg.iconTheme.package;
|
||||
|
||||
@ -13,7 +13,7 @@ let
|
||||
wmDefault = xcfg.windowManager.default;
|
||||
hasDefaultUserSession = dmDefault != "none" || wmDefault != "none";
|
||||
|
||||
inherit (pkgs) stdenv lightdm writeScript writeText;
|
||||
inherit (pkgs) lightdm writeScript writeText;
|
||||
|
||||
# lightdm runs with clearenv(), but we need a few things in the enviornment for X to startup
|
||||
xserverWrapper = writeScript "xserver-wrapper"
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
|
||||
with lib;
|
||||
let
|
||||
inherit (lib) mkOption mkIf;
|
||||
cfg = config.services.xserver.windowManager.openbox;
|
||||
in
|
||||
|
||||
|
||||
@ -2,7 +2,6 @@
|
||||
|
||||
with lib;
|
||||
let
|
||||
inherit (lib) mkOption mkIf singleton;
|
||||
cfg = config.services.xserver.windowManager.wmii;
|
||||
wmii = pkgs.wmii_hg;
|
||||
in
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, python3Packages, gnome3, gtk3, gobjectIntrospection}:
|
||||
|
||||
let
|
||||
inherit (python3Packages) buildPythonApplication python isPy3k dbus-python pygobject3 mpd2;
|
||||
inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2;
|
||||
in buildPythonApplication rec {
|
||||
pname = "sonata";
|
||||
version = "1.7b1";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, coreutils, gnugrep, which, git, unzip, libsecret
|
||||
}:
|
||||
|
||||
{ name, product, version, src, wmClass, jdk, meta } @ attrs:
|
||||
{ name, product, version, src, wmClass, jdk, meta }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
|
||||
@ -10,11 +10,11 @@
|
||||
|
||||
mkDerivation rec {
|
||||
name = "krita-${version}";
|
||||
version = "4.1.0";
|
||||
version = "4.1.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
|
||||
sha256 = "1mbyybc7h3sblbaklvz0cci3ys4zcyi616fgdn06p62v2vw2sybq";
|
||||
sha256 = "1qz9bjvnwa5gc2b0063i2p72jq6y1b6kgqdj39599acp7ws11asw";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake extra-cmake-modules ];
|
||||
|
||||
@ -17,12 +17,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.10.0";
|
||||
version = "3.10.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "nomacs";
|
||||
repo = "nomacs";
|
||||
rev = version;
|
||||
sha256 = "07k921r4m6p5kicyb55zdfp58m8mlc94g2csq354d7v20m71zwrv";
|
||||
sha256 = "0v2gsdc8caswf2b5aa023d8kil1fqf4r9mlg15180h3c92f8jzvh";
|
||||
};
|
||||
|
||||
name = "nomacs-${version}";
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "3.27.1";
|
||||
version = "3.28.0";
|
||||
name = "calibre-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
|
||||
sha256 = "0hmdlnwrfql2b675xmjf50hnnrrkv5jbky0ssdpyfjfa5vxya2bh";
|
||||
sha256 = "0b3vv03c6m6972sk8zj3zc5sq6b9837irnfgjlqhv9z5i75m0414";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, gtk3, keybinder3, libnotify, libutempter, vte }:
|
||||
|
||||
let
|
||||
version = "3.3.0";
|
||||
version = "3.3.2";
|
||||
in python3.pkgs.buildPythonApplication rec {
|
||||
name = "guake-${version}";
|
||||
format = "other";
|
||||
@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec {
|
||||
owner = "Guake";
|
||||
repo = "guake";
|
||||
rev = version;
|
||||
sha256 = "1wckzz18rpgacnkynh4rknhhki52agd76i2p80kk9rlrdifqs788";
|
||||
sha256 = "0cz58wfsa66j01sqpka7908ilj5ch3jdxaxzqdi8yspqwzz5iwc7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ];
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, fetchpatch, cmake, xlibsWrapper, libX11, libXi, libXtst, libXrandr
|
||||
, xinput, curl, openssl, unzip }:
|
||||
|
||||
with stdenv.lib;
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchurl, cmake, xlibsWrapper
|
||||
, ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver
|
||||
, libX11, libXi, libXtst, libXrandr, xinput, curl, openssl, unzip }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "synergy-${version}";
|
||||
@ -14,17 +13,33 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0ksgr9hkf09h54572p7k7b9zkfhcdb2g2d5x7ixxn028y8i3jyp3";
|
||||
};
|
||||
|
||||
patches = [ ./openssl-1.1.patch ];
|
||||
patches = [./openssl-1.1.patch ./update_gtest_gmock.patch
|
||||
] ++ lib.optional stdenv.isDarwin ./respect_macos_arch.patch;
|
||||
|
||||
patch_gcc6 = fetchpatch {
|
||||
url = https://raw.githubusercontent.com/gentoo/gentoo/20e2bff3697ebf5f291e9907b34aae3074a36b53/dev-cpp/gmock/files/gmock-1.7.0-gcc6.patch;
|
||||
sha256 = "0j3f381x1lf8qci9pfv6mliggl8qs2w05v5lw3rs3gn7aibg174d";
|
||||
};
|
||||
|
||||
# Due to the included gtest and gmock not supporting clang
|
||||
# we replace it with 1.7.0 for synergy-1.8.8. This should
|
||||
# become unnecessary when we update to a newer version of Synergy.
|
||||
gmock_zip = fetchurl {
|
||||
url = https://github.com/google/googlemock/archive/release-1.7.0.zip;
|
||||
sha256 = "11bd04098rzamv7f9y01zaf9c8zrmzdk6g1qrlwq780pxzlr4ya0";
|
||||
};
|
||||
|
||||
gtest_zip = fetchurl {
|
||||
url = https://github.com/google/googletest/archive/release-1.7.0.zip;
|
||||
sha256 = "1l5n6kzdypjzjrz2jh14ylzrx735lccfx2p3s4ccgci8g9abg35m";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
${unzip}/bin/unzip -d ext/gmock-1.6.0 ext/gmock-1.6.0.zip
|
||||
${unzip}/bin/unzip -d ext/gtest-1.6.0 ext/gtest-1.6.0.zip
|
||||
patch -d ext/gmock-1.6.0 -p1 -i ${patch_gcc6}
|
||||
${unzip}/bin/unzip -d ext/ ${gmock_zip}
|
||||
${unzip}/bin/unzip -d ext/ ${gtest_zip}
|
||||
mv ext/googlemock-release-1.7.0 ext/gmock-1.7.0
|
||||
mv ext/googletest-release-1.7.0 ext/gtest-1.7.0
|
||||
patch -d ext/gmock-1.7.0 -p1 -i ${patch_gcc6}
|
||||
''
|
||||
# We have XRRNotifyEvent (libXrandr), but with the upstream CMakeLists.txt
|
||||
# it's not able to find it (it's trying to search the store path of libX11
|
||||
@ -38,15 +53,19 @@ stdenv.mkDerivation rec {
|
||||
# Looking for XRRNotifyEvent - not found
|
||||
#
|
||||
# So let's force it:
|
||||
+ optionalString stdenv.isLinux ''
|
||||
+ lib.optionalString stdenv.isLinux ''
|
||||
sed -i -e '/HAVE_X11_EXTENSIONS_XRANDR_H/c \
|
||||
set(HAVE_X11_EXTENSIONS_XRANDR_H true)
|
||||
' CMakeLists.txt
|
||||
'';
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.isDarwin [ "-DOSX_TARGET_MAJOR=10" "-DOSX_TARGET_MINOR=7" ];
|
||||
|
||||
buildInputs = [
|
||||
cmake xlibsWrapper libX11 libXi libXtst libXrandr xinput curl openssl
|
||||
];
|
||||
cmake curl openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
ApplicationServices Carbon Cocoa CoreServices ScreenSaver
|
||||
] ++ lib.optionals stdenv.isLinux [ xlibsWrapper libX11 libXi libXtst libXrandr xinput ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
@ -58,12 +77,11 @@ stdenv.mkDerivation rec {
|
||||
doCheck = true;
|
||||
checkPhase = "../bin/unittests";
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Share one mouse and keyboard between multiple computers";
|
||||
homepage = http://synergy-project.org/;
|
||||
license = licenses.gpl2;
|
||||
maintainers = [ maintainers.aszlig ];
|
||||
maintainers = with maintainers; [ aszlig enzime ];
|
||||
platforms = platforms.all;
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
||||
|
||||
61
pkgs/applications/misc/synergy/respect_macos_arch.patch
Normal file
61
pkgs/applications/misc/synergy/respect_macos_arch.patch
Normal file
@ -0,0 +1,61 @@
|
||||
From 944177c76d4c7ff5ef3460eab28286a45344a0e7 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Hoang <enzime@users.noreply.github.com>
|
||||
Date: Sat, 14 Jul 2018 21:56:59 +1000
|
||||
Subject: [PATCH 2/2] Make sure CMake respects the current arch on macOS
|
||||
|
||||
Only set the macOS architecture if not defined by the user. Use the
|
||||
OpenSSL libraries and headers from Nix on macOS to prevent architecture
|
||||
mismatches.
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
src/CMakeLists.txt | 14 +-------------
|
||||
2 files changed, 2 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2f37424d..c7217e28 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -172,7 +172,7 @@ if (UNIX)
|
||||
# <= 10.5: 32-bit Intel and PowerPC
|
||||
set(CMAKE_OSX_ARCHITECTURES "ppc;i386"
|
||||
CACHE STRING "" FORCE)
|
||||
- else()
|
||||
+ elseif (NOT CMAKE_OSX_ARCHITECTURES)
|
||||
# >= 10.6: Intel only
|
||||
set(CMAKE_OSX_ARCHITECTURES "i386"
|
||||
CACHE STRING "" FORCE)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 237ba484..04428636 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -23,11 +23,6 @@ if (WIN32)
|
||||
set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/inc32)
|
||||
endif()
|
||||
|
||||
-if (APPLE)
|
||||
- set(OPENSSL_PLAT_DIR openssl-osx)
|
||||
- set(OPENSSL_INCLUDE ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/include)
|
||||
-endif()
|
||||
-
|
||||
if (WIN32)
|
||||
set(OPENSSL_LIBS
|
||||
${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib
|
||||
@@ -36,14 +31,7 @@ if (WIN32)
|
||||
endif()
|
||||
|
||||
if (UNIX)
|
||||
- if (APPLE)
|
||||
- set(OPENSSL_LIBS
|
||||
- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libssl.a
|
||||
- ${CMAKE_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/libcrypto.a
|
||||
- )
|
||||
- else()
|
||||
- set(OPENSSL_LIBS ssl crypto)
|
||||
- endif()
|
||||
+ set(OPENSSL_LIBS ssl crypto)
|
||||
endif()
|
||||
|
||||
add_subdirectory(lib)
|
||||
--
|
||||
2.17.1
|
||||
|
||||
158
pkgs/applications/misc/synergy/update_gtest_gmock.patch
Normal file
158
pkgs/applications/misc/synergy/update_gtest_gmock.patch
Normal file
@ -0,0 +1,158 @@
|
||||
From eea85dbf4bbde545d8cb07d7ee9fbdca3dcf48fd Mon Sep 17 00:00:00 2001
|
||||
From: Michael Hoang <enzime@users.noreply.github.com>
|
||||
Date: Sat, 14 Jul 2018 22:07:39 +1000
|
||||
Subject: [PATCH 1/2] Update gtest and gmock to version 1.7.0
|
||||
|
||||
Fixes compilation under clang on macOS as <tr1/tuple> is now found under
|
||||
<tuple>.
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
ext/toolchain/commands1.py | 4 ++--
|
||||
src/lib/platform/CMakeLists.txt | 2 +-
|
||||
src/lib/server/CMakeLists.txt | 2 +-
|
||||
src/lib/shared/CMakeLists.txt | 2 +-
|
||||
src/lib/synergy/CMakeLists.txt | 2 +-
|
||||
src/test/CMakeLists.txt | 12 ++++++------
|
||||
src/test/integtests/CMakeLists.txt | 4 ++--
|
||||
src/test/unittests/CMakeLists.txt | 4 ++--
|
||||
9 files changed, 17 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 94c474e8..2f37424d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -178,7 +178,7 @@ if (UNIX)
|
||||
CACHE STRING "" FORCE)
|
||||
endif()
|
||||
|
||||
- set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -DGTEST_USE_OWN_TR1_TUPLE=1")
|
||||
+ set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS}")
|
||||
|
||||
find_library(lib_ScreenSaver ScreenSaver)
|
||||
find_library(lib_IOKit IOKit)
|
||||
diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py
|
||||
index f32ec483..bf997cf6 100644
|
||||
--- a/ext/toolchain/commands1.py
|
||||
+++ b/ext/toolchain/commands1.py
|
||||
@@ -251,10 +251,10 @@ class InternalCommands:
|
||||
macIdentity = None
|
||||
|
||||
# gtest dir with version number
|
||||
- gtestDir = 'gtest-1.6.0'
|
||||
+ gtestDir = 'gtest-1.7.0'
|
||||
|
||||
# gmock dir with version number
|
||||
- gmockDir = 'gmock-1.6.0'
|
||||
+ gmockDir = 'gmock-1.7.0'
|
||||
|
||||
win32_generators = {
|
||||
1 : VisualStudioGenerator('10'),
|
||||
diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt
|
||||
index 481d8ef9..1ce67eca 100644
|
||||
--- a/src/lib/platform/CMakeLists.txt
|
||||
+++ b/src/lib/platform/CMakeLists.txt
|
||||
@@ -31,7 +31,7 @@ endif()
|
||||
|
||||
include_directories(
|
||||
../
|
||||
- ../../../ext/gtest-1.6.0/include
|
||||
+ ../../../ext/gtest-1.7.0/include
|
||||
)
|
||||
|
||||
if (UNIX)
|
||||
diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt
|
||||
index 3cb582ec..0525d627 100644
|
||||
--- a/src/lib/server/CMakeLists.txt
|
||||
+++ b/src/lib/server/CMakeLists.txt
|
||||
@@ -24,7 +24,7 @@ endif()
|
||||
include_directories(
|
||||
../
|
||||
../../../ext
|
||||
- ../../../ext/gtest-1.6.0/include
|
||||
+ ../../../ext/gtest-1.7.0/include
|
||||
)
|
||||
|
||||
if (UNIX)
|
||||
diff --git a/src/lib/shared/CMakeLists.txt b/src/lib/shared/CMakeLists.txt
|
||||
index 891f4aa7..16c8b04a 100644
|
||||
--- a/src/lib/shared/CMakeLists.txt
|
||||
+++ b/src/lib/shared/CMakeLists.txt
|
||||
@@ -25,7 +25,7 @@ add_library(shared STATIC ${sources})
|
||||
include_directories(
|
||||
../
|
||||
../../../ext
|
||||
- ../../../ext/gtest-1.6.0/include
|
||||
+ ../../../ext/gtest-1.7.0/include
|
||||
)
|
||||
|
||||
target_link_libraries(shared arch base)
|
||||
diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt
|
||||
index 0972be8c..e19fcce5 100644
|
||||
--- a/src/lib/synergy/CMakeLists.txt
|
||||
+++ b/src/lib/synergy/CMakeLists.txt
|
||||
@@ -36,7 +36,7 @@ endif()
|
||||
include_directories(
|
||||
../
|
||||
../../../ext
|
||||
- ../../../ext/gtest-1.6.0/include
|
||||
+ ../../../ext/gtest-1.7.0/include
|
||||
)
|
||||
|
||||
if (UNIX)
|
||||
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
|
||||
index 8812150a..04cdfc50 100644
|
||||
--- a/src/test/CMakeLists.txt
|
||||
+++ b/src/test/CMakeLists.txt
|
||||
@@ -15,13 +15,13 @@
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
include_directories(
|
||||
- ../../ext/gtest-1.6.0
|
||||
- ../../ext/gtest-1.6.0/include
|
||||
- ../../ext/gmock-1.6.0
|
||||
- ../../ext/gmock-1.6.0/include)
|
||||
+ ../../ext/gtest-1.7.0
|
||||
+ ../../ext/gtest-1.7.0/include
|
||||
+ ../../ext/gmock-1.7.0
|
||||
+ ../../ext/gmock-1.7.0/include)
|
||||
|
||||
-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc)
|
||||
-add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc)
|
||||
+add_library(gtest STATIC ../../ext/gtest-1.7.0/src/gtest-all.cc)
|
||||
+add_library(gmock STATIC ../../ext/gmock-1.7.0/src/gmock-all.cc)
|
||||
|
||||
if (UNIX)
|
||||
# ignore warnings in gtest and gmock
|
||||
diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
|
||||
index 2f1ca7f3..6ddbd29a 100644
|
||||
--- a/src/test/integtests/CMakeLists.txt
|
||||
+++ b/src/test/integtests/CMakeLists.txt
|
||||
@@ -56,8 +56,8 @@ endif()
|
||||
include_directories(
|
||||
../../
|
||||
../../lib/
|
||||
- ../../../ext/gtest-1.6.0/include
|
||||
- ../../../ext/gmock-1.6.0/include
|
||||
+ ../../../ext/gtest-1.7.0/include
|
||||
+ ../../../ext/gmock-1.7.0/include
|
||||
)
|
||||
|
||||
if (UNIX)
|
||||
diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
|
||||
index 3e49dc3c..5f6c4fac 100644
|
||||
--- a/src/test/unittests/CMakeLists.txt
|
||||
+++ b/src/test/unittests/CMakeLists.txt
|
||||
@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources})
|
||||
include_directories(
|
||||
../../
|
||||
../../lib/
|
||||
- ../../../ext/gtest-1.6.0/include
|
||||
- ../../../ext/gmock-1.6.0/include
|
||||
+ ../../../ext/gtest-1.7.0/include
|
||||
+ ../../../ext/gmock-1.7.0/include
|
||||
../../../ext
|
||||
)
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, version, sha256s, ... } @ args:
|
||||
{ stdenv, fetchurl, version, sha256s, ... }:
|
||||
|
||||
let
|
||||
arch = {
|
||||
|
||||
@ -64,8 +64,6 @@ let
|
||||
|
||||
version = chromium.browser.version;
|
||||
|
||||
inherit (stdenv.lib) versionAtLeast;
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
name = "chromium${suffix}-${version}";
|
||||
inherit version;
|
||||
|
||||
@ -40,11 +40,11 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "signal-desktop-${version}";
|
||||
version = "1.14.3";
|
||||
version = "1.14.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
sha256 = "1z8z32d7ic28zg4mgk3cjmzb6kpism7xzym2ng25b0ndf72g1vfi";
|
||||
sha256 = "0590r7748kv6g7zygq95v8qxf7vi2n5ypj6734x9yshrn8z6p8lr";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
@ -11,8 +11,7 @@
|
||||
assert pulseaudioSupport -> libpulseaudio != null;
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) concatStringsSep makeBinPath makeLibraryPath
|
||||
makeSearchPath optional optionalString;
|
||||
inherit (stdenv.lib) concatStringsSep makeBinPath optional;
|
||||
|
||||
version = "2.2.128200.0702";
|
||||
srcs = {
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
, runCommand }:
|
||||
|
||||
let
|
||||
inherit (pythonPackages) python pycrypto pync;
|
||||
inherit (pythonPackages) python;
|
||||
plugins = [
|
||||
{ name = "perl"; enabled = perlSupport; cmakeFlag = "ENABLE_PERL"; buildInputs = [ perl ]; }
|
||||
{ name = "tcl"; enabled = tclSupport; cmakeFlag = "ENABLE_TCL"; buildInputs = [ tcl ]; }
|
||||
|
||||
@ -27,11 +27,11 @@ with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mutt-${version}";
|
||||
version = "1.10.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
|
||||
sha256 = "0nskymwr2cdapxlfv0ysz3bjwhb4kcvl5a3c39237k7r1vwva582";
|
||||
sha256 = "182lkbkpd3q3l1x6bvyds90ycp38gyyxhf35ry0d3hwf2n1khjkk";
|
||||
};
|
||||
|
||||
patches = optional smimeSupport (fetchpatch {
|
||||
|
||||
@ -15,14 +15,14 @@ let
|
||||
'';
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
version = "20180622";
|
||||
version = "20180716";
|
||||
name = "neomutt-${version}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "neomutt";
|
||||
repo = "neomutt";
|
||||
rev = "neomutt-${version}";
|
||||
sha256 = "0rwrxghsxbkbkdyi0544nglip8ri2xi8fn15m0wg5hg52xzcq40i";
|
||||
sha256 = "0im2kkahkr04q04irvcimfawxi531ld6wrsa92r2m7l10gmijkl8";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
|
||||
--replace /etc/mime.types ${mime-types}/etc/mime.types
|
||||
|
||||
# The string conversion tests all fail with the first version of neomutt
|
||||
# that has tests (20180223) as well as 20180622 so we disable them for now.
|
||||
# that has tests (20180223) as well as 20180716 so we disable them for now.
|
||||
# I don't know if that is related to the tests or our build environment.
|
||||
# Try again with a later release.
|
||||
sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c
|
||||
|
||||
@ -4,8 +4,7 @@
|
||||
installExamples ? true,
|
||||
installEmacsMode ? true }:
|
||||
|
||||
let inherit (stdenv.lib) versionAtLeast
|
||||
optionals optionalString; in
|
||||
let inherit (stdenv.lib) versionAtLeast optionalString; in
|
||||
|
||||
let inherit (ocamlPackages) ocaml camlp4; in
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (nixpkgs) fetchpatch fetchurl symlinkJoin fetchFromGitHub callPackage nodePackages_8_x;
|
||||
inherit (nixpkgs) fetchpatch fetchurl symlinkJoin callPackage nodePackages_8_x;
|
||||
|
||||
# https://trac.sagemath.org/ticket/15980 for tracking of python3 support
|
||||
python = nixpkgs.python2.override {
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchFromGitHub, pythonPackages, gettext, git }:
|
||||
|
||||
let
|
||||
inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock;
|
||||
inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify;
|
||||
in buildPythonApplication rec {
|
||||
name = "git-cola-${version}";
|
||||
version = "3.1";
|
||||
|
||||
@ -12,11 +12,11 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gitkraken-${version}";
|
||||
version = "3.6.4";
|
||||
version = "3.6.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://release.gitkraken.com/linux/v${version}.deb";
|
||||
sha256 = "0n14lwmga0hhi4m4pwgpzpxmsmfy6an7b2pk59afsydhxjj88z4x";
|
||||
sha256 = "01ir325ls1fb6ml79c02c7dyi910lxw0avlwc0nzv8fy4aqavl6p";
|
||||
};
|
||||
|
||||
libPath = makeLibraryPath [
|
||||
|
||||
@ -56,8 +56,8 @@ in python2Packages.buildPythonApplication {
|
||||
meta = {
|
||||
inherit version;
|
||||
description = "A fast, lightweight SCM system for very large distributed projects";
|
||||
homepage = http://mercurial.selenic.com/;
|
||||
downloadPage = "http://mercurial.selenic.com/release/";
|
||||
homepage = https://www.mercurial-scm.org;
|
||||
downloadPage = https://www.mercurial-scm.org/release/;
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = [ stdenv.lib.maintainers.eelco ];
|
||||
updateWalker = true;
|
||||
|
||||
@ -7,23 +7,10 @@
|
||||
, fontconfig, intltool }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "cinelerra-git";
|
||||
|
||||
# # REGION AUTO UPDATE: { name="cinelerra"; type="git"; url="git://git.cinelerra.org/j6t/cinelerra.git"; }
|
||||
# src= sourceFromHead "cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"
|
||||
# (fetchurl { url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz"; sha256 = "0b264e2a770d2257550c9a23883a060afcaff12293fe43828954e7373f5f4fb4"; });
|
||||
# # END
|
||||
name = "cinelerra-unstable-2016-01-12";
|
||||
|
||||
src = fetchgit {
|
||||
url = "git://git.cinelerra-cv.org/j6t/cinelerra.git";
|
||||
# 2.3
|
||||
#rev = "58ef118e63bf2fac8c99add372c584e93b008bae";
|
||||
#sha256 = "1wx8c9rvh4y7fgg39lb02cy3sanms8a4fayr70jbhcb4rp691lph";
|
||||
# master 22 nov 2016
|
||||
#rev = "dbc22e0f35a9e8c274b06d4075b51dc9bace34aa";
|
||||
#sha256 = "0c76j98ws1x2s5hzcdlykxm2bi7987d9nanka428xj62id0grla5";
|
||||
|
||||
# j6t/cinelerra.git
|
||||
rev = "454be60e201c18c1fc3f1f253a6d2184fcfc94c4";
|
||||
sha256 = "1n4kshqhgnr7aivsi8dgx48phyd2nzvv4szbc82mndklvs9jfb7r";
|
||||
};
|
||||
|
||||
@ -17,7 +17,7 @@ infoFile: let
|
||||
${lib.concatStrings (map (dep: let
|
||||
inherit (dep)
|
||||
url sha1 groupId artifactId version
|
||||
authenticated metadata extension repository-id;
|
||||
authenticated metadata repository-id;
|
||||
|
||||
versionDir = dep.unresolved-version or version;
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ fetchurl }:
|
||||
|
||||
fetchurl {
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/e6e8a920e43237ccd2f66d6a349b5932a5eba1f5.tar.gz";
|
||||
sha256 = "0xyw1a5fp6swyxsj79hihivq9fpzzvl4apv34399a1n4ch6qhbf3";
|
||||
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/92b4fe519b988dee70e2ef8f2f1d05edf610ba8a.tar.gz";
|
||||
sha256 = "15sh85v57k635q5ir8pwa605cchj12h4sflss8zd1xshy7ywi673";
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
let
|
||||
mkNixBackground = { name, src, description } @ attrs:
|
||||
mkNixBackground = { name, src, description }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit name src;
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "mate-panel-${version}";
|
||||
version = "1.21.0";
|
||||
version = "1.21.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
|
||||
sha256 = "0vn523jscmxhyv80fmrnvk1wmyp4kdzr4g7yypqnsg4kg2gmr7x0";
|
||||
sha256 = "0093pimqkx5db2nciksgrmq02hldg08p7hghafky3njl0kzv8l5z";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ stdenv, pkgs, erlang }:
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) getVersion versionAtLeast makeExtensible;
|
||||
inherit (stdenv.lib) makeExtensible;
|
||||
|
||||
lib = pkgs.callPackage ./lib.nix {};
|
||||
|
||||
|
||||
@ -49,7 +49,6 @@ rec {
|
||||
*/
|
||||
callElixir = drv: args:
|
||||
let
|
||||
inherit (stdenv.lib) versionAtLeast;
|
||||
builder = callPackage ../interpreters/elixir/generic-builder.nix args;
|
||||
in
|
||||
callPackage drv {
|
||||
@ -71,7 +70,6 @@ rec {
|
||||
*/
|
||||
callLFE = drv: args:
|
||||
let
|
||||
inherit (stdenv.lib) versionAtLeast;
|
||||
builder = callPackage ../interpreters/lfe/generic-builder.nix args;
|
||||
in
|
||||
callPackage drv {
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
inherit (stdenv.lib) optionals optionalString;
|
||||
|
||||
clangHack = writeScriptBin "clang" ''
|
||||
#!${stdenv.shell}
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
let
|
||||
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
inherit (stdenv.lib) optionals optionalString;
|
||||
|
||||
clangHack = writeScriptBin "clang" ''
|
||||
#!${stdenv.shell}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
let
|
||||
useX11 = stdenv.isi686 || stdenv.isx86_64;
|
||||
inherit (stdenv.lib) optionals optionalString;
|
||||
inherit (stdenv.lib) optionals;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -6,8 +6,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) getLib optionalString;
|
||||
inherit (darwin) libiconv;
|
||||
inherit (stdenv.lib) optionalString;
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
|
||||
bootstrapping = versionType == "bootstrap";
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
, doCheck ? true
|
||||
, broken ? false
|
||||
, buildPlatform, hostPlatform
|
||||
} @ args:
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) optional optionalString;
|
||||
|
||||
@ -86,7 +86,7 @@ self: super: {
|
||||
name = "git-annex-${super.git-annex.version}-src";
|
||||
url = "git://git-annex.branchable.com/";
|
||||
rev = "refs/tags/" + super.git-annex.version;
|
||||
sha256 = "0q9z5q7vrcqa831wni972kchcdivqp55x1z2fgmdp8jfq4pidvyb";
|
||||
sha256 = "1l6xgvn3l0kkly5jvg57msx09bf1jwdff7m61w8yf2pxsrh5ybxl";
|
||||
};
|
||||
}).override {
|
||||
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
|
||||
|
||||
@ -96,4 +96,83 @@ self: super: {
|
||||
haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);
|
||||
}));
|
||||
|
||||
} // # All the following is needed to build tensorflow.
|
||||
(
|
||||
let
|
||||
tensorflow-haskell = pkgs.fetchFromGitHub {
|
||||
owner = "tensorflow";
|
||||
repo = "haskell";
|
||||
rev = "e40d2c44f0a861701cc90ec73c2bcee669ab5ba7";
|
||||
sha256 = "05pda34jfrlqmb8y9l8g87n4iq87v1z820vnd3cy41v5c5nrdpa8";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
in
|
||||
{
|
||||
proto-lens-descriptors = super.proto-lens-descriptors.override {
|
||||
proto-lens = self.proto-lens_0_2_2_0;
|
||||
lens-labels = self.lens-labels_0_1_0_2;
|
||||
};
|
||||
proto-lens-protoc_0_2_2_3 = super.proto-lens-protoc_0_2_2_3.override {
|
||||
haskell-src-exts = self.haskell-src-exts_1_19_1;
|
||||
};
|
||||
proto-lens-protobuf-types_0_2_2_0 = super.proto-lens-protobuf-types_0_2_2_0.override {
|
||||
proto-lens = self.proto-lens_0_2_2_0;
|
||||
proto-lens-protoc = self.proto-lens-protoc_0_2_2_3;
|
||||
};
|
||||
tensorflow-proto = (super.callPackage (
|
||||
{ mkDerivation, base, Cabal, proto-lens, proto-lens-protobuf-types
|
||||
, proto-lens-protoc, stdenv
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "tensorflow-proto";
|
||||
version = "0.1.0.0";
|
||||
src = tensorflow-haskell;
|
||||
setupHaskellDepends = [ base Cabal proto-lens-protoc ];
|
||||
libraryHaskellDepends = [
|
||||
base proto-lens proto-lens-protobuf-types proto-lens-protoc
|
||||
];
|
||||
libraryToolDepends = [ pkgs.protobuf ];
|
||||
homepage = "https://github.com/tensorflow/haskell#readme";
|
||||
description = "TensorFlow protocol buffers";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
}
|
||||
) {
|
||||
proto-lens = self.proto-lens_0_2_2_0;
|
||||
proto-lens-protoc = self.proto-lens-protoc_0_2_2_3;
|
||||
proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_2_2_0;
|
||||
}).overrideAttrs (_oldAttrs: {
|
||||
sourceRoot = "source/tensorflow-proto";
|
||||
});
|
||||
tensorflow = (super.callPackage (
|
||||
{ mkDerivation, async, attoparsec, base, bytestring, c2hs
|
||||
, containers, data-default, exceptions, fgl, HUnit, lens-family
|
||||
, mainland-pretty, mtl, proto-lens, semigroups, split, stdenv
|
||||
, temporary, libtensorflow, tensorflow-proto, test-framework
|
||||
, test-framework-hunit, test-framework-quickcheck2, text
|
||||
, transformers, vector
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "tensorflow";
|
||||
version = "0.1.0.2";
|
||||
src = tensorflow-haskell;
|
||||
libraryHaskellDepends = [
|
||||
async attoparsec base bytestring containers data-default exceptions
|
||||
fgl lens-family mainland-pretty mtl proto-lens semigroups split
|
||||
temporary tensorflow-proto text transformers vector
|
||||
];
|
||||
librarySystemDepends = [ libtensorflow ];
|
||||
libraryToolDepends = [ c2hs ];
|
||||
testHaskellDepends = [
|
||||
attoparsec base bytestring HUnit lens-family proto-lens
|
||||
tensorflow-proto test-framework test-framework-hunit
|
||||
test-framework-quickcheck2
|
||||
];
|
||||
homepage = "https://github.com/tensorflow/haskell#readme";
|
||||
description = "TensorFlow bindings";
|
||||
license = stdenv.lib.licenses.asl20;
|
||||
}
|
||||
) {}).overrideAttrs (_oldAttrs: {
|
||||
sourceRoot = "source/tensorflow";
|
||||
});
|
||||
}
|
||||
)
|
||||
|
||||
@ -2392,6 +2392,7 @@ extra-packages:
|
||||
- http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227
|
||||
- inline-c < 0.6 # required on GHC 8.0.x
|
||||
- inline-c-cpp < 0.2 # required on GHC 8.0.x
|
||||
- lens-labels == 0.1.* # required for proto-lens-descriptors
|
||||
- mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
|
||||
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
|
||||
- network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below
|
||||
@ -2399,6 +2400,9 @@ extra-packages:
|
||||
- persistent >=2.5 && <2.8 # pre-lts-11.x versions neeed by git-annex 6.20180227
|
||||
- persistent-sqlite < 2.7 # pre-lts-11.x versions neeed by git-annex 6.20180227
|
||||
- primitive == 0.5.1.* # required to build alex with GHC 6.12.3
|
||||
- proto-lens == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x
|
||||
- proto-lens-protoc == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x
|
||||
- proto-lens-protobuf-types == 0.2.* # required for tensorflow-proto-0.1.x on GHC 8.2.x
|
||||
- QuickCheck < 2 # required by test-framework-quickcheck and its users
|
||||
- resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227
|
||||
- seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x
|
||||
@ -2581,6 +2585,7 @@ dont-distribute-packages:
|
||||
passman-core: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reflex-dom-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reflex-dom-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reflex-dom-fragment-shader-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reflex-dom-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reflex-dom: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
reflex-jsx: [ i686-linux, x86_64-linux, x86_64-darwin ]
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
let
|
||||
|
||||
inherit (lib) extends makeExtensible;
|
||||
inherit (haskellLib) overrideCabal makePackageSet;
|
||||
inherit (haskellLib) makePackageSet;
|
||||
|
||||
haskellPackages = pkgs.callPackage makePackageSet {
|
||||
package-set = initialPackages;
|
||||
|
||||
1001
pkgs/development/haskell-modules/hackage-packages.nix
generated
1001
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load Diff
@ -28,7 +28,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) optional;
|
||||
wrapper = ./hoogle-local-wrapper.sh;
|
||||
isGhcjs = ghc.isGhcjs or false;
|
||||
opts = lib.optionalString;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ stdenv, fetchFromGitHub, makeWrapper }:
|
||||
let
|
||||
version = "0.7.3";
|
||||
version = "0.8";
|
||||
name = "chibi-scheme-${version}";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
@ -18,7 +18,7 @@ stdenv.mkDerivation {
|
||||
owner = "ashinn";
|
||||
repo = "chibi-scheme";
|
||||
rev = version;
|
||||
sha256 = "05b17flppkll1a2c2aq6lxh4iif4pjmpxmyrmiqzk0ls85gvai2x";
|
||||
sha256 = "0269d5fhaz7nqjb41vh7yz63mp5s4z08fn4sspwc06z32xksigw9";
|
||||
};
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
assert enableSerialization -> boost != null;
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
inherit (stdenv.lib) optional optionals;
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
*/
|
||||
|
||||
let
|
||||
inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux isAarch32;
|
||||
inherit (stdenv) isDarwin isFreeBSD isLinux isAarch32;
|
||||
inherit (stdenv.lib) optional optionals enableFeature;
|
||||
|
||||
cmpVer = builtins.compareVersions;
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
inherit (stdenv.lib) optional optionalString;
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "freetype-${version}";
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
assert gtkSupport -> gtk3 != null;
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
inherit (stdenv.lib) optional optionals;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gst-plugins-good-1.14.0";
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
{ stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.16.1";
|
||||
version = "1.17";
|
||||
name = "commons-compress-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz";
|
||||
sha256 = "0yz2m3qac1idg9346i64mjfrkq4kniajzx2manyybhj43v9dpx37";
|
||||
sha256 = "1ydm6mhy0kja47mns674iyrhz5mqlhhnh2l8rglzxnq5iawpi2m0";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -12,7 +12,7 @@ stdenv.mkDerivation {
|
||||
name = "frog-${release.version}";
|
||||
version = release.version;
|
||||
src = fetchurl { inherit (release) url sha256;
|
||||
name = "frog-${release.version}.tar.gz"; };
|
||||
name = "frog-v${release.version}.tar.gz"; };
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
buildInputs = [ automake autoconf bzip2 libtar libtool autoconf-archive
|
||||
libxml2 icu
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
{
|
||||
"version": "v0.13",
|
||||
"version": "0.13",
|
||||
"url": "https://api.github.com/repos/LanguageMachines/frogdata/tarball/v0.13",
|
||||
"sha256": "13mhv8qacl0n20ddl1ay49xi6h2m0a149ya3rrsmaah3x4adb4sg"
|
||||
}
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
assert faacSupport -> enableUnfree;
|
||||
|
||||
let inherit (stdenv.lib) optional optionals hasPrefix enableFeature; in
|
||||
let inherit (stdenv.lib) optional hasPrefix enableFeature; in
|
||||
|
||||
/* ToDo:
|
||||
- more deps, inspiration: https://packages.ubuntu.com/raring/libav-tools
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
|
||||
, python, perl, gdk_pixbuf, libiconv, libintl }:
|
||||
|
||||
let inherit (stdenv.lib) optionals; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libgsf-1.14.42";
|
||||
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libsvm-${version}";
|
||||
version = "3.22";
|
||||
version = "3.23";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/libsvm-${version}.tar.gz";
|
||||
sha256 = "0zd7s19y5vb7agczl6456bn45cj1y64739sslaskw1qk7dywd0bd";
|
||||
sha256 = "0jpaq0rr92x38p4nk3gjan79ip67m6p80anb28z1d8601miysyi5";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
32
pkgs/development/libraries/libtensorflow/default.nix
Normal file
32
pkgs/development/libraries/libtensorflow/default.nix
Normal file
@ -0,0 +1,32 @@
|
||||
{ stdenv, fetchurl, patchelf }:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libtensorflow";
|
||||
version = "1.8.0";
|
||||
name = "${pname}-${version}";
|
||||
src = fetchurl {
|
||||
url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-cpu-linux-x86_64-${version}.tar.gz";
|
||||
sha256 = "0qzy15rc3x961cyi3bqnygrcnw4x69r28xkwhpwrv1r0gi6k73ha";
|
||||
};
|
||||
|
||||
# Patch library to use our libc, libstdc++ and others
|
||||
buildCommand = ''
|
||||
. $stdenv/setup
|
||||
mkdir -pv $out
|
||||
tar -C $out -xzf $src
|
||||
chmod +w $out/lib/libtensorflow.so
|
||||
chmod +w $out/lib/libtensorflow_framework.so
|
||||
${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib:$out/lib" $out/lib/libtensorflow.so
|
||||
${patchelf}/bin/patchelf --set-rpath "${stdenv.cc.libc}/lib:${stdenv.cc.cc.lib}/lib" $out/lib/libtensorflow_framework.so
|
||||
chmod -w $out/lib/libtensorflow.so
|
||||
chmod -w $out/lib/libtensorflow_framework.so
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
inherit version;
|
||||
description = "C API for TensorFlow";
|
||||
license = licenses.asl20;
|
||||
maintainers = [maintainers.basvandijk];
|
||||
platforms = platforms.linux;
|
||||
homepage = https://www.tensorflow.org/versions/master/install/install_c;
|
||||
};
|
||||
}
|
||||
@ -40,7 +40,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin;
|
||||
inherit (stdenv) is64bit isMips isDarwin isCygwin;
|
||||
inherit (stdenv.lib) enableFeature optional optionals;
|
||||
in
|
||||
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
{ stdenv, fetchurl, readline, mysql, postgresql, sqlite }:
|
||||
|
||||
let
|
||||
inherit (stdenv.lib) getDev getLib;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opendbx-1.4.6";
|
||||
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "opensubdiv-${version}";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PixarAnimationStudios";
|
||||
repo = "OpenSubdiv";
|
||||
rev = "v${lib.replaceChars ["."] ["_"] version}";
|
||||
sha256 = "1s96038yvf8wch5gv537iigqflxx7rh9wwn3wlrk8f9yfdwv1mk1";
|
||||
sha256 = "0j3vh52w1pnld2a2cm6z7iicni1f617qzg0d8xh3p7l0s2dxjibh";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
@ -11,8 +11,7 @@ let
|
||||
atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
|
||||
else null;
|
||||
usedLibExtension = if shared then ".so" else ".a";
|
||||
inherit (stdenv.lib) optional optionals concatStringsSep;
|
||||
inherit (builtins) hasAttr attrNames;
|
||||
inherit (stdenv.lib) optional optionals;
|
||||
version = "3.8.0";
|
||||
in
|
||||
|
||||
|
||||
@ -8,13 +8,13 @@ assert ncclSupport -> cudaSupport;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "xgboost-${version}";
|
||||
version = "0.7";
|
||||
version = "0.72";
|
||||
|
||||
# needs submodules
|
||||
src = fetchgit {
|
||||
url = "https://github.com/dmlc/xgboost";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "1wxh020l4q037hc5z7vgxflb70l41a97anl8g6y4wxb74l5zv61l";
|
||||
sha256 = "1d4kw2jm7d12g8qwi7p9r3429y7sjks9xp9yhvfpx5jh7qakkxj6";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec{
|
||||
name = "zimg-${version}";
|
||||
version = "2.7.4";
|
||||
version = "2.7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sekrit-twc";
|
||||
repo = "zimg";
|
||||
rev = "release-${version}";
|
||||
sha256 = "1gpmf6algpl1g1z891jfnsici84scg2cq1kj4v90glgik9z99mci";
|
||||
sha256 = "1f4iv99w1sn7kp8xlv2vr20m6qif7c8km1vqjfs9kf2305z5lxww";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''alexandria'';
|
||||
version = ''20170830-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''array-utils'';
|
||||
version = ''20180131-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''asdf-finalizers'';
|
||||
version = ''20170403-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''asdf-system-connections'';
|
||||
version = ''20170124-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''chipz'';
|
||||
version = ''20180328-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''cl-aa'';
|
||||
version = ''cl-vectors-20180228-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''cl-anonfun'';
|
||||
version = ''20111203-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''cl-html-parse'';
|
||||
version = ''20161031-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''cl-l10n-cldr'';
|
||||
version = ''20120909-darcs'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''cl-log'';
|
||||
version = ''cl-log.1.0.1'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''cl-markup'';
|
||||
version = ''20131003-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''cl-paths'';
|
||||
version = ''cl-vectors-20180228-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''cl-unification'';
|
||||
version = ''20171227-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''cl-utilities'';
|
||||
version = ''1.2.4'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''clack-socket'';
|
||||
version = ''clack-20180328-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''closer-mop'';
|
||||
version = ''20180430-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''command-line-arguments'';
|
||||
version = ''20151218-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''css-lite'';
|
||||
version = ''20120407-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''db3'';
|
||||
version = ''cl-20150302-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''eos'';
|
||||
version = ''20150608-git'';
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
args @ { fetchurl, ... }:
|
||||
{ fetchurl, ... }:
|
||||
rec {
|
||||
baseName = ''garbage-pools'';
|
||||
version = ''20130720-git'';
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user