Merge master into staging-next
This commit is contained in:
commit
c02da5611d
|
@ -215,6 +215,7 @@ in {
|
|||
systemd.sockets.mpd = mkIf cfg.startWhenNeeded {
|
||||
wantedBy = [ "sockets.target" ];
|
||||
listenStreams = [
|
||||
"" # Note: this is needed to override the upstream unit
|
||||
(if pkgs.lib.hasPrefix "/" cfg.network.listenAddress
|
||||
then cfg.network.listenAddress
|
||||
else "${optionalString (cfg.network.listenAddress != "any") "${cfg.network.listenAddress}:"}${toString cfg.network.port}")
|
||||
|
|
|
@ -124,6 +124,11 @@ let
|
|||
default = 1;
|
||||
description = "Org id. will default to orgId 1 if not specified.";
|
||||
};
|
||||
uid = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
description = "Custom UID which can be used to reference this datasource in other parts of the configuration, if not specified will be generated automatically.";
|
||||
};
|
||||
url = mkOption {
|
||||
type = types.str;
|
||||
description = "Url of the datasource.";
|
||||
|
|
|
@ -57,9 +57,9 @@ in {
|
|||
${pkgs.prometheus-wireguard-exporter}/bin/prometheus_wireguard_exporter \
|
||||
-p ${toString cfg.port} \
|
||||
-l ${cfg.listenAddress} \
|
||||
${optionalString cfg.verbose "-v"} \
|
||||
${optionalString cfg.singleSubnetPerField "-s"} \
|
||||
${optionalString cfg.withRemoteIp "-r"} \
|
||||
${optionalString cfg.verbose "-v true"} \
|
||||
${optionalString cfg.singleSubnetPerField "-s true"} \
|
||||
${optionalString cfg.withRemoteIp "-r true"} \
|
||||
${optionalString (cfg.wireguardConfig != null) "-n ${escapeShellArg cfg.wireguardConfig}"}
|
||||
'';
|
||||
RestrictAddressFamilies = [
|
||||
|
|
|
@ -25,20 +25,20 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "authenticator";
|
||||
version = "4.1.2";
|
||||
version = "4.1.4";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "Authenticator";
|
||||
rev = version;
|
||||
hash = "sha256-YxmVqL9dseImN3LfkRz+Au+IaKpTepHl3CNx2Ue7N24=";
|
||||
hash = "sha256-606uMEbJd60ehoEEV0w2vz33poR1/18HcsvBMszMZrc=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-ub2PryALI7QXEG0djkPVQQCgZn5M5VoGo6ETSkvEjX0=";
|
||||
hash = "sha256-D2kT4IBKxbrL17S+kPyofu1sLPHMuyez6jTiA6kVohs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -51,9 +51,9 @@ stdenv.mkDerivation rec {
|
|||
domain = "repo.palemoon.org";
|
||||
owner = "MoonchildProductions";
|
||||
repo = "Pale-Moon";
|
||||
rev = "${version}_Release";
|
||||
rev = "${version}_Release_build2"; # Remove _build2 when bumping past 31.1.0
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-82OvD4q89D0rxMdzPEabMGLXXtEt4A7P6p2gKi7o+oA=";
|
||||
sha256 = "sha256-x3n4OeZbnJCPCVjsZJW1nBYlsEYn6fXt80voYWQSNq4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "hydroxide";
|
||||
version = "0.2.21";
|
||||
version = "0.2.23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "emersion";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-fF+pQnqAWBktc4NdQFTHeB/sEg5bPTxXtdL1x5JuXU8=";
|
||||
sha256 = "sha256-Hc348rlwICnPWq7qYzFE01QeeJuQpSP19NjXtGqI10o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-M5QlhF2Cj1jn5NNiKj1Roh9+sNCWxQEb4vbtsDfapWY=";
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ lib
|
||||
, config
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, fetchFromGitHub
|
||||
, autoreconfHook
|
||||
, boost
|
||||
, ffmpeg
|
||||
, ffms
|
||||
|
@ -16,7 +16,9 @@
|
|||
, libX11
|
||||
, libass
|
||||
, libiconv
|
||||
, libuchardet
|
||||
, pkg-config
|
||||
, which
|
||||
, wxGTK
|
||||
, zlib
|
||||
|
||||
|
@ -24,7 +26,7 @@
|
|||
, hunspell ? null
|
||||
|
||||
, automationSupport ? true
|
||||
, lua ? null
|
||||
, luajit ? null
|
||||
|
||||
, openalSupport ? false
|
||||
, openal ? null
|
||||
|
@ -37,64 +39,39 @@
|
|||
|
||||
, portaudioSupport ? false
|
||||
, portaudio ? null
|
||||
|
||||
}:
|
||||
|
||||
assert spellcheckSupport -> (hunspell != null);
|
||||
assert automationSupport -> (lua != null);
|
||||
assert automationSupport -> (luajit != null);
|
||||
assert openalSupport -> (openal != null);
|
||||
assert alsaSupport -> (alsa-lib != null);
|
||||
assert pulseaudioSupport -> (libpulseaudio != null);
|
||||
assert portaudioSupport -> (portaudio != null);
|
||||
|
||||
let
|
||||
luajit52 = luajit.override { enable52Compat = true; };
|
||||
inherit (lib) optional;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "aegisub";
|
||||
version = "3.2.2";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://ftp.aegisub.org/pub/releases/${pname}-${version}.tar.xz";
|
||||
hash = "sha256-xV4zlFuC2FE8AupueC8Ncscmrc03B+lbjAAi9hUeaIU=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wangqr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Er0g8fJyx7zjNVpKw7zUHE40hU10BdYlZohlqJq2LE0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Compatibility with ICU 59
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Aegisub/Aegisub/commit/dd67db47cb2203e7a14058e52549721f6ff16a49.patch";
|
||||
sha256 = "sha256-R2rN7EiyA5cuBYIAMpa0eKZJ3QZahfnRp8R4HyejGB8=";
|
||||
})
|
||||
|
||||
# Compatbility with Boost 1.69
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Aegisub/Aegisub/commit/c3c446a8d6abc5127c9432387f50c5ad50012561.patch";
|
||||
sha256 = "sha256-7nlfojrb84A0DT82PqzxDaJfjIlg5BvWIBIgoqasHNk=";
|
||||
})
|
||||
|
||||
# Compatbility with make 4.3
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Aegisub/Aegisub/commit/6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39.patch";
|
||||
sha256 = "sha256-rG8RJokd4V4aSYOQw2utWnrWPVrkqSV3TAvnGXNhLOk=";
|
||||
})
|
||||
|
||||
# Compatibility with ffms2
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Aegisub/Aegisub/commit/1aa9215e7fc360de05da9b7ec2cd68f1940af8b2.patch";
|
||||
sha256 = "sha256-JsuI4hQTcT0TEqHHoSsGbuiTg4hMCH3Cxp061oLk8Go=";
|
||||
})
|
||||
|
||||
./update-ffms2.patch
|
||||
|
||||
# Compatibility with X11
|
||||
(fetchpatch {
|
||||
url = "https://github.com/Aegisub/Aegisub/commit/7a6da26be6a830f4e1255091952cc0a1326a4520.patch";
|
||||
sha256 = "sha256-/aTcIjFlZY4N9+IyHL4nwR0hUR4HTJM7ibbdKmNxq0w=";
|
||||
})
|
||||
];
|
||||
patches = [ ./no-git.patch ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
intltool
|
||||
luajit52
|
||||
pkg-config
|
||||
which
|
||||
];
|
||||
buildInputs = [
|
||||
boost
|
||||
|
@ -109,17 +86,24 @@ stdenv.mkDerivation rec {
|
|||
libX11
|
||||
libass
|
||||
libiconv
|
||||
libuchardet
|
||||
wxGTK
|
||||
zlib
|
||||
]
|
||||
++ optional alsaSupport alsa-lib
|
||||
++ optional automationSupport lua
|
||||
++ optional automationSupport luajit52
|
||||
++ optional openalSupport openal
|
||||
++ optional portaudioSupport portaudio
|
||||
++ optional pulseaudioSupport libpulseaudio
|
||||
++ optional spellcheckSupport hunspell
|
||||
;
|
||||
|
||||
configureFlags = [
|
||||
"--with-boost-libdir=${boost.out}/lib"
|
||||
"--with-system-luajit"
|
||||
"FORCE_GIT_VERSION=${version}"
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
hardeningDisable = [
|
||||
|
@ -127,22 +111,10 @@ stdenv.mkDerivation rec {
|
|||
"relro"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's/-Wno-c++11-narrowing/-Wno-narrowing/' configure.ac src/Makefile
|
||||
'';
|
||||
|
||||
# compat with icu61+
|
||||
# https://github.com/unicode-org/icu/blob/release-64-2/icu4c/readme.html#L554
|
||||
CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ];
|
||||
|
||||
# this is fixed upstream though not yet in an officially released version,
|
||||
# should be fine remove on next release (if one ever happens)
|
||||
NIX_LDFLAGS = "-lpthread";
|
||||
|
||||
postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub";
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/Aegisub/Aegisub";
|
||||
homepage = "https://github.com/wangqr/Aegisub";
|
||||
description = "An advanced subtitle editor";
|
||||
longDescription = ''
|
||||
Aegisub is a free, cross-platform open source tool for creating and
|
||||
|
@ -157,4 +129,3 @@ stdenv.mkDerivation rec {
|
|||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
# TODO [ AndersonTorres ]: update to fork release
|
||||
|
|
41
pkgs/applications/video/aegisub/no-git.patch
Normal file
41
pkgs/applications/video/aegisub/no-git.patch
Normal file
|
@ -0,0 +1,41 @@
|
|||
Modified from <https://github.com/wangqr/Aegisub/commit/f8dca9f6386299ec2f90158e2d923a8fb30e3466>
|
||||
to patch cleanly to v3.3.2. Necessary for building without git.
|
||||
Upstream and will be in next release.
|
||||
|
||||
diff --git a/build/version.sh b/build/version.sh
|
||||
index 8cea0a3f3..d505341e4 100755
|
||||
--- a/build/version.sh
|
||||
+++ b/build/version.sh
|
||||
@@ -10,13 +10,13 @@ if ! test -d "${srcdir}/.git"; then
|
||||
done < "${version_h_path}"
|
||||
if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != x; then
|
||||
export VERSION_SOURCE="from cached git_version.h"
|
||||
- return 0
|
||||
+ exit 0
|
||||
else
|
||||
echo "invalid git_version.h"
|
||||
exit 2
|
||||
fi
|
||||
- else
|
||||
- echo "git repo not found and no cached git_version.h"
|
||||
+ elif [ -z "$FORCE_GIT_VERSION" ]; then
|
||||
+ echo "git repo not found and no cached git_version.h - use FORCE_GIT_VERSION to override"
|
||||
exit 2
|
||||
fi
|
||||
fi
|
||||
@@ -25,13 +25,13 @@ last_svn_revision=6962
|
||||
last_svn_hash="16cd907fe7482cb54a7374cd28b8501f138116be"
|
||||
|
||||
git_revision=$(expr $last_svn_revision + $(git log --pretty=oneline $last_svn_hash..HEAD 2>/dev/null | wc -l))
|
||||
-git_version_str=$(git describe --exact-match 2> /dev/null)
|
||||
+git_version_str=${FORCE_GIT_VERSION:-$(git describe --exact-match 2> /dev/null)}
|
||||
installer_version='0.0.0'
|
||||
resource_version='0, 0, 0'
|
||||
if test x$git_version_str != x; then
|
||||
git_version_str="${git_version_str##v}"
|
||||
tagged_release=1
|
||||
- if [ $(echo $git_version_str | grep '\d\.\d\.\d') ]; then
|
||||
+ if [ $(echo $git_version_str | grep '[0-9].[0-9].[0-9]') ]; then
|
||||
installer_version=$git_version_str
|
||||
resource_version=$(echo $git_version_str | sed 's/\./, /g')
|
||||
fi
|
|
@ -1,105 +0,0 @@
|
|||
commit 89c4e8d34ab77c3322f097b91fd9de22cbea7a37
|
||||
Author: Thomas Goyne <plorkyeran@aegisub.org>
|
||||
Date: Wed Nov 21 16:41:05 2018 -0800
|
||||
|
||||
Update ffmpeg and ffms2
|
||||
|
||||
diff --git a/src/video_provider_ffmpegsource.cpp b/src/video_provider_ffmpegsource.cpp
|
||||
index 8bd68fbbf..f4ed6a2f2 100644
|
||||
--- a/src/video_provider_ffmpegsource.cpp
|
||||
+++ b/src/video_provider_ffmpegsource.cpp
|
||||
@@ -44,6 +44,23 @@
|
||||
#include <libaegisub/make_unique.h>
|
||||
|
||||
namespace {
|
||||
+typedef enum AGI_ColorSpaces {
|
||||
+ AGI_CS_RGB = 0,
|
||||
+ AGI_CS_BT709 = 1,
|
||||
+ AGI_CS_UNSPECIFIED = 2,
|
||||
+ AGI_CS_FCC = 4,
|
||||
+ AGI_CS_BT470BG = 5,
|
||||
+ AGI_CS_SMPTE170M = 6,
|
||||
+ AGI_CS_SMPTE240M = 7,
|
||||
+ AGI_CS_YCOCG = 8,
|
||||
+ AGI_CS_BT2020_NCL = 9,
|
||||
+ AGI_CS_BT2020_CL = 10,
|
||||
+ AGI_CS_SMPTE2085 = 11,
|
||||
+ AGI_CS_CHROMATICITY_DERIVED_NCL = 12,
|
||||
+ AGI_CS_CHROMATICITY_DERIVED_CL = 13,
|
||||
+ AGI_CS_ICTCP = 14
|
||||
+} AGI_ColorSpaces;
|
||||
+
|
||||
/// @class FFmpegSourceVideoProvider
|
||||
/// @brief Implements video loading through the FFMS library.
|
||||
class FFmpegSourceVideoProvider final : public VideoProvider, FFmpegSourceProvider {
|
||||
@@ -78,7 +95,7 @@ public:
|
||||
if (matrix == RealColorSpace)
|
||||
FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
|
||||
else if (matrix == "TV.601")
|
||||
- FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
|
||||
+ FFMS_SetInputFormatV(VideoSource, AGI_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
|
||||
else
|
||||
return;
|
||||
ColorSpace = matrix;
|
||||
@@ -103,16 +120,16 @@ std::string colormatrix_description(int cs, int cr) {
|
||||
std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
|
||||
|
||||
switch (cs) {
|
||||
- case FFMS_CS_RGB:
|
||||
+ case AGI_CS_RGB:
|
||||
return "None";
|
||||
- case FFMS_CS_BT709:
|
||||
+ case AGI_CS_BT709:
|
||||
return str + ".709";
|
||||
- case FFMS_CS_FCC:
|
||||
+ case AGI_CS_FCC:
|
||||
return str + ".FCC";
|
||||
- case FFMS_CS_BT470BG:
|
||||
- case FFMS_CS_SMPTE170M:
|
||||
+ case AGI_CS_BT470BG:
|
||||
+ case AGI_CS_SMPTE170M:
|
||||
return str + ".601";
|
||||
- case FFMS_CS_SMPTE240M:
|
||||
+ case AGI_CS_SMPTE240M:
|
||||
return str + ".240M";
|
||||
default:
|
||||
throw VideoOpenError("Unknown video color space");
|
||||
@@ -206,8 +223,10 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st
|
||||
|
||||
// set thread count
|
||||
int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
|
||||
+#if FFMS_VERSION < ((2 << 24) | (30 << 16) | (0 << 8) | 0)
|
||||
if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
|
||||
Threads = 1;
|
||||
+#endif
|
||||
|
||||
// set seekmode
|
||||
// TODO: give this its own option?
|
||||
@@ -235,18 +254,22 @@ void FFmpegSourceVideoProvider::LoadVideo(agi::fs::path const& filename, std::st
|
||||
else
|
||||
DAR = double(Width) / Height;
|
||||
|
||||
- CS = TempFrame->ColorSpace;
|
||||
+ int VideoCS = CS = TempFrame->ColorSpace;
|
||||
CR = TempFrame->ColorRange;
|
||||
|
||||
- if (CS == FFMS_CS_UNSPECIFIED)
|
||||
- CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
|
||||
+ if (CS == AGI_CS_UNSPECIFIED)
|
||||
+ CS = Width > 1024 || Height >= 600 ? AGI_CS_BT709 : AGI_CS_BT470BG;
|
||||
RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
|
||||
|
||||
#if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
|
||||
- if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
|
||||
- if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
|
||||
+ if (CS != AGI_CS_RGB && CS != AGI_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
|
||||
+ CS = AGI_CS_BT470BG;
|
||||
+ ColorSpace = colormatrix_description(AGI_CS_BT470BG, CR);
|
||||
+ }
|
||||
+
|
||||
+ if (CS != VideoCS) {
|
||||
+ if (FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), &ErrInfo))
|
||||
throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
|
||||
- ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
|
||||
}
|
||||
#endif
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bite-parser";
|
||||
version = "0.1.1";
|
||||
version = "0.1.3";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
|
@ -18,15 +18,9 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8021100bfbd6cc6056605361e763a3591efdea38014b3d8aa76c74c74de4ead4";
|
||||
sha256 = "0f246e98a5556d6ed9a33fda1e94c3ab906305729feb30d25e35344b3e1c1fd9";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'python = "^3.7,<=3.10"' 'python = "^3.7,<3.11"' \
|
||||
--replace poetry.masonry.api poetry.core.masonry.api
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
@ -42,6 +36,7 @@ buildPythonPackage rec {
|
|||
meta = {
|
||||
description = "Asynchronous parser taking incremental bites out of your byte input stream";
|
||||
homepage = "https://github.com/jgosmann/bite-parser";
|
||||
changelog = "https://github.com/jgosmann/bite-parser/blob/v${version}/CHANGELOG.rst";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
|
|
53
pkgs/development/python-modules/dalle-mini/default.nix
Normal file
53
pkgs/development/python-modules/dalle-mini/default.nix
Normal file
|
@ -0,0 +1,53 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, einops
|
||||
, emoji
|
||||
, flax
|
||||
, ftfy
|
||||
, jax
|
||||
, jaxlib
|
||||
, pillow
|
||||
, transformers
|
||||
, unidecode
|
||||
, wandb
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dalle-mini";
|
||||
version = "0.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-Sbos44uWGnJLYMx/xy0wkyAJHlDhVIeOS7rnYt2W53w=";
|
||||
};
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
buildInputs = [
|
||||
jaxlib
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
einops
|
||||
emoji
|
||||
flax
|
||||
ftfy
|
||||
jax
|
||||
pillow
|
||||
transformers
|
||||
unidecode
|
||||
wandb
|
||||
];
|
||||
|
||||
doCheck = false; # no upstream tests
|
||||
|
||||
pythonImportsCheck = [ "dalle_mini" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate images from a text prompt";
|
||||
homepage = "https://github.com/borisdayma/dalle-mini";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ r-burns ];
|
||||
};
|
||||
}
|
46
pkgs/development/python-modules/vqgan-jax/default.nix
Normal file
46
pkgs/development/python-modules/vqgan-jax/default.nix
Normal file
|
@ -0,0 +1,46 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, flax
|
||||
, jax
|
||||
, jaxlib
|
||||
, transformers
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "vqgan-jax";
|
||||
version = "unstable-2022-04-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "patil-suraj";
|
||||
repo = "vqgan-jax";
|
||||
rev = "1be20eee476e5d35c30e4ec3ed12222018af8ce4";
|
||||
sha256 = "sha256-OZihAXpE0UsgauQ38XDmAF+lrIgz05uK0ro8SCdVsPc=";
|
||||
};
|
||||
|
||||
format = "setuptools";
|
||||
|
||||
buildInputs = [
|
||||
jaxlib
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
flax
|
||||
jax
|
||||
transformers
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"vqgan_jax"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "JAX implementation of VQGAN";
|
||||
homepage = "https://github.com/patil-suraj/vqgan-jax";
|
||||
# license unknown: https://github.com/patil-suraj/vqgan-jax/issues/9
|
||||
license = lib.licenses.unfree;
|
||||
maintainers = with maintainers; [ r-burns ];
|
||||
};
|
||||
}
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grafana";
|
||||
version = "8.5.3";
|
||||
version = "8.5.5";
|
||||
|
||||
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" ];
|
||||
|
||||
|
@ -10,12 +10,12 @@ buildGoModule rec {
|
|||
rev = "v${version}";
|
||||
owner = "grafana";
|
||||
repo = "grafana";
|
||||
sha256 = "sha256-O0R+FsZC//Kj9FBb7Xg2fKxn60h/4ATJiropltGM9EI";
|
||||
sha256 = "sha256-ixqvBwwnkdEb3dFFw+I3XUksf2uMezbwcyyhmLTqh2M=";
|
||||
};
|
||||
|
||||
srcStatic = fetchurl {
|
||||
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
|
||||
sha256 = "0812lvcdibviy23y61z9ljy1j5d55ziyvf1y69kxmds2hwsj7iwl";
|
||||
sha256 = "0mqzrzi21qi3m4wm7q18i3n7cg8nwzlc3nw1axgmp7vs1bh5vs0l";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-ZL+A6Sz0uHg7ZzYHmA4EU5ZxfRXBLyKglk135iQT600=";
|
||||
|
|
|
@ -1,11 +1,10 @@
|
|||
{ lib
|
||||
, python3
|
||||
, fetchpatch
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dmarc-metrics-exporter";
|
||||
version = "0.5.1";
|
||||
version = "0.6.0";
|
||||
|
||||
disabled = python3.pythonOlder "3.7";
|
||||
|
||||
|
@ -13,21 +12,11 @@ python3.pkgs.buildPythonApplication rec {
|
|||
|
||||
src = python3.pkgs.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "22ec361f9a4c86abefbfab541f588597e21bf4fbedf2911f230e560b2ec3503a";
|
||||
sha256 = "70f39b373ead42acb8caf56040f7ebf13ab67aea505511025c09ecf4560f8b1b";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# https://github.com/jgosmann/dmarc-metrics-exporter/pull/23
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jgosmann/dmarc-metrics-exporter/commit/3fe401f5dfb9e0304601a2a89ac987ff853b7cba.patch";
|
||||
hash = "sha256-MjVLlFQMp2r3AhBMu1lEmRm0Y2H9FdvCfPgAK5kvwWE=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace 'python = "^3.7,<3.10"' 'python = "^3.7,<3.11"' \
|
||||
--replace poetry.masonry.api poetry.core.masonry.api \
|
||||
--replace '"^' '">='
|
||||
'';
|
||||
|
||||
|
@ -63,6 +52,7 @@ python3.pkgs.buildPythonApplication rec {
|
|||
meta = {
|
||||
description = "Export Prometheus metrics from DMARC reports";
|
||||
homepage = "https://github.com/jgosmann/dmarc-metrics-exporter";
|
||||
changelog = "https://github.com/jgosmann/dmarc-metrics-exporter/blob/v${version}/CHANGELOG.rst";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ ma27 ];
|
||||
};
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wiki-js";
|
||||
version = "2.5.283";
|
||||
version = "2.5.284";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";
|
||||
sha256 = "sha256-dQ1FWZ+WysdsRkbNapKm1psZx35biKrRvTfNklC89e8=";
|
||||
sha256 = "sha256-1kwC9wfx/8yKociV4wqrXRisgp/Ix5F4Iro6dQs1xG0=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
|
@ -2071,6 +2071,8 @@ in {
|
|||
|
||||
daemonocle = callPackage ../development/python-modules/daemonocle { };
|
||||
|
||||
dalle-mini = callPackage ../development/python-modules/dalle-mini { };
|
||||
|
||||
daphne = callPackage ../development/python-modules/daphne { };
|
||||
|
||||
dasbus = callPackage ../development/python-modules/dasbus { };
|
||||
|
@ -11048,6 +11050,8 @@ in {
|
|||
|
||||
vpk = callPackage ../development/python-modules/vpk { };
|
||||
|
||||
vqgan-jax = callPackage ../development/python-modules/vqgan-jax { };
|
||||
|
||||
vsts = callPackage ../development/python-modules/vsts { };
|
||||
|
||||
vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { };
|
||||
|
|
Loading…
Reference in a new issue