Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
df7d0b3f5c
79 changed files with 278 additions and 207 deletions
|
|
@ -4,29 +4,61 @@
|
|||
let
|
||||
zeroPad = n:
|
||||
lib.optionalString (n < 16) "0" +
|
||||
(if n > 255
|
||||
then throw "Can't have more than 255 nets or nodes!"
|
||||
else lib.toHexString n);
|
||||
(if n > 255
|
||||
then throw "Can't have more than 255 nets or nodes!"
|
||||
else lib.toHexString n);
|
||||
in
|
||||
|
||||
rec {
|
||||
qemuNicMac = net: machine: "52:54:00:12:${zeroPad net}:${zeroPad machine}";
|
||||
|
||||
qemuNICFlags = nic: net: machine:
|
||||
[ "-device virtio-net-pci,netdev=vlan${toString nic},mac=${qemuNicMac net machine}"
|
||||
[
|
||||
"-device virtio-net-pci,netdev=vlan${toString nic},mac=${qemuNicMac net machine}"
|
||||
''-netdev vde,id=vlan${toString nic},sock="$QEMU_VDE_SOCKET_${toString net}"''
|
||||
];
|
||||
|
||||
qemuSerialDevice = if pkgs.stdenv.hostPlatform.isx86 || pkgs.stdenv.hostPlatform.isRiscV then "ttyS0"
|
||||
else if (with pkgs.stdenv.hostPlatform; isAarch || isPower) then "ttyAMA0"
|
||||
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";
|
||||
qemuSerialDevice =
|
||||
if pkgs.stdenv.hostPlatform.isx86 || pkgs.stdenv.hostPlatform.isRiscV then "ttyS0"
|
||||
else if (with pkgs.stdenv.hostPlatform; isAarch || isPower) then "ttyAMA0"
|
||||
else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'";
|
||||
|
||||
qemuBinary = qemuPkg: {
|
||||
x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max";
|
||||
armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -machine virt,accel=kvm:tcg -cpu max";
|
||||
aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=max,accel=kvm:tcg -cpu max";
|
||||
powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
|
||||
powerpc64-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
|
||||
x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu max";
|
||||
}.${pkgs.stdenv.hostPlatform.system} or "${qemuPkg}/bin/qemu-kvm";
|
||||
qemuBinary = qemuPkg:
|
||||
let
|
||||
hostStdenv = qemuPkg.stdenv;
|
||||
hostSystem = hostStdenv.system;
|
||||
guestSystem = pkgs.stdenv.hostPlatform.system;
|
||||
|
||||
linuxHostGuestMatrix = {
|
||||
x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max";
|
||||
armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -machine virt,accel=kvm:tcg -cpu max";
|
||||
aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=max,accel=kvm:tcg -cpu max";
|
||||
powerpc64le-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
|
||||
powerpc64-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv";
|
||||
x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu max";
|
||||
};
|
||||
otherHostGuestMatrix = {
|
||||
aarch64-darwin = {
|
||||
aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=2,accel=hvf:tcg -cpu max";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
x86_64-linux = "${qemuPkg}/bin/qemu-system-x86_64 -machine type=q35,accel=hvf:tcg -cpu max";
|
||||
};
|
||||
};
|
||||
|
||||
throwUnsupportedHostSystem =
|
||||
let
|
||||
supportedSystems = [ "linux" ] ++ (lib.attrNames otherHostGuestMatrix);
|
||||
in
|
||||
throw "Unsupported host system ${hostSystem}, supported: ${lib.concatStringsSep ", " supportedSystems}";
|
||||
throwUnsupportedGuestSystem = guestMap:
|
||||
throw "Unsupported guest system ${guestSystem} for host ${hostSystem}, supported: ${lib.concatStringsSep ", " (lib.attrNames guestMap)}";
|
||||
in
|
||||
if hostStdenv.isLinux then
|
||||
linuxHostGuestMatrix.${guestSystem} or "${qemuPkg}/bin/qemu-kvm"
|
||||
else
|
||||
let
|
||||
guestMap = (otherHostGuestMatrix.${hostSystem} or throwUnsupportedHostSystem);
|
||||
in
|
||||
(guestMap.${guestSystem} or (throwUnsupportedGuestSystem guestMap));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -298,7 +298,7 @@ in
|
|||
];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "${package}/bin/kea-ctrl-agent -c /etc/kea/ctrl-agent.conf ${lib.escapeShellArgs cfg.dhcp4.extraArgs}";
|
||||
ExecStart = "${package}/bin/kea-ctrl-agent -c /etc/kea/ctrl-agent.conf ${lib.escapeShellArgs cfg.ctrl-agent.extraArgs}";
|
||||
KillMode = "process";
|
||||
Restart = "on-failure";
|
||||
} // commonServiceConfig;
|
||||
|
|
|
|||
|
|
@ -102,7 +102,9 @@ let
|
|||
# Shell script to start the VM.
|
||||
startVM =
|
||||
''
|
||||
#! ${pkgs.runtimeShell}
|
||||
#! ${cfg.host.pkgs.runtimeShell}
|
||||
|
||||
export PATH=${makeBinPath [ cfg.host.pkgs.coreutils ]}''${PATH:+:}$PATH
|
||||
|
||||
set -e
|
||||
|
||||
|
|
@ -574,11 +576,24 @@ in
|
|||
description = "Primary IP address used in /etc/hosts.";
|
||||
};
|
||||
|
||||
virtualisation.host.pkgs = mkOption {
|
||||
type = options.nixpkgs.pkgs.type;
|
||||
default = pkgs;
|
||||
defaultText = "pkgs";
|
||||
example = literalExpression ''
|
||||
import pkgs.path { system = "x86_64-darwin"; }
|
||||
'';
|
||||
description = ''
|
||||
pkgs set to use for the host-specific packages of the vm runner.
|
||||
Changing this to e.g. a Darwin package set allows running NixOS VMs on Darwin.
|
||||
'';
|
||||
};
|
||||
|
||||
virtualisation.qemu = {
|
||||
package =
|
||||
mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.qemu_kvm;
|
||||
default = cfg.host.pkgs.qemu_kvm;
|
||||
example = "pkgs.qemu_test";
|
||||
description = lib.mdDoc "QEMU package to use.";
|
||||
};
|
||||
|
|
@ -1075,14 +1090,14 @@ in
|
|||
|
||||
services.qemuGuest.enable = cfg.qemu.guestAgent.enable;
|
||||
|
||||
system.build.vm = pkgs.runCommand "nixos-vm" {
|
||||
system.build.vm = cfg.host.pkgs.runCommand "nixos-vm" {
|
||||
preferLocalBuild = true;
|
||||
meta.mainProgram = "run-${config.system.name}-vm";
|
||||
}
|
||||
''
|
||||
mkdir -p $out/bin
|
||||
ln -s ${config.system.build.toplevel} $out/system
|
||||
ln -s ${pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${config.system.name}-vm
|
||||
ln -s ${cfg.host.pkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${config.system.name}-vm
|
||||
'';
|
||||
|
||||
# When building a regular system configuration, override whatever
|
||||
|
|
|
|||
|
|
@ -1,5 +1,17 @@
|
|||
{ lib, fetchFromGitHub, rustPlatform, alsa-lib, atk, cairo, dbus, gdk-pixbuf, glib, gtk3, pango, pkg-config }:
|
||||
{ lib, fetchFromGitHub, rustPlatform, alsa-lib, atk, cairo, dbus, gdk-pixbuf, glib, gtk3, pango, pkg-config, makeDesktopItem }:
|
||||
|
||||
let
|
||||
desktopItem = makeDesktopItem {
|
||||
name = "Psst";
|
||||
exec = "psst-gui";
|
||||
comment = "Fast and multi-platform Spotify client with native GUI";
|
||||
desktopName = "Psst";
|
||||
type = "Application";
|
||||
categories = [ "Audio" "AudioVideo" ];
|
||||
icon = "psst";
|
||||
terminal = false;
|
||||
};
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "psst";
|
||||
version = "unstable-2022-05-19";
|
||||
|
|
@ -29,7 +41,10 @@ rustPlatform.buildRustPackage rec {
|
|||
];
|
||||
|
||||
postInstall = ''
|
||||
install -Dm444 psst-gui/assets/logo_512.png $out/share/icons/${pname}.png
|
||||
mkdir -pv $out/share/icons/hicolor/512x512/apps
|
||||
install -Dm444 psst-gui/assets/logo_512.png $out/share/icons/hicolor/512x512/apps/${pname}.png
|
||||
mkdir -pv $out/share/applications
|
||||
ln -s ${desktopItem}/share/applications/* $out/share/applications
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@
|
|||
}
|
||||
},
|
||||
"dev": {
|
||||
"version": "106.0.5245.0",
|
||||
"sha256": "1hpp5gcajmjf2wvgrnsrfwl879gj8w8b6asn79raqj1qf2pa7wxg",
|
||||
"sha256bin64": "1d4v2mwpbn3h533lkh8270hmj71ag9ivh7ns03qifsqsl9jv4zdv",
|
||||
"version": "106.0.5249.12",
|
||||
"sha256": "0brqn9rs3z3fdsnzjq2mr4p5c6d5fjllhfjfg39z3zmijcmd7f5y",
|
||||
"sha256bin64": "1giay4nfcyczzcgrrdxrizd4pkiy7hqqc4ni6jg4rnbalh72p78n",
|
||||
"deps": {
|
||||
"gn": {
|
||||
"version": "2022-08-11",
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "terragrunt";
|
||||
version = "0.38.8";
|
||||
version = "0.38.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gruntwork-io";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-iTKENFFST7nTsMe7KULGc/WnKrHSXRTWPm2DT5LJC00=";
|
||||
sha256 = "sha256-rfAVgnFAxEguFuY+Gfe/T0NcsD6LmPSquxuTR0bRqXQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-CqImT90jFFLi6XR7jfzFKwhnCHK6B+aM+Ba/L+G3bEg=";
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.165";
|
||||
version = "1.2.166";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-YL3hdWUmt6v58ObnVNhILtM/DSqNlFcaODhNxzPyF0o=";
|
||||
sha256 = "sha256-8LBGdjcnZTejH+lRo0im+czJJHOfhpmEB4DXM/qugYs=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-E5yDk48O7zze8QTeLQ999QmB8XLkpKNZ8JQ2wVRMGCU=";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
{
|
||||
"version": "15.3.1",
|
||||
"repo_hash": "sha256-WSo1yh/stYzbNWS1XOO4wf4Jg4vvfGn3ugje1kMTtiA=",
|
||||
"yarn_hash": "1cmz4815vfrgnh6khnx1hi0nnkz5xcrx8cqd9dxyd66pzwlyllx0",
|
||||
"version": "15.3.2",
|
||||
"repo_hash": "sha256-MZ8sDfJh2sw+Tu5LPcH5JjznTSwfDj/3vmaGC+K8ZeY=",
|
||||
"yarn_hash": "1s2xai0q16xhp3q68hf9mxh1v429h4n5qy1iizdi7a5cmg3p3ldq",
|
||||
"owner": "gitlab-org",
|
||||
"repo": "gitlab",
|
||||
"rev": "v15.3.1-ee",
|
||||
"rev": "v15.3.2-ee",
|
||||
"passthru": {
|
||||
"GITALY_SERVER_VERSION": "15.3.1",
|
||||
"GITALY_SERVER_VERSION": "15.3.2",
|
||||
"GITLAB_PAGES_VERSION": "1.62.0",
|
||||
"GITLAB_SHELL_VERSION": "14.10.0",
|
||||
"GITLAB_WORKHORSE_VERSION": "15.3.1"
|
||||
"GITLAB_WORKHORSE_VERSION": "15.3.2"
|
||||
},
|
||||
"vendored_gems": [
|
||||
"devise-pbkdf2-encryptable",
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ let
|
|||
gemdir = ./.;
|
||||
};
|
||||
|
||||
version = "15.3.1";
|
||||
version = "15.3.2";
|
||||
package_version = "v${lib.versions.major version}";
|
||||
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ let
|
|||
owner = "gitlab-org";
|
||||
repo = "gitaly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-g2w75eTjRUsKc2A0rue4Ei45nXrM0NjQk0LhRuhdUXQ=";
|
||||
sha256 = "sha256-7OAB+oHY7OBCZ4rjiS+qQIPtpYRFS8xqOkUjgWj+Qp8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-aPCcTS5zflpjzb2L/oDOQotdL8cFsgKPa8b+lhCpbag=";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ in
|
|||
buildGoModule rec {
|
||||
pname = "gitlab-workhorse";
|
||||
|
||||
version = "15.3.1";
|
||||
version = "15.3.2";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = data.owner;
|
||||
|
|
|
|||
|
|
@ -533,7 +533,7 @@ gem 'valid_email', '~> 0.1'
|
|||
# JSON
|
||||
gem 'json', '~> 2.5.1'
|
||||
gem 'json_schemer', '~> 0.2.18'
|
||||
gem 'oj', '~> 3.13.20'
|
||||
gem 'oj', '~> 3.13.21'
|
||||
gem 'multi_json', '~> 1.14.1'
|
||||
gem 'yajl-ruby', '~> 1.4.3', require: 'yajl'
|
||||
|
||||
|
|
|
|||
|
|
@ -887,7 +887,7 @@ GEM
|
|||
plist (~> 3.1)
|
||||
train-core
|
||||
wmi-lite (~> 1.0)
|
||||
oj (3.13.20)
|
||||
oj (3.13.21)
|
||||
omniauth (1.9.1)
|
||||
hashie (>= 3.4.6)
|
||||
rack (>= 1.6.2, < 3)
|
||||
|
|
@ -1651,7 +1651,7 @@ DEPENDENCIES
|
|||
oauth2 (~> 2.0)
|
||||
octokit (~> 4.15)
|
||||
ohai (~> 16.10)
|
||||
oj (~> 3.13.20)
|
||||
oj (~> 3.13.21)
|
||||
omniauth (~> 1.8)
|
||||
omniauth-alicloud (~> 1.0.1)
|
||||
omniauth-atlassian-oauth2 (~> 0.2.0)
|
||||
|
|
|
|||
|
|
@ -3505,10 +3505,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1iiavwlx9k3v9vyj2pswnc88vmn60prrg8dnsrpg4iglh40da64m";
|
||||
sha256 = "0ihfnl0maszdq821h6mivr8xickjab6ccyncnm5rn2vgrj6imwxf";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.13.20";
|
||||
version = "3.13.21";
|
||||
};
|
||||
omniauth = {
|
||||
dependencies = ["hashie" "rack"];
|
||||
|
|
|
|||
|
|
@ -1,23 +1,31 @@
|
|||
{ lib, stdenv, fetchurl, SDL2, ftgl, pkg-config, libpng, libjpeg, pcre
|
||||
, SDL2_image, freetype, glew, libGLU, libGL, boost, glm
|
||||
{ lib, stdenv, fetchurl, SDL2, ftgl, pkg-config, libpng, libjpeg, pcre2
|
||||
, SDL2_image, freetype, glew, libGLU, libGL, boost, glm, tinyxml
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.51";
|
||||
pname = "gource";
|
||||
version = "0.53";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/acaudwell/Gource/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
|
||||
sha256 = "16p7b1x4r0915w883lp374jcdqqja37fnb7m8vnsfnl2n64gi8qr";
|
||||
hash = "sha256-PV9kwcaBL2RMMgy8mphY35e8YDb8Hl9gPKRrFbjdcjc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# remove bundled library
|
||||
rm -r src/tinyxml
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL
|
||||
boost glm freetype
|
||||
glew SDL2 ftgl libpng libjpeg pcre2 SDL2_image libGLU libGL
|
||||
boost glm freetype tinyxml
|
||||
];
|
||||
|
||||
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
|
||||
configureFlags = [
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--with-tinyxml"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = https://lamdera.com;
|
||||
homepage = "https://lamdera.com";
|
||||
license = licenses.unfree;
|
||||
description = "A delightful platform for full-stack web apps";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libcouchbase";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "couchbase";
|
||||
repo = "libcouchbase";
|
||||
rev = version;
|
||||
sha256 = "sha256-Fyx8qGojlWMlDCnuG+Ks2L2/Kf94GC+/0YiV3JjZgS8=";
|
||||
sha256 = "sha256-nGZHAp2ajGHNHjfKTAQrQSlBmyufzP9V8/vRO6S8Ui0=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ "-DLCB_NO_MOCK=ON" ];
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "webkitgtk";
|
||||
version = "2.36.6";
|
||||
version = "2.36.7";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-EZO8ghlGM2d28N+l4NylZR8eVxV+2hLaRyHSRB8kpho=";
|
||||
sha256 = "sha256-DCYM8rMvBIHQF2cN/tG2HlVJZ80GcZVgbJ+etf5zF0M=";
|
||||
};
|
||||
|
||||
patches = lib.optionals stdenv.isLinux [
|
||||
|
|
|
|||
|
|
@ -2,17 +2,15 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "lwt_log";
|
||||
version = "1.1.1";
|
||||
version = "1.1.2";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
minimumOCamlVersion = "4.02";
|
||||
minimalOCamlVersion = "4.03";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aantron";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1n12i1rmn9cjn6p8yr6qn5dwbrwvym7ckr7bla04a1xnq8qlcyj7";
|
||||
sha256 = "sha256-ODTD3KceEnrEzD01CeuNg4BNKOtKZEpYaDIB+RIte1U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ lwt ];
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, ppx_sexp_conv
|
||||
, sexplib
|
||||
, stdio
|
||||
, pytorch
|
||||
, torch
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
|
|
@ -37,16 +37,16 @@ buildDunePackage rec {
|
|||
ctypes
|
||||
npy
|
||||
ocaml-compiler-libs
|
||||
pytorch
|
||||
pytorch.dev
|
||||
ppx_custom_printf
|
||||
ppx_expect
|
||||
ppx_sexp_conv
|
||||
sexplib
|
||||
stdio
|
||||
torch
|
||||
torch.dev
|
||||
];
|
||||
|
||||
preBuild = "export LIBTORCH=${pytorch.dev}/";
|
||||
preBuild = "export LIBTORCH=${torch.dev}/";
|
||||
|
||||
doCheck = !stdenv.isAarch64;
|
||||
checkPhase = "dune runtest";
|
||||
|
|
@ -56,6 +56,6 @@ buildDunePackage rec {
|
|||
description = "Ocaml bindings to Pytorch";
|
||||
maintainers = [ maintainers.bcdarwin ];
|
||||
license = licenses.asl20;
|
||||
broken = lib.versionAtLeast pytorch.version "1.11";
|
||||
broken = lib.versionAtLeast torch.version "1.11";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
, fn
|
||||
, pyopengl
|
||||
, seaborn
|
||||
, pytorch
|
||||
, torch
|
||||
, pythonOlder
|
||||
, torchvision
|
||||
}:
|
||||
|
|
@ -43,7 +43,7 @@ buildPythonPackage rec {
|
|||
|
||||
checkInputs = [
|
||||
xvfb-run
|
||||
pytorch
|
||||
torch
|
||||
torchvision
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
, coqpit
|
||||
, fsspec
|
||||
, pytorch-bin
|
||||
, torch-bin
|
||||
, tensorboardx
|
||||
, protobuf
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ buildPythonPackage {
|
|||
propagatedBuildInputs = [
|
||||
coqpit
|
||||
fsspec
|
||||
pytorch-bin
|
||||
torch-bin
|
||||
soundfile
|
||||
tensorboardx
|
||||
protobuf
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytorch
|
||||
, torch
|
||||
, ninja
|
||||
, scipy
|
||||
, which
|
||||
|
|
@ -48,7 +48,7 @@ buildPythonPackage rec {
|
|||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ pytorch pybind11 ];
|
||||
propagatedBuildInputs = [ torch pybind11 ];
|
||||
|
||||
checkInputs = [
|
||||
which
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, lib
|
||||
, poetry
|
||||
, pytestCheckHook
|
||||
, pytorch
|
||||
, torch
|
||||
, pyyaml
|
||||
, sh
|
||||
, tables
|
||||
|
|
@ -66,7 +66,7 @@ buildPythonPackage rec {
|
|||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
pytorch
|
||||
torch
|
||||
sh
|
||||
tensorflow
|
||||
];
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, scipy
|
||||
, matplotlib
|
||||
, scikit-learn
|
||||
, pytorch
|
||||
, torch
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
|||
scipy
|
||||
matplotlib
|
||||
scikit-learn
|
||||
pytorch
|
||||
torch
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, ninja
|
||||
, pytestCheckHook
|
||||
, python
|
||||
, pytorch
|
||||
, torch
|
||||
, pybind11
|
||||
, which
|
||||
}:
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
# `setup.py` imports `torch.utils.cpp_extension`.
|
||||
nativeBuildInputs = [
|
||||
ninja
|
||||
pytorch
|
||||
torch
|
||||
which
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, matplotlib
|
||||
, mock
|
||||
, packaging
|
||||
, pytorch
|
||||
, torch
|
||||
, scikit-learn
|
||||
, tqdm
|
||||
}:
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ];
|
||||
propagatedBuildInputs = [ packaging pytorch scikit-learn tqdm ];
|
||||
propagatedBuildInputs = [ packaging torch scikit-learn tqdm ];
|
||||
|
||||
# runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite.
|
||||
doCheck = pythonOlder "3.9";
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, ignite
|
||||
, numpy
|
||||
, pybind11
|
||||
, pytorch
|
||||
, torch
|
||||
, which
|
||||
}:
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
|
||||
nativeBuildInputs = [ ninja which ];
|
||||
buildInputs = [ pybind11 ];
|
||||
propagatedBuildInputs = [ numpy pytorch ignite ];
|
||||
propagatedBuildInputs = [ numpy torch ignite ];
|
||||
|
||||
BUILD_MONAI = 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, scikit-learn
|
||||
, pytorch
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pydata-sphinx-theme";
|
||||
version = "0.9.0";
|
||||
version = "0.10.1";
|
||||
|
||||
format = "wheel";
|
||||
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
dist = "py3";
|
||||
python = "py3";
|
||||
pname = "pydata_sphinx_theme";
|
||||
sha256 = "sha256-sitEKm1kN+Xq8KHwVxaf/LMeqp8Qvn1UgaEl5zXHHBI=";
|
||||
sha256 = "sha256-RzH5N8f0L1Fukn1Svgo1ara5AWmK74MxsJfmxP2BAPQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, buildPythonPackage
|
||||
, numpy
|
||||
, scipy
|
||||
, pytorch
|
||||
, torch
|
||||
, autograd
|
||||
, nose2
|
||||
, matplotlib
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-dqyduExNgXIbEFlgkckaPfhLFSVLqPgwAOyBUdowwiQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy pytorch ];
|
||||
propagatedBuildInputs = [ numpy scipy torch ];
|
||||
checkInputs = [ nose2 autograd matplotlib tensorflow ];
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
, pillow
|
||||
, pyro-api
|
||||
, pythonOlder
|
||||
, pytorch
|
||||
, torch
|
||||
, scikit-learn
|
||||
, seaborn
|
||||
, torchvision
|
||||
|
|
@ -32,7 +32,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
pyro-api
|
||||
pytorch
|
||||
torch
|
||||
networkx
|
||||
opt-einsum
|
||||
tqdm
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, fsspec
|
||||
, packaging
|
||||
, pytestCheckHook
|
||||
, pytorch
|
||||
, torch
|
||||
, pyyaml
|
||||
, tensorboard
|
||||
, torchmetrics
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
packaging
|
||||
future
|
||||
fsspec
|
||||
pytorch
|
||||
torch
|
||||
pyyaml
|
||||
tensorboard
|
||||
torchmetrics
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, numpy
|
||||
, scikit-learn
|
||||
, pytestCheckHook
|
||||
, pytorch
|
||||
, torch
|
||||
, torchvision
|
||||
, tqdm
|
||||
, faiss
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
pytorch
|
||||
torch
|
||||
scikit-learn
|
||||
torchvision
|
||||
tqdm
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
, onnx
|
||||
, packaging
|
||||
, pytestCheckHook
|
||||
, pytorch
|
||||
, torch
|
||||
, torchvision
|
||||
, typing-extensions
|
||||
}:
|
||||
|
|
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
|||
sha256 = "sha256-w4WSEgNLdVLDnKS4kzJBK9BkrrGzbk2aCIhk4HCM/Bk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy packaging pytorch typing-extensions ];
|
||||
propagatedBuildInputs = [ numpy packaging torch typing-extensions ];
|
||||
|
||||
checkInputs = [ onnx pytestCheckHook torchvision ];
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
, pandas
|
||||
, pillow
|
||||
, six
|
||||
, pytorch
|
||||
, torch
|
||||
, torchvision
|
||||
, tqdm
|
||||
, lib
|
||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
h5py hickle numpy pandas pillow six pytorch torchvision tqdm
|
||||
h5py hickle numpy pandas pillow six torch torchvision tqdm
|
||||
];
|
||||
|
||||
checkInputs = [ pytest ];
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
, sparse
|
||||
# Optional inputs
|
||||
, withTorch ? true
|
||||
, pytorch
|
||||
, torch
|
||||
# Check Inputs
|
||||
, pytestCheckHook
|
||||
, ddt
|
||||
|
|
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
|||
qiskit-terra
|
||||
scikit-learn
|
||||
sparse
|
||||
] ++ lib.optional withTorch pytorch;
|
||||
] ++ lib.optional withTorch torch;
|
||||
|
||||
doCheck = false; # TODO: enable. Tests fail on unstable due to some multithreading issue?
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
, pytest-cov
|
||||
, dill
|
||||
, numpy
|
||||
, pytorch
|
||||
, torch
|
||||
, threadpoolctl
|
||||
, tqdm
|
||||
}:
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
sha256 = "15wYWToXRae1cMpHWbJwzAp0THx6ED9ixQgL+n1v9PI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy pytorch threadpoolctl tqdm ];
|
||||
propagatedBuildInputs = [ numpy torch threadpoolctl tqdm ];
|
||||
checkInputs = [ dill pytest-cov pytestCheckHook ];
|
||||
|
||||
disabledTests = [ "test_affine" ]; # deprecated division operator '/'
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, flaky
|
||||
, numpy
|
||||
, pandas
|
||||
, pytorch
|
||||
, torch
|
||||
, scikit-learn
|
||||
, scipy
|
||||
, tabulate
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
sha256 = "b35cb4e50045742f0ffcfad33044af691d5d36b50212573753a804483a947ca9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy pytorch scikit-learn scipy tabulate tqdm ];
|
||||
propagatedBuildInputs = [ numpy torch scikit-learn scipy tabulate tqdm ];
|
||||
checkInputs = [ pytest pytest-cov flaky pandas pytestCheckHook ];
|
||||
|
||||
disabledTests = [
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, isPy27
|
||||
, pytestCheckHook
|
||||
, pandas
|
||||
, pytorch
|
||||
, torch
|
||||
, scipy
|
||||
}:
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ buildPythonPackage rec {
|
|||
sha256 = "f5d5f7b45f98d155b9c0ba6554fa9770c6b26d5793a3e77a1030fb56910ebeec";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook pandas pytorch scipy ];
|
||||
checkInputs = [ pytestCheckHook pandas torch scipy ];
|
||||
|
||||
disabledTests = [
|
||||
# IndexError: too many indices for array
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, dataclasses
|
||||
, pytorch
|
||||
, torch
|
||||
, pythonOlder
|
||||
, spacy
|
||||
, spacy-alignments
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pytorch
|
||||
torch
|
||||
spacy
|
||||
spacy-alignments
|
||||
srsly
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, protobuf
|
||||
, requests
|
||||
, six
|
||||
, pytorch
|
||||
, torch
|
||||
, tqdm
|
||||
}:
|
||||
|
||||
|
|
@ -30,7 +30,7 @@ buildPythonPackage rec {
|
|||
protobuf
|
||||
requests
|
||||
six
|
||||
pytorch
|
||||
torch
|
||||
tqdm
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
, pillow
|
||||
, protobuf3_8
|
||||
, pytestCheckHook
|
||||
, pytorch
|
||||
, torch
|
||||
, six
|
||||
, soundfile
|
||||
, tensorboard
|
||||
|
|
@ -55,7 +55,7 @@ buildPythonPackage rec {
|
|||
moto
|
||||
pillow
|
||||
pytestCheckHook
|
||||
pytorch
|
||||
torch
|
||||
tensorboard
|
||||
torchvision
|
||||
];
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, imageio
|
||||
, numpy
|
||||
, pandas
|
||||
, pytorch
|
||||
, torch
|
||||
, tensorboard
|
||||
}:
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ buildPythonPackage rec {
|
|||
imageio
|
||||
numpy
|
||||
pandas
|
||||
pytorch
|
||||
torch
|
||||
tensorboard
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, lib
|
||||
, pandas
|
||||
, pytestCheckHook
|
||||
, pytorch
|
||||
, torch
|
||||
, tensorboard
|
||||
, torchvision
|
||||
}:
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
|
||||
propagatedBuildInputs = [ pandas tensorboard ];
|
||||
|
||||
checkInputs = [ pytestCheckHook pytorch torchvision ];
|
||||
checkInputs = [ pytestCheckHook torch torchvision ];
|
||||
|
||||
disabledTests = [
|
||||
# Tests that attempt to access the filesystem in naughty ways.
|
||||
|
|
|
|||
|
|
@ -24,8 +24,8 @@ let
|
|||
in buildPythonPackage {
|
||||
inherit version;
|
||||
|
||||
pname = "pytorch";
|
||||
# Don't forget to update pytorch to the same version.
|
||||
pname = "torch";
|
||||
# Don't forget to update torch to the same version.
|
||||
|
||||
format = "wheel";
|
||||
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# Warning: use the same CUDA version as pytorch-bin.
|
||||
# Warning: use the same CUDA version as torch-bin.
|
||||
#
|
||||
# Precompiled wheels can be found at:
|
||||
# https://download.pytorch.org/whl/torch_stable.html
|
||||
|
|
@ -120,8 +120,8 @@ let
|
|||
"LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH ";
|
||||
|
||||
in buildPythonPackage rec {
|
||||
pname = "pytorch";
|
||||
# Don't forget to update pytorch-bin to the same version.
|
||||
pname = "torch";
|
||||
# Don't forget to update torch-bin to the same version.
|
||||
version = "1.11.0";
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
, isPy39
|
||||
, isPy310
|
||||
, python
|
||||
, pytorch-bin
|
||||
, torch-bin
|
||||
, pythonOlder
|
||||
, pythonAtLeast
|
||||
}:
|
||||
|
|
@ -26,7 +26,7 @@ buildPythonPackage rec {
|
|||
disabled = !(isPy37 || isPy38 || isPy39 || isPy310);
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pytorch-bin
|
||||
torch-bin
|
||||
];
|
||||
|
||||
# The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.
|
||||
|
|
@ -38,7 +38,7 @@ buildPythonPackage rec {
|
|||
# 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 ]}:${pytorch-bin}/${python.sitePackages}/torch/lib:" \
|
||||
patchelf --set-rpath "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}:${torch-bin}/${python.sitePackages}/torch/lib:" \
|
||||
"$out/${python.sitePackages}/torchaudio/_torchaudio.so"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Warning: Need to update at the same time as pytorch-bin
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
, isPy27
|
||||
, pytest-runner
|
||||
, pytestCheckHook
|
||||
, pytorch
|
||||
, torch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
sha256 = "0ki0njhmz1i3pkpr3y6h6ac7p5qh1kih06mknc2s18mfw34f2l55";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pytorch ];
|
||||
propagatedBuildInputs = [ torch ];
|
||||
|
||||
checkInputs = [ pytest-runner pytestCheckHook ];
|
||||
disabledTests = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pytorch
|
||||
, torch
|
||||
, torchvision
|
||||
}:
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pytorch
|
||||
torch
|
||||
torchvision
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
, packaging
|
||||
, psutil
|
||||
, py-deprecate
|
||||
, pytorch
|
||||
, torch
|
||||
, pytestCheckHook
|
||||
, torchmetrics
|
||||
, pytorch-lightning
|
||||
|
|
@ -34,7 +34,7 @@ buildPythonPackage {
|
|||
|
||||
# Let the user bring their own instance
|
||||
buildInputs = [
|
||||
pytorch
|
||||
torch
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
, patchelf
|
||||
, pillow
|
||||
, python
|
||||
, pytorch-bin
|
||||
, torch-bin
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -34,7 +34,7 @@ in buildPythonPackage {
|
|||
|
||||
propagatedBuildInputs = [
|
||||
pillow
|
||||
pytorch-bin
|
||||
torch-bin
|
||||
];
|
||||
|
||||
# The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.
|
||||
|
|
@ -48,7 +48,7 @@ in buildPythonPackage {
|
|||
# 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}:${pytorch-bin}/${python.sitePackages}/torch/lib:" \
|
||||
patchelf --set-rpath "${rpath}:${torch-bin}/${python.sitePackages}/torch/lib:" \
|
||||
"$out/${python.sitePackages}/torchvision/_C.so"
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# Warning: use the same CUDA version as pytorch-bin.
|
||||
# Warning: use the same CUDA version as torch-bin.
|
||||
#
|
||||
# Precompiled wheels can be found at:
|
||||
# https://download.pytorch.org/whl/torch_stable.html
|
||||
|
|
|
|||
|
|
@ -9,19 +9,19 @@
|
|||
, numpy
|
||||
, scipy
|
||||
, pillow
|
||||
, pytorch
|
||||
, torch
|
||||
, pytest
|
||||
, cudaSupport ? pytorch.cudaSupport or false # by default uses the value from pytorch
|
||||
, cudaSupport ? torch.cudaSupport or false # by default uses the value from torch
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (pytorch.cudaPackages) cudatoolkit cudnn;
|
||||
inherit (torch.cudaPackages) cudatoolkit cudnn;
|
||||
|
||||
cudatoolkit_joined = symlinkJoin {
|
||||
name = "${cudatoolkit.name}-unsplit";
|
||||
paths = [ cudatoolkit.out cudatoolkit.lib ];
|
||||
};
|
||||
cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList;
|
||||
cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" torch.cudaArchList;
|
||||
in buildPythonPackage rec {
|
||||
pname = "torchvision";
|
||||
version = "0.13.0";
|
||||
|
|
@ -42,7 +42,7 @@ in buildPythonPackage rec {
|
|||
buildInputs = [ libjpeg_turbo libpng ]
|
||||
++ lib.optionals cudaSupport [ cudnn ];
|
||||
|
||||
propagatedBuildInputs = [ numpy pillow pytorch scipy ];
|
||||
propagatedBuildInputs = [ numpy pillow torch scipy ];
|
||||
|
||||
preBuild = lib.optionalString cudaSupport ''
|
||||
export TORCH_CUDA_ARCH_LIST="${cudaArchStr}"
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "towncrier";
|
||||
version = "21.9.0";
|
||||
version = "22.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-nLb0XBbhoe7J0OdlEWXnvmDNCrgdE6XJbKl6SYrof0g=";
|
||||
sha256 = "sha256-fTg5sDOFm0X7Vd+Ct0z9cCQxkzwMyfKHpafqPgXQQss=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
, scikit-learn
|
||||
, pillow
|
||||
, pyyaml
|
||||
, pytorch
|
||||
, torch
|
||||
, tokenizers
|
||||
, tqdm
|
||||
}:
|
||||
|
|
@ -67,7 +67,7 @@ buildPythonPackage rec {
|
|||
# tf2onnx
|
||||
];
|
||||
torch = [
|
||||
pytorch
|
||||
torch
|
||||
];
|
||||
tokenizers = [
|
||||
tokenizers
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "unicrypto";
|
||||
version = "0.0.8";
|
||||
version = "0.0.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BIf53ZAJwybulTGnlBKuGK1nNCWhyADWSUe5b96wTN8=";
|
||||
hash = "sha256-nV3YWK1a1gj6UkmHsX6IVdZNbSRQygyhFjj02S/GyAs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pytorch
|
||||
, torch
|
||||
, pyyaml
|
||||
, requests
|
||||
, scikit-learn
|
||||
|
|
@ -94,7 +94,7 @@ buildPythonPackage rec {
|
|||
pytest-mock
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
pytorch
|
||||
torch
|
||||
scikit-learn
|
||||
tqdm
|
||||
];
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "frugal";
|
||||
version = "3.16.1";
|
||||
version = "3.16.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Workiva";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-u8+4wBadgyzw1XfZChmI/K2nkSoRZ0Yp+Q8V7NrDQ3E=";
|
||||
sha256 = "sha256-zZ4CueyDugaOY62KCyTcbF2QVvp0N8pI/ChmQSscn1w=";
|
||||
};
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
vendorSha256 = "sha256-QtF2MdZCO6CsoRD25yaQ6h8n/j/9fHogJaVZNQ2RbDs=";
|
||||
vendorSha256 = "sha256-0pPSEYPGluuRsDuTa2wmDPY6PqG3+YeJG6mphf8X96M=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Thrift improved";
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "ginkgo";
|
||||
version = "2.1.4";
|
||||
version = "2.1.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onsi";
|
||||
repo = "ginkgo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-5MVOJingEJojJA79nHJDWwso3eunjox/d+JzX11X46Q=";
|
||||
sha256 = "sha256-y/GLX6dHQfuH8QVC+A8biGiEhy2XZqzFz7J14zVX/zU=";
|
||||
};
|
||||
vendorSha256 = "sha256-RFI87HCw+/4J8YKLZ7Kt7D2PNmwr1qXEiHCCLlBHtPA=";
|
||||
vendorSha256 = "sha256-QXrRsDaWoPp4mbgS7nV/5c5Z5Ca6PyoDpfrjvtoHK4Q=";
|
||||
|
||||
# integration tests expect more file changes
|
||||
# types tests are missing CodeLocation
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "circleci-cli";
|
||||
version = "0.1.20788";
|
||||
version = "0.1.20856";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CircleCI-Public";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-noREDDxy4p7LVvTehzbPPKY5Bt9r/kJii6Q//JiCD0A=";
|
||||
sha256 = "sha256-lYePUN4z/Oz9UXjxyrkG8jBMRwZopU9Jzw/mMMTs+oo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jrAd1G/NCjXfaJmzOhMjMZfJoGHsQ1bi3HudBM0e8rE=";
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "pwndbg";
|
||||
version = "2022.01.05";
|
||||
version = "2022.08.30";
|
||||
format = "other";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pwndbg";
|
||||
repo = "pwndbg";
|
||||
rev = version;
|
||||
sha256 = "sha256-24WWA3wLUxylC8LkukwTOcqbpxpAg8DfrEkI3Ikyzlk=";
|
||||
sha256 = "sha256-rMdpNJonzbHyTXbnr6MtlVUmfAfLiCHaVSzuQRhtVpE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "rtl8189es-${kernel.version}-${version}";
|
||||
version = "2022-05-21";
|
||||
version = "2022-08-30";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jwrdegoede";
|
||||
repo = "rtl8189ES_linux";
|
||||
rev = "1269e117454069cd47f1822ffa31e29ec19a10da";
|
||||
sha256 = "sha256-3d16zu9RxPKO9uAjHNu/+9z++smH1LSXHmrB0FnQt+E=";
|
||||
rev = "c93cfd712a3acd2ecdeda19a66d269c20f8803f1";
|
||||
sha256 = "sha256-bBUxo8lplFwXfsSNf5lz9XCpQ6M0vWelmFoCal95FpI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ bc nukeReferences ] ++ kernel.moduleBuildDependencies;
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
{ fetchurl, fetchzip }:
|
||||
{
|
||||
x86_64-darwin = fetchzip {
|
||||
sha256 = "sha256-SLGzciTzzvW0DTG8v6lNb1IovbOjxBFgFVjNY6MEyKY=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_darwin_amd64.zip";
|
||||
sha256 = "sha256-QS/GMUXZ3FlBDfgLXEUeqWb4jNDXaRpRlieWjxmMe5U=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_darwin_amd64.zip";
|
||||
};
|
||||
aarch64-darwin = fetchzip {
|
||||
sha256 = "sha256-d7hnCM7BJuYfSH89jv516uVyKTMueQmVKQxEeTGIDUE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_darwin_arm64.zip";
|
||||
sha256 = "sha256-LQcIlQUbL7fDQQKKEr5HdL87O/dv7sD4ESqAxfeMo28=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_darwin_arm64.zip";
|
||||
};
|
||||
i686-linux = fetchurl {
|
||||
sha256 = "sha256-wTmUF6NHWis4dyw/bPjAjvZ0aQ1l1BCDlm6eLu4m/0o=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_linux_386.tar.gz";
|
||||
sha256 = "sha256-VIvQ+dhPi+gCGoCwwmnNscFPqfTCNqZdZsMYFYSFCuE=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_linux_386.tar.gz";
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
sha256 = "sha256-Mxe9Gb1ErrZZl3a+0SqC/0ghoeV51X93YxIOs9gM2lY=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_linux_amd64.tar.gz";
|
||||
sha256 = "sha256-aTZ/nfzJBJX7pV/xn/7QwPvK95GY5DIzeNs4O/6UBDw=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_linux_amd64.tar.gz";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
sha256 = "sha256-SyHuzXAe24Nf0v9Ds3Z+cbXoIVLCJSj243I6B0XWBlM=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_linux_arm64.tar.gz";
|
||||
sha256 = "sha256-aYPMMjI7azFtGUvPy2KnS0o7lTmtsOaOVgIFCWkfNi4=";
|
||||
url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.11/AdGuardHome_linux_arm64.tar.gz";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "adguardhome";
|
||||
version = "0.107.9";
|
||||
version = "0.107.11";
|
||||
src = sources.${system} or (throw "Source for ${pname} is not available for ${system}");
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ let
|
|||
in
|
||||
buildGoModule rec {
|
||||
pname = "minio";
|
||||
version = "2022-08-25T07-17-05Z";
|
||||
version = "2022-08-26T19-53-15Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "minio";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-Rqgac/F1KPa94xg46fqRNAKSilrIMaCphuuf07HuIcY=";
|
||||
sha256 = "sha256-VZsByVcErl6dts8OlggEFnvA+9ds8ZgQvZkCb53bSac=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-eAHL8UsRllnZ5frWYxXXYlkvf9QmrcvJHx5wEcbGeM4=";
|
||||
|
|
|
|||
|
|
@ -32,20 +32,21 @@ let
|
|||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
pname = "tts";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coqui-ai";
|
||||
repo = "TTS";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ch+711soRfZj1egyaF0+6NrUJtf7JqfZuxQ4eDf1zas=";
|
||||
sha256 = "sha256-A48L1JGXckSEaZra00ZOBVxcYJMvhpQqzE8nABaP0TY=";
|
||||
};
|
||||
|
||||
postPatch = let
|
||||
relaxedConstraints = [
|
||||
"cython"
|
||||
"gruut"
|
||||
"inflect"
|
||||
"librosa"
|
||||
"mecab-python3"
|
||||
"numba"
|
||||
|
|
@ -84,11 +85,11 @@ python.pkgs.buildPythonApplication rec {
|
|||
pandas
|
||||
pypinyin
|
||||
pysbd
|
||||
pytorch-bin
|
||||
pyworld
|
||||
scipy
|
||||
soundfile
|
||||
tensorflow
|
||||
torch-bin
|
||||
torchaudio-bin
|
||||
tqdm
|
||||
umap-learn
|
||||
|
|
@ -138,8 +139,6 @@ python.pkgs.buildPythonApplication rec {
|
|||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Requires network acccess to download models
|
||||
"tests/aux_tests/test_remove_silence_vad_script.py"
|
||||
# phonemes mismatch between espeak-ng and gruuts phonemizer
|
||||
"tests/text_tests/test_phonemizer.py"
|
||||
# no training, it takes too long
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "chezmoi";
|
||||
version = "2.21.0";
|
||||
version = "2.21.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "twpayne";
|
||||
repo = "chezmoi";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-93f01YfCold2lUoCjnmIpwUR2pDvJ8Ph+QKEvZLL02Y=";
|
||||
sha256 = "sha256-WBshiEohUO58LSRpbwunXfSRvnYtnB8g+1zUZTZtUOg=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-jFXK/VvOyL9JUrMkzAZA++ydPKH0iL+4oH2YD1uh9CQ=";
|
||||
vendorSha256 = "sha256-KcUe3Wbco+s4Zt3TS6C60AYiCuTAW5qdz+x68UBPALY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "goreleaser";
|
||||
version = "1.10.3";
|
||||
version = "1.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "goreleaser";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+xrjIef8ToN07sfgZt/R5ZfCJ68v9293dSfaOwh1kmI=";
|
||||
sha256 = "sha256-3kaoBmq/GXZMSlShgI/ykxnOMn9DrdNAFuUcCGItZW4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-sJHq2ZSeCpUXhcF5HZQxIE0Jkutnc/m86NcaDNs7a7A=";
|
||||
vendorSha256 = "sha256-7xySEPmc24yOwUerGoARsKaGIYnIvaJFjcwNvbHG4Ls=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minio-client";
|
||||
version = "2022-08-23T05-45-20Z";
|
||||
version = "2022-08-28T20-08-11Z";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "minio";
|
||||
repo = "mc";
|
||||
rev = "RELEASE.${version}";
|
||||
sha256 = "sha256-ecEoMyTdL1ckKAPPTrXHDbzB5778Jq11yqQ/UJi6yuQ=";
|
||||
sha256 = "sha256-1Cwvuyy0TRKNnhkpuXdr6ZenDa5pNjsOJA8/sczM22A=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-pq6tiVrkpf7anYAhkc0y+AB8qhqSPR93HME8AbN/cz0=";
|
||||
vendorSha256 = "sha256-rGIy+qw+n/WCJ/3rviYjz9uffSP/rcJRvPda+Hm1G3s=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "systeroid";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "orhun";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-o72tjYc+1dBLAIG75Fyt2UubjeK6j/nufjiz3wn2SdI=";
|
||||
sha256 = "sha256-+OwixA1m0/17auVNJkBv+cVhYrYgLr6Gv4qr4rzd1Xk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
|
|||
--replace '"/usr/share/doc/kernel-doc-*/Documentation/*",' '"${linux-doc}/share/doc/linux-doc/*",'
|
||||
'';
|
||||
|
||||
cargoSha256 = "sha256-8DGAiPAq+L1aWleeWEl95+hcgT+PHsxdg118U8IDyOA=";
|
||||
cargoSha256 = "sha256-FM0xX3adPmHBBJuLtTSOfAd71mBRVduMx/eqkJjw9Q0=";
|
||||
|
||||
buildInputs = [
|
||||
xorg.libxcb
|
||||
|
|
|
|||
|
|
@ -1232,7 +1232,7 @@ let
|
|||
tls-mirage = callPackage ../development/ocaml-modules/tls/mirage.nix { };
|
||||
|
||||
torch = callPackage ../development/ocaml-modules/torch {
|
||||
inherit (pkgs.python3Packages) pytorch;
|
||||
inherit (pkgs.python3Packages) torch;
|
||||
};
|
||||
|
||||
ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { };
|
||||
|
|
|
|||
|
|
@ -158,6 +158,10 @@ mapAliases ({
|
|||
python-subunit = subunit; # added 2021-09-10
|
||||
pytest_xdist = pytest-xdist; # added 2021-01-04
|
||||
python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
|
||||
pytorch = torch; # added 2022-09-30
|
||||
pytorch-bin = torch-bin; # added 2022-09-30
|
||||
pytorchWithCuda = torchWithCuda; # added 2022-09-30
|
||||
pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30
|
||||
pytwitchapi = twitchapi; # added 2022-03-07
|
||||
qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
|
||||
qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages";
|
||||
|
|
|
|||
|
|
@ -9049,28 +9049,12 @@ in {
|
|||
|
||||
pytools = callPackage ../development/python-modules/pytools { };
|
||||
|
||||
pytorch = callPackage ../development/python-modules/pytorch {
|
||||
cudaSupport = pkgs.config.cudaSupport or false;
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
|
||||
inherit (pkgs.darwin) libobjc;
|
||||
};
|
||||
|
||||
pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { };
|
||||
|
||||
pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { };
|
||||
|
||||
pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { };
|
||||
|
||||
pytorch-pfn-extras = callPackage ../development/python-modules/pytorch-pfn-extras { };
|
||||
|
||||
pytorchWithCuda = self.pytorch.override {
|
||||
cudaSupport = true;
|
||||
};
|
||||
|
||||
pytorchWithoutCuda = self.pytorch.override {
|
||||
cudaSupport = false;
|
||||
};
|
||||
|
||||
pytraccar = callPackage ../development/python-modules/pytraccar { };
|
||||
|
||||
pytradfri = callPackage ../development/python-modules/pytradfri { };
|
||||
|
|
@ -10937,6 +10921,23 @@ in {
|
|||
|
||||
toposort = callPackage ../development/python-modules/toposort { };
|
||||
|
||||
torch = callPackage ../development/python-modules/torch {
|
||||
cudaSupport = pkgs.config.cudaSupport or false;
|
||||
inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
|
||||
inherit (pkgs.darwin) libobjc;
|
||||
};
|
||||
|
||||
torch-bin = callPackage ../development/python-modules/torch/bin.nix { };
|
||||
|
||||
|
||||
torchWithCuda = self.torch.override {
|
||||
cudaSupport = true;
|
||||
};
|
||||
|
||||
torchWithoutCuda = self.torch.override {
|
||||
cudaSupport = false;
|
||||
};
|
||||
|
||||
torch-tb-profiler = callPackage ../development/python-modules/torch-tb-profiler/default.nix { };
|
||||
|
||||
torchaudio-bin = callPackage ../development/python-modules/torchaudio/bin.nix { };
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ let
|
|||
python3.pkgs.libgpuarray = linux;
|
||||
python3.pkgs.tensorflowWithCuda = linux;
|
||||
python3.pkgs.pyrealsense2WithCuda = linux;
|
||||
python3.pkgs.pytorchWithCuda = linux;
|
||||
python3.pkgs.torchWithCuda = linux;
|
||||
python3.pkgs.jaxlib = linux;
|
||||
}) // (genAttrs packageSets evalPackageSet));
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue