mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
649fc12ad6
|
|
@ -10289,6 +10289,13 @@
|
|||
githubId = 105451387;
|
||||
name = "Maria";
|
||||
};
|
||||
marie = {
|
||||
email = "tabmeier12+nix@gmail.com";
|
||||
github = "nycodeghg";
|
||||
githubId = 37078297;
|
||||
matrix = "@marie:marie.cologne";
|
||||
name = "Marie Ramlow";
|
||||
};
|
||||
marijanp = {
|
||||
name = "Marijan Petričević";
|
||||
email = "marijan.petricevic94@gmail.com";
|
||||
|
|
|
|||
|
|
@ -109,8 +109,10 @@ let
|
|||
|
||||
nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; };
|
||||
|
||||
withExtraArgs = nixosSystem: nixosSystem // {
|
||||
inherit extraArgs;
|
||||
inherit (nixosSystem._module.args) pkgs;
|
||||
extendModules = args: withExtraArgs (nixosSystem.extendModules args);
|
||||
};
|
||||
in
|
||||
withWarnings nixosWithUserModules // {
|
||||
inherit extraArgs;
|
||||
inherit (nixosWithUserModules._module.args) pkgs;
|
||||
}
|
||||
withWarnings (withExtraArgs nixosWithUserModules)
|
||||
|
|
|
|||
|
|
@ -833,6 +833,9 @@ class Machine:
|
|||
# TODO: do we want to bail after a set number of attempts?
|
||||
while not shell_ready(timeout_secs=30):
|
||||
self.log("Guest root shell did not produce any data yet...")
|
||||
self.log(
|
||||
" To debug, enter the VM and run 'systemctl status backdoor.service'."
|
||||
)
|
||||
|
||||
while True:
|
||||
chunk = self.shell.recv(1024)
|
||||
|
|
|
|||
|
|
@ -12,12 +12,34 @@ in
|
|||
i18n.inputMethod.fcitx5 = {
|
||||
addons = mkOption {
|
||||
type = with types; listOf package;
|
||||
default = [];
|
||||
default = [ ];
|
||||
example = literalExpression "with pkgs; [ fcitx5-rime ]";
|
||||
description = lib.mdDoc ''
|
||||
Enabled Fcitx5 addons.
|
||||
'';
|
||||
};
|
||||
quickPhrase = mkOption {
|
||||
type = with types; attrsOf string;
|
||||
default = { };
|
||||
example = literalExpression ''
|
||||
{
|
||||
smile = "（・∀・）";
|
||||
angry = "(￣ー￣)";
|
||||
}
|
||||
'';
|
||||
description = lib.mdDoc "Quick phrases.";
|
||||
};
|
||||
quickPhraseFiles = mkOption {
|
||||
type = with types; attrsOf path;
|
||||
default = { };
|
||||
example = literalExpression ''
|
||||
{
|
||||
words = ./words.mb;
|
||||
numbers = ./numbers.mb;
|
||||
}
|
||||
'';
|
||||
description = lib.mdDoc "Quick phrase files.";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -30,6 +52,16 @@ in
|
|||
config = mkIf (im.enabled == "fcitx5") {
|
||||
i18n.inputMethod.package = fcitx5Package;
|
||||
|
||||
i18n.inputMethod.fcitx5.addons = lib.optionals (cfg.quickPhrase != { }) [
|
||||
(pkgs.writeTextDir "share/fcitx5/data/QuickPhrase.mb"
|
||||
(lib.concatStringsSep "\n"
|
||||
(lib.mapAttrsToList (name: value: "${name} ${value}") cfg.quickPhrase)))
|
||||
] ++ lib.optionals (cfg.quickPhraseFiles != { }) [
|
||||
(pkgs.linkFarm "quickPhraseFiles" (lib.mapAttrs'
|
||||
(name: value: lib.nameValuePair ("share/fcitx5/data/quickphrase.d/${name}.mb") value)
|
||||
cfg.quickPhraseFiles))
|
||||
];
|
||||
|
||||
environment.variables = {
|
||||
GTK_IM_MODULE = "fcitx";
|
||||
QT_IM_MODULE = "fcitx";
|
||||
|
|
|
|||
|
|
@ -215,7 +215,10 @@ in {
|
|||
LockPersonality = true;
|
||||
RestrictRealtime = true;
|
||||
PrivateMounts = true;
|
||||
SystemCallFilter = "~@aio @clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @setuid @swap";
|
||||
SystemCallFilter = [
|
||||
"@system-service @pkey"
|
||||
"~@privileged @resources"
|
||||
];
|
||||
SystemCallArchitectures = "native";
|
||||
# AF_UNIX is required to connect to a postgres socket.
|
||||
RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
|
||||
|
|
|
|||
|
|
@ -1635,7 +1635,7 @@ in {
|
|||
"gitlab-config.service"
|
||||
"gitlab-db-config.service"
|
||||
] ++ optional (cfg.databaseHost == "") "postgresql.service";
|
||||
wantedBy = [ "gitlab.target" ];
|
||||
requiredBy = [ "gitlab.target" ];
|
||||
partOf = [ "gitlab.target" ];
|
||||
environment = gitlabEnv;
|
||||
path = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -147,6 +147,14 @@ with lib;
|
|||
defaultText = lib.literalExpression ''if config.proxmox.qemuConf.bios == "seabios" then "legacy" else "efi"'';
|
||||
example = "hybrid";
|
||||
};
|
||||
additionalSpace = mkOption {
|
||||
type = types.str;
|
||||
default = "512M";
|
||||
description = lib.mdDoc ''
|
||||
Additional disk space to be added to the image.
|
||||
Defaults to 512M (Megabytes), Suffix can also be specified with `G` (gigabyte) or `K` (kilobyte).
|
||||
'';
|
||||
};
|
||||
filenameSuffix = mkOption {
|
||||
type = types.str;
|
||||
default = config.proxmox.qemuConf.name;
|
||||
|
|
@ -197,7 +205,7 @@ with lib;
|
|||
];
|
||||
system.build.VMA = import ../../lib/make-disk-image.nix {
|
||||
name = "proxmox-${cfg.filenameSuffix}";
|
||||
inherit partitionTableType;
|
||||
inherit (cfg) partitionTableType additionalSpace;
|
||||
postVM = let
|
||||
# Build qemu with PVE's patch that adds support for the VMA format
|
||||
vma = (pkgs.qemu_kvm.override {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, meta
|
||||
, fetchurl
|
||||
, unzip
|
||||
, mpv
|
||||
, electron_24
|
||||
, makeDesktopItem
|
||||
|
|
@ -14,7 +16,7 @@ stdenv.mkDerivation {
|
|||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip"
|
||||
url = "https://github.com/jeffvli/feishin/releases/download/v${version}/${appname}-${version}-mac-x64.zip";
|
||||
hash = "sha256-WzU/Yd3cNMIpmkKWC29mQlviYXiYV5k8+80iyzilPGc=";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
, pkg-config
|
||||
, ninja
|
||||
, alsa-lib
|
||||
, alsa-plugins
|
||||
, freetype
|
||||
, libjack2
|
||||
, lame
|
||||
|
|
@ -85,6 +86,8 @@ in stdenv'.mkDerivation rec {
|
|||
qtWrapperArgs = [
|
||||
# MuseScore JACK backend loads libjack at runtime.
|
||||
"--prefix ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}"
|
||||
] ++ lib.optionals (stdenv.isLinux) [
|
||||
"--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib"
|
||||
] ++ lib.optionals (!stdenv.isDarwin) [
|
||||
# There are some issues with using the wayland backend, see:
|
||||
# https://musescore.org/en/node/321936
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@ let
|
|||
inherit tiling_wm;
|
||||
};
|
||||
stableVersion = {
|
||||
version = "2022.2.1.20"; # "Android Studio Flamingo (2022.2.1) Patch 2"
|
||||
sha256Hash = "sha256-X+ZuH4cHKfQtfvOF0kLk+QjQ5AR3pTEparczHEUk+uY=";
|
||||
version = "2022.3.1.18"; # "Android Studio Giraffe (2022.3.1)"
|
||||
sha256Hash = "sha256-JCFeEySmrJEYELLMGvstc1z3Rd+8BpGKQrjW+8a/dDM=";
|
||||
};
|
||||
betaVersion = {
|
||||
version = "2022.3.1.16"; # "Android Studio Giraffe (2022.3.1) Beta 5"
|
||||
sha256Hash = "sha256-D+Hoa50fzvtO0/6DsExmGSDzcgDIT2Bg+HvI6mCle14=";
|
||||
version = "2022.3.1.17"; # "Android Studio Giraffe (2022.3.1) RC 1"
|
||||
sha256Hash = "sha256-Bpur9ytiwa0udiyYVxlfLT4M+ZcO5atQUQg/ForATP4=";
|
||||
};
|
||||
latestVersion = {
|
||||
version = "2023.1.1.12"; # Android Studio Hedgehog (2023.1.1) Canary 12
|
||||
sha256Hash = "sha256-/BKtjX3O6PCqtzVfVMPICcip6tf6W/JV5UzWgON+kZY=";
|
||||
version = "2023.1.1.14"; # Android Studio Hedgehog (2023.1.1) Canary 14
|
||||
sha256Hash = "sha256-MgZDUpRyM0XDfgqfYjtJJyG2CBaNB06PgtoJltDwNwk=";
|
||||
};
|
||||
in {
|
||||
# Attributes are named by their corresponding release channels
|
||||
|
|
|
|||
|
|
@ -2,25 +2,24 @@
|
|||
, stdenv
|
||||
, fetchFromSourcehut
|
||||
, SDL2
|
||||
, unstableGitUpdater
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "uxn";
|
||||
version = "unstable-2022-10-22";
|
||||
version = "unstable-2023-07-26";
|
||||
|
||||
src = fetchFromSourcehut {
|
||||
owner = "~rabbits";
|
||||
repo = "uxn";
|
||||
rev = "1b2049e238df96f32335edf1c6db35bd09f8b42d";
|
||||
hash = "sha256-lwms+qUelfpTC+i2m5b3dW7ww9298YMPFdPVsFrwcDQ=";
|
||||
rev = "e2e5e8653193e2797131813938cb0d633ca3f40c";
|
||||
hash = "sha256-VZYvpHUyNeJMsX2ccLEBRuHgdgwOVuv+iakPiHnGAfg=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
SDL2
|
||||
];
|
||||
|
||||
dontConfigure = true;
|
||||
|
||||
postPatch = ''
|
||||
sed -i -e 's|UXNEMU_LDFLAGS="$(brew.*$|UXNEMU_LDFLAGS="$(sdl2-config --cflags --libs)"|' build.sh
|
||||
'';
|
||||
|
|
@ -44,11 +43,13 @@ stdenv.mkDerivation {
|
|||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
passthru.updateScript = unstableGitUpdater { };
|
||||
|
||||
meta = {
|
||||
homepage = "https://wiki.xxiivv.com/site/uxn.html";
|
||||
description = "An assembler and emulator for the Uxn stack machine";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ AndersonTorres kototama ];
|
||||
platforms = with platforms; unix;
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres kototama ];
|
||||
inherit (SDL2.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,19 +17,17 @@
|
|||
, wrapQtAppsHook
|
||||
, zlib
|
||||
, withTeXLive ? true
|
||||
, buildPackages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ipe";
|
||||
version = "7.2.26";
|
||||
version = "7.2.27";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/otfried/ipe/releases/download/v${version}/ipe-${version}-src.tar.gz";
|
||||
sha256 = "sha256-5J0AV5E6SlFrIBfwDZrbJnkDUoVZ0fDH669s2RQ1CqU=";
|
||||
sha256 = "sha256-wx/bZy8kB7dpZsz58BeRGdS1BzbrIoafgEmLyFg7wZU=";
|
||||
};
|
||||
patches = [
|
||||
./headers-lookup.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config copyDesktopItems wrapQtAppsHook ];
|
||||
|
||||
|
|
@ -52,6 +50,7 @@ stdenv.mkDerivation rec {
|
|||
"-C src"
|
||||
"IPEPREFIX=${placeholder "out"}"
|
||||
"LUA_PACKAGE=lua"
|
||||
"MOC=${buildPackages.qt6Packages.qtbase}/libexec/moc"
|
||||
"IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/src/ipepresenter/Makefile b/src/ipepresenter/Makefile
|
||||
index ae3664e..f4f74ff 100644
|
||||
--- a/src/ipepresenter/Makefile
|
||||
+++ b/src/ipepresenter/Makefile
|
||||
@@ -8,7 +8,7 @@ include ../common.mak
|
||||
|
||||
TARGET = $(call exe_target,ipepresenter)
|
||||
|
||||
-CXXFLAGS += -I../include -I../ipecanvas -I../ipecairo \
|
||||
+CPPFLAGS += -I../include -I../ipecanvas -I../ipecairo \
|
||||
$(UI_CFLAGS) $(CAIRO_CFLAGS) $(ZLIB_CFLAGS)
|
||||
LIBS += -L$(buildlib) -lipecanvas -lipecairo -lipe \
|
||||
$(UI_LIBS) $(CAIRO_LIBS) $(ZLIB_LIBS)
|
||||
|
|
@ -70,7 +70,8 @@ mkDerivation rec {
|
|||
cmakeFlags = [
|
||||
"-DAUTOSTART_EXEC_PATH=${autostartExecPath}"
|
||||
# See https://github.com/Martchus/syncthingtray/issues/42
|
||||
"-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/lib/qt-5"
|
||||
"-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/${qtbase.qtPluginPrefix}"
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
] ++ lib.optionals (!plasmoidSupport) ["-DNO_PLASMOID=ON"]
|
||||
++ lib.optionals (!kioPluginSupport) ["-DNO_FILE_ITEM_ACTION_PLUGIN=ON"]
|
||||
++ lib.optionals systemdSupport ["-DSYSTEMD_SUPPORT=ON"]
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tickrs";
|
||||
version = "0.14.8";
|
||||
version = "0.14.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tarkah";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8q/dL1Pv25TkL7PESybgIu+0lR0cr6qrK6ItE/r9pbI=";
|
||||
hash = "sha256-cN5GtU3bmsdJvfjVdWvWAshiU3Ged7L9pc8wid8GQwA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-fOYxOiVpgflwIz9Z6ePhQKDa7DX4D/ZCnPOwq9vWOSk=";
|
||||
cargoHash = "sha256-ngDA085V3+2oBH13Fs+pJez2W2/i1pEKoWdqJ4/3Q0I=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -29,11 +29,11 @@
|
|||
|
||||
firefox-beta = buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
version = "116.0b3";
|
||||
version = "116.0b8";
|
||||
applicationName = "Mozilla Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "6ba3b57750335fa2067669756d69a05e23c1641e9fe892f9ffc879c17bd5a836815f97c90277d6dc1fe1a68173652bcbb544540ce21a9c37892fad70987e8d39";
|
||||
sha512 = "5e34b3eed2ee54de4209af85be80f240c674d22ace072fba5e4cf14a7d733edc0cfd0feafc80b23898ef8c43e5e950b5e683f536d84f12a8a7fcee0120479701";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -56,12 +56,12 @@
|
|||
|
||||
firefox-devedition = (buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
version = "116.0b3";
|
||||
version = "116.0b8";
|
||||
applicationName = "Mozilla Firefox Developer Edition";
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "61b07bc9a706af8e947a0f206edb219650f8d64da5db821ca115375e379a11e4623dfe4e5b8734d0992e048ad8017152f8540e921105c3a266ad9347ef7b88e9";
|
||||
sha512 = "06ae0998a537a464a85cf9767555eb1b9d1378345201c9df760cb8ca856fcce61d84ca8398450b80175e9d13e6077df3c5fee9d4781d0879490d30bc6d362a0d";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
@ -115,11 +115,11 @@
|
|||
|
||||
firefox-esr-115 = buildMozillaMach rec {
|
||||
pname = "firefox-esr-115";
|
||||
version = "115.0.2esr";
|
||||
version = "115.0.3esr";
|
||||
applicationName = "Mozilla Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "f145d0e0e63032367af4198d4ca046589689b5852cb2451efbdcabeae37dfeda88dd0a2c317120ae5785228a6d7df21aa2d18c18ed7bf4b180823af37326a458";
|
||||
sha512 = "416ee56bd4a602c543391faaa8de31808f267ef2167f7d913195de45d3628de08d0582dbaa8905c847e1431bccd9d1d5d73ad9e7e5ea75be39e4d908a8b40376";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "minikube";
|
||||
version = "1.30.1";
|
||||
version = "1.31.1";
|
||||
|
||||
vendorHash = "sha256-616T47H+8FdXU37MDvAHRyM59JXurU45uz8c/TNxkkc=";
|
||||
vendorHash = "sha256-7Wa5Ut3n+CH4LeyRKvFC2aRf2auQXfqsi54QLKWgak8=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -22,7 +22,7 @@ buildGoModule rec {
|
|||
owner = "kubernetes";
|
||||
repo = "minikube";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-dw+aFckp5Q9i6bNKPetw2WlslrpKAgEzXI+aGAwDurU=";
|
||||
sha256 = "sha256-6vCZUDH35OclO02sV+AXv8+bj4klwoZC0abotheHSoU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -736,11 +736,11 @@
|
|||
"vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI="
|
||||
},
|
||||
"minio": {
|
||||
"hash": "sha256-B/3hT/R5tdbJ8IYScCLSklDD8aRnmSgX48DeM3DGGOw=",
|
||||
"hash": "sha256-BsOSImEMgxjldAQ014M25Y/JuxxaJLRdOOOHNAtm/Bg=",
|
||||
"homepage": "https://registry.terraform.io/providers/aminueza/minio",
|
||||
"owner": "aminueza",
|
||||
"repo": "terraform-provider-minio",
|
||||
"rev": "v1.17.0",
|
||||
"rev": "v1.17.1",
|
||||
"spdx": "Apache-2.0",
|
||||
"vendorHash": "sha256-Pr5YNDMVNccjQRC5WXUY+0pMTMbuxKqkqtd/Z/z0cXc="
|
||||
},
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "velero";
|
||||
version = "1.11.0";
|
||||
version = "1.11.1";
|
||||
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmware-tanzu";
|
||||
repo = "velero";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-vrRVNVcNahTC+HSHr7Bw3WedNhe+SSX03P65C5xiUnw=";
|
||||
sha256 = "sha256-G1+zdzHj8fDKVEVQpBEH3o/em+gxCyQmrpSXj8bE/P4=";
|
||||
};
|
||||
|
||||
ldflags = [
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "werf";
|
||||
version = "1.2.242";
|
||||
version = "1.2.248";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "werf";
|
||||
repo = "werf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-cYEhqoCkJtBRQuQDViA+x5Ow5bUB5Y2lZZf18cm5ig8=";
|
||||
hash = "sha256-z8XuMByI6B49XCgsZWVjErzcmthCCnpE6LdIfHEpxyA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-tNTjPIVfviUZ4ONDyQI3M+DIzZvvPbBPdVu0Du+PIdg=";
|
||||
vendorHash = "sha256-mt/2Pc1xF6seMZiSxQFQ6bfUxpQCgG3WkjZd0utWbiw=";
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -138,6 +138,13 @@ rec {
|
|||
|
||||
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/{appdata,applications,icons}
|
||||
cp $src/org.onionshare.OnionShare.desktop $out/share/applications
|
||||
cp $src/org.onionshare.OnionShare.svg $out/share/icons
|
||||
cp $src/org.onionshare.OnionShare.appdata.xml $out/share/appdata
|
||||
'';
|
||||
|
||||
preFixup = ''
|
||||
wrapQtApp $out/bin/onionshare
|
||||
'';
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2023-07-22";
|
||||
version = "unstable-2023-07-28";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "24a80b0468d9abf15207dcb962d9e14a544d53a3";
|
||||
sha256 = "D9bLsxQ/52ziIlm0A9/be8KmcqZ+xr8ZygCCG2mgGJw=";
|
||||
rev = "e3b52c687fcdb14075d6d04a1c4e9e5ba929ba54";
|
||||
sha256 = "AnhlGbd5TbreFEwP1J5r4EQPAtG+YwJ04v7sclccGYQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dvc";
|
||||
version = "3.5.1";
|
||||
version = "3.8.1";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-1kVc7+36rvIpoSinpyxMMs1/nhZrwv1pPWJsruFd1N8=";
|
||||
hash = "sha256-ZHB2XAYjPwhCWHqq2Kro4CzDW34YBaknv9xBotCDkOw=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@ let
|
|||
"email" = "someone@nixos.org";
|
||||
"phone" = "+31 71 452 5670";
|
||||
"country" = "nl";
|
||||
"street" = "Hogeweide 346";
|
||||
"state" = "Province of Utrecht";
|
||||
"city" = "Utrecht";
|
||||
"product" = "DaVinci Resolve";
|
||||
|
|
@ -98,7 +99,7 @@ let
|
|||
|
||||
curl \
|
||||
--retry 3 --retry-delay 3 \
|
||||
--header "Host: sw.blackmagicdesign.com" \
|
||||
--header "Host: sw.cloud.blackmagicdesign.com" \
|
||||
--header "Upgrade-Insecure-Requests: 1" \
|
||||
--header "$USERAGENT" \
|
||||
--header "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8" \
|
||||
|
|
|
|||
|
|
@ -92,11 +92,11 @@ python.pkgs.buildPythonApplication rec {
|
|||
|
||||
substituteInPlace frigate/const.py \
|
||||
--replace "/media/frigate" "/var/lib/frigate" \
|
||||
--replace "/tmp/cache" "/var/cache/frigate"
|
||||
--replace "/tmp/cache" "/var/cache/frigate/"
|
||||
|
||||
substituteInPlace frigate/http.py \
|
||||
--replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}" \
|
||||
--replace "/tmp/cache/" "/var/cache/frigate"
|
||||
--replace "/tmp/cache/" "/var/cache/frigate/"
|
||||
|
||||
substituteInPlace frigate/output.py \
|
||||
--replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}"
|
||||
|
|
|
|||
92
pkgs/applications/video/xine/lib.nix
Normal file
92
pkgs/applications/video/xine/lib.nix
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, aalib
|
||||
, alsa-lib
|
||||
, autoreconfHook
|
||||
, ffmpeg
|
||||
, flac
|
||||
, libGL
|
||||
, libGLU
|
||||
, libX11
|
||||
, libXext
|
||||
, libXinerama
|
||||
, libXv
|
||||
, libcaca
|
||||
, libcdio
|
||||
, libmng
|
||||
, libmpcdec
|
||||
, libpulseaudio
|
||||
, libtheora
|
||||
, libv4l
|
||||
, libvorbis
|
||||
, libxcb
|
||||
, ncurses
|
||||
, perl
|
||||
, pkg-config
|
||||
, speex
|
||||
, vcdimager
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xine-lib";
|
||||
version = "1.2.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/xine/xine-lib-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-XxDW1xikpRwX7RsysDHU+bgLBh6CdlNbK+MeWsS3Xm8=";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
perl
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
aalib
|
||||
alsa-lib
|
||||
ffmpeg
|
||||
flac
|
||||
libGL
|
||||
libGLU
|
||||
libX11
|
||||
libXext
|
||||
libXinerama
|
||||
libXv
|
||||
libcaca
|
||||
libcdio
|
||||
libmng
|
||||
libmpcdec
|
||||
libpulseaudio
|
||||
libtheora
|
||||
libv4l
|
||||
libvorbis
|
||||
libxcb
|
||||
ncurses
|
||||
perl
|
||||
speex
|
||||
vcdimager
|
||||
zlib
|
||||
libX11
|
||||
libXext
|
||||
libXinerama
|
||||
libXv
|
||||
libxcb
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
env.NIX_LDFLAGS = "-lxcb-shm";
|
||||
|
||||
meta = {
|
||||
homepage = "https://xine.sourceforge.net/";
|
||||
description = "A high-performance, portable and reusable multimedia playback engine";
|
||||
license = with lib.licenses; [ gpl2Plus lgpl2Plus ];
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -4,6 +4,13 @@
|
|||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, curl
|
||||
, libXext
|
||||
, libXft
|
||||
, libXi
|
||||
, libXinerama
|
||||
, libXtst
|
||||
, libXv
|
||||
, libXxf86vm
|
||||
, libjpeg
|
||||
, libpng
|
||||
, lirc
|
||||
|
|
@ -12,41 +19,28 @@
|
|||
, readline
|
||||
, shared-mime-info
|
||||
, xine-lib
|
||||
, xorg
|
||||
, xorgproto
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "xine-ui";
|
||||
version = "0.99.13";
|
||||
version = "0.99.14";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/xine/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-sjgtB1xysbEAOeDpAxDMhsjZEDWMU1We2C09WEIB9cU=";
|
||||
url = "mirror://sourceforge/xine/xine-ui-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-1NSQ1c7OcOK7mEnJ5ILyz4evAwLUUbYUR2/cw2Qs2cM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Fix build on aarch64
|
||||
name = "xine-ui_FTBS_aarch64.patch";
|
||||
url = "https://salsa.debian.org/debian/xine-ui/-/raw/b2f04f64947a8975a805950e7e67b15cb44007ef/debian/patches/backport/0003-Fix-build.patch";
|
||||
sha256 = "03f8nkm7q11v5vssl1bj500ja4ljz4y752mfk22k2g4djkwimx62";
|
||||
})
|
||||
];
|
||||
outputs = [ "out" "dev" "lib" "man" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
shared-mime-info
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
curl
|
||||
libjpeg
|
||||
libpng
|
||||
lirc
|
||||
ncurses
|
||||
readline
|
||||
xine-lib
|
||||
] ++ (with xorg; [
|
||||
libXext
|
||||
libXft
|
||||
libXi
|
||||
|
|
@ -54,24 +48,32 @@ stdenv.mkDerivation rec {
|
|||
libXtst
|
||||
libXv
|
||||
libXxf86vm
|
||||
libjpeg
|
||||
libpng
|
||||
lirc
|
||||
ncurses
|
||||
readline
|
||||
xine-lib
|
||||
xorgproto
|
||||
]);
|
||||
];
|
||||
|
||||
configureFlags = [ "--with-readline=${readline.dev}" ];
|
||||
|
||||
LIRC_CFLAGS="-I${lirc}/include";
|
||||
LIRC_LIBS="-L ${lirc}/lib -llirc_client";
|
||||
env = {
|
||||
LIRC_CFLAGS="-I${lirc}/include";
|
||||
LIRC_LIBS="-L ${lirc}/lib -llirc_client";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
substituteInPlace $out/share/applications/xine.desktop \
|
||||
--replace "MimeType=;" "MimeType="
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://xine.sourceforge.net/";
|
||||
description = "Xlib-based frontend for Xine video player";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
@ -36,11 +36,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "epiphany";
|
||||
version = "44.5";
|
||||
version = "44.6";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "PEdeBO0qD0EMtEuWk3VjaXB5GTrJt6UMkUhfubCDFas=";
|
||||
sha256 = "UzXdVzWB22HhJthU3BauUZZXpbh5B4mkfSXkPhfNOkM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "kzones";
|
||||
version = "0.4";
|
||||
version = "0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gerritdevriese";
|
||||
repo = "kzones";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-E5pi2ttar6bAt7s0m/NCw66Qgg5fL5p5QpXROWuUTvM=";
|
||||
sha256 = "sha256-0f7Fv5cvRvqNrKjHpU/tLpjiBPN0ExwTDq1p9sdLd4o=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,13 +22,13 @@ let
|
|||
# The loosely held nixpkgs convention for SBCL is to keep the last two
|
||||
# versions.
|
||||
# https://github.com/NixOS/nixpkgs/pull/200994#issuecomment-1315042841
|
||||
"2.3.5" = {
|
||||
sha256 = "sha256-ickHIM+dBdvNkNaQ44GiUUwPGAcVng1yIiIMWowtUYY=";
|
||||
};
|
||||
|
||||
"2.3.6" = {
|
||||
sha256 = "sha256-tEFMpNmnR06NiE19YyN+LynvRZ39WoSEJKnD+lUdGbk=";
|
||||
};
|
||||
|
||||
"2.3.7" = {
|
||||
sha256 = "sha256-aYFE+4BaMZGaYQ3pmauYOR1S62mK2qjKGbKPxu0Nmfc=";
|
||||
};
|
||||
};
|
||||
|
||||
in with versionMap.${version};
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "luau";
|
||||
version = "0.584";
|
||||
version = "0.588";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Roblox";
|
||||
repo = "luau";
|
||||
rev = version;
|
||||
hash = "sha256-yRKx+hKbi9T8O7kFnEmLYbMwhLaiWh0fHRieZzgYPSI=";
|
||||
hash = "sha256-iRYVmRnEpLBtBJ5EjN88EmWM88FNU4CyFvgnBaqDSz4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -349,4 +349,11 @@ in {
|
|||
sha256 = "sha256-lsV1WIcaZ0jeW8nydOk/S1qtBs2PN776Do2U57ikI7w=";
|
||||
cargoSha256 = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ=";
|
||||
};
|
||||
|
||||
ruby_3_3 = generic {
|
||||
version = rubyVersion "3" "3" "0" "preview1";
|
||||
sha256 = "sha256-w0VKkRd5uNdHqw6ocEEDDQAtUz7ayySF/lWLcITaJe0=";
|
||||
cargoSha256 = "sha256-6du7RJo0DH+eYMOoh3L31F3aqfR5+iG1iKauSV1uNcQ=";
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
iconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4
|
||||
];
|
||||
|
||||
cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"];
|
||||
|
||||
# Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files
|
||||
preCheck = ''
|
||||
checkFlagsArray+=(
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gspell";
|
||||
version = "1.12.1";
|
||||
version = "1.12.2";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
outputBin = "dev";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "jsRPMgUuiW/N1JJuuBSjJuOaUEfiUe7HuQVvvZREsPE=";
|
||||
sha256 = "tOmTvYJ+TOtqdwsbXolQ/OO+nIsrDL6yL9+ZKAjdITk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
328
pkgs/development/libraries/gstreamer/rs/Cargo.lock
generated
328
pkgs/development/libraries/gstreamer/rs/Cargo.lock
generated
|
|
@ -146,9 +146,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "anyhow"
|
||||
version = "1.0.71"
|
||||
version = "1.0.72"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
|
||||
checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
|
||||
|
||||
[[package]]
|
||||
name = "arbitrary"
|
||||
|
|
@ -178,9 +178,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "async-compression"
|
||||
version = "0.4.0"
|
||||
version = "0.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11"
|
||||
checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6"
|
||||
dependencies = [
|
||||
"flate2",
|
||||
"futures-core",
|
||||
|
|
@ -197,7 +197,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.26",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -208,13 +208,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
|
|||
|
||||
[[package]]
|
||||
name = "async-trait"
|
||||
version = "0.1.70"
|
||||
version = "0.1.71"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "79fa67157abdfd688a259b6648808757db9347af834624f27ec646da976aee5d"
|
||||
checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.26",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -738,9 +738,9 @@ checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
|
|||
|
||||
[[package]]
|
||||
name = "bitstream-io"
|
||||
version = "1.6.0"
|
||||
version = "1.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9d28070975aaf4ef1fd0bd1f29b739c06c2cdd9972e090617fb6dca3b2cb564e"
|
||||
checksum = "82704769cb85a22df2c54d6bdd6a158b7931d256cf3248a07d6ecbe9d58b31d7"
|
||||
|
||||
[[package]]
|
||||
name = "block-buffer"
|
||||
|
|
@ -917,9 +917,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.3.10"
|
||||
version = "4.3.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a"
|
||||
checksum = "74bb1b4028935821b2d6b439bba2e970bdcf740832732437ead910c632e30d7d"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
|
|
@ -928,9 +928,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.3.10"
|
||||
version = "4.3.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d"
|
||||
checksum = "5ae467cbb0111869b765e13882a1dbbd6cb52f58203d8b80c44f667d4dd19843"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
|
|
@ -940,14 +940,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.3.2"
|
||||
version = "4.3.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
|
||||
checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.26",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1043,9 +1043,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
|
|||
|
||||
[[package]]
|
||||
name = "cpufeatures"
|
||||
version = "0.2.8"
|
||||
version = "0.2.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c"
|
||||
checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
|
@ -1177,16 +1177,6 @@ dependencies = [
|
|||
"va_list",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ctor"
|
||||
version = "0.1.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ctr"
|
||||
version = "0.6.0"
|
||||
|
|
@ -1219,11 +1209,11 @@ checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
|
|||
|
||||
[[package]]
|
||||
name = "dav1d"
|
||||
version = "0.9.3"
|
||||
version = "0.9.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c02ab20a37bcd596fb85c3185c3286f983fc6125755c74625c7849c2ba0b7bb3"
|
||||
checksum = "87ca43c8e58ee931086b5fd9a4b6a8cc40c1346592246c4fe3d299eca1684c75"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"bitflags 2.3.3",
|
||||
"dav1d-sys",
|
||||
]
|
||||
|
||||
|
|
@ -1338,9 +1328,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "equivalent"
|
||||
version = "1.0.0"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
|
||||
checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
|
||||
|
||||
[[package]]
|
||||
name = "errno"
|
||||
|
|
@ -1536,7 +1526,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.26",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1889,7 +1879,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-audiofx"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"atomic_refcell",
|
||||
|
|
@ -1911,7 +1901,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-aws"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"async-tungstenite",
|
||||
"atomic_refcell",
|
||||
|
|
@ -1952,7 +1942,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-cdg"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"cdg",
|
||||
"cdg_renderer",
|
||||
|
|
@ -1968,7 +1958,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-claxon"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"atomic_refcell",
|
||||
"byte-slice-cast",
|
||||
|
|
@ -1982,7 +1972,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-closedcaption"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"atomic_refcell",
|
||||
|
|
@ -2009,7 +1999,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-csound"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"byte-slice-cast",
|
||||
"csound",
|
||||
|
|
@ -2023,7 +2013,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-dav1d"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"dav1d",
|
||||
"gst-plugin-version-helper",
|
||||
|
|
@ -2036,7 +2026,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-fallbackswitch"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"gio",
|
||||
"gst-plugin-gtk4",
|
||||
|
|
@ -2054,7 +2044,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-ffv1"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"byte-slice-cast",
|
||||
"ffv1",
|
||||
|
|
@ -2067,7 +2057,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-file"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"gst-plugin-version-helper",
|
||||
"gstreamer",
|
||||
|
|
@ -2078,7 +2068,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-flavors"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"byteorder",
|
||||
"flavors",
|
||||
|
|
@ -2095,7 +2085,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-fmp4"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
|
|
@ -2113,7 +2103,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-gif"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"atomic_refcell",
|
||||
"gif",
|
||||
|
|
@ -2126,7 +2116,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-gtk4"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"gdk4-wayland",
|
||||
"gdk4-win32",
|
||||
|
|
@ -2146,7 +2136,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-hlssink3"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"gio",
|
||||
"glib",
|
||||
|
|
@ -2162,7 +2152,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-hsv"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"byte-slice-cast",
|
||||
"gst-plugin-version-helper",
|
||||
|
|
@ -2177,7 +2167,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-json"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"gst-plugin-version-helper",
|
||||
"gstreamer",
|
||||
|
|
@ -2189,7 +2179,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-lewton"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"atomic_refcell",
|
||||
"byte-slice-cast",
|
||||
|
|
@ -2203,7 +2193,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-livesync"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"gio",
|
||||
"gst-plugin-gtk4",
|
||||
|
|
@ -2220,7 +2210,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-mp4"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"gst-plugin-version-helper",
|
||||
|
|
@ -2236,7 +2226,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-ndi"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"atomic_refcell",
|
||||
"byte-slice-cast",
|
||||
|
|
@ -2253,7 +2243,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-onvif"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"cairo-rs",
|
||||
"chrono",
|
||||
|
|
@ -2271,7 +2261,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-png"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"gst-plugin-version-helper",
|
||||
"gstreamer",
|
||||
|
|
@ -2284,7 +2274,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-raptorq"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"gst-plugin-version-helper",
|
||||
"gstreamer",
|
||||
|
|
@ -2298,7 +2288,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-rav1e"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"atomic_refcell",
|
||||
"gst-plugin-version-helper",
|
||||
|
|
@ -2311,7 +2301,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-regex"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"gst-plugin-version-helper",
|
||||
"gstreamer",
|
||||
|
|
@ -2322,7 +2312,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-reqwest"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"gst-plugin-version-helper",
|
||||
|
|
@ -2339,7 +2329,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-rtp"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"bitstream-io",
|
||||
"chrono",
|
||||
|
|
@ -2352,7 +2342,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-sodium"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"gst-plugin-version-helper",
|
||||
|
|
@ -2372,7 +2362,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-spotify"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"futures",
|
||||
|
|
@ -2387,7 +2377,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-textahead"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"gst-plugin-version-helper",
|
||||
"gstreamer",
|
||||
|
|
@ -2396,7 +2386,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-textwrap"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"gst-plugin-version-helper",
|
||||
"gstreamer",
|
||||
|
|
@ -2408,7 +2398,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-threadshare"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"async-task",
|
||||
"cc",
|
||||
|
|
@ -2438,7 +2428,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-togglerecord"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"either",
|
||||
"gio",
|
||||
|
|
@ -2454,7 +2444,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-tracers"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"gst-plugin-version-helper",
|
||||
|
|
@ -2466,7 +2456,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-tutorial"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"byte-slice-cast",
|
||||
"gst-plugin-version-helper",
|
||||
|
|
@ -2480,7 +2470,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-uriplaylistbin"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
|
|
@ -2502,7 +2492,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-videofx"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"atomic_refcell",
|
||||
"cairo-rs",
|
||||
|
|
@ -2522,7 +2512,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-webp"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"gst-plugin-version-helper",
|
||||
"gstreamer",
|
||||
|
|
@ -2535,7 +2525,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-webrtc"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-tungstenite",
|
||||
|
|
@ -2569,7 +2559,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-webrtc-signalling"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-tungstenite",
|
||||
|
|
@ -2592,7 +2582,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-webrtc-signalling-protocol"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
|
|
@ -2600,7 +2590,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "gst-plugin-webrtchttp"
|
||||
version = "0.10.10"
|
||||
version = "0.10.11"
|
||||
dependencies = [
|
||||
"async-recursion",
|
||||
"bytes",
|
||||
|
|
@ -3491,12 +3481,12 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
|
|||
|
||||
[[package]]
|
||||
name = "is-terminal"
|
||||
version = "0.4.8"
|
||||
version = "0.4.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
|
||||
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
|
||||
dependencies = [
|
||||
"hermit-abi 0.3.2",
|
||||
"rustix 0.38.2",
|
||||
"rustix 0.38.4",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
|
|
@ -3520,9 +3510,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "1.0.8"
|
||||
version = "1.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a"
|
||||
checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
|
||||
|
||||
[[package]]
|
||||
name = "jobserver"
|
||||
|
|
@ -3871,7 +3861,7 @@ version = "0.1.0"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
|
||||
dependencies = [
|
||||
"regex-automata",
|
||||
"regex-automata 0.1.10",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -4100,6 +4090,17 @@ dependencies = [
|
|||
"syn 1.0.109",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-derive"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.26",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.45"
|
||||
|
|
@ -4196,7 +4197,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.26",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -4226,15 +4227,6 @@ dependencies = [
|
|||
"paste",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "output_vt100"
|
||||
version = "0.1.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "outref"
|
||||
version = "0.5.1"
|
||||
|
|
@ -4336,9 +4328,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "paste"
|
||||
version = "1.0.13"
|
||||
version = "1.0.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35"
|
||||
checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
|
||||
|
||||
[[package]]
|
||||
name = "pbkdf2"
|
||||
|
|
@ -4383,7 +4375,7 @@ checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.26",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -4453,13 +4445,11 @@ checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5"
|
|||
|
||||
[[package]]
|
||||
name = "pretty_assertions"
|
||||
version = "1.3.0"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
|
||||
checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
|
||||
dependencies = [
|
||||
"ctor",
|
||||
"diff",
|
||||
"output_vt100",
|
||||
"yansi",
|
||||
]
|
||||
|
||||
|
|
@ -4518,9 +4508,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.63"
|
||||
version = "1.0.66"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
|
||||
checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
|
@ -4568,9 +4558,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.29"
|
||||
version = "1.0.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
|
||||
checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
|
@ -4644,7 +4634,7 @@ dependencies = [
|
|||
"nasm-rs",
|
||||
"new_debug_unreachable",
|
||||
"noop_proc_macro",
|
||||
"num-derive",
|
||||
"num-derive 0.3.3",
|
||||
"num-traits",
|
||||
"once_cell",
|
||||
"paste",
|
||||
|
|
@ -4709,13 +4699,14 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.8.4"
|
||||
version = "1.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
|
||||
checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-syntax 0.7.2",
|
||||
"regex-automata 0.3.3",
|
||||
"regex-syntax 0.7.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -4727,6 +4718,17 @@ dependencies = [
|
|||
"regex-syntax 0.6.29",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.3.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-syntax 0.7.4",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.6.29"
|
||||
|
|
@ -4735,9 +4737,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
|||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.7.2"
|
||||
version = "0.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
|
||||
checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
|
||||
|
||||
[[package]]
|
||||
name = "reqwest"
|
||||
|
|
@ -4892,9 +4894,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.37.22"
|
||||
version = "0.37.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8818fa822adcc98b18fedbb3632a6a33213c070556b5aa7c4c8cc21cff565c4c"
|
||||
checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
|
||||
dependencies = [
|
||||
"bitflags 1.3.2",
|
||||
"errno",
|
||||
|
|
@ -4906,9 +4908,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.2"
|
||||
version = "0.38.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4"
|
||||
checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
|
||||
dependencies = [
|
||||
"bitflags 2.3.3",
|
||||
"errno",
|
||||
|
|
@ -4952,9 +4954,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.14"
|
||||
version = "1.0.15"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"
|
||||
checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
|
||||
|
||||
[[package]]
|
||||
name = "same-file"
|
||||
|
|
@ -4976,9 +4978,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
version = "1.1.0"
|
||||
version = "1.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
||||
|
||||
[[package]]
|
||||
name = "sct"
|
||||
|
|
@ -5015,47 +5017,47 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "semver"
|
||||
version = "1.0.17"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
|
||||
checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.166"
|
||||
version = "1.0.171"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
|
||||
checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_bytes"
|
||||
version = "0.11.10"
|
||||
version = "0.11.12"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f3c5113243e4a3a1c96587342d067f3e6b0f50790b6cf40d2868eb647a3eef0e"
|
||||
checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.166"
|
||||
version = "1.0.171"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
|
||||
checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.26",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.100"
|
||||
version = "1.0.103"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c"
|
||||
checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
|
|
@ -5144,9 +5146,9 @@ checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
|
|||
|
||||
[[package]]
|
||||
name = "signal-hook"
|
||||
version = "0.3.15"
|
||||
version = "0.3.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
|
||||
checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"signal-hook-registry",
|
||||
|
|
@ -5193,9 +5195,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.10.0"
|
||||
version = "1.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
|
||||
checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
|
||||
|
||||
[[package]]
|
||||
name = "smawk"
|
||||
|
|
@ -5281,9 +5283,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.23"
|
||||
version = "2.0.26"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
|
||||
checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
|
|
@ -5299,15 +5301,15 @@ dependencies = [
|
|||
"cfg-expr",
|
||||
"heck",
|
||||
"pkg-config",
|
||||
"toml 0.7.5",
|
||||
"toml 0.7.6",
|
||||
"version-compare",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "target-lexicon"
|
||||
version = "0.12.8"
|
||||
version = "0.12.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1b1c7f239eb94671427157bd93b3694320f3668d4e1eff08c7285366fd777fac"
|
||||
checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e"
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
|
|
@ -5319,7 +5321,7 @@ dependencies = [
|
|||
"cfg-if",
|
||||
"fastrand 1.9.0",
|
||||
"redox_syscall 0.3.5",
|
||||
"rustix 0.37.22",
|
||||
"rustix 0.37.23",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
|
|
@ -5353,7 +5355,7 @@ dependencies = [
|
|||
"proc-macro2",
|
||||
"quote",
|
||||
"regex",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.26",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -5370,22 +5372,22 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.41"
|
||||
version = "1.0.43"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802"
|
||||
checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.41"
|
||||
version = "1.0.43"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59"
|
||||
checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.26",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -5490,7 +5492,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.26",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -5550,9 +5552,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.7.5"
|
||||
version = "0.7.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1ebafdf5ad1220cb59e7d17cf4d2c72015297b75b19a10472f99b89225089240"
|
||||
checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
|
||||
dependencies = [
|
||||
"serde",
|
||||
"serde_spanned",
|
||||
|
|
@ -5571,9 +5573,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "toml_edit"
|
||||
version = "0.19.11"
|
||||
version = "0.19.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7"
|
||||
checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
|
||||
dependencies = [
|
||||
"indexmap 2.0.0",
|
||||
"serde",
|
||||
|
|
@ -5631,7 +5633,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.26",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -5723,9 +5725,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
|
|||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.10"
|
||||
version = "1.0.11"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73"
|
||||
checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-linebreak"
|
||||
|
|
@ -5789,22 +5791,22 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
|
|||
|
||||
[[package]]
|
||||
name = "uuid"
|
||||
version = "1.4.0"
|
||||
version = "1.4.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be"
|
||||
checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "v_frame"
|
||||
version = "0.3.4"
|
||||
version = "0.3.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e3753f70d50a77f5d381103ba2693a889fed0d84273dd5cbdf4eb8bda720f0c6"
|
||||
checksum = "bec8189c996a12ac77c50065f9c9f64961e56eb940d0ae1a4ccc7bea238bb4bc"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"noop_proc_macro",
|
||||
"num-derive",
|
||||
"num-derive 0.4.0",
|
||||
"num-traits",
|
||||
"rust_hawktracer",
|
||||
]
|
||||
|
|
@ -5914,7 +5916,7 @@ dependencies = [
|
|||
"once_cell",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.26",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
|
|
@ -5948,7 +5950,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
|
|||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn 2.0.23",
|
||||
"syn 2.0.26",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
|
@ -6093,9 +6095,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
|
|||
|
||||
[[package]]
|
||||
name = "winnow"
|
||||
version = "0.4.7"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448"
|
||||
checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
|
|
|||
|
|
@ -114,7 +114,7 @@ let
|
|||
invalidPlugins = lib.subtractLists (lib.attrNames validPlugins) selectedPlugins;
|
||||
|
||||
# TODO: figure out what must be done about this upstream - related lu-zero/cargo-c#323 lu-zero/cargo-c#138
|
||||
cargo-c' = cargo-c.overrideAttrs (oldAttrs: {
|
||||
cargo-c' = (cargo-c.__spliced.buildHost or cargo-c).overrideAttrs (oldAttrs: {
|
||||
patches = (oldAttrs.patches or []) ++ [
|
||||
(fetchpatch {
|
||||
name = "cargo-c-test-rlib-fix.patch";
|
||||
|
|
@ -130,7 +130,7 @@ in
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gst-plugins-rs";
|
||||
version = "0.10.10";
|
||||
version = "0.10.11";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
|
|
@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "gstreamer";
|
||||
repo = "gst-plugins-rs";
|
||||
rev = version;
|
||||
hash = "sha256-ZsE1Pz2N0XSQFDyIeEUg9+eFN94mdSmge2Tvw57RLZ4=";
|
||||
hash = "sha256-oOoUGzbg/ib1pA0T81hxgLlHnTRlNCWH5qZUNAutn8U=";
|
||||
# TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
|
||||
postFetch = ''
|
||||
sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g'
|
||||
|
|
|
|||
|
|
@ -66,16 +66,16 @@ let
|
|||
projectArch = "x86_64";
|
||||
};
|
||||
};
|
||||
platforms."aarch64-linux".sha256 = "0px1v7gcfxrad8ap1g93nx3aqx9yklz385yaciki5s9hnjr3rwpr";
|
||||
platforms."x86_64-linux".sha256 = "134cvgdklybf15msdbjxpcpsl06s8w91px530241yhhrx4jvzj51";
|
||||
platforms."aarch64-linux".sha256 = "1348821cprfy46fvzipqfy9qmv1jw48dsi2nxnk3k1097c6xb9zq";
|
||||
platforms."x86_64-linux".sha256 = "0w58bqys331wssfqrv27v1fbvrgj4hs1kyjanld9vvdlna0x8kpg";
|
||||
|
||||
platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cef-binary";
|
||||
version = "114.2.13";
|
||||
gitRevision = "6792e13";
|
||||
chromiumVersion = "114.0.5735.200";
|
||||
version = "115.3.11";
|
||||
gitRevision = "a61da9b";
|
||||
chromiumVersion = "115.0.5790.114";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [ qtbase cpp-utilities ];
|
||||
nativeBuildInputs = [ cmake qttools ];
|
||||
|
||||
cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"];
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "stb";
|
||||
version = "unstable-2021-09-10";
|
||||
version = "unstable-2023-01-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nothings";
|
||||
repo = "stb";
|
||||
rev = "af1a5bc352164740c1cc1354942b1c6b72eacb8a";
|
||||
sha256 = "0qq35cd747lll4s7bmnxb3pqvyp2hgcr9kyf758fax9lx76iwjhr";
|
||||
rev = "5736b15f7ea0ffb08dd38af21067c314d6a3aae9";
|
||||
hash = "sha256-s2ASdlT3bBNrqvwfhhN6skjbmyEnUgvNOrvhgUSRj98=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ copyPkgconfigItems ];
|
||||
|
|
|
|||
|
|
@ -20,11 +20,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xdg-desktop-portal-gnome";
|
||||
version = "44.1";
|
||||
version = "44.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "NoLFRsgZIqW6adYthvacDCaxfJCWgj9YFJ0LVbvw7ts=";
|
||||
sha256 = "UO0arCkDA+oLxchAqcEWWRhUarSnOiTFLcqicHK1/yE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,92 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, aalib
|
||||
, alsa-lib
|
||||
, autoconf
|
||||
, ffmpeg_4
|
||||
, flac
|
||||
, libGL
|
||||
, libGLU
|
||||
, libcaca
|
||||
, libcdio
|
||||
, libmng
|
||||
, libmpcdec
|
||||
, libpulseaudio
|
||||
, libtheora
|
||||
, libv4l
|
||||
, libvorbis
|
||||
, ncurses
|
||||
, perl
|
||||
, pkg-config
|
||||
, speex
|
||||
, vcdimager
|
||||
, xorg
|
||||
, zlib
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xine-lib";
|
||||
version = "1.2.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/xine/xine-lib-${version}.tar.xz";
|
||||
sha256 = "sha256-71GyHRDdoQRfp9cRvZFxz9rwpaKHQjO88W/98o7AcAU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with libcaca 0.99.beta20 ; remove for xine-lib 1.2.12
|
||||
(fetchpatch {
|
||||
name = "xine-lib-libcaca-0.99.beta20-fix.patch";
|
||||
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/209ae10d59d29c13633b75aa327cf937f3ff0725/trunk/010-xine-lib-libcaca-0.99.beta20-fix.patch";
|
||||
sha256 = "088141x1yp84y09x3s01v21yzas2bwavxz9v30z5hyq6c3syrmgr";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
pkg-config
|
||||
perl
|
||||
];
|
||||
buildInputs = [
|
||||
aalib
|
||||
alsa-lib
|
||||
ffmpeg_4 # xine-lib 1.2.12 should support ffmpeg_5
|
||||
flac
|
||||
libGL
|
||||
libGLU
|
||||
libcaca
|
||||
libcdio
|
||||
libmng
|
||||
libmpcdec
|
||||
libpulseaudio
|
||||
libtheora
|
||||
libv4l
|
||||
libvorbis
|
||||
ncurses
|
||||
perl
|
||||
speex
|
||||
vcdimager
|
||||
zlib
|
||||
] ++ (with xorg; [
|
||||
libX11
|
||||
libXext
|
||||
libXinerama
|
||||
libXv
|
||||
libxcb
|
||||
]);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
NIX_LDFLAGS = "-lxcb-shm";
|
||||
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://xine.sourceforge.net/";
|
||||
description = "A high-performance, portable and reusable multimedia playback engine";
|
||||
license = with licenses; [ gpl2Plus lgpl2Plus ];
|
||||
maintainers = with maintainers; [ AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.47.0";
|
||||
version = "3.48.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
|||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
hash = "sha256-42YG+brxKCo16xp72+EhmCkgABC2BAFYNWTKqTT1jeE=";
|
||||
hash = "sha256-wc8TC1IoeeeANlQILFeXUx9jJqpn1Mr3KNhJC6ZJAhU=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "chess";
|
||||
version = "1.9.4";
|
||||
version = "1.10.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -16,7 +16,7 @@ buildPythonPackage rec {
|
|||
owner = "niklasf";
|
||||
repo = "python-${pname}";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-YBABB//53gwJIwrmKJh8W+05hTBhl+49vCYv9//4E+0=";
|
||||
hash = "sha256-jfPg1W9Qp0DlAbMXaFqZ6Ri2zMOW6EKUHwi7Azn/yl0=";
|
||||
};
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "2.5.0";
|
||||
version = "2.6.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-K4quPZZnHqZkuR8moJ8TwmfHQ3BennoByZ5XW5X5rDA=";
|
||||
hash = "sha256-Tqo2dhTes/HHhWqBZkJ9qW8i6FGWRx1Uk+0Q3pwsD+M=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-objects";
|
||||
version = "0.23.1";
|
||||
version = "0.24.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -25,7 +25,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-EVhzVzgShqFbQvZD4KEw+sDWE473DMM1HyDj2okMxuk=";
|
||||
hash = "sha256-yaKrG+PXrS9wwQcpEYGAGFp+xRYbhiWFE8PxUEXG52Y=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvclive";
|
||||
version = "2.12.1";
|
||||
version = "2.13.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -23,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-0J3XLBfH8kpIAyAnMhbS6d4vW3vtlbhCKIuaNsLZACg=";
|
||||
hash = "sha256-5tvwIa2kx5MlMZV6J+NqN9v/TjOeZC6wftO102/QbCk=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
42
pkgs/development/python-modules/gptcache/default.nix
Normal file
42
pkgs/development/python-modules/gptcache/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, cachetools
|
||||
, numpy
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gptcache";
|
||||
version = "0.1.37";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zilliztech";
|
||||
repo = "GPTCache";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-eQu3O6jPL1BRObA99XA2EOznn9NaArVRouqD1Ypz/4w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cachetools
|
||||
numpy
|
||||
requests
|
||||
];
|
||||
|
||||
# many tests require network access and complicated dependencies
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "gptcache" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Semantic cache for LLMs and fully integrated with LangChain and llama_index";
|
||||
homepage = "https://github.com/zilliztech/GPTCache";
|
||||
changelog = "https://github.com/zilliztech/GPTCache/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
80
pkgs/development/python-modules/guidance/default.nix
Normal file
80
pkgs/development/python-modules/guidance/default.nix
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, aiohttp
|
||||
, diskcache
|
||||
, gptcache
|
||||
, msal
|
||||
, nest-asyncio
|
||||
, numpy
|
||||
, openai
|
||||
, platformdirs
|
||||
, pygtrie
|
||||
, pyparsing
|
||||
, requests
|
||||
, tiktoken
|
||||
, torch
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "guidance";
|
||||
version = "0.0.64";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "microsoft";
|
||||
repo = "guidance";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-tQpDJprxctKI88F+CZ9aSJbVo7tjmI4+VrI+WO4QlxE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
diskcache
|
||||
gptcache
|
||||
msal
|
||||
nest-asyncio
|
||||
numpy
|
||||
openai
|
||||
platformdirs
|
||||
pygtrie
|
||||
pyparsing
|
||||
requests
|
||||
tiktoken
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
torch
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# require network access
|
||||
"test_each_parallel_with_gen_openai"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# require network access
|
||||
"tests/library/test_gen.py"
|
||||
"tests/library/test_include.py"
|
||||
"tests/library/test_select.py"
|
||||
"tests/llms/test_openai.py"
|
||||
"tests/llms/test_transformers.py"
|
||||
"tests/test_program.py"
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "guidance" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A guidance language for controlling large language models";
|
||||
homepage = "https://github.com/microsoft/guidance";
|
||||
changelog = "https://github.com/microsoft/guidance/releases/tag/${src.rev}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
}
|
||||
|
|
@ -2,11 +2,13 @@
|
|||
, babel
|
||||
, buildPythonPackage
|
||||
, click
|
||||
, deprecated
|
||||
, exifread
|
||||
, fetchFromGitHub
|
||||
, fetchNpmDeps
|
||||
, filetype
|
||||
, flask
|
||||
, hatch-vcs
|
||||
, hatchling
|
||||
, importlib-metadata
|
||||
, inifile
|
||||
, jinja2
|
||||
|
|
@ -14,8 +16,10 @@
|
|||
, marshmallow
|
||||
, marshmallow-dataclass
|
||||
, mistune
|
||||
, nodejs
|
||||
, npmHooks
|
||||
, pillow
|
||||
, pip
|
||||
, pyopenssl
|
||||
, pytest-click
|
||||
, pytest-mock
|
||||
, pytest-pylint
|
||||
|
|
@ -25,15 +29,13 @@
|
|||
, python-slugify
|
||||
, pytz
|
||||
, requests
|
||||
, setuptools
|
||||
, typing-inspect
|
||||
, watchdog
|
||||
, watchfiles
|
||||
, werkzeug
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lektor";
|
||||
version = "3.4.0b4";
|
||||
version = "3.4.0b8";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -42,13 +44,28 @@ buildPythonPackage rec {
|
|||
owner = "lektor";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-O0bTmJqRymrQuHW19Y7/Kp+2XlbmDzcjl/jDACDlCSk=";
|
||||
hash = "sha256-FtmRW4AS11zAX2jvGY8XTsPrN3mhHkIWoFY7sXmqG/U=";
|
||||
};
|
||||
|
||||
npmDeps = fetchNpmDeps {
|
||||
src = "${src}/frontend";
|
||||
hash = "sha256-Z7LP9rrVSzKoLITUarsnRbrhIw7W7TZSZUgV/OT+m0M=";
|
||||
};
|
||||
|
||||
npmRoot = "frontend";
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatch-vcs
|
||||
hatchling
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
];
|
||||
|
||||
env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
babel
|
||||
click
|
||||
deprecated
|
||||
exifread
|
||||
filetype
|
||||
flask
|
||||
|
|
@ -58,17 +75,16 @@ buildPythonPackage rec {
|
|||
marshmallow
|
||||
marshmallow-dataclass
|
||||
mistune
|
||||
pillow
|
||||
pip
|
||||
pyopenssl
|
||||
python-slugify
|
||||
pytz
|
||||
requests
|
||||
setuptools
|
||||
typing-inspect
|
||||
watchdog
|
||||
watchfiles
|
||||
werkzeug
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
pytz
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
|
@ -86,8 +102,11 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
disabledTests = [
|
||||
# Test requires network access
|
||||
# Tests require network access
|
||||
"test_path_installed_plugin_is_none"
|
||||
"test_VirtualEnv_run_pip_install"
|
||||
# expects FHS paths
|
||||
"test_VirtualEnv_executable"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-builder";
|
||||
version = "7.15.1";
|
||||
version = "7.16.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
|
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
|||
owner = "youtype";
|
||||
repo = "mypy_boto3_builder";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-pZBAzy1MK8Mm9QyUM5/t8JKs3q/cYOmzCWRC4H0aWjY=";
|
||||
hash = "sha256-zqiJqjsE54mzN1/NScKeXtRa3Tt3IzSdtnmOxP4meEE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-ebs";
|
||||
version = "1.27.0";
|
||||
version = "1.28.13";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-hBFD5BNZ0OaHwL4iMLPNA916dLUBHTBl2f18/iOPsTs=";
|
||||
hash = "sha256-GhOEPhx4zD5jXyTMH75DOq0UL4LgOMkJn0U5nKciNMI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "mypy-boto3-s3";
|
||||
version = "1.28.8";
|
||||
version = "1.28.12";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-ye0X/uLA4u3rKWazeWr3s0ncxO7uVNvVmiaf25QY61U=";
|
||||
hash = "sha256-fVSwPgvXLMH+aQ79zp7qyeKFXfuvoVOQoPUYyunigNI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, flit-core
|
||||
, importlib-metadata
|
||||
, ipython
|
||||
|
|
@ -30,6 +31,27 @@ buildPythonPackage rec {
|
|||
hash = "sha256-D2E4ZRX6sHxzZGrcqX//L2n0HpDTE6JgIXxbvkGdhYs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix compatiblity with myst-parser 1.0. Remove with the next release.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/executablebooks/MyST-NB/commit/48c45c6a8c4501005766c2d821b5e9ddfbedd5fa.patch";
|
||||
hash = "sha256-jGL2MjZArvPtbiaR/rRGCIi0QwYO0iTIK26GLuTrBM8=";
|
||||
excludes = [
|
||||
"myst_nb/__init__.py"
|
||||
"docs/authoring/custom-formats.Rmd"
|
||||
"docs/authoring/jupyter-notebooks.md"
|
||||
"docs/index.md"
|
||||
"pyproject.toml"
|
||||
"tests/nb_fixtures/reporter_warnings.txt"
|
||||
];
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace "myst-parser~=0.18.0" "myst-parser"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
flit-core
|
||||
pythonRelaxDepsHook
|
||||
|
|
@ -53,7 +75,10 @@ buildPythonPackage rec {
|
|||
"myst-parser"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "myst_nb" ];
|
||||
pythonImportsCheck = [
|
||||
"myst_nb"
|
||||
"myst_nb.sphinx_ext"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Jupyter Notebook Sphinx reader built on top of the MyST markdown parser";
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nclib";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-rA8oeYvMhw8HURxPLBRqpMHnAez/xBjyPFoKXIIvBjg=";
|
||||
hash = "sha256-26KjYMxJMj5ANb2ej9hVl689sAcGHp89QUkH2xiLhZk=";
|
||||
};
|
||||
|
||||
# Project has no tests
|
||||
|
|
|
|||
|
|
@ -17,13 +17,15 @@ let
|
|||
version = "1.18.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# to avoid breakage, every package in opentelemetry-python must inherit this version, src, and meta
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python";
|
||||
rev = "refs/tags/v${self.version}";
|
||||
hash = "sha256-h6XDzM29wYiC51S7OpBXvWFCfZ7DmIyGMG2pFjJV7pI=";
|
||||
sparseCheckout = [ "/${self.pname}" ];
|
||||
} + "/${self.pname}";
|
||||
hash = "sha256-8xf4TqEkBeueejQBckFGwBNN4Gyo+/7/my6Z1Mnei5Q=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/opentelemetry-api";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -55,10 +57,11 @@ let
|
|||
passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://opentelemetry.io";
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-api";
|
||||
description = "OpenTelemetry Python API";
|
||||
changelog = "https://github.com/open-telemetry/opentelemetry-python/releases/tag/${self.src.rev}";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
maintainers = teams.deshaw.members ++ [ maintainers.natsukium ];
|
||||
};
|
||||
};
|
||||
in self
|
||||
|
|
|
|||
|
|
@ -1,26 +1,20 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, opentelemetry-proto
|
||||
, opentelemetry-sdk
|
||||
, opentelemetry-test-utils
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-exporter-otlp-proto-common";
|
||||
version = "1.18.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HNlkbDyYnr0/lDeY1xt0pRxqk+977ljgPdfJzAxL3AQ=";
|
||||
sparseCheckout = [ "/exporter/${pname}" ];
|
||||
} + "/exporter/${pname}";
|
||||
sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-common";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -40,10 +34,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.common" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = opentelemetry-api.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-common";
|
||||
description = "OpenTelemetry Protobuf encoding";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,23 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, backoff
|
||||
, googleapis-common-protos
|
||||
, grpcio
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, opentelemetry-test-utils
|
||||
, opentelemetry-exporter-otlp-proto-common
|
||||
, pytest-grpc
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-exporter-otlp-proto-grpc";
|
||||
version = "1.18.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-feAmPL/G3ABIY5tBODlMJIBzxqg6Bl7imJB2EYtEp2o=";
|
||||
sparseCheckout = [ "/exporter/${pname}" ];
|
||||
} + "/exporter/${pname}";
|
||||
sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-grpc";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -49,10 +43,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.grpc" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = opentelemetry-api.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-grpc";
|
||||
description = "OpenTelemetry Collector Protobuf over gRPC Exporter";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, backoff
|
||||
, googleapis-common-protos
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, opentelemetry-exporter-otlp-proto-common
|
||||
, opentelemetry-test-utils
|
||||
, requests
|
||||
|
|
@ -12,18 +12,12 @@
|
|||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-exporter-otlp-proto-http";
|
||||
version = "1.18.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-r4jvIhRM9E4CuZyS/XvvYO+F9cPxip8ab57CUfip47Q=";
|
||||
sparseCheckout = [ "/exporter/${pname}" ];
|
||||
} + "/exporter/${pname}";
|
||||
sourceRoot = "source/exporter/opentelemetry-exporter-otlp-proto-http";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -46,10 +40,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.exporter.otlp.proto.http" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = opentelemetry-api.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp-proto-http";
|
||||
description = "OpenTelemetry Collector Protobuf over HTTP Exporter";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,26 +1,20 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, backoff
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, opentelemetry-exporter-otlp-proto-grpc
|
||||
, opentelemetry-exporter-otlp-proto-http
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-exporter-otlp";
|
||||
version = "1.18.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ph9ahT6M8UBvuUJjk6nug68Ou/D7XuuXkfnKHEdD8x8=";
|
||||
sparseCheckout = [ "/exporter/${pname}" ];
|
||||
} + "/exporter/${pname}";
|
||||
sourceRoot = "source/exporter/opentelemetry-exporter-otlp";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -39,10 +33,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.exporter.otlp" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = opentelemetry-api.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-otlp";
|
||||
description = "OpenTelemetry Collector Exporters";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, opentelemetry-sdk
|
||||
|
|
@ -10,18 +9,12 @@
|
|||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-exporter-prometheus";
|
||||
version = "1.18.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-vWVLUt3Ett04kqUyoTOBNvRj51/M35X83saBBxeOTZI=";
|
||||
sparseCheckout = [ "/exporter/${pname}" ];
|
||||
} + "/exporter/${pname}";
|
||||
sourceRoot = "source/exporter/opentelemetry-exporter-prometheus";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -42,10 +35,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.exporter.prometheus" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = opentelemetry-api.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/exporter/opentelemetry-exporter-prometheus";
|
||||
description = "Prometheus Metric Exporter for OpenTelemetry";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, opentelemetry-instrumentation
|
||||
|
|
@ -12,21 +11,13 @@
|
|||
, pytestCheckHook
|
||||
, aiohttp
|
||||
}:
|
||||
let
|
||||
pname = "opentelemetry-instrumentation-aiohttp-client";
|
||||
version = "0.39b0";
|
||||
in
|
||||
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-instrumentation-aiohttp-client";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python-contrib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-HFDebR3d1osFAIlNuIbs5s+uPeTTJ1xkz+BpE5BpciU=";
|
||||
sparseCheckout = [ "/instrumentation/${pname}" ];
|
||||
} + "/instrumentation/${pname}";
|
||||
sourceRoot = "source/instrumentation/opentelemetry-instrumentation-aiohttp-client";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -54,10 +45,8 @@ buildPythonPackage {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.instrumentation.aiohttp_client" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = opentelemetry-instrumentation.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-aiohttp-client";
|
||||
description = "OpenTelemetry Instrumentation for aiohttp-client";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, asgiref
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
|
|
@ -12,18 +11,12 @@
|
|||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-instrumentation-asgi";
|
||||
version = "0.39b0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python-contrib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-BfNrbOQwyApdcKOVGF0LqzWOxzLkHZYiYdYVVPkGmdQ=";
|
||||
sparseCheckout = [ "/instrumentation/${pname}" ];
|
||||
} + "/instrumentation/${pname}";
|
||||
sourceRoot = "source/instrumentation/opentelemetry-instrumentation-asgi";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -46,10 +39,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.instrumentation.asgi" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = opentelemetry-instrumentation.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-asgi";
|
||||
description = "ASGI instrumentation for OpenTelemetry";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, django
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
|
|
@ -14,18 +13,12 @@
|
|||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-instrumentation-django";
|
||||
version = "0.39b0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python-contrib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5tyLFQTYuJBFAFZirqsaHXCw72Q3TigDctZZFi/2zdI=";
|
||||
sparseCheckout = [ "/instrumentation/${pname}" ];
|
||||
} + "/instrumentation/${pname}";
|
||||
sourceRoot = "source/instrumentation/opentelemetry-instrumentation-django";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -50,10 +43,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.instrumentation.django" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = opentelemetry-instrumentation.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-django";
|
||||
description = "OpenTelemetry Instrumentation for Django";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, opentelemetry-instrumentation
|
||||
|
|
@ -13,18 +12,12 @@
|
|||
, grpcio
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-instrumentation-grpc";
|
||||
version = "0.39b0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python-contrib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DkDAE0MsF9HdywxlFzqJaqNor4O/jpnSqINsKTuiVqU=";
|
||||
sparseCheckout = [ "/instrumentation/${pname}" ];
|
||||
} + "/instrumentation/${pname}";
|
||||
sourceRoot = "source/instrumentation/opentelemetry-instrumentation-grpc";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -52,10 +45,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.instrumentation.grpc" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = opentelemetry-instrumentation.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-grpc";
|
||||
description = "OpenTelemetry Instrumentation for grpc";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, opentelemetry-instrumentation
|
||||
|
|
@ -11,18 +10,12 @@
|
|||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-instrumentation-wsgi";
|
||||
version = "0.39b0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python-contrib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DBZGXY8Y208YC/guk0qUB04UA/JFAtiv3kjsikskTRs=";
|
||||
sparseCheckout = [ "/instrumentation/${pname}" ];
|
||||
} + "/instrumentation/${pname}";
|
||||
sourceRoot = "source/instrumentation/opentelemetry-instrumentation-wsgi";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -44,10 +37,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.instrumentation.wsgi" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = opentelemetry-instrumentation.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-wsgi";
|
||||
description = "WSGI Middleware for OpenTelemetry";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,15 @@ buildPythonPackage rec {
|
|||
version = "0.39b0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# to avoid breakage, every package in opentelemetry-python-contrib must inherit this version, src, and meta
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python-contrib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+zk76A640nyd1L0I55JrMMs7EnQ+SPQdYGAFIyQFc6E=";
|
||||
sparseCheckout = [ "/${pname}" ];
|
||||
} + "/${pname}";
|
||||
hash = "sha256-MPBOdurEQhA9BPRgVftejjtkvN/zRQEJDjQcS2QW3xc=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/opentelemetry-instrumentation";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -47,7 +49,8 @@ buildPythonPackage rec {
|
|||
meta = with lib; {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/opentelemetry-instrumentation";
|
||||
description = "Instrumentation Tools & Auto Instrumentation for OpenTelemetry Python";
|
||||
changelog = "https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/${src.rev}";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
maintainers = teams.deshaw.members ++ [ maintainers.natsukium ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,18 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, protobuf
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-proto";
|
||||
version = "1.18.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6iB+QlBUqRvIJ9p38NYgP4icW2rYs1P3bNCxI95cOvs=";
|
||||
sparseCheckout = [ "/${pname}" ];
|
||||
} + "/${pname}";
|
||||
sourceRoot = "source/opentelemetry-proto";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -36,10 +30,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.proto" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = opentelemetry-api.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-proto";
|
||||
description = "OpenTelemetry Python Proto";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, flaky
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
|
|
@ -14,17 +13,11 @@
|
|||
|
||||
let
|
||||
self = buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-sdk";
|
||||
version = "1.18.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python";
|
||||
rev = "refs/tags/v${self.version}";
|
||||
hash = "sha256-YMFSmzuvm/VA9Fpe7pbF9mnGQHOQpobWMb1iGRt+d3w=";
|
||||
sparseCheckout = [ "/${self.pname}" ];
|
||||
} + "/${self.pname}";
|
||||
sourceRoot = "source/opentelemetry-sdk";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -56,11 +49,9 @@ let
|
|||
# Enable tests via passthru to avoid cyclic dependency with opentelemetry-test-utils.
|
||||
passthru.tests.${self.pname} = self.overridePythonAttrs { doCheck = true; };
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://opentelemetry.io";
|
||||
description = "OpenTelemetry Python API and SDK";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
meta = opentelemetry-api.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-sdk";
|
||||
description = "OpenTelemetry Python SDK";
|
||||
};
|
||||
};
|
||||
in self
|
||||
|
|
|
|||
|
|
@ -1,23 +1,17 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-semantic-conventions";
|
||||
version = "1.18.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-82L/tDoWgu0r+Li3CS3hjVR99DQQmA5yt3y85+37imI=";
|
||||
sparseCheckout = [ "/${pname}" ];
|
||||
} + "/${pname}";
|
||||
sourceRoot = "source/opentelemetry-semantic-conventions";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -31,10 +25,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.semconv" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = opentelemetry-api.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/opentelemetry-semantic-conventions";
|
||||
description = "OpenTelemetry Semantic Conventions";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,25 +2,18 @@
|
|||
, callPackage
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, asgiref
|
||||
, hatchling
|
||||
, opentelemetry-api
|
||||
, opentelemetry-sdk
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-api) version src;
|
||||
pname = "opentelemetry-test-utils";
|
||||
version = "1.18.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-WRcKTE3eVqOSQUi5gZ3du+RGw8CrMazXHrctdrjgzHo=";
|
||||
sparseCheckout = [ "/tests/${pname}" ];
|
||||
} + "/tests/${pname}";
|
||||
sourceRoot = "source/tests/opentelemetry-test-utils";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -36,10 +29,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.test" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = opentelemetry-api.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python/tree/main/tests/opentelemetry-test-utils";
|
||||
description = "Test utilities for OpenTelemetry unit tests";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, hatchling
|
||||
, opentelemetry-instrumentation
|
||||
, opentelemetry-sdk
|
||||
|
|
@ -10,18 +9,12 @@
|
|||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-util-http";
|
||||
version = "0.39b0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "open-telemetry";
|
||||
repo = "opentelemetry-python-contrib";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-C20/M5wimQec/8tTKx7+jkIYgfgNPtU9lkPKliIM3Uk=";
|
||||
sparseCheckout = [ "/util/${pname}" ];
|
||||
} + "/util/${pname}";
|
||||
sourceRoot = "source/util/opentelemetry-util-http";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
|
|
@ -42,10 +35,8 @@ buildPythonPackage rec {
|
|||
|
||||
pythonImportsCheck = [ "opentelemetry.util.http" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = opentelemetry-instrumentation.meta // {
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/util/opentelemetry-util-http";
|
||||
description = "Web util for OpenTelemetry";
|
||||
license = licenses.asl20;
|
||||
maintainers = teams.deshaw.members;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,16 +16,16 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pgvector";
|
||||
version = "0.1.8";
|
||||
version = "0.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgvector";
|
||||
repo = "pgvector-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-+0daPPZGVkqfZw0gOZwIl+knL/zZki9fs5kA3dYqPpE=";
|
||||
hash = "sha256-VcV/WyDY1UN2TcuvNRQRIh5YIlewGQXf6fcTZihvftQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plaid-python";
|
||||
version = "15.1.0";
|
||||
version = "15.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BFouiIBQ2HwZ+7Qp2ULam3DW/pwsxIkOejLtTelhWd4=";
|
||||
hash = "sha256-NJCU82Q19X1fApYcbP+ZAxf76uwAnSnhch4aBer9Nm4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "plugwise";
|
||||
version = "0.31.8";
|
||||
version = "0.31.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -29,7 +29,7 @@ buildPythonPackage rec {
|
|||
owner = pname;
|
||||
repo = "python-plugwise";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-glC/2bpjw0SKE6EezWLk9a4otBU21JSxsbIE5/LBGnY=";
|
||||
hash = "sha256-IRetWNKVzWsrHOphdgV5xmdiubwDx8KOUA7x+BmTt9A=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.3.6";
|
||||
version = "0.3.7";
|
||||
pname = "potentials";
|
||||
format = "setuptools";
|
||||
|
||||
|
|
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-VEPGa3Wp+B3KterfA5XGjaDf6sIAkSST0GWdeqaJcE0=";
|
||||
hash = "sha256-vkrNVRf9ntYSpf8nXmAmGjc+sQ4iFllisYHd9s+uQv0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -9,14 +9,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ppft";
|
||||
version = "1.7.6.6";
|
||||
version = "1.7.6.7";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-+TPwQE8+gIvIYHRayzt5zU/jHqGaIIiaZF+QBBW+YPE=";
|
||||
hash = "sha256-qzRDaBTi8YI481aI/YabJkGy0tjcoiuNJG9nAd/JVMg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -23,14 +23,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "PyQt6";
|
||||
version = "6.5.1";
|
||||
version = "6.5.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-4WagVownvMjbACcaUEOTYiZpC2pKdM4KXK60CAQKl8M=";
|
||||
hash = "sha256-FIfuc1D5/7ZtYKtBdlGSUsKzcXYsvo+DQP2VH2OAEoA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
|||
|
|
@ -10,15 +10,15 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "smart-meter-texas";
|
||||
version = "0.5.1";
|
||||
version = "0.5.3";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grahamwetzler";
|
||||
repo = "smart-meter-texas";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-rjMRV5MekwRkipes2nWos/1zi3sD+Ls8LyD3+t5FOZc=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8htd5fLrtkaVlSEm+RB7tWA5YZkcAOjAXVNzZiMwP7k=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-basic-ng";
|
||||
version = "1.0.0.beta1";
|
||||
version = "1.0.0.beta2";
|
||||
disable = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pradyunsg";
|
||||
repo = "sphinx-basic-ng";
|
||||
rev = version;
|
||||
hash = "sha256-Zh9KvKs4js+AVSfIk0pAj6Kzq/O2m/MGTF+HCwYJTXk=";
|
||||
hash = "sha256-MHBGIKOKhGklrx3O075LRud8NhY2hzlTWh+jalrFpko=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "sqlalchemy-mixins";
|
||||
version = "2.0.3";
|
||||
version = "2.0.4.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "absent1706";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-DOQlG86VJEV1Eqqo+KLwmRo2tNePq+Na05s1eDhBjcQ=";
|
||||
hash = "sha256-soashrkokHveEI9YXAAPBPHydhoToJhCHx+g7bunhLE=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "yabadaba";
|
||||
version = "0.2.0";
|
||||
version = "0.2.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "usnistgov";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-PXmkRbCFag2WAtodwgb3kX+hRDZdCKKi/YwAMSQePxQ=";
|
||||
hash = "sha256-D3dzO+vhf1utBMmX2RUgvxuaPneFnXDseqfz6CMDmv4=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -128,6 +128,7 @@ gem 'rspec'
|
|||
gem 'rubocop'
|
||||
gem 'rubocop-performance'
|
||||
gem 'ruby-libvirt'
|
||||
gem 'ruby-lsp'
|
||||
gem 'ruby-lxc'
|
||||
gem 'ruby-progressbar'
|
||||
gem 'ruby-terminfo'
|
||||
|
|
|
|||
|
|
@ -5,16 +5,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "api-linter";
|
||||
version = "1.54.1";
|
||||
version = "1.55.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "googleapis";
|
||||
repo = "api-linter";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Z3VhjBI1WYLs3uEONgbItkqUX8P5ZTZ84B1YC6hPgu8=";
|
||||
hash = "sha256-aywqb//fhygphjX3suVfqNIG0saPPnhgLPA/DBpSVQY=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-EXmS3ys5uFY+7vv22+a/82V2RjTaEMas8SFOXwSS9qY=";
|
||||
vendorHash = "sha256-oK1d9aQ43Zj+Xt4tMhn+Lz1Q09psqqdTUqbgEdkuBvg=";
|
||||
|
||||
subPackages = [ "cmd/api-linter" ];
|
||||
|
||||
|
|
@ -23,7 +23,7 @@ buildGoModule rec {
|
|||
"-w"
|
||||
];
|
||||
|
||||
# reference: https://github.com/googleapis/api-linter/blob/v1.54.1/.github/workflows/release.yaml#L76
|
||||
# reference: https://github.com/googleapis/api-linter/blob/v1.55.0/.github/workflows/release.yaml#L76
|
||||
preBuild = ''
|
||||
cat > cmd/api-linter/version.go <<EOF
|
||||
package main
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@
|
|||
}:
|
||||
buildDotnetModule rec {
|
||||
pname = "github-runner";
|
||||
version = "2.306.0";
|
||||
version = "2.307.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "actions";
|
||||
repo = "runner";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wffHekmyMIGTpUHBPgcxAOPRoTDuuWJZh9pJly3I2eQ=";
|
||||
hash = "sha256-h/JcOw7p/loBD6aj7NeZyqK3GtapNkjWTYw0G6OCmVQ=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git-revision
|
||||
|
|
|
|||
|
|
@ -1,17 +1,12 @@
|
|||
{ lib, stdenv, makeWrapper, requireFile, unzip, jdk }:
|
||||
|
||||
let
|
||||
version = "22.4.0.342.1212";
|
||||
fileVersion = "1032835-01";
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
||||
inherit version;
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sqlcl";
|
||||
version = "23.2.0.178.1027";
|
||||
|
||||
src = requireFile rec {
|
||||
url = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/download/";
|
||||
name = "V${fileVersion}.zip";
|
||||
name = "sqlcl-${version}.zip";
|
||||
message = ''
|
||||
This Nix expression requires that ${name} already be part of the store. To
|
||||
obtain it you need to
|
||||
|
|
@ -37,7 +32,7 @@ in
|
|||
|
||||
nix-prefetch-url --type sha256 file:///path/to/${name}
|
||||
'';
|
||||
sha256 = "0i4xsj502s465fgmlcqn80r8rqzr11mv74x9fzrlbqmkkh5c782k";
|
||||
hash = "sha256-wGqLlV88yYJrVblKzeG6VerfsEgCi1JQd49ONZmUB4Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "grpc-gateway";
|
||||
version = "2.16.0";
|
||||
version = "2.16.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grpc-ecosystem";
|
||||
repo = "grpc-gateway";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yoy3wESegXxlyaelex2gqr3GdzwwjxK7YTAzDCILr/c=";
|
||||
sha256 = "sha256-SqHGPfmLBLVniknulTVRM+2lpRuL0n7Vvj+joq/uz0o=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dxzAiLEiZ+2+J9ZrkBemUt+slxz1zUa9Fx0VhUjFdN0=";
|
||||
vendorHash = "sha256-piAJj/B9DfjbwXZR6EAwk36vhJvuiX/IEabdctOtwy8=";
|
||||
|
||||
meta = with lib; {
|
||||
description =
|
||||
|
|
|
|||
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "memray";
|
||||
version = "1.8.1";
|
||||
version = "1.9.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bloomberg";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ztoIUYuXfD8Mgj5vIsZnpuF8a5F9Za6xXHKW0Hscz20=";
|
||||
hash = "sha256-fXA98kw+2NlbWTLXWK875t1RBIXH2a0SgS+0OseODKI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -6,16 +6,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "ast-grep";
|
||||
version = "0.9.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ast-grep";
|
||||
repo = "ast-grep";
|
||||
rev = version;
|
||||
hash = "sha256-gAzO5ganbwxarqHGVhAl9PtiHEr89puoPJK+iXtrvyU=";
|
||||
hash = "sha256-s3Z+QbE+Np9Rox0Syir7ag1gJGSxnwpu5kQRmpBOUoA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-SvGxDXC1nN6LitWHGcVieHJpEEuY1omqAvjaJmHPauE=";
|
||||
cargoHash = "sha256-VbMAPBCubst0HDI+pG59KPkwWXOeQNjVMb81ci96rBg=";
|
||||
|
||||
# error: linker `aarch64-linux-gnu-gcc` not found
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -31,9 +31,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# Linux it uses objdump. We don't have dwarfdump packaged for
|
||||
# Darwin, so this patch updates the test to also use objdump on
|
||||
# Darwin.
|
||||
# Additionally, when cross compiling, the correct target prefix
|
||||
# needs to be set.
|
||||
(substituteAll {
|
||||
src = ./force-objdump-on-darwin.patch;
|
||||
objdump = "${binutils.bintools}/bin/objdump";
|
||||
src = ./fix-objdump-path.patch;
|
||||
objdump = "${binutils.bintools}/bin/${binutils.targetPrefix}objdump";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-guppy";
|
||||
version = "unstable-2023-06-26";
|
||||
version = "unstable-2023-07-29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guppy-rs";
|
||||
repo = "guppy";
|
||||
rev = "c05b95997a127cebef76d3b238e0341086e59e32";
|
||||
sha256 = "sha256-CQ0bpc5pmPMQMQ+8mcrUwo19zqyfkk5pE/lWRr9azXs=";
|
||||
rev = "7c7f352d9d2dea1007b4475d4a76f86f061b6ba9";
|
||||
sha256 = "sha256-H2vU7qax0P8Ulh1/DHnlmGRqSqzLuRy9TZOvikSLONw=";
|
||||
};
|
||||
|
||||
cargoSha256 = "sha256-OHtg3za8EyQVYQ6XQzLK7UgvGSl8ObfeKURFL6vBDnE=";
|
||||
cargoSha256 = "sha256-lr7N/qqB1AwhNA+mbEAJFSp/rDxGp3qIGSKP9B3JAls=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-hakari";
|
||||
version = "0.9.26";
|
||||
version = "0.9.27";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guppy-rs";
|
||||
repo = "guppy";
|
||||
rev = "cargo-hakari-${version}";
|
||||
sha256 = "sha256-CQ0bpc5pmPMQMQ+8mcrUwo19zqyfkk5pE/lWRr9azXs=";
|
||||
sha256 = "sha256-H2vU7qax0P8Ulh1/DHnlmGRqSqzLuRy9TZOvikSLONw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-F6+GRn3l849vRVKE1KhLMnxwR5NWu1b78xTxrHi817A=";
|
||||
cargoHash = "sha256-fRaGtQc9CA5A6fQ1yj5zsg1Qv42yIi8ZlIcp4o5cNBU=";
|
||||
|
||||
cargoBuildFlags = [ "-p" "cargo-hakari" ];
|
||||
cargoTestFlags = [ "-p" "cargo-hakari" ];
|
||||
|
|
|
|||
|
|
@ -6,13 +6,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-llvm-cov";
|
||||
version = "0.5.23";
|
||||
version = "0.5.24";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-sAuarLfvgX6qjZV2eum3+wY5gRiCbRSbJUBgFIHd8y0=";
|
||||
sha256 = "sha256-Woayb/SgSCHwYYYezQXsna9N0Jot0/iga+jrOhjsSvc=";
|
||||
};
|
||||
cargoSha256 = "sha256-gGzVQqPHvjERvQV2Yo3wFP7n/w3atuLrHSch1CWui4I=";
|
||||
cargoSha256 = "sha256-8rP/wtDFH7hL3jt/QpWqriRwxlm0E2QvIqbCLiN7ZiM=";
|
||||
|
||||
# skip tests which require llvm-tools-preview
|
||||
checkFlags = [
|
||||
|
|
|
|||
|
|
@ -2,16 +2,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-nextest";
|
||||
version = "0.9.54";
|
||||
version = "0.9.55";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nextest-rs";
|
||||
repo = "nextest";
|
||||
rev = "cargo-nextest-${version}";
|
||||
hash = "sha256-HkDGW91XDoYMfknPg6td51KTYniCfGtGQd3dkzumRpo=";
|
||||
hash = "sha256-RiQf2cbgAif1bGzjqUBcD+XhHApEp9aGOwnrzqGEOZ4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-McL5G/PtdOou17hWLiNTSJEjTh4YpT1GUPjTMAVNxQA=";
|
||||
cargoHash = "sha256-0JSRgsr+9q/K3Pgh/8WXYCnV9DkM5oA8Pw9gJ61ktoM=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security ];
|
||||
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "supabase-cli";
|
||||
version = "1.79.0";
|
||||
version = "1.82.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "supabase";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-Nw5dzWrufGqIFbonRbjWJWeaOMlq+1Fa5jY+DnE/big=";
|
||||
sha256 = "sha256-lxdIwLhyFDKh3Gb2hkbZcamDEf4DdGEWkaizkGod0Eo=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-PcuZx1xg/VyH/cBCUoM6NVph2/HI+k+GHfK5ZLhMRcQ=";
|
||||
vendorSha256 = "sha256-/jYZp0bZUIHUn2Tmbgrpvz3mTQt3rF14wbcvWhEUAzw=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
|
|||
|
|
@ -1,20 +1,28 @@
|
|||
{ lib, stdenv, fetchurl, unzip }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, unzip
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "bootstrap";
|
||||
version = "5.3.0";
|
||||
version = "5.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip";
|
||||
sha256 = "sha256-RUN0HbrDlUt7fMDjSHaIoTyOchSmfsMQZyATZmz2zY0=";
|
||||
url = "https://github.com/twbs/bootstrap/releases/download/v${finalAttrs.version}/bootstrap-${finalAttrs.version}-dist.zip";
|
||||
hash = "sha256-SfxkgJujf07f2vq0ViDhjGgRDCeg32L0RKDHHTWBp6Q=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
dontBuild = true;
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir $out
|
||||
cp -r * $out/
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
|
@ -22,5 +30,4 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://getbootstrap.com/";
|
||||
license = lib.licenses.mit;
|
||||
};
|
||||
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -715,7 +715,7 @@ let
|
|||
MEDIA_PCI_SUPPORT = yes;
|
||||
MEDIA_USB_SUPPORT = yes;
|
||||
MEDIA_ANALOG_TV_SUPPORT = yes;
|
||||
VIDEO_STK1160_COMMON = module;
|
||||
VIDEO_STK1160_COMMON = whenOlder "6.5" module;
|
||||
};
|
||||
|
||||
"9p" = {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
with lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "6.4-rc7";
|
||||
version = "6.5-rc3";
|
||||
extraMeta.branch = lib.versions.majorMinor version;
|
||||
|
||||
# modDirVersion needs to be x.y.z, will always add .0
|
||||
|
|
@ -11,7 +11,7 @@ buildLinux (args // rec {
|
|||
|
||||
src = fetchzip {
|
||||
url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
|
||||
hash = "sha256-UDhLrKe8yMvmWbS19Xt1G3SQpAUWyKrfV3v1MJ5Vep8=";
|
||||
hash = "sha256-z4y4eNkY458rxebey3eCG0CUDLJP9oQETVlH8Av3Lhs=";
|
||||
};
|
||||
|
||||
# Should the testing kernels ever be built on Hydra?
|
||||
|
|
|
|||
|
|
@ -82,6 +82,9 @@
|
|||
, bpftools
|
||||
, libbpf
|
||||
|
||||
# Needed to produce a ukify that works for cross compiling UKIs.
|
||||
, targetPackages
|
||||
|
||||
, withAcl ? true
|
||||
, withAnalyze ? true
|
||||
, withApparmor ? true
|
||||
|
|
@ -235,6 +238,16 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
# BPF does not work with stack protector
|
||||
substituteInPlace src/core/bpf/meson.build \
|
||||
--replace "clang_flags = [" "clang_flags = [ '-fno-stack-protector',"
|
||||
'' + lib.optionalString withUkify ''
|
||||
substituteInPlace src/ukify/ukify.py \
|
||||
--replace \
|
||||
"'readelf'" \
|
||||
"'${targetPackages.stdenv.cc.bintools.targetPrefix}readelf'"
|
||||
# The objcopy dependency is removed in v254
|
||||
substituteInPlace src/ukify/ukify.py \
|
||||
--replace \
|
||||
"'objcopy'" \
|
||||
"'${targetPackages.stdenv.cc.bintools.targetPrefix}objcopy'"
|
||||
'' + (
|
||||
let
|
||||
# The following patches references to dynamic libraries to ensure that
|
||||
|
|
@ -724,6 +737,11 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
done
|
||||
'' + lib.optionalString withEfi ''
|
||||
mv $out/dont-strip-me $out/lib/systemd/boot/efi
|
||||
'' + lib.optionalString withUkify ''
|
||||
# To cross compile a derivation that builds a UKI with ukify, we need to wrap
|
||||
# ukify with the correct binutils. When wrapping, no splicing happens so we
|
||||
# have to explicitly pull binutils from targetPackages.
|
||||
wrapProgram $out/lib/systemd/ukify --set PATH ${lib.makeBinPath [ targetPackages.stdenv.cc.bintools ] }
|
||||
'';
|
||||
|
||||
disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform)
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue