Merge master into staging-next
This commit is contained in:
commit
4b24ae6c36
@ -6700,6 +6700,16 @@
|
||||
githubId = 9959940;
|
||||
name = "Andreas Fehn";
|
||||
};
|
||||
felbinger = {
|
||||
name = "Nico Felbinger";
|
||||
email = "nico@felbinger.eu";
|
||||
matrix = "@nico:felbinger.eu";
|
||||
github = "felbinger";
|
||||
githubId = 26925347;
|
||||
keys = [{
|
||||
fingerprint = "0797 D238 9769 CA1E 57B7 2ED9 2BA7 8116 87C9 0DE4";
|
||||
}];
|
||||
};
|
||||
felipeqq2 = {
|
||||
name = "Felipe Silva";
|
||||
email = "nixpkgs@felipeqq2.rocks";
|
||||
@ -12926,6 +12936,16 @@
|
||||
githubId = 11810057;
|
||||
name = "Matt Snider";
|
||||
};
|
||||
MattSturgeon = {
|
||||
email = "matt@sturgeon.me.uk";
|
||||
github = "MattSturgeon";
|
||||
githubId = 5046562;
|
||||
matrix = "@mattsturg:matrix.org";
|
||||
name = "Matt Sturgeon";
|
||||
keys = [{
|
||||
fingerprint = "7082 22EA 1808 E39A 83AC 8B18 4F91 844C ED1A 8299";
|
||||
}];
|
||||
};
|
||||
matusf = {
|
||||
email = "matus.ferech@gmail.com";
|
||||
github = "matusf";
|
||||
@ -16976,6 +16996,12 @@
|
||||
githubId = 2141853;
|
||||
name = "Bang Lee";
|
||||
};
|
||||
qwqawawow = {
|
||||
email = "eihqnh@outlook.com";
|
||||
github = "qwqawawow";
|
||||
githubId = 40905037;
|
||||
name = "qwqawawow";
|
||||
};
|
||||
qyliss = {
|
||||
email = "hi@alyssa.is";
|
||||
github = "alyssais";
|
||||
|
@ -76,6 +76,7 @@ lualdap,,,,,,aanderse
|
||||
lualogging,,,,,,
|
||||
luaossl,,,,,5.1,
|
||||
luaposix,,,,34.1.1-1,,vyp lblasc
|
||||
luaprompt,,,,,,Freed-Wu
|
||||
luarepl,,,,,,
|
||||
luarocks,,,,,,mrcjkb teto
|
||||
luarocks-build-rust-mlua,,,,,,mrcjkb
|
||||
|
|
@ -275,7 +275,7 @@ in
|
||||
softdep nvidia post: nvidia-uvm
|
||||
'';
|
||||
};
|
||||
systemd.tmpfiles.rules = lib.optional config.virtualisation.docker.enableNvidia "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin";
|
||||
systemd.tmpfiles.rules = lib.mkIf config.virtualisation.docker.enableNvidia "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin";
|
||||
services.udev.extraRules = ''
|
||||
# Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
|
||||
KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c 195 255'"
|
||||
@ -290,6 +290,7 @@ in
|
||||
};
|
||||
environment.systemPackages = [ nvidia_x11.bin ];
|
||||
})
|
||||
|
||||
# X11
|
||||
(lib.mkIf nvidiaEnabled {
|
||||
assertions = [
|
||||
@ -455,6 +456,7 @@ in
|
||||
extraPackages = [ pkgs.nvidia-vaapi-driver ];
|
||||
extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ];
|
||||
};
|
||||
|
||||
environment.systemPackages =
|
||||
lib.optional cfg.nvidiaSettings nvidia_x11.settings
|
||||
++ lib.optional cfg.nvidiaPersistenced nvidia_x11.persistenced
|
||||
@ -527,16 +529,12 @@ in
|
||||
};
|
||||
})
|
||||
];
|
||||
|
||||
services.acpid.enable = true;
|
||||
|
||||
services.dbus.packages = lib.optional cfg.dynamicBoost.enable nvidia_x11.bin;
|
||||
|
||||
hardware.firmware =
|
||||
let
|
||||
isOpen = cfg.open;
|
||||
isNewUnfree = lib.versionAtLeast nvidia_x11.version "555";
|
||||
in
|
||||
lib.optional (isOpen || isNewUnfree) nvidia_x11.firmware;
|
||||
hardware.firmware = lib.optional (cfg.open || lib.versionAtLeast nvidia_x11.version "555") nvidia_x11.firmware;
|
||||
|
||||
systemd.tmpfiles.rules =
|
||||
[
|
||||
|
@ -125,6 +125,7 @@ in {
|
||||
options = {
|
||||
services.mqtt2influxdb = {
|
||||
enable = mkEnableOption "BigClown MQTT to InfluxDB bridge.";
|
||||
package = mkPackageOption pkgs ["python3Packages" "mqtt2influxdb"] {};
|
||||
environmentFiles = mkOption {
|
||||
type = types.listOf types.path;
|
||||
default = [];
|
||||
@ -245,7 +246,7 @@ in {
|
||||
'';
|
||||
serviceConfig = {
|
||||
EnvironmentFile = cfg.environmentFiles;
|
||||
ExecStart = "${cfg.package}/bin/mqtt2influxdb -dc ${finalConfig}";
|
||||
ExecStart = "${lib.getExe cfg.package} -dc ${finalConfig}";
|
||||
RuntimeDirectory = "mqtt2influxdb";
|
||||
};
|
||||
};
|
||||
|
@ -94,6 +94,7 @@ in {
|
||||
systemd.services.loki = {
|
||||
description = "Loki Service Daemon";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
serviceConfig = let
|
||||
conf = if cfg.configFile == null
|
||||
|
@ -167,8 +167,13 @@ in {
|
||||
preStart = optionalString (settings != null) ''
|
||||
if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \
|
||||
&& [ "${toString cfg.mutableSettings}" = "1" ]; then
|
||||
# First run a schema_version update on the existing configuration
|
||||
# This ensures that both the new config and the existing one have the same schema_version
|
||||
# Note: --check-config has the side effect of modifying the file at rest!
|
||||
${lib.getExe cfg.package} -c "$STATE_DIRECTORY/AdGuardHome.yaml" --check-config
|
||||
|
||||
# Writing directly to AdGuardHome.yaml results in empty file
|
||||
${pkgs.yaml-merge}/bin/yaml-merge "$STATE_DIRECTORY/AdGuardHome.yaml" "${configFile}" > "$STATE_DIRECTORY/AdGuardHome.yaml.tmp"
|
||||
${lib.getExe pkgs.yaml-merge} "$STATE_DIRECTORY/AdGuardHome.yaml" "${configFile}" > "$STATE_DIRECTORY/AdGuardHome.yaml.tmp"
|
||||
mv "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" "$STATE_DIRECTORY/AdGuardHome.yaml"
|
||||
else
|
||||
cp --force "${configFile}" "$STATE_DIRECTORY/AdGuardHome.yaml"
|
||||
@ -178,7 +183,7 @@ in {
|
||||
|
||||
serviceConfig = {
|
||||
DynamicUser = true;
|
||||
ExecStart = "${cfg.package}/bin/adguardhome ${args}";
|
||||
ExecStart = "${lib.getExe cfg.package} ${args}";
|
||||
AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]
|
||||
++ optionals cfg.allowDHCP [ "CAP_NET_RAW" ];
|
||||
Restart = "always";
|
||||
|
@ -25,6 +25,7 @@ in
|
||||
webui = lib.mkOption {
|
||||
default = null;
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
example = lib.literalExpression "pkgs.metacubexd";
|
||||
description = ''
|
||||
Local web interface to use.
|
||||
|
||||
|
@ -12,18 +12,18 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "youtube-music";
|
||||
version = "3.3.6";
|
||||
version = "3.3.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "th-ch";
|
||||
repo = "youtube-music";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-nxpctEG4XoxW6jOAxGdgTEYr6YnhFRR8+5HUQLxRJB0=";
|
||||
hash = "sha256-kBGMp58086NQ77x1YGS5NewWfiDaXHOEbyflHPtdfIs=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-8oeloQYiwUy+GDG4R+XtiynT+8Fad4WYFWTO1KANZKQ=";
|
||||
hash = "sha256-t5omzz6y8lVFGAuhtc+HF5gwu4Ntt/dxml+nWysEpVs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper python3 nodejs pnpm.configHook ]
|
||||
@ -87,8 +87,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
meta = with lib; {
|
||||
description = "Electron wrapper around YouTube Music";
|
||||
homepage = "https://th-ch.github.io/youtube-music/";
|
||||
changelog = "https://github.com/th-ch/youtube-music/blob/master/changelog.md#${lib.replaceStrings ["."] [""] finalAttrs.src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.aacebedo ];
|
||||
maintainers = with maintainers; [ aacebedo SuperSandro2000 ];
|
||||
mainProgram = "youtube-music";
|
||||
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||
};
|
||||
|
@ -505,8 +505,8 @@ let
|
||||
mktplcRef = {
|
||||
name = "vscode-bazel";
|
||||
publisher = "bazelbuild";
|
||||
version = "0.7.0";
|
||||
sha256 = "05wvih09184bsp4rv2m55z0sasra2qrvch5m3bkbrjq7rcqgibgx";
|
||||
version = "0.10.0";
|
||||
sha256 = "sha256-8SUOzsUmfgt9fAy037qLVNrGJPvTnIeMNz2tbN5psbs=";
|
||||
};
|
||||
meta = {
|
||||
description = "Bazel support for Visual Studio Code";
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "talosctl";
|
||||
version = "1.7.2";
|
||||
version = "1.7.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siderolabs";
|
||||
repo = "talos";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hYfh/faOQtN1MTnaCHsdogzBU3Xf6BY4apK+VuVCh6E=";
|
||||
hash = "sha256-TVRWcgBt6MmHOh3LYSjJtp5qf/+ar+LWDGfHKQhDFZ8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-5Dxtwu+PM0TbznIPTl8QxgOvNsQZUDMGY2kf+PSfCqo=";
|
||||
vendorHash = "sha256-30fMLczb4+BVSxZSbhQ2S1MrQ2+Ykyqf+Dio8n0LGE0=";
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
|
@ -16,17 +16,17 @@
|
||||
}:
|
||||
|
||||
let
|
||||
rev = 3464;
|
||||
rev = 3546;
|
||||
jre' = if preferZulu then zulu else jre;
|
||||
gtk' = if preferGtk3 then gtk3 else gtk2;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "davmail";
|
||||
version = "6.2.0";
|
||||
version = "6.2.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-${toString rev}.zip";
|
||||
sha256 = "sha256-FatB0t/BhZRMofYE0KD5LDYGjDQ8hriIszKJP8qNvhw=";
|
||||
hash = "sha256-45paGy6SfUFXK6vY8L4tHFYiio1/5ah9vTyGImdgwHI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dayon";
|
||||
version = "14.0.1";
|
||||
version = "14.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "RetGal";
|
||||
repo = "dayon";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-7XrgPrYKhaUvmXxiZLsduzrbyZRHjPSo+fg4BvlatHQ=";
|
||||
hash = "sha256-nRNqubR44ydZwwuQG3q6TRm+MHTRgRbeLI9dsk83wq4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -25,14 +25,14 @@ let
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
version = "16.2.15";
|
||||
version = "16.2.17";
|
||||
pname = "jmol";
|
||||
|
||||
src = let
|
||||
baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
|
||||
in fetchurl {
|
||||
url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
|
||||
hash = "sha256-zPHh5IFdttliPc0SCgkM/3UQmS4eT2rfi5HqpFjY5hA=";
|
||||
hash = "sha256-1iBLLfaoztbphhrG3NVWH+PVSbCZd+HQqvCYF3H9S/E=";
|
||||
};
|
||||
|
||||
patchPhase = ''
|
||||
|
@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "hypnotix";
|
||||
version = "4.3";
|
||||
version = "4.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = "hypnotix";
|
||||
rev = version;
|
||||
hash = "sha256-nmldOziye+bSi8CA9TL0f3EKEKTeXRk3HFzf4ksE9oE=";
|
||||
hash = "sha256-SGKa3yo3iEDAjsvfa6dBfM7sAnBVr0pB6zLKQb6e4Ys=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
@ -2,13 +2,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "apl386";
|
||||
version = "unstable-2022-03-07";
|
||||
version = "0-unstable-2024-01-10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abrudz";
|
||||
repo = "APL386";
|
||||
rev = "6332c9dbb588946a0e8c9d7984dd0c003eeea266";
|
||||
hash = "sha256-oHk4e7NRgAjGtZzQmZToYz7wCZETaj7/yRwZMeeYF2M=";
|
||||
rev = "43ebc6349506b0e7ab5c49f6b08f8afe66c4d9c5";
|
||||
hash = "sha256-MLHSYHFyI9eKdrE/yM7u4vu4Dz6riEk7XQTUuAXPfzM=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bngblaster";
|
||||
version = "0.8.51";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rtbrick";
|
||||
repo = "bngblaster";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-7AwLedYPOZAKQpWWuEasI9ytN66MZYKFO9SgXi7NjIo=";
|
||||
hash = "sha256-ugfimJmyAHxgLypgEwzOK0VLmIYod5YzW7oO/omcl1I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
34
pkgs/by-name/do/docopts/package.nix
Normal file
34
pkgs/by-name/do/docopts/package.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "docopts";
|
||||
version = "0.6.4-with-no-mangle-double-dash";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docopt";
|
||||
repo = "docopts";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-GIBrJ5qexeJ6ul5ek9LJZC4J3cNExsTrnxdzRCfoqn8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Migrate project to Go modules.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/docopt/docopts/pull/74/commits/2c516165e72b35516a64c4529dbc938c0aaa9442.patch";
|
||||
sha256 = "sha256-Tp05B3tmctnSYIQzCxCc/fhcAWWuEz2ifu/CQZt0XPU=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorHash = "sha256-+pMgaHB69itbQ+BDM7/oaJg3HrT1UN+joJL7BO/2vxE=";
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/docopt/docopts";
|
||||
description = "Shell interpreter for docopt, the command-line interface description language";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.confus ];
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
2636
pkgs/by-name/ev/evebox/Cargo.lock
generated
Normal file
2636
pkgs/by-name/ev/evebox/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
34
pkgs/by-name/ev/evebox/package.nix
Normal file
34
pkgs/by-name/ev/evebox/package.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "evebox";
|
||||
version = "0.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jasonish";
|
||||
repo = "evebox";
|
||||
rev = version;
|
||||
hash = "sha256-djL5cdudJNPAWLMQPS2Dkcc9H/gouOuu8evcBDdY9wA=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"libsqlite3-sys-0.25.2" = "sha256-+c7ong6ca4WkEHl7ynCNn3WW68jF3pSYbllRsaNFGLc=";
|
||||
"suricatax-rule-parser-0.1.0" = "sha256-upWgOKSAuj0pYGTeYKANzwutoF/m4AQ7MkzGYXmPbEo=";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Web Based Event Viewer (GUI) for Suricata EVE Events in Elastic Search";
|
||||
homepage = "https://evebox.org/";
|
||||
changelog = "https://github.com/jasonish/evebox/releases/tag/${src.rev}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ felbinger ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
28
pkgs/by-name/fj/fjo/package.nix
Normal file
28
pkgs/by-name/fj/fjo/package.nix
Normal file
@ -0,0 +1,28 @@
|
||||
{ lib, stdenv, fetchFromGitea, rustPlatform, openssl, pkg-config }:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fjo";
|
||||
version = "0.3.5";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "VoiDD";
|
||||
repo = "fjo";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KjH78yqfZoN24TBYyFZuxf7z9poRov0uFYQ8+eq9p/o=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-2G/TdajAqKiSoTL5FnukfS/eHkTNaGOj9EFpKsdb02k=";
|
||||
|
||||
buildInputs = [ openssl ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
meta = {
|
||||
description = "CLI Tool for Codeberg similar to gh and glab";
|
||||
homepage = "https://codeberg.org/VoiDD/fjo";
|
||||
license = lib.licenses.agpl3Only;
|
||||
mainProgram = "berg";
|
||||
maintainers = with lib.maintainers; [ ehmry ];
|
||||
broken = stdenv.isDarwin;
|
||||
};
|
||||
}
|
@ -8,14 +8,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "icloudpd";
|
||||
version = "1.19.0";
|
||||
version = "1.19.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "icloud-photos-downloader";
|
||||
repo = "icloud_photos_downloader";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-VUa/VWLyGSuI+DRdrwXfvakB9/QD6qJik/XAfGtUubU=";
|
||||
hash = "sha256-0DbYbBs/8irj/55+WHyNj+iLWh7KqxReVWfmsWz43Xo=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
@ -43,13 +43,13 @@ let
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "koboldcpp";
|
||||
version = "1.66";
|
||||
version = "1.67";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LostRuins";
|
||||
repo = "koboldcpp";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
sha256 = "sha256-3Gsbfxh3K3xa6Ofs9M9cfKWg0sxrolL8Ivx40iqvlA8=";
|
||||
sha256 = "sha256-FqByklvPPwTGPM1r10Ktv3uMnyyiqZ8z/h0m28wVv68=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
@ -5,13 +5,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "krbjack";
|
||||
version = "0-unstable-2024-02-08";
|
||||
version = "1.2.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "almandin";
|
||||
repo = "krbjack";
|
||||
rev = "0abaf7039c11fe735120c44a9420a311b42f7551";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-rvK0I8WlXqJtau9f+6ximfzYCjX21dPIyDN56IMI0gE=";
|
||||
};
|
||||
|
||||
@ -19,12 +19,13 @@ python3.pkgs.buildPythonApplication rec {
|
||||
"impacket"
|
||||
];
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
build-system = with python3.pkgs; [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
colorama
|
||||
dnspython
|
||||
impacket
|
||||
@ -41,6 +42,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "Kerberos AP-REQ hijacking tool with DNS unsecure updates abuse";
|
||||
homepage = "https://github.com/almandin/krbjack";
|
||||
changelog = "https://github.com/almandin/krbjack/releases/tag/${version}}";
|
||||
license = licenses.beerware;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
mainProgram = "krbjack";
|
||||
|
@ -9,6 +9,7 @@
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "mcdreforged";
|
||||
version = "2.12.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Fallen-Breath";
|
||||
@ -17,8 +18,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
sha256 = "sha256-MLub++mkkB/jshpHJXtqgIhs7Gcb4jHUyHqGE65S8A8=";
|
||||
};
|
||||
|
||||
disabled = python3.pkgs.pythonOlder "3.8";
|
||||
|
||||
build-system = [ python3.pkgs.setuptools ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
|
51
pkgs/by-name/me/memorado/package.nix
Normal file
51
pkgs/by-name/me/memorado/package.nix
Normal file
@ -0,0 +1,51 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, meson
|
||||
, ninja
|
||||
, gtk4
|
||||
, pkg-config
|
||||
, libadwaita
|
||||
, blueprint-compiler
|
||||
, python3
|
||||
, desktop-file-utils
|
||||
, gobject-introspection
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "memorado";
|
||||
version = "0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wbernard";
|
||||
repo = "Memorado";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-bArcYUHSfpjYsySGZco4fmb6bKRFtG6efhzNSqUROX0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
blueprint-compiler
|
||||
desktop-file-utils
|
||||
gobject-introspection
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk4
|
||||
libadwaita
|
||||
(python3.withPackages (ps: with ps; [
|
||||
pygobject3
|
||||
]))
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple and clean flashcard memorizing app";
|
||||
homepage = "https://github.com/wbernard/Memorado";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
};
|
||||
}
|
55
pkgs/by-name/me/metacubexd/package.nix
Normal file
55
pkgs/by-name/me/metacubexd/package.nix
Normal file
@ -0,0 +1,55 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
nodejs,
|
||||
pnpm,
|
||||
stdenv,
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "metacubexd";
|
||||
version = "1.140.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MetaCubeX";
|
||||
repo = "metacubexd";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-OVLG+MHgwWTorPuBTHsHUAY1FSN91j7xWgRDJ7FiO7E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pnpm.configHook
|
||||
nodejs
|
||||
];
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-24PkWT5UZJwMtL3y8qdf3XFuf3v5PjiP9XESbw3oppY=";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pnpm build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r ./dist $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Clash.Meta Dashboard, The Official One, XD";
|
||||
homepage = "https://github.com/MetaCubeX/metacubexd";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ Guanran928 ];
|
||||
};
|
||||
})
|
@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mold";
|
||||
version = "2.31.0";
|
||||
version = "2.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rui314";
|
||||
repo = "mold";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-CUIk1YACM+eCuxyUqyKaVBF00Ybxr23D+FQuXv45Qrs=";
|
||||
hash = "sha256-0cidxsr7mZLtEMSXc+ZFH9l3pXNi4Fyv27XDks+th/I=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -113,7 +113,10 @@ buildDotnetModule rec {
|
||||
homepage = "https://github.com/Nexus-Mods/NexusMods.App";
|
||||
changelog = "https://github.com/Nexus-Mods/NexusMods.App/releases/tag/${src.rev}";
|
||||
license = [ lib.licenses.gpl3Plus ];
|
||||
maintainers = [ lib.maintainers.l0b0 ];
|
||||
maintainers = with lib.maintainers; [
|
||||
l0b0
|
||||
MattSturgeon
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
|
@ -24,7 +24,7 @@ buildGoModule rec {
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cli $out/bin/${meta.mainProgram}
|
||||
mv $out/bin/cli $out/bin/nhost
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
@ -12,14 +12,14 @@ rustPlatform.buildRustPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "psastras";
|
||||
repo = "sarif-rs";
|
||||
rev = "${pname}-v${version}";
|
||||
rev = "shellcheck-sarif-v${version}";
|
||||
hash = "sha256-EzWzDeIeSJ11CVcVyAhMjYQJcKHnieRrFkULc5eXAno=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-JuE/Z0qrS/3BRlb0jTGDfV0TYk74Q75X1wv/IERxqeQ=";
|
||||
cargoBuildFlags = [
|
||||
"--package"
|
||||
pname
|
||||
"shellcheck-sarif"
|
||||
];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
||||
|
34
pkgs/by-name/st/starpls-bin/package.nix
Normal file
34
pkgs/by-name/st/starpls-bin/package.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib, stdenv, fetchurl }:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "starpls-bin";
|
||||
version = "0.1.14";
|
||||
|
||||
src = {
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://github.com/withered-magic/starpls/releases/download/v${finalAttrs.version}/starpls-linux-amd64";
|
||||
hash = "sha256-PYU+Jv3uaJqJKw6zSNOPl+NlIQgfm38cOrRqTdNXY+8=";
|
||||
};
|
||||
aarch64-darwin = fetchurl {
|
||||
url = "https://github.com/withered-magic/starpls/releases/download/v${finalAttrs.version}/starpls-darwin-arm64";
|
||||
hash = "sha256-9d1ybebguEUJu2PvMcToQEd8M4ajRrQUvBZqS6o0sbw=";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
dontUnpack = true;
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
|
||||
installPhase = ''
|
||||
install -D $src $out/bin/starpls
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/withered-magic/starpls";
|
||||
description = "A language server for Starlark";
|
||||
license = licenses.asl20;
|
||||
platforms = [ "aarch64-darwin" "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ aaronjheng ];
|
||||
mainProgram = "starpls";
|
||||
};
|
||||
})
|
@ -7,22 +7,26 @@
|
||||
, ninja
|
||||
, vala
|
||||
, desktop-file-utils
|
||||
, gala
|
||||
, gsettings-desktop-schemas
|
||||
, gtk4
|
||||
, glib
|
||||
, gnome-settings-daemon
|
||||
, granite7
|
||||
, libgee
|
||||
, mutter
|
||||
, wrapGAppsHook4
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "elementary-shortcut-overlay";
|
||||
version = "2.0.1";
|
||||
version = "8.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "shortcut-overlay";
|
||||
rev = version;
|
||||
sha256 = "sha256-YVeCO7mZmf+FEY4d8tvC76lW/HkOwQ6kw7nvmzAFEtw=";
|
||||
sha256 = "sha256-HqF2eSNwAzgzwyfNQIeumaGkPYiSc+2OfaD3JRQp4/4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -35,10 +39,14 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gala # org.pantheon.desktop.gala.keybindings
|
||||
gsettings-desktop-schemas # org.gnome.desktop.wm.keybindings
|
||||
glib
|
||||
gnome-settings-daemon # org.gnome.settings-daemon.plugins.media-keys
|
||||
granite7
|
||||
gtk4
|
||||
libgee
|
||||
mutter # org.gnome.mutter.keybindings
|
||||
];
|
||||
|
||||
passthru = {
|
||||
|
@ -9,6 +9,8 @@ let
|
||||
repo = "analysis";
|
||||
owner = "math-comp";
|
||||
|
||||
release."1.2.0".sha256 = "sha256-w6BivDM4dF4Iv4rUTy++2feweNtMAJxgGExPfYGhXxo=";
|
||||
release."1.1.0".sha256 = "sha256-wl4kZf4mh9zbFfGcqaFEgWRyp0Bj511F505mYodpS6o=";
|
||||
release."1.0.0".sha256 = "sha256-KiXyaWB4zQ3NuXadq4BSWfoN1cIo1xiLVSN6nW03tC4=";
|
||||
release."0.7.0".sha256 = "sha256-JwkyetXrFsFHqz8KY3QBpHsrkhmEFnrCGuKztcoen60=";
|
||||
release."0.6.7".sha256 = "sha256-3i2PBMEwihwgwUmnS0cmrZ8s+aLPFVq/vo0aXMUaUyA=";
|
||||
@ -29,7 +31,7 @@ let
|
||||
release."0.2.3".sha256 = "0p9mr8g1qma6h10qf7014dv98ln90dfkwn76ynagpww7qap8s966";
|
||||
|
||||
defaultVersion = with versions; lib.switch [ coq.version mathcomp.version ] [
|
||||
{ cases = [ (range "8.17" "8.19") (range "2.0.0" "2.2.0") ]; out = "1.0.0"; }
|
||||
{ cases = [ (range "8.17" "8.19") (range "2.0.0" "2.2.0") ]; out = "1.1.0"; }
|
||||
{ cases = [ (range "8.17" "8.19") (range "1.17.0" "1.19.0") ]; out = "0.7.0"; }
|
||||
{ cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.7"; }
|
||||
{ cases = [ (range "8.17" "8.18") (range "1.15.0" "1.18.0") ]; out = "0.6.6"; }
|
||||
|
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "expected-lite";
|
||||
version = "0.7.0";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "martinmoene";
|
||||
repo = "expected-lite";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-8ILoBK36NT7+4k3SqwgIghFSVmNHHkhxgTFvrxxXTPk=";
|
||||
hash = "sha256-8Lf+R7wC7f2YliXqhR6pwVVSLZ6qheu7YOV5jHc0Cjc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
|
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
|
||||
description = "Linkable library implementation of Git that you can use in your application";
|
||||
mainProgram = "git2";
|
||||
homepage = "https://libgit2.org/";
|
||||
license = licenses.gpl2Plus;
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ SuperSandro2000 ];
|
||||
};
|
||||
|
@ -1867,6 +1867,31 @@ buildLuarocksPackage {
|
||||
};
|
||||
}) {};
|
||||
|
||||
luaprompt = callPackage({ argparse, buildLuarocksPackage, fetchFromGitHub, fetchurl, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "luaprompt";
|
||||
version = "0.8-1";
|
||||
knownRockspec = (fetchurl {
|
||||
url = "mirror://luarocks/luaprompt-0.8-1.rockspec";
|
||||
sha256 = "17v7yqkvm4rxszqvqk3f6a6vqysh80p18l1ryif79bc7ic948br4";
|
||||
}).outPath;
|
||||
src = fetchFromGitHub {
|
||||
owner = "dpapavas";
|
||||
repo = "luaprompt";
|
||||
rev = "v0.8";
|
||||
hash = "sha256-GdI5sj7FBeb9q23oxVOzT+yVhMYTnggaN8Xt/z/2xZo=";
|
||||
};
|
||||
|
||||
disabled = luaOlder "5.1";
|
||||
propagatedBuildInputs = [ argparse ];
|
||||
|
||||
meta = {
|
||||
homepage = "https://github.com/dpapavas/luaprompt";
|
||||
description = "A Lua command prompt with pretty-printing and auto-completion";
|
||||
license.fullName = "MIT/X11";
|
||||
};
|
||||
}) {};
|
||||
|
||||
luaposix = callPackage({ bit32, buildLuarocksPackage, fetchurl, fetchzip, luaAtLeast, luaOlder }:
|
||||
buildLuarocksPackage {
|
||||
pname = "luaposix";
|
||||
|
@ -409,6 +409,12 @@ in
|
||||
];
|
||||
});
|
||||
|
||||
luaprompt = prev.luaprompt.overrideAttrs (_: {
|
||||
externalDeps = [
|
||||
{ name = "READLINE"; dep = readline; }
|
||||
{ name = "HISTORY"; dep = readline; }
|
||||
];
|
||||
});
|
||||
|
||||
# As a nix user, use this derivation instead of "luarocks_bootstrap"
|
||||
luarocks = prev.luarocks.overrideAttrs (oa: {
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "jc";
|
||||
version = "1.25.2";
|
||||
version = "1.25.3";
|
||||
format = "setuptools";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "kellyjonbrazil";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-SDZ92m4TVH5/ldGkVZspzIrR0G1vHOv1OvAOSaWYkZ0=";
|
||||
hash = "sha256-yp5533CzqJ++G6nHip1281ZkB4JyfLb3inR9BwDkxSs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycaption";
|
||||
version = "2.2.10";
|
||||
version = "2.2.11";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "pbs";
|
||||
repo = "pycaption";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-U4ooAKs0vy6jQdUake2R0RKs9lz+DNvS1f3/c2Mck5k=";
|
||||
hash = "sha256-ae3aldx/8nRnqut7py2KmqETQuAUt2wpDwFA/30UiGg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
|
33
pkgs/development/python-modules/pycycling/default.nix
Normal file
33
pkgs/development/python-modules/pycycling/default.nix
Normal file
@ -0,0 +1,33 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
setuptools,
|
||||
bleak,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pycycling";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-yi3ZcyhhOtHp46MK0R15/dic+b1oYjy4tFVRH3ssbE8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bleak
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ pname ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Package for interacting with Bluetooth Low Energy (BLE) compatible bike trainers, power meters, radars and heart rate monitors";
|
||||
homepage = "https://github.com/zacharyedwardbull/pycycling";
|
||||
changelog = "https://github.com/zacharyedwardbull/pycycling/releases/tag/${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ viraptor ];
|
||||
};
|
||||
}
|
@ -0,0 +1,36 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
poetry-core,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "terminaltexteffects";
|
||||
version = "0.10.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
# no tests on pypi, no tags on github
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-NyWPfdgLeXAxKPJOzB7j4aT+zjrURN59CGcv0Vt99y0=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
pythonImportsCheck = [ "terminaltexteffects" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A collection of visual effects that can be applied to terminal piped stdin text";
|
||||
homepage = "https://chrisbuilds.github.io/terminaltexteffects";
|
||||
changelog = "https://chrisbuilds.github.io/terminaltexteffects/changeblog/";
|
||||
license = licenses.mit;
|
||||
platforms = with platforms; unix;
|
||||
maintainers = with maintainers; [ qwqawawow ];
|
||||
mainProgram = "tte";
|
||||
};
|
||||
}
|
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tesla-fleet-api";
|
||||
version = "0.6.0";
|
||||
version = "0.6.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "Teslemetry";
|
||||
repo = "python-tesla-fleet-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-/8XtIUjbz4+d0O1+6fqlRsG8aqhCLSWnpUSq9QFfiAQ=";
|
||||
hash = "sha256-dCkk0ikg8KvB7us4mEcUQ1q3JIRoNbSE6STVZXRBErE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
@ -27,7 +27,7 @@ let
|
||||
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
|
||||
srcs = import ./binary-hashes.nix version;
|
||||
unsupported = throw "Unsupported system";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit version;
|
||||
@ -75,7 +75,7 @@ buildPythonPackage {
|
||||
"libcuda.so.1"
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
future
|
||||
numpy
|
||||
pyyaml
|
||||
@ -102,7 +102,7 @@ buildPythonPackage {
|
||||
|
||||
pythonImportsCheck = [ "torch" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration";
|
||||
homepage = "https://pytorch.org/";
|
||||
changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}";
|
||||
@ -111,18 +111,18 @@ buildPythonPackage {
|
||||
# https://www.intel.com/content/www/us/en/developer/articles/license/onemkl-license-faq.html
|
||||
# torch's license is BSD3.
|
||||
# torch-bin used to vendor CUDA. It still links against CUDA and MKL.
|
||||
license = with licenses; [
|
||||
license = with lib.licenses; [
|
||||
bsd3
|
||||
issl
|
||||
unfreeRedistributable
|
||||
];
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
platforms = [
|
||||
"aarch64-darwin"
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
hydraPlatforms = [ ]; # output size 3.2G on 1.11.0
|
||||
maintainers = with maintainers; [ junjihashimoto ];
|
||||
maintainers = with lib.maintainers; [ junjihashimoto ];
|
||||
};
|
||||
}
|
||||
|
@ -7,81 +7,81 @@
|
||||
|
||||
version:
|
||||
builtins.getAttr version {
|
||||
"2.3.0" = {
|
||||
"2.3.1" = {
|
||||
x86_64-linux-38 = {
|
||||
name = "torch-2.3.0-cp38-cp38-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torch-2.3.0%2Bcu121-cp38-cp38-linux_x86_64.whl";
|
||||
hash = "sha256-lZi5WfVk7j6+NgOwugHSQXTKgBb+ypgQTwMB8UkGF8o=";
|
||||
name = "torch-2.3.1-cp38-cp38-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torch-2.3.1%2Bcu121-cp38-cp38-linux_x86_64.whl";
|
||||
hash = "sha256-TkEPNC/YbHO+oO0kVQnV/15od72lSySfdaM9U1yHfy8=";
|
||||
};
|
||||
x86_64-linux-39 = {
|
||||
name = "torch-2.3.0-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torch-2.3.0%2Bcu121-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-PMFeTCaCqFUYEhogUNa+eXbZj8SEO7wTtvW+4nWhtu4=";
|
||||
name = "torch-2.3.1-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torch-2.3.1%2Bcu121-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-3+phA2LA4qX/KNMi1qpl1l4D4TNJlhGaWjdwx9GCGsQ=";
|
||||
};
|
||||
x86_64-linux-310 = {
|
||||
name = "torch-2.3.0-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torch-2.3.0%2Bcu121-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-ChKqmqa8RC3/iCOsi0jZkf0HcVYuqjhZP5yBltZfcAc=";
|
||||
name = "torch-2.3.1-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torch-2.3.1%2Bcu121-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-8N610vkypo7VRiW6FA7dvyryK+l47hm5tjyYat1kJbI=";
|
||||
};
|
||||
x86_64-linux-311 = {
|
||||
name = "torch-2.3.0-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torch-2.3.0%2Bcu121-cp311-cp311-linux_x86_64.whl";
|
||||
hash = "sha256-XffjyzlhAYqJHk7e8eC8HzMEqNlD+BskqMa/aHykmmc=";
|
||||
name = "torch-2.3.1-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torch-2.3.1%2Bcu121-cp311-cp311-linux_x86_64.whl";
|
||||
hash = "sha256-kl40rwkFBipItPgtDmZWNBrU1iaDSmqCRe9OruU3XJg=";
|
||||
};
|
||||
x86_64-linux-312 = {
|
||||
name = "torch-2.3.0-cp312-cp312-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torch-2.3.0%2Bcu121-cp312-cp312-linux_x86_64.whl";
|
||||
hash = "sha256-8VtvVJ7rxuayKyZ1Tk8dfkRpvNLUuh6qtXJorYC8ypY=";
|
||||
name = "torch-2.3.1-cp312-cp312-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torch-2.3.1%2Bcu121-cp312-cp312-linux_x86_64.whl";
|
||||
hash = "sha256-s8WG9Ksl6D7//M+5cHnpEyUym8IoFmVVxLuTlXdT1Oo=";
|
||||
};
|
||||
aarch64-darwin-38 = {
|
||||
name = "torch-2.3.0-cp38-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp38-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-aun2SwlRa6pO+JCvBnLcmBwgsfDYKc4RXUQgokfoj7o=";
|
||||
name = "torch-2.3.1-cp38-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp38-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-vuC9M9xYqo/Ip1J4dum5oOgSrQgSIFSlv/LOWr8AWxA=";
|
||||
};
|
||||
aarch64-darwin-39 = {
|
||||
name = "torch-2.3.0-cp39-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp39-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-dg+L7f9QbOnm4QNJj5senhWAngCDaFlMOma/dKilE4A=";
|
||||
name = "torch-2.3.1-cp39-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp39-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-K7WveAxVvmj+EA/rBSjS7eus4dVcsuNR3nNYCbpzkes=";
|
||||
};
|
||||
aarch64-darwin-310 = {
|
||||
name = "torch-2.3.0-cp310-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp310-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-dY75ON6HomU7unS5H3A0WMFVafFWK/S2xjxi2cWgwfU=";
|
||||
name = "torch-2.3.1-cp310-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp310-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-fAmpQ2J3hChIS8+ZX2AEsElSEGruDvRf8LS6tIT1SY0=";
|
||||
};
|
||||
aarch64-darwin-311 = {
|
||||
name = "torch-2.3.0-cp311-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp311-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-0k4ygibY4q98+A/LHS8dEI4N4yd3+rSqorN7l2XYvnM=";
|
||||
name = "torch-2.3.1-cp311-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp311-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-p91O04itHz1QK/CUU9X+WWx7Eh3n4M+soeIBd4Lpu6w=";
|
||||
};
|
||||
aarch64-darwin-312 = {
|
||||
name = "torch-2.3.0-cp312-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp312-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-3KmGIUJns0Blp5AAzuVCMuYrQd/x7Cyrmrw/yLPe4K0=";
|
||||
name = "torch-2.3.1-cp312-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp312-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-PDM9wuvBiVYVFO2gboHfIr+Ptk4jhHRrLLnwT5bR1Mg=";
|
||||
};
|
||||
aarch64-linux-38 = {
|
||||
name = "torch-2.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
hash = "sha256-RunxqfQgKcBuY/v5yXE0PYsqCIZyO8T/McZ6m3pHNXM=";
|
||||
name = "torch-2.3.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
hash = "sha256-O3wUmPkE9n6x4zHy6+h0J3GiznG57pvAHelnJX6IHH0=";
|
||||
};
|
||||
aarch64-linux-39 = {
|
||||
name = "torch-2.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
hash = "sha256-N7zdkm811ccvGm0oIpczJEuyZTqPp3nEwQ3ZfjMNa6I=";
|
||||
name = "torch-2.3.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
hash = "sha256-22v/S6YnO1muRD3gS1rcNtakC7KJiGYTO/8tUvJ26v4=";
|
||||
};
|
||||
aarch64-linux-310 = {
|
||||
name = "torch-2.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
hash = "sha256-fiTBOMO6zIxRHGuCEfCcO/VH08vjdWMhrOwb3OQP7Gs=";
|
||||
name = "torch-2.3.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
hash = "sha256-ZUT98pAYZowKbUobzJVZgsGtpwgGKBsBDLqTvc+9zyI=";
|
||||
};
|
||||
aarch64-linux-311 = {
|
||||
name = "torch-2.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
hash = "sha256-FHmS068B4/KncqaId+iTeYnlfEIluCpJidPNlYLIvNE=";
|
||||
name = "torch-2.3.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
hash = "sha256-Kq8ON3NMvF/mv8yBraNuy7iZ1N2+E0mL2EqsqKkchig=";
|
||||
};
|
||||
aarch64-linux-312 = {
|
||||
name = "torch-2.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
hash = "sha256-bhOCYa8GzZAqgmUmCCreU0tmCTudj2/y1AHOQ5qiNQw=";
|
||||
name = "torch-2.3.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-2.3.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl";
|
||||
hash = "sha256-d9LeGklaHAf1ksM4oNWS5VzAudL4ADCeRqDqLA46KRk=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -207,7 +207,7 @@ in
|
||||
buildPythonPackage rec {
|
||||
pname = "torch";
|
||||
# Don't forget to update torch-bin to the same version.
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8.0";
|
||||
@ -225,7 +225,7 @@ buildPythonPackage rec {
|
||||
repo = "pytorch";
|
||||
rev = "refs/tags/v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-UmH4Mv5QL7Mz4Y4pvxn8F1FGBR/UzYZjE2Ys8Oc0FWQ=";
|
||||
hash = "sha256-vpgtOqzIDKgRuqdT8lB/g6j+oMIH1RPxdbjtlzZFjV8=";
|
||||
};
|
||||
|
||||
patches =
|
||||
@ -499,7 +499,7 @@ buildPythonPackage rec {
|
||||
++ lib.optionals MPISupport [ mpi ]
|
||||
++ lib.optionals rocmSupport [ rocmtoolkit_joined ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
astunparse
|
||||
cffi
|
||||
click
|
||||
@ -629,18 +629,18 @@ buildPythonPackage rec {
|
||||
cudaCapabilities = if cudaSupport then supportedCudaCapabilities else [ ];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
changelog = "https://github.com/pytorch/pytorch/releases/tag/v${version}";
|
||||
# keep PyTorch in the description so the package can be found under that name on search.nixos.org
|
||||
description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration";
|
||||
homepage = "https://pytorch.org/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = with lib.maintainers; [
|
||||
teh
|
||||
thoughtpolice
|
||||
tscholak
|
||||
]; # tscholak esp. for darwin-related builds
|
||||
platforms = with platforms; linux ++ lib.optionals (!cudaSupport && !rocmSupport) darwin;
|
||||
platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport && !rocmSupport) darwin;
|
||||
broken = builtins.any trivial.id (builtins.attrValues brokenConditions);
|
||||
};
|
||||
}
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "torchaudio";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
format = "wheel";
|
||||
|
||||
src =
|
||||
@ -68,20 +68,20 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "torchaudio" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "PyTorch audio library";
|
||||
homepage = "https://pytorch.org/";
|
||||
changelog = "https://github.com/pytorch/audio/releases/tag/v${version}";
|
||||
# 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;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.bsd3;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
platforms = [
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
"aarch64-darwin"
|
||||
];
|
||||
maintainers = with maintainers; [ junjihashimoto ];
|
||||
maintainers = with lib.maintainers; [ junjihashimoto ];
|
||||
};
|
||||
}
|
||||
|
@ -7,81 +7,81 @@
|
||||
|
||||
version:
|
||||
builtins.getAttr version {
|
||||
"2.3.0" = {
|
||||
"2.3.1" = {
|
||||
x86_64-linux-38 = {
|
||||
name = "torchaudio-2.3.0-cp38-cp38-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.0%2Bcu121-cp38-cp38-linux_x86_64.whl";
|
||||
hash = "sha256-Q/Iv/36izuH9uzAqE26aC51XFTUXaaYn1JDGfKzsCfQ=";
|
||||
name = "torchaudio-2.3.1-cp38-cp38-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.1%2Bcu121-cp38-cp38-linux_x86_64.whl";
|
||||
hash = "sha256-4QoP0bNR6EnnzZ4ekw3KP/uMow+WI5vqEx8YP2WUXNs=";
|
||||
};
|
||||
x86_64-linux-39 = {
|
||||
name = "torchaudio-2.3.0-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.0%2Bcu121-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-4n2qE/jPQ8sLyq81TIEj7qlpBsg/FDNCZiCSvMH7atc=";
|
||||
name = "torchaudio-2.3.1-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.1%2Bcu121-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-bOv8CdkcpAPASLnPKuPWS09UzzGghYTQ0/v3+VAewNw=";
|
||||
};
|
||||
x86_64-linux-310 = {
|
||||
name = "torchaudio-2.3.0-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.0%2Bcu121-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-OLSTk/jDItyqKdGeWsv1oLGXjPG3GURatnDx+0huOqY=";
|
||||
name = "torchaudio-2.3.1-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.1%2Bcu121-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-C0I/SuM1bxH2cj6MdyCKw/k2Gk+UHkzAjYbDLBN1lLw=";
|
||||
};
|
||||
x86_64-linux-311 = {
|
||||
name = "torchaudio-2.3.0-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.0%2Bcu121-cp311-cp311-linux_x86_64.whl";
|
||||
hash = "sha256-jdZpE+ewjGPHayGwcGEwwkruTtStwLwS+NYt+YtcbqA=";
|
||||
name = "torchaudio-2.3.1-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.1%2Bcu121-cp311-cp311-linux_x86_64.whl";
|
||||
hash = "sha256-LZE2vzybarltxC8m9suDbUXRFfV2bhav9Sg1yOfN5WU=";
|
||||
};
|
||||
x86_64-linux-312 = {
|
||||
name = "torchaudio-2.3.0-cp312-cp312-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.0%2Bcu121-cp312-cp312-linux_x86_64.whl";
|
||||
hash = "sha256-IA7PUlHYPRTook/X9V3odqrSVR/5jqvxzdhCeQXJXFU=";
|
||||
name = "torchaudio-2.3.1-cp312-cp312-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchaudio-2.3.1%2Bcu121-cp312-cp312-linux_x86_64.whl";
|
||||
hash = "sha256-sAdz3eOqMNmxuYh1ZQQo+/tp/jC5jrtc7/vY/GHegSU=";
|
||||
};
|
||||
aarch64-darwin-38 = {
|
||||
name = "torchaudio-2.3.0-cp38-cp38-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp38-cp38-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-e6kyZUVdw2M4XpjAz8rrWGt0Aa+KLIJIEe4UZhNKTzA=";
|
||||
name = "torchaudio-2.3.1-cp38-cp38-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp38-cp38-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-zkXgWs1URpbGpvAj1P6GFK3ldRV5mhEDskGOhUg41KU=";
|
||||
};
|
||||
aarch64-darwin-39 = {
|
||||
name = "torchaudio-2.3.0-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-9Lkzd28go2r13cV5aPyz2jTdA4gduNZ2Dz4RdoA7nPg=";
|
||||
name = "torchaudio-2.3.1-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-NujAtlMlccJ6CKQNrkKM00ryJQB/FbzXcnJkO2JmuB0=";
|
||||
};
|
||||
aarch64-darwin-310 = {
|
||||
name = "torchaudio-2.3.0-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-NCEI2oOqGaRXyaEosSBvrbYDdTtRzKAiufWFqsL0dUw=";
|
||||
name = "torchaudio-2.3.1-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-H5E0sn5afwweMzgvwP4njlNpV2jLCvAujSK1AGx0oq0=";
|
||||
};
|
||||
aarch64-darwin-311 = {
|
||||
name = "torchaudio-2.3.0-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-NByjBIzm7cxzFRmzAYfwsTrLJFxO/hb5JfafnVM1RuE=";
|
||||
name = "torchaudio-2.3.1-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-AZhPODmMpemOz7/q+3KuWyEx0LuKpGS1d3rds+SCaHc=";
|
||||
};
|
||||
aarch64-darwin-312 = {
|
||||
name = "torchaudio-2.3.0-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-U1FEovu6lfuzuIMiT/z0R4jkzsurvknEoa4+enT3FIU=";
|
||||
name = "torchaudio-2.3.1-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-XjZoVCCgehdhRunW4PqCJRmPEm4WegB4VTj4U4B+LUM=";
|
||||
};
|
||||
aarch64-linux-38 = {
|
||||
name = "torchaudio-2.3.0-cp38-cp38-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp38-cp38-linux_aarch64.whl";
|
||||
hash = "sha256-7Rhm9QjcaJxPaC0zCy7UyDEI01hl5PuJQxgZNk2K2e0=";
|
||||
name = "torchaudio-2.3.1-cp38-cp38-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp38-cp38-linux_aarch64.whl";
|
||||
hash = "sha256-n9D0u8P9WF+9fZdqmI/m54P8suDbnXDaxg9AvgcsZQQ=";
|
||||
};
|
||||
aarch64-linux-39 = {
|
||||
name = "torchaudio-2.3.0-cp39-cp39-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp39-cp39-linux_aarch64.whl";
|
||||
hash = "sha256-0kO7ih7iY8LNr7n+7RVpw3QtgTVzHo94GN4S9ODIPig=";
|
||||
name = "torchaudio-2.3.1-cp39-cp39-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp39-cp39-linux_aarch64.whl";
|
||||
hash = "sha256-TjvKIy+CDGoPpTlEJAdsxRn64yKI5/9vbWi9cXlNw1Q=";
|
||||
};
|
||||
aarch64-linux-310 = {
|
||||
name = "torchaudio-2.3.0-cp310-cp310-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp310-cp310-linux_aarch64.whl";
|
||||
hash = "sha256-5btQt6SHTtlwhsnlFt2QsQPZVO3LXtSzb0/CLEAApac=";
|
||||
name = "torchaudio-2.3.1-cp310-cp310-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp310-cp310-linux_aarch64.whl";
|
||||
hash = "sha256-a1fnc6rXJ0PVCmSnQCoGy4vfzHCe/G2MJkKdlA5niOI=";
|
||||
};
|
||||
aarch64-linux-311 = {
|
||||
name = "torchaudio-2.3.0-cp311-cp311-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp311-cp311-linux_aarch64.whl";
|
||||
hash = "sha256-Ye2wKunA7+pDmfnB+JlgETayTzXUMFSChOqOr2zL474=";
|
||||
name = "torchaudio-2.3.1-cp311-cp311-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp311-cp311-linux_aarch64.whl";
|
||||
hash = "sha256-yMcnyDQYJb0Y2RAXxMAPNrU7CPIXbNub3LDe8cRQsh0=";
|
||||
};
|
||||
aarch64-linux-312 = {
|
||||
name = "torchaudio-2.3.0-cp312-cp312-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.0-cp312-cp312-linux_aarch64.whl";
|
||||
hash = "sha256-ZoqLaU5VIs/yjNXgLQGqG3XOlAqp+0BICJK9xiOxc10=";
|
||||
name = "torchaudio-2.3.1-cp312-cp312-manylinux2014_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchaudio-2.3.1-cp312-cp312-linux_aarch64.whl";
|
||||
hash = "sha256-Qq9sekMOYmjywCjgYHjUE5ErXsbvoooJfr3Tw8eWWd8=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -72,14 +72,14 @@ let
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "torchaudio";
|
||||
version = "2.3.0";
|
||||
version = "2.3.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pytorch";
|
||||
repo = "audio";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8EPoZ/dfxrQjdtE0rZ+2pOaXxlyhRuweYnVuA9i0Fgc=";
|
||||
hash = "sha256-PYaqRNKIhQ1DnFRZYyJJfBszVM2Bmu7A/lvvzJ6lL3g=";
|
||||
};
|
||||
|
||||
patches = [ ./0001-setup.py-propagate-cmakeFlags.patch ];
|
||||
@ -133,7 +133,7 @@ buildPythonPackage rec {
|
||||
torch.cxxdev
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ torch ];
|
||||
dependencies = [ torch ];
|
||||
|
||||
BUILD_SOX = 0;
|
||||
BUILD_KALDI = 0;
|
||||
@ -149,16 +149,16 @@ buildPythonPackage rec {
|
||||
|
||||
doCheck = false; # requires sox backend
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "PyTorch audio library";
|
||||
homepage = "https://pytorch.org/";
|
||||
changelog = "https://github.com/pytorch/audio/releases/tag/v${version}";
|
||||
license = licenses.bsd2;
|
||||
license = lib.licenses.bsd2;
|
||||
platforms = [
|
||||
"aarch64-darwin"
|
||||
"aarch64-linux"
|
||||
"x86_64-linux"
|
||||
];
|
||||
maintainers = with maintainers; [ junjihashimoto ];
|
||||
maintainers = with lib.maintainers; [ junjihashimoto ];
|
||||
};
|
||||
}
|
||||
|
@ -17,7 +17,7 @@ let
|
||||
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
|
||||
srcs = import ./binary-hashes.nix version;
|
||||
unsupported = throw "Unsupported system";
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit version;
|
||||
@ -44,7 +44,7 @@ buildPythonPackage {
|
||||
addOpenGLRunpath
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
pillow
|
||||
torch-bin
|
||||
];
|
||||
@ -58,20 +58,20 @@ buildPythonPackage {
|
||||
addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "PyTorch vision library";
|
||||
homepage = "https://pytorch.org/";
|
||||
changelog = "https://github.com/pytorch/vision/releases/tag/v${version}";
|
||||
# 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;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
license = lib.licenses.bsd3;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
platforms = [
|
||||
"aarch64-darwin"
|
||||
"x86_64-linux"
|
||||
"aarch64-linux"
|
||||
];
|
||||
maintainers = with maintainers; [ junjihashimoto ];
|
||||
maintainers = with lib.maintainers; [ junjihashimoto ];
|
||||
};
|
||||
}
|
||||
|
@ -7,81 +7,81 @@
|
||||
|
||||
version:
|
||||
builtins.getAttr version {
|
||||
"0.18.0" = {
|
||||
"0.18.1" = {
|
||||
x86_64-linux-38 = {
|
||||
name = "torchvision-0.18.0-cp38-cp38-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.0%2Bcu121-cp38-cp38-linux_x86_64.whl";
|
||||
hash = "sha256-wkg7LMYiePuqa2fSqdgI0kUET4tkqCFZbq5o7GoNXtA=";
|
||||
name = "torchvision-0.18.1-cp38-cp38-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.1%2Bcu121-cp38-cp38-linux_x86_64.whl";
|
||||
hash = "sha256-ruiWHcuKQY6S0G1LPpr1KYcpOkjBQjHDxQyO6jdB5BI=";
|
||||
};
|
||||
x86_64-linux-39 = {
|
||||
name = "torchvision-0.18.0-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.0%2Bcu121-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-G/4MZ/1UYaOlk/jxfhVE8Hpr1mhuFVIA3SRJRwdPzVE=";
|
||||
name = "torchvision-0.18.1-cp39-cp39-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.1%2Bcu121-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-Hr9du9869EbITkK68u2+sb1vsMydO0kBr5acg5HRSl4=";
|
||||
};
|
||||
x86_64-linux-310 = {
|
||||
name = "torchvision-0.18.0-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.0%2Bcu121-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-E+G0jcXOQcy4EAqz3Sb98x2PHpBOzyhlrFJEkwE9DfU=";
|
||||
name = "torchvision-0.18.1-cp310-cp310-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.1%2Bcu121-cp310-cp310-linux_x86_64.whl";
|
||||
hash = "sha256-6VulosYWk5KB4Bur8RZk1tFyXoG7pX74H4HD5X5NQVE=";
|
||||
};
|
||||
x86_64-linux-311 = {
|
||||
name = "torchvision-0.18.0-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.0%2Bcu121-cp311-cp311-linux_x86_64.whl";
|
||||
hash = "sha256-HlFneVIPySFX1sskWsD9P3mHL+gchLhZOo8umYEG9bE=";
|
||||
name = "torchvision-0.18.1-cp311-cp311-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.1%2Bcu121-cp311-cp311-linux_x86_64.whl";
|
||||
hash = "sha256-KyrsLGjguhf57tiSF5b6Lbx6ST3qejtF0lwFWtQXSGg=";
|
||||
};
|
||||
x86_64-linux-312 = {
|
||||
name = "torchvision-0.18.0-cp312-cp312-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.0%2Bcu121-cp312-cp312-linux_x86_64.whl";
|
||||
hash = "sha256-cA9gGb6+6eDuiwvL2xWIgJyUouuUeh/eLgatw0tg2io=";
|
||||
name = "torchvision-0.18.1-cp312-cp312-linux_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cu121/torchvision-0.18.1%2Bcu121-cp312-cp312-linux_x86_64.whl";
|
||||
hash = "sha256-zo1bmSBW8GQKOe9XNDQuQ8pKgBVH3if7jbwwVdk0WUc=";
|
||||
};
|
||||
aarch64-darwin-38 = {
|
||||
name = "torchvision-0.18.0-cp38-cp38-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp38-cp38-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-IRWhkGwBX12pzu3ECpgzE7D9biyKFxCKkpkXBvUfaYc=";
|
||||
name = "torchvision-0.18.1-cp38-cp38-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp38-cp38-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-scOGT6k3jIi86K0O81mfTyU5eJfOYS4cJFx0uXCS814=";
|
||||
};
|
||||
aarch64-darwin-39 = {
|
||||
name = "torchvision-0.18.0-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-deIuz0ShO4+VuK1CHAJhKC2FnGGBa62soZWeBzzN1pE=";
|
||||
name = "torchvision-0.18.1-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp39-cp39-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-l1uFlMD1KIh1QIrLt0lG7qeGxbAI0SnA0EXQ6tI3Qrw=";
|
||||
};
|
||||
aarch64-darwin-310 = {
|
||||
name = "torchvision-0.18.0-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-3WFiij0YnGhSoS3F7UzS7s5m0tZ/Nahmyxbx3LBsjGI=";
|
||||
name = "torchvision-0.18.1-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-PmlOVLBUja2ZwSr2vwyOTzNQE305Hc0ZryKhxfiTIrM=";
|
||||
};
|
||||
aarch64-darwin-311 = {
|
||||
name = "torchvision-0.18.0-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-aJalIWi+/hEF+zyTNShzkO0ifnHR5OxNaLYuijCZ/Ak=";
|
||||
name = "torchvision-0.18.1-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp311-cp311-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-gLXXlN0P26eHrcIvGjZ6Xq1FIydoZHPLJg3ZQ2S8VqY=";
|
||||
};
|
||||
aarch64-darwin-312 = {
|
||||
name = "torchvision-0.18.0-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-652DwOHbtU7LD7BMh/eGMz46b7i5xACsp8MQgfmqVwc=";
|
||||
name = "torchvision-0.18.1-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp312-cp312-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-K+bwv3xFXImlGh27b2aNNsbtxHn0mskS10XRDfVxVlc=";
|
||||
};
|
||||
aarch64-linux-38 = {
|
||||
name = "torchvision-0.18.0-cp38-cp38-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp38-cp38-linux_aarch64.whl";
|
||||
hash = "sha256-kl0KgszPb5hsGLKbQ5KpQttly9tzwToSnISTgi65428=";
|
||||
name = "torchvision-0.18.1-cp38-cp38-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp38-cp38-linux_aarch64.whl";
|
||||
hash = "sha256-lybDFqJQHfhQPlpdxGpjGv1MUVqViXLlt/e5yH0hJcA=";
|
||||
};
|
||||
aarch64-linux-39 = {
|
||||
name = "torchvision-0.18.0-cp39-cp39-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp39-cp39-linux_aarch64.whl";
|
||||
hash = "sha256-Nu/YcAHGvuI4PgQ+RqAlr/sDF5dHyPR3e5kYUn/851Y=";
|
||||
name = "torchvision-0.18.1-cp39-cp39-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp39-cp39-linux_aarch64.whl";
|
||||
hash = "sha256-VL/NNSq7OW1cnCN9IAFnwXi9E2BRsTjh6O9GzjZ8J3M=";
|
||||
};
|
||||
aarch64-linux-310 = {
|
||||
name = "torchvision-0.18.0-cp310-cp310-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp310-cp310-linux_aarch64.whl";
|
||||
hash = "sha256-Uzf2rPof6VnVyzQNAaAGFNazHOekgkzLlUNahcUnO5U=";
|
||||
name = "torchvision-0.18.1-cp310-cp310-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp310-cp310-linux_aarch64.whl";
|
||||
hash = "sha256-Vz/1I8c5QF7bCF9ly1kvSC0oow4psL5MS6CAQLOueF8=";
|
||||
};
|
||||
aarch64-linux-311 = {
|
||||
name = "torchvision-0.18.0-cp311-cp311-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp311-cp311-linux_aarch64.whl";
|
||||
hash = "sha256-5aJNYgzqFKS7ifJKorUGIwwKFqOtpX/FOtgM/SVqISg=";
|
||||
name = "torchvision-0.18.1-cp311-cp311-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp311-cp311-linux_aarch64.whl";
|
||||
hash = "sha256-zrmTqILxrnrjc+05wo1+PoAiBbDlmn7YTvQCjwu6jX8=";
|
||||
};
|
||||
aarch64-linux-312 = {
|
||||
name = "torchvision-0.18.0-cp312-cp312-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.0-cp312-cp312-linux_aarch64.whl";
|
||||
hash = "sha256-qWSvvH3fUKRrlBR39sNXKbQW3u3ROXVr79SIJF4uIm0=";
|
||||
name = "torchvision-0.18.1-cp312-cp312-linux_aarch64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torchvision-0.18.1-cp312-cp312-linux_aarch64.whl";
|
||||
hash = "sha256-E9JNkE9l5i1moeDEH67GMLwZOGe4pKARZnaeio6N+Ok=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -18,7 +18,7 @@ let
|
||||
inherit (cudaPackages) backendStdenv;
|
||||
|
||||
pname = "torchvision";
|
||||
version = "0.18.0";
|
||||
version = "0.18.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
@ -27,7 +27,7 @@ buildPythonPackage {
|
||||
owner = "pytorch";
|
||||
repo = "vision";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-VWbalbLSV5a+t9eAO7QzQ/e11KkhGg6MHgd5vXcAUXc=";
|
||||
hash = "sha256-aFm6CyoMA8HtpOAVF5Q35n3JRaOXYswWEqfooORUKsw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -42,7 +42,7 @@ buildPythonPackage {
|
||||
torch.cxxdev
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
numpy
|
||||
pillow
|
||||
torch
|
||||
@ -73,11 +73,11 @@ buildPythonPackage {
|
||||
|
||||
nativeCheckInputs = [ pytest ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "PyTorch vision library";
|
||||
homepage = "https://pytorch.org/";
|
||||
license = licenses.bsd3;
|
||||
platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin;
|
||||
maintainers = with maintainers; [ ericsagnes ];
|
||||
license = lib.licenses.bsd3;
|
||||
platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin;
|
||||
maintainers = with lib.maintainers; [ ericsagnes ];
|
||||
};
|
||||
}
|
||||
|
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "golangci-lint";
|
||||
version = "1.59.0";
|
||||
version = "1.59.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "golangci";
|
||||
repo = "golangci-lint";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-m4VT4jJa8AQipH1KQOYYEG84cbCS6qXORZQC8PA7838=";
|
||||
hash = "sha256-VFU/qGyKBMYr0wtHXyaMjS5fXKAHWe99wDZuSyH8opg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ZNoBXSJsLCqRXc09/3woUCJVyeMrFjHIznXMlNz8MsI=";
|
||||
vendorHash = "sha256-yYwYISK1wM/mSlAcDSIwYRo8sRWgw2u+SsvgjH+Z/7M=";
|
||||
|
||||
subPackages = [ "cmd/golangci-lint" ];
|
||||
|
||||
|
@ -1,67 +1,22 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, ocamlPackages
|
||||
, pkg-config
|
||||
, autoreconfHook
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "coccinelle";
|
||||
version = "1.1.1";
|
||||
version = "1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
repo = pname;
|
||||
rev = version;
|
||||
repo = "coccinelle";
|
||||
rev = finalAttrs.version;
|
||||
owner = "coccinelle";
|
||||
hash = "sha256-rS9Ktp/YcXF0xUtT4XZtH5F9huvde0vRztY7vGtyuqY=";
|
||||
hash = "sha256-v51KQLMJENLrlstCsP3DAuJJFMyjFyOZPJ7cRW5ovws=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix data path lookup.
|
||||
# https://github.com/coccinelle/coccinelle/pull/270
|
||||
(fetchpatch {
|
||||
url = "https://github.com/coccinelle/coccinelle/commit/540888ff426e0b1f7907b63ce26e712d1fc172cc.patch";
|
||||
sha256 = "sha256-W8RNIWDAC3lQ5bG+gD50r7x919JIcZRpt3QSOSMWpW4=";
|
||||
})
|
||||
|
||||
# Fix attaching code before declarations.
|
||||
# https://github.com/coccinelle/coccinelle/issues/282
|
||||
(fetchpatch {
|
||||
url = "https://github.com/coccinelle/coccinelle/commit/cd33db143416d820f547bf5869482cfcfc0ea9d0.patch";
|
||||
sha256 = "q7wbxbB9Ob0fSJwCjRtDPO3Xg4RO9yrQZG9G0/LGunI=";
|
||||
})
|
||||
|
||||
# Fix attaching declaration metavariables.
|
||||
# https://github.com/coccinelle/coccinelle/issues/281
|
||||
(fetchpatch {
|
||||
url = "https://github.com/coccinelle/coccinelle/commit/df71c5c0fe2a73c7358f73f45a550b57a7e30d85.patch";
|
||||
sha256 = "qrYfligJnXP7J5G/hfzyaKg9aFn74VExtc/Rs/DI2gc=";
|
||||
})
|
||||
|
||||
# Support GLib’s autocleanup macros.
|
||||
# https://github.com/coccinelle/coccinelle/issues/275
|
||||
(fetchpatch {
|
||||
url = "https://github.com/coccinelle/coccinelle/commit/6d5602aca8775c3c5c503939c3dcf0637649d09b.patch";
|
||||
sha256 = "NACf8joOOvN32H/sIfI+oqiT3289zXXQVVfXbRfbIe8=";
|
||||
})
|
||||
|
||||
# Exit with non-zero status on failure.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/coccinelle/coccinelle/commit/6c0a855af14d41864e1e522b93dc39646a3b83c7.patch";
|
||||
sha256 = "6yfK8arB0GDW7o4cXsv0Y9TMvqgGf3/P1ebXrFFUC80=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/coccinelle/coccinelle/commit/5448bb2bd03491ffec356bf7bd6ddcdbf4d36bc9.patch";
|
||||
sha256 = "fyyxw2BNZUpyLBieIhOKeWbLFGP1tjULH70w/hU+jKw=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/coccinelle/coccinelle/commit/b8b1937657765e991195a10fcd7b8f7a300fc60b.patch";
|
||||
sha256 = "ergWJF6BKrhmJhx1aiVYDHztgjaQvaJ5iZRAmC9i22s=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = with ocamlPackages; [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
@ -105,4 +60,4 @@ stdenv.mkDerivation rec {
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = [ lib.maintainers.thoughtpolice ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
@ -1,31 +0,0 @@
|
||||
{ lib, buildGoPackage, fetchFromGitHub }:
|
||||
|
||||
buildGoPackage rec {
|
||||
pname = "docopts";
|
||||
version = "0.6.4-with-no-mangle-double-dash";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docopt";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0zxax0kl8wqpkzmw9ij4qgfhjbk4r7996pjyp9xf5icyk8knp00q";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/docopt/${pname}";
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
|
||||
subPackages = [ "./" ];
|
||||
|
||||
postInstall = ''
|
||||
install -D -m 755 ./go/src/$goPackagePath/docopts.sh $out/bin/docopts.sh
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/docopt/${pname}";
|
||||
description = "docopt CLI tool for shell scripting";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.confus ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
11
pkgs/development/tools/misc/docopts/deps.nix
generated
11
pkgs/development/tools/misc/docopts/deps.nix
generated
@ -1,11 +0,0 @@
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/docopt/docopt-go";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/docopt/docopt.go";
|
||||
rev = "ee0de3bc6815ee19d4a46c7eb90f829db0e014b1"; # "0.6.2";
|
||||
sha256 = "sha256-0mCKIC5x7aauBL8ahXB9ExMfoTJl55HaafWWWPNRmUI=";
|
||||
};
|
||||
}
|
||||
]
|
@ -1,4 +1,5 @@
|
||||
{ fetchFromGitHub
|
||||
, bash
|
||||
, json_c
|
||||
, keyutils
|
||||
, lib
|
||||
@ -17,7 +18,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libnvme";
|
||||
version = "1.7.1";
|
||||
version = "1.9";
|
||||
|
||||
outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ];
|
||||
|
||||
@ -25,11 +26,13 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "linux-nvme";
|
||||
repo = "libnvme";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-hCR/K8bPXj8HthayrnwwGfI+wxpUwcWkcx3S/8h+3m8=";
|
||||
hash = "sha256-nXzYbj4BDxFii30yR+aTgqjQfyYMFiAIcV/OHI2y5Ws=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs scripts
|
||||
substituteInPlace test/sysfs/sysfs-tree-diff.sh \
|
||||
--replace-fail /bin/bash ${bash}/bin/bash
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nvme-cli";
|
||||
version = "2.7.1";
|
||||
version = "2.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linux-nvme";
|
||||
repo = "nvme-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Gm+1tb/Nh+Yg2PgSUn/1hR4CZYnfTWRwcQU0A8UeQwI=";
|
||||
hash = "sha256-zs7UksB5QkvCP29iELDGMJeObvMdKrs6ajQkEzCPzzQ=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "open-iscsi";
|
||||
version = "2.1.9";
|
||||
version = "2.1.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-iscsi";
|
||||
repo = "open-iscsi";
|
||||
rev = version;
|
||||
hash = "sha256-y0NIb/KsKpCd8byr/SXI7nwTKXP2/bSSoW8QgeL5xdc=";
|
||||
hash = "sha256-5bT9MaJ2OHFU9R9X01UOOztRqtR6rWv4RS5d1MGWf6M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -85,13 +85,13 @@ lib.warnIf (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform))
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "frr";
|
||||
version = "10.0";
|
||||
version = "10.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "FRRouting";
|
||||
repo = pname;
|
||||
rev = "${pname}-${version}";
|
||||
hash = "sha256-vvh9z2hmjvAA7OXgrUmlcrrTE5MRedZzfmhX5FEDKwE=";
|
||||
hash = "sha256-bY5SSF/fmKQc8ECPik0v/ZlUiFsbZhwG2C5pbmoMzwQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
|
||||
./0001-toolchain.patch
|
||||
# Avoid leaking the build timestamp
|
||||
# https://sourceforge.net/p/refind/code/merge-requests/53/
|
||||
./reproducible.patch
|
||||
./0002-preserve-dates.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
@ -15,13 +15,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rshim-user-space";
|
||||
version = "2.0.20";
|
||||
version = "2.0.32";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Mellanox";
|
||||
repo = pname;
|
||||
rev = "rshim-${version}";
|
||||
hash = "sha256-zm1cMTna9o8edl0M7tjUhbnElbUkQZSkh3KOI6tbE6I=";
|
||||
hash = "sha256-GF7cKIf72EYRBRb6d3IWONE7YJwohTLKF1RGdDMTG6c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -36,6 +36,10 @@ stdenv.mkDerivation rec {
|
||||
fuse
|
||||
];
|
||||
|
||||
prePatch = ''
|
||||
patchShebangs scripts/bfb-install
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
preConfigure = "./bootstrap.sh";
|
||||
|
@ -2144,7 +2144,9 @@ with pkgs;
|
||||
|
||||
archi = callPackage ../tools/misc/archi { };
|
||||
|
||||
breitbandmessung = callPackage ../applications/networking/breitbandmessung { };
|
||||
breitbandmessung = callPackage ../applications/networking/breitbandmessung {
|
||||
electron = electron_29;
|
||||
};
|
||||
|
||||
### APPLICATIONS/VERSION-MANAGEMENT
|
||||
|
||||
@ -17943,6 +17945,10 @@ with pkgs;
|
||||
|
||||
ansible-lint = callPackage ../tools/admin/ansible/lint.nix { };
|
||||
|
||||
antares = callPackage ../by-name/an/antares/package.nix {
|
||||
electron = electron_29;
|
||||
};
|
||||
|
||||
antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
|
||||
antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { };
|
||||
antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { };
|
||||
@ -18012,8 +18018,8 @@ with pkgs;
|
||||
electron_28 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_28 then electron-source.electron_28 else electron_28-bin;
|
||||
electron_29 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_29 then electron-source.electron_29 else electron_29-bin;
|
||||
electron_30 = if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_30 then electron-source.electron_30 else electron_30-bin;
|
||||
electron = electron_29;
|
||||
electron-bin = electron_29-bin;
|
||||
electron = electron_30;
|
||||
electron-bin = electron_30-bin;
|
||||
|
||||
autobuild = callPackage ../development/tools/misc/autobuild { };
|
||||
|
||||
@ -20511,8 +20517,6 @@ with pkgs;
|
||||
|
||||
docopt_cpp = callPackage ../development/libraries/docopt_cpp { };
|
||||
|
||||
docopts = callPackage ../development/tools/misc/docopts { };
|
||||
|
||||
dotconf = callPackage ../development/libraries/dotconf { };
|
||||
|
||||
draco = callPackage ../development/libraries/draco {
|
||||
@ -28252,8 +28256,6 @@ with pkgs;
|
||||
|
||||
brise = callPackage ../data/misc/brise { };
|
||||
|
||||
apl386 = callPackage ../data/fonts/apl386 { };
|
||||
|
||||
bqn386 = callPackage ../data/fonts/bqn386 { };
|
||||
|
||||
cacert = callPackage ../data/misc/cacert { };
|
||||
@ -31252,6 +31254,13 @@ with pkgs;
|
||||
|
||||
manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
|
||||
|
||||
metacubexd = callPackage ../by-name/me/metacubexd/package.nix {
|
||||
pnpm = callPackage ../development/tools/pnpm/generic.nix {
|
||||
version = "9.1.4";
|
||||
hash = "sha256-MKGAGsTnI3ee/tE6IfTDn562yfu0ztEBvOBrQiWT18k=";
|
||||
};
|
||||
};
|
||||
|
||||
minari = python3Packages.toPythonApplication python3Packages.minari;
|
||||
|
||||
mindforger = libsForQt5.callPackage ../applications/editors/mindforger { };
|
||||
@ -34698,6 +34707,8 @@ with pkgs;
|
||||
|
||||
termimage = callPackage ../tools/graphics/termimage { };
|
||||
|
||||
terminaltexteffects = with python3Packages; toPythonApplication terminaltexteffects ;
|
||||
|
||||
terminal-notifier = callPackage ../applications/misc/terminal-notifier { };
|
||||
|
||||
textplots = callPackage ../tools/graphics/textplots { };
|
||||
@ -35794,7 +35805,9 @@ with pkgs;
|
||||
|
||||
youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light;
|
||||
|
||||
youtube-music = callPackage ../applications/audio/youtube-music { pnpm = pnpm_8; };
|
||||
youtube-music = callPackage ../applications/audio/youtube-music {
|
||||
pnpm = pnpm_9;
|
||||
};
|
||||
|
||||
youtube-tui = callPackage ../applications/video/youtube-tui {
|
||||
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
|
||||
|
@ -9985,6 +9985,8 @@ self: super: with self; {
|
||||
|
||||
pycrdt-websocket = callPackage ../development/python-modules/pycrdt-websocket { };
|
||||
|
||||
pycycling = callPackage ../development/python-modules/pycycling { };
|
||||
|
||||
pyfibaro = callPackage ../development/python-modules/pyfibaro { };
|
||||
|
||||
pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { };
|
||||
@ -15051,6 +15053,8 @@ self: super: with self; {
|
||||
|
||||
terminaltables = callPackage ../development/python-modules/terminaltables { };
|
||||
|
||||
terminaltexteffects = callPackage ../development/python-modules/terminaltexteffects { };
|
||||
|
||||
termplotlib = callPackage ../development/python-modules/termplotlib { };
|
||||
|
||||
termstyle = callPackage ../development/python-modules/termstyle { };
|
||||
|
Loading…
Reference in New Issue
Block a user