github-actions[bot]
2 years ago
committed by
GitHub
commit
d544a4fb07
@ -1,7 +1,8 @@ |
||||
{ |
||||
"owner": "zammad", |
||||
"repo": "zammad", |
||||
"rev": "eefae45c2ad6e6a96b8df631d2f50f290ecbd27d", |
||||
"sha256": "EjowvM//+UsAfEH9/0jgLkiD7EWH34M1NQ9U2DotBqc=", |
||||
"rev": "d71bd90ef964426230664cdfbaa2572325bfed4f", |
||||
"sha256": "yzDTkjnRBl71REtSKRblkanJWhj7gp/+exhWjxGCFWw=", |
||||
"fetchSubmodules": true |
||||
} |
||||
|
||||
|
||||
@ -0,0 +1,35 @@ |
||||
--- a/translated_examples/fifo.v 1970-01-01 00:00:01.000000000 +0000
|
||||
+++ a/temp/verilog/fifo.v 2022-05-11 03:44:43.173604945 +0000
|
||||
@@ -107,7 +107,7 @@
|
||||
//--- Read address counter --------------
|
||||
//---------------------------------------
|
||||
assign add_RD_CE = (iempty == 1'b1) ? 1'b0 : (RD == 1'b0) ? 1'b0 : 1'b1;
|
||||
- assign n_add_RD = (add_RD) + 4'h1;
|
||||
+ assign n_add_RD = add_RD + 4'h1;
|
||||
always @(posedge clk_RD, posedge rst) begin
|
||||
if((rst == 1'b1)) begin
|
||||
add_RD <= {5{1'b0}};
|
||||
diff -u '--exclude=Makefile' '--exclude-from=examples/exclude' translated_examples/test.v temp/verilog/test.v
|
||||
--- a/translated_examples/test.v 1970-01-01 00:00:01.000000000 +0000
|
||||
+++ a/temp/verilog/test.v 2022-05-11 03:44:43.189604945 +0000
|
||||
@@ -125,7 +125,7 @@
|
||||
endcase
|
||||
end
|
||||
|
||||
- assign code1[1:0] = a[6:5] ^ ({a[4],b[6]});
|
||||
+ assign code1[1:0] = a[6:5] ^ {a[4],b[6]};
|
||||
// Asynch process
|
||||
always @(we, addr, config1, bip) begin
|
||||
if(we == 1'b1) begin
|
||||
diff -u '--exclude=Makefile' '--exclude-from=examples/exclude' translated_examples/withselect.v temp/verilog/withselect.v
|
||||
--- a/translated_examples/withselect.v 1970-01-01 00:00:01.000000000 +0000
|
||||
+++ a/temp/verilog/withselect.v 2022-05-11 03:44:43.193604945 +0000
|
||||
@@ -33,7 +33,7 @@
|
||||
endcase
|
||||
end
|
||||
|
||||
- assign code1[1:0] = a[6:5] ^ ({a[4],b[6]});
|
||||
+ assign code1[1:0] = a[6:5] ^ {a[4],b[6]};
|
||||
assign foo = {(((1 + 1))-((0))+1){1'b0}};
|
||||
assign egg = {78{1'b0}};
|
||||
assign baz = {(((bus_width * 4))-((bus_width * 3 - 1))+1){1'b1}};
|
||||
@ -0,0 +1,40 @@ |
||||
{ lib, stdenv, libxml2, libxslt, fetchhg }: |
||||
|
||||
# Upstream maintains documentation (sources of https://nginx.org) in separate |
||||
# mercurial repository, which do not correspond to particular git commit, but at |
||||
# least has "introduced in version X.Y" comments. |
||||
# |
||||
# In other words, documentation does not necessary matches capabilities of |
||||
# $out/bin/nginx, but we have no better options. |
||||
stdenv.mkDerivation { |
||||
pname = "nginx-doc-unstable"; |
||||
version = "2022-05-05"; |
||||
src = fetchhg { |
||||
url = "https://hg.nginx.org/nginx.org"; |
||||
rev = "a3aee2697d4e"; |
||||
sha256 = "029n4mnmjw94h01qalmjgf1c2h3h7wm798xv5knk3padxiy4m28b"; |
||||
}; |
||||
patches = [ ./exclude-google-analytics.patch ]; |
||||
nativeBuildInputs = [ libxslt libxml2 ]; |
||||
|
||||
# Generated documentation is not local-friendly, since it assumes that link to directory |
||||
# is the same as link to index.html in that directory, which is not how browsers behave |
||||
# with local filesystem. |
||||
# |
||||
# TODO: patch all relative links that do not end with .html. |
||||
|
||||
# /en subdirectory must exist, relative links expect it. |
||||
installPhase = '' |
||||
mkdir -p $out/share/doc/nginx |
||||
mv libxslt/en $out/share/doc/nginx |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "A reverse proxy and lightweight webserver (documentation)"; |
||||
homepage = "https://nginx.org/"; |
||||
license = licenses.bsd2; |
||||
platforms = platforms.all; |
||||
priority = 6; |
||||
maintainers = with maintainers; [ kaction ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,29 @@ |
||||
Kill google analytics from local documentation.
|
||||
|
||||
diff -r bb0a2fbdc886 xslt/ga.xslt
|
||||
--- a/xslt/ga.xslt Mon Apr 06 11:17:11 2020 +0100
|
||||
+++ b/xslt/ga.xslt Thu Apr 09 10:29:02 2020 -0400
|
||||
@@ -6,23 +6,6 @@
|
||||
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
|
||||
|
||||
<xsl:template name="ga">
|
||||
-
|
||||
- <script>
|
||||
- (function(w, d, s, l, i) {
|
||||
- w[l] = w[l] || [];
|
||||
- w[l].push({
|
||||
- 'gtm.start': new Date().getTime(),
|
||||
- event: 'gtm.js'
|
||||
- });
|
||||
- var f = d.getElementsByTagName(s)[0],
|
||||
- j = d.createElement(s),
|
||||
- dl = l != 'dataLayer' ? '&l=' + l : '';
|
||||
- j.async = true;
|
||||
- j.src = '//www.googletagmanager.com/gtm.js?id=' + i + dl;
|
||||
- f.parentNode.insertBefore(j, f);
|
||||
- })(window, document, 'script', 'dataLayer', 'GTM-TPSP33');
|
||||
- </script>
|
||||
-
|
||||
</xsl:template>
|
||||
|
||||
</xsl:stylesheet>
|
||||
@ -1,26 +0,0 @@ |
||||
{ callPackage, fetchpatch, lib, stdenv }: |
||||
|
||||
callPackage ./generic.nix { |
||||
version = "1.12.0"; |
||||
sha256 = "0f7xd66vc1lzjbn7jzd5kyqrgxpsfxi4zc7iymhb5xrwyxipjl1g"; |
||||
|
||||
patches = [ |
||||
(fetchpatch { |
||||
# Fixed a compilation error with GCC 10.0 to 11.0. June 1, 2020. |
||||
# Should be included in the next release after 1.12.0 |
||||
url = "https://github.com/google/flatbuffers/commit/988164f6e1675bbea9c852e2d6001baf4d1fcf59.patch"; |
||||
sha256 = "0d8c2bywqmkhdi0a41cry85wy4j58pl0vd6h5xpfqm3fr8w0mi9s"; |
||||
excludes = [ "src/idl_gen_cpp.cpp" ]; |
||||
}) |
||||
(fetchpatch { |
||||
# Fixed a compilation error with GCC 10.0 to 11.0. July 6, 2020. |
||||
# Should be included in the next release after 1.12.0 |
||||
url = "https://github.com/google/flatbuffers/pull/6020/commits/44c7a4cf439b0a298720b5a448bcc243a882b0c9.patch"; |
||||
sha256 = "126xwkvnlc4ignjhxv9jygfd9j6kr1jx39hyk0ddpcmvzfqsccf4"; |
||||
}) |
||||
]; |
||||
|
||||
preConfigure = lib.optionalString stdenv.buildPlatform.isDarwin '' |
||||
rm BUILD |
||||
''; |
||||
} |
||||
@ -1,16 +0,0 @@ |
||||
{ callPackage, fetchpatch }: |
||||
|
||||
callPackage ./generic.nix { |
||||
version = "2.0.0"; |
||||
sha256 = "1zbf6bdpps8369r1ql00irxrp58jnalycc8jcapb8iqg654vlfz8"; |
||||
|
||||
patches = [ |
||||
# Pull patch pending upstream inclustion for gcc-12 support: |
||||
# https://github.com/google/flatbuffers/pull/6946 |
||||
(fetchpatch { |
||||
name = "gcc-12.patch"; |
||||
url = "https://github.com/google/flatbuffers/commit/17d9f0c4cf47a9575b4f43a2ac33eb35ba7f9e3e.patch"; |
||||
sha256 = "0sksk47hi7camja9ppnjr88jfdgj0nxqxy8976qs1nx73zkgbpf9"; |
||||
}) |
||||
]; |
||||
} |
||||
@ -1,25 +1,30 @@ |
||||
{ lib |
||||
, stdenv |
||||
, fetchFromGitHub |
||||
, fetchpatch |
||||
, cmake |
||||
, version |
||||
, sha256 |
||||
, patches ? [ ] |
||||
, preConfigure ? null |
||||
}: |
||||
|
||||
stdenv.mkDerivation rec { |
||||
pname = "flatbuffers"; |
||||
inherit version; |
||||
version = "2.0.0"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "google"; |
||||
repo = "flatbuffers"; |
||||
rev = "v${version}"; |
||||
inherit sha256; |
||||
sha256 = "1zbf6bdpps8369r1ql00irxrp58jnalycc8jcapb8iqg654vlfz8"; |
||||
}; |
||||
|
||||
inherit patches preConfigure; |
||||
patches = [ |
||||
# Pull patch pending upstream inclustion for gcc-12 support: |
||||
# https://github.com/google/flatbuffers/pull/6946 |
||||
(fetchpatch { |
||||
name = "gcc-12.patch"; |
||||
url = "https://github.com/google/flatbuffers/commit/17d9f0c4cf47a9575b4f43a2ac33eb35ba7f9e3e.patch"; |
||||
sha256 = "0sksk47hi7camja9ppnjr88jfdgj0nxqxy8976qs1nx73zkgbpf9"; |
||||
}) |
||||
]; |
||||
|
||||
nativeBuildInputs = [ cmake ]; |
||||
|
||||
@ -0,0 +1,50 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchFromGitHub |
||||
, pythonOlder |
||||
, toml |
||||
, pyyaml |
||||
, packaging |
||||
, pytestCheckHook |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "dparse2"; |
||||
version = "0.6.1"; |
||||
format = "setuptools"; |
||||
|
||||
disabled = pythonOlder "3.7"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "nexB"; |
||||
repo = pname; |
||||
rev = version; |
||||
hash = "sha256-1tbNW7Gy7gvMnETdAM2ahHiwbhG9qvdYZggia1+7eGo="; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ |
||||
toml |
||||
pyyaml |
||||
packaging |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
disabledTestPaths = [ |
||||
# Requries pipenv |
||||
"tests/test_parse.py" |
||||
]; |
||||
|
||||
pythonImportsCheck = [ |
||||
"dparse2" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Module to parse Python dependency files"; |
||||
homepage = "https://github.com/nexB/dparse2"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ fab ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,44 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchFromGitHub |
||||
, poetry-core |
||||
, click |
||||
, rich |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "name-that-hash"; |
||||
version = "1.10"; |
||||
format = "pyproject"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "HashPals"; |
||||
repo = pname; |
||||
rev = version; |
||||
hash = "sha256-3sddUPoC3NfKQzmNgqPf/uHaYN9VZBqsmV712uz1Phg="; |
||||
}; |
||||
|
||||
# TODO remove on next update which bumps rich |
||||
postPatch = '' |
||||
substituteInPlace pyproject.toml --replace 'rich = ">=9.9,<11.0"' 'rich = ">=9.9"' |
||||
''; |
||||
|
||||
nativeBuildInputs = [ |
||||
poetry-core |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ |
||||
click |
||||
rich |
||||
]; |
||||
|
||||
pythonImportsCheck = [ "name_that_hash" ]; |
||||
|
||||
meta = with lib; { |
||||
longDescription = "Don't know what type of hash it is? Name That Hash will name that hash type! Identify MD5, SHA256 and 300+ other hashes."; |
||||
description = "Module and CLI for the identification of hashes"; |
||||
homepage = "https://github.com/HashPals/Name-That-Hash"; |
||||
license = with licenses; [ gpl3Plus ]; |
||||
maintainers = with maintainers; [ eyjhb ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,60 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, cryptography |
||||
, fetchFromGitHub |
||||
, pytest-asyncio |
||||
, pytestCheckHook |
||||
, pythonOlder |
||||
, typing-extensions |
||||
, zeroconf |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "python-rabbitair"; |
||||
version = "0.0.8"; |
||||
format = "pyproject"; |
||||
|
||||
disabled = pythonOlder "3.6"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "rabbit-air"; |
||||
repo = pname; |
||||
rev = "v${version}"; |
||||
hash = "sha256-CGr7NvnGRNTiKq5BpB/zmfgyd/2ggTbO0nj+Q+MavTs="; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ |
||||
cryptography |
||||
zeroconf |
||||
] ++ lib.optionals (pythonOlder "3.8") [ |
||||
typing-extensions |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
pytest-asyncio |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
pythonImportsCheck = [ |
||||
"rabbitair" |
||||
]; |
||||
|
||||
disabledTests = [ |
||||
# Tests require network access |
||||
"test_info" |
||||
"test_no_response" |
||||
"test_protocol_error" |
||||
"test_sequential_requests" |
||||
"test_set_state" |
||||
"test_state_a2" |
||||
"test_state_a3" |
||||
"test_zeroconf" |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "Module for the control of Rabbit Air air purifiers"; |
||||
homepage = "https://github.com/rabbit-air/python-rabbitair"; |
||||
license = with licenses; [ asl20 ]; |
||||
maintainers = with maintainers; [ fab ]; |
||||
}; |
||||
} |
||||
@ -1,11 +0,0 @@ |
||||
diff --git a/modules/Src/aloxaf/fzftab.c b/modules/Src/aloxaf/fzftab.c
|
||||
index 60b6330..91975d8 100644
|
||||
--- a/modules/Src/aloxaf/fzftab.c
|
||||
+++ b/modules/Src/aloxaf/fzftab.c
|
||||
@@ -1,6 +1,5 @@
|
||||
#include "fzftab.mdh"
|
||||
#include "fzftab.pro"
|
||||
-#include <malloc.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/stat.h>
|
||||
Loading…
Reference in new issue