Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-07-14 06:02:04 +00:00 committed by GitHub
commit d52229da47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
50 changed files with 580 additions and 236 deletions

10
.github/CODEOWNERS vendored
View File

@ -23,7 +23,7 @@
# Libraries
/lib @edolstra @infinisil
/lib/systems @alyssais @ericson2314 @matthewbauer
/lib/systems @alyssais @ericson2314 @matthewbauer @amjoseph-nixpkgs
/lib/generators.nix @edolstra @Profpatsch
/lib/cli.nix @edolstra @Profpatsch
/lib/debug.nix @edolstra @Profpatsch
@ -37,10 +37,10 @@
/pkgs/top-level/stage.nix @Ericson2314 @matthewbauer
/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer
/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer
/pkgs/stdenv/generic @Ericson2314 @matthewbauer
/pkgs/stdenv/generic @Ericson2314 @matthewbauer @amjoseph-nixpkgs
/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @matthewbauer @piegamesde
/pkgs/stdenv/cross @Ericson2314 @matthewbauer
/pkgs/build-support/cc-wrapper @Ericson2314
/pkgs/stdenv/cross @Ericson2314 @matthewbauer @amjoseph-nixpkgs
/pkgs/build-support/cc-wrapper @Ericson2314 @amjoseph-nixpkgs
/pkgs/build-support/bintools-wrapper @Ericson2314
/pkgs/build-support/setup-hooks @Ericson2314
/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus
@ -124,7 +124,7 @@
/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda
# C compilers
/pkgs/development/compilers/gcc @matthewbauer
/pkgs/development/compilers/gcc @matthewbauer @amjoseph-nixpkgs
/pkgs/development/compilers/llvm @matthewbauer @RaitoBezarius
# Compatibility stuff

View File

@ -28,13 +28,13 @@
buildDotnetModule rec {
pname = "ryujinx";
version = "1.1.958"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
version = "1.1.960"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
rev = "fa32ef92755a51a2567a1bcbb35fb34886b5f979";
sha256 = "1g7q5c4cx2l41vs92p6a8rw1c0wvrydm9p962mjddckk6hf1bixq";
rev = "ac2444f908bee5b5c1a13fe64e997315cea4b23c";
sha256 = "0nv55x775lzbqa724ba2bpbkk6r7jbrgxgbir5bhyj0yz5ckl4v5";
};
dotnet-sdk = dotnetCorePackages.sdk_7_0;

View File

@ -19,7 +19,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "komikku";
version = "1.21.1";
version = "1.22.0";
format = "other";
@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "valos";
repo = "Komikku";
rev = "v${version}";
hash = "sha256-1VqV0tTI8XVwGJhaGWEdSxtWDhQFmrsncvhC4ftJ7Jg=";
hash = "sha256-6Pqa3qNnH8WF/GK4CLyEmLoPm4A6Q3Gri2x0whf6WTY=";
};
nativeBuildInputs = [

View File

@ -0,0 +1,38 @@
{ lib
, stdenv
, fetchFromGitHub
, SDL2
}:
stdenv.mkDerivation {
pname = "johnny-reborn-engine";
version = "unstable-2020-12-06";
src = fetchFromGitHub {
owner = "jno6809";
repo = "jc_reborn";
rev = "524a5803e4fa65f840379c781f40ce39a927032e";
hash = "sha256-YKAOCgdRnvNMzL6LJVXN0pLvjyJk4Zv/RCqGtDPFR90=";
};
makefile = "Makefile.linux";
buildInputs = [ SDL2 ];
installPhase = ''
runHook preInstall
mkdir -p $out
cp jc_reborn $out/
runHook postInstall
'';
meta = {
description = "An open-source engine for the classic \"Johnny Castaway\" screensaver (engine only)";
homepage = "https://github.com/jno6809/jc_reborn";
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ pedrohlc ];
inherit (SDL2.meta) platforms;
};
}

View File

@ -0,0 +1,63 @@
{ lib
, stdenvNoCC
, fetchFromGitHub
, fetchzip
, johnny-reborn-engine
, makeWrapper
}:
stdenvNoCC.mkDerivation {
pname = "johnny-reborn";
inherit (johnny-reborn-engine) version;
srcs =
let
sounds = fetchFromGitHub {
owner = "nivs1978";
repo = "Johnny-Castaway-Open-Source";
rev = "be6afefd43a3334acc66fc9d777c162c8bfb9558";
hash = "sha256-rtZVCn4KbEBVwaSQ4HZhMoDEI5Q9IPj9SZywgAx0MPY=";
};
resources = fetchzip {
name = "scrantic-source";
url = "https://archive.org/download/johnny-castaway-screensaver/scrantic-run.zip";
hash = "sha256-Q9chCYReOQEmkTyIkYo+D+OXYUqxPNOOEEmiFh8yaw4=";
stripRoot = false;
};
in
[
sounds
resources
];
nativeBuildInputs = [ makeWrapper ];
sourceRoot = "source";
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out
cp -t $out/ \
../scrantic-source/RESOURCE.* \
JCOS/Resources/sound*.wav
makeWrapper \
${johnny-reborn-engine}/jc_reborn \
$out/jc_reborn \
--chdir $out
runHook postInstall
'';
meta = {
description = "An open-source engine for the classic \"Johnny Castaway\" screensaver (ready to use, with resources)";
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ pedrohlc ];
inherit (johnny-reborn-engine.meta) homepage platforms;
};
}

View File

@ -5,10 +5,10 @@ let
in
stdenv.mkDerivation rec {
pname = "jotta-cli";
version = "0.15.80533";
version = "0.15.84961";
src = fetchzip {
url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
sha256 = "sha256-4Knenhuezc+hKqVVY/l5d7SNfiAHyxspwGEgJj++GQM=";
sha256 = "sha256-ay2YEtvGF93QAcpszxIiKRkrHGE02u80ujhMT39KD7Y=";
stripRoot = false;
};

View File

@ -1,15 +1,15 @@
{ lib, fetchFromGitHub }:
rec {
version = "1.4.12";
version = "1.5.4";
src = fetchFromGitHub {
owner = "TandoorRecipes";
repo = "recipes";
rev = version;
sha256 = "sha256-ZGPXcpicDYCE+J9mC2Dk/Ds2NYfUETuKXqHxpAGH86w=";
sha256 = "sha256-cVrgmRDzuLzl2+4UcrLRdrP6ZFWMkavu9OEogNas2fA=";
};
yarnSha256 = "sha256-LJ0uL66tcK6zL8Mkd2UB8dHsslMTtf8wQmgbZdvOT6s=";
yarnSha256 = "sha256-0u9P/OsoThP8gonrzcnO5zhIboWMI1mTsXHlbt7l9oE=";
meta = with lib; {
homepage = "https://tandoor.dev/";

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "tui-journal";
version = "0.2.0";
version = "0.3.0";
src = fetchFromGitHub {
owner = "AmmarAbouZor";
repo = "tui-journal";
rev = "v${version}";
hash = "sha256-B3GxxkFT2Z7WtV9RSmtKBjvzRRqmcoukUKc6LUZ/JyM=";
hash = "sha256-4fa41kzDGefqxfCcxe1/9iEZHVC8MIzcOG8RUiLW5bw=";
};
cargoHash = "sha256-DCKW8eGLSTx9U7mkGruPphzFpDlpL8ULCOKhj6HJwhw=";
cargoHash = "sha256-Uz9Od9hXM6EGZ+MsZ7uCYvA4aoF3E9uSNjjtxd1ssCs=";
nativeBuildInputs = [
pkg-config
@ -40,5 +40,6 @@ rustPlatform.buildRustPackage rec {
changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${src.rev}/CHANGELOG.ron";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
mainProgram = "tjournal";
};
}

View File

@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "numix-icon-theme-circle";
version = "23.06.21";
version = "23.07.08";
src = fetchFromGitHub {
owner = "numixproject";
repo = pname;
rev = version;
sha256 = "sha256-FoyBO/4AB1tEHTFyQoYB/rDK+HZfFAE9c3nVULTaWpM=";
sha256 = "sha256-JToou95HIrfqdT0IVh0colgGFXq3GR2D3FQU0Qc57Y4=";
};
nativeBuildInputs = [ gtk3 ];

View File

@ -5,10 +5,13 @@ mkCoqDerivation {
release."1.7".rev = "v1.7";
release."1.7".sha256 = "sha256-qoyteQ5W2Noxf12uACOVeHhPLvgmTzrvEo6Ts+FKTGI=";
release."1.8".rev = "v1.8";
release."1.8".sha256 = "sha256-n0lD8D+tjqkDDjFiE4CggxczOPS5TkEnxpB3zEwWZ2I=";
inherit version;
defaultVersion = with lib.versions; lib.switch coq.coq-version [
{ case = range "8.10" "8.16"; out = "1.7"; }
{ case = range "8.10" "8.13"; out = "1.7"; }
{ case = range "8.14" "8.17"; out = "1.8"; }
] null;
propagatedBuildInputs = [ mathcomp-ssreflect ];

View File

@ -0,0 +1,40 @@
{ lib
, stdenv
, fetchFromSourcehut
, unstableGitUpdater
}:
stdenv.mkDerivation {
pname = "femtolisp";
version = "unstable-2023-07-12";
src = fetchFromSourcehut {
owner = "~ft";
repo = "femtolisp";
rev = "b3a21a0ff408e559639f6c31e1a2ab970787567f";
hash = "sha256-PE/xYhfhn0xv/kJWsS07fOF2n5sXP666vy7OVaNxc7Y=";
};
strictDeps = true;
enableParallelBuilding = true;
installPhase = ''
runHook preInstall
install -Dm755 -t $out/bin/ flisp
runHook postInstall
'';
passthru.updateScript = unstableGitUpdater { };
meta = {
description = "A compact interpreter for a minimal lisp/scheme dialect";
homepage = "https://git.sr.ht/~ft/femtolisp";
license = with lib.licenses; [ mit bsd3 ];
maintainers = with lib.maintainers; [ moody ];
broken = stdenv.isDarwin;
platforms = lib.platforms.unix;
};
}

View File

@ -2,6 +2,7 @@
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, pythonRelaxDepsHook
, deprecated
, rich
, backoff
@ -14,33 +15,106 @@
, httpx
, pandas
, monotonic
# test dependencies
, pytestCheckHook
# optional-dependencies
, fastapi
, sqlalchemy
, opensearch-py
, factory_boy
, elasticsearch8
, elastic-transport
, luqum
, pytest-asyncio
, passlib
, python-jose
, alembic
, uvicorn
, smart-open
, brotli-asgi
, alembic
, sqlalchemy
, greenlet
, aiosqlite
, luqum
, scikit-learn
, aiofiles
, pyyaml
, python-multipart
, python-jose
, passlib
, psutil
# , segment-analytics-python
, asyncpg
, psycopg2
, schedule
, prodict
, datasets
, psutil
, spacy
, cleanlab
, snorkel
, transformers
, datasets
, huggingface-hub
# , flair
, faiss
, flyingsquid
, pgmpy
, plotly
, snorkel
, spacy
, transformers
, evaluate
, seqeval
# , setfit
# , span_marker
, openai
, peft
# test dependencies
, pytestCheckHook
, pytest-cov
, pytest-mock
, pytest-asyncio
, factory_boy
}:
let
pname = "argilla";
version = "1.8.0";
version = "1.12.0";
optional-dependencies = {
server = [
fastapi
opensearch-py
elasticsearch8
uvicorn
smart-open
brotli-asgi
alembic
sqlalchemy
greenlet
aiosqlite
luqum
scikit-learn
aiofiles
pyyaml
python-multipart
python-jose
passlib
psutil
# segment-analytics-python
] ++
elasticsearch8.optional-dependencies.async ++
uvicorn.optional-dependencies.standard ++
python-jose.optional-dependencies.cryptography ++
passlib.optional-dependencies.bcrypt;
postgresql = [ asyncpg psycopg2 ];
listeners = [ schedule prodict ];
integrations = [
pyyaml
cleanlab
datasets
huggingface-hub
# flair
faiss
flyingsquid
pgmpy
plotly
snorkel
spacy
transformers
evaluate
seqeval
# setfit
# span_marker
openai
peft
] ++ transformers.optional-dependencies.torch;
};
in
buildPythonPackage {
inherit pname version;
@ -52,64 +126,57 @@ buildPythonPackage {
owner = "argilla-io";
repo = pname;
rev = "v${version}";
hash = "sha256-pUfuwA/+fe1VVWyGxEkvSuJLNxw3sHmp8cQZecW8GWY=";
hash = "sha256-NImtS2bbCfbhbrw12xhGdZp/JVfrB6cHnUHYX3xJ7tw=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace '"rich <= 13.0.1"' '"rich"' \
--replace '"numpy < 1.24.0"' '"numpy"'
'';
pythonRelaxDeps = [
"typer"
"rich"
"numpy"
];
nativeBuildInputs = [
pythonRelaxDepsHook
];
propagatedBuildInputs = [
httpx
deprecated
rich
backoff
packaging
pandas
pydantic
typer
tqdm
wrapt
numpy
pandas
httpx
tqdm
backoff
monotonic
rich
typer
];
# still quite a bit of optional dependencies missing
doCheck = false;
preCheck = ''
export HOME=$(mktemp -d)
'';
# tests require an opensearch instance running and flyingsquid to be packaged
doCheck = false;
nativeCheckInputs = [
pytestCheckHook
fastapi
sqlalchemy
opensearch-py
factory_boy
elasticsearch8
elastic-transport
luqum
pytest-cov
pytest-mock
pytest-asyncio
passlib
python-jose
alembic
uvicorn
schedule
prodict
datasets
psutil
spacy
cleanlab
snorkel
transformers
faiss
] ++ opensearch-py.optional-dependencies.async;
factory_boy
]
++ optional-dependencies.server
++ optional-dependencies.postgresql
++ optional-dependencies.listeners
++ optional-dependencies.integrations;
pytestFlagsArray = [ "--ignore=tests/server/datasets/test_dao.py" ];
passthru.optional-dependencies = optional-dependencies;
meta = with lib; {
description = "Argilla: the open-source data curation platform for LLMs";
homepage = "https://github.com/argilla-io/argilla";

View File

@ -10,14 +10,14 @@
buildPythonPackage rec {
pname = "azure-containerregistry";
version = "1.1.0";
version = "1.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-6IU+fzMIL8HJv4rCrWlcJSuYre6cdBa7BjS9KrIbIRU=";
hash = "sha256-Ss0ygh0IZVPqvV3f7Lsh+5FbXRPvg3XRWvyyyAvclqM=";
extension = "zip";
};

View File

@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
# build inputs
, starlette
, brotli
# check inputs
, requests
, mypy
, brotlipy
}:
let
pname = "brotli-asgi";
version = "1.4.0";
in
buildPythonPackage {
inherit pname version;
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "fullonic";
repo = pname;
rev = "v${version}";
hash = "sha256-hQ6CSXnAoUSaKUSmE+2GHZemkFqd8Dc5+OvcUD7/r5Y=";
};
propagatedBuildInputs = [
starlette
brotli
];
pythonImportsCheck = [ "brotli_asgi" ];
nativeCheckInputs = [
requests
mypy
brotlipy
];
meta = with lib; {
description = "A compression AGSI middleware using brotli";
homepage = "https://github.com/fullonic/brotli-asgi";
license = licenses.mit;
maintainers = with maintainers; [ happysalada ];
};
}

View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, cython
, pytestCheckHook
, hypothesis
@ -9,6 +10,7 @@
buildPythonPackage rec {
pname = "datrie";
version = "0.8.2";
format = "pyproject";
src = fetchPypi {
inherit pname version;
@ -16,17 +18,17 @@ buildPythonPackage rec {
};
nativeBuildInputs = [
setuptools
cython
];
buildInputs = [
hypothesis
nativeCheckInputs = [
pytestCheckHook
];
postPatch = ''
substituteInPlace setup.py --replace '"pytest-runner", ' ""
'';
checkInputs = [
hypothesis
];
pythonImportsCheck = [ "datrie" ];

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "dsmr-parser";
version = "1.2.3";
version = "1.2.4";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "ndokter";
repo = "dsmr_parser";
rev = "refs/tags/v${version}";
hash = "sha256-M6ztqENIeD5foagKUXtJiGfFZPHsczlB0/AH4FMIsLY=";
hash = "sha256-R/4k6yZS96yAkjhO/Ay9MJ2KUlq9TFQvsUoqpjvZcKI=";
};
propagatedBuildInputs = [

View File

@ -2,7 +2,7 @@
buildPythonPackage rec {
pname = "ducc0";
version = "0.30.0";
version = "0.31.0";
disabled = pythonOlder "3.7";
@ -11,7 +11,7 @@ buildPythonPackage rec {
owner = "mtr";
repo = "ducc";
rev = "ducc0_${lib.replaceStrings ["."] ["_"] version}";
hash = "sha256-xYjgJGtWl9AjnzlFvdj/0chnIUDmoH85AtKXsNBwWUU=";
hash = "sha256-4aNIq5RNo1Qqiqr2wjYB/FXKyvbARsRF1yW1ZzZlAOo=";
};
buildInputs = [ pybind11 ];

View File

@ -30,7 +30,7 @@
buildPythonPackage rec {
pname = "ocrmypdf";
version = "14.2.1";
version = "14.3.0";
disabled = pythonOlder "3.8";
@ -46,7 +46,7 @@ buildPythonPackage rec {
postFetch = ''
rm "$out/.git_archival.txt"
'';
hash = "sha256-i09FPyplYhBqgHWWSXZrvI+7f31yzc5KvgAqVJ3WtWU=";
hash = "sha256-OUz19N2YIl7iwayjulx0v1K00jB5SdWo8m5XiJ9BDSs=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "praw";
version = "7.7.0";
version = "7.7.1";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "praw-dev";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-reJW1M1yDSQ1SvZJeOc0jwHj6ydl1AmMl5VZqRHxXZA=";
hash = "sha256-L7wTHD/ypXVc8GMfl9u16VNb9caLJoXpaMEIzaVVUgo=";
};
propagatedBuildInputs = [

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pydaikin";
version = "2.9.1";
version = "2.10.5";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "mustang51";
repo = pname;
rev = "v${version}";
hash = "sha256-HWJ+VHrSwdVN+PNp5NoqmDTVqb6RJy2Sr3zlrDuSBgA=";
hash = "sha256-G4mNBHk8xskQyt1gbMqz5XhoTfWWxp+qTruOSqmTvOc=";
};
propagatedBuildInputs = [
@ -30,6 +30,8 @@ buildPythonPackage rec {
urllib3
];
doCheck = false; # tests fail and upstream does not seem to run them either
nativeCheckInputs = [
freezegun
pytest-aiohttp

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pysmartthings";
version = "0.7.7";
version = "0.7.8";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "andrewsayre";
repo = pname;
rev = version;
hash = "sha256-AzAiMn88tRRPwMpwSnKoS1XUERHbKz0sVm/TjcbTsGs=";
hash = "sha256-r+f2+vEXJdQGDlbs/MhraFgEmsAf32PU282blLRLjzc=";
};
propagatedBuildInputs = [

View File

@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "python-crontab";
version = "2.7.1";
version = "3.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-shr0ZHx7u4SP7y8CBhbGsCidy5+UtPmRpVMQ/5vsV0k=";
hash = "sha256-eft0ZQOd39T7k9By1u4NRcGsi/FZfwaG6hT9Q2Hbo3k=";
};
propagatedBuildInputs = [

View File

@ -1,4 +1,5 @@
{ lib
{ stdenv
, lib
, buildPythonPackage
, docutils
, fetchFromGitHub
@ -45,6 +46,12 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = lib.optionals stdenv.isDarwin [
# Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved.
"test_error_without_config_file_macos"
"test_file_1_is_bad_without_config_macos"
];
pythonImportsCheck = [
"rstcheck_core"
];

View File

@ -1,4 +1,5 @@
{ lib
{ stdenv
, lib
, buildPythonPackage
, docutils
, fetchFromGitHub
@ -53,6 +54,12 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTests = lib.optionals stdenv.isDarwin [
# Disabled until https://github.com/rstcheck/rstcheck-core/issues/19 is resolved.
"test_error_without_config_file_macos"
"test_file_1_is_bad_without_config_macos"
];
pythonImportsCheck = [
"rstcheck"
];

View File

@ -12,13 +12,14 @@
, pytest-timeout
, pytestCheckHook
, pythonOlder
, setuptools
, voluptuous
}:
buildPythonPackage rec {
pname = "zigpy";
version = "0.56.1";
format = "setuptools";
version = "0.56.2";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -26,9 +27,18 @@ buildPythonPackage rec {
owner = "zigpy";
repo = "zigpy";
rev = "refs/tags/${version}";
hash = "sha256-xOvRsnTv/5GhGRVM9M6zjkEWI5dq9rGVcoi5G+0LpDE=";
hash = "sha256-VUnt2rk1nQZqmoS8ytBCX2q3E4zxSz2A0Hg7AUXmtJo=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'dynamic = ["version"]' 'version = "${version}"'
'';
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aiohttp
aiosqlite

View File

@ -12,11 +12,11 @@
stdenv.mkDerivation rec {
pname = "xmake";
version = "2.7.9";
version = "2.8.1";
src = fetchurl {
url = "https://github.com/xmake-io/xmake/releases/download/v${version}/xmake-v${version}.tar.gz";
hash = "sha256-m0LYY0gz9IhbBbiUKd1gBE3KmSMvYJYyC42Ff7M9Ku8=";
hash = "sha256-nM0LV3CVaLNbB1EKjc+Ywir2aQ/xWgET2Cu+kh908l8=";
};
nativeBuildInputs = [
@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
xmake-core-sv
];
strictDeps = true;
configureFlags = [ "--external=y" ];
meta = with lib; {

View File

@ -28,7 +28,7 @@ dependencies = [
[[package]]
name = "analysis"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"config",
"diagnostic",
@ -108,7 +108,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chain-map"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"fast-hash",
"str-util",
@ -121,7 +121,7 @@ source = "git+https://github.com/azdavis/language-util.git#13b015c6a11357b2b9a7e
[[package]]
name = "cm-syntax"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"lex-util",
"paths",
@ -150,7 +150,7 @@ dependencies = [
[[package]]
name = "config"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"fast-hash",
"serde",
@ -178,7 +178,7 @@ checksum = "7704b5fdd17b18ae31c4c1da5a2e0305a2bf17b5249300a9ee9ed7b72114c636"
[[package]]
name = "cov-mark"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"fast-hash",
"once_cell",
@ -415,7 +415,7 @@ dependencies = [
[[package]]
name = "input"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"cm-syntax",
"config",
@ -475,7 +475,7 @@ checksum = "3752f229dcc5a481d60f385fa479ff46818033d881d2d801aa27dffcfb5e8306"
[[package]]
name = "lang-srv"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"analysis",
"anyhow",
@ -503,7 +503,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "lex-util"
version = "0.12.5"
version = "0.12.6"
[[package]]
name = "libc"
@ -575,7 +575,7 @@ dependencies = [
[[package]]
name = "millet-cli"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"analysis",
"codespan-reporting",
@ -593,7 +593,7 @@ dependencies = [
[[package]]
name = "millet-ls"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"anyhow",
"env_logger",
@ -622,7 +622,7 @@ dependencies = [
[[package]]
name = "mlb-hir"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"fast-hash",
"paths",
@ -633,7 +633,7 @@ dependencies = [
[[package]]
name = "mlb-statics"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"config",
"diagnostic",
@ -657,7 +657,7 @@ dependencies = [
[[package]]
name = "mlb-syntax"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"lex-util",
"paths",
@ -729,7 +729,7 @@ dependencies = [
[[package]]
name = "panic-hook"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"better-panic",
]
@ -923,7 +923,7 @@ dependencies = [
[[package]]
name = "slash-var-path"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"fast-hash",
"str-util",
@ -931,14 +931,14 @@ dependencies = [
[[package]]
name = "sml-comment"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"sml-syntax",
]
[[package]]
name = "sml-dynamics"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"fast-hash",
"fmt-util",
@ -949,7 +949,7 @@ dependencies = [
[[package]]
name = "sml-dynamics-tests"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"config",
"pretty_assertions",
@ -965,7 +965,7 @@ dependencies = [
[[package]]
name = "sml-file-syntax"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"config",
"elapsed",
@ -979,7 +979,7 @@ dependencies = [
[[package]]
name = "sml-fixity"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"fast-hash",
"once_cell",
@ -988,7 +988,7 @@ dependencies = [
[[package]]
name = "sml-hir"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"la-arena",
"sml-lab",
@ -999,7 +999,7 @@ dependencies = [
[[package]]
name = "sml-hir-lower"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"config",
"cov-mark",
@ -1014,14 +1014,14 @@ dependencies = [
[[package]]
name = "sml-lab"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"str-util",
]
[[package]]
name = "sml-lex"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"cov-mark",
"diagnostic",
@ -1036,7 +1036,7 @@ source = "git+https://github.com/azdavis/sml-libs.git#3948485e5bf5649e50271caf3e
[[package]]
name = "sml-naive-fmt"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"fast-hash",
"sml-comment",
@ -1045,11 +1045,11 @@ dependencies = [
[[package]]
name = "sml-namespace"
version = "0.12.5"
version = "0.12.6"
[[package]]
name = "sml-parse"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"diagnostic",
"event-parse",
@ -1061,14 +1061,14 @@ dependencies = [
[[package]]
name = "sml-path"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"str-util",
]
[[package]]
name = "sml-scon"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"num-bigint",
"num-traits",
@ -1077,7 +1077,7 @@ dependencies = [
[[package]]
name = "sml-statics"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"chain-map",
"config",
@ -1100,7 +1100,7 @@ dependencies = [
[[package]]
name = "sml-statics-types"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"chain-map",
"code-h2-md-map",
@ -1119,7 +1119,7 @@ dependencies = [
[[package]]
name = "sml-symbol-kind"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"sml-namespace",
"sml-statics-types",
@ -1127,7 +1127,7 @@ dependencies = [
[[package]]
name = "sml-syntax"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"char-name",
"code-h2-md-map",
@ -1140,7 +1140,7 @@ dependencies = [
[[package]]
name = "sml-ty-var-scope"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"fast-hash",
"sml-hir",
@ -1208,7 +1208,7 @@ dependencies = [
[[package]]
name = "tests"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"analysis",
"cm-syntax",
@ -1552,7 +1552,7 @@ dependencies = [
[[package]]
name = "xtask"
version = "0.12.5"
version = "0.12.6"
dependencies = [
"anyhow",
"flate2",

View File

@ -2,13 +2,13 @@
rustPlatform.buildRustPackage rec {
pname = "millet";
version = "0.12.5";
version = "0.12.6";
src = fetchFromGitHub {
owner = "azdavis";
repo = pname;
rev = "v${version}";
hash = "sha256-sG4mowQMBiFAgTO1Rf+NCD2/GRgaqmmEQ1oSxn3hGTM=";
hash = "sha256-HYnBzAR994LSjsyUkwfkxHXi+f+KOFy/5z+RpwKbEdQ=";
};
cargoLock = {

View File

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "17.6.0";
version = "17.9.0";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-mWHoiFal9WdASMe/Q7EJBp1Z2xu7Wq0i06xyqmi8q24=";
hash = "sha256-Wcn+3hb90QFlQ/jf4jHQubmCH4P/cA0xP8ZWU7h5xd8=";
};
vendorHash = "sha256-fHwaCcN47+LkJYqRFSQgVddVuR1QfdFuSNDYFh1edM4=";
vendorHash = "sha256-FDVzJQuxrzypqke9gbDdQfMR3dM/y8msAvZYyrlMv+o=";
sourceRoot = "source/src";

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-temp";
version = "0.2.17";
version = "0.2.18";
src = fetchFromGitHub {
owner = "yozhgoor";
repo = "cargo-temp";
rev = "v${version}";
hash = "sha256-nDUtmCbvWK6bdcKvlx3KYMy9w8IOLL6jMWOafX704eQ=";
hash = "sha256-JUpXLdFaG653u9a4Nq7TC1ZNEcZ0QzgYMjGS8Kam0ec=";
};
cargoHash = "sha256-DxeZGQqi681JoCZo0Iq8+TgyF7a8No9Crm4NypUeDDA=";
cargoHash = "sha256-7yPvHCmdokb/oJqR3h+RJOQbE/pcrIDBltnG5zfoqMk=";
meta = with lib; {
description = "A CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies";

View File

@ -0,0 +1,72 @@
{ stdenv
, lib
, callPackage
, fetchFromGitHub
, rustPlatform
, nix-update-script
, darwin
, openssl
, pkg-config
}:
let
pname = "edge-runtime";
version = "1.6.7";
in
rustPlatform.buildRustPackage {
inherit pname version;
src = fetchFromGitHub {
owner = "supabase";
repo = pname;
rev = "v${version}";
hash = "sha256-Jq9UXFgbTDKe1AWyg4fxn62ODqWu0AUqzlUOo+JUYpo=";
fetchSubmodules = true;
};
cargoHash = "sha256-fOqo9aPgpW6oAEHtZIE7iHjTIRrgDPbdSFBaq4s0r94=";
nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
buildInputs = lib.optionals stdenv.isLinux [ openssl ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security CoreFoundation ]);
# The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
# To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE
RUSTY_V8_ARCHIVE = callPackage ./librusty_v8.nix { };
passthru.updateScript = nix-update-script { };
preCheck = ''
export HOME=$(mktemp -d)
'';
checkFlags = [
# tries to make a network access
"--skip=deno_runtime::test::test_main_rt_fs"
"--skip=deno_runtime::test::test_main_runtime_creation"
"--skip=deno_runtime::test::test_os_env_vars"
"--skip=deno_runtime::test::test_os_ops"
"--skip=deno_runtime::test::test_user_runtime_creation"
"--skip=test_custom_readable_stream_response"
"--skip=test_import_map_file_path"
"--skip=test_import_map_inline"
"--skip=test_main_worker_options_request"
"--skip=test_main_worker_post_request"
"--skip=test_null_body_with_204_status"
"--skip=test_null_body_with_204_status_post"
"--skip=test_file_upload"
"--skip=test_oak_server"
"--skip=test_tls_throw_invalid_data"
"--skip=test_user_worker_json_imports"
"--skip=node::analyze::tests::test_esm_code_with_node_globals"
"--skip=node::analyze::tests::test_esm_code_with_node_globals_with_shebang"
];
meta = with lib; {
description = "A server based on Deno runtime, capable of running JavaScript, TypeScript, and WASM services";
homepage = "https://github.com/supabase/edge-runtime";
license = licenses.mit;
maintainers = with maintainers; [ happysalada ];
};
}

View File

@ -0,0 +1,20 @@
{ rust, stdenv, fetchurl }:
let
arch = rust.toRustTarget stdenv.hostPlatform;
fetch_librusty_v8 = args: fetchurl {
name = "librusty_v8-${args.version}";
url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${arch}.a";
sha256 = args.shas.${stdenv.hostPlatform.system};
meta = { inherit (args) version; };
};
in
fetch_librusty_v8 {
version = "0.68.0";
shas = {
x86_64-linux = "sha256-yq7YPD2TM6Uw0EvCqIsZ/lbE1RLgIg7a42qDVrr5fX4=";
aarch64-linux = "sha256-uZFm3hAeyEUUXqRJFLM3OBVfglH3AecjFKVgeJZu3L0=";
x86_64-darwin = "sha256-YkxoggK0I4rT/KNJ30StDPLUc02Mdjwal3JH+s/YTQo=";
aarch64-darwin = "sha256-aXE7W3sSzbhvC661BYTTHyHlihmVVtFSv85nSjGOLkU=";
};
}

View File

@ -5,8 +5,8 @@
let
# Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake
libsRev = "0.11.0";
libsSha256 = "sha256-QvRTz3yMS6i+qdiSG51wvho9D7w/dMQhY72OYd3qOgU=";
libsRev = "0.11.3";
libsSha256 = "sha256-ph4ErNfgVv2aesZawCj+7kdqcYAnRgeNHfSrDMgm6Lo=";
# Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17
valijson = fetchFromGitHub {
@ -27,23 +27,15 @@ let
in
stdenv.mkDerivation rec {
pname = "sysdig";
version = "0.31.5";
version = "0.32.0";
src = fetchFromGitHub {
owner = "draios";
repo = "sysdig";
rev = version;
sha256 = "sha256-RuoPqVulATtn7jSga/8fECs7weNfjt/YFh7iHmfCKjw=";
sha256 = "sha256-R14uQdcZ2BnlgWjqvRQP8MDaKMk4Kfw17qTKYYlBg7o=";
};
# to fix the build against the latest kernel
patches = [
(fetchpatch {
url = "https://github.com/draios/sysdig/compare/35ded9aab87801281e22898242e24e0bc63873b2...954e6fc6238f21d4870a491395d68a7dd3062aa9.patch";
sha256 = "sha256-gnLURnv8FW5LvqjbreCf9DPGdBcn7rfizGeznFqJ+Fk=";
})
];
nativeBuildInputs = [ cmake perl installShellFiles pkg-config ];
buildInputs = [
luajit

View File

@ -2,7 +2,7 @@
# Do not edit!
{
version = "2023.7.1";
version = "2023.7.2";
components = {
"3_day_blinds" = ps: with ps; [
];

View File

@ -287,7 +287,7 @@ let
extraBuildInputs = extraPackages python.pkgs;
# Don't forget to run parse-requirements.py after updating
hassVersion = "2023.7.1";
hassVersion = "2023.7.2";
in python.pkgs.buildPythonApplication rec {
pname = "homeassistant";
@ -303,7 +303,7 @@ in python.pkgs.buildPythonApplication rec {
# Primary source is the pypi sdist, because it contains translations
src = fetchPypi {
inherit pname version;
hash = "sha256-YYuIVEAWLOIW1xiUGzq6TeFfCSj5rxn6H8W7XhgAhF8=";
hash = "sha256-fESzpOOEGFOJJ0ldI/VaVN0kH/zbCCq25s8vNnCUOFs=";
};
# Secondary source is git for tests
@ -311,7 +311,7 @@ in python.pkgs.buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = "refs/tags/${version}";
hash = "sha256-ovboX1tixBDZEA2phmdE6LxnvpWDhdTeEWVw6xJiSMU=";
hash = "sha256-HW+XO84enAA3BH4nppkXvAERT74y5m5jvz0uHWkkS6k=";
};
nativeBuildInputs = with python.pkgs; [

View File

@ -9,13 +9,13 @@
buildDotnetModule rec {
pname = "jackett";
version = "0.21.456";
version = "0.21.462";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
hash = "sha512-4As4WLtGyMC+zqRd7BUSC/4lLthde+BKWUNF+qleD2MpX7H/D+84ATDn0H8rMxRDP6SkuI0agRnxSJ8ygYzjbw==";
hash = "sha512-45R+vOo/aJR0WotL2VlynlTSZbN9UqOh6SngDciOrKtj1mctGI9NmfXcKyWMXiDNQniCkNi9suIupuY8nVcbsg==";
};
projectFile = "src/Jackett.Server/Jackett.Server.csproj";

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "matrix-sliding-sync";
version = "0.99.3";
version = "0.99.4";
src = fetchFromGitHub {
owner = "matrix-org";
repo = "sliding-sync";
rev = "v${version}";
hash = "sha256-lmmOq0gkvrIXQmy3rbTga0cC85t0LWjDOqrH1NWUpdA=";
hash = "sha256-s7hQ4qCOhkNS8Mc2HZjFqedtj0KqXMAxVMZRIjPyvOA=";
};
vendorHash = "sha256-447P2TbBUEHmHubHiiZCrFVCj2/tmEuYFzLo27UyCk4=";

View File

@ -144,7 +144,7 @@ diff -Nur --unidirectional-new-file openafs-1.8.2/src/comerr/Makefile.in openafs
@@ -38,11 +38,14 @@
compile_et: compile_et.o error_table.o
$(Q)case $(SYS_NAME) in \
*_linux* | *_umlinux* | *_darwin* ) \
*_linux* | *_umlinux* | *_darwin* | rs_aix72 | rs_aix73 ) \
- $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr $(buildtool_roken) $(MT_LIBS);; \
+ $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build $(buildtool_roken) $(MT_LIBS);; \
* ) \

View File

@ -37,54 +37,6 @@ stdenv.mkDerivation {
buildInputs = [ libkrb5 ];
patches = [
# LINUX: Run the 'sparse' checker if available
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=2cf76b31ce4c912b1151c141818f6e8c5cddcab2";
hash = "sha256-//7HSlotx70vWDEMB8P8or4ZmmXZthgioUOkvOcJpgk=";
})
# cf: Detect how to pass CFLAGS to linux kbuild
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=57df4dff496ca9bea04510759b8fdd9cd2cc0009";
hash = "sha256-pJnW9bVz2ZQZUvZ+PcZ5gEgCL5kcbTGxsyMNvM2IseU=";
})
# cf: Handle autoconf linux checks with -Werror
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=b17625959386459059f6f43875d8817383554481";
hash = "sha256-Kqx5QEX1p4UoIsWxqvJVX4IyCQFiWxtAOgvAtk+ULuQ=";
})
# Linux: Fix functions without prototypes
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=3084117f10bd62acb1182cb54fc85b1d96738f70";
hash = "sha256-nNyqDQfS9zzlS2i3dbfud2tQOaTQ1x/rZcQEsaLu3qc=";
})
# Linux: Check for block_dirty_folio
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=f0fee2c7752d18ff183d60bcfba4c98c3348cd5f";
hash = "sha256-tnNlVjZ5exC+jo78HC/y8yp0L8KQroFvVRzTC+O6vlY=";
})
# Linux: Replace lru_cache_add with folio_add_lru
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=b885159cc2bc6c746aec1d54cdd8a515d1115d14";
hash = "sha256-ptPALSbZPSGu8PMmZiOkHUd5x0UItqIM7U7wJlxtSL8=";
})
# LINUX 5.13: set .proc_lseek in proc_ops
(fetchpatch {
url = "https://git.openafs.org/?p=openafs.git;a=patch;h=cba2b88851c3ae0ab1b18ea3ce77f7f5e8200b2f";
hash = "sha256-suj7n0U0odHXZHLPqeB/k96gyBh52uoS3AuHvOzPyd8=";
})
# Linux 6.3: Include linux/filelock.h if available
(fetchBase64Patch {
url = "https://gerrit.openafs.org/changes/15388/revisions/ddb99d32012c43c76ae37f6a7563f1ca32f0e964/patch";
hash = "sha256-0Cql4+0ISfW4J4D7PhlSYNfIKAeDVWEz57PHOu5TRXg=";
})
# Linux 6.3: Use mnt_idmap for inode op functions
(fetchBase64Patch {
url = "https://gerrit.openafs.org/changes/15389/revisions/ff0d53d2fb38fc3b262f02fb1c5f49b286ff13dd/patch";
hash = "sha256-KyVAI/A+/lNrLyKY6O8DgMKzgnF6P5sOfSq3qcs6Qq0=";
})
];
hardeningDisable = [ "pic" ];
configureFlags = [

View File

@ -1,16 +1,16 @@
{ fetchurl }:
rec {
version = "1.8.9";
version = "1.8.10";
src = fetchurl {
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2";
hash = "sha256-0SYXi+H0LMoYy3wMJpGsNUUY43kBcBUKdrvSX00VHwY=";
hash = "sha256-n+wRNkYjVJ6NtzdAcvXI8BuEH2v+foVnPLzjX/Q/+wc=";
};
srcs = [
src
(fetchurl {
url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2";
hash = "sha256-75HoVOq0qnQmhSWVSkHCoq0KLq9TDqoiu55L9FOxWTk=";
hash = "sha256-nDgJ6K/qAX2K8lKPYM8OD5+oRU+shlM6PmciHy61+10=";
})
];
}

View File

@ -1,13 +1,13 @@
{ lib, fetchurl, makeWrapper, runCommand, callPackage }:
let
version = "1.3.6";
version = "1.3.7";
programs = callPackage ./programs.nix { };
webapp = fetchurl {
url = "https://github.com/root-gg/plik/releases/download/${version}/plik-${version}-linux-amd64.tar.gz";
sha256 = "sha256-UGzevhZDfQBoFgPZQIs5Ftgz1cUHGfY/IRSEWQHFVSQ=";
hash = "sha256-Uj3I/ohgMr/Ud5xAZiBjsIW8bSdUeXXv9NYKLu8Aym8=";
};
in

View File

@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub, fetchurl, makeWrapper, runCommand }:
let
version = "1.3.6";
version = "1.3.7";
src = fetchFromGitHub {
owner = "root-gg";
repo = "plik";
rev = version;
sha256 = "sha256-Xfk7+60iB5/qJh/6j6AxW0aKXuzdINRfILXRzOFejW4=";
hash = "sha256-Agkwo1oat1LDP6EJBVOoq+d+p80BGOLS4K7WTue5Nbg=";
};
vendorSha256 = null;
vendorHash = null;
meta = with lib; {
homepage = "https://plik.root.gg/";
@ -29,7 +29,7 @@ in
plik = buildGoModule {
pname = "plik";
inherit version meta src vendorSha256 postPatch;
inherit version meta src vendorHash postPatch;
subPackages = [ "client" ];
postInstall = ''
@ -39,7 +39,7 @@ in
plikd-unwrapped = buildGoModule {
pname = "plikd-unwrapped";
inherit version src vendorSha256 postPatch;
inherit version src vendorHash postPatch;
subPackages = [ "server" ];
postFixup = ''

View File

@ -45,6 +45,7 @@ stdenv.mkDerivation {
"--enable-pcre"
"--enable-zshenv=${placeholder "out"}/etc/zshenv"
"--disable-site-fndir"
"--enable-function-subdirs"
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform && !stdenv.hostPlatform.isStatic) [
# Also see: https://github.com/buildroot/buildroot/commit/2f32e668aa880c2d4a2cce6c789b7ca7ed6221ba
"zsh_cv_shared_environ=yes"
@ -112,6 +113,10 @@ EOF
'';
# XXX: patch zsh to take zwc if newer _or equal_
postFixup = ''
HOST_PATH=$out/bin:$HOST_PATH patchShebangs --host $out/share/zsh/*/functions
'';
meta = {
description = "The Z shell";
longDescription = ''

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation {
pname = "qrcode";
version = "unstable-2016-08-04";
version = "unstable-2022-01-10";
src = fetchFromGitHub {
owner = "qsantos";
repo = "qrcode";
rev = "ad0fdb4aafd0d56b903f110f697abaeb27deee73";
sha256 = "0v81745nx5gny2g05946k8j553j18a29ikmlyh6c3syq6c15k8cf";
rev = "f4475866bbf963ad118db936060f606eedc224d5";
hash = "sha256-IbWYSAc0PvSWcxKaPUXDldGDCK/lPZjptepYtLppPmA=";
};
env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result";
@ -23,6 +23,7 @@ stdenv.mkDerivation {
meta = with lib; {
description = "A small QR-code tool";
homepage = "https://github.com/qsantos/qrcode";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ raskin ];
platforms = with platforms; unix;

View File

@ -119,7 +119,7 @@ Out::Out(Out & o, const std::string & start, const std::string & end, LinePolicy
Value evaluateValue(Context & ctx, Value & v)
{
ctx.state.forceValue(v, v.attrs->pos);
ctx.state.forceValue(v, [&]() { return v.determinePos(nix::noPos); });
if (ctx.autoArgs.empty()) {
return v;
}

View File

@ -5,17 +5,17 @@
buildGoModule rec {
pname = "cnspec";
version = "8.17.0";
version = "8.18.0";
src = fetchFromGitHub {
owner = "mondoohq";
repo = "cnspec";
rev = "refs/tags/v${version}";
hash = "sha256-pirU9mJnycr3wlc6lOAVSo0Wpb6q37ewdVcFzFPlr7s=";
hash = "sha256-JlFPJ4tbpxt/UBXpQCod3zythOHP9wQ8yqAMqKAyqoU=";
};
proxyVendor = true;
vendorHash = "sha256-y63IWmBJaSUk1A5WRC9sokH+pNDhsc/Es1j50k5or8w=";
vendorHash = "sha256-RDQQVl3AxdZaF4ISQiQ8ZliZi6TWwIzYLZLxs0yPkJc=";
subPackages = [
"apps/cnspec"

View File

@ -5,13 +5,13 @@
buildGoModule rec {
pname = "oauth2c";
version = "1.9.0";
version = "1.10.0";
src = fetchFromGitHub {
owner = "cloudentity";
repo = pname;
rev = "v${version}";
hash = "sha256-+R3NViAnrHg/9dthF0e2dEppX5MLzHeRMYFiZutE1mU=";
hash = "sha256-IOZjZgZk6upeFgQ0/KqrNKM15/EggvCSrSCSCTFNGVA=";
};
vendorHash = "sha256-euEmslrSbXPVDNZkIguq+ukt74Um4H0+lIXEyCBorjE=";

View File

@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "txr";
version = "288";
version = "289";
src = fetchurl {
url = "http://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2";
hash = "sha256-ieqBM9pnwWQHdpHAczCMXqYqpP0Zv6AfL2DsHiUnF/8=";
url = "https://www.kylheku.com/cgit/txr/snapshot/txr-${finalAttrs.version}.tar.bz2";
hash = "sha256-1m3QXY1qlVMFpehAYifHkDNQ4hAlO45/6+bbpbMAo3M=";
};
buildInputs = [ libffi ];
@ -69,5 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [ AndersonTorres dtzWill ];
platforms = lib.platforms.all;
broken = stdenv.isDarwin && stdenv.isx86_64; # ofborg fails while testing
};
})

View File

@ -573,6 +573,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
edge-runtime = callPackage ../development/web/edge-runtime { };
efficient-compression-tool = callPackage ../tools/compression/efficient-compression-tool { };
eludris = callPackage ../tools/misc/eludris {
@ -589,6 +591,8 @@ with pkgs;
faq = callPackage ../development/tools/faq { };
femtolisp = callPackage ../development/interpreters/femtolisp { };
figma-agent = callPackage ../applications/graphics/figma-agent { };
figma-linux = callPackage ../applications/graphics/figma-linux { };
@ -2740,6 +2744,10 @@ with pkgs;
ytree = callPackage ../applications/file-managers/ytree { };
johnny-reborn-engine = callPackage ../applications/misc/johnny-reborn { };
johnny-reborn = callPackage ../applications/misc/johnny-reborn/with-data.nix { };
### APPLICATIONS/TERMINAL-EMULATORS
alacritty = callPackage ../applications/terminal-emulators/alacritty {

View File

@ -1535,6 +1535,8 @@ self: super: with self; {
brotli = callPackage ../development/python-modules/brotli { };
brotli-asgi = callPackage ../development/python-modules/brotli-asgi { };
brotlicffi = callPackage ../development/python-modules/brotlicffi {
inherit (pkgs) brotli;
};