github-actions[bot]
3 years ago
committed by
GitHub
commit
b7d0ebd8f8
@ -0,0 +1,32 @@ |
||||
{ trivialBuild |
||||
, lib |
||||
, fetchFromGitHub |
||||
, curl |
||||
, plz |
||||
, cl-lib |
||||
, ts |
||||
}: |
||||
|
||||
trivialBuild { |
||||
pname = "ement"; |
||||
version = "unstable-2021-09-08"; |
||||
|
||||
packageRequires = [ |
||||
plz |
||||
cl-lib |
||||
ts |
||||
]; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "alphapapa"; |
||||
repo = "ement.el"; |
||||
rev = "468aa9b0526aaa054f059c63797aa3d9ea13611d"; |
||||
sha256 = "sha256-0FCAu253iTSf9qcsmoJxKlzfd5eYc8eJXUxG6+0eg/I="; |
||||
}; |
||||
|
||||
meta = { |
||||
description = "Ement.el is a Matrix client for Emacs"; |
||||
license = lib.licenses.gpl3Only; |
||||
platforms = lib.platforms.all; |
||||
}; |
||||
} |
||||
@ -0,0 +1,23 @@ |
||||
{ trivialBuild, lib, fetchFromGitHub, curl }: |
||||
|
||||
trivialBuild { |
||||
pname = "plz"; |
||||
version = "unstable-2021-08-22"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "alphapapa"; |
||||
repo = "plz.el"; |
||||
rev = "7e456638a651bab3a814e3ea81742dd917509cbb"; |
||||
sha256 = "sha256-8kn9ax1AVF6f9iCTqvVeJZihs03pYAhLjUDooG/ubxY="; |
||||
}; |
||||
|
||||
postPatch = '' |
||||
substituteInPlace ./plz.el --replace 'plz-curl-program "curl"' 'plz-curl-program "${curl}/bin/curl"' |
||||
''; |
||||
|
||||
meta = { |
||||
description = "plz is an HTTP library for Emacs"; |
||||
license = lib.licenses.gpl3Only; |
||||
platforms = lib.platforms.all; |
||||
}; |
||||
} |
||||
@ -1 +1 @@ |
||||
WGET_ARGS=( http://download.kde.org/stable/release-service/21.04.0/src -A '*.tar.xz' ) |
||||
WGET_ARGS=( http://download.kde.org/stable/release-service/21.08.0/src -A '*.tar.xz' ) |
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,23 @@ |
||||
{ lib |
||||
, fetchurl |
||||
, appimageTools |
||||
}: |
||||
|
||||
let |
||||
version = "1.7.1"; |
||||
in |
||||
appimageTools.wrapType2 { |
||||
name = "session-desktop-appimage-${version}"; |
||||
src = fetchurl { |
||||
url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; |
||||
sha256 = "126dx37099pjaqgfv5gbmvn5iiwv2a8lvfbqy5i9h1w1gqnihwq6"; |
||||
}; |
||||
|
||||
meta = with lib; { |
||||
description = "Onion routing based messenger"; |
||||
homepage = "https://getsession.org/"; |
||||
license = licenses.gpl3Only; |
||||
maintainers = with maintainers; [ alexnortung ]; |
||||
platforms = [ "x86_64-linux" ]; |
||||
}; |
||||
} |
||||
@ -1,28 +1,31 @@ |
||||
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
|
||||
index 1afe9fc858..05dd7c3a90 100644
|
||||
index 3db4eab4ba..39bc0e77c9 100644
|
||||
--- a/Documentation/git-send-email.txt
|
||||
+++ b/Documentation/git-send-email.txt
|
||||
@@ -215,8 +215,7 @@ a password is obtained using 'git-credential'.
|
||||
specify a full pathname of a sendmail-like program instead;
|
||||
the program must support the `-i` option. Default value can
|
||||
be specified by the `sendemail.smtpServer` configuration
|
||||
- option; the built-in default is to search for `sendmail` in
|
||||
- `/usr/sbin`, `/usr/lib` and $PATH if such program is
|
||||
+ option; the built-in default is to search in $PATH if such program is
|
||||
available, falling back to `localhost` otherwise.
|
||||
|
||||
--smtp-server-port=<port>::
|
||||
@@ -220,9 +220,9 @@ a password is obtained using 'git-credential'.
|
||||
--smtp-server=<host>::
|
||||
If set, specifies the outgoing SMTP server to use (e.g.
|
||||
`smtp.example.com` or a raw IP address). If unspecified, and if
|
||||
- `--sendmail-cmd` is also unspecified, the default is to search
|
||||
- for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a
|
||||
- program is available, falling back to `localhost` otherwise.
|
||||
+ `--sendmail-cmd` is also unspecified, the default is to search for
|
||||
+ `sendmail` in $PATH if such a program is available, falling back to
|
||||
+ `localhost` otherwise.
|
||||
+
|
||||
For backward compatibility, this option can also specify a full pathname
|
||||
of a sendmail-like program instead; the program must support the `-i`
|
||||
diff --git a/git-send-email.perl b/git-send-email.perl
|
||||
index 8eb63b5a2f..74a61d8213 100755
|
||||
index e65d969d0b..508d49483d 100755
|
||||
--- a/git-send-email.perl
|
||||
+++ b/git-send-email.perl
|
||||
@@ -956,8 +956,7 @@ sub expand_one_alias {
|
||||
@@ -1066,8 +1066,7 @@ sub expand_one_alias {
|
||||
}
|
||||
|
||||
if (!defined $smtp_server) {
|
||||
if (!defined $sendmail_cmd && !defined $smtp_server) {
|
||||
- my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail );
|
||||
- push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH};
|
||||
+ my @sendmail_paths = map {"$_/sendmail"} split /:/, $ENV{PATH};
|
||||
foreach (@sendmail_paths) {
|
||||
if (-x $_) {
|
||||
$smtp_server = $_;
|
||||
$sendmail_cmd = $_;
|
||||
|
||||
@ -0,0 +1,58 @@ |
||||
{ lib |
||||
, stdenv |
||||
, fetchFromGitHub |
||||
, scfbuild |
||||
, nodejs |
||||
, nodePackages |
||||
, python3Packages |
||||
, variant ? "color" # "color" or "black" |
||||
}: |
||||
|
||||
let |
||||
filename = builtins.replaceStrings |
||||
[ "color" "black" ] |
||||
[ "OpenMoji-Color.ttf" "OpenMoji-Black.ttf" ] |
||||
variant; |
||||
|
||||
in stdenv.mkDerivation rec { |
||||
pname = "openmoji"; |
||||
version = "13.1.0"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "hfg-gmuend"; |
||||
repo = pname; |
||||
rev = version; |
||||
sha256 = "sha256-7G6a+LFq79njyPhnDhhSJ98Smw5fWlfcsFj6nWBPsSk="; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
scfbuild |
||||
nodejs |
||||
nodePackages.glob |
||||
nodePackages.lodash |
||||
]; |
||||
|
||||
buildPhase = '' |
||||
runHook preBuild |
||||
|
||||
node helpers/generate-font-glyphs.js |
||||
|
||||
cd font |
||||
scfbuild -c scfbuild-${variant}.yml |
||||
|
||||
runHook postBuild |
||||
''; |
||||
|
||||
installPhase = '' |
||||
install -Dm644 ${filename} $out/share/fonts/truetype/${filename} |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
license = licenses.cc-by-sa-40; |
||||
maintainers = with maintainers; [ fgaz ]; |
||||
platforms = platforms.all; |
||||
homepage = "https://openmoji.org/"; |
||||
downloadPage = "https://github.com/hfg-gmuend/openmoji/releases"; |
||||
description = "Open-source emojis for designers, developers and everyone else"; |
||||
}; |
||||
} |
||||
@ -1,71 +0,0 @@ |
||||
diff --git a/lib/sanitizer_common/sanitizer_mac.cpp b/lib/sanitizer_common/sanitizer_mac.cpp
|
||||
--- a/lib/sanitizer_common/sanitizer_mac.cpp
|
||||
+++ b/lib/sanitizer_common/sanitizer_mac.cpp
|
||||
@@ -613,9 +613,15 @@ HandleSignalMode GetHandleSignalMode(int signum) {
|
||||
// Offset example:
|
||||
// XNU 17 -- macOS 10.13 -- iOS 11 -- tvOS 11 -- watchOS 4
|
||||
constexpr u16 GetOSMajorKernelOffset() {
|
||||
- if (TARGET_OS_OSX) return 4;
|
||||
- if (TARGET_OS_IOS || TARGET_OS_TV) return 6;
|
||||
- if (TARGET_OS_WATCH) return 13;
|
||||
+#if TARGET_OS_OSX
|
||||
+ return 4;
|
||||
+#endif
|
||||
+#if TARGET_OS_IOS || TARGET_OS_TV
|
||||
+ return 6;
|
||||
+#endif
|
||||
+#if TARGET_OS_WATCH
|
||||
+ return 13;
|
||||
+#endif
|
||||
}
|
||||
|
||||
using VersStr = char[64];
|
||||
@@ -627,13 +633,13 @@ static uptr ApproximateOSVersionViaKernelVersion(VersStr vers) {
|
||||
u16 os_major = kernel_major - offset;
|
||||
|
||||
const char *format = "%d.0";
|
||||
- if (TARGET_OS_OSX) {
|
||||
- if (os_major >= 16) { // macOS 11+
|
||||
- os_major -= 5;
|
||||
- } else { // macOS 10.15 and below
|
||||
- format = "10.%d";
|
||||
- }
|
||||
+#if TARGET_OS_OSX
|
||||
+ if (os_major >= 16) { // macOS 11+
|
||||
+ os_major -= 5;
|
||||
+ } else { // macOS 10.15 and below
|
||||
+ format = "10.%d";
|
||||
}
|
||||
+#endif
|
||||
return internal_snprintf(vers, sizeof(VersStr), format, os_major);
|
||||
}
|
||||
|
||||
@@ -681,15 +687,14 @@ void ParseVersion(const char *vers, u16 *major, u16 *minor) {
|
||||
// Aligned versions example:
|
||||
// macOS 10.15 -- iOS 13 -- tvOS 13 -- watchOS 6
|
||||
static void MapToMacos(u16 *major, u16 *minor) {
|
||||
- if (TARGET_OS_OSX)
|
||||
- return;
|
||||
-
|
||||
- if (TARGET_OS_IOS || TARGET_OS_TV)
|
||||
+#if !TARGET_OS_OSX
|
||||
+#if TARGET_OS_IOS || TARGET_OS_TV
|
||||
*major += 2;
|
||||
- else if (TARGET_OS_WATCH)
|
||||
+#elif TARGET_OS_WATCH
|
||||
*major += 9;
|
||||
- else
|
||||
+#else
|
||||
UNREACHABLE("unsupported platform");
|
||||
+#endif
|
||||
|
||||
if (*major >= 16) { // macOS 11+
|
||||
*major -= 5;
|
||||
@@ -697,6 +702,7 @@ static void MapToMacos(u16 *major, u16 *minor) {
|
||||
*minor = *major;
|
||||
*major = 10;
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
static MacosVersion GetMacosAlignedVersionInternal() {
|
||||
@ -0,0 +1,19 @@ |
||||
{ lib, mkCoqDerivation, coq, version ? null }: |
||||
|
||||
with lib; |
||||
mkCoqDerivation { |
||||
|
||||
pname = "ceres"; |
||||
repo = "coq-ceres"; |
||||
owner = "Lysxia"; |
||||
|
||||
inherit version; |
||||
defaultVersion = if versions.isGe "8.8" coq.version then "0.4.0" else null; |
||||
release."0.4.0".sha256 = "sha256:0zwp3pn6fdj0qdig734zdczrls886al06mxqhhabms0jvvqijmbi"; |
||||
|
||||
meta = { |
||||
description = "Library for serialization to S-expressions"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ Zimmi48 ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,22 @@ |
||||
{ lib, mkCoqDerivation, coq, ceres, coq-ext-lib, version ? null }: |
||||
|
||||
with lib; |
||||
mkCoqDerivation { |
||||
|
||||
pname = "parsec"; |
||||
repo = "coq-parsec"; |
||||
owner = "liyishuai"; |
||||
|
||||
propagatedBuildInputs = [ ceres coq-ext-lib ]; |
||||
releaseRev = (v: "v${v}"); |
||||
|
||||
inherit version; |
||||
defaultVersion = if versions.isGe "8.12" coq.version then "0.1.0" else null; |
||||
release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr"; |
||||
|
||||
meta = { |
||||
description = "Library for serialization to S-expressions"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ Zimmi48 ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,15 @@ |
||||
diff --git a/setup.py b/setup.py
|
||||
index 04eb6b2..2e1160d 100644
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1981,8 +1981,8 @@ class PyBuildExt(build_ext):
|
||||
# Rather than complicate the code below, detecting and building
|
||||
# AquaTk is a separate method. Only one Tkinter will be built on
|
||||
# Darwin - either AquaTk, if it is found, or X11 based Tk.
|
||||
- if (MACOS and self.detect_tkinter_darwin()):
|
||||
- return True
|
||||
+ # if (MACOS and self.detect_tkinter_darwin()):
|
||||
+ # return True
|
||||
|
||||
# Assume we haven't found any of the libraries or include files
|
||||
# The versions with dots are used on Unix, and the versions without
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue