Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
7ed55e7bca
@ -14016,6 +14016,12 @@
|
||||
githubId = 7040031;
|
||||
name = "Yannik Sander";
|
||||
};
|
||||
yureien = {
|
||||
email = "contact@sohamsen.me";
|
||||
github = "Yureien";
|
||||
githubId = 17357089;
|
||||
name = "Soham Sen";
|
||||
};
|
||||
yuriaisaka = {
|
||||
email = "yuri.aisaka+nix@gmail.com";
|
||||
github = "yuriaisaka";
|
||||
|
||||
@ -43,8 +43,9 @@
|
||||
<itemizedlist spacing="compact">
|
||||
<listitem>
|
||||
<para>
|
||||
Please remove this line when you add the first item since
|
||||
docbook requires the section to be non-empty
|
||||
<link xlink:href="https://github.com/jollheef/appvm">appvm</link>,
|
||||
Nix based app VMs. Available as
|
||||
<link xlink:href="options.html#opt-virtualisation.appvm.enable">virtualisation.appvm</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
|
||||
@ -23,7 +23,7 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
## New Services {#sec-release-22.11-new-services}
|
||||
|
||||
- Please remove this line when you add the first item since docbook requires the section to be non-empty
|
||||
- [appvm](https://github.com/jollheef/appvm), Nix based app VMs. Available as [virtualisation.appvm](options.html#opt-virtualisation.appvm.enable).
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
|
||||
@ -1236,6 +1236,7 @@
|
||||
./tasks/powertop.nix
|
||||
./testing/service-runner.nix
|
||||
./virtualisation/anbox.nix
|
||||
./virtualisation/appvm.nix
|
||||
./virtualisation/build-vm.nix
|
||||
./virtualisation/container-config.nix
|
||||
./virtualisation/containerd.nix
|
||||
|
||||
49
nixos/modules/virtualisation/appvm.nix
Normal file
49
nixos/modules/virtualisation/appvm.nix
Normal file
@ -0,0 +1,49 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
cfg = config.virtualisation.appvm;
|
||||
|
||||
in {
|
||||
|
||||
options = {
|
||||
virtualisation.appvm = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
This enables AppVMs and related virtualisation settings.
|
||||
'';
|
||||
};
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
description = ''
|
||||
AppVM user login. Currenly only AppVMs are supported for a single user only.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
virtualisation.libvirtd = {
|
||||
enable = true;
|
||||
qemu.verbatimConfig = ''
|
||||
namespaces = []
|
||||
user = "${cfg.user}"
|
||||
group = "users"
|
||||
remember_owner = 0
|
||||
'';
|
||||
};
|
||||
|
||||
users.users."${cfg.user}" = {
|
||||
packages = [ pkgs.appvm ];
|
||||
extraGroups = [ "libvirtd" ];
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -23,12 +23,11 @@
|
||||
, libpulseaudio
|
||||
, gvfs
|
||||
, libcdio
|
||||
, libechonest
|
||||
, libspotify
|
||||
, pcre
|
||||
, projectm
|
||||
, protobuf
|
||||
, qca2
|
||||
, qca-qt5
|
||||
, pkg-config
|
||||
, sparsehash
|
||||
, config
|
||||
@ -87,13 +86,12 @@ let
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gstreamer
|
||||
gvfs
|
||||
libechonest
|
||||
liblastfm
|
||||
libpulseaudio
|
||||
pcre
|
||||
projectm
|
||||
protobuf
|
||||
qca2
|
||||
qca-qt5
|
||||
qjson
|
||||
qtbase
|
||||
qtx11extras
|
||||
|
||||
@ -13,14 +13,14 @@ let
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "apostrophe";
|
||||
version = "2.6.2";
|
||||
version = "2.6.3";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
domain = "gitlab.gnome.org";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-At3kaVJE07j/QWXerYnvxleE2Cbn0FjlBXH69tkuFys=";
|
||||
sha256 = "sha256-RBrrG1TO810LidIelYGNaK7PjDq84D0cA8VcMojAW3M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils
|
||||
|
||||
@ -1700,7 +1700,8 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
matklad.rust-analyzer = callPackage ./rust-analyzer { };
|
||||
rust-lang.rust-analyzer = callPackage ./rust-analyzer { };
|
||||
matklad.rust-analyzer = self.rust-lang.rust-analyzer; # Previous publisher
|
||||
|
||||
ocamllabs.ocaml-platform = buildVscodeMarketplaceExtension {
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,32 +1,12 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, alsa-lib
|
||||
, at-spi2-atk
|
||||
, at-spi2-core
|
||||
, atk
|
||||
, autoPatchelfHook
|
||||
, cairo
|
||||
, cups
|
||||
, dbus
|
||||
, dpkg
|
||||
, expat
|
||||
, fetchurl
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk3
|
||||
, libdrm
|
||||
, libxkbcommon
|
||||
, dpkg
|
||||
, electron_16
|
||||
, makeWrapper
|
||||
, mesa
|
||||
, nixosTests
|
||||
, nspr
|
||||
, nss
|
||||
, pango
|
||||
, pciutils
|
||||
, systemd
|
||||
, nodePackages
|
||||
, undmg
|
||||
, writeShellScriptBin
|
||||
, xorg
|
||||
}:
|
||||
|
||||
let
|
||||
@ -34,19 +14,6 @@ let
|
||||
|
||||
version = "3.1.0";
|
||||
|
||||
# At first start, the program checks for supported operating systems by calling `lsb_release -a`
|
||||
# and only runs when it finds Debian/Ubuntu. So we present us as Debian an make it happy.
|
||||
fake-lsb-release = writeShellScriptBin "lsb_release" ''
|
||||
echo "Distributor ID: Debian"
|
||||
echo "Description: Debian GNU/Linux 10 (buster)"
|
||||
echo "Release: 10"
|
||||
echo "Codename: buster"
|
||||
'';
|
||||
|
||||
binPath = lib.makeBinPath [
|
||||
fake-lsb-release
|
||||
];
|
||||
|
||||
systemArgs = rec {
|
||||
x86_64-linux = rec {
|
||||
src = fetchurl {
|
||||
@ -54,68 +21,41 @@ let
|
||||
sha256 = "sha256-jSP+H9ej9Wd+swBZSy9uMi2ExSTZ191FGZhqaocTl7w=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoPatchelfHook
|
||||
dpkg
|
||||
makeWrapper
|
||||
nodePackages.asar
|
||||
];
|
||||
|
||||
buildInputs = runtimeDependencies;
|
||||
|
||||
runtimeDependencies = [
|
||||
alsa-lib
|
||||
at-spi2-atk
|
||||
at-spi2-core
|
||||
atk
|
||||
cairo
|
||||
cups
|
||||
dbus
|
||||
expat
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk3
|
||||
libdrm
|
||||
libxkbcommon
|
||||
mesa
|
||||
nspr
|
||||
nss
|
||||
pango
|
||||
pciutils
|
||||
systemd
|
||||
xorg.libX11
|
||||
xorg.libXcomposite
|
||||
xorg.libXdamage
|
||||
xorg.libXext
|
||||
xorg.libXfixes
|
||||
xorg.libXrandr
|
||||
xorg.libxcb
|
||||
xorg.libxshmfence
|
||||
];
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
installPhase = ''
|
||||
dpkg-deb -x $src $out
|
||||
mkdir -p $out/bin
|
||||
mv usr/share $out/share
|
||||
mkdir -p $out/share/breitbandmessung/resources
|
||||
|
||||
chmod -R g-w $out
|
||||
asar e opt/Breitbandmessung/resources/app.asar $out/share/breitbandmessung/resources
|
||||
|
||||
addAutoPatchelfSearchPath --no-recurse $out/opt/Breitbandmessung
|
||||
autoPatchelfFile $out/opt/Breitbandmessung/breitbandmessung
|
||||
# At first start, the program checks for supported operating systems by using the `bizzby-lsb-release`
|
||||
# module and only runs when it finds Debian/Ubuntu. So we present us as Debian and make it happy.
|
||||
cat <<EOF > $out/share/breitbandmessung/resources/node_modules/bizzby-lsb-release/lib/lsb-release.js
|
||||
module.exports = function release() {
|
||||
return {
|
||||
distributorID: "Debian",
|
||||
description: "Debian GNU/Linux 10 (buster)",
|
||||
release: "10",
|
||||
codename: "buster"
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
makeWrapper $out/opt/Breitbandmessung/breitbandmessung $out/bin/breitbandmessung \
|
||||
--prefix PATH : ${binPath}
|
||||
|
||||
mv $out/usr/share $out/share
|
||||
rmdir $out/usr
|
||||
makeWrapper ${electron_16}/bin/electron $out/bin/breitbandmessung \
|
||||
--add-flags $out/share/breitbandmessung/resources/build/electron.js
|
||||
|
||||
# Fix the desktop link
|
||||
substituteInPlace $out/share/applications/breitbandmessung.desktop \
|
||||
--replace /opt/Breitbandmessung $out/bin
|
||||
'';
|
||||
|
||||
dontAutoPatchelf = true;
|
||||
dontPatchELF = true;
|
||||
};
|
||||
|
||||
x86_64-darwin = {
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "asuka";
|
||||
version = "0.8.3";
|
||||
version = "0.8.5";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~julienxx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-l3SgIyApASllHVhAc2yoUYc2x7QtCdzBrMYaXCp65m8=";
|
||||
sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-twECZM1KcWeQptLhlKlIz16r3Q/xMb0e+lBG+EX79mU=";
|
||||
cargoSha256 = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
25
pkgs/applications/networking/wgcf/default.nix
Normal file
25
pkgs/applications/networking/wgcf/default.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wgcf";
|
||||
version = "2.2.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ViRb3";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-6V4fIoFB0fuCEu1Rj8QWGDNdgystrD/gefjbshvxVsw=";
|
||||
};
|
||||
|
||||
subPackages = ".";
|
||||
|
||||
vendorSha256 = "sha256-NGlV/qcnUlNLvt3uVRdfx+lUDgqAEBEowW9WIHBY+AI=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform, unofficial CLI for Cloudflare Warp";
|
||||
homepage = "https://github.com/ViRb3/wgcf";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ yureien ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
diff --git a/src/resources/ui/virt-viewer.ui b/src/resources/ui/virt-viewer.ui
|
||||
index 430f879..68856fc 100644
|
||||
--- a/src/resources/ui/virt-viewer.ui
|
||||
+++ b/src/resources/ui/virt-viewer.ui
|
||||
@@ -137,7 +137,6 @@
|
||||
</child>
|
||||
<child type="titlebar">
|
||||
<object class="GtkHeaderBar" id="header">
|
||||
- <property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="show-close-button">True</property>
|
||||
<child>
|
||||
@ -0,0 +1,15 @@
|
||||
diff --git a/src/virt-viewer-display-spice.c b/src/virt-viewer-display-spice.c
|
||||
index 2265f02..1d60d81 100644
|
||||
--- a/src/virt-viewer-display-spice.c
|
||||
+++ b/src/virt-viewer-display-spice.c
|
||||
@@ -317,8 +317,8 @@ virt_viewer_display_spice_new(VirtViewerSessionSpice *session,
|
||||
gtk_container_add(GTK_CONTAINER(self), GTK_WIDGET(self->display));
|
||||
gtk_widget_show(GTK_WIDGET(self->display));
|
||||
g_object_set(self->display,
|
||||
- "grab-keyboard", TRUE,
|
||||
- "grab-mouse", TRUE,
|
||||
+ "grab-keyboard", FALSE,
|
||||
+ "grab-mouse", FALSE,
|
||||
"resize-guest", FALSE,
|
||||
"scaling", TRUE,
|
||||
NULL);
|
||||
@ -0,0 +1,14 @@
|
||||
diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
|
||||
index fe740ce..d45fd4f 100644
|
||||
--- a/src/virt-viewer-window.c
|
||||
+++ b/src/virt-viewer-window.c
|
||||
@@ -1342,6 +1342,9 @@ virt_viewer_window_update_title(VirtViewerWindow *self)
|
||||
grabhint,
|
||||
g_get_application_name());
|
||||
}
|
||||
+ } else if (g_str_has_prefix(self->subtitle, "appvm_")) {
|
||||
+ /* Use name of the application as a title */
|
||||
+ title = g_strdup_printf(_("%s"), &self->subtitle[strlen("appvm_")]);
|
||||
} else if (self->subtitle) {
|
||||
/* translators:
|
||||
* This is "<subtitle> - <appname>"
|
||||
@ -0,0 +1,12 @@
|
||||
diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
|
||||
index b977b7b..36bce34 100644
|
||||
--- a/src/virt-viewer-app.c
|
||||
+++ b/src/virt-viewer-app.c
|
||||
@@ -976,6 +976,7 @@ virt_viewer_app_set_window_subtitle(VirtViewerApp *app,
|
||||
*d = '%';
|
||||
} else
|
||||
subtitle = g_strdup_printf("%s (%s)", title, desc);
|
||||
+ subtitle = g_strdup_printf("%s", title);
|
||||
g_free(desc);
|
||||
}
|
||||
|
||||
48
pkgs/applications/virtualization/appvm/default.nix
Normal file
48
pkgs/applications/virtualization/appvm/default.nix
Normal file
@ -0,0 +1,48 @@
|
||||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, nix
|
||||
, virt-viewer
|
||||
, fetchpatch
|
||||
, makeWrapper }:
|
||||
|
||||
let
|
||||
# Upstream patches fail with newer virt-viewer. These are own ports to the
|
||||
# newest virt-viewer version, see:
|
||||
# https://github.com/jollheef/appvm/issues/28
|
||||
virt-manager-without-menu = virt-viewer.overrideAttrs(oldAttrs: {
|
||||
patches = oldAttrs.patches ++ [
|
||||
./0001-Remove-menu-bar.patch
|
||||
./0002-Do-not-grab-keyboard-mouse.patch
|
||||
./0003-Use-name-of-appvm-applications-as-a-title.patch
|
||||
./0004-Use-title-application-name-as-subtitle.patch
|
||||
];
|
||||
});
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "appvm";
|
||||
version = "unstable-2021-12-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jollheef";
|
||||
repo = pname;
|
||||
rev = "17f17be7846d872e7e26d5cb6759a52ea4113587";
|
||||
sha256 = "sha256-FL5olOy1KufULyqI2dJeS0OnKzC3LfPWxnia2i4f4yY=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-8eU+Mf5dxL/bAMMShXvj8I1Kdd4ysBTWvgYIXwLStPI=";
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/appvm \
|
||||
--prefix PATH : "${lib.makeBinPath [ nix virt-manager-without-menu ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Nix-based app VMs";
|
||||
homepage = "https://code.dumpstack.io/tools/${pname}";
|
||||
maintainers = with maintainers; [ dump_stack cab404 onny ];
|
||||
license = licenses.gpl3;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gleam";
|
||||
version = "0.20.1";
|
||||
version = "0.21.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gleam-lang";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-AK+eb0eJyI7ALn7sg0wz4GzHthxrJWd1PVT5bL9LKWA=";
|
||||
sha256 = "sha256-BI8qEaNasNxcMJ7jJYKyFP3ypgh+P39F9tAzzqxA4BI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
|
||||
buildInputs = [ openssl ] ++
|
||||
lib.optionals stdenv.isDarwin [ Security libiconv ];
|
||||
|
||||
cargoSha256 = "sha256-kFTAPbP42sbhsvP069ua0ys1Dw7W+Gdsv2YaGrzorIk=";
|
||||
cargoSha256 = "sha256-avwdgX7FaBIOMumJknWBLc50JgtzGpM6S+Du7U/FE6Q=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A statically typed language for the Erlang VM";
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, doxygen, qt4, qjson }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libechonest";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lfranchi";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0xbavf9f355dl1d3qv59x4ryypqrdanh9xdvw2d0q66l008crdkq";
|
||||
};
|
||||
|
||||
# Fix build with GCC 11.
|
||||
NIX_CFLAGS_COMPILE = [ "-std=c++14" ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lfranchi/libechonest/commit/009514f65044823ef29045397d4b58dd04d09977.patch";
|
||||
sha256 = "0dmmpi7hixdngwiv045ilqrzyzkf56xpfyihcsx5i3xya2m0mynx";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://github.com/lfranchi/libechonest/commit/3ce779536d56a163656e8098913f923e6cda2b5c.patch";
|
||||
sha256 = "1vasd3sgqah562vxk71jibyws5cbihjjfnffd50qvdm2xqgvbx94";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ cmake doxygen ];
|
||||
buildInputs = [ qt4 qjson ];
|
||||
|
||||
doCheck = false; # requires network access
|
||||
|
||||
meta = {
|
||||
description = "A C++/Qt wrapper around the Echo Nest API";
|
||||
homepage = "https://projects.kde.org/projects/playground/libs/libechonest";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
platforms = lib.platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, qt4 }:
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, qtbase }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.9.0";
|
||||
@ -12,12 +12,12 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
buildInputs = [ qt4 ];
|
||||
buildInputs = [ qtbase ];
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Lightweight data-interchange format";
|
||||
homepage = "http://qjson.sourceforge.net/";
|
||||
license = licenses.lgpl21;
|
||||
inherit (qt4.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@ -9,97 +9,97 @@
|
||||
, numpy
|
||||
, pandas
|
||||
, pytest
|
||||
, cloudpickle
|
||||
, scipy
|
||||
, setuptools
|
||||
, cloudpickle
|
||||
, pytestCheckHook
|
||||
, scipy
|
||||
, packaging
|
||||
, typing-extensions
|
||||
# , tensorflow-probability (incompatible version)
|
||||
, pythonOlder
|
||||
, xarray
|
||||
, xarray-einstats
|
||||
, zarr
|
||||
, h5py
|
||||
#, pymc3 (broken)
|
||||
#, pyro-ppl (broken)
|
||||
#, pystan (not packaged)
|
||||
#, numpyro (not packaged)
|
||||
, jaxlib
|
||||
, torchvision
|
||||
, jax
|
||||
# , pymc3 (circular dependency)
|
||||
, pyro-ppl
|
||||
#, pystan (not packaged)
|
||||
, numpyro
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "arviz";
|
||||
version = "0.12.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arviz-devs";
|
||||
repo = "arviz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ClARxgfji/CavEy8g5oeYK7pwSZS1yUIZnBiyTbZ/zU=";
|
||||
hash = "sha256-ClARxgfji/CavEy8g5oeYK7pwSZS1yUIZnBiyTbZ/zU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
# needed to install
|
||||
matplotlib
|
||||
netcdf4
|
||||
pandas
|
||||
xarray
|
||||
# needed to import
|
||||
setuptools
|
||||
# not needed to import, but used by many functions
|
||||
# and is listed as a dependency in the documentation
|
||||
numpy
|
||||
packaging
|
||||
pandas
|
||||
scipy
|
||||
setuptools
|
||||
xarray
|
||||
xarray-einstats
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "typing_extensions>=3.7.4.3,<4" "typing_extensions>=3.7.4.3"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
bokeh
|
||||
emcee
|
||||
numba
|
||||
pytest
|
||||
cloudpickle
|
||||
zarr
|
||||
#tensorflow-probability (used by disabled tests)
|
||||
emcee
|
||||
h5py
|
||||
#pymc3 (broken, used by disabled tests)
|
||||
#pyro-ppl (broken, used by disabled tests)
|
||||
#pystan (not packaged)
|
||||
#numpyro (not packaged, used by disabled tests)
|
||||
jax
|
||||
jaxlib
|
||||
numba
|
||||
numpyro
|
||||
# pymc3 (circular dependency)
|
||||
pyro-ppl
|
||||
# pystan (not packaged)
|
||||
pytestCheckHook
|
||||
torchvision
|
||||
zarr
|
||||
];
|
||||
|
||||
# check requires pymc3 and pyro-ppl, which are currently broken, and pystan
|
||||
# and numpyro, which are not yet packaged, and an incompatible (old) version
|
||||
# of tensorflow-probability. some checks also need to make
|
||||
# directories and do not have permission to do so. So we can only check part
|
||||
# of the package
|
||||
# Additionally, there are some failures with the plots test, which revolve
|
||||
# around attempting to output .mp4 files through an interface that only wants
|
||||
# to output .html files.
|
||||
# The following test have been disabled as a result: data_cmdstanpy,
|
||||
# data_numpyro, data_pyro, data_pystan, data_tfp, data_pymc3 and plots.
|
||||
checkPhase = ''
|
||||
cd arviz/tests/
|
||||
export HOME=$TMPDIR
|
||||
pytest \
|
||||
base_tests/test_data.py \
|
||||
base_tests/test_diagnostics.py \
|
||||
base_tests/test_plot_utils.py \
|
||||
base_tests/test_rcparams.py \
|
||||
base_tests/test_stats.py \
|
||||
base_tests/test_stats_numba.py \
|
||||
base_tests/test_stats_utils.py \
|
||||
base_tests/test_utils.py \
|
||||
base_tests/test_utils_numba.py \
|
||||
base_tests/test_data_zarr.py \
|
||||
external_tests/test_data_cmdstan.py \
|
||||
external_tests/test_data_emcee.py
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d);
|
||||
'';
|
||||
|
||||
pytestFlagsArray = [
|
||||
"arviz/tests/base_tests/"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Remove tests as dependency creates a circular dependency
|
||||
"arviz/tests/external_tests/test_data_pymc.py"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Tests require network access
|
||||
"test_plot_separation"
|
||||
"test_plot_trace_legend"
|
||||
"test_cov"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"arviz"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "ArviZ is a Python package for exploratory analysis of Bayesian models";
|
||||
description = "Library for exploratory analysis of Bayesian models";
|
||||
homepage = "https://arviz-devs.github.io/arviz/";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.omnipotententity ];
|
||||
maintainers = with maintainers; [ omnipotententity ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,6 +6,7 @@
|
||||
, certifi
|
||||
, ecs-logging
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, httpx
|
||||
, jinja2
|
||||
, jsonschema
|
||||
@ -40,6 +41,14 @@ buildPythonPackage rec {
|
||||
sha256 = "sha256-IaCl39rhsFLQwvQdPcqKruV/Mo3f7WH91UVgMG/cnOc=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# fix tests with sanic>=22.3.0
|
||||
url = "https://github.com/elastic/apm-agent-python/commit/114ee6ca998b4d6a5cb075a289af39cb963cf08a.patch";
|
||||
hash = "sha256-M6yEHjThKDCRQOmR0L94KEt8tUun1tPRULI6PNIlE/8=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
blinker
|
||||
|
||||
@ -1,5 +1,18 @@
|
||||
{ buildPythonPackage, freezegun, fetchFromGitHub, lib, pytestCheckHook
|
||||
, pytest-mock, pytest-runner, six, tornado_4 }:
|
||||
{ buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
|
||||
# runtime
|
||||
, six
|
||||
|
||||
# tests
|
||||
, freezegun
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, tornado_4
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lomond";
|
||||
@ -12,11 +25,33 @@ buildPythonPackage rec {
|
||||
sha256 = "0lydq0imala08wxdyg2iwhqa6gcdrn24ah14h91h2zcxjhjk4gv8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytest-runner ];
|
||||
propagatedBuildInputs = [ six ];
|
||||
checkInputs = [ pytestCheckHook freezegun pytest-mock tornado_4 ];
|
||||
# Makes HTTP requests
|
||||
disabledTests = [ "test_proxy" "test_live" ];
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
six
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
freezegun
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
] ++ lib.optionals (pythonOlder "3.10") [
|
||||
tornado_4
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Makes HTTP requests
|
||||
"test_proxy"
|
||||
"test_live"
|
||||
];
|
||||
|
||||
disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [
|
||||
# requires tornado_4, which is not compatible with python3.10
|
||||
"tests/test_integration.py"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Websocket Client Library";
|
||||
|
||||
62
pkgs/development/python-modules/numpyro/default.nix
Normal file
62
pkgs/development/python-modules/numpyro/default.nix
Normal file
@ -0,0 +1,62 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, jax
|
||||
, jaxlib
|
||||
, multipledispatch
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, tqdm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "numpyro";
|
||||
version = "0.9.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
hash = "sha256-TbzyIt17/z56juc8kH1L8rTkvSgcsT5ah6xmvWTo6tM=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
jax
|
||||
jaxlib
|
||||
numpy
|
||||
multipledispatch
|
||||
tqdm
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"numpyro"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AssertionError due to tolerance issues
|
||||
"test_beta_binomial_log_prob"
|
||||
"test_collapse_beta"
|
||||
"test_cpu"
|
||||
"test_gamma_poisson"
|
||||
"test_gof"
|
||||
"test_hpdi"
|
||||
"test_kl_univariate"
|
||||
"test_mean_var"
|
||||
# Tests want to download data
|
||||
"data_load"
|
||||
"test_jsb_chorales"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library for probabilistic programming with NumPy";
|
||||
homepage = "https://num.pyro.ai/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -1,17 +1,37 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, docutils, pybtex, six }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, docutils
|
||||
, fetchPypi
|
||||
, pybtex
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.0.1";
|
||||
pname = "pybtex-docutils";
|
||||
version = "1.0.2";
|
||||
format = "setuptools";
|
||||
|
||||
doCheck = false;
|
||||
buildInputs = [ docutils pybtex six ];
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "d53aa0c31dc94d61fd30ea3f06c749e6f510f9ff0e78cb2765a9300f173d8626";
|
||||
hash = "sha256-Q6o1O21Jj9WsMPAHOpjjMtBh00/mGdPVDRdh+P1KoBY=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
docutils
|
||||
pybtex
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pybtex_docutils"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A docutils backend for pybtex";
|
||||
homepage = "https://github.com/mcmtroffaes/pybtex-docutils";
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
@ -19,6 +20,14 @@ buildPythonPackage rec {
|
||||
sha256 = "1xwx0c1dp2374bwigzwhvcj4577vrxyhn6i5zv73k9ydc7w1xgyz";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Python3.10 compatibility; https://github.com/nielstron/pyfronius/pull/7
|
||||
url = "https://github.com/nielstron/pyfronius/commit/9deb209d4246ff575cd3c4c5373037bf11df6719.patch";
|
||||
hash = "sha256-srXYCvp86kGYUYZIXMcu68hEbkTspD945J+hc/AhqSw=";
|
||||
})
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
@ -1,72 +1,64 @@
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, theano-pymc
|
||||
, pandas
|
||||
, patsy
|
||||
, joblib
|
||||
, cachetools
|
||||
, tqdm
|
||||
, six
|
||||
, h5py
|
||||
, aeppl
|
||||
, aesara
|
||||
, arviz
|
||||
, packaging
|
||||
, pytest
|
||||
, nose
|
||||
, parameterized
|
||||
, buildPythonPackage
|
||||
, cachetools
|
||||
, cloudpickle
|
||||
, fastprogress
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, pythonOlder
|
||||
, scipy
|
||||
, typing-extensions
|
||||
, dill
|
||||
, semver
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymc3";
|
||||
version = "3.11.5";
|
||||
disabled = pythonOlder "3.5";
|
||||
version = "unstable-2022-05-23";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-M0HLvZYpCROLfV6+TtfP7in0Cy/nyt64iLOda7wXE4w=";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pymc-devs";
|
||||
repo = "pymc3";
|
||||
rev = "b5a5b569779673914c9420c1cc0135b118505ff5";
|
||||
hash = "sha256-vkIFwdjX2Rex8oqscVMP4xh0K4bjmN/RL7aQmOI//Dw=";
|
||||
};
|
||||
|
||||
# No need for coverage stats in Nix builds
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace ", 'pytest-cov'" ""
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pandas
|
||||
patsy
|
||||
joblib
|
||||
tqdm
|
||||
six
|
||||
h5py
|
||||
aeppl
|
||||
aesara
|
||||
arviz
|
||||
packaging
|
||||
fastprogress
|
||||
typing-extensions
|
||||
dill
|
||||
theano-pymc
|
||||
cachetools
|
||||
semver
|
||||
cloudpickle
|
||||
fastprogress
|
||||
numpy
|
||||
scipy
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace ', "pytest-cov"' ""
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "aesara==2.6.2" "aesara" \
|
||||
--replace "aeppl==0.0.28" "aeppl"
|
||||
'';
|
||||
|
||||
# The test suite is computationally intensive and test failures are not
|
||||
# indicative for package usability hence tests are disabled by default.
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "pymc3" ];
|
||||
|
||||
# For some reason tests are run as a part of the *install* phase if enabled.
|
||||
# Theano writes compiled code to ~/.theano hence we set $HOME.
|
||||
preInstall = "export HOME=$(mktemp -d)";
|
||||
postInstall = "rm -rf $HOME";
|
||||
pythonImportsCheck = [
|
||||
"pymc"
|
||||
];
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)";
|
||||
homepage = "https://github.com/pymc-devs/pymc3";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ nidabdella ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ nidabdella ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,20 +1,40 @@
|
||||
{ lib, buildPythonPackage, fetchFromGitHub, precice, numpy, mpi4py, cython }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
, fetchFromGitHub
|
||||
, mpi4py
|
||||
, numpy
|
||||
, precice
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyprecice";
|
||||
version = "2.3.0.1";
|
||||
version = "2.4.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "precice";
|
||||
repo = "python-bindings";
|
||||
rev = "v${version}";
|
||||
sha256 = "1yz96pif63ms797bzxbfrjba4mgz7cz5dqrqghn5sg0g1b9qxnn5";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Endy5oiC1OWdtZlVPUkIdkzoDTc1b5TaQ6VEUWq5iSg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cython ];
|
||||
propagatedBuildInputs = [ numpy mpi4py precice ];
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
mpi4py
|
||||
precice
|
||||
];
|
||||
|
||||
# Disable Test because everything depends on open mpi which requires network
|
||||
doCheck = false;
|
||||
|
||||
doCheck = false; # Disable Test because everything depends on open mpi which requires network.
|
||||
# Do not use pythonImportsCheck because this will also initialize mpi which requires a network interface
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -1,29 +1,62 @@
|
||||
{ buildPythonPackage, fetchPypi, lib, pytorch, contextlib2
|
||||
, graphviz, networkx, six, opt-einsum, tqdm, pyro-api }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, graphviz
|
||||
, jupyter
|
||||
, matplotlib
|
||||
, networkx
|
||||
, opt-einsum
|
||||
, pandas
|
||||
, pillow
|
||||
, pyro-api
|
||||
, pythonOlder
|
||||
, pytorch
|
||||
, scikit-learn
|
||||
, seaborn
|
||||
, torchvision
|
||||
, tqdm
|
||||
, wget
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.8.1";
|
||||
pname = "pyro-ppl";
|
||||
version = "1.8.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version pname;
|
||||
sha256 = "sha256-18BJ6y50haYStN2ZwkwwnMhgx8vGsZczhwNPVDbRyNY=";
|
||||
hash = "sha256-18BJ6y50haYStN2ZwkwwnMhgx8vGsZczhwNPVDbRyNY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyro-api
|
||||
pytorch
|
||||
contextlib2
|
||||
# TODO(tom): graphviz pulls in a lot of dependencies - make
|
||||
# optional when some time to figure out how.
|
||||
graphviz
|
||||
networkx
|
||||
six
|
||||
opt-einsum
|
||||
tqdm
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
extras = [
|
||||
graphviz
|
||||
jupyter
|
||||
# lap
|
||||
matplotlib
|
||||
pandas
|
||||
pillow
|
||||
scikit-learn
|
||||
seaborn
|
||||
torchvision
|
||||
# visdom
|
||||
wget
|
||||
];
|
||||
};
|
||||
|
||||
# pyro not shipping tests do simple smoke test instead
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"pyro"
|
||||
"pyro.distributions"
|
||||
@ -31,12 +64,10 @@ buildPythonPackage rec {
|
||||
"pyro.optim"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "A Python library for probabilistic modeling and inference";
|
||||
meta = with lib; {
|
||||
description = "Library for probabilistic modeling and inference";
|
||||
homepage = "http://pyro.ai";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ teh georgewhewell ];
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ teh georgewhewell ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -25,6 +25,11 @@ buildPythonPackage rec {
|
||||
sanic-testing
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# incompatible with sanic>=22.3.0
|
||||
"test_login_required"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Support for httpx>=0.20.0
|
||||
substituteInPlace tests/test_auth.py \
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sanic-routing";
|
||||
version = "0.7.2";
|
||||
version = "22.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanic-org";
|
||||
repo = "sanic-routing";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MN6A8CtDVxj34eehr3UIwCT09VOfcruVX+/iImr1MgY=";
|
||||
hash = "sha256-dX+uxrVjtPxX0ba3WUE/JKgj0PZzvFdKr/lXQgASN6Y=";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook pytest-asyncio ];
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sanic-testing";
|
||||
version = "0.8.2";
|
||||
version = "22.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanic-org";
|
||||
repo = "sanic-testing";
|
||||
rev = "v${version}";
|
||||
sha256 = "17fbb78gvic5s9nlcgwj817fq1f9j9d1d7z6n2ahhinmvyzl9gc8";
|
||||
sha256 = "sha256-ZsLQA8rP4RrbVSUy5n0WZs903fnF7jtFqrIe5JVuRIg=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
@ -23,11 +23,6 @@ buildPythonPackage rec {
|
||||
"testsout"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "httpx>=0.18,<0.22" "httpx"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
httpx
|
||||
sanic
|
||||
|
||||
@ -24,32 +24,23 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sanic";
|
||||
version = "21.12.1";
|
||||
version = "22.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7" ||
|
||||
pythonAtLeast "3.10"; # see GHSA-7p79-6x2v-5h88
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sanic-org";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0jyl23q7b7fyqzan97qflkqcvmfpzbxbzv0qgygxasrzh80zx67g";
|
||||
hash = "sha256-4zdPp3X22dfZ5YlW3G5/OqeUxrt+NiFO9dk2XjEKXEg=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# Loosen dependency requirements.
|
||||
substituteInPlace setup.py \
|
||||
--replace "pytest==6.2.5" "pytest" \
|
||||
--replace "gunicorn==20.0.4" "gunicorn" \
|
||||
--replace "multidict>=5.0,<6.0" "multidict"
|
||||
|
||||
sed '/pytest-sanic/d' setup.py
|
||||
|
||||
# Patch a request headers test to allow brotli encoding
|
||||
# (we build httpx with brotli support, upstream doesn't).
|
||||
substituteInPlace tests/test_headers.py \
|
||||
--replace "deflate\r\n" "deflate, br\r\n"
|
||||
--replace "gunicorn==20.0.4" "gunicorn"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -66,8 +57,6 @@ buildPythonPackage rec {
|
||||
beautifulsoup4
|
||||
gunicorn
|
||||
pytest-asyncio
|
||||
pytest-benchmark
|
||||
pytest-sugar
|
||||
pytestCheckHook
|
||||
sanic-testing
|
||||
uvicorn
|
||||
@ -95,49 +84,27 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Lack of uvloop setup through fixtures
|
||||
"test_create_asyncio_server"
|
||||
"test_listeners_triggered_async"
|
||||
"test_tls_options"
|
||||
# Tests are flaky
|
||||
# Fails to parse cmdline arguments
|
||||
"test_dev"
|
||||
"test_auto_reload"
|
||||
# OSError: foo
|
||||
"test_bad_headers"
|
||||
"test_create_server_trigger_events"
|
||||
"test_json_body_requests"
|
||||
"test_missing_startup_raises_exception"
|
||||
"test_no_body_requests"
|
||||
"test_oserror_warning"
|
||||
"test_running_multiple_offset_warning"
|
||||
"test_streaming_body_requests"
|
||||
"test_trigger_before_events_create_server"
|
||||
"test_keep_alive_connection_context"
|
||||
# Racy tests
|
||||
"test_keep_alive_client_timeout"
|
||||
"test_check_timeouts_request_timeout"
|
||||
"test_check_timeouts_response_timeout"
|
||||
"test_reloader_live"
|
||||
"test_zero_downtime"
|
||||
# Not working from 21.9.1
|
||||
"test_create_server_main"
|
||||
"test_create_server_main_convenience"
|
||||
"test_debug"
|
||||
"test_auto_reload"
|
||||
"test_no_exceptions_when_cancel_pending_request"
|
||||
"test_ipv6_address_is_not_wrapped"
|
||||
# Failure of the redirect tests seems to be related to httpx>0.20.0
|
||||
"test_redirect"
|
||||
"test_chained_redirect"
|
||||
"test_unix_connection"
|
||||
# These appear to be very sensitive to output of commands
|
||||
"test_access_logs"
|
||||
"test_auto_reload"
|
||||
"test_host_port"
|
||||
"test_no_exceptions_when_cancel_pending_request"
|
||||
"test_num_workers"
|
||||
"test_server_run"
|
||||
"test_version"
|
||||
# Sensitive comparison of raw HTTP header fails
|
||||
"test_raw_headers"
|
||||
# noisy_exceptions sometimes missing from sanic stdout
|
||||
"test_noisy_exceptions"
|
||||
] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [
|
||||
# test fail on aarch64
|
||||
"test_tls_wrong_options"
|
||||
"test_cookie_expires"
|
||||
"test_gunicorn_worker"
|
||||
"test_gunicorn_worker_no_logs"
|
||||
"test_gunicorn_worker_with_logs"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# We are not interested in benchmarks
|
||||
"benchmark/"
|
||||
# unable to create async loop
|
||||
"test_app.py"
|
||||
"test_asgi.py"
|
||||
|
||||
@ -1,43 +1,47 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
|
||||
# runtime
|
||||
, certifi
|
||||
, urllib3
|
||||
|
||||
# optionals
|
||||
, aiohttp
|
||||
, asttokens
|
||||
, apache-beam
|
||||
, blinker
|
||||
, botocore
|
||||
, bottle
|
||||
, buildPythonPackage
|
||||
, celery
|
||||
, certifi
|
||||
, chalice
|
||||
, django
|
||||
, executing
|
||||
, fakeredis
|
||||
, falcon
|
||||
, fetchFromGitHub
|
||||
, flask
|
||||
, flask_login
|
||||
, gevent
|
||||
, httpx
|
||||
, iana-etc
|
||||
, isPy3k
|
||||
, jsonschema
|
||||
, libredirect
|
||||
, pure-eval
|
||||
, pyramid
|
||||
, pyspark
|
||||
, pytest-django
|
||||
, pytest-forked
|
||||
, pytest-localserver
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, rq
|
||||
, sanic
|
||||
, sanic-testing
|
||||
, sqlalchemy
|
||||
, tornado
|
||||
, trytond
|
||||
, urllib3
|
||||
, werkzeug
|
||||
, multidict
|
||||
|
||||
# tests
|
||||
, asttokens
|
||||
, executing
|
||||
, gevent
|
||||
, jsonschema
|
||||
, mock
|
||||
, pyrsistent
|
||||
, pytest-forked
|
||||
, pytest-localserver
|
||||
, pytest-watch
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@ -59,37 +63,73 @@ buildPythonPackage rec {
|
||||
urllib3
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
aiohttp = [
|
||||
aiohttp
|
||||
];
|
||||
beam = [
|
||||
apache-beam
|
||||
];
|
||||
bottle = [
|
||||
bottle
|
||||
];
|
||||
celery = [
|
||||
celery
|
||||
];
|
||||
chalice = [
|
||||
chalice
|
||||
];
|
||||
django = [
|
||||
django
|
||||
];
|
||||
falcon = [
|
||||
falcon
|
||||
];
|
||||
flask = [
|
||||
flask
|
||||
blinker
|
||||
];
|
||||
httpx = [
|
||||
httpx
|
||||
];
|
||||
pyspark = [
|
||||
pyspark
|
||||
];
|
||||
pure_eval = [
|
||||
asttokens
|
||||
executing
|
||||
pure-eval
|
||||
];
|
||||
quart = [
|
||||
# quart missing
|
||||
blinker
|
||||
];
|
||||
rq = [
|
||||
rq
|
||||
];
|
||||
sanic = [
|
||||
sanic
|
||||
];
|
||||
sqlalchemy = [
|
||||
sqlalchemy
|
||||
];
|
||||
tornado = [
|
||||
tornado
|
||||
];
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
aiohttp
|
||||
asttokens
|
||||
blinker
|
||||
botocore
|
||||
bottle
|
||||
celery
|
||||
chalice
|
||||
django
|
||||
executing
|
||||
fakeredis
|
||||
falcon
|
||||
flask_login
|
||||
gevent
|
||||
httpx
|
||||
jsonschema
|
||||
mock
|
||||
pure-eval
|
||||
pyramid
|
||||
pyspark
|
||||
pytest-django
|
||||
pyrsistent
|
||||
pytest-forked
|
||||
pytest-localserver
|
||||
pytest-watch
|
||||
pytestCheckHook
|
||||
rq
|
||||
sanic
|
||||
sanic-testing
|
||||
sqlalchemy
|
||||
tornado
|
||||
trytond
|
||||
werkzeug
|
||||
multidict
|
||||
];
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
@ -97,53 +137,15 @@ buildPythonPackage rec {
|
||||
disabledTests = [
|
||||
# Issue with the asseration
|
||||
"test_auto_enabling_integrations_catches_import_error"
|
||||
# Output mismatch in sqlalchemy test
|
||||
"test_too_large_event_truncated"
|
||||
# Failing falcon tests
|
||||
"test_has_context"
|
||||
"uri_template-"
|
||||
"path-"
|
||||
"test_falcon_large_json_request"
|
||||
"test_falcon_empty_json_request"
|
||||
"test_falcon_raw_data_request"
|
||||
# Failing spark tests
|
||||
"test_set_app_properties"
|
||||
"test_start_sentry_listener"
|
||||
# Failing threading test
|
||||
"test_circular_references"
|
||||
# Failing wsgi tests
|
||||
"test_session_mode_defaults_to_request_mode_in_wsgi_handler"
|
||||
"test_auto_session_tracking_with_aggregates"
|
||||
# Network requests to public web
|
||||
"test_crumb_capture"
|
||||
# TypeError: cannot unpack non-iterable TestResponse object
|
||||
"test_rpc_error_page"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Some tests are failing (network access, assertion errors)
|
||||
"tests/integrations/aiohttp/"
|
||||
"tests/integrations/gcp/"
|
||||
"tests/integrations/httpx/"
|
||||
"tests/integrations/stdlib/test_httplib.py"
|
||||
# Tests are blocking
|
||||
"tests/integrations/celery/"
|
||||
# pytest-chalice is not available in nixpkgs yet
|
||||
"tests/integrations/chalice/"
|
||||
# broken since rq-1.10.1: https://github.com/getsentry/sentry-python/issues/1274
|
||||
"tests/integrations/rq/"
|
||||
# broken since pytest 7.0.1; AssertionError: previous item was not torn down properly
|
||||
"tests/utils/test_contextvars.py"
|
||||
# broken since Flask and Werkzeug update to 2.1.0 (different error messages)
|
||||
"tests/integrations/flask/test_flask.py"
|
||||
"tests/integrations/bottle/test_bottle.py"
|
||||
"tests/integrations/django/test_basic.py"
|
||||
"tests/integrations/pyramid/test_pyramid.py"
|
||||
]
|
||||
# test crashes on aarch64
|
||||
++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [
|
||||
# Varius integration tests fail every once in a while when we
|
||||
# upgrade depencies, so don't bother testing them.
|
||||
"tests/integrations/"
|
||||
] ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [
|
||||
# test crashes on aarch64
|
||||
"tests/test_transport.py"
|
||||
"tests/integrations/threading/test_threading.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinxcontrib-spelling";
|
||||
version = "7.3.3";
|
||||
version = "7.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-OBnRJinZXgyQkiT6QLRipn4K2zIdUCg9f8DRFobIrH4=";
|
||||
hash = "sha256-GLsQu912pXRg7dejBka9lXZt+oxv50/T7J2ZQ2BlmGA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-mqtt";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Gj+hXgGkOqKnZ4W2iZ9P6JN3lYMoREMSF/wfGwLL/tc=";
|
||||
hash = "sha256-Gj+hXgGkOqKnZ4W2iZ9P6JN3lYMoREMSF/wfGwLL/tc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
--replace "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \
|
||||
--replace "pytest-cov" ""
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "weconnect[Images]~=0.35.1" "weconnect"
|
||||
--replace "weconnect[Images]~=0.40.0" "weconnect"
|
||||
'';
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "weconnect";
|
||||
version = "0.40.0";
|
||||
version = "0.41.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "tillsteinbach";
|
||||
repo = "WeConnect-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NXINATb8/yDPnpwQEbPhuazdTlsZqv7BUPzedIg0IV4=";
|
||||
hash = "sha256-y8vHniQ32WDQYPKfnOin1uLmr24KC1t6zSpxGdgwXOg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
59
pkgs/development/python-modules/xarray-einstats/default.nix
Normal file
59
pkgs/development/python-modules/xarray-einstats/default.nix
Normal file
@ -0,0 +1,59 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, einops
|
||||
, fetchFromGitHub
|
||||
, flit-core
|
||||
, numba
|
||||
, numpy
|
||||
, pandas
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, scipy
|
||||
, xarray
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xarray-einstats";
|
||||
version = "0.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arviz-devs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-yc2dWKL9XhSSB7rUKS2uDCa4IyH/ajUf632Of2beY+4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
scipy
|
||||
xarray
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
einops
|
||||
numba
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"xarray_einstats"
|
||||
];
|
||||
|
||||
pytestFlagsArray = [
|
||||
"src/xarray_einstats/tests/"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Stats, linear algebra and einops for xarray";
|
||||
homepage = "https://github.com/arviz-devs/xarray-einstats";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -1,12 +1,12 @@
|
||||
{ lib, stdenv, fetchurl, makeWrapper, jre }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "10.1";
|
||||
version = "10.2";
|
||||
pname = "checkstyle";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
|
||||
sha256 = "sha256-raVTkfJou6mLgjZd4vriPOAeM+mrlWf3lo9kFstMpT8=";
|
||||
sha256 = "sha256-jcu7KMeYbHZW4zswaV/cLkY4CLX9vJIcElXJq06EfRY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -2,14 +2,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "dprint";
|
||||
version = "0.28.0";
|
||||
version = "0.29.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-MGAkjjP6efdME4SncV18aLOOC4XxWutaYTINSIRCSp0=";
|
||||
sha256 = "sha256-uLNZUIp8+fKr6l+vi8rqjXn9PrwAmpYnYuwtYjl2y+o=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-k2BrkdLRFmppQcPm2dkbQIOlmIv/jsfwD8S/rsLxm+0=";
|
||||
cargoSha256 = "sha256-bmbrnzUZfHvO5waMixZoD0DmWxVGtUXhIwZLLlHqPhs=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-insta";
|
||||
version = "1.13.0";
|
||||
version = "1.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mitsuhiko";
|
||||
repo = "insta";
|
||||
rev = version;
|
||||
sha256 = "sha256-cSQEwsUqn+Q0ZWndBVatHL0btO7xLOJWO+MMjtSL0Zo=";
|
||||
sha256 = "sha256-kTICdLL3paJIj779w4i7QUzhdynzyjo+YjtBorJsms4=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/cargo-insta";
|
||||
cargoSha256 = "sha256-rn4ln/MeaDAQmWpxeTn3mGH4sEvO4876o1VPYiz/CR8=";
|
||||
cargoSha256 = "sha256-Hfjz3arOvRbMIvV3o60zjRB2p4JbBUFPj66OpHZdIJg=";
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "telegraf";
|
||||
version = "1.22.1";
|
||||
version = "1.22.4";
|
||||
|
||||
excludedPackages = "test";
|
||||
|
||||
@ -12,10 +12,10 @@ buildGoModule rec {
|
||||
owner = "influxdata";
|
||||
repo = "telegraf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-W6o+dFUdnH4c+SLwqhoutOsXf+XLu2qNjYytPp43fjk=";
|
||||
sha256 = "sha256-Cftxm+Lb3ekK8YZrklD/C+p0EpyEVU/xxVI5oiNgBxk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-28Xz8fIlrdCVkG0x5toJXht+RIkBmey4wi6WGqsq80k=";
|
||||
vendorSha256 = "sha256-E1p9hnxNFse7Zg8FGcZrbVqThrGTVSP04nH/ZP8WBlk=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
{ lib, stdenv, fetchzip }:
|
||||
|
||||
let
|
||||
version = "21.11.15";
|
||||
version = "22.1.3";
|
||||
platform = if stdenv.isLinux then "linux" else "darwin";
|
||||
arch = if stdenv.isAarch64 then "arm" else "amd";
|
||||
sha256s = {
|
||||
darwin.amd = "sha256-Yf4O7lVcf+nmb0wFTx7jLjUSmdAItoUfPlkhHveI9UY=";
|
||||
darwin.arm = "sha256-vKfFBheDZtvcbg0zbj3rqUEQczZvySuGuM3RopnDJG8=";
|
||||
linux.amd = "sha256:0vpxn7kcpqylk0nc74m6yxgwwf8ns8pyb6kxnmnmv2x58f8x4c8n";
|
||||
linux.arm = "sha256-1AQSB2V5zGivU0UinTST2kOydQf/bmLbpjdW0Yo4ptE=";
|
||||
darwin.amd = "sha256-AXk3aP1SGiHTfHTCBRTagX0DAVmdcVVIkxWaTnZxB8g=";
|
||||
darwin.arm = "sha256-pvOVvNc8lZ2d2fVZVYWvumVWYpnLORNY/3o1t4BN2N4=";
|
||||
linux.amd = "sha256-Uz7KjbsH3lKRL0iI73DxwS5rcIkPQiMFkIQsc06gF0k=";
|
||||
linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8=";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "redpanda";
|
||||
@ -25,6 +25,12 @@ in stdenv.mkDerivation rec {
|
||||
mkdir -p $out/bin
|
||||
cp rpk $out/bin
|
||||
|
||||
${lib.optionalString stdenv.isLinux ''
|
||||
patchelf \
|
||||
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
|
||||
$out/bin/rpk
|
||||
''}
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
|
||||
@ -186,6 +186,7 @@ let
|
||||
rm tests/pexpects/exit_handlers.py
|
||||
'';
|
||||
|
||||
outputs = [ "out" "doc" ];
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
@ -199,7 +200,7 @@ let
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DCMAKE_INSTALL_DOCDIR=${placeholder "out"}/share/doc/fish"
|
||||
"-DCMAKE_INSTALL_DOCDIR=${placeholder "doc"}/share/doc/fish"
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
"-DMAC_CODESIGN_ID=OFF"
|
||||
];
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "syft";
|
||||
version = "0.46.2";
|
||||
version = "0.46.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "anchore";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-eVW8Ho23Yylo8B7m7h175yCDjDuh7dbI+ZeiB4SCNAM=";
|
||||
sha256 = "sha256-4Yo9CIAVEOtAvsvGzSXerTwCbvylo7MjwJwWU6uJAX8=";
|
||||
# populate values that require us to use git. By doing this in postFetch we
|
||||
# can delete .git afterwards and maintain better reproducibility of the src.
|
||||
leaveDotGit = true;
|
||||
|
||||
@ -6,15 +6,15 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trivy";
|
||||
version = "0.28.0";
|
||||
version = "0.28.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-zyTUGAxUAfrigRNiw03ZXFK+UkpuxwuU2xviZmAPuR8=";
|
||||
sha256 = "sha256-x9mojwA86zgXRwKDp1kIh5/LRdHjm02119CKYlIkZgw=";
|
||||
};
|
||||
vendorSha256 = "sha256-dgiKWHSm49/CB4dWrNWIzkkmj6Aw4l+9iLa6xe/umq0=";
|
||||
vendorSha256 = "sha256-7rX4j188IXhSS4E4NStAsJq4FEfAFxIys7jucDCCe+4=";
|
||||
|
||||
excludedPackages = "misc";
|
||||
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-hangul";
|
||||
version = "5.0.8";
|
||||
version = "5.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-b8vxPzTmvmvWkO5H/yf+Kg9xPQ/53tR9jQsD11KjzJw=";
|
||||
sha256 = "sha256-jT9k5QXW3fdG6s91NjFZ3lrjADy8wxf2SRiVDSnr6So=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-lua";
|
||||
version = "5.0.7";
|
||||
version = "5.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-ZZwPjELIJczF3AJxQqJcwA6J8vGuPdit/0dEHS+g7J0=";
|
||||
sha256 = "sha256-VHGHKV5KLbfIMWLErLRNl8pOQOkYkc/f6VjZUSqluFk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,13 +13,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-m17n";
|
||||
version = "5.0.8";
|
||||
version = "5.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-Mh3a7PzfNmGGXzKb/6QUgLmRw7snsM3WSOduFdxj6OM=";
|
||||
sha256 = "sha256-JySEzWyPZqVrvgRA4Hc0ZSGLdS29n8uoSQsFEMK6kbs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-rime";
|
||||
version = "5.0.12";
|
||||
version = "5.0.13";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-8ETSRBTznd4AKzYbSW/zIMZXV+yuHXLhfTJV3DJ2ahc=";
|
||||
sha256 = "sha256-/oQdBCDV5obSHw7dzdceC+zWHcNve3NDlA50GhvkK8o=";
|
||||
};
|
||||
|
||||
cmakeFlags = [
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-table-extra";
|
||||
version = "5.0.9";
|
||||
version = "5.0.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-FEpBpEfq9qRLQ+j+313ua3zhZnphdaYy9jPKyb8oUG8=";
|
||||
sha256 = "sha256-fKT1nCr6kAFJEdacff4qBr3uI5fvIwMDPkHVFGTQf10=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "fcitx5-table-other";
|
||||
version = "5.0.8";
|
||||
version = "5.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fcitx";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-aCZqcPqokkxBWx9kPBfxbslW1RZBIoZ63e7fPItl5yg=";
|
||||
sha256 = "sha256-y/OY7m136VQvK75079OTFqLLR2o0NCIc5llljrJ91DU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fselect";
|
||||
version = "0.8.0";
|
||||
version = "0.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jhspetersson";
|
||||
repo = "fselect";
|
||||
rev = version;
|
||||
sha256 = "sha256-nFfzvTCiNlv+EzK51w04JHh8tfsim/8hFCxnZZue5No=";
|
||||
sha256 = "sha256-oJyaK39ZCY7RB1U2yBMJg0tvJxnLE5iRLSnywYe9LNU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-B7uJ9hLN/WhLA/bqoO7WZ38tN0tDMZ2KW/vjfOgcQ3A=";
|
||||
cargoSha256 = "sha256-sT/WfnROBi4PNcEbs381cMGyKPRuQ3PdJ2kzr/paycQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
@ -1,44 +1,29 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
}:
|
||||
{ lib, nimPackages, fetchFromGitHub }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "tridactyl-native";
|
||||
# this is actually the version of tridactyl itself; the native messenger will
|
||||
# probably not change with every tridactyl version
|
||||
version = "1.20.4";
|
||||
nimPackages.buildNimPackage rec {
|
||||
pname = "tridactly-native";
|
||||
version = "0.3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tridactyl";
|
||||
repo = "tridactyl";
|
||||
rev = version;
|
||||
sha256 = "sha256-BjjRB9VadQ/MSwNK2QLbcTDoRs6Ua+5MONHtmfq4xz0=";
|
||||
repo = "native_messenger";
|
||||
rev = "5cc315da79a1caa8fd5b27b192377d8824a311c1";
|
||||
sha256 = "sha256-9IyVDJgdZleeNltD1b4PfqxeWAtFsPHtmq1ZC5Z0O9k=";
|
||||
};
|
||||
sourceRoot = "source/native";
|
||||
|
||||
nativeBuildInputs = [
|
||||
python3.pkgs.wrapPython
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
sed -i -e "s|REPLACE_ME_WITH_SED|$out/share/tridactyl/native_main.py|" "tridactyl.json"
|
||||
'';
|
||||
buildInputs = with nimPackages; [ tempfile ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/lib/mozilla/native-messaging-hosts"
|
||||
sed -i -e "s|REPLACE_ME_WITH_SED|$out/bin/native_main|" "tridactyl.json"
|
||||
cp tridactyl.json "$out/lib/mozilla/native-messaging-hosts/"
|
||||
|
||||
mkdir -p "$out/share/tridactyl"
|
||||
cp native_main.py "$out/share/tridactyl"
|
||||
wrapPythonProgramsIn "$out/share/tridactyl"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tridactyl native messaging host application";
|
||||
homepage = "https://github.com/tridactyl/tridactyl";
|
||||
license = licenses.asl20;
|
||||
description =
|
||||
"Native messenger for Tridactyl, a vim-like Firefox webextension";
|
||||
homepage = "https://github.com/tridactyl/native_messenger";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ timokau ];
|
||||
maintainers = with maintainers; [ timokau dit7ya ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2022-05-18";
|
||||
version = "2022-05-26";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
sha256 = "sha256-E2QPeSlsJCRhnwgxr1NerLkSFbLLaTSLl8oeYsHQM+U=";
|
||||
sha256 = "sha256-yLbPgU8BAAcXZtG4fIo6oVtD1tRBlGgNeFglyGJ8Uhk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "choose";
|
||||
version = "1.3.3";
|
||||
version = "1.3.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "theryangeary";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-HYwlAgFKbi6or2eblERdMMjJOJdtt2FCQECUg3MzO8E=";
|
||||
sha256 = "sha256-yW1quDyQn2xhrlhhPj9DKq7g8LlYKvEKDFj3xSagRTU=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-55/B+LxdbekfaKKyng0lUCU3QnqL34M+QnLUxaPqkqI=";
|
||||
cargoSha256 = "sha256-0INC0LFzlnFnt5pCiU4xePxU8a6GiU1L8bg7zcuFl2k=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "A human-friendly and fast alternative to cut and (sometimes) awk";
|
||||
|
||||
@ -11726,6 +11726,8 @@ with pkgs;
|
||||
|
||||
wg-bond = callPackage ../applications/networking/wg-bond { };
|
||||
|
||||
wgcf = callPackage ../applications/networking/wgcf { };
|
||||
|
||||
which = callPackage ../tools/system/which { };
|
||||
|
||||
whsniff = callPackage ../applications/networking/sniffers/whsniff { };
|
||||
@ -18577,8 +18579,6 @@ with pkgs;
|
||||
icu = icu67;
|
||||
};
|
||||
|
||||
libechonest = callPackage ../development/libraries/libechonest { };
|
||||
|
||||
libemf2svg = callPackage ../development/libraries/libemf2svg { };
|
||||
|
||||
libev = callPackage ../development/libraries/libev { };
|
||||
@ -20165,8 +20165,6 @@ with pkgs;
|
||||
|
||||
qimageblitz = callPackage ../development/libraries/qimageblitz {};
|
||||
|
||||
qjson = callPackage ../development/libraries/qjson { };
|
||||
|
||||
qolibri = libsForQt5.callPackage ../applications/misc/qolibri { };
|
||||
|
||||
qt4 = qt48;
|
||||
@ -25095,6 +25093,8 @@ with pkgs;
|
||||
|
||||
adobe-reader = pkgsi686Linux.callPackage ../applications/misc/adobe-reader { };
|
||||
|
||||
appvm = callPackage ../applications/virtualization/appvm { };
|
||||
|
||||
masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { };
|
||||
|
||||
masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { };
|
||||
|
||||
@ -5870,6 +5870,8 @@ in {
|
||||
|
||||
numpy-stl = callPackage ../development/python-modules/numpy-stl { };
|
||||
|
||||
numpyro = callPackage ../development/python-modules/numpyro { };
|
||||
|
||||
nunavut = callPackage ../development/python-modules/nunavut { };
|
||||
|
||||
nutils = callPackage ../development/python-modules/nutils { };
|
||||
@ -11165,6 +11167,8 @@ in {
|
||||
|
||||
xarray = callPackage ../development/python-modules/xarray { };
|
||||
|
||||
xarray-einstats = callPackage ../development/python-modules/xarray-einstats { };
|
||||
|
||||
xattr = callPackage ../development/python-modules/xattr { };
|
||||
|
||||
xbox-webapi = callPackage ../development/python-modules/xbox-webapi { };
|
||||
|
||||
@ -181,6 +181,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
|
||||
|
||||
qcsxcad = callPackage ../development/libraries/science/electronics/qcsxcad { };
|
||||
|
||||
qjson = callPackage ../development/libraries/qjson { };
|
||||
|
||||
qmltermwidget = callPackage ../development/libraries/qmltermwidget {
|
||||
inherit (pkgs.darwin.apple_sdk.libs) utmp;
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user