Merge master into staging-next
This commit is contained in:
commit
0a7bf347e3
|
@ -315,6 +315,12 @@
|
|||
githubId = 1174858;
|
||||
name = "Maxwell Huang-Hobbs";
|
||||
};
|
||||
adjacentresearch = {
|
||||
email = "nate@adjacentresearch.xyz";
|
||||
github = "0xperp";
|
||||
githubId = 96147421;
|
||||
name = "0xperp";
|
||||
};
|
||||
adnelson = {
|
||||
email = "ithinkican@gmail.com";
|
||||
github = "adnelson";
|
||||
|
|
92
pkgs/applications/blockchains/solana-validator/default.nix
Normal file
92
pkgs/applications/blockchains/solana-validator/default.nix
Normal file
|
@ -0,0 +1,92 @@
|
|||
# largely inspired from https://github.com/saber-hq/saber-overlay/blob/master/packages/solana/solana.nix
|
||||
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, rustPlatform
|
||||
, IOKit
|
||||
, Security
|
||||
, AppKit
|
||||
, pkg-config
|
||||
, udev
|
||||
, zlib
|
||||
, protobuf
|
||||
, clang
|
||||
, llvm
|
||||
, pkgconfig
|
||||
, openssl
|
||||
, libclang
|
||||
, rustfmt
|
||||
, perl
|
||||
, hidapi
|
||||
, solanaPkgs ? [
|
||||
"solana"
|
||||
"solana-bench-tps"
|
||||
"solana-faucet"
|
||||
"solana-gossip"
|
||||
"solana-install"
|
||||
"solana-keygen"
|
||||
"solana-ledger-tool"
|
||||
"solana-log-analyzer"
|
||||
"solana-net-shaper"
|
||||
"solana-sys-tuner"
|
||||
"solana-validator"
|
||||
"cargo-build-bpf"
|
||||
"cargo-test-bpf"
|
||||
"solana-dos"
|
||||
"solana-install-init"
|
||||
"solana-stake-accounts"
|
||||
"solana-test-validator"
|
||||
"solana-tokens"
|
||||
"solana-watchtower"
|
||||
] ++ [
|
||||
# XXX: Ensure `solana-genesis` is built LAST!
|
||||
# See https://github.com/solana-labs/solana/issues/5826
|
||||
"solana-genesis"
|
||||
]
|
||||
}:
|
||||
let
|
||||
pinData = lib.importJSON ./pin.json;
|
||||
version = pinData.version;
|
||||
sha256 = pinData.sha256;
|
||||
cargoSha256 = pinData.cargoSha256;
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "solana-validator";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "solana-labs";
|
||||
repo = "solana";
|
||||
rev = "v${version}";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
# partly inspired by https://github.com/obsidiansystems/solana-bridges/blob/develop/default.nix#L29
|
||||
inherit cargoSha256;
|
||||
verifyCargoDeps = true;
|
||||
|
||||
cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs;
|
||||
|
||||
# weird errors. see https://github.com/NixOS/nixpkgs/issues/52447#issuecomment-852079285
|
||||
LIBCLANG_PATH = "${libclang.lib}/lib";
|
||||
BINDGEN_EXTRA_CLANG_ARGS =
|
||||
"-isystem ${libclang.lib}/lib/clang/${lib.getVersion clang}/include";
|
||||
LLVM_CONFIG_PATH = "${llvm}/bin/llvm-config";
|
||||
|
||||
nativeBuildInputs = [ clang llvm pkgconfig protobuf rustfmt perl ];
|
||||
buildInputs =
|
||||
[ openssl zlib libclang hidapi ] ++ (lib.optionals stdenv.isLinux [ udev ]);
|
||||
strictDeps = true;
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces. ";
|
||||
homepage = "https://solana.com";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ adjacentresearch ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
passthru.updateScript = ./update.sh;
|
||||
}
|
5
pkgs/applications/blockchains/solana-validator/pin.json
Normal file
5
pkgs/applications/blockchains/solana-validator/pin.json
Normal file
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"version": "1.10.35",
|
||||
"sha256": "sha256-y7+ogMJ5E9E/+ZaTCHWOQWG7iR+BGuVqvlNUDT++Ghc=",
|
||||
"cargoSha256": "sha256-idlu9qkh2mrF6MxstRcvemKrtTGNY/InBnIDqRvDQPs"
|
||||
}
|
33
pkgs/applications/blockchains/solana-validator/update.sh
Normal file
33
pkgs/applications/blockchains/solana-validator/update.sh
Normal file
|
@ -0,0 +1,33 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep
|
||||
|
||||
# TODO set to `verbose` or `extdebug` once implemented in oil
|
||||
shopt --set xtrace
|
||||
# we need failures inside of command subs to get the correct cargoSha256
|
||||
shopt --unset inherit_errexit
|
||||
|
||||
const directory = $(dirname $0 | xargs realpath)
|
||||
const owner = "solana-labs"
|
||||
const repo = "solana"
|
||||
const latest_rev = $(curl -q https://api.github.com/repos/${owner}/${repo}/releases/latest | \
|
||||
jq -r '.tag_name')
|
||||
const latest_version = $(echo $latest_rev | sd 'v' '')
|
||||
const current_version = $(jq -r '.version' $directory/pin.json)
|
||||
if ("$latest_version" === "$current_version") {
|
||||
echo "solana is already up-to-date"
|
||||
return 0
|
||||
} else {
|
||||
const tarball_meta = $(nix-prefetch-github $owner $repo --rev "$latest_rev")
|
||||
const tarball_hash = "sha256-$(echo $tarball_meta | jq -r '.sha256')"
|
||||
|
||||
jq ".version = \"$latest_version\" | \
|
||||
.\"sha256\" = \"$tarball_hash\" | \
|
||||
.\"cargoSha256\" = \"\"" $directory/pin.json | sponge $directory/pin.json
|
||||
|
||||
const new_cargo_sha256 = $(nix-build -A solana-testnet 2>&1 | \
|
||||
tail -n 2 | \
|
||||
head -n 1 | \
|
||||
sd '\s+got:\s+' '')
|
||||
|
||||
jq ".cargoSha256 = \"$new_cargo_sha256\"" $directory/pin.json | sponge $directory/pin.json
|
||||
}
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "kanboard";
|
||||
version = "1.2.22";
|
||||
version = "1.2.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kanboard";
|
||||
repo = "kanboard";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-WG2lTPpRG9KQpRdb+cS7CqF4ZDV7JZ8XtNqAI6eVzm0=";
|
||||
sha256 = "sha256-RO8yxXn0kRXNIP6+OUdXMH1tRDX55e34r3CGPU5EHU0=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
|
@ -3,10 +3,10 @@
|
|||
rec {
|
||||
firefox = buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "104.0.1";
|
||||
version = "104.0.2";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "ad80fccfde34a201fc4b596c2a0a1d959abc132946dde0865b6da624a07fd9c57381bc268c394a17f295e0e183d122b2cf5c5126e8a0bc99684affaa6212e246";
|
||||
sha512 = "bf0d972add11566f5ef6402a22abd82122945de9fa9aab6ed7bb7e41d0843d41948a6d95c0769b0b704c066c8ff6e3f3bf26fcf288c64cd3b3f09a13d4dd467d";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "arkade";
|
||||
version = "0.8.39";
|
||||
version = "0.8.41";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexellis";
|
||||
repo = "arkade";
|
||||
rev = version;
|
||||
sha256 = "sha256-ucM4Dl4ZeeZ6pCQ3qdf3Z88CWJIoreZWeo6ehKqXxI8=";
|
||||
sha256 = "sha256-PcP/D/uq+zl8Utbv7TkFGoZGpIGOddzSqaqrpSp6Rgw=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "helmsman";
|
||||
version = "3.14.0";
|
||||
version = "3.15.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Praqma";
|
||||
repo = "helmsman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-6ISQsCLiyW4GDFuVnQ+UWwfN2ZqW3m3ZN/FrYOd83DE=";
|
||||
sha256 = "sha256-wKemvUk5UP4LweX9JxbsYlrjuVRgchkOvlHqRYvAB9A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-AjRKPsCPHCDEPjqMJtl/hkrcGepj3neC9eSgsbT/DIc=";
|
||||
vendorSha256 = "sha256-swUZqrQ0nJS66oyqn0ONmFutLR2mEnDviC8siQB19c8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hydroxide";
|
||||
version = "0.2.23";
|
||||
version = "0.2.24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emersion";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Hc348rlwICnPWq7qYzFE01QeeJuQpSP19NjXtGqI10o=";
|
||||
sha256 = "sha256-Bstrg/TtGpC4zeJEYgycwdzBMfMbQX0S6okdtUiVMIQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-M5QlhF2Cj1jn5NNiKj1Roh9+sNCWxQEb4vbtsDfapWY=";
|
||||
vendorSha256 = "sha256-OLsJc/AMtD03KA8SN5rsnaq57/cB7bMB/f7FfEjErEU=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
@ -19,11 +19,11 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "gromacs";
|
||||
version = "2022.2";
|
||||
version = "2022.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-${version}.tar.gz";
|
||||
sha256 = "1gq1bvscngsbf8231laam6z0v38lmy95nakxr5225ynjhkw08r35";
|
||||
sha256 = "sha256-FM+xMN2vj3WaOvZDwE9aDQ0ysJvDRIsWr6W2F/XjXa4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -37,8 +37,9 @@ stdenv.mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Network A/V plugin for OBS Studio";
|
||||
homepage = "https://github.com/Palakis/obs-ndi";
|
||||
maintainers = with maintainers; [ jshcmpbll ];
|
||||
license = licenses.gpl2;
|
||||
platforms = with platforms; linux;
|
||||
maintainers = with maintainers; [ jshcmpbll ];
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = ndi.meta.hydraPlatforms;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -25,7 +25,7 @@ let
|
|||
};
|
||||
|
||||
pythonEnv =
|
||||
python3.withPackages (p: [ p.fonttools p.nototools ]);
|
||||
python3.withPackages (ps: with ps; [ fonttools nototools ]);
|
||||
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
@ -44,6 +44,11 @@ let
|
|||
# BEAM-based languages.
|
||||
elixir = elixir_1_13;
|
||||
|
||||
elixir_1_14 = lib'.callElixir ../interpreters/elixir/1.14.nix {
|
||||
inherit erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
|
||||
elixir_1_13 = lib'.callElixir ../interpreters/elixir/1.13.nix {
|
||||
inherit erlang;
|
||||
debugInfo = true;
|
||||
|
@ -64,11 +69,6 @@ let
|
|||
debugInfo = true;
|
||||
};
|
||||
|
||||
elixir_1_9 = lib'.callElixir ../interpreters/elixir/1.9.nix {
|
||||
inherit erlang;
|
||||
debugInfo = true;
|
||||
};
|
||||
|
||||
# Remove old versions of elixir, when the supports fades out:
|
||||
# https://hexdocs.pm/elixir/compatibility-and-deprecations.html
|
||||
|
||||
|
|
8
pkgs/development/interpreters/elixir/1.14.nix
Normal file
8
pkgs/development/interpreters/elixir/1.14.nix
Normal file
|
@ -0,0 +1,8 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
mkDerivation {
|
||||
version = "1.14.0";
|
||||
sha256 = "16rc4qaykddda6ax5f8zw70yhapgwraqbgx5gp3f40dvfax3d51l";
|
||||
# https://hexdocs.pm/elixir/1.14.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
|
||||
minimumOTPVersion = "23";
|
||||
}
|
|
@ -1,9 +0,0 @@
|
|||
{ mkDerivation }:
|
||||
|
||||
# How to obtain `sha256`:
|
||||
# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
|
||||
mkDerivation {
|
||||
version = "1.9.4";
|
||||
sha256 = "1l4318g35y4h0vi2w07ayc3jizw1xc3s7hdb47w6j3iw33y06g6b";
|
||||
minimumOTPVersion = "20";
|
||||
}
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "intel-gmmlib";
|
||||
version = "22.1.7";
|
||||
version = "22.1.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "intel";
|
||||
repo = "gmmlib";
|
||||
rev = "intel-gmmlib-${version}";
|
||||
sha256 = "sha256-HRN4SSjP8h8nnCisysDM9V17012ECLz2GgdUok1AV24=";
|
||||
sha256 = "sha256-l6FCFYdHQrH00phcncmeCGrFDs5lmyTRjQXH13nWZwg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
@ -40,24 +40,17 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "4.1";
|
||||
version = "4.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Ay+Kb8fPBczRIU5KLiHfzWojudV1xlc8rMjGeCjb5kI=";
|
||||
hash = "sha256-oVP/1RQ78mqHe/ri9Oxzbr2JJKRmAMoImtlrVKHU4o4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Fix regression in sqlite backend introduced in 4.1.
|
||||
# https://github.com/django/django/pull/15925
|
||||
url = "https://github.com/django/django/commit/c0beff21239e70cbdcc9597e5be09e505bb8f76c.patch";
|
||||
hash = "sha256-QE7QnfYAK74wvK8gDJ15FtQ+BCIWRQKAVvM7v1FzwlE=";
|
||||
excludes = [ "docs/releases/4.1.1.txt" ];
|
||||
})
|
||||
(substituteAll {
|
||||
src = ./django_4_set_zoneinfo_dir.patch;
|
||||
zoneinfo = tzdata + "/share/zoneinfo";
|
||||
|
|
|
@ -1,21 +1,41 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, python, pygments }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, python
|
||||
, pygments
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "markdown2";
|
||||
version = "2.4.1";
|
||||
version = "2.4.3";
|
||||
|
||||
# PyPI does not contain tests, so using GitHub instead.
|
||||
src = fetchFromGitHub {
|
||||
owner = "trentm";
|
||||
repo = "python-markdown2";
|
||||
rev = version;
|
||||
sha256 = "0y7kh9jj8ys00qkfmmyqj63y21g7wn7yr715kj0j1nabs6xbp0y7";
|
||||
sha256 = "sha256-zNZ7/dDZbPIwcxSLvf8u5oaAgHLrZ6kk4vXNPUuZs/4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "SNYK-PYTHON-MARKDOWN2-2606985-xss.patch"; # no CVE (yet?)
|
||||
url = "https://github.com/trentm/python-markdown2/commit/5898fcc1090ef7cd7783fa1422cc0e53cbca9d1b.patch";
|
||||
sha256 = "sha256-M6kKxjHVC3O0BvDeEF4swzfpFsDO/LU9IHvfjK4hznA=";
|
||||
})
|
||||
];
|
||||
|
||||
checkInputs = [ pygments ];
|
||||
|
||||
checkPhase = ''
|
||||
${python.interpreter} ./test/test.py
|
||||
runHook preCheck
|
||||
|
||||
pushd test
|
||||
${python.interpreter} ./test.py -- -knownfailure
|
||||
popd # test
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -58,7 +58,7 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "Type annotations builder for boto3";
|
||||
homepage = "https://vemel.github.io/mypy_boto3_builder/";
|
||||
homepage = "https://github.com/youtype/mypy_boto3_builder";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
@ -31,8 +31,8 @@ buildPythonPackage rec {
|
|||
|
||||
meta = with lib; {
|
||||
description = "An advanced Python REPL";
|
||||
homepage = "https://github.com/prompt-toolkit/ptpython";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ mlieberman85 ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
96
pkgs/development/python-modules/pymoo/default.nix
Normal file
96
pkgs/development/python-modules/pymoo/default.nix
Normal file
|
@ -0,0 +1,96 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, writeText
|
||||
, autograd
|
||||
, cma
|
||||
, cython
|
||||
, deprecated
|
||||
, dill
|
||||
, matplotlib
|
||||
, nbformat
|
||||
, notebook
|
||||
, numba
|
||||
, numpy
|
||||
, pandas
|
||||
, scipy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymoo";
|
||||
version = "0.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anyoptimization";
|
||||
repo = "pymoo";
|
||||
rev = version;
|
||||
sha256 = "sha256-dzKr+u84XmPShWXFjH7V9KzwJPGZz3msGOe1S7FlGTQ=";
|
||||
};
|
||||
|
||||
pymoo_data = fetchFromGitHub {
|
||||
owner = "anyoptimization";
|
||||
repo = "pymoo-data";
|
||||
rev = "33f61a78182ceb211b95381dd6d3edee0d2fc0f3";
|
||||
sha256 = "sha256-iGWPepZw3kJzw5HKV09CvemVvkvFQ38GVP+BAryBSs0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "cma==3.2.2" "cma" \
|
||||
--replace "'alive-progress'," ""
|
||||
|
||||
substituteInPlace pymoo/util/display/display.py \
|
||||
--replace "from pymoo.util.display.progress import ProgressBar" "" \
|
||||
--replace "ProgressBar() if progress else None" \
|
||||
"print('Missing alive_progress needed for progress=True!') if progress else None"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
];
|
||||
propagatedBuildInputs = [
|
||||
autograd
|
||||
cma
|
||||
deprecated
|
||||
dill
|
||||
matplotlib
|
||||
numpy
|
||||
scipy
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
substituteInPlace pymoo/config.py \
|
||||
--replace "https://raw.githubusercontent.com/anyoptimization/pymoo-data/main/" \
|
||||
"file://$pymoo_data/"
|
||||
'';
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
nbformat
|
||||
notebook
|
||||
numba
|
||||
];
|
||||
# Select some lightweight tests
|
||||
pytestFlagsArray = [
|
||||
"-m 'not long'"
|
||||
];
|
||||
disabledTests = [
|
||||
# ModuleNotFoundError: No module named 'pymoo.cython.non_dominated_sorting'
|
||||
"test_fast_non_dominated_sorting"
|
||||
"test_efficient_non_dominated_sort"
|
||||
];
|
||||
# Avoid crashing sandboxed build on macOS
|
||||
MATPLOTLIBRC=writeText "" ''
|
||||
backend: Agg
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "pymoo" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Multi-objective Optimization in Python";
|
||||
homepage = "https://pymoo.org/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pynetgear";
|
||||
version = "0.10.7";
|
||||
version = "0.10.8";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "MatMaul";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-dYpYUeZClfRGrhd5Rw7MzBQkyGURQTeQVtCc51AqXb4=";
|
||||
sha256 = "sha256-cffaXYoMBICfevoRnm3n0/qfD/Arz4TZeGihhIMmUcI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "r2pipe";
|
||||
version = "1.7.1";
|
||||
version = "1.7.2";
|
||||
|
||||
postPatch = let
|
||||
r2lib = "${lib.getOutput "lib" radare2}/lib";
|
||||
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-7Qa8Jl7vX/acMhGSqWfaqvN9emA05RSubpseAwRSpG4=";
|
||||
sha256 = "sha256-XoYIZWlIN54O/8LHre8Ut+2neLER/g7bYBD9+xNCkAU=";
|
||||
};
|
||||
|
||||
# Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "slack-sdk";
|
||||
version = "3.18.1";
|
||||
version = "3.18.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
owner = "slackapi";
|
||||
repo = "python-slack-sdk";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-pHIsYOY+/LlH9+kmp2ETEY1IE8izy5+R4tm0iY7NmQk=";
|
||||
sha256 = "sha256-DBJyw+im7OyzOCUQ9xyth6Tv0kjXRz+R4YUMay1HF3Y=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "tesla-wall-connector";
|
||||
version = "1.0.1";
|
||||
version = "1.0.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = "einarhauks";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-JBtlGd9aHY8ikhpJ5v7ZcNu3BfLdBmOBZCMa6C0s6gE=";
|
||||
hash = "sha256-GblKXWV9h37E3bxNsx17hEe0uDm8ahzJUx8wiE+Vc38=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -40,11 +40,6 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'backoff = "^1.11.1"' 'backoff = "*"'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tesla_wall_connector"
|
||||
];
|
||||
|
|
|
@ -1,25 +1,38 @@
|
|||
{ buildGoModule, lib, fetchFromGitHub }:
|
||||
{ buildGoModule
|
||||
, clickhouse-backup
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, testers
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "clickhouse-backup";
|
||||
version = "1.6.0";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "AlexAkulov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-wvF81bzNW1ps+iZ9HDmE91vciD8l8dO0HS5XGUDa+AA=";
|
||||
sha256 = "sha256-PIn90tz/FnUr4MGKZfLcP0hmF3eqKGB+1gKwfgtk/70=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-7pKaIhIqINy7A/QE9teVT/S2ho9atnKcixk8y5DEuVk=";
|
||||
vendorSha256 = "sha256-aPVzXZ7wjVtxjJXhbDlvBhdzoYsvii6OKUaQryrjaNc=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${version}"
|
||||
];
|
||||
|
||||
postConfigure = ''
|
||||
export CGO_ENABLED=0
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = clickhouse-backup;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/AlexAkulov/clickhouse-backup";
|
||||
description = "Tool for easy ClickHouse backup and restore with cloud storages support";
|
||||
homepage = "https://github.com/AlexAkulov/clickhouse-backup";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ma27 ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ijq";
|
||||
version = "0.4.0";
|
||||
version = "0.4.1";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~gpanders";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EQfCEdQIrjg38JjjePNDNWKi0cFezjYvIGVJajbf9jw=";
|
||||
sha256 = "sha256-WTA14W8JFHdouDgWmsc4wMygnwlANPjSYCAhxFVrwAA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-DX8m5FsqMZnzk1wgJA/ESZl0QeDv3p9huF4h1HY9DIA=";
|
||||
|
|
|
@ -4,16 +4,16 @@ let
|
|||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "5.19.6"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "1mnrnvlxdckf036w8bhw48z915187sfbfy3cpwclvcrmhixiafql"; #zen
|
||||
version = "5.19.7"; #zen
|
||||
suffix = "zen2"; #zen
|
||||
sha256 = "19hvjbw845g8jhfy6mhjizlkcq26si4mm9nchd3jl5mmbps4k2sp"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "5.19.6"; #lqx
|
||||
version = "5.19.7"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "0siv53qr6192s4qq1skssxkzapqk5w3k043dl548rdzp6a26yvrh"; #lqx
|
||||
sha256 = "0zackpfnc4fmf9hvlcbmw9sdw3hag023k3ppy0iaakrfq44zqnis"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
|
|
|
@ -54,11 +54,11 @@ rec {
|
|||
# Vulkan developer beta driver
|
||||
# See here for more information: https://developer.nvidia.com/vulkan-driver
|
||||
vulkan_beta = generic rec {
|
||||
version = "515.49.14";
|
||||
version = "515.49.15";
|
||||
persistencedVersion = "515.48.07";
|
||||
settingsVersion = "515.48.07";
|
||||
sha256_64bit = "sha256-xNaqTeIfYQIdCxo841rQ87RQc+br5OhP6K12o4V3I18=";
|
||||
openSha256 = "sha256-4KvOOAR0RQkHTFJkkG32y6uOSHB85Lh6PyVSgRjU1l4=";
|
||||
sha256_64bit = "sha256-yQbNE+YsbHUc4scXvMZFGuuBRrFTa42g1XoMVZEO/zo=";
|
||||
openSha256 = "sha256-2RvogIdTA7Rg4oq14TG7Kh31HWuj860xsK7/MYFitpQ=";
|
||||
settingsSha256 = "sha256-XwdMsAAu5132x2ZHqjtFvcBJk6Dao7I86UksxrOkknU=";
|
||||
persistencedSha256 = "sha256-BTfYNDJKe4tOvV71/1JJSPltJua0Mx/RvDcWT5ccRRY=";
|
||||
url = "https://developer.nvidia.com/vulkan-beta-${lib.concatStrings (lib.splitString "." version)}-linux";
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tmate-ssh-server";
|
||||
version = "2.3.0";
|
||||
version = "unstable-2021-10-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmate-io";
|
||||
repo = "tmate-ssh-server";
|
||||
rev = version;
|
||||
sha256 = "1y77mv1k4c79glj84lzlp0s1lafr1jzf60mywr5vhy6sq47q8hwd";
|
||||
rev = "1f314123df2bb29cb07427ed8663a81c8d9034fd";
|
||||
sha256 = "sha256-9/xlMvtkNWUBRYYnJx20qEgtEcjagH2NtEKZcDOM1BY=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
|
|||
description = "tmate SSH Server";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
knownVulnerabilities = [ "CVE-2021-44513" "CVE-2021-44512" ];
|
||||
maintainers = with maintainers; [ ck3d ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildFishPlugin rec {
|
||||
pname = "forgit";
|
||||
version = "unstable-2021-12-05";
|
||||
version = "unstable-2022-08-16";
|
||||
|
||||
preFixup = ''
|
||||
substituteInPlace $out/share/fish/vendor_conf.d/forgit.plugin.fish \
|
||||
|
@ -13,8 +13,8 @@ buildFishPlugin rec {
|
|||
src = fetchFromGitHub {
|
||||
owner = "wfxr";
|
||||
repo = "forgit";
|
||||
rev = "7b26cd46ac768af51b8dd4b84b6567c4e1c19642";
|
||||
sha256 = "sha256-S/alL3CiyedJ8aGhC2Vg9fmLJYcLxDe4EjQns5dZkKM=";
|
||||
rev = "3f50933f047510020428114551da0ee5cdfb32a3";
|
||||
sha256 = "sha256-TSF4Vr5uf/+MVU4yCdIHNnwB7kkp4mF+hkhKtLqQvmk=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "genimage";
|
||||
version = "15";
|
||||
version = "16";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://public.pengutronix.de/software/genimage/genimage-${version}.tar.xz";
|
||||
sha256 = "0gh05pkmqn9ck79mwvl2812ssh0fb0xbq72iwh7b641ki2zj9jlv";
|
||||
sha256 = "sha256-hp+WYtO3eMabHR/nDfZY4cnpCu2iart1P2/lXosMbnM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
{ lib, stdenv, fetchCrate, rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
version = "5.0.1";
|
||||
version = "6.0.0";
|
||||
pname = "oxipng";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit version pname;
|
||||
sha256 = "1g2m6ifmppgq086w3vzdsihnba4qrzmnf5k13bgah2qasnl97qfh";
|
||||
sha256 = "sha256-iav1va1EbEj4qWSfe8bzFgdx1U3IeZV60LYk7vD1LoQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1dkfplmi21wgks8pfxxc3kww89i9wq7fq5j7jm7a8zi59p3xdars";
|
||||
cargoSha256 = "sha256-e4uACIiHelCvLXPCZ4aMa59mX5xuhVFkk0MvS/1uk68=";
|
||||
|
||||
doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;
|
||||
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "chezmoi";
|
||||
version = "2.22.0";
|
||||
version = "2.22.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-igZURbPa4ldhkjae6olAbW9L8qddxZj6wwkIJ3L23aA=";
|
||||
sha256 = "sha256-IVXrFoSpwKC96oYqMrWz5Pouf2RPUJZxQppkfmNoZIg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-riGN7d+am9DXCcFVkc2WIxmHvsNaZxHm/aEDcb8kCz4=";
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.6.2";
|
||||
version = "1.6.3";
|
||||
pname = "goaccess";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "allinurl";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Ie+66zfw11dzUgAHSRtJA09nWSSvyHZ0ygkVL4aZO14=";
|
||||
sha256 = "sha256-PeF+NfoLizPdk8yHQRfycBSpf3ZIUZX2YQdAbVbdArc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -71,6 +71,13 @@ stdenv.mkDerivation rec {
|
|||
url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b98275138bf4fc250a1c362dfd2c8b1cf2421701";
|
||||
sha256 = "001m058bsl2pcb0ii84jfm5ias8zgzabrfy6k2cc9w6w1y51ii82";
|
||||
})
|
||||
# Properly handle multiple initrd paths in 30_os-prober
|
||||
# Remove this patch once a new release is cut
|
||||
(fetchpatch {
|
||||
name = "Properly-handle-multiple-initrd-paths-in-os-prober.patch";
|
||||
url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=000b5cd04fd228f9741f5dca0491636bc0b89eb8";
|
||||
sha256 = "sha256-Mex3qQ0lW7ZCv7ZI7MSSqbylJXZ5RTbR4Pv1+CJ0ciM=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = if kbdcompSupport then ''
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tmate";
|
||||
version = "2.4.0";
|
||||
version = "unstable-2022-08-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tmate-io";
|
||||
repo = "tmate";
|
||||
rev = version;
|
||||
sha256 = "0x5c31yq7ansmiy20a0qf59wagba9v3pq97mlkxrqxn4n1gcc6vi";
|
||||
rev = "ac919516f4f1b10ec928e20b3a5034d18f609d68";
|
||||
sha256 = "sha256-t96gfmAMcsjkGf8pvbEx2fNx4Sj3W6oYoQswB3Dklb8=";
|
||||
};
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
|
|||
description = "Instant Terminal Sharing";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ ck3d ];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cdk-go";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cdk-team";
|
||||
repo = "CDK";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AhTeovusYsrtxrifvElMrFdYAa3a31JIm7jjIQuk8zI=";
|
||||
sha256 = "sha256-Lt9OvjxAOtYM3NJk2w9qY+3COiX9QWErhUrw6nrHYcw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aJN/d/BxmleRXKw6++k6e0Vb0Gs5zg1QfakviABYTog=";
|
||||
|
|
|
@ -1,30 +1,47 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, gitleaks
|
||||
, installShellFiles
|
||||
, testers
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gitleaks";
|
||||
version = "8.11.2";
|
||||
version = "8.12.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zricethezav";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E6ogPJQbg8hrfUNPIQ7b9c5at5VY73j0cEolzQpzUTM=";
|
||||
sha256 = "sha256-g15ySGRX9f3zlmoatfzUomokdXyr33geNZnEQLle9rw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-KtBE8zOCSh/sItEpEA+I2cG3U44FJ2wxxVX3F6choUY=";
|
||||
vendorSha256 = "sha256-Ev0/CSpwJDmc+Dvu/bFDzsgsq80rWImJWXNAUqYHgoE=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}"
|
||||
"-X github.com/zricethezav/gitleaks/v${lib.versions.major version}/cmd.Version=${version}"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# With v8 the config tests are are blocking
|
||||
doCheck = false;
|
||||
|
||||
postInstall = ''
|
||||
installShellCompletion --cmd ${pname} \
|
||||
--bash <($out/bin/${pname} completion bash) \
|
||||
--fish <($out/bin/${pname} completion fish) \
|
||||
--zsh <($out/bin/${pname} completion zsh)
|
||||
'';
|
||||
|
||||
passthru.tests.version = testers.testVersion {
|
||||
package = gitleaks;
|
||||
command = "${pname} version";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Scan git repos (or files) for secrets";
|
||||
longDescription = ''
|
||||
|
|
|
@ -15008,7 +15008,7 @@ with pkgs;
|
|||
inherit (beam.interpreters)
|
||||
erlang erlangR25 erlangR24 erlangR23 erlangR22 erlangR21
|
||||
erlang_odbc erlang_javac erlang_odbc_javac
|
||||
elixir elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9
|
||||
elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10
|
||||
elixir_ls;
|
||||
|
||||
erlang_nox = beam_nox.interpreters.erlang;
|
||||
|
@ -32662,6 +32662,10 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) IOKit Security AppKit;
|
||||
};
|
||||
|
||||
solana-validator = callPackage ../applications/blockchains/solana-validator {
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit Security AppKit;
|
||||
};
|
||||
|
||||
snarkos = callPackage ../applications/blockchains/snarkos {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
|
|
@ -100,7 +100,7 @@ with beam; {
|
|||
# access for example elixir built with different version of Erlang, use
|
||||
# `beam.packages.erlangR24.elixir`.
|
||||
inherit (packages.erlang)
|
||||
elixir elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_1_9 elixir_ls;
|
||||
elixir elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 elixir_ls;
|
||||
|
||||
inherit (packages.erlang) lfe lfe_1_3;
|
||||
};
|
||||
|
|
|
@ -7990,6 +7990,8 @@ in {
|
|||
|
||||
pymongo = callPackage ../development/python-modules/pymongo { };
|
||||
|
||||
pymoo = callPackage ../development/python-modules/pymoo { };
|
||||
|
||||
pymorphy2 = callPackage ../development/python-modules/pymorphy2 { };
|
||||
|
||||
pymorphy2-dicts-ru = callPackage ../development/python-modules/pymorphy2/dicts-ru.nix { };
|
||||
|
|
Loading…
Reference in a new issue