github-actions[bot]
2 years ago
committed by
GitHub
commit
e3d20dfaa5
@ -0,0 +1,41 @@ |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchFromGitHub |
||||
, pytestCheckHook |
||||
, pythonOlder |
||||
, tokenize-rt |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "add-trailing-comma"; |
||||
version = "2.2.1"; |
||||
format = "setuptools"; |
||||
|
||||
disabled = pythonOlder "3.7"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "asottile"; |
||||
repo = pname; |
||||
rev = "v${version}"; |
||||
sha256 = "RBOL4mM9VciHHNmCTlRBIoXqeln19MKYxgv9p6GCNvU="; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ |
||||
tokenize-rt |
||||
]; |
||||
|
||||
pythonImportsCheck = [ |
||||
"add_trailing_comma" |
||||
]; |
||||
|
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
meta = with lib; { |
||||
description = "A tool (and pre-commit hook) to automatically add trailing commas to calls and literals"; |
||||
homepage = "https://github.com/asottile/add-trailing-comma"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ gador ]; |
||||
}; |
||||
} |
||||
@ -0,0 +1,71 @@ |
||||
{ buildPythonPackage |
||||
, fetchFromGitHub |
||||
, lib |
||||
|
||||
# pythonPackages |
||||
, anyconfig |
||||
, appdirs |
||||
, colorama |
||||
, flake8 |
||||
, jsonschema |
||||
, nested-lookup |
||||
, poetry-core |
||||
, python-json-logger |
||||
, pyyaml |
||||
, toolz |
||||
, unidiff |
||||
, yamllint |
||||
}: |
||||
|
||||
buildPythonPackage rec { |
||||
pname = "ansible-later"; |
||||
version = "2.0.6"; |
||||
format = "pyproject"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "thegeeklab"; |
||||
repo = "ansible-later"; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-vg9ryzl9ZeOGuFLL1yeJ3vGNPdo3ONmCQozY6DK6miY="; |
||||
}; |
||||
|
||||
postInstall = '' |
||||
rm $out/lib/python*/site-packages/LICENSE |
||||
''; |
||||
|
||||
postPatch = '' |
||||
substituteInPlace pyproject.toml \ |
||||
--replace 'PyYAML = "6.0"' 'PyYAML = "*"' \ |
||||
--replace 'unidiff = "0.7.3"' 'unidiff = "*"' \ |
||||
--replace 'jsonschema = "4.4.0"' 'jsonschema = "*"' |
||||
''; |
||||
|
||||
nativeBuildInputs = [ |
||||
poetry-core |
||||
]; |
||||
|
||||
propagatedBuildInputs = [ |
||||
anyconfig |
||||
appdirs |
||||
colorama |
||||
flake8 |
||||
jsonschema |
||||
nested-lookup |
||||
python-json-logger |
||||
pyyaml |
||||
toolz |
||||
unidiff |
||||
yamllint |
||||
]; |
||||
|
||||
# no tests |
||||
doCheck = false; |
||||
pythonImportsCheck = [ "ansiblelater" ]; |
||||
|
||||
meta = with lib; { |
||||
description = "Another best practice scanner for Ansible roles and playbooks"; |
||||
homepage = "https://github.com/thegeeklab/ansible-later"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ tboerger ]; |
||||
}; |
||||
} |
||||
@ -1,30 +1,46 @@ |
||||
{ lib, buildPythonPackage, fetchPypi, python, requests, six }: |
||||
{ lib |
||||
, buildPythonPackage |
||||
, fetchFromGitHub |
||||
, httpx |
||||
, pytestCheckHook |
||||
, python |
||||
, pythonOlder |
||||
, requests |
||||
, six |
||||
}: |
||||
|
||||
with lib; |
||||
buildPythonPackage rec { |
||||
pname = "requests-aws4auth"; |
||||
version = "1.1.1"; |
||||
version = "1.1.2"; |
||||
format = "setuptools"; |
||||
|
||||
src = fetchPypi { |
||||
inherit pname version; |
||||
sha256 = "c0883346ce30b5018903a67da88df72f73ff06e1a320845bba9cd85e811ba0ba"; |
||||
disabled = pythonOlder "3.7"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "tedder"; |
||||
repo = pname; |
||||
rev = "v${version}"; |
||||
hash = "sha256-/SqU/ojP9I4JXzR0c5tLzxx9UyNaVsON7LG/dbdeiH0="; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ requests six ]; |
||||
propagatedBuildInputs = [ |
||||
httpx |
||||
requests |
||||
six |
||||
]; |
||||
|
||||
# pypi package no longer contains tests |
||||
doCheck = false; |
||||
checkPhase = '' |
||||
cd requests_aws4auth |
||||
${python.interpreter} test/requests_aws4auth_test.py |
||||
''; |
||||
checkInputs = [ |
||||
pytestCheckHook |
||||
]; |
||||
|
||||
pythonImportsCheck = [ "requests_aws4auth" ]; |
||||
pythonImportsCheck = [ |
||||
"requests_aws4auth" |
||||
]; |
||||
|
||||
meta = { |
||||
description = "Amazon Web Services version 4 authentication for the Python Requests library."; |
||||
meta = with lib; { |
||||
description = "Amazon Web Services version 4 authentication for the Python Requests library"; |
||||
homepage = "https://github.com/sam-washington/requests-aws4auth"; |
||||
license = licenses.mit; |
||||
maintainers = [ maintainers.basvandijk ]; |
||||
maintainers = with maintainers; [ basvandijk ]; |
||||
}; |
||||
} |
||||
|
||||
@ -0,0 +1,2 @@ |
||||
source 'https://rubygems.org' |
||||
gem 'license_finder' |
||||
@ -0,0 +1,26 @@ |
||||
GEM |
||||
remote: https://rubygems.org/ |
||||
specs: |
||||
license_finder (7.0.1) |
||||
bundler |
||||
rubyzip (>= 1, < 3) |
||||
thor (~> 1.2) |
||||
tomlrb (>= 1.3, < 2.1) |
||||
with_env (= 1.1.0) |
||||
xml-simple (~> 1.1.9) |
||||
rexml (3.2.5) |
||||
rubyzip (2.3.2) |
||||
thor (1.2.1) |
||||
tomlrb (2.0.1) |
||||
with_env (1.1.0) |
||||
xml-simple (1.1.9) |
||||
rexml |
||||
|
||||
PLATFORMS |
||||
ruby |
||||
|
||||
DEPENDENCIES |
||||
license_finder |
||||
|
||||
BUNDLED WITH |
||||
2.1.4 |
||||
@ -0,0 +1,19 @@ |
||||
{ lib, bundlerEnv, bundlerUpdateScript, ruby }: |
||||
|
||||
bundlerEnv { |
||||
pname = "license_finder"; |
||||
version = "7.0.1"; |
||||
|
||||
inherit ruby; |
||||
gemdir = ./.; |
||||
|
||||
passthru.updateScript = bundlerUpdateScript "license_finder"; |
||||
|
||||
meta = with lib; { |
||||
description = "Find licenses for your project's dependencies"; |
||||
homepage = "https://github.com/pivotal/licensefinder"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ wolfangaukang ]; |
||||
platforms = platforms.unix; |
||||
}; |
||||
} |
||||
@ -0,0 +1,74 @@ |
||||
{ |
||||
license_finder = { |
||||
dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; |
||||
groups = ["default"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0sig4ifxzvcz3fwjnz93dpv61v6sxpmlknj5f8n112ragrbcj8hb"; |
||||
type = "gem"; |
||||
}; |
||||
version = "7.0.1"; |
||||
}; |
||||
rexml = { |
||||
groups = ["default"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; |
||||
type = "gem"; |
||||
}; |
||||
version = "3.2.5"; |
||||
}; |
||||
rubyzip = { |
||||
groups = ["default"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; |
||||
type = "gem"; |
||||
}; |
||||
version = "2.3.2"; |
||||
}; |
||||
thor = { |
||||
groups = ["default"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; |
||||
type = "gem"; |
||||
}; |
||||
version = "1.2.1"; |
||||
}; |
||||
tomlrb = { |
||||
groups = ["default"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0a83cb5xpyzlr651d46rk5xgq37s46hs9nfqy9baawzs31hm9k2g"; |
||||
type = "gem"; |
||||
}; |
||||
version = "2.0.1"; |
||||
}; |
||||
with_env = { |
||||
groups = ["default"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "1r5ns064mbb99hf1dyxsk9183hznc5i7mn3bi86zka6dlvqf9csh"; |
||||
type = "gem"; |
||||
}; |
||||
version = "1.1.0"; |
||||
}; |
||||
xml-simple = { |
||||
dependencies = ["rexml"]; |
||||
groups = ["default"]; |
||||
platforms = []; |
||||
source = { |
||||
remotes = ["https://rubygems.org"]; |
||||
sha256 = "0pb9plyl71mdbjr4kllfy53qx6g68ryxblmnq9dilvy837jk24fj"; |
||||
type = "gem"; |
||||
}; |
||||
version = "1.1.9"; |
||||
}; |
||||
} |
||||
@ -0,0 +1,186 @@ |
||||
diff --git a/src/util/thread.h b/src/util/thread.h
|
||||
index 28aeca8a..db5c9913 100644
|
||||
--- a/src/util/thread.h
|
||||
+++ b/src/util/thread.h
|
||||
@@ -149,178 +149,8 @@ namespace dxvk {
|
||||
}
|
||||
}
|
||||
|
||||
-
|
||||
- /**
|
||||
- * \brief SRW-based mutex implementation
|
||||
- *
|
||||
- * Drop-in replacement for \c std::mutex that uses Win32
|
||||
- * SRW locks, which are implemented with \c futex in wine.
|
||||
- */
|
||||
- class mutex {
|
||||
-
|
||||
- public:
|
||||
-
|
||||
- using native_handle_type = PSRWLOCK;
|
||||
-
|
||||
- mutex() { }
|
||||
-
|
||||
- mutex(const mutex&) = delete;
|
||||
- mutex& operator = (const mutex&) = delete;
|
||||
-
|
||||
- void lock() {
|
||||
- AcquireSRWLockExclusive(&m_lock);
|
||||
- }
|
||||
-
|
||||
- void unlock() {
|
||||
- ReleaseSRWLockExclusive(&m_lock);
|
||||
- }
|
||||
-
|
||||
- bool try_lock() {
|
||||
- return TryAcquireSRWLockExclusive(&m_lock);
|
||||
- }
|
||||
-
|
||||
- native_handle_type native_handle() {
|
||||
- return &m_lock;
|
||||
- }
|
||||
-
|
||||
- private:
|
||||
-
|
||||
- SRWLOCK m_lock = SRWLOCK_INIT;
|
||||
-
|
||||
- };
|
||||
-
|
||||
-
|
||||
- /**
|
||||
- * \brief Recursive mutex implementation
|
||||
- *
|
||||
- * Drop-in replacement for \c std::recursive_mutex that
|
||||
- * uses Win32 critical sections.
|
||||
- */
|
||||
- class recursive_mutex {
|
||||
-
|
||||
- public:
|
||||
-
|
||||
- using native_handle_type = PCRITICAL_SECTION;
|
||||
-
|
||||
- recursive_mutex() {
|
||||
- InitializeCriticalSection(&m_lock);
|
||||
- }
|
||||
-
|
||||
- ~recursive_mutex() {
|
||||
- DeleteCriticalSection(&m_lock);
|
||||
- }
|
||||
-
|
||||
- recursive_mutex(const recursive_mutex&) = delete;
|
||||
- recursive_mutex& operator = (const recursive_mutex&) = delete;
|
||||
-
|
||||
- void lock() {
|
||||
- EnterCriticalSection(&m_lock);
|
||||
- }
|
||||
-
|
||||
- void unlock() {
|
||||
- LeaveCriticalSection(&m_lock);
|
||||
- }
|
||||
-
|
||||
- bool try_lock() {
|
||||
- return TryEnterCriticalSection(&m_lock);
|
||||
- }
|
||||
-
|
||||
- native_handle_type native_handle() {
|
||||
- return &m_lock;
|
||||
- }
|
||||
-
|
||||
- private:
|
||||
-
|
||||
- CRITICAL_SECTION m_lock;
|
||||
-
|
||||
- };
|
||||
-
|
||||
-
|
||||
- /**
|
||||
- * \brief SRW-based condition variable implementation
|
||||
- *
|
||||
- * Drop-in replacement for \c std::condition_variable that
|
||||
- * uses Win32 condition variables on SRW locks.
|
||||
- */
|
||||
- class condition_variable {
|
||||
-
|
||||
- public:
|
||||
-
|
||||
- using native_handle_type = PCONDITION_VARIABLE;
|
||||
-
|
||||
- condition_variable() {
|
||||
- InitializeConditionVariable(&m_cond);
|
||||
- }
|
||||
-
|
||||
- condition_variable(condition_variable&) = delete;
|
||||
-
|
||||
- condition_variable& operator = (condition_variable&) = delete;
|
||||
-
|
||||
- void notify_one() {
|
||||
- WakeConditionVariable(&m_cond);
|
||||
- }
|
||||
-
|
||||
- void notify_all() {
|
||||
- WakeAllConditionVariable(&m_cond);
|
||||
- }
|
||||
-
|
||||
- void wait(std::unique_lock<dxvk::mutex>& lock) {
|
||||
- auto srw = lock.mutex()->native_handle();
|
||||
- SleepConditionVariableSRW(&m_cond, srw, INFINITE, 0);
|
||||
- }
|
||||
-
|
||||
- template<typename Predicate>
|
||||
- void wait(std::unique_lock<dxvk::mutex>& lock, Predicate pred) {
|
||||
- while (!pred())
|
||||
- wait(lock);
|
||||
- }
|
||||
-
|
||||
- template<typename Clock, typename Duration>
|
||||
- std::cv_status wait_until(std::unique_lock<dxvk::mutex>& lock, const std::chrono::time_point<Clock, Duration>& time) {
|
||||
- auto now = Clock::now();
|
||||
-
|
||||
- return (now < time)
|
||||
- ? wait_for(lock, now - time)
|
||||
- : std::cv_status::timeout;
|
||||
- }
|
||||
-
|
||||
- template<typename Clock, typename Duration, typename Predicate>
|
||||
- bool wait_until(std::unique_lock<dxvk::mutex>& lock, const std::chrono::time_point<Clock, Duration>& time, Predicate pred) {
|
||||
- if (pred())
|
||||
- return true;
|
||||
-
|
||||
- auto now = Clock::now();
|
||||
- return now < time && wait_for(lock, now - time, pred);
|
||||
- }
|
||||
-
|
||||
- template<typename Rep, typename Period>
|
||||
- std::cv_status wait_for(std::unique_lock<dxvk::mutex>& lock, const std::chrono::duration<Rep, Period>& timeout) {
|
||||
- auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(timeout);
|
||||
- auto srw = lock.mutex()->native_handle();
|
||||
-
|
||||
- return SleepConditionVariableSRW(&m_cond, srw, ms.count(), 0)
|
||||
- ? std::cv_status::no_timeout
|
||||
- : std::cv_status::timeout;
|
||||
- }
|
||||
-
|
||||
- template<typename Rep, typename Period, typename Predicate>
|
||||
- bool wait_for(std::unique_lock<dxvk::mutex>& lock, const std::chrono::duration<Rep, Period>& timeout, Predicate pred) {
|
||||
- bool result = pred();
|
||||
-
|
||||
- if (!result && wait_for(lock, timeout) == std::cv_status::no_timeout)
|
||||
- result = pred();
|
||||
-
|
||||
- return result;
|
||||
- }
|
||||
-
|
||||
- native_handle_type native_handle() {
|
||||
- return &m_cond;
|
||||
- }
|
||||
-
|
||||
- private:
|
||||
-
|
||||
- CONDITION_VARIABLE m_cond;
|
||||
-
|
||||
- };
|
||||
+ using mutex = std::mutex;
|
||||
+ using recursive_mutex = std::recursive_mutex;
|
||||
+ using condition_variable = std::condition_variable;
|
||||
|
||||
}
|
||||
@ -1,12 +1,12 @@ |
||||
{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: |
||||
|
||||
buildLinux (args // rec { |
||||
version = "4.9.307"; |
||||
version = "4.9.308"; |
||||
extraMeta.branch = "4.9"; |
||||
extraMeta.broken = stdenv.isAarch64; |
||||
|
||||
src = fetchurl { |
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; |
||||
sha256 = "1xyhz7hq8yyclxyavzk36sbl41vlb74pccd56240kq34ma1hyis7"; |
||||
sha256 = "11rf3zr31ap6rzy3s489c1dqzkfn5cfkm579y4dnssdyzmyams3v"; |
||||
}; |
||||
} // (args.argsOverride or {})) |
||||
|
||||
@ -0,0 +1,22 @@ |
||||
{ lib, buildGoModule, fetchFromGitHub }: |
||||
|
||||
buildGoModule rec { |
||||
pname = "irccat"; |
||||
version = "0.4.8"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "irccloud"; |
||||
repo = "irccat"; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-fr5x1usviJPbc4t5SpIVgV9Q6071XG8eYtyeyraddts="; |
||||
}; |
||||
|
||||
vendorSha256 = "030hnkwh45yqppm96yy15j82skf7wmax5xkm7j5khr1l9lrz4591"; |
||||
|
||||
meta = with lib; { |
||||
homepage = "https://github.com/irccloud/irccat"; |
||||
description = "Send events to IRC channels from scripts and other applications"; |
||||
maintainers = with maintainers; [ qyliss ]; |
||||
license = licenses.gpl3Only; |
||||
}; |
||||
} |
||||
@ -0,0 +1,30 @@ |
||||
{ buildPythonApplication |
||||
, fetchFromGitHub |
||||
, lib |
||||
, natsort |
||||
, panflute |
||||
}: |
||||
|
||||
buildPythonApplication rec { |
||||
pname = "pandoc-include"; |
||||
version = "1.2.0"; |
||||
format = "pyproject"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "DCsunset"; |
||||
repo = pname; |
||||
rev = "v${version}"; |
||||
sha256 = "sha256-kuxud7m+sWcNqE8A+Fwb8ATgiUwxQvHeYBTyw1UzX4U="; |
||||
}; |
||||
|
||||
propagatedBuildInputs = [ natsort panflute ]; |
||||
|
||||
pythonImportsCheck = [ "pandoc_include.main" ]; |
||||
|
||||
meta = with lib; { |
||||
description = "Pandoc filter to allow file and header includes"; |
||||
homepage = "https://github.com/DCsunset/pandoc-include"; |
||||
license = licenses.mit; |
||||
maintainers = with maintainers; [ ppenguin ]; |
||||
}; |
||||
} |
||||
@ -1,39 +0,0 @@ |
||||
{ stdenv, lib, fetchFromGitHub, python2, util-linux }: |
||||
|
||||
stdenv.mkDerivation { |
||||
pname = "bud"; |
||||
version = "0.34.1"; |
||||
|
||||
src = fetchFromGitHub { |
||||
owner = "indutny"; |
||||
repo = "bud"; |
||||
rev = "b112852c9667632f692d2ce3dcd9a8312b61155a"; |
||||
sha256 = "sha256-sHXwxWCCVL8Wyo6PAjbA2jj7FXOjCAOezaYKRgk12SM="; |
||||
fetchSubmodules = true; |
||||
}; |
||||
|
||||
nativeBuildInputs = [ |
||||
python2 python2.pkgs.gyp |
||||
] ++ lib.optional stdenv.isLinux util-linux; |
||||
|
||||
strictDeps = true; |
||||
|
||||
buildPhase = '' |
||||
python ./gyp_bud -f make |
||||
make -C out |
||||
''; |
||||
|
||||
installPhase = '' |
||||
mkdir -p $out/bin |
||||
cp out/Release/bud $out/bin |
||||
''; |
||||
|
||||
meta = with lib; { |
||||
description = "A TLS terminating proxy"; |
||||
license = licenses.mit; |
||||
platforms = platforms.linux; |
||||
# Does not build on aarch64-linux. |
||||
badPlatforms = [ "aarch64-linux" ]; |
||||
maintainers = with maintainers; [ cstrahan ]; |
||||
}; |
||||
} |
||||
Loading…
Reference in new issue