Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
ee5a894bb8
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mympd";
|
||||
version = "9.5.3";
|
||||
version = "9.5.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jcorporation";
|
||||
repo = "myMPD";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0plbOBTrEOjfVbyfrQ8mNByJb6XygIPTrwGfY6+0DHo=";
|
||||
sha256 = "sha256-0X/rEVfJ6zzX75R72xVntOfuCt8srp9PkiYOq3XbWPs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -46,13 +46,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "imagemagick";
|
||||
version = "7.1.0-47";
|
||||
version = "7.1.0-48";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ImageMagick";
|
||||
repo = "ImageMagick";
|
||||
rev = version;
|
||||
hash = "sha256-x5kC9nd38KgSpzJX3y6h2iBnte+UHrfZnbkRD/Dgqi8=";
|
||||
hash = "sha256-ExGeZVqRajuYcck0JrIFGDEam4PfUCXF/jI2dudHh+E=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "spicetify-cli";
|
||||
version = "2.13.0";
|
||||
version = "2.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "spicetify";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XsYZoJDSaAp+oMTy5YWM9aM+TCNkqF5WXBhU/axcEVk=";
|
||||
sha256 = "sha256-YgT4HlVqm58CEGoc/bNjo0xEzoNIcTpKGZkSdhcAgis=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng=";
|
||||
|
||||
@ -21,14 +21,14 @@
|
||||
}:
|
||||
|
||||
mkDerivation rec {
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
pname = "syncthingtray";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Martchus";
|
||||
repo = "syncthingtray";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-BdcMW9ePOLXOZnFxFb1h/mn5a6c8fHYFr9ckK9hXJAM=";
|
||||
sha256 = "sha256-jMl2kXpHVXH/TfdPbq6bzdpNec6f1AUWsMNZzaAvK/I=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kubelogin";
|
||||
version = "1.25.2";
|
||||
version = "1.25.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "int128";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-d3iiUmNEPKylYSFq9cSfgJuQYLPhBJavGV8tOao0l4s=";
|
||||
sha256 = "sha256-2Ny3tzeFOZR63fweb+/q1kocIDboD8fJzlLOzcoR0nA=";
|
||||
};
|
||||
|
||||
subPackages = ["."];
|
||||
|
||||
vendorSha256 = "sha256-XxVXhNWZOyvrdh2yPQogtH62h7d8NbsNhhrwGuqcLJs=";
|
||||
vendorSha256 = "sha256-iY4CmtWwQQwZBQM4iJXedFePL4vzSBfNWrVOxYvrhMs=";
|
||||
|
||||
# Rename the binary instead of symlinking to avoid conflict with the
|
||||
# Azure version of kubelogin
|
||||
|
||||
@ -206,9 +206,9 @@ in {
|
||||
major = "3";
|
||||
minor = "11";
|
||||
patch = "0";
|
||||
suffix = "rc1";
|
||||
suffix = "rc2";
|
||||
};
|
||||
sha256 = "sha256-U6U3fDeoosbaB1sU651jN0V59/PHGPog8KH7sOlKkis=";
|
||||
sha256 = "sha256-JbNcx9gsWtNNhnsXmhwWldEpvl7RSiHka2t/I1CotJA=";
|
||||
inherit (darwin) configd;
|
||||
inherit passthruFun;
|
||||
};
|
||||
|
||||
@ -4,25 +4,25 @@ let
|
||||
# mbuild is a custom build system used only to build xed
|
||||
mbuild = python3Packages.buildPythonPackage rec {
|
||||
pname = "mbuild";
|
||||
version = "0.2496-dev";
|
||||
version = "2022.07.28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intelxed";
|
||||
repo = "mbuild";
|
||||
rev = "3e8eb33aada4153c21c4261b35e5f51f6e2019e8";
|
||||
sha256 = "0yamgzkzw4v6x1a857psw9f7i62ydgd0zaqrf33dbdg8hfd2mq3q";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eOAqmoPotdXGcBmrD9prXph4XOL6noJU6GYT/ud/VXk=";
|
||||
};
|
||||
};
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "xed";
|
||||
version = "12.0.1";
|
||||
version = "2022.08.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intelxed";
|
||||
repo = "xed";
|
||||
rev = version;
|
||||
sha256 = "07zfff8zf29c2n0wal87hiqfq3cwcjn80zz78mz0nyjfj09nd39f";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Iil+dfjuWYPbzmSjgwKTKScSE/IsWuHEKQ5HsBJDqWM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ mbuild ];
|
||||
|
||||
@ -167,7 +167,8 @@ rec {
|
||||
*/
|
||||
unresholved = (stdenv.mkDerivation ((removeAttrs attrs [ "solutions" ])
|
||||
// {
|
||||
inherit pname version src;
|
||||
inherit version src;
|
||||
pname = "${pname}-unresholved";
|
||||
}));
|
||||
in
|
||||
/*
|
||||
@ -178,8 +179,7 @@ rec {
|
||||
*/
|
||||
lib.extendDerivation true passthru (stdenv.mkDerivation {
|
||||
src = unresholved;
|
||||
version = unresholved.version;
|
||||
pname = "resholved-${unresholved.pname}";
|
||||
inherit version pname;
|
||||
buildInputs = [ resholve ];
|
||||
|
||||
# retain a reference to the base
|
||||
@ -199,5 +199,8 @@ rec {
|
||||
# supports default python.logging levels
|
||||
# LOGLEVEL="INFO";
|
||||
preFixup = phraseSolutions solutions unresholved;
|
||||
|
||||
# don't break the metadata...
|
||||
meta = unresholved.meta;
|
||||
});
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
let
|
||||
pname = "coqui-trainer";
|
||||
version = "0.0.14";
|
||||
version = "0.0.15";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@ -27,7 +27,7 @@ buildPythonPackage {
|
||||
owner = "coqui-ai";
|
||||
repo = "Trainer";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WvJDGV7gmf/QQN3SswTq/ABy9ppPFi5xYnMeL/M7GxY=";
|
||||
hash = "sha256-WBFsQuGnpqOiQW7VFfsk0t7qEBs1ScOChfQFpLmqTz4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "fastbencode";
|
||||
version = "0.0.11";
|
||||
version = "0.0.12";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-hMLS59/BlzK7aPoTWN5YgE77xEBBYpvYurUD98XqkDI=";
|
||||
sha256 = "sha256-w7F+70R1Wizo/i0GGCc13ADf6JqARtPXMS6/qTmPKEY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, boto3
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "localstack-client";
|
||||
version = "1.36";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "localstack";
|
||||
repo = "localstack-python-client";
|
||||
# Request for proper tags: https://github.com/localstack/localstack-python-client/issues/38
|
||||
rev = "92229c02c5b3cd0cef006e99c3d47db15aefcb4f";
|
||||
sha256 = "sha256-pbDpe/5o4YU/2UIi8YbhzhIlXigOb/M2vjW9DKcIxoI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
boto3
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"localstack_client"
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Has trouble creating a socket
|
||||
"test_session"
|
||||
];
|
||||
|
||||
# For tests
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A lightweight Python client for LocalStack";
|
||||
homepage = "https://github.com/localstack/localstack-python-client";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
}
|
||||
59
pkgs/development/python-modules/localstack-ext/default.nix
Normal file
59
pkgs/development/python-modules/localstack-ext/default.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, dill
|
||||
, dnslib
|
||||
, dnspython
|
||||
, plux
|
||||
, pyaes
|
||||
, python-jose
|
||||
, requests
|
||||
, tabulate
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "localstack-ext";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-YNj4V/mv8gn+TEPBejgyMIuSXYmIXNjk5xruyVbf1qA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Avoid circular dependency
|
||||
sed -i '/localstack>=/d' setup.cfg
|
||||
|
||||
# Pip is unable to resolve attr logic, so it will emit version as 0.0.0
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "version = attr: localstack_ext.__version__" "version = ${version}"
|
||||
cat setup.cfg
|
||||
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "dill==0.3.2" "dill~=0.3.0" \
|
||||
--replace "requests>=2.20.0,<2.26" "requests~=2.20"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dill
|
||||
dnslib
|
||||
dnspython
|
||||
plux
|
||||
pyaes
|
||||
python-jose
|
||||
requests
|
||||
tabulate
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "localstack_ext" ];
|
||||
|
||||
# No tests in repo
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Extensions for LocalStack";
|
||||
homepage = "https://github.com/localstack/localstack";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
}
|
||||
69
pkgs/development/python-modules/localstack/default.nix
Normal file
69
pkgs/development/python-modules/localstack/default.nix
Normal file
@ -0,0 +1,69 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, apispec
|
||||
, boto3
|
||||
, cachetools
|
||||
, click
|
||||
, localstack-client
|
||||
, localstack-ext
|
||||
, plux
|
||||
, psutil
|
||||
, python-dotenv
|
||||
, pyyaml
|
||||
, requests
|
||||
, rich
|
||||
, semver
|
||||
, tailer
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "localstack";
|
||||
version = "1.0.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "localstack";
|
||||
repo = "localstack";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-JDF3wM5AVhfkAFlxmy1f3aMxs4J5LWd0JOY8MzRAzT4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "requests>=2.20.0,<2.26" "requests~=2.20" \
|
||||
--replace "cachetools~=5.0.0" "cachetools~=5.0"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
apispec
|
||||
boto3
|
||||
cachetools
|
||||
click
|
||||
localstack-client
|
||||
localstack-ext
|
||||
plux
|
||||
psutil
|
||||
python-dotenv
|
||||
pyyaml
|
||||
requests
|
||||
rich
|
||||
semver
|
||||
tailer
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "localstack" ];
|
||||
|
||||
# Test suite requires boto, which has been removed from nixpkgs
|
||||
# Just do minimal test, buildPythonPackage maps checkPhase
|
||||
# to installCheckPhase, so we can test that entrypoint point works.
|
||||
checkPhase = ''
|
||||
$out/bin/localstack --version
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A fully functional local Cloud stack";
|
||||
homepage = "https://github.com/localstack/localstack";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
}
|
||||
38
pkgs/development/python-modules/plux/default.nix
Normal file
38
pkgs/development/python-modules/plux/default.nix
Normal file
@ -0,0 +1,38 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, stevedore
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "plux";
|
||||
version = "1.3.1";
|
||||
format = "pyproject";
|
||||
|
||||
# Tests are not available from PyPi
|
||||
src = fetchFromGitHub {
|
||||
owner = "localstack";
|
||||
repo = "plux";
|
||||
# Request for proper tags: https://github.com/localstack/plux/issues/4
|
||||
rev = "a412ab0a0d7d17c3b5e1f560b7b31dc1876598f7";
|
||||
sha256 = "sha256-zFwrRc93R4cXah7zYXjVLBIeBpDedsInxuyXOyBI8SA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
stevedore
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "plugin.core" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dynamic code loading framework for building pluggable Python distributions";
|
||||
homepage = "https://github.com/localstack/plux";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
}
|
||||
@ -7,11 +7,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "riot-redis";
|
||||
version = "2.17.0";
|
||||
version = "2.18.1";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/redis-developer/riot/releases/download/v${version}/riot-redis-${version}.zip";
|
||||
sha256 = "sha256-Blhjss0ypHzdd3XTRzzHnIPg8+m1ke7a+8VuBB6oA/0=";
|
||||
sha256 = "sha256-mRuW/mPcqDO2txVwL2MlqZeprNDifjmOx7UUUy3yF3M=";
|
||||
};
|
||||
|
||||
buildInputs = [ jre_headless ];
|
||||
|
||||
@ -7,20 +7,18 @@
|
||||
}:
|
||||
|
||||
let
|
||||
# gameServer/hedgewars-server.cabal depends on network < 3
|
||||
ghc = ghcWithPackages (pkgs: with pkgs; [
|
||||
SHA bytestring entropy hslogger network_2_6_3_1 pkgs.zlib random
|
||||
SHA bytestring entropy hslogger network pkgs.zlib random
|
||||
regex-tdfa sandi utf8-string vector
|
||||
]);
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hedgewars";
|
||||
version = "1.0.0";
|
||||
version = "1.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.hedgewars.org/download/releases/hedgewars-src-${version}.tar.bz2";
|
||||
sha256 = "0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1";
|
||||
sha256 = "sha256-IB/l5FvYyls9gbGOwGvWu8n6fCxjvwGQBeL4C+W88hI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ];
|
||||
@ -33,33 +31,11 @@ stdenv.mkDerivation rec {
|
||||
qtbase
|
||||
] ++ lib.optional withServer ghc;
|
||||
|
||||
patches = [
|
||||
./qt515.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace gameServer/CMakeLists.txt \
|
||||
--replace mask evaluate
|
||||
|
||||
# compile with fpc >= 3.2.0
|
||||
# https://github.com/archlinux/svntogit-community/blob/75a1b3900fb3dd553d5114bbc8474d85fd6abb02/trunk/PKGBUILD#L26
|
||||
sed -i 's/procedure ShiftWorld(Dir: LongInt); inline;/procedure ShiftWorld(Dir: LongInt);/' hedgewars/uWorld.pas
|
||||
'';
|
||||
|
||||
cmakeFlags = [
|
||||
"-DNOVERSIONINFOUPDATE=ON"
|
||||
"-DNOSERVER=${if withServer then "OFF" else "ON"}"
|
||||
];
|
||||
|
||||
|
||||
# hslogger brings network-3 and network-bsd which conflict with
|
||||
# network-2.6.3.1
|
||||
preConfigure = ''
|
||||
substituteInPlace gameServer/CMakeLists.txt \
|
||||
--replace "haskell_flags}" \
|
||||
"haskell_flags} -package network-2.6.3.1 -hide-package network-bsd"
|
||||
'';
|
||||
|
||||
NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [
|
||||
SDL2.out
|
||||
SDL2_image
|
||||
@ -107,8 +83,5 @@ stdenv.mkDerivation rec {
|
||||
all movement on the battlefield has ceased).'';
|
||||
maintainers = with maintainers; [ kragniz fpletz ];
|
||||
inherit (fpc.meta) platforms;
|
||||
# https://github.com/NixOS/nixpkgs/pull/185755#issuecomment-1219024584
|
||||
broken = true;
|
||||
hydraPlatforms = platforms.none;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- a/QTfrontend/ui/page/pagegamestats.cpp
|
||||
+++ b/QTfrontend/ui/page/pagegamestats.cpp
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <QGraphicsScene>
|
||||
#include <QGroupBox>
|
||||
#include <QSizePolicy>
|
||||
+#include <QPainterPath>
|
||||
|
||||
#include "pagegamestats.h"
|
||||
#include "team.h"
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs, nodePackages, makeWrapper, nixosTests, nodejs, stdenv, lib, fetchFromGitHub }:
|
||||
{ pkgs, nodePackages, makeWrapper, nixosTests, nodejs, stdenv, lib, fetchFromGitHub, fetchurl, autoPatchelfHook }:
|
||||
|
||||
let
|
||||
ourNodePackages = import ./node-composition.nix {
|
||||
@ -7,6 +7,26 @@ let
|
||||
};
|
||||
version = (lib.importJSON ./package.json).version;
|
||||
srcInfo = lib.importJSON ./src.json;
|
||||
|
||||
# TODO: package matrix-rust-sdk and use that instead of fetching & patching binaries
|
||||
platform = {
|
||||
"x86_64-linux" = "linux-x64-gnu";
|
||||
"aarch64-linux" = "linux-arm64-gnu";
|
||||
}.${stdenv.hostPlatform.system} or
|
||||
(throw "matrix-appservice-irc: Unsupported platform ${stdenv.hostPlatform.system}");
|
||||
|
||||
matrix-sdk-crypto = let
|
||||
version = "0.1.0-beta.1";
|
||||
base = "https://github.com/matrix-org/matrix-rust-sdk/releases/download/matrix-sdk-crypto-nodejs-v${version}";
|
||||
in
|
||||
fetchurl {
|
||||
url = "${base}/matrix-sdk-crypto.${platform}.node";
|
||||
hash = {
|
||||
"x86_64-linux" = "sha256-a6FX+KhHooipIMsJ7Fl7gmUBt8WbTUgT6sXN4N3NXRk=";
|
||||
"aarch64-linux" = "sha256-jvr6gMTQ4aAk5x0iXpA28ADdaCgDpvOjmogd52Z6bIY=";
|
||||
}.${stdenv.hostPlatform.system} or
|
||||
(throw "matrix-appservice-irc: Unsupported platform ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
in
|
||||
ourNodePackages.package.override {
|
||||
pname = "matrix-appservice-irc";
|
||||
@ -19,11 +39,18 @@ ourNodePackages.package.override {
|
||||
inherit (srcInfo) sha256;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper nodePackages.node-gyp-build ];
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper nodePackages.node-gyp-build ];
|
||||
|
||||
dontAutoPatchelf = true;
|
||||
|
||||
postInstall = ''
|
||||
makeWrapper '${nodejs}/bin/node' "$out/bin/matrix-appservice-irc" \
|
||||
--add-flags "$out/lib/node_modules/matrix-appservice-irc/app.js"
|
||||
|
||||
# install the native bindings for matrix-sdk-crypto
|
||||
export CRYPTO_SDK_PATH="$out/lib/node_modules/matrix-appservice-irc/node_modules/@matrix-org/matrix-sdk-crypto-nodejs/matrix-sdk-crypto.${platform}.node"
|
||||
cp -v ${matrix-sdk-crypto} "$CRYPTO_SDK_PATH"
|
||||
autoPatchelf "$CRYPTO_SDK_PATH"
|
||||
'';
|
||||
|
||||
passthru.tests.matrix-appservice-irc = nixosTests.matrix-appservice-irc;
|
||||
@ -34,5 +61,6 @@ ourNodePackages.package.override {
|
||||
maintainers = with maintainers; [ ];
|
||||
homepage = "https://github.com/matrix-org/matrix-appservice-irc";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "matrix-appservice-irc",
|
||||
"version": "0.34.0",
|
||||
"version": "0.35.0",
|
||||
"description": "An IRC Bridge for Matrix",
|
||||
"main": "app.js",
|
||||
"bin": "./bin/matrix-appservice-irc",
|
||||
@ -34,7 +34,7 @@
|
||||
"he": "^1.2.0",
|
||||
"logform": "^2.4.0",
|
||||
"matrix-appservice-bridge": "^3.2.0",
|
||||
"matrix-org-irc": "^1.2.1",
|
||||
"matrix-org-irc": "1.3.0",
|
||||
"matrix-bot-sdk": "0.5.19",
|
||||
"nopt": "^3.0.1",
|
||||
"p-queue": "^6.6.2",
|
||||
@ -65,6 +65,6 @@
|
||||
"proxyquire": "^2.1.3",
|
||||
"nyc": "^15.1.0",
|
||||
"request-promise-native": "^1.0.9",
|
||||
"typescript": "^4.5.5"
|
||||
"typescript": "^4.8.2"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"url": "https://github.com/matrix-org/matrix-appservice-irc",
|
||||
"rev": "8faf9614e80073e3cf07c96dbd295379d80f4161",
|
||||
"date": "2022-05-04T09:06:31+02:00",
|
||||
"path": "/nix/store/sy3v3h9xf4zc9cggavfk720c1pv3hiz2-matrix-appservice-irc",
|
||||
"sha256": "1ihhd1y6jsz98iwrza3fnfinpkpzkn0776wiz6jzdzz71hnb444l",
|
||||
"rev": "b52ac9ec9e45fe82fb3eb9c1a5e420c1eba73b9b",
|
||||
"date": "2022-09-13T09:07:52+01:00",
|
||||
"path": "/nix/store/nd7jrqynfikcirmzc22jp82bgmliglnp-matrix-appservice-irc",
|
||||
"sha256": "0bw06rzlsi3rddjmw1v32vlpq3clda26dcyq3f8qaily9rdxr7vn",
|
||||
"fetchLFS": false,
|
||||
"fetchSubmodules": false,
|
||||
"deepClone": false,
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "routinator";
|
||||
version = "0.11.2";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NLnetLabs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-C6BY+Ba5KQgi+jMUKRi7osZNEDMLMDOhA4TQlbqb9jY=";
|
||||
sha256 = "sha256-zQ68PN3CbLx6Z84jFeuAck6mzp9f3sbALgVqssecsUU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-5ZBE7jbhO4j4FwGSXLIbYjmtmNxFpiME9JqXBqwHSUA=";
|
||||
cargoSha256 = "sha256-M8JO4E8TwLbPGdwslO2Uw+ooAJkIoyc1t1wgxw8CFF0=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "age";
|
||||
version = "1.0.0-rc1";
|
||||
version = "1.1.0-rc0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "apache";
|
||||
repo = "age";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-b5cBpS5xWaohRZf5H0DwzNq0BodqWDjkAP44osPVYps=";
|
||||
sha256 = "sha256-7qQGiiFkGbS/j7ouP2Joj5EGT+ferIgYYMoTe9jmTqQ=";
|
||||
};
|
||||
|
||||
buildInputs = [ postgresql ];
|
||||
|
||||
@ -5,15 +5,15 @@
|
||||
, git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2022-09-08";
|
||||
version = "2022-09-10";
|
||||
pname = "oh-my-zsh";
|
||||
rev = "dfa88b4d369f6afc7205af0b399a0ef05a4bef2e";
|
||||
rev = "7dcabbe6826073ef6069c8a4b6f9a943f00d2df0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
inherit rev;
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
sha256 = "BzJAQIZXKoj1LtQQvM4LEA0V8yKoND4hVxzQA+weESk=";
|
||||
sha256 = "Mk2GQh7Yh0cyklSEIutIIUEQNMAcPC1i3QT5K6lCEt8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -15,14 +15,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "broot";
|
||||
version = "1.14.2";
|
||||
version = "1.14.3";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-3SaR3ug9J1nqhbM8OW9oIM8mJwbw99YXrPgSIHsDG/0=";
|
||||
sha256 = "sha256-OtpIbBrQtpxx8njhBKDB+Vk6o5sJY4jzs8cIYmUxEmw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-bNDM7RJCclEMRZ+BlXy0ALLZZ3Wu7wjxPMRmSeWNaVw=";
|
||||
cargoHash = "sha256-lGV4fvpZ5/pcUMAvffSqh/PBASiFIpnpEKc+8zQ5/0M=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cyberchef";
|
||||
version = "9.46.0";
|
||||
version = "9.46.4";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip";
|
||||
sha256 = "sha256-4IqXp7fYgXwIuciUklrQoRD2XagatdhQ3l6ghjgTCR8=";
|
||||
sha256 = "sha256-3QcrJN7ahyPGZsY6EM6K5sgr0eLZQazlh+G0TdN0uQc=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub, autoreconfHook, buildPackages }:
|
||||
{ stdenv, lib, fetchFromGitHub, autoreconfHook, buildPackages, fetchpatch, targetPackages }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rpcsvc-proto";
|
||||
@ -11,12 +11,27 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-DXRLEpOanWcxCSTC8OxEw5SWKpgFz7oTPukzfnPrAOk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/thkukuk/rpcsvc-proto/pull/14
|
||||
(fetchpatch {
|
||||
name = "follow-RPCGEN_CPP-env-var";
|
||||
url = "https://github.com/thkukuk/rpcsvc-proto/commit/e772270774ff45172709e39f744cab875a816667.diff";
|
||||
sha256 = "sha256-KrUD6YwdyxW9S99h4TB21ahnAOgQmQr2tYz++MIbk1Y=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
postPatch = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
RPCGEN_CPP = "${stdenv.cc.targetPrefix}cpp";
|
||||
|
||||
postPatch = ''
|
||||
# replace fallback cpp with the target prefixed cpp
|
||||
substituteInPlace rpcgen/rpc_main.c \
|
||||
--replace 'CPP = "cpp"' \
|
||||
'CPP = "${targetPackages.stdenv.cc.targetPrefix}cpp"'
|
||||
'' + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
substituteInPlace rpcsvc/Makefile.am \
|
||||
--replace '$(top_builddir)/rpcgen/rpcgen' '${buildPackages.rpcsvc-proto}/bin/rpcgen'
|
||||
'';
|
||||
|
||||
@ -8677,6 +8677,8 @@ with pkgs;
|
||||
|
||||
lmp = callPackage ../tools/security/lmp { };
|
||||
|
||||
localstack = with python3Packages; toPythonApplication localstack;
|
||||
|
||||
localtime = callPackage ../tools/system/localtime { };
|
||||
|
||||
log4j-detect = callPackage ../tools/security/log4j-detect { };
|
||||
|
||||
@ -5333,6 +5333,12 @@ in {
|
||||
|
||||
localimport = callPackage ../development/python-modules/localimport { };
|
||||
|
||||
localstack = callPackage ../development/python-modules/localstack { };
|
||||
|
||||
localstack-client = callPackage ../development/python-modules/localstack-client { };
|
||||
|
||||
localstack-ext = callPackage ../development/python-modules/localstack-ext { };
|
||||
|
||||
localzone = callPackage ../development/python-modules/localzone { };
|
||||
|
||||
locationsharinglib = callPackage ../development/python-modules/locationsharinglib { };
|
||||
@ -7059,6 +7065,8 @@ in {
|
||||
|
||||
plumbum = callPackage ../development/python-modules/plumbum { };
|
||||
|
||||
plux = callPackage ../development/python-modules/plux { };
|
||||
|
||||
ply = callPackage ../development/python-modules/ply { };
|
||||
|
||||
plyer = callPackage ../development/python-modules/plyer { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user