Merge staging-next into staging
This commit is contained in:
commit
97694001f2
|
@ -28,7 +28,7 @@ in
|
|||
type = types.package;
|
||||
default = pkgs.xonsh;
|
||||
defaultText = literalExpression "pkgs.xonsh";
|
||||
example = literalExpression "pkgs.xonsh.override { configFile = \"/path/to/xonshrc\"; }";
|
||||
example = literalExpression "pkgs.xonsh.override { extraPackages = ps: [ ps.requests ]; }";
|
||||
description = lib.mdDoc ''
|
||||
xonsh package to use.
|
||||
'';
|
||||
|
@ -83,4 +83,3 @@ in
|
|||
};
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -250,9 +250,9 @@ in
|
|||
|
||||
environment = {
|
||||
LEMMY_UI_HOST = "127.0.0.1:${toString cfg.ui.port}";
|
||||
LEMMY_INTERNAL_HOST = "127.0.0.1:${toString cfg.settings.port}";
|
||||
LEMMY_EXTERNAL_HOST = cfg.settings.hostname;
|
||||
LEMMY_HTTPS = "false";
|
||||
LEMMY_UI_LEMMY_INTERNAL_HOST = "127.0.0.1:${toString cfg.settings.port}";
|
||||
LEMMY_UI_LEMMY_EXTERNAL_HOST = cfg.settings.hostname;
|
||||
LEMMY_UI_HTTPS = "false";
|
||||
};
|
||||
|
||||
documentation = [
|
||||
|
|
|
@ -25,8 +25,6 @@ in
|
|||
site_name = "Lemmy FTW";
|
||||
admin_email = "mightyiam@example.com";
|
||||
};
|
||||
# https://github.com/LemmyNet/lemmy/blob/50efb1d519c63a7007a07f11cc8a11487703c70d/crates/utils/src/settings/mod.rs#L52
|
||||
database.uri = "postgres:///lemmy?host=/run/postgresql&user=lemmy";
|
||||
};
|
||||
secretFile = /etc/lemmy-config.hjson;
|
||||
caddy.enable = true;
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
, variant
|
||||
, src
|
||||
, patches ? _: [ ]
|
||||
, meta
|
||||
}:
|
||||
|
||||
{ lib
|
||||
|
@ -391,44 +392,7 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation {
|
|||
treeSitter = builtins.trace "emacs.passthru: treeSitter was renamed to withTreeSitter and will be removed in 23.11" withTreeSitter;
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = if variant == "macport"
|
||||
then "https://bitbucket.org/mituharu/emacs-mac/"
|
||||
else "https://www.gnu.org/software/emacs/";
|
||||
description = "The extensible, customizable GNU text editor"
|
||||
+ lib.optionalString (variant == "macport") " - with macport patches";
|
||||
longDescription = ''
|
||||
GNU Emacs is an extensible, customizable text editor—and more. At its
|
||||
core is an interpreter for Emacs Lisp, a dialect of the Lisp programming
|
||||
language with extensions to support text editing.
|
||||
|
||||
The features of GNU Emacs include: content-sensitive editing modes,
|
||||
including syntax coloring, for a wide variety of file types including
|
||||
plain text, source code, and HTML; complete built-in documentation,
|
||||
including a tutorial for new users; full Unicode support for nearly all
|
||||
human languages and their scripts; highly customizable, using Emacs Lisp
|
||||
code or a graphical interface; a large number of extensions that add other
|
||||
functionality, including a project planner, mail and news reader, debugger
|
||||
interface, calendar, and more. Many of these extensions are distributed
|
||||
with GNU Emacs; others are available separately.
|
||||
''
|
||||
+ lib.optionalString (variant == "macport") ''
|
||||
|
||||
This release is built from Mitsuharu Yamamoto's patched, MacOS X-specific
|
||||
source code.
|
||||
'';
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
AndersonTorres
|
||||
adisbladis
|
||||
atemu
|
||||
jwiegley
|
||||
lovek323
|
||||
matthewbauer
|
||||
];
|
||||
platforms = if variant == "macport"
|
||||
then lib.platforms.darwin
|
||||
else lib.platforms.all;
|
||||
meta = meta // {
|
||||
broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
|
||||
};
|
||||
}))
|
||||
|
|
|
@ -3,6 +3,37 @@
|
|||
, fetchFromSavannah
|
||||
}:
|
||||
|
||||
let
|
||||
mainlineMeta = {
|
||||
homepage = "https://www.gnu.org/software/emacs/";
|
||||
description = "The extensible, customizable GNU text editor";
|
||||
longDescription = ''
|
||||
GNU Emacs is an extensible, customizable text editor—and more. At its core
|
||||
is an interpreter for Emacs Lisp, a dialect of the Lisp programming
|
||||
language with extensions to support text editing.
|
||||
|
||||
The features of GNU Emacs include: content-sensitive editing modes,
|
||||
including syntax coloring, for a wide variety of file types including
|
||||
plain text, source code, and HTML; complete built-in documentation,
|
||||
including a tutorial for new users; full Unicode support for nearly all
|
||||
human languages and their scripts; highly customizable, using Emacs Lisp
|
||||
code or a graphical interface; a large number of extensions that add other
|
||||
functionality, including a project planner, mail and news reader, debugger
|
||||
interface, calendar, and more. Many of these extensions are distributed
|
||||
with GNU Emacs; others are available separately.
|
||||
'';
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [
|
||||
AndersonTorres
|
||||
adisbladis
|
||||
atemu
|
||||
jwiegley
|
||||
lovek323
|
||||
matthewbauer
|
||||
];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
in
|
||||
{
|
||||
emacs28 = import ./generic.nix {
|
||||
pname = "emacs";
|
||||
|
@ -13,6 +44,8 @@
|
|||
rev = "28.2";
|
||||
hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";
|
||||
};
|
||||
|
||||
meta = mainlineMeta;
|
||||
};
|
||||
|
||||
emacs29 = import ./generic.nix {
|
||||
|
@ -24,6 +57,8 @@
|
|||
rev = "29.0.92";
|
||||
hash = "sha256-Vkry+2zYejZVwZKQlmQiAJnbjsj87DiIZ1ungooYd8A=";
|
||||
};
|
||||
|
||||
meta = mainlineMeta;
|
||||
};
|
||||
|
||||
emacs-macport = import ./generic.nix {
|
||||
|
@ -36,5 +71,17 @@
|
|||
rev = "emacs-28.2-mac-9.1";
|
||||
hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
homepage = "https://bitbucket.org/mituharu/emacs-mac/";
|
||||
description = mainlineMeta.description + " - with macport patches";
|
||||
longDescription = mainlineMeta.longDescription + ''
|
||||
|
||||
This release is built from Mitsuharu Yamamoto's patched source code
|
||||
tailoired for MacOS X.
|
||||
'';
|
||||
inherit (mainlineMeta) license maintainers;
|
||||
platforms = lib.platforms.darwin;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ mkDerivation, backintime-common, python3 }:
|
||||
|
||||
let
|
||||
python' = python3.withPackages (ps: with ps; [ pyqt5 backintime-common ]);
|
||||
python' = python3.withPackages (ps: with ps; [ pyqt5 backintime-common packaging ]);
|
||||
in
|
||||
mkDerivation {
|
||||
inherit (backintime-common)
|
||||
|
|
|
@ -41,7 +41,7 @@ stdenvNoCC.mkDerivation rec {
|
|||
'';
|
||||
homepage = "https://distrobox.privatedns.org/";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.all;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ atila ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -33,13 +33,13 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "warpinator";
|
||||
version = "1.6.3";
|
||||
version = "1.6.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-iCq2cwZgsq5/bJqjYuZ6dZLqz2nIpgHCrIQeMVxJNXY=";
|
||||
hash = "sha256-BKptTQbSBTQyc5V6WWdsPdC76sH0CFMXOyahfRmvQzc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -13,12 +13,12 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "circt";
|
||||
version = "1.40.0";
|
||||
version = "1.44.0";
|
||||
src = fetchFromGitHub {
|
||||
owner = "llvm";
|
||||
repo = "circt";
|
||||
rev = "firtool-${version}";
|
||||
sha256 = "sha256-L114Xh0O/Wu8IyrKohxalyXeSe/8oVcAXD4hpa6ocwU=";
|
||||
sha256 = "sha256-92gGsuwz1AfQJe1kFsqm/75P+3QuSHzZEUbItOC5nGU=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
|
|||
LIT_FILTER_OUT = if stdenv.cc.isClang then "CIRCT :: Target/ExportSystemC/.*\.mlir" else null;
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace test/circt-reduce/test/annotation-remover.mlir --replace "/usr/bin/env" "${coreutils}/bin/env"
|
||||
find ./test -name '*.mlir' -exec sed -i 's|/usr/bin/env|${coreutils}/bin/env|g' {} \;
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.1.20";
|
||||
hash = "sha256-VVeFh1FKJwdQD4UxnlfA1N+biAPNsmVmWVrEv0WdxN0=";
|
||||
version = "8.1.21";
|
||||
hash = "sha256-bqSegzXWMhd/VrUHFgqhUcewIBhXianBSFn85dSgd20=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
let
|
||||
base = callPackage ./generic.nix (_args // {
|
||||
version = "8.2.7";
|
||||
hash = "sha256-W/sqNcZ5Ib3K3VyQyykK11N9JNoROl6LwtZGsC3nSI8=";
|
||||
version = "8.2.8";
|
||||
hash = "sha256-mV7UAJx5F8li0xg3oaNljzbUr081e2c8l//b5kA/hRc=";
|
||||
});
|
||||
|
||||
in
|
||||
|
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
let
|
||||
base = (callPackage ./generic.nix (_args // {
|
||||
version = "8.3.0alpha2";
|
||||
version = "8.3.0alpha3";
|
||||
hash = null;
|
||||
})).overrideAttrs (oldAttrs: {
|
||||
src = fetchurl {
|
||||
url = "https://downloads.php.net/~eric/php-8.3.0alpha2.tar.xz";
|
||||
hash = "sha256-YLCxgiDcsBisOmAodf0h8HyaCIh+4i1Q7QZw/h4KR5I=";
|
||||
url = "https://downloads.php.net/~jakub/php-8.3.0alpha3.tar.xz";
|
||||
hash = "sha256-Ko0SR5ZIsdMyEmeM65zFU4bCU7f7xpiDBMf0od/kv8k=";
|
||||
};
|
||||
});
|
||||
in
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
|
||||
index a6f3e64db6..c3047233db 100644
|
||||
--- a/ext/fileinfo/fileinfo.c
|
||||
+++ b/ext/fileinfo/fileinfo.c
|
||||
@@ -14,6 +14,9 @@
|
||||
+----------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+#include "config.h"
|
||||
+#endif
|
||||
#include "php.h"
|
||||
|
||||
#include "libmagic/magic.h"
|
|
@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "vKtY6ZEkyK2K+BzJCSo30f9MpERpPlUnarFIlvJ1Giw=";
|
||||
};
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.isDarwin) "-DBOOST_STACKTRACE_GNU_SOURCE_NOT_REQUIRED=1";
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
|
|
68
pkgs/development/python-modules/sacrebleu/default.nix
Normal file
68
pkgs/development/python-modules/sacrebleu/default.nix
Normal file
|
@ -0,0 +1,68 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
|
||||
# Propagated build inputs
|
||||
, portalocker
|
||||
, regex
|
||||
, tabulate
|
||||
, numpy
|
||||
, colorama
|
||||
, lxml
|
||||
|
||||
# Check inputs
|
||||
, pytestCheckHook
|
||||
}:
|
||||
let
|
||||
pname = "sacrebleu";
|
||||
version = "2.3.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mjpost";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+58dhQv5LkjccjktfoAG2gqja6TMLIxHIbRgzZPDhKo=";
|
||||
};
|
||||
|
||||
# postPatch = ''
|
||||
# substituteInPlace setup.py \
|
||||
# --replace "portalocker==" "portalocker>="
|
||||
# '';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
portalocker
|
||||
regex
|
||||
tabulate
|
||||
numpy
|
||||
colorama
|
||||
lxml
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# require network access
|
||||
"test/test_api.py"
|
||||
"test/test_dataset.py"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "sacrebleu" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Hassle-free computation of shareable, comparable, and reproducible BLEU, chrF, and TER scores";
|
||||
homepage = "https://github.com/mjpost/sacrebleu";
|
||||
changelog = "https://github.com/mjpost/sacrebleu/blob/v{version}/CHANGELOG.md";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
|
@ -1,18 +1,19 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, stdenv }:
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "terraform-ls";
|
||||
version = "0.30.1";
|
||||
version = "0.31.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hashicorp";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-enPnj4/p83hQkVv821MGyGipgEmVo12IZzy/3y8UprQ=";
|
||||
hash = "sha256-OzqJ/F3GeIaX4/z1KJdok8kUfualRzHv1AIM8dt8Kik=";
|
||||
};
|
||||
vendorSha256 = "sha256-U3zslBDVz5nvhNgcn5L84hSUolf7XFCuh7zMZxyW/gQ=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ];
|
||||
vendorHash = "sha256-pEuen7CWniFzLgL1v+Xt1l6hde3YpyOMmQalj08UBX8=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
# There's a mixture of tests that use networking and several that fail on aarch64
|
||||
doCheck = false;
|
||||
|
@ -21,7 +22,7 @@ buildGoModule rec {
|
|||
installCheckPhase = ''
|
||||
runHook preInstallCheck
|
||||
$out/bin/terraform-ls --help
|
||||
$out/bin/terraform-ls version | grep "v${version}"
|
||||
$out/bin/terraform-ls --version | grep "${version}"
|
||||
runHook postInstallCheck
|
||||
'';
|
||||
|
||||
|
|
|
@ -1,20 +1,20 @@
|
|||
{
|
||||
"name": "lemmy-ui",
|
||||
"version": "0.18.0",
|
||||
"version": "0.18.1",
|
||||
"description": "An isomorphic UI for lemmy",
|
||||
"repository": "https://github.com/LemmyNet/lemmy-ui",
|
||||
"license": "AGPL-3.0",
|
||||
"author": "Dessalines <tyhou13@gmx.com>",
|
||||
"scripts": {
|
||||
"analyze": "webpack --mode=none",
|
||||
"prebuild:dev": "yarn clean && node generate_translations.js",
|
||||
"build:dev": "webpack --mode=development",
|
||||
"build:dev": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=development",
|
||||
"prebuild:prod": "yarn clean && node generate_translations.js",
|
||||
"build:prod": "webpack --mode=production",
|
||||
"build:prod": "webpack --env COMMIT_HASH=$(git rev-parse --short HEAD) --mode=production",
|
||||
"clean": "yarn run rimraf dist",
|
||||
"dev": "yarn start",
|
||||
"dev": "yarn build:dev --watch",
|
||||
"lint": "yarn translations:generate && tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx \"src/**\" && prettier --check \"src/**/*.{ts,tsx,js,css,scss}\"",
|
||||
"prepare": "husky install",
|
||||
"start": "yarn build:dev --watch",
|
||||
"themes:build": "sass src/assets/css/themes/:src/assets/css/themes",
|
||||
"themes:watch": "sass --watch src/assets/css/themes/:src/assets/css/themes",
|
||||
"translations:generate": "node generate_translations.js",
|
||||
|
@ -48,9 +48,11 @@
|
|||
"check-password-strength": "^2.0.7",
|
||||
"classnames": "^2.3.1",
|
||||
"clean-webpack-plugin": "^4.0.0",
|
||||
"cookie": "^0.5.0",
|
||||
"copy-webpack-plugin": "^11.0.0",
|
||||
"cross-fetch": "^3.1.5",
|
||||
"css-loader": "^6.7.3",
|
||||
"date-fns": "^2.30.0",
|
||||
"emoji-mart": "^5.4.0",
|
||||
"emoji-short-name": "^2.0.0",
|
||||
"express": "~4.18.2",
|
||||
|
@ -64,19 +66,19 @@
|
|||
"inferno-i18next-dess": "0.0.2",
|
||||
"inferno-router": "^8.1.1",
|
||||
"inferno-server": "^8.1.1",
|
||||
"isomorphic-cookie": "^1.2.4",
|
||||
"jwt-decode": "^3.1.2",
|
||||
"lemmy-js-client": "0.18.0-rc.2",
|
||||
"lodash": "^4.17.21",
|
||||
"lodash.isequal": "^4.5.0",
|
||||
"lodash.merge": "^4.6.2",
|
||||
"markdown-it": "^13.0.1",
|
||||
"markdown-it-container": "^3.0.0",
|
||||
"markdown-it-emoji": "^2.0.2",
|
||||
"markdown-it-footnote": "^3.0.3",
|
||||
"markdown-it-html5-embed": "^1.0.0",
|
||||
"markdown-it-ruby": "^0.1.1",
|
||||
"markdown-it-sub": "^1.0.0",
|
||||
"markdown-it-sup": "^1.0.0",
|
||||
"mini-css-extract-plugin": "^2.7.5",
|
||||
"moment": "^2.29.4",
|
||||
"register-service-worker": "^1.7.2",
|
||||
"run-node-webpack-plugin": "^1.3.0",
|
||||
"sanitize-html": "^2.10.0",
|
||||
|
@ -96,11 +98,14 @@
|
|||
"@babel/core": "^7.21.8",
|
||||
"@types/autosize": "^4.0.0",
|
||||
"@types/bootstrap": "^5.2.6",
|
||||
"@types/cookie": "^0.5.1",
|
||||
"@types/express": "^4.17.17",
|
||||
"@types/html-to-text": "^9.0.0",
|
||||
"@types/lodash.isequal": "^4.5.6",
|
||||
"@types/markdown-it": "^12.2.3",
|
||||
"@types/markdown-it-container": "^2.0.5",
|
||||
"@types/node": "^20.1.2",
|
||||
"@types/path-browserify": "^1.0.0",
|
||||
"@types/sanitize-html": "^2.9.0",
|
||||
"@types/serialize-javascript": "^5.0.1",
|
||||
"@types/toastify-js": "^1.11.1",
|
||||
|
@ -122,6 +127,8 @@
|
|||
"style-loader": "^3.3.2",
|
||||
"terser": "^5.17.3",
|
||||
"typescript": "^5.0.4",
|
||||
"typescript-language-server": "^3.3.2",
|
||||
"webpack-bundle-analyzer": "^4.9.0",
|
||||
"webpack-dev-server": "4.15.0"
|
||||
},
|
||||
"packageManager": "yarn@1.22.19",
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"version": "0.18.0",
|
||||
"serverSha256": "sha256-KzEelj2/+wfp570Vw1+FoqiYZd1PxELTdopGSeel97E=",
|
||||
"serverCargoSha256": "sha256-p1ZytuaXouKFkKjsEsaNjndoioTSVVM2pf72qE8/qyM=",
|
||||
"uiSha256": "sha256-pB6uEL9gDwvsi+FbooKBhTCJ+Qmc6Vl2bBTMiL1hUJI=",
|
||||
"uiYarnDepsSha256": "sha256-NtluS6Cr39L9nGwNA17c7xsM5xoJraS02a7sp7r9KPI="
|
||||
"version": "0.18.1",
|
||||
"serverSha256": "sha256-jYbrbIRyXo2G113ReG32oZ56ed2FEB/ZBcqYAxoxzGQ=",
|
||||
"serverCargoSha256": "sha256-7DNMNPSjzYY45DlR6Eo2q6QdwrMrRb51cFOnXfOuub0=",
|
||||
"uiSha256": "sha256-tc7fGA4okIv+3kq5t6I+EN+owdekCgAdk0EtkDgodIU=",
|
||||
"uiYarnDepsSha256": "sha256-/T1PQ0XsGY82/RlLq94hJgv8Yx1bIf2gcklhgtPu1RM="
|
||||
}
|
||||
|
|
|
@ -26,11 +26,6 @@ rustPlatform.buildRustPackage rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# `cargo test` fails as `tokio::test` relies on the macros feature which wasn't specified in Cargo.toml
|
||||
./tokio-macros.patch
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
echo 'pub const VERSION: &str = "${version}";' > crates/utils/src/version.rs
|
||||
'';
|
||||
|
@ -58,7 +53,7 @@ rustPlatform.buildRustPackage rec {
|
|||
description = "🐀 Building a federated alternative to reddit in rust";
|
||||
homepage = "https://join-lemmy.org/";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ happysalada billewanick ];
|
||||
maintainers = with maintainers; [ happysalada billewanick adisbladis ];
|
||||
mainProgram = "lemmy_server";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,37 +0,0 @@
|
|||
From f8c83b48774d152f9bc590db83c032235ef502a9 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Klass <kissaki@posteo.de>
|
||||
Date: Sat, 24 Jun 2023 17:57:59 +0200
|
||||
Subject: [PATCH] test: Fix missing tokio test macro dependency
|
||||
|
||||
The tests make use of the `#[tokio::test]` macro, but the tokio dependency default feature does not include them. Running cargo test fails.
|
||||
|
||||
By including the `macros` feature on the tokio dependency, cargo test will work.
|
||||
|
||||
---
|
||||
|
||||
cargo test fails with
|
||||
|
||||
```
|
||||
error[E0433]: failed to resolve: could not find `test` in `tokio`
|
||||
--> src\scheduled_tasks.rs:295:12
|
||||
|
|
||||
295 | #[tokio::test]
|
||||
| ^^^^ could not find `test` in `tokio`
|
||||
```
|
||||
---
|
||||
Cargo.toml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 430deb082c..d4c5ab8ef0 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -89,7 +89,7 @@ anyhow = "1.0.71"
|
||||
diesel_ltree = "0.3.0"
|
||||
typed-builder = "0.10.0"
|
||||
serial_test = "0.9.0"
|
||||
-tokio = "1.28.2"
|
||||
+tokio = { version = "1.28.2", features = ["macros"] }
|
||||
sha2 = "0.10.6"
|
||||
regex = "1.8.4"
|
||||
once_cell = "1.18.0"
|
|
@ -84,7 +84,7 @@ mkYarnPackage {
|
|||
description = "Building a federated alternative to reddit in rust";
|
||||
homepage = "https://join-lemmy.org/";
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = with maintainers; [ happysalada billewanick ];
|
||||
maintainers = with maintainers; [ happysalada billewanick adisbladis ];
|
||||
inherit (nodejs.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3Packages
|
||||
, python3
|
||||
, glibcLocales
|
||||
, coreutils
|
||||
, git
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "xonsh";
|
||||
version = "0.14.0";
|
||||
|
||||
|
@ -29,16 +29,8 @@ python3Packages.buildPythonApplication rec {
|
|||
find scripts -name 'xonsh*' -exec sed -i -e "s|env -S|env|" {} \;
|
||||
find -name "*.xsh" | xargs sed -ie 's|/usr/bin/env|${coreutils}/bin/env|'
|
||||
patchShebangs .
|
||||
|
||||
substituteInPlace scripts/xon.sh \
|
||||
--replace 'python' "${python3Packages.python}/bin/python"
|
||||
|
||||
'';
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix PYTHONPATH : ${placeholder "out"}/lib/${python3Packages.python.libPrefix}/site-packages"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# fails on sandbox
|
||||
"test_colorize_file"
|
||||
|
@ -71,9 +63,9 @@ python3Packages.buildPythonApplication rec {
|
|||
'';
|
||||
|
||||
nativeCheckInputs = [ glibcLocales git ] ++
|
||||
(with python3Packages; [ pyte pytestCheckHook pytest-mock pytest-subprocess ]);
|
||||
(with python3.pkgs; [ pyte pytestCheckHook pytest-mock pytest-subprocess ]);
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [ ply prompt-toolkit pygments ];
|
||||
propagatedBuildInputs = with python3.pkgs; [ ply prompt-toolkit pygments ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Python-ish, BASHwards-compatible shell";
|
||||
|
@ -85,5 +77,6 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
passthru = {
|
||||
shellPath = "/bin/xonsh";
|
||||
python = python3;
|
||||
};
|
||||
}
|
||||
|
|
24
pkgs/shells/xonsh/wrapper.nix
Normal file
24
pkgs/shells/xonsh/wrapper.nix
Normal file
|
@ -0,0 +1,24 @@
|
|||
{ runCommand
|
||||
, xonsh-unwrapped
|
||||
, lib
|
||||
, extraPackages ? (ps: [ ])
|
||||
}:
|
||||
|
||||
let
|
||||
xonsh = xonsh-unwrapped;
|
||||
inherit (xonsh.passthru) python;
|
||||
|
||||
pythonEnv = python.withPackages (ps: [
|
||||
(ps.toPythonModule xonsh)
|
||||
] ++ extraPackages ps);
|
||||
|
||||
in
|
||||
runCommand "${xonsh.pname}-${xonsh.version}"
|
||||
{
|
||||
inherit (xonsh) pname version meta passthru;
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
for bin in ${lib.getBin xonsh}/bin/*; do
|
||||
ln -s ${pythonEnv}/bin/$(basename "$bin") $out/bin/
|
||||
done
|
||||
''
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "aliyun-cli";
|
||||
version = "3.0.167";
|
||||
version = "3.0.169";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "aliyun";
|
||||
repo = pname;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-53diBESwUa85+yHHvcBlAaCyvqu99Exudp/4+JOJQZw=";
|
||||
sha256 = "sha256-ZQR4bVVcqUdQc35Az/eDjLiK8Mk3a9zRVeUPdwPJ9fE=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-wrFRGzVRN9kJC7uXwh07e1FSv2LBo38AtSjcDOtewks=";
|
||||
vendorHash = "sha256-XM/ATJVTyhv85KI2aUTufVDzYZMLTegtNuT3JEsU5vM=";
|
||||
|
||||
subPackages = [ "main" ];
|
||||
|
||||
|
|
|
@ -4,12 +4,12 @@ with python3Packages;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "iredis";
|
||||
version = "1.13.0";
|
||||
version = "1.13.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d1e4e7936d0be456f70a39abeb1c97d931f66ccd60e891f4fd796ffb06dfeaf9";
|
||||
sha256 = "sha256-MWzbmuxUKh0yBgar1gk8QGJQwbHtINsbCsbTM+RLmQo=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
@ -50,6 +50,9 @@ buildPythonApplication rec {
|
|||
"--deselect=tests/unittests/test_entry.py::test_command_shell_options_higher_priority"
|
||||
# Only execute unittests, because cli tests require a running Redis
|
||||
"tests/unittests/"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
# Flaky test
|
||||
"--deselect=tests/unittests/test_utils.py::test_timer"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "iredis" ];
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "shadowsocks-rust";
|
||||
version = "1.15.3";
|
||||
version = "1.15.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "shadowsocks";
|
||||
repo = pname;
|
||||
hash = "sha256-HU+9y4btWbYrkHazOudY2j9RceieBK3BS2jgLbwcEdk=";
|
||||
hash = "sha256-Tdh6lGk93hGuR+L2cytVoKYfRHrmuNo9OtKqQaeCMx0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-YORQHX4RPPHDErgo4c3SxvxklJ9mxHeP/1GiwhuL+J0=";
|
||||
cargoHash = "sha256-dtHr+zsjpQe+iNwlj0sRxZRsgl1nxflXhhV1fTMCiFY=";
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
||||
|
|
|
@ -14808,7 +14808,8 @@ with pkgs;
|
|||
|
||||
rush = callPackage ../shells/rush { };
|
||||
|
||||
xonsh = callPackage ../shells/xonsh { };
|
||||
xonsh = callPackage ../shells/xonsh/wrapper.nix { };
|
||||
xonsh-unwrapped = callPackage ../shells/xonsh { };
|
||||
|
||||
zsh = callPackage ../shells/zsh { };
|
||||
|
||||
|
|
|
@ -339,12 +339,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
{
|
||||
name = "fileinfo";
|
||||
buildInputs = [ pcre2 ];
|
||||
patches = lib.optionals (lib.versionAtLeast php.version "8.3") [
|
||||
# Fix the extension unable to be loaded due to missing `get_module` function.
|
||||
# `ZEND_GET_MODULE` macro that creates it is conditional on `COMPILE_DL_FILEINFO` being defined.
|
||||
# https://github.com/php/php-src/issues/11408#issuecomment-1602106200
|
||||
../development/interpreters/php/fix-fileinfo-ext-php83.patch
|
||||
];
|
||||
}
|
||||
{ name = "filter"; buildInputs = [ pcre2 ]; }
|
||||
{ name = "ftp"; buildInputs = [ openssl ]; }
|
||||
|
@ -534,15 +528,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
|||
}
|
||||
{ name = "session";
|
||||
doCheck = false;
|
||||
patches = lib.optionals (lib.versionAtLeast php.version "8.3") [
|
||||
# Fix GH-11529: Crash after dealing with an Apache request
|
||||
# To be removed in next alpha
|
||||
# See https://github.com/php/php-src/issues/11529
|
||||
(fetchpatch {
|
||||
url = "https://github.com/php/php-src/commit/8d4370954ec610164a4503431bb0c52da6954aa7.patch";
|
||||
hash = "sha256-w1uF9lRdfhz9I0gux0J4cvMzNS93uSHL1fYG23VLDPc=";
|
||||
})
|
||||
];
|
||||
}
|
||||
{ name = "shmop"; }
|
||||
{
|
||||
|
|
|
@ -11037,6 +11037,8 @@ self: super: with self; {
|
|||
|
||||
sacn = callPackage ../development/python-modules/sacn { };
|
||||
|
||||
sacrebleu = callPackage ../development/python-modules/sacrebleu { };
|
||||
|
||||
sacremoses = callPackage ../development/python-modules/sacremoses { };
|
||||
|
||||
safe = callPackage ../development/python-modules/safe { };
|
||||
|
|
Loading…
Reference in a new issue