forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
489a4937eb
|
|
@ -257,6 +257,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- To enable the HTTP3 (QUIC) protocol for a nginx virtual host, set the `quic` attribute on it to true, e.g. `services.nginx.virtualHosts.<name>.quic = true;`.
|
||||
|
||||
- In `services.fail2ban`, `bantime-increment.<name>` options now default to `null` (except `bantime-increment.enable`) and are used to set the corresponding option in `jail.local` only if not `null`. Also, enforce that `bantime-increment.formula` and `bantime-increment.multipliers` are not both specified.
|
||||
|
||||
- The default Asterisk package was changed to v20 from v19. Asterisk versions 16 and 19 have been dropped due to being EOL. You may need to update /var/lib/asterisk to match the template files in `${asterisk-20}/var/lib/asterisk`.
|
||||
|
||||
- conntrack helper autodetection has been removed from kernels 6.0 and up upstream, and an assertion was added to ensure things don't silently stop working. Migrate your configuration to assign helpers explicitly or use an older LTS kernel branch as a temporary workaround.
|
||||
|
|
|
|||
|
|
@ -118,56 +118,56 @@ in
|
|||
default = false;
|
||||
type = types.bool;
|
||||
description = lib.mdDoc ''
|
||||
Allows to use database for searching of previously banned ip's to increase
|
||||
a default ban time using special formula, default it is banTime * 1, 2, 4, 8, 16, 32...
|
||||
"bantime.increment" allows to use database for searching of previously banned ip's to increase
|
||||
a default ban time using special formula, default it is banTime * 1, 2, 4, 8, 16, 32 ...
|
||||
'';
|
||||
};
|
||||
|
||||
bantime-increment.rndtime = mkOption {
|
||||
default = "4m";
|
||||
type = types.str;
|
||||
default = null;
|
||||
type = types.nullOr types.str;
|
||||
example = "8m";
|
||||
description = lib.mdDoc ''
|
||||
"bantime-increment.rndtime" is the max number of seconds using for mixing with random time
|
||||
"bantime.rndtime" is the max number of seconds using for mixing with random time
|
||||
to prevent "clever" botnets calculate exact time IP can be unbanned again
|
||||
'';
|
||||
};
|
||||
|
||||
bantime-increment.maxtime = mkOption {
|
||||
default = "10h";
|
||||
type = types.str;
|
||||
default = null;
|
||||
type = types.nullOr types.str;
|
||||
example = "48h";
|
||||
description = lib.mdDoc ''
|
||||
"bantime-increment.maxtime" is the max number of seconds using the ban time can reach (don't grows further)
|
||||
"bantime.maxtime" is the max number of seconds using the ban time can reach (don't grows further)
|
||||
'';
|
||||
};
|
||||
|
||||
bantime-increment.factor = mkOption {
|
||||
default = "1";
|
||||
type = types.str;
|
||||
default = null;
|
||||
type = types.nullOr types.str;
|
||||
example = "4";
|
||||
description = lib.mdDoc ''
|
||||
"bantime-increment.factor" is a coefficient to calculate exponent growing of the formula or common multiplier,
|
||||
"bantime.factor" is a coefficient to calculate exponent growing of the formula or common multiplier,
|
||||
default value of factor is 1 and with default value of formula, the ban time grows by 1, 2, 4, 8, 16 ...
|
||||
'';
|
||||
};
|
||||
|
||||
bantime-increment.formula = mkOption {
|
||||
default = "ban.Time * (1<<(ban.Count if ban.Count<20 else 20)) * banFactor";
|
||||
type = types.str;
|
||||
default = null;
|
||||
type = types.nullOr types.str;
|
||||
example = "ban.Time * math.exp(float(ban.Count+1)*banFactor)/math.exp(1*banFactor)";
|
||||
description = lib.mdDoc ''
|
||||
"bantime-increment.formula" used by default to calculate next value of ban time, default value bellow,
|
||||
the same ban time growing will be reached by multipliers 1, 2, 4, 8, 16, 32...
|
||||
"bantime.formula" used by default to calculate next value of ban time, default value bellow,
|
||||
the same ban time growing will be reached by multipliers 1, 2, 4, 8, 16, 32 ...
|
||||
'';
|
||||
};
|
||||
|
||||
bantime-increment.multipliers = mkOption {
|
||||
default = "1 2 4 8 16 32 64";
|
||||
type = types.str;
|
||||
example = "2 4 16 128";
|
||||
default = null;
|
||||
type = types.nullOr types.str;
|
||||
example = "1 2 4 8 16 32 64";
|
||||
description = lib.mdDoc ''
|
||||
"bantime-increment.multipliers" used to calculate next value of ban time instead of formula, corresponding
|
||||
"bantime.multipliers" used to calculate next value of ban time instead of formula, corresponding
|
||||
previously ban count and given "bantime.factor" (for multipliers default is 1);
|
||||
following example grows ban time by 1, 2, 4, 8, 16 ... and if last ban count greater as multipliers count,
|
||||
always used last multiplier (64 in example), for factor '1' and original ban time 600 - 10.6 hours
|
||||
|
|
@ -175,11 +175,11 @@ in
|
|||
};
|
||||
|
||||
bantime-increment.overalljails = mkOption {
|
||||
default = false;
|
||||
type = types.bool;
|
||||
default = null;
|
||||
type = types.nullOr types.bool;
|
||||
example = true;
|
||||
description = lib.mdDoc ''
|
||||
"bantime-increment.overalljails" (if true) specifies the search of IP in the database will be executed
|
||||
"bantime.overalljails" (if true) specifies the search of IP in the database will be executed
|
||||
cross over all jails, if false (default), only current jail of the ban IP will be searched
|
||||
'';
|
||||
};
|
||||
|
|
@ -276,8 +276,16 @@ in
|
|||
###### implementation
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = (cfg.bantime-increment.formula == null || cfg.bantime-increment.multipliers == null);
|
||||
message = ''
|
||||
Options `services.fail2ban.bantime-increment.formula` and `services.fail2ban.bantime-increment.multipliers` cannot be both specified.
|
||||
'';
|
||||
}
|
||||
];
|
||||
|
||||
warnings = mkIf (config.networking.firewall.enable == false && config.networking.nftables.enable == false) [
|
||||
warnings = mkIf (!config.networking.firewall.enable && !config.networking.nftables.enable) [
|
||||
"fail2ban can not be used without a firewall"
|
||||
];
|
||||
|
||||
|
|
@ -330,15 +338,14 @@ in
|
|||
# Add some reasonable default jails. The special "DEFAULT" jail
|
||||
# sets default values for all other jails.
|
||||
services.fail2ban.jails.DEFAULT = ''
|
||||
${optionalString cfg.bantime-increment.enable ''
|
||||
# Bantime incremental
|
||||
bantime.increment = ${boolToString cfg.bantime-increment.enable}
|
||||
bantime.maxtime = ${cfg.bantime-increment.maxtime}
|
||||
bantime.factor = ${cfg.bantime-increment.factor}
|
||||
bantime.formula = ${cfg.bantime-increment.formula}
|
||||
bantime.multipliers = ${cfg.bantime-increment.multipliers}
|
||||
bantime.overalljails = ${boolToString cfg.bantime-increment.overalljails}
|
||||
''}
|
||||
# Bantime increment options
|
||||
bantime.increment = ${boolToString cfg.bantime-increment.enable}
|
||||
${optionalString (cfg.bantime-increment.rndtime != null) "bantime.rndtime = ${cfg.bantime-increment.rndtime}"}
|
||||
${optionalString (cfg.bantime-increment.maxtime != null) "bantime.maxtime = ${cfg.bantime-increment.maxtime}"}
|
||||
${optionalString (cfg.bantime-increment.factor != null) "bantime.factor = ${cfg.bantime-increment.factor}"}
|
||||
${optionalString (cfg.bantime-increment.formula != null) "bantime.formula = ${cfg.bantime-increment.formula}"}
|
||||
${optionalString (cfg.bantime-increment.multipliers != null) "bantime.multipliers = ${cfg.bantime-increment.multipliers}"}
|
||||
${optionalString (cfg.bantime-increment.overalljails != null) "bantime.overalljails = ${boolToString cfg.bantime-increment.overalljails}"}
|
||||
# Miscellaneous options
|
||||
ignoreip = 127.0.0.1/8 ${optionalString config.networking.enableIPv6 "::1"} ${concatStringsSep " " cfg.ignoreIP}
|
||||
${optionalString (cfg.bantime != null) ''
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "9.20";
|
||||
version = "10.10";
|
||||
pname = "monkeys-audio";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://monkeysaudio.com/files/MAC_${
|
||||
builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip";
|
||||
sha256 = "sha256-8cJ88plR9jrrLdzRHzRotGBrn6qIqOWvl+oOTXxY/TE=";
|
||||
sha256 = "sha256-fDH7F9xLfR9Q2T3HCirBWdKB7Kb1vxyo8g0PNzHzMCY=";
|
||||
stripRoot = false;
|
||||
};
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -181,6 +181,7 @@ stdenv.mkDerivation rec {
|
|||
# OptiX, enabled with cudaSupport, is non-free.
|
||||
license = with licenses; [ gpl2Plus ] ++ optional cudaSupport unfree;
|
||||
platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ];
|
||||
broken = stdenv.isDarwin;
|
||||
maintainers = with maintainers; [ goibhniu veprbl ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sdcv";
|
||||
version = "0.5.4";
|
||||
version = "0.5.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Dushistov";
|
||||
repo = "sdcv";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-i6odmnkoSqDIQAor7Dn26Gu+td9aeMIkwsngF7beBtE=";
|
||||
sha256 = "sha256-EyvljVXhOsdxIYOGTzD+T16nvW7/RNx3DuQ2OdhjXJ4=";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
|
|||
|
|
@ -51,11 +51,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opera";
|
||||
version = "98.0.4759.6";
|
||||
version = "98.0.4759.15";
|
||||
|
||||
src = fetchurl {
|
||||
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
|
||||
hash = "sha256-bX0Z+p6DvfsBbglONuGSdVnbIOGZrM1xFtfvbY0U7SQ=";
|
||||
hash = "sha256-nv6/RXsF8rvYoCfsUC1xR79ssroAkfBqzADi02AfYH8=";
|
||||
};
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ in stdenv.mkDerivation rec {
|
|||
# Should appear BEFORE lit, since lit passes through python rather
|
||||
# than the python environment we make.
|
||||
kleePython
|
||||
(lit.override { python3 = kleePython; })
|
||||
(lit.override { python = kleePython; })
|
||||
];
|
||||
|
||||
cmakeFlags = let
|
||||
|
|
|
|||
|
|
@ -10,56 +10,56 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dvc";
|
||||
version = "2.17.0";
|
||||
format = "setuptools";
|
||||
version = "2.56.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-P0J+3TNHGqMw3krfs1uLnf8nEiIBK6UrrB37mY+fBA0=";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-IpdlNwOuUNWgfphRH2UTQ/IvBHo39PafCqyioju8miI=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"dvc-data"
|
||||
"platformdirs"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "grandalf==0.6" "grandalf" \
|
||||
--replace "scmrepo==0.0.25" "scmrepo" \
|
||||
--replace "pathspec>=0.9.0,<0.10.0" "pathspec"
|
||||
substituteInPlace dvc/daemon.py \
|
||||
--subst-var-by dvc "$out/bin/dcv"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
pythonRelaxDepsHook
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
aiohttp-retry
|
||||
appdirs
|
||||
colorama
|
||||
configobj
|
||||
dictdiffer
|
||||
diskcache
|
||||
distro
|
||||
dpath
|
||||
dvclive
|
||||
dvc-data
|
||||
dvc-http
|
||||
dvc-render
|
||||
dvc-studio-client
|
||||
dvc-task
|
||||
flatten-dict
|
||||
flufl_lock
|
||||
funcy
|
||||
grandalf
|
||||
nanotime
|
||||
hydra-core
|
||||
iterative-telemetry
|
||||
networkx
|
||||
packaging
|
||||
pathspec
|
||||
ply
|
||||
platformdirs
|
||||
psutil
|
||||
pydot
|
||||
pygtrie
|
||||
pyparsing
|
||||
python-benedict
|
||||
requests
|
||||
rich
|
||||
ruamel-yaml
|
||||
|
|
@ -73,17 +73,13 @@ python3.pkgs.buildPythonApplication rec {
|
|||
voluptuous
|
||||
zc_lockfile
|
||||
] ++ lib.optionals enableGoogle [
|
||||
gcsfs
|
||||
google-cloud-storage
|
||||
dvc-gs
|
||||
] ++ lib.optionals enableAWS [
|
||||
aiobotocore
|
||||
boto3
|
||||
s3fs
|
||||
dvc-s3
|
||||
] ++ lib.optionals enableAzure [
|
||||
azure-identity
|
||||
knack
|
||||
dvc-azure
|
||||
] ++ lib.optionals enableSSH [
|
||||
bcrypt
|
||||
dvc-ssh
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
|
|
@ -96,8 +92,8 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = with lib; {
|
||||
description = "Version Control System for Machine Learning Projects";
|
||||
homepage = "https://dvc.org";
|
||||
changelog = "https://github.com/iterative/dvc/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ cmcdragonkai fab ];
|
||||
broken = true; # requires new python package: dvc-studio-client
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
#!${runtimeShell}
|
||||
export PYTHONPATH=${python38}/lib/python3.8
|
||||
export PYTHONHOME=${python38}/bin/python3.8
|
||||
$out/bin/arm-none-eabi-gdb-unwrapped
|
||||
exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/arm-none-eabi-gdb
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
|||
#!${runtimeShell}
|
||||
export PYTHONPATH=${python38}/lib/python3.8
|
||||
export PYTHONHOME=${python38}/bin/python3.8
|
||||
$out/bin/arm-none-eabi-gdb-unwrapped
|
||||
exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@"
|
||||
EOF
|
||||
chmod +x $out/bin/arm-none-eabi-gdb
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -6,21 +6,29 @@
|
|||
, ocamlPackages
|
||||
, cacert
|
||||
, ocaml-crunch
|
||||
, jq
|
||||
, mustache-go
|
||||
, yaml2json
|
||||
, tezos-rust-libs
|
||||
}:
|
||||
|
||||
ocamlPackages.buildDunePackage rec {
|
||||
pname = "ligo";
|
||||
version = "0.60.0";
|
||||
version = "0.64.2";
|
||||
src = fetchFromGitLab {
|
||||
owner = "ligolang";
|
||||
repo = "ligo";
|
||||
rev = version;
|
||||
sha256 = "sha256-gyMSpy+F3pF2Kv1ygUs20mrspJ6GtJ6ySyZD7zfZj2w=";
|
||||
sha256 = "sha256-/XUJFDH1pv65VeZt57P+AiCegTwCn7OWdaa0D8sw7CI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# The build picks this up for ligo --version
|
||||
LIGO_VERSION = version;
|
||||
CHANGELOG_PATH = "./changelog.txt";
|
||||
|
||||
# This is a hack to work around the hack used in the dune files
|
||||
OPAM_SWITCH_PREFIX = "${tezos-rust-libs}";
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
|
|
@ -33,6 +41,10 @@ ocamlPackages.buildDunePackage rec {
|
|||
ocamlPackages.crunch
|
||||
ocamlPackages.menhir
|
||||
ocamlPackages.ocaml-recovery-parser
|
||||
# deps for changelog
|
||||
jq
|
||||
mustache-go
|
||||
yaml2json
|
||||
];
|
||||
|
||||
buildInputs = with ocamlPackages; [
|
||||
|
|
@ -60,13 +72,19 @@ ocamlPackages.buildDunePackage rec {
|
|||
lambda-term
|
||||
tar-unix
|
||||
parse-argv
|
||||
|
||||
hacl-star
|
||||
prometheus
|
||||
# lsp
|
||||
linol
|
||||
linol-lwt
|
||||
ocaml-lsp
|
||||
# Test helpers deps
|
||||
qcheck
|
||||
qcheck-alcotest
|
||||
alcotest-lwt
|
||||
|
||||
# vendored tezos' deps
|
||||
aches
|
||||
aches-lwt
|
||||
tezos-plonk
|
||||
tezos-bls12-381-polynomial
|
||||
ctypes
|
||||
|
|
@ -78,13 +96,10 @@ ocamlPackages.buildDunePackage rec {
|
|||
lwt-canceler
|
||||
ipaddr
|
||||
bls12-381
|
||||
bls12-381-legacy
|
||||
bls12-381-signature
|
||||
ptime
|
||||
mtime
|
||||
lwt_log
|
||||
ringo
|
||||
ringo-lwt
|
||||
secp256k1-internal
|
||||
resto
|
||||
resto-directory
|
||||
|
|
@ -97,6 +112,13 @@ ocamlPackages.buildDunePackage rec {
|
|||
simple-diff
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
# The scripts use `nix-shell` in the shebang which seems to fail
|
||||
sed -i -e '1,5d' ./scripts/changelog-generation.sh
|
||||
sed -i -e '1,5d' ./scripts/changelog-json.sh
|
||||
./scripts/changelog-generation.sh
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
cacert
|
||||
ocamlPackages.ca-certs
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "purescript";
|
||||
version = "0.15.8";
|
||||
version = "0.15.9";
|
||||
|
||||
# These hashes can be updated automatically by running the ./update.sh script.
|
||||
src =
|
||||
|
|
@ -26,12 +26,12 @@ in stdenv.mkDerivation rec {
|
|||
then
|
||||
fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz";
|
||||
sha256 = "0aq6b8yw2ll3qgmc21ap2pxfnr7glqhrjx3ggc21q4gwq3zxrrrp";
|
||||
sha256 = "1xxg79rlf7li9f73wdbwif1dyy4hnzpypy6wx4zbnvap53habq9f";
|
||||
}
|
||||
else
|
||||
fetchurl {
|
||||
url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz";
|
||||
sha256 = "192px9a4ja1iazhahc6ilgxk0x2bjp59qxd9zaww4pldj1b7z20y";
|
||||
sha256 = "0rabinklsd8bs16f03zv7ij6d1lv4w2xwvzzgkwc862gpqvz9jq3";
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1015,6 +1015,14 @@ self: super: builtins.intersectAttrs super {
|
|||
hnix-store-core = super.hnix-store-core_0_6_1_0;
|
||||
});
|
||||
|
||||
hercules-ci-api-core =
|
||||
# 2023-05-02: Work around a corrupted file on cache.nixos.org. This is a hash for x86_64-linux. Remove when it has changed.
|
||||
if super.hercules-ci-api-core.drvPath == "/nix/store/dgy3w43zypmdswc7a7zis0njgljqvnq0-hercules-ci-api-core-0.1.5.0.drv"
|
||||
then super.hercules-ci-api-core.overrideAttrs (_: {
|
||||
dummyAttr = 1;
|
||||
})
|
||||
else super.hercules-ci-api-core;
|
||||
|
||||
hercules-ci-agent = super.hercules-ci-agent.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; };
|
||||
hercules-ci-cnix-expr = addTestToolDepend pkgs.git (super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; });
|
||||
hercules-ci-cnix-store = (super.hercules-ci-cnix-store.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }).overrideAttrs (_: {
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ def _get_values(attribute, text):
|
|||
|
||||
:returns: List of matches.
|
||||
"""
|
||||
regex = '{}\s+=\s+"(.*)";'.format(attribute)
|
||||
regex = '{}\s+=\s+"(.*)";'.format(re.escape(attribute))
|
||||
regex = re.compile(regex)
|
||||
values = regex.findall(text)
|
||||
return values
|
||||
|
|
@ -103,9 +103,9 @@ def _get_unique_value(attribute, text):
|
|||
def _get_line_and_value(attribute, text, value=None):
|
||||
"""Match attribute in text. Return the line and the value of the attribute."""
|
||||
if value is None:
|
||||
regex = rf'({attribute}\s+=\s+\"(.*)\";)'
|
||||
regex = rf'({re.escape(attribute)}\s+=\s+\"(.*)\";)'
|
||||
else:
|
||||
regex = rf'({attribute}\s+=\s+\"({value})\";)'
|
||||
regex = rf'({re.escape(attribute)}\s+=\s+\"({re.escape(value)})\";)'
|
||||
regex = re.compile(regex)
|
||||
results = regex.findall(text)
|
||||
n = len(results)
|
||||
|
|
|
|||
|
|
@ -1,37 +1,50 @@
|
|||
{ lib, fetchFromGitLab, rustPlatform }:
|
||||
{ lib, fetchFromGitLab, stdenv, llvmPackages_12, cargo }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.5";
|
||||
pname = "tezos-rust-libs";
|
||||
version = "1.0";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "tezos";
|
||||
repo = "tezos-rust-libs";
|
||||
rev = "v${version}";
|
||||
sha256 = "1ffkzbvb0ls4wk9205g3xh2c26cmwnl68x43gh6dm9z4xsic94v5";
|
||||
sha256 = "sha256-SuCqDZDXmWdGI/GN+3nYcUk66jnW5FQQaeTB76/rvaw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "0dgyqfr3dvvdwdi1wvpd7v9j21740jy4zwrwiwknw7csb4bq9wfx";
|
||||
nativeBuildInputs = [ llvmPackages_12.llvm cargo ];
|
||||
propagatedBuildDeps = [ llvmPackages_12.libllvm ];
|
||||
|
||||
preBuild = ''
|
||||
mkdir .cargo
|
||||
mv cargo-config .cargo/config
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
cargo build \
|
||||
--target-dir target-librustzcash \
|
||||
--package librustzcash \
|
||||
--release
|
||||
|
||||
cargo build \
|
||||
--target-dir target-wasmer \
|
||||
--package wasmer-c-api \
|
||||
--no-default-features \
|
||||
--features singlepass,cranelift,wat,middlewares,universal \
|
||||
--release
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
cp -r rustc-bls12-381/include $out/include
|
||||
cp -r librustzcash/include $out
|
||||
cp -r $out/lib $out/tmp
|
||||
mkdir $out/lib/tezos-rust-libs
|
||||
mv $out/tmp/ $out/lib/tezos-rust-libs/
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/lib/tezos-rust-libs/rust
|
||||
cp "librustzcash/include/librustzcash.h" \
|
||||
"target-librustzcash/release/librustzcash.a" \
|
||||
"wasmer-2.3.0/lib/c-api/wasm.h" \
|
||||
"wasmer-2.3.0/lib/c-api/wasmer.h" \
|
||||
"target-wasmer/release/libwasmer.a" \
|
||||
"$out/lib/tezos-rust-libs"
|
||||
cp -r "librustzcash/include/rust" "$out/lib/tezos-rust-libs"
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.com/tezos/tezos-rust-libs";
|
||||
description = "Tezos: all rust dependencies and their dependencies";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
};
|
||||
cargoVendorDir = "./vendor";
|
||||
}
|
||||
|
|
|
|||
16
pkgs/development/ocaml-modules/aches/default.nix
Normal file
16
pkgs/development/ocaml-modules/aches/default.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{ lib, buildDunePackage, ringo }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "aches";
|
||||
inherit (ringo) src version;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ringo
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Caches (bounded-size stores) for in-memory values and for resources";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
};
|
||||
}
|
||||
17
pkgs/development/ocaml-modules/aches/lwt.nix
Normal file
17
pkgs/development/ocaml-modules/aches/lwt.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ lib, buildDunePackage, ringo, aches, lwt }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "aches-lwt";
|
||||
inherit (ringo) src version;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aches
|
||||
lwt
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Caches (bounded-size stores) for Lwt promises";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
};
|
||||
}
|
||||
26
pkgs/development/ocaml-modules/asetmap/default.nix
Normal file
26
pkgs/development/ocaml-modules/asetmap/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ lib
|
||||
, fetchurl
|
||||
, buildDunePackage
|
||||
, topkg
|
||||
, findlib
|
||||
, ocamlbuild
|
||||
, ocaml
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "asetmap";
|
||||
version = "0.8.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dbuenzli/asetmap/archive/refs/tags/v${version}.tar.gz";
|
||||
sha256 = "051ky0k62xp4inwi6isif56hx5ggazv4jrl7s5lpvn9cj8329frj";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
nativeBuildInputs = [ topkg findlib ocamlbuild ocaml ];
|
||||
buildInputs = [ topkg ];
|
||||
|
||||
inherit (topkg) buildPhase installPhase;
|
||||
|
||||
meta = { inherit (ocaml.meta) platforms; };
|
||||
}
|
||||
27
pkgs/development/ocaml-modules/bls12-381-hash/default.nix
Normal file
27
pkgs/development/ocaml-modules/bls12-381-hash/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib
|
||||
, fetchFromGitLab
|
||||
, buildDunePackage
|
||||
, bls12-381
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "bls12-381-hash";
|
||||
version = "1.0.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "nomadic-labs";
|
||||
repo = "cryptography/ocaml-bls12-381-hash";
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-cfsSVmN4rbKcLcPcy6NduZktJhPXiVdK75LypmaSe9I=";
|
||||
};
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [ bls12-381 ];
|
||||
|
||||
meta = {
|
||||
description = "Implementation of some cryptographic hash primitives using the scalar field of BLS12-381";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://gitlab.com/nomadic-labs/privacy-team";
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
{ lib
|
||||
, buildDunePackage
|
||||
, fetchFromGitLab
|
||||
, bls12-381-gen
|
||||
, ctypes
|
||||
, ff-pbt
|
||||
, ff-sig
|
||||
, tezos-rust-libs
|
||||
, zarith
|
||||
, alcotest
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "bls12-381-legacy";
|
||||
|
||||
inherit (bls12-381-gen) version src doCheck;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bls12-381-gen
|
||||
ctypes
|
||||
ff-pbt
|
||||
ff-sig
|
||||
tezos-rust-libs
|
||||
zarith
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
alcotest
|
||||
];
|
||||
|
||||
meta = {
|
||||
homepage = "https://gitlab.com/dannywillems/ocaml-bls12-381";
|
||||
description = "UNIX version of BLS12-381 primitives, not implementating the virtual package bls12-381";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "data-encoding";
|
||||
version = "0.6";
|
||||
version = "0.7.1";
|
||||
|
||||
duneVersion = "3";
|
||||
minimalOCamlVersion = "4.10";
|
||||
|
|
@ -25,7 +25,7 @@ buildDunePackage rec {
|
|||
owner = "nomadic-labs";
|
||||
repo = "data-encoding";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-oQEV7lTG+/q1UcPsepPM4yN4qia6tEtRPkTkTVdGXE0=";
|
||||
hash = "sha256-V3XiCCtoU+srOI+KVSJshtaSJLBJ4m4o10GpBfdYKCU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
{ lib, buildDunePackage, hacl-star-raw, zarith, cppo }:
|
||||
{ lib, buildDunePackage, hacl-star-raw, zarith, cppo, alcotest, secp256k1-internal, qcheck-core, cstruct }:
|
||||
|
||||
|
||||
buildDunePackage {
|
||||
pname = "hacl-star";
|
||||
|
||||
inherit (hacl-star-raw) version src meta doCheck minimalOCamlVersion;
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
hacl-star-raw
|
||||
|
|
@ -16,5 +17,10 @@ buildDunePackage {
|
|||
cppo
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
checkInputs = [
|
||||
alcotest
|
||||
secp256k1-internal
|
||||
qcheck-core
|
||||
cstruct
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +1,25 @@
|
|||
{ lib, which, stdenv, fetchzip, ocaml, findlib, hacl-star, ctypes, cppo }:
|
||||
|
||||
{ lib
|
||||
, which
|
||||
, stdenv
|
||||
, fetchzip
|
||||
, opaline
|
||||
, cmake
|
||||
, ocaml
|
||||
, findlib
|
||||
, hacl-star
|
||||
, ctypes
|
||||
, cppo
|
||||
}:
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ocaml${ocaml.version}-hacl-star-raw";
|
||||
version = "0.4.5";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/project-everest/hacl-star/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz";
|
||||
sha256 = "1330vgbf5krlkvifby96kyk13xhmihajk2w5hgf2761jrljmnnrs";
|
||||
url = "https://github.com/cryspen/hacl-packages/releases/download/ocaml-v${version}/hacl-star.${version}.tar.gz";
|
||||
sha256 = "sha256-jJtxVYhQgP8ItfLhQ2wcF8RKNRnYhB2j0nR7/YH1NfY=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
sourceRoot = "./source/raw";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
# strictoverflow is disabled because it breaks aarch64-darwin
|
||||
|
|
@ -21,18 +29,34 @@ stdenv.mkDerivation rec {
|
|||
patchShebangs ./
|
||||
'';
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $OCAMLFIND_DESTDIR/stublibs
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
make -C hacl-star-raw build-c
|
||||
make -C hacl-star-raw build-bindings
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installTargets = "install-hacl-star-raw";
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
echo $OCAMLFIND_DESTDIR
|
||||
mkdir $out
|
||||
mkdir -p $OCAMLFIND_DESTDIR/stublibs
|
||||
make -C hacl-star-raw install
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
dontAddPrefix = true;
|
||||
dontAddStaticConfigureFlags = true;
|
||||
configurePlatforms = [];
|
||||
createFindlibDestdir = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
which
|
||||
cmake
|
||||
ocaml
|
||||
findlib
|
||||
];
|
||||
|
|
@ -41,7 +65,7 @@ stdenv.mkDerivation rec {
|
|||
ctypes
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
checkInputs = [
|
||||
cppo
|
||||
];
|
||||
|
||||
|
|
@ -50,9 +74,9 @@ stdenv.mkDerivation rec {
|
|||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
inherit (ocaml.meta) platforms;
|
||||
description = "Auto-generated low-level OCaml bindings for EverCrypt/HACL*";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
platforms = ocaml.meta.platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
27
pkgs/development/ocaml-modules/linol/default.nix
Normal file
27
pkgs/development/ocaml-modules/linol/default.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{ lib, fetchFromGitHub, buildDunePackage, yojson, logs, lsp, ppx_yojson_conv_lib }:
|
||||
|
||||
buildDunePackage
|
||||
rec {
|
||||
pname = "linol";
|
||||
version = "2023-04-25";
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "c-cube";
|
||||
repo = "linol";
|
||||
# Brings support for newer LSP
|
||||
rev = "439534e0c5b7a3fbf93ba05fae7d171426153763";
|
||||
sha256 = "sha256-EW35T7KUc/L1Zy4+oaJOC6mlVpbvhTfnU3NNFGoZAJg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ yojson logs lsp ppx_yojson_conv_lib ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "LSP server library";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.ulrikstrid ];
|
||||
homepage = "https://github.com/c-cube/linol";
|
||||
};
|
||||
}
|
||||
19
pkgs/development/ocaml-modules/linol/lwt.nix
Normal file
19
pkgs/development/ocaml-modules/linol/lwt.nix
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ lib, buildDunePackage, linol, jsonrpc, lwt, yojson }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "linol-lwt";
|
||||
inherit (linol) version src;
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
linol
|
||||
jsonrpc
|
||||
lwt
|
||||
yojson
|
||||
];
|
||||
|
||||
meta = linol.meta // {
|
||||
description = "LSP server library (with Lwt for concurrency)";
|
||||
};
|
||||
}
|
||||
29
pkgs/development/ocaml-modules/polynomial/default.nix
Normal file
29
pkgs/development/ocaml-modules/polynomial/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib
|
||||
, fetchFromGitLab
|
||||
, buildDunePackage
|
||||
, zarith
|
||||
, ff-sig
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "polynomial";
|
||||
version = "0.4.0";
|
||||
duneVersion = "3";
|
||||
src = fetchFromGitLab {
|
||||
owner = "nomadic-labs";
|
||||
repo = "cryptography/ocaml-polynomial";
|
||||
rev = version;
|
||||
sha256 = "sha256-is/PrYLCwStHiQsNq5OVRCwHdXjO2K2Z7FrXgytRfAU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ zarith ff-sig ];
|
||||
|
||||
doCheck = false; # circular dependencies
|
||||
|
||||
meta = {
|
||||
description = "Polynomials over finite field";
|
||||
license = lib.licenses.mit;
|
||||
homepage = "https://gitlab.com/nomadic-labs/ocaml-polynomial";
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
};
|
||||
}
|
||||
28
pkgs/development/ocaml-modules/prometheus/default.nix
Normal file
28
pkgs/development/ocaml-modules/prometheus/default.nix
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{ lib, fetchurl, buildDunePackage, astring, asetmap, fmt, re, lwt, alcotest }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "prometheus";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/prometheus/releases/download/v${version}/prometheus-${version}.tbz";
|
||||
sha256 = "sha256-g2Q6ApprbecdFANO7i6U/v8dCHVcSkHVg9wVMKtVW8s=";
|
||||
};
|
||||
|
||||
duneVersion = "3";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
astring
|
||||
asetmap
|
||||
fmt
|
||||
re
|
||||
lwt
|
||||
alcotest
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Client library for Prometheus monitoring";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.ulrikstrid ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,22 +2,18 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "ringo";
|
||||
version = "0.9";
|
||||
|
||||
version = "1.0.0";
|
||||
src = fetchFromGitLab {
|
||||
owner = "nomadic-labs";
|
||||
repo = "ringo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lPb+WrRsmtOow9BX9FW4HoILlsTuuMrVlK0XPcXWZ9U=";
|
||||
sha256 = "sha256-9HW3M27BxrEPbF8cMHwzP8FmJduUInpQQAE2672LOuU=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.05";
|
||||
|
||||
doCheck = true;
|
||||
|
||||
# If we just run the test as is it will try to test ringo-lwt
|
||||
checkPhase = "dune build @test/runtest";
|
||||
|
||||
meta = {
|
||||
description = "Caches (bounded-size key-value stores) and other bounded-size stores";
|
||||
license = lib.licenses.mit;
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
{ lib, buildDunePackage, ringo, lwt }:
|
||||
|
||||
buildDunePackage {
|
||||
pname = "ringo-lwt";
|
||||
inherit (ringo) version src doCheck;
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ringo
|
||||
lwt
|
||||
];
|
||||
|
||||
meta = ringo.meta // {
|
||||
description = "Lwt-wrappers for Ringo caches";
|
||||
};
|
||||
}
|
||||
|
|
@ -8,21 +8,21 @@
|
|||
, alcotest-lwt
|
||||
, bisect_ppx
|
||||
, qcheck-alcotest
|
||||
,
|
||||
, ppx_repr
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "tezos-bls12-381-polynomial";
|
||||
version = "0.1.3";
|
||||
version = "1.0.1";
|
||||
duneVersion = "3";
|
||||
src = fetchFromGitLab {
|
||||
owner = "nomadic-labs/cryptography";
|
||||
repo = "privacy-team";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-H1Wog3GItTIVsawr9JkyyKq+uGqbTQPTR1dacpmxLbs=";
|
||||
sha256 = "sha256-5qDa/fQoTypjaceQ0MBzt0rM+0hSJcpGlXMGAZKRboo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ bls12-381 data-encoding bigstringaf ];
|
||||
propagatedBuildInputs = [ ppx_repr bls12-381 data-encoding bigstringaf ];
|
||||
|
||||
checkInputs = [ alcotest alcotest-lwt bisect_ppx qcheck-alcotest ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,9 @@
|
|||
, buildDunePackage
|
||||
, hacl-star
|
||||
, bls12-381
|
||||
, bls12-381-hash
|
||||
, tezos-bls12-381-polynomial
|
||||
, polynomial
|
||||
, data-encoding
|
||||
, hex
|
||||
, stdint
|
||||
|
|
@ -22,12 +24,14 @@ buildDunePackage rec {
|
|||
propagatedBuildInputs = [
|
||||
hacl-star
|
||||
bls12-381
|
||||
bls12-381-hash
|
||||
tezos-bls12-381-polynomial
|
||||
data-encoding
|
||||
hex
|
||||
stdint
|
||||
ff
|
||||
mec
|
||||
polynomial
|
||||
];
|
||||
|
||||
checkInputs = [ alcotest qcheck-alcotest bisect_ppx ];
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bc-detect-secrets";
|
||||
version = "1.4.24";
|
||||
version = "1.4.26";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "bridgecrewio";
|
||||
repo = "detect-secrets";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-roqViqEOw5Mx+LFCdJHNDWrZ5wVCuzMxugnOCbuS7nY=";
|
||||
hash = "sha256-rkyeG0xZZVO7SkfFyxq07c373YElblIUqJpwWc1nF58=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, nix-update-script
|
||||
, orjson
|
||||
, pandas
|
||||
, poetry-core
|
||||
|
|
@ -15,14 +16,17 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "coinmetrics-api-client";
|
||||
version = "2023.2.23.0";
|
||||
version = "2023.5.2.20";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-XZNGasNYmN4ulfG18M4n8qTO06kSyLoZQj64LzXdl34=";
|
||||
inherit version;
|
||||
pname = "coinmetrics_api_client";
|
||||
hash = "sha256-20+qoCaSNGw4DVlW3USrSkg3fckqF77TQ7wmSsuZ3ek=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -50,6 +54,7 @@ buildPythonPackage rec {
|
|||
optional-dependencies = {
|
||||
pandas = [ pandas ];
|
||||
};
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
41
pkgs/development/python-modules/dvc-azure/default.nix
Normal file
41
pkgs/development/python-modules/dvc-azure/default.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{ lib
|
||||
, adlfs
|
||||
, azure-identity
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, knack
|
||||
, pythonRelaxDepsHook
|
||||
, setuptools-scm }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-azure";
|
||||
version = "2.21.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-VN3QSGb4cLhxX8JV1Pg4/449SJOWv9Tu3kcDGbDwAYw=";
|
||||
};
|
||||
|
||||
# Prevent circular dependency
|
||||
pythonRemoveDeps = [ "dvc" ];
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
adlfs azure-identity knack
|
||||
];
|
||||
|
||||
# Network access is needed for tests
|
||||
doCheck = false;
|
||||
|
||||
pythonCheckImports = [ "dvc_azure" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "azure plugin for dvc";
|
||||
homepage = "https://pypi.org/project/dvc-azure/${version}";
|
||||
changelog = "https://github.com/iterative/dvc-azure/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ melling ];
|
||||
};
|
||||
}
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "0.41.3";
|
||||
version = "0.47.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-+rK5OGbIBP7g69swhsgnaJovllxp7XdO8iT3hfYwhV4=";
|
||||
hash = "sha256-5DbnvIScSq+bu8ki0eUwUZd9Gf3KlhD+I0/PpWfGOu0=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
38
pkgs/development/python-modules/dvc-gs/default.nix
Normal file
38
pkgs/development/python-modules/dvc-gs/default.nix
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, dvc-objects
|
||||
, fetchPypi
|
||||
, gcsfs
|
||||
, pythonRelaxDepsHook
|
||||
, setuptools-scm }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-gs";
|
||||
version = "2.21.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-MGNDEhJJGSQIPDXGv/y4u1UHnh4HnNbKtQbGHys0dSA=";
|
||||
};
|
||||
|
||||
# Prevent circular dependency
|
||||
pythonRemoveDeps = [ "dvc" ];
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];
|
||||
|
||||
propagatedBuildInputs = [ gcsfs dvc-objects ];
|
||||
|
||||
# Network access is needed for tests
|
||||
doCheck = false;
|
||||
|
||||
pythonCheckImports = [ "dvc_gs" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "gs plugin for dvc";
|
||||
homepage = "https://pypi.org/project/dvc-gs/version";
|
||||
changelog = "https://github.com/iterative/dvc-gs/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ melling ];
|
||||
};
|
||||
}
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-objects";
|
||||
version = "0.21.1";
|
||||
version = "0.21.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-JUpK4sAn5ZivjlpHO3XSBXZVDSWkjch/HRqHNrdC7b4=";
|
||||
hash = "sha256-XKfhjzN69U0qiArXJHeLcdv/sMy0gF33FVrk9DuCGLk=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-render";
|
||||
version = "0.2.0";
|
||||
version = "0.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1nXNi++vNNRxoA/ptTDN9PtePP67oWdkAtqAbZpTfDg=";
|
||||
hash = "sha256-bt2jqjhgtGmJsyfYNSzETQZUHFKni/poyeqpQzIJX08=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
47
pkgs/development/python-modules/dvc-s3/default.nix
Normal file
47
pkgs/development/python-modules/dvc-s3/default.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, aiobotocore
|
||||
, boto3
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, flatten-dict
|
||||
, pythonRelaxDepsHook
|
||||
, s3fs
|
||||
, setuptools-scm }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-s3";
|
||||
version = "2.21.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-AEB5Nyp6j7mX0AOA0rhegd4q8xP/POx9J6yn1Ppu0nk=";
|
||||
};
|
||||
|
||||
# Prevent circular dependency
|
||||
pythonRemoveDeps = [ "dvc" ];
|
||||
|
||||
# dvc-s3 uses boto3 directly, we add in propagatedBuildInputs
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg --replace 'aiobotocore[boto3]' 'aiobotocore'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiobotocore boto3 flatten-dict s3fs
|
||||
];
|
||||
|
||||
# Network access is needed for tests
|
||||
doCheck = false;
|
||||
|
||||
pythonCheckImports = [ "dvc_s3" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "s3 plugin for dvc";
|
||||
homepage = "https://pypi.org/project/dvc-s3/${version}";
|
||||
changelog = "https://github.com/iterative/dvc-s3/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ melling ];
|
||||
};
|
||||
}
|
||||
44
pkgs/development/python-modules/dvc-ssh/default.nix
Normal file
44
pkgs/development/python-modules/dvc-ssh/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, bcrypt
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonRelaxDepsHook
|
||||
, setuptools-scm
|
||||
, sshfs
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-ssh";
|
||||
version = "2.21.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-iew/+/Ww6Uvz6Ctvswd8l5YFa3zihYxo1jvTe0ZTW9M=";
|
||||
};
|
||||
|
||||
# Prevent circular dependency
|
||||
pythonRemoveDeps = [ "dvc" ];
|
||||
|
||||
nativeBuildInputs = [ setuptools-scm pythonRelaxDepsHook ];
|
||||
|
||||
propagatedBuildInputs = [ bcrypt sshfs ];
|
||||
|
||||
# bcrypt is enabled for sshfs in nixpkgs
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg --replace "sshfs[bcrypt]" "sshfs"
|
||||
'';
|
||||
|
||||
# Network access is needed for tests
|
||||
doCheck = false;
|
||||
|
||||
pythonCheckImports = [ "dvc_ssh" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "ssh plugin for dvc";
|
||||
homepage = "https://pypi.org/project/dvc-ssh/${version}";
|
||||
changelog = "https://github.com/iterative/dvc-ssh/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ melling ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, dulwich
|
||||
, fetchFromGitHub
|
||||
, gitpython
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools-scm
|
||||
, voluptuous
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-studio-client";
|
||||
version = "0.8.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Uk9P/QUlvu3XgGMGZF7d2dPJyYKe3/Ex68HVP8eZqU0=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dulwich
|
||||
gitpython
|
||||
requests
|
||||
voluptuous
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"dvc_studio_client"
|
||||
];
|
||||
|
||||
# Tests try to access network
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library to post data from DVC/DVCLive to Iterative Studio";
|
||||
homepage = "https://github.com/iterative/dvc-studio-client";
|
||||
changelog = "https://github.com/iterative/dvc-studio-client/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ melling ];
|
||||
};
|
||||
}
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-task";
|
||||
version = "0.1.11";
|
||||
version = "0.2.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0KfH0/rghq+03sFLaR8lsIi4TJuwwca/YhQgILCdHq8=";
|
||||
hash = "sha256-DIjS56QDdjH8lp8yZE8UIccOM+OoafJK3DWZ1d/q29k=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -1,17 +1,20 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, dvc-render
|
||||
, dvc
|
||||
, dvc-studio-client
|
||||
, fetchFromGitHub
|
||||
, funcy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, ruamel-yaml
|
||||
, setuptools
|
||||
, scmrepo
|
||||
, setuptools-scm
|
||||
, tabulate
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvclive";
|
||||
version = "2.1.0";
|
||||
version = "2.8.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,17 +23,22 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-n3JjZrh2ImpjW1MUTwag716qaVjSChrYqNJuNp6K1s8=";
|
||||
hash = "sha256-Wb0347y+oDFOctKjJUYPtqIFdsRm2wt16ZlQWDgjr7g=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dvc-render
|
||||
dvc
|
||||
dvc-studio-client
|
||||
funcy
|
||||
ruamel-yaml
|
||||
] ++ dvc-render.optional-dependencies.table;
|
||||
scmrepo
|
||||
];
|
||||
|
||||
# Circular dependency with dvc
|
||||
doCheck = false;
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ete3";
|
||||
version = "3.1.2";
|
||||
version = "3.1.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "4fc987b8c529889d6608fab1101f1455cb5cbd42722788de6aea9c7d0a8e59e9";
|
||||
sha256 = "sha256-BqO3+o7ZAYewdqjbvlsbYqzulCAdPG6CL1X0SWAe9vI=";
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "gehomesdk";
|
||||
version = "0.5.9";
|
||||
version = "0.5.10";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-V8vwsLIO44q2ms/segTZ70DUVb7BNuxYZ8vX9KPNP4c=";
|
||||
hash = "sha256-M0G+UvFCegKEDA+0PI1voesMqIItKC0591ruZ4YvjMU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-bigquery-datatransfer";
|
||||
version = "3.11.0";
|
||||
version = "3.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-AXBFNLF39+H/KLrWQ/rXQAAMC6hMsGXQ5XFTDs4Y3EY=";
|
||||
hash = "sha256-IRD02YbB3355uo/5+qCeRjQt4pU5NUuZ3tbTNZyc9lA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, google-api-core
|
||||
, grpc-google-iam-v1
|
||||
, mock
|
||||
, libcst
|
||||
, proto-plus
|
||||
|
|
@ -13,18 +14,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-dataproc";
|
||||
version = "5.4.0";
|
||||
version = "5.4.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-oMX+XMglmgu2sfREVxSq/E9foEf49UzHEzkUupeFb14=";
|
||||
hash = "sha256-GJbhT2PBIaPx4sIhKHzH/QBlDSpz+LOPggQK5tWqt78=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-api-core
|
||||
grpc-google-iam-v1
|
||||
libcst
|
||||
proto-plus
|
||||
protobuf
|
||||
|
|
|
|||
|
|
@ -15,14 +15,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-cloud-firestore";
|
||||
version = "2.11.0";
|
||||
version = "2.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-mA3FX3Cg7ldApxNGka21jNW9ljGKu+rF3MhfqmekDa4=";
|
||||
hash = "sha256-f336hlZ8jWbGbI26i8XvhWd8hTK0IGBVozlBP4BxUl0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
{ lib
|
||||
, appdirs
|
||||
, buildPythonPackage
|
||||
, distro
|
||||
, fetchFromGitHub
|
||||
, filelock
|
||||
, pytestCheckHook
|
||||
, pytest-mock
|
||||
, pythonOlder
|
||||
, requests
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "iterative-telemtry";
|
||||
version = "0.0.7";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = "telemetry-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-n67nc9a/Qrz2v1EYbHZb+pGhuMDqofUMpgfD/0BwqLM=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
appdirs
|
||||
filelock
|
||||
distro
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
pytest-mock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"iterative_telemetry"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Common library to send usage telemetry";
|
||||
homepage = "https://github.com/iterative/iterative-telemetry";
|
||||
changelog = "https://github.com/iterative/iterative-telemetry/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ melling ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,20 @@
|
|||
{ lib, python3 }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
buildPythonPackage rec {
|
||||
pname = "lit";
|
||||
version = "15.0.6";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-S06OQfDmDyutls21HxyQ016ku3FTTsDOP8Di67d9f+k=";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
python = python3;
|
||||
inherit python;
|
||||
};
|
||||
|
||||
# Non-standard test suite. Needs custom checkPhase.
|
||||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "looseversion";
|
||||
version = "1.0.3";
|
||||
version = "1.1.2";
|
||||
format = "flit";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
sha256 = "sha256-A1KIhg4a/mfWPqnHAN2dCVxyTi5XIqOQKd2RZS1DFu0";
|
||||
sha256 = "sha256-lNgL29C21XwRuIYUe6FgH30VMVcWIbgZM7NFN8vkaa0=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
|
|||
|
|
@ -41,13 +41,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nikola";
|
||||
version = "8.2.3";
|
||||
version = "8.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Nikola";
|
||||
inherit version;
|
||||
hash = "sha256-c8eadkmYWS88nGwi6QwPqHg7FBXlkdazKSrbWDMw/UA=";
|
||||
hash = "sha256-LNVk2zfNwY4CC4qulqfNXwi3mWyFxzWIeMykh6gFOL8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -110,6 +112,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Static website and blog generator";
|
||||
homepage = "https://getnikola.com/";
|
||||
changelog = "https://github.com/getnikola/nikola/blob/v${version}/CHANGES.txt";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jluttine ];
|
||||
# All tests fail
|
||||
|
|
|
|||
|
|
@ -60,6 +60,11 @@ buildPythonPackage rec {
|
|||
"omegaconf"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"-W"
|
||||
"ignore::DeprecationWarning"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Framework for configuring complex applications";
|
||||
homepage = "https://github.com/omry/omegaconf";
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "onvif-zeep-async";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-Gd3OfFfJE//uDiaU6HTlURCqoGOG4jvuMN1TlDy7pZU=";
|
||||
hash = "sha256-Bh7QA86oL/CeRSLHdwvBdO39+AZwTqA7ZVERw1jvJtU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
82
pkgs/development/python-modules/openai-triton/bin.nix
Normal file
82
pkgs/development/python-modules/openai-triton/bin.nix
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, addOpenGLRunpath
|
||||
, cudaPackages
|
||||
, buildPythonPackage
|
||||
, fetchurl
|
||||
, isPy38
|
||||
, isPy39
|
||||
, isPy310
|
||||
, isPy311
|
||||
, python
|
||||
, autoPatchelfHook
|
||||
, filelock
|
||||
, lit
|
||||
, pythonRelaxDepsHook
|
||||
, zlib
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "triton";
|
||||
version = "2.0.0";
|
||||
format = "wheel";
|
||||
|
||||
src =
|
||||
let pyVerNoDot = lib.replaceStrings [ "." ] [ "" ] python.pythonVersion;
|
||||
unsupported = throw "Unsupported system";
|
||||
srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported;
|
||||
in fetchurl srcs;
|
||||
|
||||
disabled = !(isPy38 || isPy39 || isPy310 || isPy311);
|
||||
|
||||
pythonRemoveDeps = [ "cmake" "torch" ];
|
||||
|
||||
buildInputs = [ zlib ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook # torch and triton refer to each other so this hook is included to mitigate that.
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
filelock
|
||||
lit
|
||||
zlib
|
||||
];
|
||||
|
||||
dontStrip = true;
|
||||
|
||||
# If this breaks, consider replacing with "${cuda_nvcc}/bin/ptxas"
|
||||
postFixup = ''
|
||||
chmod +x "$out/${python.sitePackages}/triton/third_party/cuda/bin/ptxas"
|
||||
'' +
|
||||
(let
|
||||
# Bash was getting weird without linting,
|
||||
# but basically upstream contains [cc, ..., "-lcuda", ...]
|
||||
# and we replace it with [..., "-lcuda", "-L/run/opengl-driver/lib", "-L$stubs", ...]
|
||||
old = [ "-lcuda" ];
|
||||
new = [ "-lcuda" "-L${addOpenGLRunpath.driverLink}" "-L${cudaPackages.cuda_cudart}/lib/stubs/" ];
|
||||
|
||||
quote = x: ''"${x}"'';
|
||||
oldStr = lib.concatMapStringsSep ", " quote old;
|
||||
newStr = lib.concatMapStringsSep ", " quote new;
|
||||
in
|
||||
''
|
||||
substituteInPlace $out/${python.sitePackages}/triton/compiler.py \
|
||||
--replace '${oldStr}' '${newStr}'
|
||||
'');
|
||||
|
||||
meta = with lib; {
|
||||
description = "A language and compiler for custom Deep Learning operations";
|
||||
homepage = "https://github.com/openai/triton/";
|
||||
changelog = "https://github.com/openai/triton/releases/tag/v${version}";
|
||||
# Includes NVIDIA's ptxas, but redistributions of the binary are not limited.
|
||||
# https://docs.nvidia.com/cuda/eula/index.html
|
||||
# triton's license is MIT.
|
||||
# openai-triton-bin includes ptxas binary, therefore unfreeRedistributable is set.
|
||||
license = with licenses; [ unfreeRedistributable mit ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ junjihashimoto ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
# Warning: Need to update at the same time as torch-bin
|
||||
#
|
||||
# Precompiled wheels can be found at:
|
||||
# https://download.pytorch.org/whl/torch_stable.html
|
||||
|
||||
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
|
||||
|
||||
version : builtins.getAttr version {
|
||||
"2.0.0" = {
|
||||
x86_64-linux-38 = {
|
||||
name = "triton-2.0.0-1-cp38-cp38-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl";
|
||||
hash = "sha256-nUl4KYt0/PWadf5x5TXAkrAjCIkzsvHfkz7DJhXkvu8=";
|
||||
};
|
||||
x86_64-linux-39 = {
|
||||
name = "triton-2.0.0-1-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl";
|
||||
hash = "sha256-dPEYwStDf7LKJeGgR1kXO1F1gvz0x74RkTMWx2QhNlY=";
|
||||
};
|
||||
x86_64-linux-310 = {
|
||||
name = "triton-2.0.0-1-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl";
|
||||
hash = "sha256-OIBu6WY/Sw981keQ6WxXk3QInlj0mqxKZggSGqVeJQU=";
|
||||
};
|
||||
x86_64-linux-311 = {
|
||||
name = "triton-2.0.0-1-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/triton-2.0.0-1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl";
|
||||
hash = "sha256-ImlBx7hZUhnd71mh/bgh6MdEKJoTJBXd1YT6zt60dbE=";
|
||||
};
|
||||
};
|
||||
}
|
||||
40
pkgs/development/python-modules/openai-triton/prefetch.sh
Executable file
40
pkgs/development/python-modules/openai-triton/prefetch.sh
Executable file
|
|
@ -0,0 +1,40 @@
|
|||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash -p nix-prefetch-scripts
|
||||
|
||||
set -eou pipefail
|
||||
|
||||
version=$1
|
||||
|
||||
linux_bucket="https://download.pytorch.org/whl"
|
||||
|
||||
url_and_key_list=(
|
||||
"x86_64-linux-38 $linux_bucket/triton-${version}-1-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp38-cp38-linux_x86_64.whl"
|
||||
"x86_64-linux-39 $linux_bucket/triton-${version}-1-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp39-cp39-linux_x86_64.whl"
|
||||
"x86_64-linux-310 $linux_bucket/triton-${version}-1-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp310-cp310-linux_x86_64.whl"
|
||||
"x86_64-linux-311 $linux_bucket/triton-${version}-1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl triton-${version}-cp311-cp311-linux_x86_64.whl"
|
||||
)
|
||||
|
||||
hashfile=binary-hashes-"$version".nix
|
||||
echo " \"$version\" = {" >> $hashfile
|
||||
|
||||
for url_and_key in "${url_and_key_list[@]}"; do
|
||||
key=$(echo "$url_and_key" | cut -d' ' -f1)
|
||||
url=$(echo "$url_and_key" | cut -d' ' -f2)
|
||||
name=$(echo "$url_and_key" | cut -d' ' -f3)
|
||||
|
||||
echo "prefetching ${url}..."
|
||||
hash=$(nix hash to-sri --type sha256 `nix-prefetch-url "$url" --name "$name"`)
|
||||
|
||||
cat << EOF >> $hashfile
|
||||
$key = {
|
||||
name = "$name";
|
||||
url = "$url";
|
||||
hash = "$hash";
|
||||
};
|
||||
EOF
|
||||
|
||||
echo
|
||||
done
|
||||
|
||||
echo " };" >> $hashfile
|
||||
echo "done."
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pybravia";
|
||||
version = "0.3.2";
|
||||
version = "0.3.3";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = "Drafteed";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4TeUPJlNlmZxf1Tw62m5KjoTNHGt6wCSjKixkJBeGyw=";
|
||||
hash = "sha256-Ux9EereKKbgaVQORliW6J5FSBlytLM+m4PVFBk+OW6k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,22 +1,26 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonPackage
|
||||
, pytestCheckHook
|
||||
, untangle
|
||||
, psutil
|
||||
, trio
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, psutil
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, trio
|
||||
, untangle
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydevd";
|
||||
version = "2.8.0";
|
||||
version = "2.9.6";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fabioz";
|
||||
repo = "PyDev.Debugger";
|
||||
rev = "pydev_debugger_${lib.replaceStrings ["."] ["_"] version}";
|
||||
hash = "sha256-+yRngN10654trB09ZZa8QQsTPdM7VxVj7r6jh7OcgAA=";
|
||||
hash = "sha256-TDU/V7kY7zVxiP4OVjGqpsRVYplpkgCly2qAOqhZONo=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
@ -46,13 +50,14 @@ buildPythonPackage rec {
|
|||
"test_tracing_basic"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pydevd" ];
|
||||
pythonImportsCheck = [
|
||||
"pydevd"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)";
|
||||
homepage = "https://github.com/fabioz/PyDev.Debugger";
|
||||
license = licenses.epl10;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyoverkiz";
|
||||
version = "1.7.7";
|
||||
version = "1.7.8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "iMicknl";
|
||||
repo = "python-overkiz-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QYvnSFt0pJL3clDxN2axJUMU8M/maj3iSeUfVRgQGFg=";
|
||||
hash = "sha256-DZ9MpwlZvq6LHbvnesk7XtGsHOhZvc1tXb/xVDQuR48=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-roborock";
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "humbertogontijo";
|
||||
repo = "python-roborock";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-w3UpbkBBSPcz3872HDp8MduAIgn0+8R+0C0pGU6fDJM=";
|
||||
hash = "sha256-3t9ep6JHczvNBJdJqdwrZSS+ZEh4UYQkPCx0X4e7gNY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pywemo";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-RgG2bKA7ifuOPX0ZDKv92S4Gpp9zaansKiEpYrYfPt4=";
|
||||
hash = "sha256-mrLZ8W7imM/ysJhd4OcqZFzx2z/KG8k5bOPFb4ldYzE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -48,6 +48,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Python module to discover and control WeMo devices";
|
||||
homepage = "https://github.com/pywemo/pywemo";
|
||||
changelog = "https://github.com/pywemo/pywemo/releases/tag/${version}";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,100 +0,0 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonAtLeast
|
||||
, fetchFromGitHub
|
||||
, colorcet
|
||||
, cryptography
|
||||
, flask
|
||||
, flask-compress
|
||||
, flask-cors
|
||||
, flask-sockets
|
||||
, gevent
|
||||
, imageio
|
||||
, numpy
|
||||
, pillow
|
||||
, pyopenssl
|
||||
, scipy
|
||||
, six
|
||||
, unidecode
|
||||
, urllib3
|
||||
, wget
|
||||
, deepdiff
|
||||
, pytest-cov
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, websocket-client
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "runway-python";
|
||||
version = "0.6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "runwayml";
|
||||
repo = "model-sdk";
|
||||
rev = version;
|
||||
hash = "sha256-Qn+gsvxxUJee7k060lPk53qi15xwC/JORJ5aHKLigvM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
colorcet
|
||||
cryptography
|
||||
flask
|
||||
flask-compress
|
||||
flask-cors
|
||||
flask-sockets
|
||||
gevent
|
||||
imageio
|
||||
numpy
|
||||
pillow
|
||||
pyopenssl
|
||||
scipy
|
||||
six
|
||||
unidecode
|
||||
urllib3
|
||||
wget
|
||||
] ++ urllib3.optional-dependencies.secure;
|
||||
|
||||
nativeCheckInputs = [
|
||||
deepdiff
|
||||
pytest-cov
|
||||
pytestCheckHook
|
||||
websocket-client
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Build fails with:
|
||||
# ERROR: No matching distribution found for urllib3-secure-extra; extra == "secure"
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "urllib3[secure]>=1.25.7" "urllib3"
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# These tests require network
|
||||
"test_file_deserialization_remote"
|
||||
"test_file_deserialization_absolute_directory"
|
||||
"test_file_deserialization_remote_directory"
|
||||
# Fails with a decoding error at the moment
|
||||
"test_inference_async"
|
||||
] ++ lib.optionals (pythonAtLeast "3.9") [
|
||||
# AttributeError: module 'base64' has no attribute 'decodestring
|
||||
# https://github.com/runwayml/model-sdk/issues/99
|
||||
"test_image_serialize_and_deserialize"
|
||||
"test_segmentation_serialize_and_deserialize_colormap"
|
||||
"test_segmentation_serialize_and_deserialize_labelmap"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"runway"
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Helper library for creating Runway models";
|
||||
homepage = "https://github.com/runwayml/model-sdk";
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ prusnak ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,6 +11,7 @@
|
|||
, pygtrie
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, shortuuid
|
||||
}:
|
||||
|
||||
|
|
@ -28,14 +29,11 @@ buildPythonPackage rec {
|
|||
hash = "sha256-MREY8i6FIeRyjcCKvS8gthsVql81x4Ab7gA7yFgwNoQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.cfg \
|
||||
--replace "asyncssh>=2.7.1,<2.9" "asyncssh>=2.7.1" \
|
||||
--replace "pathspec>=0.9.0,<0.10.0" "pathspec"
|
||||
'';
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,26 +1,31 @@
|
|||
{ lib, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchurl
|
||||
, isPy37
|
||||
, isPy38
|
||||
, isPy39
|
||||
, isPy310
|
||||
, python
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, addOpenGLRunpath
|
||||
, cudaPackages
|
||||
, future
|
||||
, numpy
|
||||
, autoPatchelfHook
|
||||
, patchelf
|
||||
, pyyaml
|
||||
, requests
|
||||
, setuptools
|
||||
, typing-extensions
|
||||
, sympy
|
||||
, jinja2
|
||||
, networkx
|
||||
, filelock
|
||||
, openai-triton
|
||||
}:
|
||||
|
||||
let
|
||||
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
|
||||
srcs = import ./binary-hashes.nix version;
|
||||
unsupported = throw "Unsupported system";
|
||||
version = "1.13.1";
|
||||
version = "2.0.0";
|
||||
in buildPythonPackage {
|
||||
inherit version;
|
||||
|
||||
|
|
@ -29,15 +34,31 @@ in buildPythonPackage {
|
|||
|
||||
format = "wheel";
|
||||
|
||||
disabled = !(isPy38 || isPy39 || isPy310);
|
||||
disabled = (pythonOlder "3.8") || (pythonAtLeast "3.12");
|
||||
|
||||
src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
|
||||
|
||||
nativeBuildInputs = [
|
||||
addOpenGLRunpath
|
||||
autoPatchelfHook
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
patchelf
|
||||
];
|
||||
|
||||
buildInputs = with cudaPackages; [
|
||||
# $out/${sitePackages}/nvfuser/_C*.so wants libnvToolsExt.so.1 but torch/lib only ships
|
||||
# libnvToolsExt-$hash.so.1
|
||||
cuda_nvtx
|
||||
];
|
||||
|
||||
autoPatchelfIgnoreMissingDeps = [
|
||||
# This is the hardware-dependent userspace driver that comes from
|
||||
# nvidia_x11 package. It must be deployed at runtime in
|
||||
# /run/opengl-driver/lib or pointed at by LD_LIBRARY_PATH variable, rather
|
||||
# than pinned in runpath
|
||||
"libcuda.so.1"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
future
|
||||
numpy
|
||||
|
|
@ -45,6 +66,12 @@ in buildPythonPackage {
|
|||
requests
|
||||
setuptools
|
||||
typing-extensions
|
||||
sympy
|
||||
jinja2
|
||||
networkx
|
||||
filelock
|
||||
] ++ lib.optionals stdenv.isx86_64 [
|
||||
openai-triton
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
@ -52,14 +79,20 @@ in buildPythonPackage {
|
|||
rm -rf $out/bin
|
||||
'';
|
||||
|
||||
postFixup = let
|
||||
rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ];
|
||||
in ''
|
||||
find $out/${python.sitePackages}/torch/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
|
||||
echo "setting rpath for $lib..."
|
||||
patchelf --set-rpath "${rpath}:$out/${python.sitePackages}/torch/lib" "$lib"
|
||||
addOpenGLRunpath "$lib"
|
||||
done
|
||||
postFixup = ''
|
||||
addAutoPatchelfSearchPath "$out/${python.sitePackages}/torch/lib"
|
||||
|
||||
patchelf $out/${python.sitePackages}/torch/lib/libcudnn.so.8 --add-needed libcudnn_cnn_infer.so.8
|
||||
|
||||
pushd $out/${python.sitePackages}/torch/lib || exit 1
|
||||
for LIBNVRTC in ./libnvrtc*
|
||||
do
|
||||
case "$LIBNVRTC" in
|
||||
./libnvrtc-builtins*) true;;
|
||||
./libnvrtc*) patchelf "$LIBNVRTC" --add-needed libnvrtc-builtins* ;;
|
||||
esac
|
||||
done
|
||||
popd || exit 1
|
||||
'';
|
||||
|
||||
# The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.
|
||||
|
|
@ -74,7 +107,9 @@ in buildPythonPackage {
|
|||
# Includes CUDA and Intel MKL, but redistributions of the binary are not limited.
|
||||
# https://docs.nvidia.com/cuda/eula/index.html
|
||||
# https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
|
||||
license = licenses.bsd3;
|
||||
# torch's license is BSD3.
|
||||
# torch-bin includes CUDA and MKL binaries, therefore unfreeRedistributable is set.
|
||||
license = with licenses; [ bsd3 issl unfreeRedistributable ];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
platforms = [ "aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux" ];
|
||||
hydraPlatforms = []; # output size 3.2G on 1.11.0
|
||||
|
|
|
|||
|
|
@ -6,66 +6,86 @@
|
|||
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
|
||||
|
||||
version : builtins.getAttr version {
|
||||
"1.13.1" = {
|
||||
"2.0.0" = {
|
||||
x86_64-linux-38 = {
|
||||
name = "torch-1.13.1-cp38-cp38-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl";
|
||||
hash = "sha256-u/lUbw0Ni1EmPKR5Y3tCaogzX8oANPQs7GPU0y3uBa8=";
|
||||
name = "torch-2.0.0-cp38-cp38-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu118/torch-2.0.0%2Bcu118-cp38-cp38-linux_x86_64.whl";
|
||||
hash = "sha256-H4766/y7fsOWL9jHw74CxmZu/1OhIEMAanSdZHZWFj4=";
|
||||
};
|
||||
x86_64-linux-39 = {
|
||||
name = "torch-1.13.1-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-s6wTng1KCzA8wW9R63cUbsfRTAsecCrWOGE2KPUIavc=";
|
||||
name = "torch-2.0.0-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu118/torch-2.0.0%2Bcu118-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-6rl6n+WefjHWVisYb0NecXsd8zMcrcd25sBzIjmp7Tk=";
|
||||
};
|
||||
x86_64-linux-310 = {
|
||||
name = "torch-1.13.1-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu117/torch-1.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-FMXJ2wnfjPGzlCo0ecd52m4pOoShYtimrHHiveMOMMU=";
|
||||
name = "torch-2.0.0-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu118/torch-2.0.0%2Bcu118-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-S2kOK3fyEHNQDGXYu56pZWuMtOlp81c3C7yZKjsHR2Q=";
|
||||
};
|
||||
x86_64-linux-311 = {
|
||||
name = "torch-2.0.0-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu118/torch-2.0.0%2Bcu118-cp311-cp311-linux_x86_64.whl";
|
||||
hash = "sha256-I4Vz02LFZBE0UQRvZwjDuBWP5rG39sA7cnMyfZVd61Q=";
|
||||
};
|
||||
x86_64-darwin-38 = {
|
||||
name = "torch-1.13.1-cp38-none-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp38-none-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-M+Z+6lJuC7uRUSY+ZUF6nvLY+lPL5ijocxAGDJ3PoxI=";
|
||||
name = "torch-2.0.0-cp38-none-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp38-none-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-zHiMu7vG60yQ5SxVDv0GdYbCaTCSzzZ8E1s0iTpkrng=";
|
||||
};
|
||||
x86_64-darwin-39 = {
|
||||
name = "torch-1.13.1-cp39-none-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp39-none-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-aTB5HvqHV8tpdK9z1Jlra1DFkogqMkuPsFicapui3a8=";
|
||||
name = "torch-2.0.0-cp39-none-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp39-none-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-bguXvrA3oWVmnDElkfJCOC6RCaJA4gBU1aV4LZI2ytA=";
|
||||
};
|
||||
x86_64-darwin-310 = {
|
||||
name = "torch-1.13.1-cp310-none-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp310-none-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-OTpic8gy4EdYEGP7dDNf9QtMVmIXAZzGrOMYzXnrBWY=";
|
||||
name = "torch-2.0.0-cp310-none-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp310-none-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-zptaSb1RPf95UKWgfW4mWU3VGYnO4FujiLA+jjZv1dU=";
|
||||
};
|
||||
x86_64-darwin-311 = {
|
||||
name = "torch-2.0.0-cp311-none-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp311-none-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-AYWGIPJfJeep7EtUf/OOXifJLTjsTMupz7+zHXBx7Zw=";
|
||||
};
|
||||
aarch64-darwin-38 = {
|
||||
name = "torch-1.13.1-cp38-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp38-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-7usgTTD9QK9qLYCHm0an77489Dzb64g43U89EmzJCys=";
|
||||
name = "torch-2.0.0-cp38-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp38-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-0pJkDw/XK3oxsqbjtjXrUGX8vt1EePnK0aHnqeyGHTU=";
|
||||
};
|
||||
aarch64-darwin-39 = {
|
||||
name = "torch-1.13.1-cp39-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp39-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-4N+QKnx91seVaYUy7llwzomGcmJWNdiF6t6ZduWgSUk=";
|
||||
name = "torch-2.0.0-cp39-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp39-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-KXpJGa/xwPmKWOvpaSAPcTUKHU1PmG2/1gwC/854Dpk=";
|
||||
};
|
||||
aarch64-darwin-310 = {
|
||||
name = "torch-1.13.1-cp310-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-1.13.1-cp310-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-ASKAaxEblJ0h+hpfl2TR/S/MSkfLf4/5FCBP1Px1LtU=";
|
||||
name = "torch-2.0.0-cp310-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp310-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-U+HDPGiWWDzbmlg2k+IumSZkRMSkM5Ld3FYmQNOeVCs=";
|
||||
};
|
||||
aarch64-darwin-311 = {
|
||||
name = "torch-2.0.0-cp311-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.0.0-cp311-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-mi5TtXg+9YlqavM4s214LyjoPI3fwqxEtnsGbZ129Jg=";
|
||||
};
|
||||
aarch64-linux-38 = {
|
||||
name = "torch-1.13.1-cp38-cp38-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/torch-1.13.1-cp38-cp38-manylinux2014_aarch64.whl";
|
||||
hash = "sha256-34Q0sGlenOuMxwZQr8ExDYupSebbKgUl3dnDsrGB5f4=";
|
||||
name = "torch-2.0.0-cp38-cp38-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/torch-2.0.0-cp38-cp38-manylinux2014_aarch64.whl";
|
||||
hash = "sha256-EbA4T+PBjAG4/FmS5w/FGc3mXkTFHMh74YOMGAPa9C8=";
|
||||
};
|
||||
aarch64-linux-39 = {
|
||||
name = "torch-1.13.1-cp39-cp39-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/torch-1.13.1-cp39-cp39-manylinux2014_aarch64.whl";
|
||||
hash = "sha256-LDWBo/2B6x8PIpl83f/qVp/qU7r6NyssBHHbNzsmqvw=";
|
||||
name = "torch-2.0.0-cp39-cp39-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/torch-2.0.0-cp39-cp39-manylinux2014_aarch64.whl";
|
||||
hash = "sha256-qDsmvWrjb79f7j1Wlz2YFuIALoo7fZIFUxFnwoqqOKc=";
|
||||
};
|
||||
aarch64-linux-310 = {
|
||||
name = "torch-1.13.1-cp310-cp310-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/torch-1.13.1-cp310-cp310-manylinux2014_aarch64.whl";
|
||||
hash = "sha256-2f54XTdfLial1eul3pH4nmo75dEe+0l+dnBf35P6PC4=";
|
||||
name = "torch-2.0.0-cp310-cp310-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/torch-2.0.0-cp310-cp310-manylinux2014_aarch64.whl";
|
||||
hash = "sha256-nwH+H2Jj8xvQThdXlG/WOtUxrjfyi7Lb9m9cgm7gifQ=";
|
||||
};
|
||||
aarch64-linux-311 = {
|
||||
name = "torch-2.0.0-cp311-cp311-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/torch-2.0.0-cp311-cp311-manylinux2014_aarch64.whl";
|
||||
hash = "sha256-1Dmuw0nJjxKBnoVkuMVACORhPdRChYKvDm4UwkyoWHA=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ set -eou pipefail
|
|||
|
||||
version=$1
|
||||
|
||||
linux_cuda_version="cu117"
|
||||
linux_cuda_version="cu118"
|
||||
linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
|
||||
linux_cpu_bucket="https://download.pytorch.org/whl"
|
||||
darwin_bucket="https://download.pytorch.org/whl/cpu"
|
||||
|
|
@ -14,15 +14,19 @@ url_and_key_list=(
|
|||
"x86_64-linux-38 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torch-${version}-cp38-cp38-linux_x86_64.whl"
|
||||
"x86_64-linux-39 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl"
|
||||
"x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl"
|
||||
"x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torch-${version}-cp311-cp311-linux_x86_64.whl"
|
||||
"x86_64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_10_9_x86_64.whl torch-${version}-cp38-none-macosx_10_9_x86_64.whl"
|
||||
"x86_64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_10_9_x86_64.whl torch-${version}-cp39-none-macosx_10_9_x86_64.whl"
|
||||
"x86_64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_10_9_x86_64.whl torch-${version}-cp310-none-macosx_10_9_x86_64.whl"
|
||||
"x86_64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_10_9_x86_64.whl torch-${version}-cp311-none-macosx_10_9_x86_64.whl"
|
||||
"aarch64-darwin-38 $darwin_bucket/torch-${version}-cp38-none-macosx_11_0_arm64.whl torch-${version}-cp38-none-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl"
|
||||
"aarch64-linux-38 $linux_cpu_bucket/torch-${version}-cp38-cp38-manylinux2014_aarch64.whl torch-${version}-cp38-cp38-manylinux2014_aarch64.whl"
|
||||
"aarch64-linux-39 $linux_cpu_bucket/torch-${version}-cp39-cp39-manylinux2014_aarch64.whl torch-${version}-cp39-cp39-manylinux2014_aarch64.whl"
|
||||
"aarch64-linux-310 $linux_cpu_bucket/torch-${version}-cp310-cp310-manylinux2014_aarch64.whl torch-${version}-cp310-cp310-manylinux2014_aarch64.whl"
|
||||
"aarch64-linux-311 $linux_cpu_bucket/torch-${version}-cp311-cp311-manylinux2014_aarch64.whl torch-${version}-cp311-cp311-manylinux2014_aarch64.whl"
|
||||
)
|
||||
|
||||
hashfile="binary-hashes-$version.nix"
|
||||
|
|
|
|||
|
|
@ -1,47 +1,61 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, addOpenGLRunpath
|
||||
, autoPatchelfHook
|
||||
, buildPythonPackage
|
||||
, cudaPackages
|
||||
, fetchurl
|
||||
, isPy37
|
||||
, isPy38
|
||||
, isPy39
|
||||
, isPy310
|
||||
, ffmpeg_4
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, python
|
||||
, torch-bin
|
||||
, pythonOlder
|
||||
, pythonAtLeast
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "torchaudio";
|
||||
version = "0.13.1";
|
||||
version = "2.0.1";
|
||||
format = "wheel";
|
||||
|
||||
src =
|
||||
let pyVerNoDot = lib.replaceStrings [ "." ] [ "" ] python.pythonVersion;
|
||||
unsupported = throw "Unsupported system";
|
||||
srcs = (import ./binary-hashes.nix version)."${stdenv.system}-${pyVerNoDot}" or unsupported;
|
||||
in fetchurl srcs;
|
||||
in
|
||||
fetchurl srcs;
|
||||
|
||||
disabled = !(isPy38 || isPy39 || isPy310);
|
||||
disabled = (pythonOlder "3.8") || (pythonAtLeast "3.12");
|
||||
|
||||
buildInputs = with cudaPackages; [
|
||||
# $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libcudart.so.11.0 but torch/lib only ships
|
||||
# libcudart.$hash.so.11.0
|
||||
cuda_cudart
|
||||
|
||||
# $out/${sitePackages}/torchaudio/lib/libtorchaudio*.so wants libnvToolsExt.so.2 but torch/lib only ships
|
||||
# libnvToolsExt-$hash.so.1
|
||||
cuda_nvtx
|
||||
|
||||
ffmpeg_4.lib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
addOpenGLRunpath
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
torch-bin
|
||||
];
|
||||
|
||||
preInstall = ''
|
||||
addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch"
|
||||
'';
|
||||
|
||||
# The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.
|
||||
dontStrip = true;
|
||||
|
||||
pythonImportsCheck = [ "torchaudio" ];
|
||||
|
||||
postFixup = ''
|
||||
# Note: after patchelf'ing, libcudart can still not be found. However, this should
|
||||
# not be an issue, because PyTorch is loaded before torchvision and brings
|
||||
# in the necessary symbols.
|
||||
patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:${torch-bin}/${python.sitePackages}/torch/lib:" \
|
||||
"$out/${python.sitePackages}/torchaudio/_torchaudio.so"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "PyTorch audio library";
|
||||
homepage = "https://pytorch.org/";
|
||||
|
|
|
|||
|
|
@ -6,66 +6,86 @@
|
|||
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
|
||||
|
||||
version : builtins.getAttr version {
|
||||
"0.13.1" = {
|
||||
"2.0.1" = {
|
||||
x86_64-linux-38 = {
|
||||
name = "torchaudio-0.13.1-cp38-cp38-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp38-cp38-linux_x86_64.whl";
|
||||
hash = "sha256-QCY7LUVyj7/x2zOBJyvkKXD/blj5KZSqWHKlvUx+cmQ=";
|
||||
name = "torchaudio-2.0.1-cp38-cp38-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.1%2Bcu118-cp38-cp38-linux_x86_64.whl";
|
||||
hash = "sha256-lLDpx2ypHR4CiYlZIPv+jBF0ZNdXtktd+tsTCM+ZBPk=";
|
||||
};
|
||||
x86_64-linux-39 = {
|
||||
name = "torchaudio-0.13.1-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-Zbs2FdQz1bkwrNwQNu+xJAR9VxfbpN63D0GSkNlC+DY=";
|
||||
name = "torchaudio-2.0.1-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.1%2Bcu118-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-Bws4SWlhQr49keCycHbaHz+MtDKrzONc2VbRkfwNgYc=";
|
||||
};
|
||||
x86_64-linux-310 = {
|
||||
name = "torchaudio-0.13.1-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu117/torchaudio-0.13.1%2Bcu117-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-k/RVSktT+WmNAiJJA8kjwSpsIrPJQtz8IXm1gdjzcUY=";
|
||||
name = "torchaudio-2.0.1-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.1%2Bcu118-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-GcTvkBIyTE+4DqZpNFUbeAfZcUjChTji6rr+FqtQ6Rw=";
|
||||
};
|
||||
x86_64-linux-311 = {
|
||||
name = "torchaudio-2.0.1-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu118/torchaudio-2.0.1%2Bcu118-cp311-cp311-linux_x86_64.whl";
|
||||
hash = "sha256-GicitvZleO3FY+d7TMB6ItZjorte5cneJTlmGpihTbk=";
|
||||
};
|
||||
x86_64-darwin-38 = {
|
||||
name = "torchaudio-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp38-cp38-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-Qs5cZtMEvCzWgziRa4Ij4yLgmoTcvZIogU7za8R3o3s=";
|
||||
name = "torchaudio-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp38-cp38-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-AiyhuqS7gZt4NDvUe1f/bcb5/Bn6TvJplGqt9+Yts8A=";
|
||||
};
|
||||
x86_64-darwin-39 = {
|
||||
name = "torchaudio-0.13.1-cp39-cp39-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp39-cp39-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-nSFwVA3jKuAxqrOTYSmGjoluoEFhe21mkt3mqi37CiM=";
|
||||
name = "torchaudio-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp39-cp39-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-48bI+eqfDi33oLk3Ww3PlVkG44/BL6tUK3KoYVZK+Oc=";
|
||||
};
|
||||
x86_64-darwin-310 = {
|
||||
name = "torchaudio-0.13.1-cp310-cp310-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp310-cp310-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-Xg89xmmVBlITZCZnBOa/idDQV5/UNdEsXC9YWNUt5Po=";
|
||||
name = "torchaudio-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp310-cp310-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-tdIeu7VecEDUGNUGKw6IL5Zg1otHezj9Q2+mySzLtSo=";
|
||||
};
|
||||
x86_64-darwin-311 = {
|
||||
name = "torchaudio-2.0.1-cp311-cp311-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp311-cp311-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-4qBHZ1STwKolj+xiHvQOiwGr49jbyHIVLktZmEGKo8U=";
|
||||
};
|
||||
aarch64-darwin-38 = {
|
||||
name = "torchaudio-0.13.1-cp38-cp38-macosx_12_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.1-cp38-cp38-macosx_12_0_arm64.whl";
|
||||
hash = "sha256-sJOz52YchRaOyd3iz5c0WWXqCTHT0qfni9QJIh5taZg=";
|
||||
name = "torchaudio-2.0.1-cp38-cp38-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp38-cp38-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-oVOtXNti3o7J/RNgoNCAu6851XiuBOeI2yEVceZ1t+A=";
|
||||
};
|
||||
aarch64-darwin-39 = {
|
||||
name = "torchaudio-0.13.1-cp39-cp39-macosx_12_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.1-cp39-cp39-macosx_12_0_arm64.whl";
|
||||
hash = "sha256-kfz79HAAQC0Sv/JiTmIgoP07jKjub/Ue31lF7DmrCn8=";
|
||||
name = "torchaudio-2.0.1-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-HQzwd5ozTsGGHp+ii862amM8Quj2szIuLjf/nyDQroE=";
|
||||
};
|
||||
aarch64-darwin-310 = {
|
||||
name = "torchaudio-0.13.1-cp310-cp310-macosx_12_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-0.13.1-cp310-cp310-macosx_12_0_arm64.whl";
|
||||
hash = "sha256-7HKhfU0heIKed4BoKZm1Nc9X/hYNDCCw1r3BrRqHxN0=";
|
||||
name = "torchaudio-2.0.1-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-bbzZOynXGi9QDzajTqXkZ/UQ93PahTIgmOa92MncmUg=";
|
||||
};
|
||||
aarch64-darwin-311 = {
|
||||
name = "torchaudio-2.0.1-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.0.1-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-kaKOWH9wigMyDt28xKfdGtcVCz1IRrbBVX2FzImo0Gw=";
|
||||
};
|
||||
aarch64-linux-38 = {
|
||||
name = "torchaudio-0.13.1-cp38-cp38-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp38-cp38-manylinux2014_aarch64.whl";
|
||||
hash = "sha256-PEi8/wDq6BgPh/WNHJ5+n9jEy36z6ogXk1+2BI0VK8c=";
|
||||
name = "torchaudio-2.0.1-cp38-cp38-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/torchaudio-2.0.1-cp38-cp38-manylinux2014_aarch64.whl";
|
||||
hash = "sha256-qlsjzsMVcWRKpn1s1QGzl/QmVX3F8y6NtuzbJ7GUClg=";
|
||||
};
|
||||
aarch64-linux-39 = {
|
||||
name = "torchaudio-0.13.1-cp39-cp39-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp39-cp39-manylinux2014_aarch64.whl";
|
||||
hash = "sha256-MCOutcGRBHvvFoGjdBv/1KIWS1imTK0k3TfaXhrC0fE=";
|
||||
name = "torchaudio-2.0.1-cp39-cp39-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/torchaudio-2.0.1-cp39-cp39-manylinux2014_aarch64.whl";
|
||||
hash = "sha256-ry16SysebkDnnA7d0Qezu0MVkdBJTX+X7ffBhkN7XBo=";
|
||||
};
|
||||
aarch64-linux-310 = {
|
||||
name = "torchaudio-0.13.1-cp310-cp310-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/torchaudio-0.13.1-cp310-cp310-manylinux2014_aarch64.whl";
|
||||
hash = "sha256-LkdWLNzdR8uO2Go88FO3BnzJ6INA9FUK5z15DdvBLyE=";
|
||||
name = "torchaudio-2.0.1-cp310-cp310-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/torchaudio-2.0.1-cp310-cp310-manylinux2014_aarch64.whl";
|
||||
hash = "sha256-6f/6Y0Gbxl7Pg5Vo3QS+O6VibF9bJsmlZsA4KtKXcck=";
|
||||
};
|
||||
aarch64-linux-311 = {
|
||||
name = "torchaudio-2.0.1-cp311-cp311-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/torchaudio-2.0.1-cp311-cp311-manylinux2014_aarch64.whl";
|
||||
hash = "sha256-MkQuKxHfwJxMW2zEuSTT84wslGPuKOSGUi+fSLCbf7c=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,24 +5,28 @@ set -eou pipefail
|
|||
|
||||
version=$1
|
||||
|
||||
linux_cuda_version="cu117"
|
||||
linux_cuda_version="cu118"
|
||||
linux_cuda_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
|
||||
linux_cpu_bucket="https://download.pytorch.org/whl"
|
||||
darwin_bucket="https://download.pytorch.org/whl"
|
||||
darwin_bucket="https://download.pytorch.org/whl/cpu"
|
||||
|
||||
url_and_key_list=(
|
||||
"x86_64-linux-38 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchaudio-${version}-cp38-cp38-linux_x86_64.whl"
|
||||
"x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl"
|
||||
"x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl"
|
||||
"x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl"
|
||||
"x86_64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchaudio-${version}-cp38-cp38-macosx_10_9_x86_64.whl"
|
||||
"x86_64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchaudio-${version}-cp39-cp39-macosx_10_9_x86_64.whl"
|
||||
"x86_64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchaudio-${version}-cp310-cp310-macosx_10_9_x86_64.whl"
|
||||
"aarch64-darwin-38 $darwin_bucket/cpu/torchaudio-${version}-cp38-cp38-macosx_12_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_12_0_arm64.whl"
|
||||
"aarch64-darwin-39 $darwin_bucket/cpu/torchaudio-${version}-cp39-cp39-macosx_12_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_12_0_arm64.whl"
|
||||
"aarch64-darwin-310 $darwin_bucket/cpu/torchaudio-${version}-cp310-cp310-macosx_12_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_12_0_arm64.whl"
|
||||
"x86_64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_10_9_x86_64.whl torchaudio-${version}-cp311-cp311-macosx_10_9_x86_64.whl"
|
||||
"aarch64-darwin-38 $darwin_bucket/torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl torchaudio-${version}-cp38-cp38-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl"
|
||||
"aarch64-linux-38 $linux_cpu_bucket/torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl torchaudio-${version}-cp38-cp38-manylinux2014_aarch64.whl"
|
||||
"aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl"
|
||||
"aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl"
|
||||
"aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl"
|
||||
)
|
||||
|
||||
hashfile=binary-hashes-"$version".nix
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, addOpenGLRunpath
|
||||
, autoPatchelfHook
|
||||
, buildPythonPackage
|
||||
, cudaPackages
|
||||
, fetchurl
|
||||
, isPy37
|
||||
, isPy38
|
||||
, isPy39
|
||||
, isPy310
|
||||
, patchelf
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, pillow
|
||||
, python
|
||||
, torch-bin
|
||||
|
|
@ -16,7 +16,7 @@ let
|
|||
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
|
||||
srcs = import ./binary-hashes.nix version;
|
||||
unsupported = throw "Unsupported system";
|
||||
version = "0.14.1";
|
||||
version = "0.15.1";
|
||||
in buildPythonPackage {
|
||||
inherit version;
|
||||
|
||||
|
|
@ -26,10 +26,17 @@ in buildPythonPackage {
|
|||
|
||||
src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
|
||||
|
||||
disabled = !(isPy37 || isPy38 || isPy39 || isPy310);
|
||||
disabled = (pythonOlder "3.8") || (pythonAtLeast "3.12");
|
||||
|
||||
buildInputs = with cudaPackages; [
|
||||
# $out/${sitePackages}/torchvision/_C.so wants libcudart.so.11.0 but torchvision.libs only ships
|
||||
# libcudart.$hash.so.11.0
|
||||
cuda_cudart
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
patchelf
|
||||
autoPatchelfHook
|
||||
addOpenGLRunpath
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -42,14 +49,8 @@ in buildPythonPackage {
|
|||
|
||||
pythonImportsCheck = [ "torchvision" ];
|
||||
|
||||
postFixup = let
|
||||
rpath = lib.makeLibraryPath [ stdenv.cc.cc.lib ];
|
||||
in ''
|
||||
# Note: after patchelf'ing, libcudart can still not be found. However, this should
|
||||
# not be an issue, because PyTorch is loaded before torchvision and brings
|
||||
# in the necessary symbols.
|
||||
patchelf --set-rpath "${rpath}:${torch-bin}/${python.sitePackages}/torch/lib:" \
|
||||
"$out/${python.sitePackages}/torchvision/_C.so"
|
||||
preInstall = ''
|
||||
addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -6,61 +6,66 @@
|
|||
# To add a new version, run "prefetch.sh 'new-version'" to paste the generated file as follows.
|
||||
|
||||
version : builtins.getAttr version {
|
||||
"0.14.1" = {
|
||||
x86_64-linux-37 = {
|
||||
name = "torchvision-0.14.1-cp37-cp37m-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp37-cp37m-linux_x86_64.whl";
|
||||
hash = "sha256-vOOhWqGuclcvjNKOSdHsGtjwhm+7ZhxzaNnBKF9psi4=";
|
||||
};
|
||||
"0.15.1" = {
|
||||
x86_64-linux-38 = {
|
||||
name = "torchvision-0.14.1-cp38-cp38-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp38-cp38-linux_x86_64.whl";
|
||||
hash = "sha256-dAk4UTnOiGTOssgv/OM46+FaVRk/S4DEKm0PnP14Fik=";
|
||||
name = "torchvision-0.15.1-cp38-cp38-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.1%2Bcu118-cp38-cp38-linux_x86_64.whl";
|
||||
hash = "sha256-kQRzDWVavygsKEXUzUcrsIk288hQg6KK79dq2e6v8mE=";
|
||||
};
|
||||
x86_64-linux-39 = {
|
||||
name = "torchvision-0.14.1-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-iomg7gB9fNulO9VkJth5UGCgZLiRm2GsOeAOOZ3ta+I=";
|
||||
name = "torchvision-0.15.1-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.1%2Bcu118-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-Xs4nnI9SH49jc7+XHyrcY6lh1pTErO1TjfgSlCEO5Lo=";
|
||||
};
|
||||
x86_64-linux-310 = {
|
||||
name = "torchvision-0.14.1-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu117/torchvision-0.14.1%2Bcu117-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-g9JxpTA5KBS4x/aTgihcrHx9p5uPXcxrz1bGKFR7zlM=";
|
||||
name = "torchvision-0.15.1-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.1%2Bcu118-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-mmefo3p0EBjIBCNGk7usPUh/s91V7nP2szZ3sXfIwHo=";
|
||||
};
|
||||
x86_64-darwin-37 = {
|
||||
name = "torchvision-0.14.1-cp37-cp37m-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp37-cp37m-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-+3p5P9M84avsJLQneEGaP7HjFZ19/LJ0o8qPuMvECNw=";
|
||||
x86_64-linux-311 = {
|
||||
name = "torchvision-0.15.1-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu118/torchvision-0.15.1%2Bcu118-cp311-cp311-linux_x86_64.whl";
|
||||
hash = "sha256-nO0skO54K7tBWw3mW8wQ1P6BETGGRnm3B0QsnZ6Kqv0=";
|
||||
};
|
||||
x86_64-darwin-38 = {
|
||||
name = "torchvision-0.14.1-cp38-cp38-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp38-cp38-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-aO0DNZ3NPanNIbirlNohFY34pqDFutC/SkLw5EjSjLM=";
|
||||
name = "torchvision-0.15.1-cp38-cp38-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp38-cp38-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-5YYbqu6ofRm2/X0THhGkpr0XvhQjTEkKJZuzYHdelSA=";
|
||||
};
|
||||
x86_64-darwin-39 = {
|
||||
name = "torchvision-0.14.1-cp39-cp39-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp39-cp39-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-xedE9W5fW0Ut61/A8/K6TS8AYS0U2NoNvv6o8JrHaQs=";
|
||||
name = "torchvision-0.15.1-cp39-cp39-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp39-cp39-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-Hf3sfH35ZzMLujNBp4HgwEfU4BY+ZxZKmRhQA2K/fZE=";
|
||||
};
|
||||
x86_64-darwin-310 = {
|
||||
name = "torchvision-0.14.1-cp310-cp310-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/torchvision-0.14.1-cp310-cp310-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-7rBd2d069UKP7lJUAHWdr42o5MrsRd3WkIz7NlcfZDM=";
|
||||
name = "torchvision-0.15.1-cp310-cp310-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp310-cp310-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-vBDUjppg0AbQwbSN6ofx7Jtj2FZzfVkvfFxEzYfz9Lc=";
|
||||
};
|
||||
x86_64-darwin-311 = {
|
||||
name = "torchvision-0.15.1-cp311-cp311-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp311-cp311-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-l7kOs7czOjHQScTM/RBkNh6EkYdJWdOPRmr2TWdBjO8=";
|
||||
};
|
||||
aarch64-darwin-38 = {
|
||||
name = "torchvision-0.14.1-cp38-cp38-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.1-cp38-cp38-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-MPzw6f5X1KxM5kJmWaV9zhmWN8y2xwvhEoZw8XdpJiQ=";
|
||||
name = "torchvision-0.15.1-cp38-cp38-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp38-cp38-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-5xTzYrnYIXz01oUJtnnryd3xKM/oD2wd744/ihhGbnU=";
|
||||
};
|
||||
aarch64-darwin-39 = {
|
||||
name = "torchvision-0.14.1-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.1-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-dYsg0HnoELR0C9YNHrFuSdqDDjNg+b43nrF37iIfpdQ=";
|
||||
name = "torchvision-0.15.1-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-wVNxAYbOwDONT/9BFFmlfdvIUEQ2EjynOz8L3Cb/kYw=";
|
||||
};
|
||||
aarch64-darwin-310 = {
|
||||
name = "torchvision-0.14.1-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.14.1-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-jQdm6pKv+nrySOMn3YX3yc/fUaV1MLQyEtThhYVI6dc=";
|
||||
name = "torchvision-0.15.1-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-NwjTQQ/cr2KA41jNqd4qSrBswLTA/ZrurFUOwlY6iH4=";
|
||||
};
|
||||
aarch64-darwin-311 = {
|
||||
name = "torchvision-0.15.1-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.15.1-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-a2DhyDmuKgcb77ummxdGjWf+r99XbpD/lkW/vumY3hc=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,22 +5,23 @@ set -eou pipefail
|
|||
|
||||
version=$1
|
||||
|
||||
linux_cuda_version="cu117"
|
||||
linux_cuda_version="cu118"
|
||||
linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
|
||||
darwin_bucket="https://download.pytorch.org/whl"
|
||||
darwin_bucket="https://download.pytorch.org/whl/cpu"
|
||||
|
||||
url_and_key_list=(
|
||||
"x86_64-linux-37 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp37-cp37m-linux_x86_64.whl torchvision-${version}-cp37-cp37m-linux_x86_64.whl"
|
||||
"x86_64-linux-38 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp38-cp38-linux_x86_64.whl torchvision-${version}-cp38-cp38-linux_x86_64.whl"
|
||||
"x86_64-linux-39 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp39-cp39-linux_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl"
|
||||
"x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-linux_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl"
|
||||
"x86_64-darwin-37 $darwin_bucket/torchvision-${version}-cp37-cp37m-macosx_10_9_x86_64.whl torchvision-${version}-cp37-cp37m-macosx_10_9_x86_64.whl"
|
||||
"x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-linux_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl"
|
||||
"x86_64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl torchvision-${version}-cp38-cp38-macosx_10_9_x86_64.whl"
|
||||
"x86_64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl torchvision-${version}-cp39-cp39-macosx_10_9_x86_64.whl"
|
||||
"x86_64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl torchvision-${version}-cp310-cp310-macosx_10_9_x86_64.whl"
|
||||
"aarch64-darwin-38 $darwin_bucket/cpu/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-39 $darwin_bucket/cpu/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-310 $darwin_bucket/cpu/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl"
|
||||
"x86_64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_10_9_x86_64.whl torchvision-${version}-cp311-cp311-macosx_10_9_x86_64.whl"
|
||||
"aarch64-darwin-38 $darwin_bucket/torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl torchvision-${version}-cp38-cp38-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl"
|
||||
"aarch64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl"
|
||||
)
|
||||
|
||||
hashfile="binary-hashes-$version.nix"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yalexs";
|
||||
version = "1.3.2";
|
||||
version = "1.3.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "bdraco";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CqonGKcbAg0Edqw3WosK2vEJ0DxOMZNSNO5RkecECa0=";
|
||||
hash = "sha256-dUiaz1adXsiVji1YZYkYN6NCFGzAWIBPjVTeyvUaiqU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "zigpy-znp";
|
||||
version = "0.10.0";
|
||||
version = "0.11.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "zigpy";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-pQ1T7MTrL789kd8cbbsjRLUaxd1yHF7sDwow2UksQ7c=";
|
||||
hash = "sha256-gYzk3XHXlF4+lnrRHYS5RB2QD0oDHgnMov9UFmXder8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -49,15 +49,15 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
disabledTests = [
|
||||
# https://github.com/zigpy/zigpy-znp/issues/209
|
||||
"--deselect=tests/application/test_joining.py::test_join_device"
|
||||
"--deselect=tests/application/test_joining.py::test_permit_join"
|
||||
"--deselect=tests/application/test_requests.py::test_request_recovery_route_rediscovery_af"
|
||||
"--deselect=tests/application/test_requests.py::test_request_recovery_route_rediscovery_zdo"
|
||||
"--deselect=tests/application/test_requests.py::test_zigpy_request"
|
||||
"--deselect=tests/application/test_requests.py::test_zigpy_request_failure"
|
||||
"--deselect=tests/application/test_zdo_requests.py::test_mgmt_nwk_update_req"
|
||||
"test_join_device"
|
||||
"test_permit_join"
|
||||
"test_request_recovery_route_rediscovery_af"
|
||||
"test_request_recovery_route_rediscovery_zdo"
|
||||
"test_zigpy_request"
|
||||
"test_zigpy_request_failure"
|
||||
"test_mgmt_nwk_update_req"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
@ -67,6 +67,7 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
description = "Library for zigpy which communicates with TI ZNP radios";
|
||||
homepage = "https://github.com/zigpy/zigpy-znp";
|
||||
changelog = "https://github.com/zigpy/zigpy-znp/releases/tag/v${version}";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ mvnetbiz ];
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@ with py.pkgs;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "2.3.214";
|
||||
version = "2.3.216";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-MmwMB5bb6mqZ9ZyBeOXF/rmofLLgvIRxEcj0uh+0zcA=";
|
||||
hash = "sha256-A9X7QrqgPgVxCf1O7dbhoaRaZDDI73e1Wl5elBZDbO4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-public-api";
|
||||
version = "0.29.0";
|
||||
version = "0.29.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-Tf2nAisZlKPalWa0T5XDAWy+d/ERJYtzJVb3gEdcGSo=";
|
||||
hash = "sha256-4UaLzYwOhVK3Ca4EqQTdi/cMozAeXLWALB5yTQCNi/k=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-X+4C/ExKAVvAX11dBcJHhV7WW/EUI1zk3UR8mBQkSY4=";
|
||||
cargoHash = "sha256-zDgohGKu7jbaWNkb/Nr6ZVkQFEiXzNdEReVBsVuvKDA=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -22,27 +22,15 @@ let inherit (lib) optional optionals;
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bozohttpd";
|
||||
version = "20210227";
|
||||
version = "20220517";
|
||||
|
||||
# bozohttpd is developed in-tree in pkgsrc, canonical hashes can be found at:
|
||||
# http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/bozohttpd/distinfo
|
||||
src = fetchurl {
|
||||
url = "http://www.eterna.com.au/${pname}/${pname}-${version}.tar.bz2";
|
||||
sha512 = "b838498626ffb7f7e84f31611e0e99aaa3af64bd9376e1a13ec16313c182eebfd9ea2c2d03904497239af723bf34a3d2202dac1f2d3e55f9fd076f6d45ccfa33";
|
||||
sha512 = "275b8fab3cf2e6c59721682cae952db95da5bd3b1f20680240c6cf1029463693f6feca047fbef5e3a3e7528b40b7b2e87b2a56fd800b612e679a16f24890e5b6";
|
||||
};
|
||||
|
||||
# backport two unreleased commits to fix builds on non-netbsd platforms.
|
||||
patches = [
|
||||
# add missing `#include <stdint.h>`
|
||||
# https://freshbsd.org/netbsd/src/commit/qMGNoXfgeieZBVRC
|
||||
./0001-include-stdint.h.patch
|
||||
|
||||
# BUFSIZ is not guaranteed to be large enough
|
||||
# https://freshbsd.org/netbsd/src/commit/A4ueIHIp3JgjNVRC
|
||||
./0002-dont-use-host-BUFSIZ.patch
|
||||
];
|
||||
patchFlags = [ "-p3" ];
|
||||
|
||||
buildInputs = [ openssl libxcrypt ] ++ optional (luaSupport) lua;
|
||||
nativeBuildInputs = [ bmake groff ];
|
||||
|
||||
|
|
|
|||
|
|
@ -294,6 +294,7 @@ else let
|
|||
(["meta" "passthru" "pos"
|
||||
"checkInputs" "installCheckInputs"
|
||||
"nativeCheckInputs" "nativeInstallCheckInputs"
|
||||
"__contentAddressed"
|
||||
"__darwinAllowLocalNetworking"
|
||||
"__impureHostDeps" "__propagatedImpureHostDeps"
|
||||
"sandboxProfile" "propagatedSandboxProfile"]
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2023-04-29";
|
||||
version = "2023-05-03";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "exploit-database";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-9GBGjpqsOe4FMcMg3whG/n9zF2h1M6LQp5bJHu0mu+E=";
|
||||
hash = "sha256-6pXGSG2blINzZA34F20YjV7ertJLnjxTHHa6Hv0EN08=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,17 +6,17 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kubescape";
|
||||
version = "2.2.6";
|
||||
version = "2.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubescape";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tXfjbE4C08YWgLJlZHjagAP3upqCpaOgwSegovVSFCI=";
|
||||
hash = "sha256-xYkNwANAGWlYxGLIhIkOLKmOW/SM3Duqus4WJ6MKGZE=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bZPM8PCn0+W7Sf/+lQ3ASeqxFSZi49r32rjvQdD7Bvc=";
|
||||
vendorHash = "sha256-SPIMI9HJRF9r5wZfdynwcTTZiZ7SxuJjfcfPg6dMsGo=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# frozen_string_literal: true
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.13"
|
||||
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.14"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
GIT
|
||||
remote: https://github.com/rapid7/metasploit-framework
|
||||
revision: f58dd240e0c900976bc0609096b3b2e9965f70cb
|
||||
ref: refs/tags/6.3.13
|
||||
revision: 44a9a761be544d3435963076dcbbeb8a4fa0e47f
|
||||
ref: refs/tags/6.3.14
|
||||
specs:
|
||||
metasploit-framework (6.3.13)
|
||||
metasploit-framework (6.3.14)
|
||||
actionpack (~> 7.0)
|
||||
activerecord (~> 7.0)
|
||||
activesupport (~> 7.0)
|
||||
|
|
@ -33,7 +33,7 @@ GIT
|
|||
metasploit-concern
|
||||
metasploit-credential
|
||||
metasploit-model
|
||||
metasploit-payloads (= 2.0.126)
|
||||
metasploit-payloads (= 2.0.127)
|
||||
metasploit_data_models
|
||||
metasploit_payloads-mettle (= 1.0.20)
|
||||
mqtt
|
||||
|
|
@ -130,19 +130,19 @@ GEM
|
|||
arel-helpers (2.14.0)
|
||||
activerecord (>= 3.1.0, < 8)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.752.0)
|
||||
aws-partitions (1.759.0)
|
||||
aws-sdk-core (3.171.0)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.651.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
aws-sdk-ec2 (1.375.0)
|
||||
aws-sdk-ec2 (1.377.0)
|
||||
aws-sdk-core (~> 3, >= 3.165.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.77.0)
|
||||
aws-sdk-core (~> 3, >= 3.165.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kms (1.63.0)
|
||||
aws-sdk-kms (1.64.0)
|
||||
aws-sdk-core (~> 3, >= 3.165.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.121.0)
|
||||
|
|
@ -205,7 +205,7 @@ GEM
|
|||
domain_name (~> 0.5)
|
||||
http_parser.rb (0.8.0)
|
||||
httpclient (2.8.3)
|
||||
i18n (1.12.0)
|
||||
i18n (1.13.0)
|
||||
concurrent-ruby (~> 1.0)
|
||||
io-console (0.6.0)
|
||||
irb (1.6.4)
|
||||
|
|
@ -241,7 +241,7 @@ GEM
|
|||
activemodel (~> 7.0)
|
||||
activesupport (~> 7.0)
|
||||
railties (~> 7.0)
|
||||
metasploit-payloads (2.0.126)
|
||||
metasploit-payloads (2.0.127)
|
||||
metasploit_data_models (6.0.2)
|
||||
activerecord (~> 7.0)
|
||||
activesupport (~> 7.0)
|
||||
|
|
@ -254,7 +254,7 @@ GEM
|
|||
webrick
|
||||
metasploit_payloads-mettle (1.0.20)
|
||||
method_source (1.0.0)
|
||||
mini_portile2 (2.8.1)
|
||||
mini_portile2 (2.8.2)
|
||||
minitest (5.18.0)
|
||||
mqtt (0.6.0)
|
||||
msgpack (1.7.0)
|
||||
|
|
@ -291,12 +291,12 @@ GEM
|
|||
hashery (~> 2.0)
|
||||
ruby-rc4
|
||||
ttfunk
|
||||
pg (1.5.1)
|
||||
pg (1.5.3)
|
||||
public_suffix (5.0.1)
|
||||
puma (6.2.2)
|
||||
nio4r (~> 2.0)
|
||||
racc (1.6.2)
|
||||
rack (2.2.6.4)
|
||||
rack (2.2.7)
|
||||
rack-protection (3.0.6)
|
||||
rack
|
||||
rack-test (2.1.0)
|
||||
|
|
@ -330,7 +330,7 @@ GEM
|
|||
rex-core
|
||||
rex-struct2
|
||||
rex-text
|
||||
rex-core (0.1.30)
|
||||
rex-core (0.1.31)
|
||||
rex-encoder (0.1.6)
|
||||
metasm
|
||||
rex-arch
|
||||
|
|
@ -360,7 +360,7 @@ GEM
|
|||
metasm
|
||||
rex-core
|
||||
rex-text
|
||||
rex-socket (0.1.49)
|
||||
rex-socket (0.1.50)
|
||||
rex-core
|
||||
rex-sslscan (0.1.9)
|
||||
rex-core
|
||||
|
|
@ -436,7 +436,7 @@ GEM
|
|||
activesupport (>= 4.2, < 8.0)
|
||||
xmlrpc (0.3.2)
|
||||
webrick
|
||||
zeitwerk (2.6.7)
|
||||
zeitwerk (2.6.8)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
|
@ -445,4 +445,4 @@ DEPENDENCIES
|
|||
metasploit-framework!
|
||||
|
||||
BUNDLED WITH
|
||||
2.4.10
|
||||
2.4.12
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ let
|
|||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "metasploit-framework";
|
||||
version = "6.3.13";
|
||||
version = "6.3.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rapid7";
|
||||
repo = "metasploit-framework";
|
||||
rev = version;
|
||||
sha256 = "sha256-bmp5H7awE8ZaLrPt9UEXeK6haaLzejsIq8jk1bbnv/c=";
|
||||
sha256 = "sha256-4gmzR3Ulz8lDwoSRUhPoOdMXtBio5iTJw4FWbs1znqs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -104,10 +104,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "18ndv604p1p3gkyy0d958jx2wp74d100q6vbc6ak70a7bv93wqsg";
|
||||
sha256 = "0rrfwdzv8xpyjg52xvyabqxvcahk77ag2cfgpxky4w1jsv8khwv9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.752.0";
|
||||
version = "1.759.0";
|
||||
};
|
||||
aws-sdk-core = {
|
||||
groups = ["default"];
|
||||
|
|
@ -124,10 +124,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1zj67jzg81nr3da2mwh27b22ps2waz41fhvc2f2khdfjazi7knqv";
|
||||
sha256 = "06l027yxps5lar958qszjls9whv39wwm22v91898lpj82v2c974r";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.375.0";
|
||||
version = "1.377.0";
|
||||
};
|
||||
aws-sdk-iam = {
|
||||
groups = ["default"];
|
||||
|
|
@ -144,10 +144,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0v87zi28dfmrv7bv91yfldccnpd63n295siirbz7wqv1rajn8n02";
|
||||
sha256 = "1bcm0c9f7xy5qj5f0z3gddqslhb2vzrj9smc39pgqyq4jmn5kpj0";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.63.0";
|
||||
version = "1.64.0";
|
||||
};
|
||||
aws-sdk-s3 = {
|
||||
groups = ["default"];
|
||||
|
|
@ -504,10 +504,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
|
||||
sha256 = "1yk33slipi3i1kydzrrchbi7cgisaxym6pgwlzx7ir8vjk6wl90x";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
};
|
||||
io-console = {
|
||||
groups = ["default"];
|
||||
|
|
@ -624,12 +624,12 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "f58dd240e0c900976bc0609096b3b2e9965f70cb";
|
||||
sha256 = "1xxzwyvdbr68mc43nypkl9ls3bkq2x0zbvdk5rdcc4xhnqgpjskf";
|
||||
rev = "44a9a761be544d3435963076dcbbeb8a4fa0e47f";
|
||||
sha256 = "1awyfg6nwml1qg4j9rm832s1glrrx09m54c4q91wkkr5fm3v62g2";
|
||||
type = "git";
|
||||
url = "https://github.com/rapid7/metasploit-framework";
|
||||
};
|
||||
version = "6.3.13";
|
||||
version = "6.3.14";
|
||||
};
|
||||
metasploit-model = {
|
||||
groups = ["default"];
|
||||
|
|
@ -646,10 +646,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1dncaysx2llgcy5a4vgv93hbp3cmiqa36ch229vmshfr296vfqr8";
|
||||
sha256 = "0zb15r1m4lnqh91cw7nly800xv1b85437hszyfpxj687ldklm9j7";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.0.126";
|
||||
version = "2.0.127";
|
||||
};
|
||||
metasploit_data_models = {
|
||||
groups = ["default"];
|
||||
|
|
@ -686,10 +686,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp";
|
||||
sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.8.1";
|
||||
version = "2.8.2";
|
||||
};
|
||||
minitest = {
|
||||
groups = ["default"];
|
||||
|
|
@ -927,10 +927,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0ihx7icaib5hfr51s44aw63y7g8za3gkqk3diwp75hzkbgjj9hrc";
|
||||
sha256 = "1zcvxmfa8hxkhpp59fhxyxy1arp70f11zi1jh9c7bsdfspifb7kb";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.5.1";
|
||||
version = "1.5.3";
|
||||
};
|
||||
public_suffix = {
|
||||
groups = ["default"];
|
||||
|
|
@ -967,10 +967,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk";
|
||||
sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.6.4";
|
||||
version = "2.2.7";
|
||||
};
|
||||
rack-protection = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1107,10 +1107,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1djg6dk804l55vhnp8wm6phir9wgvb7biv4jiyi78w95cxb1vfk6";
|
||||
sha256 = "0s5fz1fipk2x9grd8rj7n09wfmq78kdhw9fvrmgr9z52zi640xzs";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.30";
|
||||
version = "0.1.31";
|
||||
};
|
||||
rex-encoder = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1217,10 +1217,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0il5kknd85msng18m78a5gqcy918dlwjcvq4abxh3zw170n4g5iv";
|
||||
sha256 = "0wvq9miaqncyjmdphkn87ab5pk3yciplbcgzsp5q322pwmssqb1i";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.49";
|
||||
version = "0.1.50";
|
||||
};
|
||||
rex-sslscan = {
|
||||
groups = ["default"];
|
||||
|
|
@ -1608,9 +1608,9 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1";
|
||||
sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.6.7";
|
||||
version = "2.6.8";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ospd-openvas";
|
||||
version = "22.4.6";
|
||||
version = "22.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "greenbone";
|
||||
repo = "ospd-openvas";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-tgLOO4L/P6USiPf72uZse36r8HhXJnUUT8PfZH4E/jg=";
|
||||
hash = "sha256-1dzpS5Hov+48BYOkPicVk1duaNM5ueXNr7UKg6aPoZA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -18526,7 +18526,7 @@ with pkgs;
|
|||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
||||
lit = callPackage ../development/tools/misc/lit { };
|
||||
lit = with python3Packages; toPythonApplication lit;
|
||||
|
||||
litecli = callPackage ../development/tools/database/litecli { };
|
||||
|
||||
|
|
|
|||
|
|
@ -9,6 +9,8 @@ let
|
|||
inherit ocaml;
|
||||
|
||||
### A ###
|
||||
aches = callPackage ../development/ocaml-modules/aches { };
|
||||
aches-lwt = callPackage ../development/ocaml-modules/aches/lwt.nix { };
|
||||
|
||||
afl-persistent = callPackage ../development/ocaml-modules/afl-persistent { };
|
||||
|
||||
|
|
@ -38,6 +40,8 @@ let
|
|||
|
||||
arp = callPackage ../development/ocaml-modules/arp { };
|
||||
|
||||
asetmap = callPackage ../development/ocaml-modules/asetmap { };
|
||||
|
||||
asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { };
|
||||
|
||||
astring = callPackage ../development/ocaml-modules/astring { };
|
||||
|
|
@ -100,7 +104,7 @@ let
|
|||
|
||||
bls12-381 = callPackage ../development/ocaml-modules/bls12-381 { };
|
||||
bls12-381-gen = callPackage ../development/ocaml-modules/bls12-381/gen.nix { };
|
||||
bls12-381-legacy = callPackage ../development/ocaml-modules/bls12-381/legacy.nix { };
|
||||
bls12-381-hash = callPackage ../development/ocaml-modules/bls12-381-hash { };
|
||||
|
||||
bls12-381-signature = callPackage ../development/ocaml-modules/bls12-381-signature { };
|
||||
|
||||
|
|
@ -845,6 +849,10 @@ let
|
|||
|
||||
linksem = callPackage ../development/ocaml-modules/linksem { };
|
||||
|
||||
linol = callPackage ../development/ocaml-modules/linol { };
|
||||
|
||||
linol-lwt = callPackage ../development/ocaml-modules/linol/lwt.nix { };
|
||||
|
||||
llvm = callPackage ../development/ocaml-modules/llvm {
|
||||
libllvm = pkgs.llvmPackages_10.libllvm;
|
||||
};
|
||||
|
|
@ -1303,6 +1311,8 @@ let
|
|||
inherit (pkgs) coreutils imagemagick;
|
||||
};
|
||||
|
||||
polynomial = callPackage ../development/ocaml-modules/polynomial { };
|
||||
|
||||
portaudio = callPackage ../development/ocaml-modules/portaudio {
|
||||
inherit (pkgs) portaudio;
|
||||
};
|
||||
|
|
@ -1380,6 +1390,8 @@ let
|
|||
|
||||
process = callPackage ../development/ocaml-modules/process { };
|
||||
|
||||
prometheus = callPackage ../development/ocaml-modules/prometheus { };
|
||||
|
||||
progress = callPackage ../development/ocaml-modules/progress { };
|
||||
|
||||
promise_jsoo = callPackage ../development/ocaml-modules/promise_jsoo { };
|
||||
|
|
@ -1452,7 +1464,6 @@ let
|
|||
rfc7748 = callPackage ../development/ocaml-modules/rfc7748 { };
|
||||
|
||||
ringo = callPackage ../development/ocaml-modules/ringo { };
|
||||
ringo-lwt = callPackage ../development/ocaml-modules/ringo/lwt.nix { };
|
||||
|
||||
rock = callPackage ../development/ocaml-modules/rock { };
|
||||
|
||||
|
|
|
|||
|
|
@ -260,6 +260,7 @@ mapAliases ({
|
|||
ruamel_base = ruamel-base; # added 2021-11-01
|
||||
ruamel_yaml = ruamel-yaml; # added 2021-11-01
|
||||
ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01
|
||||
runway-python = throw "SDK has been deprecated and was archived by upstream"; # added 2023-05-03
|
||||
sapi-python-client = kbcstorage; # added 2022-04-20
|
||||
scikitlearn = scikit-learn; # added 2021-07-21
|
||||
selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10
|
||||
|
|
|
|||
|
|
@ -2997,14 +2997,24 @@ self: super: with self; {
|
|||
|
||||
durus = callPackage ../development/python-modules/durus { };
|
||||
|
||||
dvc-azure = callPackage ../development/python-modules/dvc-azure { };
|
||||
|
||||
dvc-data = callPackage ../development/python-modules/dvc-data { };
|
||||
|
||||
dvc-gs = callPackage ../development/python-modules/dvc-gs { };
|
||||
|
||||
dvc-http = callPackage ../development/python-modules/dvc-http { };
|
||||
|
||||
dvc-objects = callPackage ../development/python-modules/dvc-objects { };
|
||||
|
||||
dvc-render = callPackage ../development/python-modules/dvc-render { };
|
||||
|
||||
dvc-s3 = callPackage ../development/python-modules/dvc-s3 { };
|
||||
|
||||
dvc-ssh = callPackage ../development/python-modules/dvc-ssh { };
|
||||
|
||||
dvc-studio-client = callPackage ../development/python-modules/dvc-studio-client { };
|
||||
|
||||
dvc-task = callPackage ../development/python-modules/dvc-task { };
|
||||
|
||||
dvclive = callPackage ../development/python-modules/dvclive { };
|
||||
|
|
@ -4951,6 +4961,8 @@ self: super: with self; {
|
|||
|
||||
iteration-utilities = callPackage ../development/python-modules/iteration-utilities { };
|
||||
|
||||
iterative-telemetry = callPackage ../development/python-modules/iterative-telemetry { };
|
||||
|
||||
iterm2 = callPackage ../development/python-modules/iterm2 { };
|
||||
|
||||
itsdangerous = callPackage ../development/python-modules/itsdangerous { };
|
||||
|
|
@ -5704,6 +5716,8 @@ self: super: with self; {
|
|||
python3 = python;
|
||||
});
|
||||
|
||||
lit = callPackage ../development/python-modules/lit { };
|
||||
|
||||
littleutils = callPackage ../development/python-modules/littleutils { };
|
||||
|
||||
livelossplot = callPackage ../development/python-modules/livelossplot { };
|
||||
|
|
@ -6884,6 +6898,8 @@ self: super: with self; {
|
|||
|
||||
openai-triton = callPackage ../development/python-modules/openai-triton { llvmPackages = pkgs.llvmPackages_rocm; };
|
||||
|
||||
openai-triton-bin = callPackage ../development/python-modules/openai-triton/bin.nix { };
|
||||
|
||||
openai-whisper = callPackage ../development/python-modules/openai-whisper {
|
||||
cudaSupport = pkgs.config.cudaSupport or false;
|
||||
};
|
||||
|
|
@ -10564,8 +10580,6 @@ self: super: with self; {
|
|||
|
||||
ruffus = callPackage ../development/python-modules/ruffus { };
|
||||
|
||||
runway-python = callPackage ../development/python-modules/runway-python { };
|
||||
|
||||
ruuvitag-ble = callPackage ../development/python-modules/ruuvitag-ble { };
|
||||
|
||||
ruyaml = callPackage ../development/python-modules/ruyaml { };
|
||||
|
|
@ -11980,7 +11994,9 @@ self: super: with self; {
|
|||
inherit (pkgs.llvmPackages_rocm) openmp;
|
||||
};
|
||||
|
||||
torch-bin = callPackage ../development/python-modules/torch/bin.nix { };
|
||||
torch-bin = callPackage ../development/python-modules/torch/bin.nix {
|
||||
openai-triton = self.openai-triton-bin;
|
||||
};
|
||||
|
||||
torchWithCuda = self.torch.override {
|
||||
magma = pkgs.magma-cuda;
|
||||
|
|
|
|||
Loading…
Reference in a new issue