forked from mirrors/nixpkgs
Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
2e421aaac4
|
|
@ -52,4 +52,7 @@ in
|
|||
};
|
||||
|
||||
};
|
||||
|
||||
# uses extendModules
|
||||
meta.buildDocsInSandbox = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -479,6 +479,7 @@ in
|
|||
timezone = handleTest ./timezone.nix {};
|
||||
tinc = handleTest ./tinc {};
|
||||
tinydns = handleTest ./tinydns.nix {};
|
||||
tinywl = handleTest ./tinywl.nix {};
|
||||
tor = handleTest ./tor.nix {};
|
||||
# traefik test relies on docker-containers
|
||||
traefik = handleTestOn ["x86_64-linux"] ./traefik.nix {};
|
||||
|
|
|
|||
56
nixos/tests/tinywl.nix
Normal file
56
nixos/tests/tinywl.nix
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
name = "tinywl";
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ primeos ];
|
||||
};
|
||||
|
||||
machine = { config, ... }: {
|
||||
# Automatically login on tty1 as a normal user:
|
||||
imports = [ ./common/user-account.nix ];
|
||||
services.getty.autologinUser = "alice";
|
||||
|
||||
environment = {
|
||||
systemPackages = with pkgs; [ tinywl foot wayland-utils ];
|
||||
};
|
||||
|
||||
# Automatically start TinyWL when logging in on tty1:
|
||||
programs.bash.loginShellInit = ''
|
||||
if [ "$(tty)" = "/dev/tty1" ]; then
|
||||
set -e
|
||||
test ! -e /tmp/tinywl.log # Only start tinywl once
|
||||
readonly TEST_CMD="wayland-info |& tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok; read"
|
||||
readonly FOOT_CMD="foot sh -c '$TEST_CMD'"
|
||||
tinywl -s "$FOOT_CMD" |& tee /tmp/tinywl.log
|
||||
touch /tmp/tinywl-exit-ok
|
||||
fi
|
||||
'';
|
||||
|
||||
# Switch to a different GPU driver (default: -vga std), otherwise TinyWL segfaults:
|
||||
virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
|
||||
};
|
||||
|
||||
testScript = { nodes, ... }: ''
|
||||
start_all()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
# Wait for complete startup:
|
||||
machine.wait_until_succeeds("pgrep tinywl")
|
||||
machine.wait_for_file("/run/user/1000/wayland-0")
|
||||
machine.wait_until_succeeds("pgrep foot")
|
||||
machine.wait_for_file("/tmp/test-wayland-exit-ok")
|
||||
|
||||
# Make a screenshot and save the result:
|
||||
machine.screenshot("tinywl_foot")
|
||||
print(machine.succeed("cat /tmp/test-wayland.out"))
|
||||
machine.copy_from_vm("/tmp/test-wayland.out")
|
||||
|
||||
# Terminate cleanly:
|
||||
machine.send_key("alt-esc")
|
||||
machine.wait_until_fails("pgrep foot")
|
||||
machine.wait_until_fails("pgrep tinywl")
|
||||
machine.wait_for_file("/tmp/tinywl-exit-ok")
|
||||
machine.copy_from_vm("/tmp/tinywl.log")
|
||||
'';
|
||||
})
|
||||
|
|
@ -73,7 +73,6 @@ stdenv.mkDerivation rec {
|
|||
callaudiod
|
||||
gtk3
|
||||
libpeas
|
||||
libgdata # required by some dependency transitively
|
||||
sofia_sip
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
|
|||
pantheon.granite
|
||||
sqlite
|
||||
webkitgtk
|
||||
libgdata # required by some dependency transitively
|
||||
libhandy
|
||||
curl
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,39 +1,46 @@
|
|||
{ lib, fetchFromGitHub, python3Packages }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "toil";
|
||||
version = "5.4.0";
|
||||
version = "5.6.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = python3Packages.fetchPypi {
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "73c0648828bd3610c07b7648dd06d6ec27efefdb09473bf01d05d91eb899c9fd";
|
||||
sha256 = "sha256-m6tzrRCCLULO+wB8htUlt0KESLm/vdIeTzBrihnAo/I=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "docker = " "docker = 'docker' #" \
|
||||
--replace "addict = " "addict = 'addict' #"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
addict
|
||||
docker
|
||||
pytz
|
||||
pyyaml
|
||||
enlighten
|
||||
psutil
|
||||
py-tes
|
||||
python-dateutil
|
||||
dill
|
||||
];
|
||||
checkInputs = with python3Packages; [ pytestCheckHook ];
|
||||
|
||||
pytestFlagsArray = [ "src/toil/test" ];
|
||||
pythonImportsCheck = [ "toil" ];
|
||||
checkInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"src/toil/test"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"toil"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Workflow engine written in pure Python";
|
||||
homepage = "https://toil.ucsc-cgl.org/";
|
||||
license = with licenses; [ asl20 ];
|
||||
description = "Workflow engine written in pure Python";
|
||||
maintainers = with maintainers; [ veprbl ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ stdenv.mkDerivation {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/swaywm/wlroots/tree/master/tinywl";
|
||||
description = ''A "minimum viable product" Wayland compositor based on wlroots'';
|
||||
maintainers = with maintainers; [ qyliss ];
|
||||
maintainers = with maintainers; [ qyliss ] ++ wlroots.meta.maintainers;
|
||||
license = licenses.cc0;
|
||||
inherit (wlroots.meta) platforms;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -38,7 +38,15 @@ stdenv.mkDerivation rec {
|
|||
libcanberra-gtk3 pcre libphonenumber boost protobuf
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ libsecret nss nspr libical db libsoup ];
|
||||
propagatedBuildInputs = [
|
||||
db
|
||||
libsecret
|
||||
nss
|
||||
nspr
|
||||
libical
|
||||
libgdata # needed for GObject inspection, https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/57/diffs
|
||||
libsoup
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DENABLE_UOA=OFF"
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
|
|||
evolution-data-server
|
||||
gsettings-desktop-schemas
|
||||
folks
|
||||
libgdata # required by some dependency transitively
|
||||
gnome-desktop
|
||||
libhandy
|
||||
libxml2
|
||||
|
|
|
|||
|
|
@ -64,7 +64,6 @@ stdenv.mkDerivation rec {
|
|||
libhandy
|
||||
libical
|
||||
libnotify
|
||||
libgdata # required by some dependency transitively
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -57,7 +57,6 @@ stdenv.mkDerivation rec {
|
|||
libical
|
||||
libsoup
|
||||
wingpanel
|
||||
libgdata # required by some dependency transitively
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -1,18 +1,26 @@
|
|||
{ stdenv, lib, fetchFromRepoOrCz, perl, texinfo, which }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromRepoOrCz
|
||||
, perl
|
||||
, texinfo
|
||||
, which
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tcc";
|
||||
version = "unstable-2021-10-09";
|
||||
version = "0.9.27+date=2022-01-11";
|
||||
|
||||
src = fetchFromRepoOrCz {
|
||||
repo = "tinycc";
|
||||
rev = "ca11849ebb88ef4ff87beda46bf5687e22949bd6";
|
||||
sha256 = "sha256-xnUDyTYZxbxUCblACyX73boBhU073VRqSy1SWlWsvIw=";
|
||||
rev = "4e0e9b8f210d69893b306d6b24d2dd615a22f246";
|
||||
hash = "sha256-0BJ5wXsgDLBIvcbq+rL9UQC4NjLHCI9r6sUWF98APPg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ perl texinfo which ];
|
||||
|
||||
hardeningDisable = [ "fortify" ];
|
||||
nativeBuildInputs = [
|
||||
perl
|
||||
texinfo
|
||||
which
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs texi2pod.pl
|
||||
|
|
@ -46,37 +54,39 @@ stdenv.mkDerivation rec {
|
|||
install -Dt $out/lib/pkgconfig libtcc.pc -m 444
|
||||
'';
|
||||
|
||||
outputs = [ "out" "info" "man" ];
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://repo.or.cz/tinycc.git";
|
||||
description = "Small, fast, and embeddable C compiler and interpreter";
|
||||
longDescription = ''
|
||||
TinyCC (aka TCC) is a small but hyper fast C compiler. Unlike
|
||||
other C compilers, it is meant to be self-sufficient: you do not
|
||||
need an external assembler or linker because TCC does that for
|
||||
you.
|
||||
TinyCC (aka TCC) is a small but hyper fast C compiler. Unlike other C
|
||||
compilers, it is meant to be self-sufficient: you do not need an external
|
||||
assembler or linker because TCC does that for you.
|
||||
|
||||
TCC compiles so fast that even for big projects Makefiles may not
|
||||
be necessary.
|
||||
TCC compiles so fast that even for big projects Makefiles may not be
|
||||
necessary.
|
||||
|
||||
TCC not only supports ANSI C, but also most of the new ISO C99
|
||||
standard and many GNU C extensions.
|
||||
TCC not only supports ANSI C, but also most of the new ISO C99 standard
|
||||
and many GNU C extensions.
|
||||
|
||||
TCC can also be used to make C scripts, i.e. pieces of C source
|
||||
that you run as a Perl or Python script. Compilation is so fast
|
||||
that your script will be as fast as if it was an executable.
|
||||
TCC can also be used to make C scripts, i.e. pieces of C source that you
|
||||
run as a Perl or Python script. Compilation is so fast that your script
|
||||
will be as fast as if it was an executable.
|
||||
|
||||
TCC can also automatically generate memory and bound checks while
|
||||
allowing all C pointers operations. TCC can do these checks even
|
||||
if non patched libraries are used.
|
||||
TCC can also automatically generate memory and bound checks while allowing
|
||||
all C pointers operations. TCC can do these checks even if non patched
|
||||
libraries are used.
|
||||
|
||||
With libtcc, you can use TCC as a backend for dynamic code
|
||||
generation.
|
||||
With libtcc, you can use TCC as a backend for dynamic code generation.
|
||||
'';
|
||||
homepage = "https://repo.or.cz/tinycc.git";
|
||||
license = licenses.lgpl21Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.joachifm ];
|
||||
maintainers = with maintainers; [ joachifm AndersonTorres ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
# TODO: more multiple outputs
|
||||
# TODO: self-compilation
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "olm";
|
||||
version = "3.2.8";
|
||||
version = "3.2.9";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.matrix.org";
|
||||
owner = "matrix-org";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1jfhydfcnqpksb2bhi960v3h10prf4v5gx42mm2rp6p0jfbqcy50";
|
||||
sha256 = "1vcxxnhsskvnkmk5ial31mvbhs1jwriw8ngyhfslbd30fr9ylw08";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman
|
||||
, xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa
|
||||
, libpng, ffmpeg, xcbutilrenderutil, seatd, vulkan-loader, glslang
|
||||
, nixosTests
|
||||
|
||||
, enableXWayland ? true, xwayland ? null
|
||||
}:
|
||||
|
|
@ -49,6 +50,9 @@ stdenv.mkDerivation rec {
|
|||
done
|
||||
'';
|
||||
|
||||
# Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots):
|
||||
passthru.tests.tinywl = nixosTests.tinywl;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A modular Wayland compositor library";
|
||||
longDescription = ''
|
||||
|
|
|
|||
|
|
@ -6,14 +6,14 @@
|
|||
|
||||
buildDunePackage rec {
|
||||
pname = "index";
|
||||
version = "1.4.0";
|
||||
version = "1.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz";
|
||||
sha256 = "13xd858c50fs651p1y8x70323ff0gzbf6zgc0a25f6xh3rsmkn4c";
|
||||
sha256 = "sha256:01i24m1xh7vn44sq7gsxg1z0jxa6rg80bpjcp3cvg6zfjpsl7sfx";
|
||||
};
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.08";
|
||||
useDune2 = true;
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,23 +1,20 @@
|
|||
{ lib, buildDunePackage, fetchurl
|
||||
, mtime, terminal_size, alcotest, astring, fmt
|
||||
{ lib, buildDunePackage
|
||||
, fmt, logs, mtime, optint, terminal, vector
|
||||
, alcotest, astring
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "progress";
|
||||
version = "0.1.1";
|
||||
|
||||
minimumOCamlVersion = "4.08";
|
||||
minimalOCamlVersion = "4.08";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz";
|
||||
sha256 = "90c6bec19d014a4c6b0b67006f08bdfcf36981d2176769bebe0ccd75d6785a32";
|
||||
};
|
||||
inherit (terminal) version src;
|
||||
|
||||
propagatedBuildInputs = [ mtime terminal_size ];
|
||||
propagatedBuildInputs = [ fmt logs mtime optint terminal vector ];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [ alcotest astring fmt ];
|
||||
checkInputs = [ alcotest astring ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Progress bar library for OCaml";
|
||||
|
|
|
|||
30
pkgs/development/ocaml-modules/terminal/default.nix
Normal file
30
pkgs/development/ocaml-modules/terminal/default.nix
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
{ lib, buildDunePackage, fetchurl, ocaml
|
||||
, stdlib-shims, uutf, uucp
|
||||
, alcotest, fmt
|
||||
}:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "terminal";
|
||||
version = "0.2.1";
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/CraigFe/progress/releases/download/${version}/terminal-${version}.tbz";
|
||||
sha256 = "sha256:0vjqkvmpyi8kvmb4vrx3f0994rph8i9pvlrz1dyi126vlb2zbrvs";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ stdlib-shims uutf uucp ];
|
||||
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.05";
|
||||
checkInputs = [ alcotest fmt ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Basic utilities for interacting with terminals";
|
||||
homepage = "https://github.com/CraigFe/progress";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.vbgl ];
|
||||
};
|
||||
}
|
||||
|
||||
23
pkgs/development/ocaml-modules/vector/default.nix
Normal file
23
pkgs/development/ocaml-modules/vector/default.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ lib, buildDunePackage, fetchurl }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "vector";
|
||||
version = "1.0.0";
|
||||
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/backtracking/vector/releases/download/${version}/vector-${version}.tbz";
|
||||
sha256 = "sha256:0hb6prpada4c5z07sxf5ayj5xbahsnwall15vaqdwdyfjgbd24pj";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Resizable arrays for OCaml";
|
||||
license = lib.licenses.lgpl2Only;
|
||||
homepage = "https://github.com/backtracking/vector";
|
||||
maintainers = [ lib.maintainers.vbgl ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -7,7 +7,6 @@
|
|||
, clickclick
|
||||
, decorator
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, flask
|
||||
, inflection
|
||||
, jsonschema
|
||||
|
|
@ -23,14 +22,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "connexion";
|
||||
version = "2.9.0";
|
||||
version = "2.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zalando";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "13smcg2w24zr2sv1968g9p9m6f18nqx688c96qdlmldnszgzf5ik";
|
||||
sha256 = "sha256-a1wj72XpjXvhWCxRLrGeDatS8a4ij9YAm9FGhTBq/i8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -55,16 +56,20 @@ buildPythonPackage rec {
|
|||
testfixtures
|
||||
];
|
||||
|
||||
patches = [
|
||||
# No minor release for later versions, https://github.com/zalando/connexion/pull/1402
|
||||
(fetchpatch {
|
||||
name = "allow-later-flask-and-werkzeug-releases.patch";
|
||||
url = "https://github.com/zalando/connexion/commit/4a225d554d915fca17829652b7cb8fe119e14b37.patch";
|
||||
sha256 = "0dys6ymvicpqa3p8269m4yv6nfp58prq3fk1gcx1z61h9kv84g1k";
|
||||
})
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "PyYAML>=5.1,<6" "PyYAML>=5.1" \
|
||||
--replace "jsonschema>=2.5.1,<4" "jsonschema>=2.5.1"
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# We have a later PyYAML release
|
||||
"test_swagger_yaml"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "connexion" ];
|
||||
pythonImportsCheck = [
|
||||
"connexion"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Swagger/OpenAPI First framework on top of Flask";
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.14.3";
|
||||
version = "0.14.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "a7b41b522deafe47f8d3ce2b13f5a8a01f7bc715f09ebb5ca53a4af4f6987701";
|
||||
sha256 = "sha256-SipDW1ahPHnC/BYv/I+uuzCYpFtOw3b4Oiu7N9LxFik=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
49
pkgs/development/python-modules/py-tes/default.nix
Normal file
49
pkgs/development/python-modules/py-tes/default.nix
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
{ lib
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, future
|
||||
, python-dateutil
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
, requests-mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "py-tes";
|
||||
version = "0.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ohsu-comp-bio";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-HZeyCQHiqfdquWQD5axS73JDjDMUieONwm5VyA+vTFk=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
future
|
||||
python-dateutil
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"tes"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python SDK for the GA4GH Task Execution API";
|
||||
homepage = "https://github.com/ohsu-comp-bio/py-tes";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -11,6 +11,7 @@
|
|||
, patchelf
|
||||
, pyyaml
|
||||
, requests
|
||||
, setuptools
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
|
|
@ -41,6 +42,7 @@ in buildPythonPackage {
|
|||
numpy
|
||||
pyyaml
|
||||
requests
|
||||
setuptools
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
|
|
@ -72,7 +74,7 @@ in buildPythonPackage {
|
|||
# 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;
|
||||
platforms = platforms.linux;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ junjihashimoto ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,5 +22,30 @@ version : builtins.getAttr version {
|
|||
url = "https://download.pytorch.org/whl/cu113/torch-1.10.0%2Bcu113-cp39-cp39-linux_x86_64.whl";
|
||||
hash = "sha256-w8UJDh4b5cgDu7ZSvDoKzNH4hiXEyRfvpycNOg+wJOg=";
|
||||
};
|
||||
x86_64-darwin-37 = {
|
||||
name = "torch-1.10.0-cp37-none-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp37-none-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-RJkFVUcIfX736KdU8JwsTxRwKXrj5UkDY9umbHVQGyE=";
|
||||
};
|
||||
x86_64-darwin-38 = {
|
||||
name = "torch-1.10.0-cp38-none-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp38-none-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-rvevti6bF0tODl4eSkLjurO4SQpmjWZvYvfUUXVZ+/I=";
|
||||
};
|
||||
x86_64-darwin-39 = {
|
||||
name = "torch-1.10.0-cp39-none-macosx_10_9_x86_64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp39-none-macosx_10_9_x86_64.whl";
|
||||
hash = "sha256-1u+HRwtE35lw6EVCVH1bp3ILuJYWYCRB31VaObEk4rw=";
|
||||
};
|
||||
aarch64-darwin-38 = {
|
||||
name = "torch-1.10.0-cp38-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp38-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-1hhYJ7KFeAZTzdgdd6Cf3KdqWxkNWYbVUr4qXEQs+qQ=";
|
||||
};
|
||||
aarch64-darwin-39 = {
|
||||
name = "torch-1.10.0-cp39-none-macosx_11_0_arm64.whl";
|
||||
url = "https://download.pytorch.org/whl/cpu/torch-1.10.0-cp39-none-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-7qZ17AHsS0oGVf0phPFmpco7kz2uatTrTlLrpwJtwXY=";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyturbojpeg";
|
||||
version = "1.6.3";
|
||||
version = "1.6.4";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyTurboJPEG";
|
||||
inherit version;
|
||||
sha256 = "sha256-5g9MQB7vpeuorVGExt0scHtLdrWlkuLOZMT38FhAsi4=";
|
||||
hash = "sha256-kAIFFK7VnwL7o4G512f7kVVDBLz2SnjapzzpNM/KNKA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isPy27
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, sybil
|
||||
, twisted
|
||||
, zope_component
|
||||
|
|
@ -12,6 +13,9 @@
|
|||
buildPythonPackage rec {
|
||||
pname = "testfixtures";
|
||||
version = "6.18.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
|
|
@ -19,29 +23,42 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
mock
|
||||
pytestCheckHook
|
||||
sybil
|
||||
zope_component
|
||||
twisted
|
||||
zope_component
|
||||
];
|
||||
|
||||
doCheck = !isPy27;
|
||||
|
||||
disabledTestPaths = [
|
||||
# Django is too much hasle to setup at the moment
|
||||
"testfixtures/tests/test_django"
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.10") [
|
||||
# https://github.com/simplistix/testfixtures/issues/168
|
||||
"test_invalid_communicate_call"
|
||||
"test_invalid_kill"
|
||||
"test_invalid_parameters"
|
||||
"test_invalid_poll"
|
||||
"test_invalid_send_signal"
|
||||
"test_invalid_terminate"
|
||||
"test_invalid_wait_call"
|
||||
"test_replace_delattr_cant_remove"
|
||||
"test_replace_delattr_cant_remove_not_strict"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"testfixtures/tests"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "testfixtures" ];
|
||||
pythonImportsCheck = [
|
||||
"testfixtures"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of helpers and mock objects for unit tests and doc tests";
|
||||
homepage = "https://github.com/Simplistix/testfixtures";
|
||||
description = "A collection of helpers and mock objects for unit tests and doc tests";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ siriobalmelli ];
|
||||
};
|
||||
|
|
|
|||
43
pkgs/development/python-modules/torchinfo/default.nix
Normal file
43
pkgs/development/python-modules/torchinfo/default.nix
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, fetchPypi
|
||||
, python
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, pytorch
|
||||
, pytestCheckHook
|
||||
, torchvision
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "torchinfo";
|
||||
version = "1.6.2";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-vf3TADqIX4RtCU3dN/lBK4aRg3wud/KkK9u5XGnBbO4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pytorch
|
||||
torchvision
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Skip as it downloads pretrained weights (require network access)
|
||||
"test_eval_order_doesnt_matter"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "torchvision" ];
|
||||
|
||||
meta = {
|
||||
description = "API to visualize pytorch models";
|
||||
homepage = "https://github.com/TylerYep/torchinfo";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ petterstorvik ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ytmusicapi";
|
||||
version = "0.19.5";
|
||||
version = "0.20.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-haZe5afwkU8wD8s2lrmHJuVo6TO3CcQ/0TuJbHPmqvU=";
|
||||
hash = "sha256-DvLrytLp28TVFVdkmWg19cC2VRetFcSx7dmsO4HQqVo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
25
pkgs/development/tools/deadnix/default.nix
Normal file
25
pkgs/development/tools/deadnix/default.nix
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deadnix";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "astro";
|
||||
repo = "deadnix";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ddnxmcr9fncgrqg1vvqcbx49c3lccdpb40h9rvzyldzy9xynzi7";
|
||||
};
|
||||
|
||||
cargoSha256 = "19vgjv70vxgxssrxvdjwfl16bwdbdrpb2wzb3fg9vlz4fhbj2lv9";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Find and remove unused code in .nix source files";
|
||||
homepage = "https://github.com/astro/deadnix";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ astro ];
|
||||
};
|
||||
}
|
||||
|
|
@ -30,10 +30,10 @@ rec {
|
|||
production = legacy_470;
|
||||
|
||||
beta = generic {
|
||||
version = "495.29.05";
|
||||
sha256_64bit = "sha256-9yVLl9QAxpJQR5ZJb059j2TpOx4xxCeGCk8hmhhvEl4=";
|
||||
settingsSha256 = "sha256-dcEI+3bxSTwVbHcR6IgvIUFt4vWtK5T4NMGVhmmeVJ0=";
|
||||
persistencedSha256 = "sha256-OT/hOXEPatc6pAKrxDe0jsmaDFCtVXAbdW4elKe6xE8=";
|
||||
version = "510.39.01";
|
||||
sha256_64bit = "sha256-Lj7cOvulhApeuRycIiyYy5kcPv3ZlM8qqpPUWl0bmRs=";
|
||||
settingsSha256 = "sha256-qlSwNq0wC/twvrbQjY+wSTcDaV5KG4Raq6WkzTizyXw=";
|
||||
persistencedSha256 = "sha256-UNrl/hfiNXKGACQ7aHpsNcfcHPWVnycQ51yaa3eKXhI=";
|
||||
};
|
||||
|
||||
# Vulkan developer beta driver
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "mautrix-signal";
|
||||
version = "unstable-2021-11-12";
|
||||
version = "unstable-2022-01-13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mautrix";
|
||||
repo = "signal";
|
||||
rev = "2e57810e964c1701df2e69273c2f8cebbe021464";
|
||||
sha256 = "sha256-xgn01nbY3LR4G1Yk2MgUhq116/wEhG+5vLH6HKqZE+8=";
|
||||
rev = "e015852a9969ac169e215c80872199ba3f3d838f";
|
||||
sha256 = "sha256-7+0JubSGmQDMr7n1PK6i7homR1WknMz9ikC4164XmMo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clamav";
|
||||
version = "0.103.3";
|
||||
version = "0.103.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-n249GESfPRo5kncdaWaFJJ36EnNv4rKSmFjyx9gnauk=";
|
||||
sha256 = "sha256-HnSx4dKoqQVkScMT9Ippg7nVug1vte8LK+atPIQaVCY=";
|
||||
};
|
||||
|
||||
# don't install sample config files into the absolute sysconfdir folder
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "logrotate";
|
||||
version = "3.18.1";
|
||||
version = "3.19.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "logrotate";
|
||||
repo = "logrotate";
|
||||
rev = version;
|
||||
sha256 = "sha256-OJOV++rtN9ry+l0c0eanpu/Pwu8cOHfyEaDWp3FZjkw=";
|
||||
sha256 = "sha256-YAoMRLgKPqHsXdXBigl6dPJDkZIAMYK/likhTd/LpkY=";
|
||||
};
|
||||
|
||||
# Logrotate wants to access the 'mail' program; to be done.
|
||||
|
|
|
|||
|
|
@ -315,6 +315,8 @@ with pkgs;
|
|||
|
||||
deadcode = callPackage ../development/tools/deadcode { };
|
||||
|
||||
deadnix = callPackage ../development/tools/deadnix { };
|
||||
|
||||
each = callPackage ../tools/text/each { };
|
||||
|
||||
eclipse-mat = callPackage ../development/tools/eclipse-mat { };
|
||||
|
|
|
|||
|
|
@ -1281,6 +1281,8 @@ let
|
|||
|
||||
tcslib = callPackage ../development/ocaml-modules/tcslib { };
|
||||
|
||||
terminal = callPackage ../development/ocaml-modules/terminal { };
|
||||
|
||||
terminal_size = callPackage ../development/ocaml-modules/terminal_size { };
|
||||
|
||||
tezos-010-PtGRANAD-test-helpers = callPackage ../development/ocaml-modules/tezos/010-PtGRANAD-test-helpers.nix { };
|
||||
|
|
@ -1372,6 +1374,8 @@ let
|
|||
|
||||
vchan = callPackage ../development/ocaml-modules/vchan { };
|
||||
|
||||
vector = callPackage ../development/ocaml-modules/vector { };
|
||||
|
||||
vg = callPackage ../development/ocaml-modules/vg { };
|
||||
|
||||
vlq = callPackage ../development/ocaml-modules/vlq { };
|
||||
|
|
|
|||
|
|
@ -6408,6 +6408,8 @@ in {
|
|||
|
||||
py-synologydsm-api = callPackage ../development/python-modules/py-synologydsm-api { };
|
||||
|
||||
py-tes = callPackage ../development/python-modules/py-tes { };
|
||||
|
||||
py-ubjson = callPackage ../development/python-modules/py-ubjson { };
|
||||
|
||||
py-zabbix = callPackage ../development/python-modules/py-zabbix { };
|
||||
|
|
@ -9769,6 +9771,8 @@ in {
|
|||
|
||||
torchgpipe = callPackage ../development/python-modules/torchgpipe { };
|
||||
|
||||
torchinfo = callPackage ../development/python-modules/torchinfo { };
|
||||
|
||||
torchvision = callPackage ../development/python-modules/torchvision { };
|
||||
|
||||
torchvision-bin = callPackage ../development/python-modules/torchvision/bin.nix { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue