mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge branch 'staging-next' into staging
This commit is contained in:
Vladimír Čunát
commit
a641e599a8
86 changed files with 1156 additions and 209 deletions
|
|
@ -116,6 +116,13 @@
|
|||
<link xlink:href="options.html#opt-services.kea">services.kea</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://owncast.online/">owncast</link>,
|
||||
self-hosted video live streaming solution. Available at
|
||||
<link xlink:href="options.html#opt-services.owncast">services.owncast</link>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<link xlink:href="https://sr.ht">sourcehut</link>, a
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- [Kea](https://www.isc.org/kea/), ISCs 2nd generation DHCP and DDNS server suite. Available at [services.kea](options.html#opt-services.kea).
|
||||
|
||||
- [owncast](https://owncast.online/), self-hosted video live streaming solution. Available at [services.owncast](options.html#opt-services.owncast).
|
||||
|
||||
- [sourcehut](https://sr.ht), a collection of tools useful for software development. Available as [services.sourcehut](options.html#opt-services.sourcehut.enable).
|
||||
|
||||
- [ucarp](https://download.pureftpd.org/pub/ucarp/README), an userspace implementation of the Common Address Redundancy Protocol (CARP). Available as [networking.ucarp](options.html#opt-networking.ucarp.enable).
|
||||
|
|
|
|||
|
|
@ -560,6 +560,7 @@
|
|||
./services/misc/octoprint.nix
|
||||
./services/misc/ombi.nix
|
||||
./services/misc/osrm.nix
|
||||
./services/misc/owncast.nix
|
||||
./services/misc/packagekit.nix
|
||||
./services/misc/paperless-ng.nix
|
||||
./services/misc/parsoid.nix
|
||||
|
|
|
|||
98
nixos/modules/services/misc/owncast.nix
Normal file
98
nixos/modules/services/misc/owncast.nix
Normal file
|
|
@ -0,0 +1,98 @@
|
|||
{ lib, pkgs, config, ... }:
|
||||
with lib;
|
||||
let cfg = config.services.owncast;
|
||||
in {
|
||||
|
||||
options.services.owncast = {
|
||||
|
||||
enable = mkEnableOption "owncast";
|
||||
|
||||
dataDir = mkOption {
|
||||
type = types.str;
|
||||
default = "/var/lib/owncast";
|
||||
description = ''
|
||||
The directory where owncast stores its data files. If left as the default value this directory will automatically be created before the owncast server starts, otherwise the sysadmin is responsible for ensuring the directory exists with appropriate ownership and permissions.
|
||||
'';
|
||||
};
|
||||
|
||||
openFirewall = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Open the appropriate ports in the firewall for owncast.
|
||||
'';
|
||||
};
|
||||
|
||||
user = mkOption {
|
||||
type = types.str;
|
||||
default = "owncast";
|
||||
description = "User account under which owncast runs.";
|
||||
};
|
||||
|
||||
group = mkOption {
|
||||
type = types.str;
|
||||
default = "owncast";
|
||||
description = "Group under which owncast runs.";
|
||||
};
|
||||
|
||||
listen = mkOption {
|
||||
type = types.str;
|
||||
default = "127.0.0.1";
|
||||
example = "0.0.0.0";
|
||||
description = "The IP address to bind the owncast web server to.";
|
||||
};
|
||||
|
||||
port = mkOption {
|
||||
type = types.port;
|
||||
default = 8080;
|
||||
description = ''
|
||||
TCP port where owncast web-gui listens.
|
||||
'';
|
||||
};
|
||||
|
||||
rtmp-port = mkOption {
|
||||
type = types.port;
|
||||
default = 1935;
|
||||
description = ''
|
||||
TCP port where owncast rtmp service listens.
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
||||
systemd.services.owncast = {
|
||||
description = "A self-hosted live video and web chat server";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
|
||||
serviceConfig = mkMerge [
|
||||
{
|
||||
User = cfg.user;
|
||||
Group = cfg.group;
|
||||
WorkingDirectory = cfg.dataDir;
|
||||
ExecStart = "${pkgs.owncast}/bin/owncast -webserverport ${toString cfg.port} -rtmpport ${toString cfg.rtmp-port} -webserverip ${cfg.listen}";
|
||||
Restart = "on-failure";
|
||||
}
|
||||
(mkIf (cfg.dataDir == "/var/lib/owncast") {
|
||||
StateDirectory = "owncast";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
users.users = mkIf (cfg.user == "owncast") {
|
||||
owncast = {
|
||||
isSystemUser = true;
|
||||
group = cfg.group;
|
||||
description = "owncast system user";
|
||||
};
|
||||
};
|
||||
|
||||
users.groups = mkIf (cfg.group == "owncast") { owncast = { }; };
|
||||
|
||||
networking.firewall =
|
||||
mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.rtmp-port ] ++ optional (cfg.listen != "127.0.0.1") cfg.port; };
|
||||
|
||||
};
|
||||
meta = { maintainers = with lib.maintainers; [ MayNiklas ]; };
|
||||
}
|
||||
|
|
@ -327,6 +327,7 @@ in
|
|||
openstack-image-metadata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).metadata or {};
|
||||
openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {};
|
||||
opentabletdriver = handleTest ./opentabletdriver.nix {};
|
||||
owncast = handleTest ./owncast.nix {};
|
||||
image-contents = handleTest ./image-contents.nix {};
|
||||
orangefs = handleTest ./orangefs.nix {};
|
||||
os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {};
|
||||
|
|
|
|||
21
nixos/tests/owncast.nix
Normal file
21
nixos/tests/owncast.nix
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ system ? builtins.currentSystem, config ? { }
|
||||
, pkgs ? import ../.. { inherit system config; } }:
|
||||
|
||||
with import (nixpkgs + "/nixos/lib/testing-python.nix") { inherit system; };
|
||||
makeTest {
|
||||
name = "owncast";
|
||||
meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ MayNiklas ]; };
|
||||
|
||||
nodes = {
|
||||
client = { ... }: {
|
||||
environment.systemPackages = [ curl ];
|
||||
services.owncast = { enable = true; };
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
start_all()
|
||||
client.wait_for_unit("owncast.service")
|
||||
client.succeed("curl localhost:8080/api/status")
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, stdenv, fetchFromGitLab, meson, ninja, cmake
|
||||
{ lib, stdenv, fetchFromGitLab, meson, ninja
|
||||
, wrapGAppsHook, pkg-config, desktop-file-utils
|
||||
, appstream-glib, pythonPackages, glib, gobject-introspection
|
||||
, gtk3, webkitgtk, glib-networking, gnome, gspell, texlive
|
||||
, shared-mime-info, libhandy, fira
|
||||
, shared-mime-info, libhandy, fira, sassc
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -13,18 +13,18 @@ let
|
|||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "apostrophe";
|
||||
version = "2.4";
|
||||
version = "2.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "somas";
|
||||
owner = "World";
|
||||
repo = pname;
|
||||
domain = "gitlab.gnome.org";
|
||||
rev = "v${version}";
|
||||
sha256 = "1qzy3zhi18wf42m034s8kcmx9gl05j620x3hf6rnycq2fvy7g4gz";
|
||||
sha256 = "06yfiflmj3ip7ppcz41nb3xpgb5ggw5h74w0v87yaqqkq7qh31lp";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ meson ninja cmake pkg-config desktop-file-utils
|
||||
appstream-glib wrapGAppsHook ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils
|
||||
appstream-glib wrapGAppsHook sassc ];
|
||||
|
||||
buildInputs = [ glib pythonEnv gobject-introspection gtk3
|
||||
gnome.adwaita-icon-theme webkitgtk gspell texlive
|
||||
|
|
@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://gitlab.gnome.org/somas/apostrophe";
|
||||
homepage = "https://gitlab.gnome.org/World/apostrophe";
|
||||
description = "A distraction free Markdown editor for GNU/Linux";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
|
|
|
|||
|
|
@ -112,7 +112,8 @@ let
|
|||
'';
|
||||
|
||||
# See https://github.com/NixOS/nixpkgs/issues/49643#issuecomment-873853897
|
||||
postPatch = ''
|
||||
# linux only because of https://github.com/NixOS/nixpkgs/issues/138729
|
||||
postPatch = lib.optionalString stdenv.isLinux ''
|
||||
# this is a fix for "save as root" functionality
|
||||
packed="resources/app/node_modules.asar"
|
||||
unpacked="resources/app/node_modules"
|
||||
|
|
|
|||
|
|
@ -2,23 +2,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "joshuto";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kamiyaa";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "08d6h7xwcgycw5bdzwwc6aaikcrw3yc7inkiydgml9q261kql7zl";
|
||||
# upstream includes an outdated Cargo.lock that stops cargo from compiling
|
||||
postFetch = ''
|
||||
mkdir -p $out
|
||||
tar xf $downloadedFile --strip=1 -C $out
|
||||
substituteInPlace $out/Cargo.lock \
|
||||
--replace 0.8.6 ${version}
|
||||
'';
|
||||
sha256 = "sha256-+qKOvFoEF/gZL4ijL8lIRWE9ZWJM2eBlk29Lk46jAfQ=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1scrqm7fs8y7anfiigimj7y5rjxcc2qvrxiq8ai7k5cwfc4v1ghm";
|
||||
# upstream includes an outdated Cargo.lock that stops cargo from compiling
|
||||
cargoPatches = [ ./fix-cargo-lock.patch ];
|
||||
|
||||
cargoSha256 = "sha256-JlekxU9pMkHNsIcH3+7b2I6MYUlxRqNX+0wwyVrQMAE=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin SystemConfiguration;
|
||||
|
||||
|
|
|
|||
11
pkgs/applications/misc/joshuto/fix-cargo-lock.patch
Normal file
11
pkgs/applications/misc/joshuto/fix-cargo-lock.patch
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -512,7 +512,7 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
|
||||
|
||||
[[package]]
|
||||
name = "joshuto"
|
||||
-version = "0.9.0"
|
||||
+version = "0.9.1"
|
||||
dependencies = [
|
||||
"alphanumeric-sort",
|
||||
"chrono",
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, fetchurl, python2Packages }:
|
||||
{ lib, fetchurl, python3Packages }:
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "menumaker";
|
||||
version = "0.99.12";
|
||||
version = "0.99.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/menumaker/${pname}-${version}.tar.gz";
|
||||
sha256 = "034v5204bsgkzzk6zfa5ia63q95gln47f7hwf96yvad5hrhmd8z3";
|
||||
sha256 = "sha256-JBXs5hnt1snbnB1hi7q7HBI7rNp0OoalLeIM0uJCdkE=";
|
||||
};
|
||||
|
||||
format = "other";
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ buildGoPackage rec {
|
|||
goDeps = ./deps.nix;
|
||||
|
||||
preConfigure = ''
|
||||
for i in $(find . -type f);do
|
||||
for i in *.go **/*.go; do
|
||||
substituteInPlace $i --replace michaeldv/termbox-go nsf/termbox-go
|
||||
done
|
||||
substituteInPlace Makefile --replace mop/cmd mop/mop
|
||||
|
|
|
|||
|
|
@ -6,6 +6,6 @@
|
|||
|
||||
callPackage ./generic.nix {
|
||||
inherit buildGoPackage nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.0.10";
|
||||
sha256 = "1yd4j35dmxzg9qapqyq3g3hnhxi5c4f57q43xbim8255bjyn94f0";
|
||||
version = "1.0.11";
|
||||
sha256 = "15h7w020p576zl91s5mr4npcmngrqqfj9xzlx6bk9i1cp6h4w0jy";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
callPackage ./genericModule.nix {
|
||||
inherit buildGoModule nvidia_x11 nvidiaGpuSupport;
|
||||
version = "1.1.4";
|
||||
sha256 = "182f3sxw751s8qg16vbssplhl92i9gshgzvflwwvnxraz2795y7l";
|
||||
vendorSha256 = "1nddknnsvb05sapbj1c52cv2fmibvdg48f88malxqblzw33wfziq";
|
||||
version = "1.1.5";
|
||||
sha256 = "03gxh12bd5mj1l4q3xilil806dsqaqmz93ff7ysf441frgkx3iy3";
|
||||
vendorSha256 = "0rfd22rf76mwj489zhswah4g3dhhz6davm336xgm9dbnyaz9d8r0";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "chatterino2";
|
||||
version = "2.3.0";
|
||||
version = "2.3.4";
|
||||
src = fetchFromGitHub {
|
||||
owner = "Chatterino";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0x12zcrbkxn2nn0hqkj1amrxv4q032id282cajzsx7by970r1shd";
|
||||
sha256 = "sha256-ZmUM56+YNH98J3XE/mWOOIfb0qBld2n4iuHpImbrU4o=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ];
|
||||
|
|
|
|||
|
|
@ -91,7 +91,11 @@ stdenv.mkDerivation rec {
|
|||
inherit (python.sourceVersion) major minor; # Should be changed in case of PyPy
|
||||
});
|
||||
|
||||
postPatch = lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") ''
|
||||
postPatch = ''
|
||||
substituteInPlace src/caffe/util/io.cpp --replace \
|
||||
'SetTotalBytesLimit(kProtoReadBytesLimit, 536870912)' \
|
||||
'SetTotalBytesLimit(kProtoReadBytesLimit)'
|
||||
'' + lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") ''
|
||||
# CUDA 9.0 doesn't support sm_20
|
||||
sed -i 's,20 21(20) ,,' cmake/Cuda.cmake
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{ lib, stdenv, fetchgit, fetchFromGitHub, cmake
|
||||
, fetchpatch
|
||||
, openblas, blas, lapack, opencv3, libzip, boost, protobuf, mpi
|
||||
, onebitSGDSupport ? false
|
||||
, cudaSupport ? false, addOpenGLRunpath, cudatoolkit, nvidia_x11
|
||||
|
|
@ -28,6 +29,26 @@ in stdenv.mkDerivation rec {
|
|||
sha256 = "18l9k7s966a26ywcf7flqyhm61788pcb9fj3wk61jrmgkhy2pcns";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with protobuf 3.18+
|
||||
# Remove with onnx submodule bump to 1.9+
|
||||
(fetchpatch {
|
||||
url = "https://github.com/onnx/onnx/commit/d3bc82770474761571f950347560d62a35d519d7.patch";
|
||||
extraPrefix = "Source/CNTKv2LibraryDll/proto/onnx/onnx_repo/";
|
||||
stripLen = 1;
|
||||
sha256 = "00raqj8wx30b06ky6cdp5vvc1mrzs7hglyi6h58hchw5lhrwkzxp";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# Fix build with protobuf 3.18+
|
||||
substituteInPlace Source/CNTKv2LibraryDll/Serialization.cpp \
|
||||
--replace 'SetTotalBytesLimit(INT_MAX, INT_MAX)' \
|
||||
'SetTotalBytesLimit(INT_MAX)' \
|
||||
--replace 'SetTotalBytesLimit(limit, limit)' \
|
||||
'SetTotalBytesLimit(limit)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ] ++ lib.optional cudaSupport addOpenGLRunpath;
|
||||
|
||||
# Force OpenMPI to use g++ in PATH.
|
||||
|
|
|
|||
10
pkgs/build-support/fetchfirefoxaddon/tests.nix
Normal file
10
pkgs/build-support/fetchfirefoxaddon/tests.nix
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
{ invalidateFetcherByDrvHash, fetchFirefoxAddon, ... }:
|
||||
|
||||
{
|
||||
simple = invalidateFetcherByDrvHash fetchFirefoxAddon {
|
||||
name = "image-search-options";
|
||||
# Chosen because its only 147KB
|
||||
url = "https://addons.mozilla.org/firefox/downloads/file/3059971/image_search_options-3.0.12-fx.xpi";
|
||||
sha256 = "sha256-H73YWX/DKxvhEwKpWOo7orAQ7c/rQywpljeyxYxv0Gg=";
|
||||
};
|
||||
}
|
||||
|
|
@ -75,6 +75,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
patches = [
|
||||
./plugins-dir.patch
|
||||
# https://github.com/elementary/gala/pull/1259
|
||||
# https://github.com/NixOS/nixpkgs/issues/139404
|
||||
# Remove this patch when it is included in a new release
|
||||
# of gala OR when we no longer use mutter 3.38 for pantheon
|
||||
./fix-session-crash-when-taking-screenshots.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -0,0 +1,50 @@
|
|||
From fa3c39331d4ef56a13019f45d811bde1fc755c21 Mon Sep 17 00:00:00 2001
|
||||
From: Bobby Rong <rjl931189261@126.com>
|
||||
Date: Sat, 25 Sep 2021 23:21:01 +0800
|
||||
Subject: [PATCH] Fix session crash when taking screenshots with mutter 3.38
|
||||
|
||||
---
|
||||
src/ScreenshotManager.vala | 5 ++---
|
||||
vapi/mutter-clutter.vapi | 2 +-
|
||||
2 files changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/ScreenshotManager.vala b/src/ScreenshotManager.vala
|
||||
index 3ffb0123..388fee1a 100644
|
||||
--- a/src/ScreenshotManager.vala
|
||||
+++ b/src/ScreenshotManager.vala
|
||||
@@ -354,12 +354,11 @@ namespace Gala {
|
||||
paint_flags |= Clutter.PaintFlag.FORCE_CURSORS;
|
||||
}
|
||||
|
||||
- unowned var data = image.get_data ();
|
||||
if (GLib.ByteOrder.HOST == GLib.ByteOrder.LITTLE_ENDIAN) {
|
||||
wm.stage.paint_to_buffer (
|
||||
{x, y, width, height},
|
||||
scale,
|
||||
- ref data,
|
||||
+ image.get_data (),
|
||||
image.get_stride (),
|
||||
Cogl.PixelFormat.BGRA_8888_PRE,
|
||||
paint_flags
|
||||
@@ -368,7 +367,7 @@ namespace Gala {
|
||||
wm.stage.paint_to_buffer (
|
||||
{x, y, width, height},
|
||||
scale,
|
||||
- ref data,
|
||||
+ image.get_data (),
|
||||
image.get_stride (),
|
||||
Cogl.PixelFormat.ARGB_8888_PRE,
|
||||
paint_flags
|
||||
diff --git a/vapi/mutter-clutter.vapi b/vapi/mutter-clutter.vapi
|
||||
index 5b778cb2..95de24be 100644
|
||||
--- a/vapi/mutter-clutter.vapi
|
||||
+++ b/vapi/mutter-clutter.vapi
|
||||
@@ -7336,7 +7336,7 @@ namespace Clutter {
|
||||
[Version (since = "1.2")]
|
||||
public bool get_use_alpha ();
|
||||
#if HAS_MUTTER338
|
||||
- public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false)] ref unowned uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
|
||||
+ public bool paint_to_buffer (Cairo.RectangleInt rect, float scale, [CCode (array_length = false, type = "uint8_t*")] uint8[] data, int stride, Cogl.PixelFormat format, Clutter.PaintFlag paint_flags) throws GLib.Error;
|
||||
public void paint_to_framebuffer (Cogl.Framebuffer framebuffer, Cairo.RectangleInt rect, float scale, Clutter.PaintFlag paint_flags);
|
||||
#else
|
||||
[Version (since = "0.4")]
|
||||
|
|
@ -109,8 +109,7 @@ in stdenv.mkDerivation {
|
|||
inherit passthru;
|
||||
|
||||
meta = {
|
||||
# The emscripten is broken on darwin
|
||||
platforms = lib.platforms.linux;
|
||||
platforms = with lib.platforms; linux ++ darwin;
|
||||
|
||||
# Hydra limits jobs to only outputting 1 gigabyte worth of files.
|
||||
# GHCJS outputs over 3 gigabytes.
|
||||
|
|
|
|||
|
|
@ -1,9 +1,6 @@
|
|||
import ./generic.nix {
|
||||
major_version = "4";
|
||||
minor_version = "13";
|
||||
patch_version = "0-rc2";
|
||||
src = fetchTarball {
|
||||
url = "https://caml.inria.fr/pub/distrib/ocaml-4.13/ocaml-4.13.0~rc2.tar.xz";
|
||||
sha256 = "1w4sdrs5s1bhbisgz44ysi2j1n13qd3slgs34ppglpwmqqw6ply2";
|
||||
};
|
||||
patch_version = "0";
|
||||
sha256 = "sha256:1f7gnndzs6qcyy2gnzalnhm808pifxhvxg2qp5dnsziz6li7x303";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@
|
|||
, libGL
|
||||
, libGLU
|
||||
, libjpeg
|
||||
, xorg
|
||||
, ncurses
|
||||
, libpng, libtool, mpfr, openssl, pango, poppler
|
||||
, readline, sqlite
|
||||
|
|
@ -96,6 +97,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = false;
|
||||
|
||||
postFixup = lib.optionalString stdenv.isDarwin ''
|
||||
wrapProgram $out/bin/drracket --prefix DYLD_LIBRARY_PATH : ${xorg.libX11}/lib
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A programmable programming language";
|
||||
|
|
@ -112,6 +116,5 @@ stdenv.mkDerivation rec {
|
|||
license = with licenses; [ asl20 /* or */ mit ];
|
||||
maintainers = with maintainers; [ kkallio henrytill vrthra ];
|
||||
platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ];
|
||||
broken = stdenv.isDarwin; # No support yet for setting FFI lookup path
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
|
|||
|
||||
makeFlags = [ "INSTALLPREFIX=$(out)" ];
|
||||
|
||||
postFixup = ''
|
||||
chmod +x $out/lib/*
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://miniupnp.free.fr/libnatpmp.html";
|
||||
description = "NAT-PMP client";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
, autoPatchelfHook
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, git
|
||||
, protobuf
|
||||
|
|
@ -10,17 +11,29 @@
|
|||
, opencv
|
||||
, unzip
|
||||
, shellcheck
|
||||
, srcOnly
|
||||
, python
|
||||
, enablePython ? false
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
onnx_src = fetchFromGitHub {
|
||||
owner = "onnx";
|
||||
repo = "onnx";
|
||||
rev = "v1.8.1";
|
||||
sha256 = "+1zNnZ4lAyVYRptfk0PV7koIX9FqcfD1Ah33qj/G2rA=";
|
||||
onnx_src = srcOnly {
|
||||
name = "onnx-patched";
|
||||
src = fetchFromGitHub {
|
||||
owner = "onnx";
|
||||
repo = "onnx";
|
||||
rev = "v1.8.1";
|
||||
sha256 = "+1zNnZ4lAyVYRptfk0PV7koIX9FqcfD1Ah33qj/G2rA=";
|
||||
};
|
||||
patches = [
|
||||
# Fix build with protobuf 3.18+
|
||||
# Remove with onnx 1.9 release
|
||||
(fetchpatch {
|
||||
url = "https://github.com/onnx/onnx/commit/d3bc82770474761571f950347560d62a35d519d7.patch";
|
||||
sha256 = "0vdsrklkzhdjaj8wdsl4icn93q3961g8dx35zvff0nhpr08wjb7y";
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
in
|
||||
|
|
|
|||
|
|
@ -14,6 +14,15 @@ stdenv.mkDerivation rec {
|
|||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
# https://github.com/valhalla/valhalla/issues/2119
|
||||
postPatch = ''
|
||||
for f in valhalla/mjolnir/transitpbf.h \
|
||||
src/mjolnir/valhalla_query_transit.cc; do
|
||||
substituteInPlace $f --replace 'SetTotalBytesLimit(limit, limit)' \
|
||||
'SetTotalBytesLimit(limit)'
|
||||
done
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [
|
||||
zlib curl protobuf prime-server boost sqlite libspatialite
|
||||
|
|
|
|||
39
pkgs/development/python-modules/aiopvapi/default.nix
Normal file
39
pkgs/development/python-modules/aiopvapi/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, async-timeout
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiopvapi";
|
||||
version = "1.6.14";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "02bl7q166j6rb8av9n1jz11xlwhrzmbkjq70mwr86qaj63pcxrak";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
async-timeout
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "aiopvapi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API for the PowerView API";
|
||||
homepage = "https://github.com/sander76/aio-powerview-api";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
53
pkgs/development/python-modules/aiowatttime/default.nix
Normal file
53
pkgs/development/python-modules/aiowatttime/default.nix
Normal file
|
|
@ -0,0 +1,53 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pytest-aiohttp
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiowatttime";
|
||||
version = "0.1.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bachya";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1614p5ca7x9ipz7dgwhiz83dfwn6hyliawa8pr2j9y2kn8cg2sdm";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aresponses
|
||||
pytest-aiohttp
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
# Ignore the examples directory as the files are prefixed with test_
|
||||
disabledTestPaths = [ "examples/" ];
|
||||
|
||||
pythonImportsCheck = [ "aiowatttime" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for interacting with WattTime";
|
||||
homepage = "https://github.com/bachya/aiowatttime";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -7,12 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioymaps";
|
||||
version = "1.1.0";
|
||||
version = "1.2.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1rvgf4flvnpjj0sm14xlnfmmnlmkz6xq5h5mfb14amkfy76za3jm";
|
||||
sha256 = "sha256-YkSoxYf/Ti/gc1BFSYR24P3OzDrmcGWKhcOcrGpkRjU=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "arcam-fmj";
|
||||
version = "0.11.1";
|
||||
version = "0.12.0";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "elupus";
|
||||
repo = "arcam_fmj";
|
||||
rev = version;
|
||||
sha256 = "sha256-Vs32LGRN6kxG8sswvuUwuUbLv9GXuhJeK0CUGoo2EgE=";
|
||||
sha256 = "sha256-YkoABsOLEl1gSCRgZr0lLZGzicr3N5KRNLDjfuQhy2U=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
42
pkgs/development/python-modules/asynccmd/default.nix
Normal file
42
pkgs/development/python-modules/asynccmd/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "asynccmd";
|
||||
version = "0.2.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "valentinmk";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02sa0k0zgwv0y8k00pd1yh4x7k7xqhdikk2c0avpih1204lcw26h";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Deprecation of asyncio.Task.all_tasks(), https://github.com/valentinmk/asynccmd/pull/2
|
||||
(fetchpatch {
|
||||
name = "deprecation-python-38.patch";
|
||||
url = "https://github.com/valentinmk/asynccmd/commit/12afa60ac07db17e96755e266061f2c88cb545ff.patch";
|
||||
sha256 = "0l6sk93gj51qqrpw01a8iiyz14k6dd2z68vr9l9w9vx76l8725yf";
|
||||
})
|
||||
];
|
||||
|
||||
# Tests are outdated
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "asynccmd" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Asyncio implementation of Cmd Python library";
|
||||
homepage = "https://github.com/valentinmk/asynccmd";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "casbin";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "pycasbin";
|
||||
rev = "v${version}";
|
||||
sha256 = "16s1bd8z400cmwz0igai9fdv9qlafwp2fllhy84cfi90yxwh1flp";
|
||||
sha256 = "01prcwkmh3a4ggzjiaai489rrpmgwvqpjcavwjxw60mspyhsbv86";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "deezer-py";
|
||||
version = "1.2.3";
|
||||
version = "1.2.4";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "f4dd648e5bf251cb13316145e243d3a08d870840e0ac1525309926e640c91ea9";
|
||||
sha256 = "1b5664835975fda7a2519ba4b411cc5f2e4113e614ee140389b61844906d0c05";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ requests ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "emoji";
|
||||
version = "1.5.0";
|
||||
version = "1.5.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "carpedm20";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1b75p1ia4ip6aq1657pdwpspvhyjw6dpsrglj2qlql2gdmcm8sp8";
|
||||
sha256 = "11v8zqz183vpiyg2cp0fghb1hxqsn3yaydm1d97nqd9g2mfy37s1";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
|
|
|||
39
pkgs/development/python-modules/eternalegypt/default.nix
Normal file
39
pkgs/development/python-modules/eternalegypt/default.nix
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, attrs
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "eternalegypt";
|
||||
version = "0.0.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "amelchio";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0wi2cqd81irqm873npkqg3mvdrb57idqdsp8qw8h0s7lk0kil1wi";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
attrs
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "eternalegypt" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python API for Netgear LTE modems";
|
||||
homepage = "https://github.com/amelchio/eternalegypt";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -10,11 +10,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fe25519";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1m85qvw9dwxk81mv9k45c9n75pk8wqn70qkinqh56h5zv56vgq24";
|
||||
sha256 = "8819659f19b51713199a75fda5107c93fbb6e2cb4afef3164ce7932b5eb276b9";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
60
pkgs/development/python-modules/flipr-api/default.nix
Normal file
60
pkgs/development/python-modules/flipr-api/default.nix
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, poetry-core
|
||||
, requests-mock
|
||||
, pythonOlder
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "flipr-api";
|
||||
version = "1.4.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cnico";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "00qkzr2g38fpa7ndnbfx9m4d50lmz0j74nkxif3amnkbl4m6l5vn";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python-dateutil
|
||||
requests
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
requests-mock
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/cnico/flipr-api/pull/4
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/cnico/flipr-api/commit/f14be1dfd4f46d4d43d9ea47e51cafca3cc18e86.patch";
|
||||
sha256 = "1fdi19cq21zcjx4g132k480yhi5y0x5qj2l0h8k5zky5cdxs58r6";
|
||||
})
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "flipr_api" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for Flipr API";
|
||||
homepage = "https://github.com/cnico/flipr-api";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "fountains";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "47c28e598cc3a723327daee28c757de3a40f4d8eb48e6be37081932c1d00fa6f";
|
||||
sha256 = "fbf4e2cb11d60d3bafca5bb7c01c254d08a5541ed7ddfe00ef975eb173fb75a4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,25 +1,34 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, lxml, sqlalchemy }:
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, lxml
|
||||
, sqlalchemy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "IMDbPY";
|
||||
pname = "imdbpy";
|
||||
version = "2021.4.18";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
pname = "IMDbPY";
|
||||
inherit version;
|
||||
sha256 = "af57f03638ba3b8ab3d696bfef0eeaf6414385c85f09260aba0a16b32174853f";
|
||||
};
|
||||
|
||||
patches = [ ./sql_error.patch ]; # Already fixed in master, but not yet in the current release. This can be removed upon the next version update
|
||||
propagatedBuildInputs = [
|
||||
lxml
|
||||
sqlalchemy
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [ lxml sqlalchemy ];
|
||||
# Tests require networking, and https://github.com/alberanid/imdbpy/issues/240
|
||||
doCheck = false;
|
||||
|
||||
doCheck = false; # Tests require networking, and https://github.com/alberanid/imdbpy/issues/240
|
||||
pythonImportsCheck = [ "imdb" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python package for retrieving and managing the data of the IMDb database";
|
||||
homepage = "https://imdbpy.github.io/";
|
||||
description = "A Python package for retrieving and managing the data of the IMDb database";
|
||||
maintainers = [ maintainers.ivar ];
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ ivar ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
diff --git a/imdb/parser/sql/__init__.py b/imdb/parser/sql/__init__.py
|
||||
index cd4a3e3..3fcfdd4 100644
|
||||
--- a/imdb/parser/sql/__init__.py
|
||||
+++ b/imdb/parser/sql/__init__.py
|
||||
@@ -557,7 +557,6 @@ class IMDbSqlAccessSystem(IMDbBase):
|
||||
"""The class used to access IMDb's data through a SQL database."""
|
||||
|
||||
accessSystem = 'sql'
|
||||
- _sql_logger = logging.getLogger('imdbpy.parser.sql')
|
||||
|
||||
def __init__(self, uri, adultSearch=True, *arguments, **keywords):
|
||||
"""Initialize the access system."""
|
||||
@@ -582,7 +581,7 @@ class IMDbSqlAccessSystem(IMDbBase):
|
||||
except ImportError as e:
|
||||
raise IMDbError('unable to import SQLAlchemy')
|
||||
# Set the connection to the database.
|
||||
- self._sql_logger.debug('connecting to %s', uri)
|
||||
+ logger.debug('connecting to %s', uri)
|
||||
try:
|
||||
self._connection = setConnection(uri, DB_TABLES)
|
||||
except AssertionError as e:
|
||||
@@ -593,7 +592,7 @@ class IMDbSqlAccessSystem(IMDbBase):
|
||||
# Maps some IDs to the corresponding strings.
|
||||
self._kind = {}
|
||||
self._kindRev = {}
|
||||
- self._sql_logger.debug('reading constants from the database')
|
||||
+ logger.debug('reading constants from the database')
|
||||
try:
|
||||
for kt in KindType.select():
|
||||
self._kind[kt.id] = kt.kind
|
||||
@@ -1616,7 +1615,7 @@ class IMDbSqlAccessSystem(IMDbBase):
|
||||
return
|
||||
if not hasattr(self, '_connection'):
|
||||
return
|
||||
- self._sql_logger.debug('closing connection to the database')
|
||||
+ logger.debug('closing connection to the database')
|
||||
try:
|
||||
self._connection.close()
|
||||
except:
|
||||
36
pkgs/development/python-modules/iotawattpy/default.nix
Normal file
36
pkgs/development/python-modules/iotawattpy/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, httpx
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "iotawattpy";
|
||||
version = "0.1.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1pyxm87lvd6zy0rx7r9jivk2li267r3xr0b9p6vf0v0vp9fmgsw3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
httpx
|
||||
];
|
||||
|
||||
# Project doesn't tag releases or ship the tests with PyPI
|
||||
# https://github.com/gtdiehl/iotawattpy/issues/14
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "iotawattpy" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python interface for the IoTaWatt device";
|
||||
homepage = "https://github.com/gtdiehl/iotawattpy";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, marshmallow
|
||||
, marshmallow-enum
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, typeguard
|
||||
, typing-inspect
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "marshmallow-dataclass";
|
||||
version = "8.5.3";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lovasoa";
|
||||
repo = "marshmallow_dataclass";
|
||||
rev = "v${version}";
|
||||
sha256 = "0mngkjfs2nxxr0y77n429hb22rmjxbnn95j4vwqr9y6q16bqxs0w";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
marshmallow
|
||||
typing-inspect
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
marshmallow-enum
|
||||
pytestCheckHook
|
||||
typeguard
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "marshmallow_dataclass" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Automatic generation of marshmallow schemas from dataclasses";
|
||||
homepage = "https://github.com/lovasoa/marshmallow_dataclass";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,10 +3,11 @@
|
|||
, boto3
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isort
|
||||
, jinja2
|
||||
, md-toc
|
||||
, isort
|
||||
, mdformat
|
||||
, poetry-core
|
||||
, pyparsing
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
|
|
@ -14,16 +15,22 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-builder";
|
||||
version = "4.14.1";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "5.4.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vemel";
|
||||
repo = "mypy_boto3_builder";
|
||||
rev = version;
|
||||
sha256 = "sha256-y55bPi70ldd528Olr2atXHm5JHiLNBZ396D9qwbBmkc=";
|
||||
sha256 = "sha256-PS2MMpI/ezjHnI6vUoHTt0uuuB/w94OrOYBLNCpSxIE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
black
|
||||
boto3
|
||||
|
|
@ -38,6 +45,11 @@ buildPythonPackage rec {
|
|||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# Should be fixed with 5.x
|
||||
"test_get_types"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mypy_boto3_builder" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
35
pkgs/development/python-modules/niluclient/default.nix
Normal file
35
pkgs/development/python-modules/niluclient/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "niluclient";
|
||||
version = "0.1.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "11ymn0cr4lchrcnf2xxlgljw223gwln01gxwr7mcgf95yc4006iq";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "niluclient" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for getting air pollution data from NILU sensor stations";
|
||||
homepage = "https://github.com/hfurubotten/niluclient";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
45
pkgs/development/python-modules/p1monitor/default.nix
Normal file
45
pkgs/development/python-modules/p1monitor/default.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aresponses
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
, yarl
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "p1monitor";
|
||||
version = "1.0.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "klaasnicolaas";
|
||||
repo = "python-p1monitor";
|
||||
rev = "v${version}";
|
||||
sha256 = "1xfr097hmjppp6cfdvfjypxmr1sb9dasq1s3np2vd5d93w0p5123";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
yarl
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "p1monitor" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python client for the P1 Monitor";
|
||||
homepage = "https://github.com/klaasnicolaas/python-p1monitor";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-core";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.core";
|
||||
inherit version;
|
||||
sha256 = "1kd5wda7nqcmrwy6b42nqgz570y99yjw3m6a1kxr8ag3859fwga5";
|
||||
sha256 = "sha256-Jm10Dq5A+mTdBFQfAH0022ls7PMVTLpb4w+nWmfUOFI=";
|
||||
};
|
||||
|
||||
# pyroute2 sub-modules have no tests
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-ethtool";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.ethtool";
|
||||
inherit version;
|
||||
sha256 = "04wxx2nn3rdsjcmck7fidzfdc42gpsjva2jc8p7a987b0j58r17s";
|
||||
sha256 = "sha256-yvgBS2dlIRNcR2DXLPWu72q7x/onUhD36VMzBzzHcVo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-ipdb";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.ipdb";
|
||||
inherit version;
|
||||
sha256 = "0r4xq7h39qac309lpl7haaa4rqf6qzsypkgnsiran3w9jgr1hg75";
|
||||
sha256 = "sha256-8gKP0QE9iviIFQ0DPuz3U3ZXpL434MzOqYAICZYetXc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-ipset";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.ipset";
|
||||
inherit version;
|
||||
sha256 = "sha256-V6aUGYv4PGhxHoEjgNuqoRbd6ftqirO/ofNDQEACTy8=";
|
||||
sha256 = "sha256-rlJ8D5mXSCMKH2iNmit8JXst9tdDafROylMNAHeTt50=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-ndb";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.ndb";
|
||||
inherit version;
|
||||
sha256 = "0q3py2n6w7nhdxi4l6vx8xpxh5if6hav4lcl5nwk8c4pgcrfd4vn";
|
||||
sha256 = "sha256-pNMJWE6e9seEKvT4MrSPxTRKsiXnDjhLrtG3/iuU2fg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-nftables";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.nftables";
|
||||
inherit version;
|
||||
sha256 = "0mj897h86ifk4ncms71nz6qrrfzfq8hd81198vf1hm41wppgyxn1";
|
||||
sha256 = "sha256-sUVaY6PvwFDRCNVQ0cr9AR7d7W6JTZnnvfoC1ZK/bxY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-nslink";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.nslink";
|
||||
inherit version;
|
||||
sha256 = "0iz4vrv05x678ihhl2wdppxda82fxrq3d3sh7mka0pyb66a8mrik";
|
||||
sha256 = "sha256-KS5sKDKnNUTBxtW6cn9xF6qEflX4jXjpS31GB7KZmZ4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2-protocols";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pyroute2.protocols";
|
||||
inherit version;
|
||||
sha256 = "0gb5r1msd14fhalfknhmg67l2hm802r4771i1srgl4rix1sk0yw8";
|
||||
sha256 = "sha256-lj9Q8ew+44m+Y72miQyuZhzjHmdLqYB+c2FK+ph1d84=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroute2";
|
||||
version = "0.6.4";
|
||||
version = "0.6.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "560b48a751b1150056ba553c89a31d563cc18ae2675b3793666adcaeb4fabfda";
|
||||
sha256 = "sha256-0JlciuuWwOTu1NYul8nXlQAKGjO3R9bcVDJmZYV88Rw=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
31
pkgs/development/python-modules/pysdcp/default.nix
Normal file
31
pkgs/development/python-modules/pysdcp/default.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysdcp";
|
||||
version = "1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "pySDCP";
|
||||
inherit version;
|
||||
sha256 = "07396lsn610izaravqc6j5f6m0wjrzgc0d1r9dwqzj15g5zfc7wm";
|
||||
};
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "pysdcp" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to control SONY projectors";
|
||||
homepage = "https://github.com/Galala7/pySDCP";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysiaalarm";
|
||||
version = "3.0.0";
|
||||
version = "3.0.1";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "b1c3a3d48d399bc91014167f59b23af601044d182db9267c23a9cf3559922122";
|
||||
sha256 = "sha256-96LSD1jL4Za7HF9vgplImeY57EQ9qa/hOdjQ/PPBq4A=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
46
pkgs/development/python-modules/pyspcwebgw/default.nix
Normal file
46
pkgs/development/python-modules/pyspcwebgw/default.nix
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aioresponses
|
||||
, asynccmd
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyspcwebgw";
|
||||
version = "0.5.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mbrrg";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0pc25myjc2adqcx2lbns9kw0gy17x1qjgicmfj46n6fn0c786p9v";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asynccmd
|
||||
aiohttp
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aioresponses
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyspcwebgw" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module for the SPC Web Gateway REST API";
|
||||
homepage = "https://github.com/mbrrg/pyspcwebgw";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyupgrade";
|
||||
version = "2.26.0";
|
||||
version = "2.27.0";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "asottile";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fXDBozMZbvMkdqafvPQrCI26OjQ/2Rx6OMQs9X2Q55s=";
|
||||
sha256 = "1j14m4mdvpq740bxz3mhs5k02jfp425xig4yb13drx37p4yyl9zn";
|
||||
};
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
|
|
|||
68
pkgs/development/python-modules/renault-api/default.nix
Normal file
68
pkgs/development/python-modules/renault-api/default.nix
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
{ lib
|
||||
, aiohttp
|
||||
, aioresponses
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, dateparser
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, marshmallow-dataclass
|
||||
, poetry-core
|
||||
, pyjwt
|
||||
, pythonOlder
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, tabulate
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "renault-api";
|
||||
version = "0.1.4";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hacf-fr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "049kh63yk0r0falqbl5akcwgzqjrkqqhf9y537rrlzc85ihf28b8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
click
|
||||
dateparser
|
||||
marshmallow-dataclass
|
||||
pyjwt
|
||||
tabulate
|
||||
];
|
||||
|
||||
checkInputs = [
|
||||
aioresponses
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/hacf-fr/renault-api/pull/371
|
||||
(fetchpatch {
|
||||
name = "switch-to-poetry-core.patch";
|
||||
url = "https://github.com/hacf-fr/renault-api/commit/5457a612b9ff9f323e8449cbe9dbce465bd65a79.patch";
|
||||
sha256 = "0ds9m4j2qpv0nyg9p8dk9klnarl8wckwclddgnii6h47qci362yy";
|
||||
})
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "renault_api" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to interact with the Renault API";
|
||||
homepage = "https://github.com/hacf-fr/renault-api";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
37
pkgs/development/python-modules/streamlabswater/default.nix
Normal file
37
pkgs/development/python-modules/streamlabswater/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "streamlabswater";
|
||||
version = "0.3.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = "stream-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "1lh1i1ksic9yhxnwc7mqm5qla98x85dfwj846kwldwam0vcrqlk7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
];
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "streamlabswater" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library for the StreamLabs API";
|
||||
homepage = "https://github.com/streamlabswater/stream-python";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-requests";
|
||||
version = "2.25.8";
|
||||
version = "2.25.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-IlrC6GVJtu86ikS/lV+AtJVYVXBKFdKIPYRFyN9jckI=";
|
||||
sha256 = "sha256-Tsi3Hac+U0Stub7nJadOyFmOcob5vLF1ANYn8ln+T7k=";
|
||||
};
|
||||
|
||||
# Modules doesn't have tests
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "velbus-aio";
|
||||
version = "2021.9.2";
|
||||
version = "2021.9.4";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "Cereal2nd";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-pFVhWrMygCwAsAYPnqtoaPcgh6y0Tf9vROYfn0M+g2E=";
|
||||
sha256 = "sha256-WywJ70tVniUX9RZTh9aswHgCEvWTggzABhSWoSRydUc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,15 +1,34 @@
|
|||
{ lib, fetchPypi, buildPythonPackage, pythonAtLeast, intervaltree, pyflakes, requests, lxml, google-i18n-address
|
||||
, pycountry, html5lib, six, kitchen, pypdf2, dict2xml, weasyprint, pyyaml, jinja2, configargparse, appdirs
|
||||
{ lib
|
||||
, fetchPypi
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, intervaltree
|
||||
, pyflakes
|
||||
, requests
|
||||
, lxml
|
||||
, google-i18n-address
|
||||
, pycountry
|
||||
, html5lib
|
||||
, six
|
||||
, kitchen
|
||||
, pypdf2
|
||||
, dict2xml
|
||||
, weasyprint
|
||||
, pyyaml
|
||||
, jinja2
|
||||
, configargparse
|
||||
, appdirs
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "xml2rfc";
|
||||
version = "3.9.1";
|
||||
disabled = pythonAtLeast "3.9";
|
||||
version = "3.10.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "76cee167e81fc3cc0e0cc696fe58cadd039e19a774c8f4d2e5c0fea724c7aaca";
|
||||
sha256 = "sha256-DJjGQAYFhXjAiJhWzxpQ0jRUSrnsNCcNz1KfPEjBoKE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -31,12 +50,18 @@ buildPythonPackage rec {
|
|||
appdirs
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace requirements.txt \
|
||||
--replace "jinja2>=2.11,<3.0" "jinja2>=2.11"
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
# lxml tries to fetch from the internet
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "xml2rfc" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yeelight";
|
||||
version = "0.7.4";
|
||||
version = "0.7.5";
|
||||
disabled = pythonOlder "3.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "stavros";
|
||||
repo = "python-yeelight";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-qpyD4o8YMVu6DiizuBs/44Vz0oPIMR4/YQwaCDNKpFI=";
|
||||
sha256 = "sha256-lEroQ2Gy1ldeIkkSMYcXJk6j6Ls2zigImrIWOPq70D0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ytmusicapi";
|
||||
version = "0.19.2";
|
||||
version = "0.19.3";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Vmf3eZpeRPDYWy6fc8VRYsQZJrwwX3KTs0njfPy6HRE=";
|
||||
sha256 = "dfd0271f7177173cea9c255730151a10a2fe4a32f9accd2fe31e7645936c90c5";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -11,13 +11,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "cutter";
|
||||
version = "2.0.2";
|
||||
version = "2.0.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rizinorg";
|
||||
repo = "cutter";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-CVVUXx6wt9vH3B7NrrlRGnOIrhXQPjV7GmX3O+KtMSM=";
|
||||
sha256 = "sha256-OC04d3j8Dfsob1dUjNBc1pSQFxJlexzWJ4v0V3QNkno=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rizin";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz";
|
||||
sha256 = "sha256-lxVsPI+qLenZ0pelvxtHlQ6fhWdQeqoEEHrUGZ5Rdmg=";
|
||||
sha256 = "sha256-+XW12VIaRfRkLc3Li6ItF4VQfWLNRvxZW2VGtxVYJxY=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "tfsec";
|
||||
version = "0.58.9";
|
||||
version = "0.58.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aquasecurity";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1i61xls3jj5w3cliqs28m1y6p47yav24m40zxa6kf0jj4s50m1d3";
|
||||
sha256 = "sha256-VMnc4frDBAkVc9hqUdXAiJ2vNsK9NzkLOUaQWhQQUBU=";
|
||||
};
|
||||
|
||||
goPackagePath = "github.com/aquasecurity/tfsec";
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "sqlfluff";
|
||||
version = "0.6.5";
|
||||
version = "0.6.6";
|
||||
disabled = python3.pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-JUvwp4Ptu1URWO7wyeOCjwjGW4S0XqYZwNjCyR3H/rc=";
|
||||
sha256 = "sha256-I7vsOQtXY/n2Zu0F94f5/uF1ia96R/qQw+duG7X8Dpo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome
|
||||
, python2Packages }:
|
||||
{ lib, fetchurl, pkg-config, libxml2, libxslt, intltool, gnome
|
||||
, python3Packages, fetchpatch, bash }:
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "gnome-doc-utils";
|
||||
version = "0.20.10";
|
||||
|
||||
|
|
@ -12,28 +12,31 @@ python2Packages.buildPythonApplication rec {
|
|||
sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=438638
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/gnome-doc-utils/raw/6b8908abe5af61a952db7174c5d1843708d61f1b/f/gnome-doc-utils-0.14.0-package.patch";
|
||||
sha256 = "sha256-V2L2/30NoHY/wj3+dsombxveWRSUJb2YByOKtEgVx/0=";
|
||||
})
|
||||
# python3 support
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/gnome-doc-utils/raw/6b8908abe5af61a952db7174c5d1843708d61f1b/f/gnome-doc-utils-0.20.10-python3.patch";
|
||||
sha256 = "sha256-niH/Yx5H44rsRgkCZS8LWLFB9ZvuInt75zugzoVUhH0=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ intltool pkg-config libxslt.dev ];
|
||||
buildInputs = [ libxslt ];
|
||||
buildInputs = [ libxml2 libxslt bash ];
|
||||
propagatedBuildInputs = [ python3Packages.libxml2 ];
|
||||
|
||||
configureFlags = [ "--disable-scrollkeeper" ];
|
||||
|
||||
preBuild = ''
|
||||
substituteInPlace xml2po/xml2po/Makefile --replace '-e "s+^#!.*python.*+#!$(PYTHON)+"' '-e "s\"^#!.*python.*\"#!$(PYTHON)\""'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ libxml2Python ];
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
};
|
||||
};
|
||||
|
||||
postFixup = ''
|
||||
# Do not propagate Python
|
||||
rm $out/nix-support/propagated-build-inputs
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of documentation utilities for the GNOME project";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-doc-utils";
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-feature";
|
||||
version = "0.5.2";
|
||||
version = "0.5.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Riey";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0n5kzh756ghfs3cydlcn9mfvpgwy1cjg41h0nd9dbi5cr1fp9x1n";
|
||||
sha256 = "sha256-aUzmD5Dt0obXWDdZT6/Bzun2R1TLQYYELrN4xEG4hq8=";
|
||||
};
|
||||
|
||||
cargoSha256 = "1jh1h6v4mxx03b4diw9325ga0k3js0czs504lx07hvbx8yai1wkq";
|
||||
cargoSha256 = "sha256-R8OaxlBAkK5YQPejOdLuCMeQlCbPcC/VQm9WHm31v54=";
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
|
||||
|
|
|
|||
|
|
@ -2,19 +2,19 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "system76-power";
|
||||
version = "1.1.16";
|
||||
version = "1.1.17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "system76-power";
|
||||
rev = version;
|
||||
sha256 = "sha256-OtrhvUkNNgg6KlrqjwiBKL4zuQZBWevb0xgtSlEW2rQ=";
|
||||
sha256 = "sha256-9ndukZPNB0qtU0hA9eUYpiAC8Tw1eF16W+sVU7XKvsg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ dbus libusb1 ];
|
||||
|
||||
cargoSha256 = "sha256-ImACDbnUbwc0ZXgF3xxzes8+vUjt76B1xxgqzhgAYX4=";
|
||||
cargoSha256 = "sha256-6mtBY77d2WAwTpj+g0KVpW/n39uanAL2GNHWC8Qbtqk=";
|
||||
|
||||
postInstall = ''
|
||||
install -D -m 0644 data/system76-power.conf $out/etc/dbus-1/system.d/system76-power.conf
|
||||
|
|
|
|||
|
|
@ -27,12 +27,12 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rabbitmq-server";
|
||||
version = "3.9.4";
|
||||
version = "3.9.6";
|
||||
|
||||
# when updating, consider bumping elixir version in all-packages.nix
|
||||
src = fetchurl {
|
||||
url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-L2ftgdk7QmWl3iQR52G4SwZyI4NURybVMQ1WtcHPvHE=";
|
||||
sha256 = "sha256-YCVOMVsbOMczpZi02Ywd6M+AXrd5AMweCYn1WcyRHSw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ];
|
||||
|
|
|
|||
|
|
@ -272,7 +272,7 @@
|
|||
"flexit" = ps: with ps; [ pymodbus ];
|
||||
"flic" = ps: with ps; [ pyflic ];
|
||||
"flick_electric" = ps: with ps; [ pyflick ];
|
||||
"flipr" = ps: with ps; [ ]; # missing inputs: flipr-api
|
||||
"flipr" = ps: with ps; [ flipr-api ];
|
||||
"flo" = ps: with ps; [ aioflo ];
|
||||
"flock" = ps: with ps; [ ];
|
||||
"flume" = ps: with ps; [ pyflume ];
|
||||
|
|
@ -380,7 +380,7 @@
|
|||
"hue" = ps: with ps; [ aiohue ];
|
||||
"huisbaasje" = ps: with ps; [ huisbaasje-client ];
|
||||
"humidifier" = ps: with ps; [ ];
|
||||
"hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi
|
||||
"hunterdouglas_powerview" = ps: with ps; [ aiopvapi ];
|
||||
"hvv_departures" = ps: with ps; [ pygti ];
|
||||
"hydrawise" = ps: with ps; [ hydrawiser ];
|
||||
"hyperion" = ps: with ps; [ hyperion-py ];
|
||||
|
|
@ -411,7 +411,7 @@
|
|||
"intesishome" = ps: with ps; [ pyintesishome ];
|
||||
"ios" = ps: with ps; [ aiohttp-cors ifaddr zeroconf ];
|
||||
"iota" = ps: with ps; [ ]; # missing inputs: pyota
|
||||
"iotawatt" = ps: with ps; [ ]; # missing inputs: iotawattpy
|
||||
"iotawatt" = ps: with ps; [ iotawattpy ];
|
||||
"iperf3" = ps: with ps; [ ]; # missing inputs: iperf3
|
||||
"ipma" = ps: with ps; [ pyipma ];
|
||||
"ipp" = ps: with ps; [ pyipp ];
|
||||
|
|
@ -564,7 +564,7 @@
|
|||
"netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa pyatmo ];
|
||||
"netdata" = ps: with ps; [ netdata ];
|
||||
"netgear" = ps: with ps; [ ]; # missing inputs: pynetgear
|
||||
"netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt
|
||||
"netgear_lte" = ps: with ps; [ eternalegypt ];
|
||||
"netio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pynetio
|
||||
"network" = ps: with ps; [ aiohttp-cors ifaddr ];
|
||||
"neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio
|
||||
|
|
@ -574,7 +574,7 @@
|
|||
"nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv
|
||||
"nightscout" = ps: with ps; [ ]; # missing inputs: py-nightscout
|
||||
"niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control
|
||||
"nilu" = ps: with ps; [ ]; # missing inputs: niluclient
|
||||
"nilu" = ps: with ps; [ niluclient ];
|
||||
"nissan_leaf" = ps: with ps; [ ]; # missing inputs: pycarwings2
|
||||
"nmap_tracker" = ps: with ps; [ aiohttp-cors getmac ifaddr netmap ]; # missing inputs: mac-vendor-lookup
|
||||
"nmbs" = ps: with ps; [ ]; # missing inputs: pyrail
|
||||
|
|
@ -630,7 +630,7 @@
|
|||
"ovo_energy" = ps: with ps; [ ovoenergy ];
|
||||
"owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ];
|
||||
"ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ];
|
||||
"p1_monitor" = ps: with ps; [ ]; # missing inputs: p1monitor
|
||||
"p1_monitor" = ps: with ps; [ p1monitor ];
|
||||
"panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta
|
||||
"panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera
|
||||
"pandora" = ps: with ps; [ pexpect ];
|
||||
|
|
@ -703,7 +703,7 @@
|
|||
"remember_the_milk" = ps: with ps; [ httplib2 ]; # missing inputs: RtmAPI
|
||||
"remote" = ps: with ps; [ ];
|
||||
"remote_rpi_gpio" = ps: with ps; [ ]; # missing inputs: gpiozero
|
||||
"renault" = ps: with ps; [ ]; # missing inputs: renault-api
|
||||
"renault" = ps: with ps; [ renault-api ];
|
||||
"repetier" = ps: with ps; [ ]; # missing inputs: pyrepetier
|
||||
"rest" = ps: with ps; [ jsonpath xmltodict ];
|
||||
"rest_command" = ps: with ps; [ ];
|
||||
|
|
@ -803,10 +803,10 @@
|
|||
"sonarr" = ps: with ps; [ sonarr ];
|
||||
"songpal" = ps: with ps; [ python-songpal ];
|
||||
"sonos" = ps: with ps; [ aiohttp-cors async-upnp-client defusedxml ifaddr plexapi plexauth plexwebsocket soco zeroconf ];
|
||||
"sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp
|
||||
"sony_projector" = ps: with ps; [ pysdcp ];
|
||||
"soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ];
|
||||
"spaceapi" = ps: with ps; [ aiohttp-cors ];
|
||||
"spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw
|
||||
"spc" = ps: with ps; [ pyspcwebgw ];
|
||||
"speedtestdotnet" = ps: with ps; [ speedtest-cli ];
|
||||
"spider" = ps: with ps; [ spiderpy ];
|
||||
"splunk" = ps: with ps; [ ]; # missing inputs: hass_splunk
|
||||
|
|
@ -824,7 +824,7 @@
|
|||
"stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron
|
||||
"stookalert" = ps: with ps; [ ]; # missing inputs: stookalert
|
||||
"stream" = ps: with ps; [ aiohttp-cors av ];
|
||||
"streamlabswater" = ps: with ps; [ ]; # missing inputs: streamlabswater
|
||||
"streamlabswater" = ps: with ps; [ streamlabswater ];
|
||||
"stt" = ps: with ps; [ aiohttp-cors ];
|
||||
"subaru" = ps: with ps; [ subarulink ];
|
||||
"suez_water" = ps: with ps; [ ]; # missing inputs: pysuez
|
||||
|
|
|
|||
|
|
@ -362,6 +362,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"fireservicerota"
|
||||
"firmata"
|
||||
"flick_electric"
|
||||
"flipr"
|
||||
"flo"
|
||||
"flume"
|
||||
"flunearyou"
|
||||
|
|
@ -430,6 +431,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"hue"
|
||||
"huisbaasje"
|
||||
"humidifier"
|
||||
"hunterdouglas_powerview"
|
||||
"hvv_departures"
|
||||
"hyperion"
|
||||
"ialarm"
|
||||
|
|
@ -545,6 +547,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"ovo_energy"
|
||||
"owntracks"
|
||||
"ozw"
|
||||
"p1_monitor"
|
||||
"panel_custom"
|
||||
"panel_iframe"
|
||||
"persistent_notification"
|
||||
|
|
@ -575,6 +578,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
"recorder"
|
||||
"reddit"
|
||||
"remote"
|
||||
"renault"
|
||||
"rest"
|
||||
"rest_command"
|
||||
"rflink"
|
||||
|
|
@ -628,6 +632,7 @@ in with py.pkgs; buildPythonApplication rec {
|
|||
# "sonos"
|
||||
"soundtouch"
|
||||
"spaceapi"
|
||||
"spc"
|
||||
"speedtestdotnet"
|
||||
"spider"
|
||||
"spotify"
|
||||
|
|
|
|||
59
pkgs/servers/owncast/default.nix
Normal file
59
pkgs/servers/owncast/default.nix
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
{ lib, buildGoModule, fetchFromGitHub, nixosTests, bash, which, ffmpeg, makeWrapper, coreutils, ... }:
|
||||
|
||||
buildGoModule rec {
|
||||
|
||||
pname = "owncast";
|
||||
version = "0.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "owncast";
|
||||
repo = "owncast";
|
||||
rev = "v${version}";
|
||||
sha256 = "0md4iafa767yxkwh6z8zpcjv9zd79ql2wapx9vzyd973ksvrdaw2";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-bH2CWIgpOS974/P98n0R9ebGTJ0YoqPlH8UmxSYNHeM=";
|
||||
|
||||
propagatedBuildInputs = [ ffmpeg ];
|
||||
|
||||
buildInputs = [ makeWrapper ];
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $out
|
||||
cp -r $src/{static,webroot} $out
|
||||
'';
|
||||
|
||||
postInstall = let
|
||||
|
||||
setupScript = ''
|
||||
[ ! -d "$PWD/webroot" ] && (
|
||||
${coreutils}/bin/cp --no-preserve=mode -r "${placeholder "out"}/webroot" "$PWD"
|
||||
)
|
||||
|
||||
[ ! -d "$PWD/static" ] && (
|
||||
${coreutils}/bin/ln -s "${placeholder "out"}/static" "$PWD"
|
||||
)
|
||||
'';
|
||||
in ''
|
||||
wrapProgram $out/bin/owncast \
|
||||
--run '${setupScript}' \
|
||||
--prefix PATH : ${lib.makeBinPath [ bash which ffmpeg ]}
|
||||
'';
|
||||
|
||||
installCheckPhase = ''
|
||||
runHook preCheck
|
||||
$out/bin/owncast --help
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
passthru.tests.owncast = nixosTests.testOwncast;
|
||||
|
||||
meta = with lib; {
|
||||
description = "self-hosted video live streaming solution";
|
||||
homepage = "https://owncast.online";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ MayNiklas ];
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "tailscale";
|
||||
version = "1.14.3";
|
||||
version = "1.14.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tailscale";
|
||||
repo = "tailscale";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IXnkKKyjnktGjz3Osi2qYnrcDHC3Xfcr1oku/P0s0xk=";
|
||||
sha256 = "sha256-66akb1ru2JJe23Cr8q9mkMmmgqtezqh+Mc8aA+Rovb8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -1,22 +1,27 @@
|
|||
{ lib, stdenv, fetchurl, fetchpatch }:
|
||||
|
||||
let
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cpio";
|
||||
version = "2.13";
|
||||
name = "cpio-${version}";
|
||||
in stdenv.mkDerivation {
|
||||
inherit name;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/cpio/${name}.tar.bz2";
|
||||
url = "mirror://gnu/cpio/cpio-${version}.tar.bz2";
|
||||
sha256 = "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "CVE-2021-38185.patch";
|
||||
url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=dd96882877721703e19272fe25034560b794061b";
|
||||
sha256 = "0vmr0qjwj2ldnzsvccl105ckwgx3ssvn9mp3f27ss0kiyigrzz32";
|
||||
})
|
||||
patches = let
|
||||
fp = suffix: rev: sha256: fetchpatch {
|
||||
name = "CVE-2021-38185-${suffix}.patch";
|
||||
url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=${rev}";
|
||||
inherit sha256;
|
||||
};
|
||||
in [
|
||||
(fp "1" "dd96882877721703e19272fe25034560b794061b"
|
||||
"0vmr0qjwj2ldnzsvccl105ckwgx3ssvn9mp3f27ss0kiyigrzz32")
|
||||
(fp "2" "dfc801c44a93bed7b3951905b188823d6a0432c8"
|
||||
"1qkrhi3lbxk6hflp6w3h4sgssc0wblv8r0qgxqzbjrm36pqwxiwh")
|
||||
(fp "3" "236684f6deb3178043fe72a8e2faca538fa2aae1"
|
||||
"0pidkbxalpj5yz4fr95x8h0rizgjij0xgvjgirfkjk460giawwg6")
|
||||
(fetchpatch {
|
||||
# upstream build fix against -fno-common compilers like >=gcc-10
|
||||
name = "fno-common-fix.patch";
|
||||
|
|
@ -25,9 +30,9 @@ in stdenv.mkDerivation {
|
|||
})
|
||||
];
|
||||
|
||||
preConfigure = if stdenv.isCygwin then ''
|
||||
preConfigure = lib.optionalString stdenv.isCygwin ''
|
||||
sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
|
||||
'' else null;
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -43,6 +43,9 @@ stdenv.mkDerivation rec {
|
|||
patchFlags = [ "-p0" ];
|
||||
|
||||
postPatch = ''
|
||||
# Drop blanket -Werror to avoid build failure on fresh toolchains
|
||||
# like gcc-11.
|
||||
substituteInPlace squashfs-tools/Makefile --replace ' -Werror' ' '
|
||||
cd squashfs-tools
|
||||
'';
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "github-backup";
|
||||
version = "0.40.0";
|
||||
version = "0.40.1";
|
||||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-HgNOTi4z1wbRdeVFjGVbpuxd9/o9aWWYd8/ykiVF8Ks=";
|
||||
sha256 = "sha256-Qrj0+4WXlW0UgG2xV/P8e0QgUG3VurY4HIAiiUF3LW8=";
|
||||
};
|
||||
|
||||
makeWrapperArgs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ callPackage, lib, stdenv, fetchurl, jre, makeWrapper }:
|
||||
|
||||
let this = stdenv.mkDerivation rec {
|
||||
version = "5.2.0";
|
||||
version = "5.2.1";
|
||||
pname = "openapi-generator-cli";
|
||||
|
||||
jarfilename = "${pname}-${version}.jar";
|
||||
|
|
@ -12,7 +12,7 @@ let this = stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}";
|
||||
sha256 = "sha256-mZYGCIR7XOvONnNFDM86qSM7iug48noNgBcHdik81vk=";
|
||||
sha256 = "sha256-stRtSZCvPUQuTiKOHmJ7k8o3Gtly9Up+gicrDOeWjIs=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "exploitdb";
|
||||
version = "2021-09-22";
|
||||
version = "2021-09-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "offensive-security";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-axA20Ok+5LgtW4Mf1xMM64Gd6C6joBC5isUdZPncgDw=";
|
||||
sha256 = "sha256-KjeldF3oBX4QLba7pTmvRwymxZ+x8HPfIKT7IevrOlU=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
|
|
|||
|
|
@ -4,6 +4,10 @@ GEM
|
|||
foreman (0.87.2)
|
||||
|
||||
PLATFORMS
|
||||
aarch64-darwin
|
||||
aarch64-linux
|
||||
ruby
|
||||
x86_64-darwin
|
||||
x86_64-linux
|
||||
|
||||
DEPENDENCIES
|
||||
|
|
|
|||
|
|
@ -511,7 +511,10 @@ with pkgs;
|
|||
|
||||
fetchhg = callPackage ../build-support/fetchhg { };
|
||||
|
||||
fetchFirefoxAddon = callPackage ../build-support/fetchfirefoxaddon {};
|
||||
fetchFirefoxAddon = callPackage ../build-support/fetchfirefoxaddon { }
|
||||
// {
|
||||
tests = callPackages ../build-support/fetchfirefoxaddon/tests.nix { };
|
||||
};
|
||||
|
||||
# `fetchurl' downloads a file from the network.
|
||||
fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform
|
||||
|
|
@ -7969,6 +7972,8 @@ with pkgs;
|
|||
|
||||
operator-sdk = callPackage ../development/tools/operator-sdk { };
|
||||
|
||||
owncast = callPackage ../servers/owncast { };
|
||||
|
||||
update-dotdee = with python3Packages; toPythonApplication update-dotdee;
|
||||
|
||||
update-nix-fetchgit = haskell.lib.justStaticExecutables haskellPackages.update-nix-fetchgit;
|
||||
|
|
|
|||
|
|
@ -1601,7 +1601,7 @@ in let inherit (pkgs) callPackage; in rec
|
|||
|
||||
ocamlPackages_4_13 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.13.nix { });
|
||||
|
||||
ocamlPackages_latest = ocamlPackages_4_12;
|
||||
ocamlPackages_latest = ocamlPackages_4_13;
|
||||
|
||||
ocamlPackages = ocamlPackages_4_12;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -351,6 +351,8 @@ in {
|
|||
|
||||
aiopulse = callPackage ../development/python-modules/aiopulse { };
|
||||
|
||||
aiopvapi = callPackage ../development/python-modules/aiopvapi { };
|
||||
|
||||
aiopvpc = callPackage ../development/python-modules/aiopvpc { };
|
||||
|
||||
aiopylgtv = callPackage ../development/python-modules/aiopylgtv { };
|
||||
|
|
@ -387,6 +389,8 @@ in {
|
|||
|
||||
aiounittest = callPackage ../development/python-modules/aiounittest { };
|
||||
|
||||
aiowatttime = callPackage ../development/python-modules/aiowatttime { };
|
||||
|
||||
aiowinreg = callPackage ../development/python-modules/aiowinreg { };
|
||||
|
||||
aioymaps = callPackage ../development/python-modules/aioymaps { };
|
||||
|
|
@ -615,6 +619,8 @@ in {
|
|||
|
||||
async-lru = callPackage ../development/python-modules/async-lru { };
|
||||
|
||||
asynccmd = callPackage ../development/python-modules/asynccmd { };
|
||||
|
||||
asyncio-dgram = callPackage ../development/python-modules/asyncio-dgram { };
|
||||
|
||||
asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { };
|
||||
|
|
@ -2412,6 +2418,8 @@ in {
|
|||
|
||||
etebase-server = callPackage ../servers/etebase { };
|
||||
|
||||
eternalegypt = callPackage ../development/python-modules/eternalegypt { };
|
||||
|
||||
etesync = callPackage ../development/python-modules/etesync { };
|
||||
|
||||
eth-hash = callPackage ../development/python-modules/eth-hash { };
|
||||
|
|
@ -2731,6 +2739,8 @@ in {
|
|||
|
||||
flickrapi = callPackage ../development/python-modules/flickrapi { };
|
||||
|
||||
flipr-api = callPackage ../development/python-modules/flipr-api { };
|
||||
|
||||
flit = callPackage ../development/python-modules/flit { };
|
||||
|
||||
flit-core = callPackage ../development/python-modules/flit-core { };
|
||||
|
|
@ -3678,6 +3688,8 @@ in {
|
|||
|
||||
iocapture = callPackage ../development/python-modules/iocapture { };
|
||||
|
||||
iotawattpy = callPackage ../development/python-modules/iotawattpy { };
|
||||
|
||||
iowait = callPackage ../development/python-modules/iowait { };
|
||||
|
||||
ipaddress = callPackage ../development/python-modules/ipaddress { };
|
||||
|
|
@ -4466,6 +4478,8 @@ in {
|
|||
|
||||
marshmallow = callPackage ../development/python-modules/marshmallow { };
|
||||
|
||||
marshmallow-dataclass = callPackage ../development/python-modules/marshmallow-dataclass { };
|
||||
|
||||
marshmallow-enum = callPackage ../development/python-modules/marshmallow-enum { };
|
||||
|
||||
marshmallow-oneofschema = callPackage ../development/python-modules/marshmallow-oneofschema { };
|
||||
|
|
@ -4925,6 +4939,8 @@ in {
|
|||
|
||||
nilearn = callPackage ../development/python-modules/nilearn { };
|
||||
|
||||
niluclient = callPackage ../development/python-modules/niluclient { };
|
||||
|
||||
nimfa = callPackage ../development/python-modules/nimfa { };
|
||||
|
||||
nine = callPackage ../development/python-modules/nine { };
|
||||
|
|
@ -5239,6 +5255,8 @@ in {
|
|||
|
||||
oyaml = callPackage ../development/python-modules/oyaml { };
|
||||
|
||||
p1monitor = callPackage ../development/python-modules/p1monitor { };
|
||||
|
||||
packageurl-python = callPackage ../development/python-modules/packageurl-python { };
|
||||
|
||||
packaging = callPackage ../development/python-modules/packaging { };
|
||||
|
|
@ -6807,6 +6825,8 @@ in {
|
|||
|
||||
pyscss = callPackage ../development/python-modules/pyscss { };
|
||||
|
||||
pysdcp = callPackage ../development/python-modules/pysdcp { };
|
||||
|
||||
pysdl2 = callPackage ../development/python-modules/pysdl2 { };
|
||||
|
||||
pysendfile = callPackage ../development/python-modules/pysendfile { };
|
||||
|
|
@ -6893,6 +6913,8 @@ in {
|
|||
|
||||
pysparse = callPackage ../development/python-modules/pysparse { };
|
||||
|
||||
pyspcwebgw = callPackage ../development/python-modules/pyspcwebgw { };
|
||||
|
||||
pyspf = callPackage ../development/python-modules/pyspf { };
|
||||
|
||||
pyspice = callPackage ../development/python-modules/pyspice { };
|
||||
|
|
@ -7801,6 +7823,8 @@ in {
|
|||
|
||||
remarshal = callPackage ../development/python-modules/remarshal { };
|
||||
|
||||
renault-api = callPackage ../development/python-modules/renault-api { };
|
||||
|
||||
rencode = callPackage ../development/python-modules/rencode { };
|
||||
|
||||
reparser = callPackage ../development/python-modules/reparser { };
|
||||
|
|
@ -8669,6 +8693,8 @@ in {
|
|||
|
||||
streaming-form-data = callPackage ../development/python-modules/streaming-form-data { };
|
||||
|
||||
streamlabswater = callPackage ../development/python-modules/streamlabswater { };
|
||||
|
||||
streamz = callPackage ../development/python-modules/streamz { };
|
||||
|
||||
strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue