-
-
Notifications
You must be signed in to change notification settings - Fork 14.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into staging-next
- Loading branch information
Showing
12 changed files
with
163 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git a/sources/core/client.cpp b/sources/core/client.cpp | ||
| index 7ea20e2..c5d2c40 100644 | ||
| --- a/sources/core/client.cpp | ||
| +++ b/sources/core/client.cpp | ||
| @@ -23,6 +23,7 @@ | ||
| #include <cpp_redis/core/client.hpp> | ||
| #include <cpp_redis/misc/error.hpp> | ||
| #include <cpp_redis/misc/macro.hpp> | ||
| +#include <thread> | ||
|
|
||
| namespace cpp_redis { | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| { | ||
| lib, | ||
| stdenv, | ||
| fetchFromGitHub, | ||
| cmake, | ||
| pkg-config, | ||
| }: | ||
|
|
||
| stdenv.mkDerivation rec { | ||
| pname = "cpp-redis"; | ||
| version = "4.3.1"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "cpp-redis"; | ||
| repo = "cpp_redis"; | ||
| rev = version; | ||
| hash = "sha256-dLAnxgldylWWKO3WIyx+F7ylOpRH+0nD7NZjWSOxuwQ="; | ||
| fetchSubmodules = true; | ||
| }; | ||
|
|
||
| nativeBuildInputs = [ | ||
| cmake | ||
| pkg-config | ||
| ]; | ||
| CFLAGS = "-D_GLIBCXX_USE_NANOSLEEP"; | ||
| patches = [ | ||
| ./01-fix-sleep_for.patch | ||
| ]; | ||
|
|
||
| meta = with lib; { | ||
| description = "C++11 Lightweight Redis client: async, thread-safe, no dependency, pipelining, multi-platform"; | ||
| homepage = "https://github.com/cpp-redis/cpp_redis"; | ||
| changelog = "https://github.com/cpp-redis/cpp_redis/blob/${src.rev}/CHANGELOG.md"; | ||
| license = licenses.mit; | ||
| maintainers = with maintainers; [ poelzi ]; | ||
| platforms = platforms.all; | ||
| }; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,8 @@ | ||
| #!/usr/bin/env nix-shell | ||
| #!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq common-updater-scripts nixfmt-rfc-style | ||
| set -eo pipefail | ||
| #!nix-shell --pure -i bash -p bash nix nix-update git cacert | ||
| set -euo pipefail | ||
|
|
||
| verlte() { | ||
| printf '%s\n' "$1" "$2" | sort -C -V | ||
| } | ||
|
|
||
| new_version="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/OpenTabletDriver/OpenTabletDriver/releases" | | ||
| jq -r 'map(select(.prerelease == false)) | .[0].tag_name' | | ||
| cut -c2-)" | ||
| old_version="$(nix --extra-experimental-features 'nix-command' eval --file default.nix opentabletdriver.version --raw)" | ||
|
|
||
| if verlte "$new_version" "$old_version"; then | ||
| echo "Already up to date!" | ||
| [[ "${1}" != "--force" ]] && exit 0 | ||
| fi | ||
|
|
||
| update-source-version opentabletdriver "$new_version" | ||
| eval "$(nix-build -A opentabletdriver.fetch-deps --no-out-link)" | ||
|
|
||
| cd "$(dirname "${BASH_SOURCE[0]}")" | ||
| nixfmt deps.nix | ||
| prev_version=$(nix eval --raw -f. opentabletdriver.version) | ||
| nix-update opentabletdriver | ||
| [[ $(nix eval --raw -f. opentabletdriver.version) == "$prev_version" ]] || | ||
| "$(nix-build . -A opentabletdriver.fetch-deps --no-out-link)" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| { | ||
| stdenv, | ||
| fetchFromGitHub, | ||
| alsa-lib, | ||
| openssl, | ||
| pkg-config, | ||
| lib, | ||
| unstableGitUpdater, | ||
| }: | ||
|
|
||
| let | ||
|
|
||
| firmwareSrc = fetchFromGitHub { | ||
| owner = "geoffreybennett"; | ||
| repo = "scarlett2-firmware"; | ||
| rev = "f628dfb4d2e874b2078dbb43e8c1d59dd6553dd1"; | ||
| hash = "sha256-s61eyS47SuIbK9KR59XxHpybvl9tHFWPLkpHmdqwO24="; | ||
| }; | ||
|
|
||
| in | ||
| stdenv.mkDerivation { | ||
|
|
||
| pname = "scarlett2"; | ||
|
|
||
| version = "0-unstable-2024-04-06"; | ||
|
|
||
| src = fetchFromGitHub { | ||
| owner = "geoffreybennett"; | ||
| repo = "scarlett2"; | ||
| rev = "1c262bcac11bceb6da8334b8f5b56d3c9331bfc8"; | ||
| hash = "sha256-yhmXVfys300NwZ8UJ7WvOyNkGP3OkIVoRaToF+SenQA="; | ||
| }; | ||
|
|
||
| buildInputs = [ | ||
| alsa-lib | ||
| openssl | ||
| ]; | ||
|
|
||
| nativeBuildInputs = [ pkg-config ]; | ||
|
|
||
| preBuild = '' | ||
| makeFlagsArray+=( PREFIX=$out ) | ||
| ''; | ||
|
|
||
| passthru.updateScript = unstableGitUpdater { }; | ||
|
|
||
| # the program expects to find firmware files in a directory called "firmware" relative to the resolved path of the binary | ||
| postInstall = '' | ||
| mkdir -p $out/share | ||
| mv $out/bin/scarlett2 $out/share | ||
| ln -s $out/share/scarlett2 $out/bin/scarlett2 | ||
| ln -s ${firmwareSrc}/firmware $out/share/firmware | ||
| ''; | ||
|
|
||
| meta = { | ||
| description = "Scarlett2 Firmware Management Utility for Scarlett 2nd, 3rd, and 4th Gen, Clarett USB, and Clarett+ interfaces"; | ||
| homepage = "https://github.com/geoffreybennett/scarlett2"; | ||
| license = lib.licenses.gpl3Only; | ||
| maintainers = with lib.maintainers; [ squalus ]; | ||
| mainProgram = "scarlett2"; | ||
| }; | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters