Merge remote-tracking branch 'origin/master' into haskell-updates

This commit is contained in:
sternenseemann 2022-10-30 16:51:14 +01:00
commit 84e79e1148
75 changed files with 528 additions and 251 deletions

View File

@ -25,6 +25,7 @@ in {
default = {
homeserver = {
address = "http://localhost:8008";
software = "standard";
};
appservice = rec {

View File

@ -112,7 +112,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }:
enable = true;
role = "agent";
serverAddr = "https://192.168.1.3:6443";
extraFlags = lib.toString [
extraFlags = lib.concatStringsSep " " [
"--pause-image" "test.local/pause:local"
"--node-ip" "192.168.1.2"
];
@ -138,12 +138,15 @@ import ../make-test-python.nix ({ pkgs, lib, ... }:
m.start()
m.wait_for_unit("k3s")
is_aarch64 = "${toString pkgs.stdenv.isAarch64}" == "1"
# wait for the agent to show up
server.wait_until_succeeds("k3s kubectl get node agent")
for m in machines:
'' # Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)"
+ lib.optionalString (!pkgs.stdenv.isAarch64) ''m.succeed("k3s check-config")'' + ''
# Fix-Me: Tests fail for 'aarch64-linux' as: "CONFIG_CGROUP_FREEZER: missing (fail)"
if not is_aarch64:
m.succeed("k3s check-config")
m.succeed(
"${pauseImage} | k3s ctr image import -"
)

View File

@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchurl, cmake, pkg-config, xlibsWrapper
{ lib, mkDerivation, fetchurl, cmake, pkg-config
, qtbase, qttools, qtmultimedia, qtx11extras
# transports
, curl, libmms
@ -40,7 +40,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake pkg-config ];
buildInputs =
[ # basic requirements
qtbase qttools qtmultimedia qtx11extras xlibsWrapper
qtbase qttools qtmultimedia qtx11extras
# transports
curl libmms
# input plugins

View File

@ -2,7 +2,8 @@
, lib
, fetchFromSourcehut
, cmake
, wxGTK
, wxGTK31
, gtk3
, pkg-config
, python3
, gettext
@ -123,8 +124,8 @@ stdenv.mkDerivation rec {
sratom
suil
twolame
wxGTK
wxGTK.gtk
wxGTK31
gtk3
] ++ lib.optionals stdenv.isLinux [
at-spi2-core
dbus

View File

@ -26,11 +26,11 @@
with lib;
stdenv.mkDerivation rec {
pname = if withGui then "bitcoin-knots" else "bitcoind-knots";
version = "22.0.knots20211108";
version = "23.0.knots20220529";
src = fetchurl {
url = "https://bitcoinknots.org/files/22.x/${version}/guix/bitcoin-${version}.tar.gz";
sha256 = "04sqbx4sp3bzwbl8z53nz96n3s0590h327ih0mbgyvfvl3b8pj4i";
url = "https://bitcoinknots.org/files/23.x/${version}/bitcoin-${version}.tar.gz";
sha256 = "0c6l4bvj4ck8gp5vm4dla3l32swsp6ijk12fyf330wgry4mhqxyi";
};
nativeBuildInputs =

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK31-gtk3, gtk3
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, file, zip, wxGTK31, gtk3
, contribPlugins ? false, hunspell, gamin, boost, wrapGAppsHook
}:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config file zip wrapGAppsHook ];
buildInputs = [ wxGTK31-gtk3 gtk3 ]
buildInputs = [ wxGTK31 gtk3 ]
++ optionals contribPlugins [ hunspell gamin boost ];
enableParallelBuilding = true;
patches = [

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, xlibsWrapper, motif, libXpm }:
{ lib, stdenv, fetchurl, motif, libXpm, libXt }:
stdenv.mkDerivation rec {
pname = "nedit";
@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
nativeBuildInputs = [ xlibsWrapper ];
buildInputs = [ motif libXpm ];
buildInputs = [ motif libXpm libXt ];
# the linux config works fine on darwin too!
buildFlags = lib.optional (stdenv.isLinux || stdenv.isDarwin) "linux";

View File

@ -1,4 +1,18 @@
{ lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, xcbutil, gcc, intltool, file, libpng }:
{ lib
, stdenv
, fetchurl
, fox
, fontconfig
, freetype
, pkg-config
, gettext
, xcbutil
, gcc
, intltool
, file
, libpng
, xorg
}:
stdenv.mkDerivation rec {
pname = "xfe";
@ -10,7 +24,18 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ fox gettext xlibsWrapper xcbutil gcc file libpng ];
buildInputs = [
fox
gettext
xcbutil
gcc
file
libpng
fontconfig
freetype
xorg.libX11
xorg.libXft
];
preConfigure = ''
sed -i s,/usr/share/xfe,$out/share/xfe, src/xfedefs.h

View File

@ -7,7 +7,7 @@
, pkg-config
# not native
, gdal
, wxGTK31-gtk3
, wxGTK31
, proj
, dxflib
, curl
@ -56,7 +56,7 @@ mkDerivation rec {
libsvm
hdf5
gdal
wxGTK31-gtk3
wxGTK31
proj
libharu
opencv

View File

@ -28,11 +28,11 @@ let
in
stdenv.mkDerivation rec {
pname = "blender";
version = "3.3.0";
version = "3.3.1";
src = fetchurl {
url = "https://download.blender.org/source/${pname}-${version}.tar.xz";
hash = "sha256-IsUaTmY4XLFIGKpNdtz3+m1uEDr7DTaRbhLqFZiNIfA=";
hash = "sha256-KtpI8L+KDKgCuYfXV0UgEuH48krPTSNFOwnC1ZURjMo=";
};
patches = lib.optional stdenv.isDarwin ./darwin.patch;

View File

@ -1,4 +1,11 @@
{ lib, stdenv, fetchFromGitHub, imake, gccmakedep, xlibsWrapper }:
{ lib
, stdenv
, fetchFromGitHub
, imake
, gccmakedep
, libX11
, libXext
}:
stdenv.mkDerivation rec {
version_name = "1.2.hanami.6";
@ -11,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "0vx12v5fm8ar3f1g6jbpmd3b1q652d32nc67ahkf28djbqjgcbnc";
};
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ xlibsWrapper ];
buildInputs = [ libX11 libXext ];
makeFlags = [ "BINDIR=$(out)/bin" "MANPATH=$(out)/share/man" ];
installTargets = [ "install" "install.man" ];

View File

@ -28,13 +28,13 @@
, qhull
, systemd
, tbb
, wxGTK31-gtk3
, wxGTK31
, xorg
, fetchpatch
, wxGTK31-gtk3-override ? null
, wxGTK31-override ? null
}:
let
wxGTK31-gtk3-prusa = wxGTK31-gtk3.overrideAttrs (old: rec {
wxGTK31-prusa = wxGTK31.overrideAttrs (old: rec {
pname = "wxwidgets-prusa3d-patched";
version = "3.1.4";
src = fetchFromGitHub {
@ -45,7 +45,7 @@ let
fetchSubmodules = true;
};
});
wxGTK31-gtk3-override' = if wxGTK31-gtk3-override == null then wxGTK31-gtk3-prusa else wxGTK31-gtk3-override;
wxGTK31-override' = if wxGTK31-override == null then wxGTK31-prusa else wxGTK31-override;
in
stdenv.mkDerivation rec {
pname = "prusa-slicer";
@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
pcre
systemd
tbb
wxGTK31-gtk3-override'
wxGTK31-override'
xorg.libX11
] ++ checkInputs;

View File

@ -1,4 +1,4 @@
{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer, wxGTK31-gtk3 }:
{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer, wxGTK31 }:
let
appname = "SuperSlicer";
pname = "super-slicer";
@ -71,7 +71,7 @@ let
passthru = allVersions;
};
prusa-slicer' = prusa-slicer.override { wxGTK31-gtk3-override = wxGTK31-gtk3; };
prusa-slicer' = prusa-slicer.override { wxGTK31-override = wxGTK31; };
allVersions = builtins.mapAttrs (_name: version: (prusa-slicer'.overrideAttrs (override version))) versions;
in
allVersions.stable

View File

@ -0,0 +1,38 @@
{ lib, buildGoModule, installShellFiles, fetchFromGitHub, ffmpeg, ttyd, makeWrapper }:
buildGoModule rec {
pname = "vhs";
version = "0.1.1";
src = fetchFromGitHub {
owner = "charmbracelet";
repo = pname;
rev = "v${version}";
hash = "sha256-wcOLUA/U+xRwo7slnACCURQO7D0F3pFP2/SHDfEHeTA=";
};
vendorHash = "sha256-f8EHDxu+NWAFJx9ujzsiDhNymdEzExmdreP11gV56AI=";
nativeBuildInputs = [ installShellFiles makeWrapper ];
buildInputs = [ ttyd ffmpeg ];
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
postInstall = ''
wrapProgram $out/bin/vhs --prefix PATH : ${lib.makeBinPath [ ffmpeg ttyd ]}
$out/bin/vhs man > vhs.1
installManPage vhs.1
installShellCompletion --cmd vhs \
--bash <($out/bin/vhs completion bash) \
--fish <($out/bin/vhs completion fish) \
--zsh <($out/bin/vhs completion zsh)
'';
meta = with lib; {
description = "A tool for generating terminal GIFs with code";
homepage = "https://github.com/charmbracelet/vhs";
changelog = "https://github.com/charmbracelet/vhs/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ maaslalani ];
};
}

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, tcl, tk, Cocoa, xlibsWrapper, makeWrapper }:
{ lib, stdenv, fetchurl, tcl, tk, Cocoa, makeWrapper }:
stdenv.mkDerivation rec {
version = "3.0";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ tcl tk xlibsWrapper ]
buildInputs = [ tcl tk ]
++ lib.optionals stdenv.isDarwin [ Cocoa ];
hardeningDisable = [ "format" ];

View File

@ -47,15 +47,15 @@ with lib;
# Those pieces of software we entirely ignore upstream's handling of, and just
# make sure they're in the path if desired.
let
k3sVersion = "1.25.2+k3s1"; # k3s git tag
k3sCommit = "53c268d8eb90ceea5e1c7865f89db5c7fb8763bc"; # k3s git commit at the above version
k3sRepoSha256 = "1w040bsrf981k19rwaaxjsv52pgzc0k77x083fkhysmrca565z0y";
k3sVendorSha256 = "sha256-8Xti08sjFk1WKimH/GEb99oqBdFO79WVCvYyXIWMpgo=";
k3sVersion = "1.25.3+k3s1"; # k3s git tag
k3sCommit = "f2585c1671b31b4b34bddbb3bf4e7d69662b0821"; # k3s git commit at the above version
k3sRepoSha256 = "0zwf3iwjcidx14zw36s1hr0q8wmmbfc0rfqwd7fmpjq597h8zkms";
k3sVendorSha256 = "sha256-U67tJRGqPFk5AfRe7I50zKGC9HJ2oh+iI/C7qF/76BQ=";
# taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9
# The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know.
traefikChartVersion = "10.19.3";
traefikChartSha256 = "04zg5li957svgscdmkzmzjkwljaljyav68rzxmhakkwgav6q9058";
traefikChartVersion = "12.0.0";
traefikChartSha256 = "1sqmi71fi3ad5dh5fmsp9mv80x6pkgqwi4r9fr8l6i9sdnai6f1a";
# taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47
k3sRootVersion = "0.11.0";

View File

@ -394,13 +394,13 @@
"version": "2.4.0"
},
"flexibleengine": {
"hash": "sha256-2eXNumT1Hkc33bW635qYr5jxlByX+yZ8zSKRpgKWQJo=",
"hash": "sha256-yg3o7jsWGJ7/fJmDDbFnCpDmKRu0oEbe9wYoILbVwq8=",
"owner": "FlexibleEngineCloud",
"provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine",
"repo": "terraform-provider-flexibleengine",
"rev": "v1.33.0",
"vendorHash": "sha256-smk44z0q2Ku9iO+74vhb/gk5DvdaJe/wDFg7EtQEh/E=",
"version": "1.33.0"
"rev": "v1.34.0",
"vendorHash": "sha256-m0Bv/w0TZASE3n7wEyCmHRHEpjc3snP5Bxyx+2A5dQQ=",
"version": "1.34.0"
},
"fortios": {
"deleteVendor": true,

View File

@ -5,6 +5,7 @@
, libGL
, zlib
, wxGTK
, gtk3
, libX11
, gettext
, glew
@ -143,7 +144,7 @@ stdenv.mkDerivation rec {
zlib
libX11
wxGTK
wxGTK.gtk
gtk3
pcre
libXdmcp
gettext

View File

@ -2,7 +2,8 @@
, fetchFromGitLab
, gnome
, dconf
, wxGTK31-gtk3
, wxGTK31
, gtk3
, makeWrapper
, gsettings-desktop-schemas
, hicolor-icon-theme
@ -103,7 +104,7 @@ let
if srcOverridep "libVersion" then srcs.libVersion
else versionsImport.${baseName}.libVersion.version;
wxGTK = wxGTK31-gtk3;
wxGTK = wxGTK31;
python = python3;
wxPython = python.pkgs.wxPython_4_1;
@ -143,7 +144,7 @@ stdenv.mkDerivation rec {
"--prefix XDG_DATA_DIRS : ${base}/share"
"--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share"
"--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share"
"--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}"
"--prefix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}"
"--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}"
# wrapGAppsHook did these two as well, no idea if it matters...
"--prefix XDG_DATA_DIRS : ${cups}/share"

View File

@ -46,6 +46,13 @@ mkDerivation rec {
++ lib.optionals (!withGui) [ "--disable-qtgui" "--disable-x11mon" ]
++ (if stdenv.isLinux then [ "--with-inotify" ] else [ "--without-inotify" ]);
NIX_CFLAGS_COMPILE = [ "-DNIXPKGS" ];
patches = [
# fix "No/bad main configuration file" error
./fix-datadir.patch
];
nativeBuildInputs = [
file pkg-config python3Packages.setuptools which
];

View File

@ -0,0 +1,13 @@
diff --git a/utils/rclutil.cpp b/utils/rclutil.cpp
index 60ff5fb..4a59ccc 100644
--- a/utils/rclutil.cpp
+++ b/utils/rclutil.cpp
@@ -279,7 +279,7 @@ const string& path_pkgdatadir()
"a subfolder of the installation directory. \n"
"Please set the RECOLL_DATADIR environment variable to point to it\n"
"(e.g. setx RECOLL_DATADIR \"C:/Program Files (X86)/Recoll/Share)\"\n";
-#elif defined(__APPLE__) && !defined(MACPORTS) && !defined(HOMEBREW)
+#elif defined(__APPLE__) && !defined(MACPORTS) && !defined(HOMEBREW) && !defined(NIXPKGS)
uint32_t size = 0;
_NSGetExecutablePath(nullptr, &size);
char *path= (char*)malloc(size+1);

View File

@ -8,16 +8,16 @@
buildGoModule rec {
pname = "lima";
version = "0.12.0";
version = "0.13.0";
src = fetchFromGitHub {
owner = "lima-vm";
repo = pname;
rev = "v${version}";
sha256 = "sha256-v2zvcUDbzjisJVxEic6VDZewaE0kp1rcB2NK8y3utnQ=";
sha256 = "sha256-alE7fUVxJRkLMtdia5ruHxh9nlWIubM0J6iIrmpreRM=";
};
vendorSha256 = "sha256-MlfDvdzkegtS8sW/GjkOMLQTK30G6RipHaYzNcwIkEE=";
vendorSha256 = "sha256-Kb2R8USWOWRFMjQO3tjdl5UHOzzb2B3ld+5vO2gF3KY=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

View File

@ -2,7 +2,7 @@
, lua, gettext, which, groff, xmessage, xterm
, readline, fontconfig, libX11, libXext, libSM
, libXinerama, libXrandr, libXft
, xlibsWrapper, makeWrapper
, makeWrapper
}:
stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config makeWrapper groff ];
buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM
libXinerama libXrandr libXft xlibsWrapper ];
libXinerama libXrandr libXft ];
buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ];

View File

@ -2,14 +2,14 @@
stdenv.mkDerivation rec {
pname = "jsonnet";
version = "0.19.0";
version = "0.19.1";
outputs = ["out" "doc"];
src = fetchFromGitHub {
rev = "v${version}";
owner = "google";
repo = "jsonnet";
sha256 = "sha256-tCK6iEj6GNL46zGMzOnVv40/P0T6EpttoK0NokJ6qyM=";
sha256 = "sha256-q1MNdbyrx4vvN5woe0o90pPqaNtsZjI5RQ7KJt7rOpU=";
};
nativeBuildInputs = [ jekyll ];

View File

@ -9,12 +9,12 @@
ocamlPackages.buildDunePackage rec {
pname = "ligo";
version = "0.54.0";
version = "0.54.1";
src = fetchFromGitLab {
owner = "ligolang";
repo = "ligo";
rev = version;
sha256 = "sha256-Iq72gDaS05yhxAYjIUrqiCwBkx5aWbVpYPcQlgojhNU=";
sha256 = "sha256-P4oScKsf2A6qtkzpep8lewqSMM9A+vHyN5VaH7+/6xQ=";
fetchSubmodules = true;
};

View File

@ -1,5 +1,17 @@
{ lib, stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor, libXrandr, libXft
, CoreServices ? null }:
{ lib
, stdenv
, fetchurl
, libpng
, libjpeg
, libtiff
, zlib
, bzip2
, libXcursor
, libXext
, libXrandr
, libXft
, CoreServices ? null
}:
stdenv.mkDerivation rec {
pname = "fox";
@ -12,7 +24,7 @@ stdenv.mkDerivation rec {
patches = [ ./clang.patch ];
buildInputs = [ libpng xlibsWrapper libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ]
buildInputs = [ libpng libjpeg libtiff zlib bzip2 libXcursor libXext libXrandr libXft ]
++ lib.optional stdenv.isDarwin CoreServices;
doCheck = true;

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }:
{ lib, stdenv, fetchurl, libICE, libXext, libXi, libXrandr, libXxf86vm, libGL, libGLU, cmake }:
stdenv.mkDerivation rec {
pname = "freeglut";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ cmake ];
buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper ];
buildInputs = [ libICE libXext libXi libXrandr libXxf86vm libGL libGLU ];
cmakeFlags = lib.optionals stdenv.isDarwin [
"-DOPENGL_INCLUDE_DIR=${libGL}/include"

View File

@ -1,4 +1,4 @@
{ fetchhg, lib, stdenv, cmake, coin3d, motif, xlibsWrapper, libXmu, libGLU, libGL }:
{ fetchhg, lib, stdenv, cmake, coin3d, motif, libXext, libXmu, libGLU, libGL }:
stdenv.mkDerivation {
pname = "soxt";
@ -12,7 +12,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ cmake ];
buildInputs = [ coin3d motif xlibsWrapper libGLU libGL libXmu ];
buildInputs = [ coin3d motif libGLU libGL libXext libXmu ];
meta = with lib; {
homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home";

View File

@ -4,7 +4,6 @@
, fetchurl
, gnome2
, gst_all_1
, gtk2
, gtk3
, libGL
, libGLU
@ -18,7 +17,6 @@
, compat30 ? true
, unicode ? true
, withEGL ? true
, withGtk2 ? (!stdenv.isDarwin)
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
, withWebKit ? stdenv.isDarwin
, webkitgtk
@ -33,11 +31,6 @@
, WebKit
}:
assert withGtk2 -> (!withWebKit);
let
gtk = if withGtk2 then gtk2 else gtk3;
in
stdenv.mkDerivation rec {
pname = "wxwidgets";
version = "3.1.5";
@ -60,18 +53,14 @@ stdenv.mkDerivation rec {
buildInputs = [
gst_all_1.gst-plugins-base
gst_all_1.gstreamer
]
++ lib.optionals (!stdenv.isDarwin) [
gtk
] ++ lib.optionals (!stdenv.isDarwin) [
gtk3
libSM
libXinerama
libXtst
libXxf86vm
xorgproto
]
++ lib.optionals withGtk2 [
gnome2.GConf
]
++ lib.optional withMesa libGLU
++ lib.optional (withWebKit && !stdenv.isDarwin) webkitgtk
++ lib.optional (withWebKit && stdenv.isDarwin) WebKit
@ -102,8 +91,7 @@ stdenv.mkDerivation rec {
++ lib.optionals stdenv.isDarwin [
"--with-osx_cocoa"
"--with-libiconv"
]
++ lib.optionals withWebKit [
] ++ lib.optionals withWebKit [
"--enable-webview"
"--enable-webviewwebkit"
];
@ -133,6 +121,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
passthru = {
inherit compat28 compat30 unicode;
};
meta = with lib; {
homepage = "https://www.wxwidgets.org/";
description = "A Cross-Platform C++ GUI Library";
@ -150,9 +142,4 @@ stdenv.mkDerivation rec {
maintainers = with maintainers; [ tfmoraes ];
platforms = platforms.unix;
};
passthru = {
inherit gtk;
inherit compat28 compat30 unicode;
};
}

View File

@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "aioambient";
version = "2021.12.0";
version = "2022.10.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-nFCLMpkuSVPecKrtJ/z7KuyGw4Z9X79wKXmWsewbxvY=";
sha256 = "sha256-Oppi4J0TuLbqwVn1Hpa4xcU9c/I+YDP3E0VXwiP8a/w=";
};
postPatch = ''

View File

@ -15,13 +15,13 @@
buildPythonPackage rec {
pname = "aioguardian";
version = "2022.07.0";
version = "2022.10.0";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-87MumQ6MuhRRDHrcH1nmOPviKDaT4crYnq5Pd26qsLw=";
sha256 = "sha256-plgO+pyKmG0mYnFZxDcrENcuEg5AG2Og2xWipzuzyHo=";
};
format = "pyproject";

View File

@ -13,18 +13,21 @@
buildPythonPackage rec {
pname = "aionotion";
version = "2021.10.0";
version = "2022.10.0";
format = "pyproject";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-5bu2XveDi2e6lGdI/T+0apqXzcnqdztVtaHEpp+Vkzs=";
hash = "sha256-DJkqFj87N8OlWHNto+tInj8QvVoNA9faLBb/pBbQl0U=";
};
nativeBuildInputs = [ poetry-core ];
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
@ -38,9 +41,13 @@ buildPythonPackage rec {
pytestCheckHook
];
disabledTestPaths = [ "examples" ];
disabledTestPaths = [
"examples"
];
pythonImportsCheck = [ "aionotion" ];
pythonImportsCheck = [
"aionotion"
];
meta = with lib; {
description = "Python library for Notion Home Monitoring";

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiorecollect";
version = "2021.10.0";
version = "2022.10.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
sha256 = "sha256-cLutszJ8VXGcqb8kZv7Qn1ZD/LRYjVgQWQxNMHNd0UQ=";
sha256 = "sha256-JIh6jr4pFXGZTUi6K7VsymaCxCrTNBevk9xo9TsrFnM=";
};
nativeBuildInputs = [

View File

@ -17,7 +17,7 @@
buildPythonPackage rec {
pname = "aioridwell";
version = "2022.03.0";
version = "2022.10.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
owner = "bachya";
repo = pname;
rev = version;
hash = "sha256-UiHT1YbBb9UTughVw2oJxRtvhUDVqQWqEcXMEXwy2cI=";
hash = "sha256-cc5l72QHcyCBFZtw3F9EFFtmz58NnZ9gkDTcFZFlL4E=";
};
nativeBuildInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "aioswitcher";
version = "3.1.0";
version = "3.2.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "TomerFi";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-UnKi9/+BmQoJcv/Mlv9C9FYUgMy3J8KCGRrWPMGrM8Y=";
hash = "sha256-Vob5p0+SlZR2eHj5Br2pWp3FCxW+zgY6crh8jrkreT0=";
};
nativeBuildInputs = [

View File

@ -36,6 +36,9 @@ buildPythonPackage rec {
disabledTests = [
# AssertionError: <_io.TextIOWrapper name='<stdout>' mode='w' encoding='utf-8'> is not...
"test_init"
# AssertionError: Invalid format specifier (deprecated since prefixed 0.4.0)
"test_floats_prefixed"
"test_subcounter_prefixed"
] ++ lib.optionals stdenv.isDarwin [
# https://github.com/Rockhopper-Technologies/enlighten/issues/44
"test_autorefresh"

View File

@ -0,0 +1,35 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, requests
}:
buildPythonPackage rec {
pname = "hydrus-api";
version = "4.0.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-4by2TlZJIKElGgaof1w555ik2hUNbg16YekSWwICGmg=";
};
disabled = pythonOlder "3.9";
propagatedBuildInputs = [
requests
];
pythonImportsCheck = [ "hydrus_api" ];
# There are no unit tests
doCheck = false;
meta = with lib; {
description = "Python module implementing the Hydrus API";
homepage = "https://gitlab.com/cryzed/hydrus-api";
license = licenses.agpl3Plus;
maintainers = with maintainers; [ dandellion ];
};
}

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "md-toc";
version = "8.1.4";
version = "8.1.5";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "frnmst";
repo = pname;
rev = version;
hash = "sha256-7bXd+kTB1NF5KfcDVsvemCfIbZxv6nAw851bNo375Xs=";
hash = "sha256-jt2ZZV63s7LL0R9ay/tvMH3cIDElYXiNPBuHlxj/Z8E=";
};
propagatedBuildInputs = [

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "meshtastic";
version = "1.3.42";
version = "1.3.43";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -26,8 +26,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "meshtastic";
repo = "Meshtastic-python";
rev = version;
hash = "sha256-yQjUepoKHYsQg49hY3ABtRGBxAppqm/DODnCM4tBH5A=";
rev = "refs/tags/${version}";
hash = "sha256-Gy9fnYUbv5jR+YeFjbNGdng+loM/J71Yn9Y1mKERVUA=";
};
propagatedBuildInputs = [

View File

@ -8,24 +8,32 @@
buildPythonPackage rec {
pname = "motor";
version = "3.1.0";
disabled = pythonOlder "3.6";
version = "3.1.1";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "mongodb";
repo = pname;
rev = "refs/tags/${version}";
sha256 = "sha256-Wc0C4sO33v/frBtZVV2u9ESunHKyJI+eQ59l72h2eFk=";
hash = "sha256-PD41ZyUFY4fYaO4Fo7kiTWcn1a6LOd81K3PWAAagmr4=";
};
propagatedBuildInputs = [ pymongo ];
propagatedBuildInputs = [
pymongo
];
checkInputs = [ mockupdb ];
checkInputs = [
mockupdb
];
# network connections
doCheck = false;
pythonImportsCheck = [ "motor" ];
pythonImportsCheck = [
"motor"
];
meta = with lib; {
description = "Non-blocking MongoDB driver for Tornado or asyncio";

View File

@ -1,13 +1,19 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k }:
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
}:
buildPythonPackage rec {
pname = "mss";
version = "6.1.0";
disabled = !isPy3k;
version = "7.0.1";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "aebd069f3e05667fe9c7b9fa4b1771fe42a4710ce1058ce0236936ce06fa5394";
hash = "sha256-8UzuUokDw7AdO48SCc1JhCL3Hj0NLZLFuTPt07l3ICI=";
};
# By default it attempts to build Windows-only functionality
@ -16,10 +22,12 @@ buildPythonPackage rec {
'';
# Skipping tests due to most relying on DISPLAY being set
pythonImportsCheck = [ "mss" ];
pythonImportsCheck = [
"mss"
];
meta = with lib; {
description = "Cross-platform multiple screenshots module in pure Python";
description = "Cross-platform multiple screenshots module";
homepage = "https://github.com/BoboTiG/python-mss";
license = licenses.mit;
maintainers = with maintainers; [ austinbutler ];

View File

@ -0,0 +1,63 @@
{ lib
, buildPythonPackage
, factory_boy
, fetchFromGitHub
, httpretty
, inflection
, jsondate
, mock
, more-itertools
, numpy
, pandas
, parameterized
, pytestCheckHook
, python-dateutil
, pythonOlder
, requests
, six
}:
buildPythonPackage rec {
pname = "nasdaq-data-link";
version = "1.0.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Nasdaq";
repo = "data-link-python";
rev = "refs/tags/${version}";
hash = "sha256-Q3Ay9FpJsvSVu0WU2bxFyo3ODKP/ZUo3SqsBtOGrIIE=";
};
propagatedBuildInputs = [
inflection
more-itertools
numpy
pandas
python-dateutil
requests
six
];
checkInputs = [
factory_boy
httpretty
jsondate
mock
parameterized
pytestCheckHook
];
pythonImportsCheck = [
"nasdaqdatalink"
];
meta = with lib; {
description = "Library for Nasdaq Data Link's RESTful API";
homepage = "https://github.com/Nasdaq/data-link-python";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "panel";
version = "0.14.0";
version = "0.14.1";
format = "wheel";
@ -23,7 +23,7 @@ buildPythonPackage rec {
# tries to fetch even more artifacts
src = fetchPypi {
inherit pname version format;
hash = "sha256-3kZba0R9J978bvjsjRMLSTo7dOPd5Ml7VPkZqMQV2uY=";
hash = "sha256-DSurTC+inYSoGJ047u03K+wEQhGFqqRX0uS5qb3sNEI=";
};
propagatedBuildInputs = [

View File

@ -6,14 +6,14 @@
buildPythonPackage rec {
pname = "peaqevcore";
version = "7.0.10";
version = "7.0.13";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-97Evn/FT1SCQaiSNKBi0akajc7LkywqzJQEaqxm6s+U=";
hash = "sha256-0qzqnmMzgiUBe2NQsYC/EmjmoBmZsG+tUkfGc9cyKP8=";
};
postPatch = ''

View File

@ -1,26 +1,44 @@
{ lib
, python
, buildPythonPackage
, fetchPypi
, freezegun
, pytestCheckHook
, python-utils
, pythonOlder
}:
buildPythonPackage rec {
pname = "progressbar2";
version = "4.1.1";
version = "4.2.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-Y5odWSJ4RIg5kwvf/SQrTU6pzgyeZWrqgQKCwtNrwSE=";
hash = "sha256-E5OSL8tkWYlErUV1afvrSzrBie9Qta25zvMoTofjlM4=";
};
propagatedBuildInputs = [ python-utils ];
postPatch = ''
sed -i "/-cov/d" pytest.ini
'';
pythonImportsCheck = [ "progressbar" ];
propagatedBuildInputs = [
python-utils
];
checkInputs = [
freezegun
pytestCheckHook
];
pythonImportsCheck = [
"progressbar"
];
meta = with lib; {
homepage = "https://progressbar-2.readthedocs.io/en/latest/";
description = "Text progressbar library for python";
description = "Text progressbar library";
homepage = "https://progressbar-2.readthedocs.io/";
license = licenses.bsd3;
maintainers = with maintainers; [ ashgillman turion ];
};

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "psygnal";
version = "0.5.0";
version = "0.6.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "tlambert03";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-Hh1HG4VVcNXo62M/4mU3ZcSQNHmalcIDprkwD6/WRf8=";
hash = "sha256-KCdX+pMUAQxeQRZhkrdGCKGjBaB1Ode/r1W8LJQPxyM=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pulumi-aws";
# Version is independant of pulumi's.
version = "5.18.0";
version = "5.19.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "pulumi";
repo = "pulumi-aws";
rev = "refs/tags/v${version}";
hash = "sha256-IHvmiX5drRm4PNY+N5VZ7OjsH5xIswr/G7AREN1XYtM=";
hash = "sha256-ZpbWqhTScWOlcVsX4OYlA5dYQg0UsfOhMLllXjEDdUI=";
};
sourceRoot = "${src.name}/sdk/python";

View File

@ -19,14 +19,14 @@
buildPythonPackage rec {
pname = "pywlroots";
version = "0.15.22";
version = "0.15.24";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-KzpQk7ANinEVvOBeZ+8vPmuuu4LbatjHBKUL44bcAAI=";
sha256 = "sha256-TvYhxiAbK+mpcEE9y79WH96dzeDnvI0xPaUxSYQqyHE=";
};
nativeBuildInputs = [ pkg-config ];

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "shtab";
version = "1.5.5";
version = "1.5.6";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "iterative";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-I6De64eawNi36c8NiyVxj63PkxnZfUYYT4Dw4l42Ztk=";
hash = "sha256-w04wvmzWcp92slPIc2f1En+52J9Z/XvjGHHntCeuTd0=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -7,7 +7,7 @@
buildPythonPackage rec {
pname = "teamcity-messages";
version = "1.31";
version = "1.32";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
owner = "JetBrains";
repo = pname;
rev = "v${version}";
sha256 = "sha256-oYXP9HWdgmEq48rYyuX6zHf+cp835C0BtHUAME+5S+k=";
sha256 = "sha256-9az7kD7nKqMF2b3/eFgF+pOKKIYLvTy2sf4TSJfHRnA=";
};
checkInputs = [

View File

@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "velbus-aio";
version = "2022.10.3";
version = "2022.10.4";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "Cereal2nd";
repo = pname;
rev = version;
sha256 = "sha256-p/oWyi5417rTSG2+xYsPlaiiHfdyAACyvRwTsmqAoUI=";
sha256 = "sha256-6Sg2t8UmIyVCfjTW3GDldOk09gVg2ngV9sXhyQI4Kz4=";
fetchSubmodules = true;
};

View File

@ -13,6 +13,7 @@
, ncurses
, pango
, wxGTK
, gtk3
, AGL
, AudioToolbox
, AVFoundation
@ -70,7 +71,7 @@ buildPythonPackage rec {
nativeBuildInputs = [
which
doxygen
wxGTK.gtk
gtk3
pkg-config
setuptools
] ++ lib.optionals stdenv.isLinux [
@ -78,7 +79,7 @@ buildPythonPackage rec {
];
buildInputs = [
wxGTK.gtk
gtk3
ncurses
] ++ lib.optionals stdenv.isLinux [
libXinerama
@ -120,7 +121,7 @@ buildPythonPackage rec {
preConfigure = lib.optionalString (!stdenv.isDarwin) ''
substituteInPlace wx/lib/wxcairo/wx_pycairo.py \
--replace '_dlls = dict()' '_dlls = {k: ctypes.CDLL(v) for k, v in [
("gdk", "${wxGTK.gtk}/lib/libgtk-x11-3.0.so"),
("gdk", "${gtk3}/lib/libgtk-x11-3.0.so"),
("pangocairo", "${pango.out}/lib/libpangocairo-1.0.so"),
("cairoLib = None", "cairoLib = ctypes.CDLL('${cairo}/lib/libcairo.so')"),
("appsvc", None)

View File

@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, makeWrapper, git }:
{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, Security, makeWrapper, libgit2 }:
rustPlatform.buildRustPackage rec {
pname = "cocogitto";
@ -17,18 +17,15 @@ rustPlatform.buildRustPackage rec {
# and might be failing to create the test repository it works in.
doCheck = false;
nativeBuildInputs = [ installShellFiles makeWrapper ];
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optional stdenv.isDarwin Security;
buildInputs = [ libgit2 ] ++ lib.optional stdenv.isDarwin Security;
postInstall = ''
installShellCompletion --cmd cog \
--bash <($out/bin/cog generate-completions bash) \
--fish <($out/bin/cog generate-completions fish) \
--zsh <($out/bin/cog generate-completions zsh)
wrapProgram $out/bin/cog \
--prefix PATH : "${lib.makeBinPath [ git ]}"
'';
meta = with lib; {

View File

@ -4,13 +4,13 @@ with lib;
buildGoModule rec {
pname = "kind";
version = "0.15.0";
version = "0.17.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "kubernetes-sigs";
repo = "kind";
sha256 = "sha256-IDSWmNWHnTKOl6/N1Mz+OKOkZSBarpuN39CBsSjYhKY=";
sha256 = "sha256-YAa5Dr8Pc6P3RZ3SCiyi7zwmVd5tPalM88R8bxgg6JU=";
};
patches = [
@ -18,7 +18,7 @@ buildGoModule rec {
./kernel-module-path.patch
];
vendorSha256 = "sha256-FE1GvNgXkBt2cH4YB3jTsPXp91DSiYlniQLtMwvi384=";
vendorSha256 = "sha256-J/sJd2LLMBr53Z3sGrWgnWA8Ry+XqqfCEObqFyUD96g=";
CGO_ENABLED = 0;
GOFLAGS = [ "-trimpath" ];

View File

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "millet";
version = "0.5.8";
version = "0.5.10";
src = fetchFromGitHub {
owner = "azdavis";
repo = pname;
rev = "v${version}";
sha256 = "sha256-AsI0n76ZWzW326/kpzP+6zjVA42WrhPqnid02OJ5fEo=";
sha256 = "sha256-6TFXaVIbdHO6smM20I2olURdBPZfcPBQ4Pyk5hU9Mx8=";
};
cargoSha256 = "sha256-tHa/DXcWLdOlMlauerSiLsLImYrbnslN6R991mSTyvs=";
cargoSha256 = "sha256-fsguAk77XXMaGokqyGEumngBW2G4lmSU3Q2HMo5EtKY=";
postPatch = ''
rm .cargo/config.toml

View File

@ -1,17 +0,0 @@
{ stdenv, fetchurl, patchelf }:
stdenv.mkDerivation rec {
pname = "patchelf";
version = "0.9";
src = fetchurl {
url = "https://nixos.org/releases/patchelf/patchelf-${version}/patchelf-${version}.tar.bz2";
sha256 = "a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83";
};
setupHook = [ ./setup-hook.sh ];
doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6
inherit (patchelf) meta;
}

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "oh-my-posh";
version = "12.9.1";
version = "12.10.0";
src = fetchFromGitHub {
owner = "jandedobbeleer";
repo = pname;
rev = "v${version}";
sha256 = "sha256-bjmYGQBJ4YdeQR+rlnXxE5Z6QRoF2EONciLz2ka29ys=";
sha256 = "sha256-iPSaJL1mvPjzZjXtgqeFS1p1jlOqc6B/R1/Zwym0j3g=";
};
vendorSha256 = "sha256-OrtKFkWXqVoXKmN6BT8YbCNjR1gRTT4gPNwmirn7fjU=";

View File

@ -7,16 +7,16 @@
buildGoModule rec {
pname = "packer";
version = "1.8.3";
version = "1.8.4";
src = fetchFromGitHub {
owner = "hashicorp";
repo = "packer";
rev = "v${version}";
sha256 = "sha256-Ar8O/zbM3L898FwJiITON/vID4b+dN/KIk7TRTepD/0=";
sha256 = "sha256-m8PKigVm46PN55hchc5a1OUUuhxoGn3e2sMRqqvkPgs=";
};
vendorSha256 = "sha256-kM+D981x3/2uUFKElWbNrsfKhKbGgAvEklMD+FSaDRE=";
vendorSha256 = "sha256-hSZCYSV7nMGd5KQsV+Z4ig7vk4j8cZnOvsg0DqPiEvg=";
subPackages = [ "." ];

View File

@ -0,0 +1,27 @@
{ lib
, rustPlatform
, fetchFromGitHub
}:
rustPlatform.buildRustPackage rec {
pname = "toast";
version = "0.45.5";
src = fetchFromGitHub {
owner = "stepchowfun";
repo = pname;
rev = "v${version}";
sha256 = "sha256-7EF9DCT8Vg7aGOUlRG9c4Lv2EhCX/P9k4zQC6Ruqv0c=";
};
cargoSha256 = "sha256-tyZrNUT2i9i0yOqz1KqIuFSb4PO+fx1SNa+ZVNfIGfM=";
checkFlags = [ "--skip=format::tests::code_str_display" ]; # fails
meta = with lib; {
description = "Containerize your development and continuous integration environments";
homepage = "https://github.com/stepchowfun/toast";
license = licenses.mit;
maintainers = with maintainers; [ dit7ya ];
};
}

View File

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "yq-go";
version = "4.28.2";
version = "4.29.1";
src = fetchFromGitHub {
owner = "mikefarah";
repo = "yq";
rev = "v${version}";
sha256 = "sha256-wLb7M/M/t6CCpjTyhMMDODaQUp1t6gbQaCY+JPBi/4Q=";
sha256 = "sha256-aZMlWC6qtN2TvND18QO8Q3UicSNa9cZT/xPmia3V6FM=";
};
vendorSha256 = "sha256-5GHkl9bwzf0ZUQXjhDPke4Fm7ffH+GqbTXC1Qd71B7M=";
vendorSha256 = "sha256-L3l6wH4bR1/R6MtQTHYsyRE5E/EPnpNwa310zUONo+s=";
nativeBuildInputs = [ installShellFiles ];

View File

@ -8,7 +8,6 @@
, bullet
, glm
, libmad
, xlibsWrapper
, openal
, SDL2
, boost
@ -36,7 +35,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake ];
buildInputs = [
sfml libGLU libGL bullet glm libmad xlibsWrapper openal SDL2 boost ffmpeg
sfml libGLU libGL bullet glm libmad openal SDL2 boost ffmpeg
] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ];
meta = with lib; {

View File

@ -3,9 +3,14 @@
, bzip2
, cmake
, expat
, freetype
, irrlicht
, libICE
, libGL
, libGLU
, libSM
, libX11
, libXext
, libXxf86vm
, libjpeg
, libpng
@ -13,7 +18,6 @@
, openal
, pkg-config
, sqlite
, xlibsWrapper
}:
stdenv.mkDerivation rec {
@ -39,18 +43,24 @@ stdenv.mkDerivation rec {
];
buildInputs = [
# has to go before others to override transitive libpng-1.6
libpng
bzip2
expat
freetype
irrlicht
libICE
libGL
libGLU
libSM
libX11
libXext
libXxf86vm
libjpeg
libpng
libvorbis
openal
sqlite
xlibsWrapper
];
meta = with lib; {

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, xlibsWrapper
, imake, gccmakedep, libXScrnSaver, xorgproto
{ lib, stdenv, fetchFromGitHub
, imake, gccmakedep, libX11, libXext, libXScrnSaver, xorgproto
}:
stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ imake gccmakedep ];
buildInputs = [ xlibsWrapper libXScrnSaver xorgproto ];
buildInputs = [ libX11 libXext libXScrnSaver xorgproto ];
makeFlags = [
"BINDIR=$(out)/bin"

View File

@ -15,13 +15,13 @@ let
in
buildGoModule rec {
pname = "minio";
version = "2022-10-24T18-35-07Z";
version = "2022-10-29T06-21-33Z";
src = fetchFromGitHub {
owner = "minio";
repo = "minio";
rev = "RELEASE.${version}";
sha256 = "sha256-sABNzhyfBNU5pWyE/VWHUzuSyKsx0glj01ectJPakV8=";
sha256 = "sha256-fQikYzaFFBYwtwKUOehxhK1+8M6Mlg4bBojkviheOco=";
};
vendorSha256 = "sha256-wB3UiuptT6D0CIUlHC1d5k0rjIxNeh5yAWOmYpyLGmA=";

View File

@ -1,12 +1,12 @@
# DO NOT EDIT! This file is generated automatically by update.sh
{ }:
{
version = "3.44.1";
version = "3.44.3";
pulumiPkgs = {
x86_64-linux = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.1-linux-x64.tar.gz";
sha256 = "14riwmvq3dyakrpjk33fwy7inndm7ziyznf16vlnzj1fikv8q6bg";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-linux-x64.tar.gz";
sha256 = "0mykgk7gkb0369i3a52jjcnwm87a8c8vfr92k9mca6hr6z79d9kp";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-amd64.tar.gz";
@ -25,12 +25,12 @@
sha256 = "15qs31vpip7dbzmhaa2rh6439qdd9b88dblkilwr3rypwiwdsdvy";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.13.0-linux-amd64.tar.gz";
sha256 = "0y7np2qg2hp81cji78bjbcw7ng2g81y1asbnqb2jd2ip0yf43aqp";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-linux-amd64.tar.gz";
sha256 = "1rp0kdsrljlyzp58zrzvs8ifygrlz3qz6wqi1cxmf482gn1ck3xg";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.18.0-linux-amd64.tar.gz";
sha256 = "153abxmq0z0m06nm5kbdypbl7np8rpkn78s8c54dqm4v0kjgiwgf";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.19.0-linux-amd64.tar.gz";
sha256 = "182281jvafg0ixd6k17y6zvnkfpfi57khf42jsdgn6q97xz9bvfs";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.23.0-linux-amd64.tar.gz";
@ -61,8 +61,8 @@
sha256 = "0dwnrqng4w02wcmznksdxksak9kgfrj6pg2jny175a1lr6584blf";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-linux-amd64.tar.gz";
sha256 = "0nxbbkk98w35dxsibfc67m6y5b2h48kckk62i2qw0ix2v8qgmcks";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.5.0-linux-amd64.tar.gz";
sha256 = "1wkz9lr1q668kf71gz38n6wd11rxc5np0akw91i5fln5z9wd2jcf";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-amd64.tar.gz";
@ -93,8 +93,8 @@
sha256 = "09i6lh9wfsfpa5jkj2nb80f3gvmpg3m3flfgfcc794khlrikqmib";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.0-linux-amd64.tar.gz";
sha256 = "0mfd82i4f2lkpafpxx8f67zqw1hj33ai2zah07vm7sv1h2dmaxlc";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.1-linux-amd64.tar.gz";
sha256 = "1iiri83hvsvx9nz9whsjj9gswrs06ihywh8lf58rjzmr7bw141ln";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-amd64.tar.gz";
@ -163,8 +163,8 @@
];
x86_64-darwin = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.1-darwin-x64.tar.gz";
sha256 = "18w0k1jgwvpgdshai9bmminzdaarisvwhl57kz6gmzjria4gfyxy";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-darwin-x64.tar.gz";
sha256 = "0jjz3xwlqw62g8vzmc3pjpad9h6i81vfskxlwr88n1sgwsr6z6ml";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-amd64.tar.gz";
@ -183,12 +183,12 @@
sha256 = "1iw5xzgyfjr6j9dmhvmbnfhw8q4x94af5jb3jzzhbfjnsrbricwb";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.13.0-darwin-amd64.tar.gz";
sha256 = "0dz583zm47v2x2aznc4yszxibmp9schp3b38yzmbry0xrkm1gryx";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-darwin-amd64.tar.gz";
sha256 = "1ss0si046ikx60l94121vfd80h2axcbddiak3pnwq3cikabyw8r7";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.18.0-darwin-amd64.tar.gz";
sha256 = "0daw6h47n1apwnbb2s4bjqa7llhbdpczfmh9xm22nwgj5a4nca30";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.19.0-darwin-amd64.tar.gz";
sha256 = "02jcdmmgm2v5abdqhi4l2w6nd76xh5r12sz7i27ifrq92y67hdwi";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.23.0-darwin-amd64.tar.gz";
@ -219,8 +219,8 @@
sha256 = "08v8s77plv9fv5bjx6g6wfq1fxknmmacws33zgl06vqdgdsfg1gx";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-darwin-amd64.tar.gz";
sha256 = "17qxlhqnxnkvgsym4cgymnpg38pgg83xq6jcjk28ap7d31ginzmg";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.5.0-darwin-amd64.tar.gz";
sha256 = "07kxf42j2a4z1ph161mqll2vlzhgw1ibrvd69gzqwr4d4098s7sb";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-amd64.tar.gz";
@ -251,8 +251,8 @@
sha256 = "1jp9cfw8jj1wms73b5d1xhkmnylly061fxilxzvnpd49glam7da6";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.0-darwin-amd64.tar.gz";
sha256 = "0402ygp40dv3km8qp6hdy1y4prl86gxg69m0sdgaximjkvkfs4bm";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.1-darwin-amd64.tar.gz";
sha256 = "15dhf48k3vwg5ralcaljzg20vssvl4r615z3la852s9hlyr0rvzz";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-amd64.tar.gz";
@ -321,8 +321,8 @@
];
aarch64-linux = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.1-linux-arm64.tar.gz";
sha256 = "1dmghbm7ngrqdaqb2w0ifl9wxrngsz5y26bfrj0bj6j0vhgd6qw8";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-linux-arm64.tar.gz";
sha256 = "1nqsvpms3l5vbcjcn8yhwia4li1v9hgnbc2mmb1ywmv2za7nbq2h";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-arm64.tar.gz";
@ -341,12 +341,12 @@
sha256 = "1yqqnc03hv79l1px8qxppwf8n3shdcd8jd46q1xm9f9fm7bkxd9i";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.13.0-linux-arm64.tar.gz";
sha256 = "0ni0dp0wghcaybnzvvwyf0nbnyq8k2akkghxlym48z8dq7n4206y";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-linux-arm64.tar.gz";
sha256 = "1r8rq9m2rayylspz38x8wqj7d9nlks3ynr5ifdiqf10a5xchcw96";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.18.0-linux-arm64.tar.gz";
sha256 = "10yd58z8mwswik507p84b136xlgaaz9hjbg2hir2nwkycaa3xjj8";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.19.0-linux-arm64.tar.gz";
sha256 = "13bkgsb8wqy9jcmmwignx7609m5qhmj2ghsprwmmbjnmcnsc21k7";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.23.0-linux-arm64.tar.gz";
@ -377,8 +377,8 @@
sha256 = "0bx2dczfm1zqpkclyf1pj0m0iv2w7c3dlqdajfgism3inyb6313c";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-linux-arm64.tar.gz";
sha256 = "1bh1ikp9dvs1akc9qqs65mdcakkmxcx2ki5pvh7sc0zdgp6ppm76";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.5.0-linux-arm64.tar.gz";
sha256 = "0600s9hyvxxqbbcaikmwqg0ib6ibjz9wxadlpd9ch50kvsmfi0w4";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-linux-arm64.tar.gz";
@ -409,8 +409,8 @@
sha256 = "0gis39k5kgdxl0i4afy78hkcmwpzm1shh4x713p7dg6h8w0afdmi";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.0-linux-arm64.tar.gz";
sha256 = "1rmdc65f166zd83rkncl474w2fmwc315h0jmlik75dqykh5d2sfx";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.1-linux-arm64.tar.gz";
sha256 = "16if0nrj433b7xclg2mv9lcq2p5phkj4lviyi5xb655mapyzkqg2";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-linux-arm64.tar.gz";
@ -479,8 +479,8 @@
];
aarch64-darwin = [
{
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.1-darwin-arm64.tar.gz";
sha256 = "0g47sjqc16xhmbsj4bqy31ia079jq1j68ww0mqvwd0wb3i1lfpsk";
url = "https://get.pulumi.com/releases/sdk/pulumi-v3.44.3-darwin-arm64.tar.gz";
sha256 = "1nwgf0mg82vlc93adplw9c3x3fa3277ql8zbc8jqxbvm4l1hr4h2";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-arm64.tar.gz";
@ -499,12 +499,12 @@
sha256 = "0g882459cqbxcl9ml7mdc4s4xx6kg7srk56n0x7ypj3k0j7hjbd0";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.13.0-darwin-arm64.tar.gz";
sha256 = "11qrwc44vl0s59bbhjbb15nkcy8nb9lcsw9brb7whvxh2z080nbk";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.14.0-darwin-arm64.tar.gz";
sha256 = "0dvcbni3s6gpcizgdilsjnks7z3srvdmzqlcdd61dzv0j5jkfshp";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.18.0-darwin-arm64.tar.gz";
sha256 = "17nvcn59yd789qqwj92amwjf4xrw34yi5v80qry8vv03c4z8y0gm";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.19.0-darwin-arm64.tar.gz";
sha256 = "0hszy2nsw88qirnf58yrbmsgra98j2zla635y58ap10f7am1x69x";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.23.0-darwin-arm64.tar.gz";
@ -535,8 +535,8 @@
sha256 = "1gzh37b5jmpz3ih7s7r11vx7wpph7pvn3iidy6gckrs9rw9jp7l4";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.4.1-darwin-arm64.tar.gz";
sha256 = "1ph2vnx5ayzckgbdgmjzbs0i9qf1bkmp29794v82582f0hdmz97q";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v3.5.0-darwin-arm64.tar.gz";
sha256 = "0bl2sqinn5bf3hp7maw7092n08v0pnjrcjpxhls7n234kq124rlk";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-equinix-metal-v3.2.1-darwin-arm64.tar.gz";
@ -567,8 +567,8 @@
sha256 = "1679zpv2r3i2acjmx2a6i7dc47p73gf3jw1k1aclasd5cyjf46jf";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.0-darwin-arm64.tar.gz";
sha256 = "1d7vcz66myixs0f78bmnx1qii6lrq2h5fswwhzlb6w2nj9x4hq76";
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.22.1-darwin-arm64.tar.gz";
sha256 = "1q5xx4d1kk8hm39bnagq9f4y78ganrnw7380bsgm1qxkbq3k1lcm";
}
{
url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.10.1-darwin-arm64.tar.gz";

View File

@ -12,7 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
# Version of Pulumi from
# https://www.pulumi.com/docs/get-started/install/versions/
VERSION="3.44.1"
VERSION="3.44.3"
# An array of plugin names. The respective repository inside Pulumi's
# Github organization is called pulumi-$name by convention.

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook
, gnome, avahi, gtk3, libayatana-appindicator, libnotify, libpulseaudio
, xlibsWrapper, gsettings-desktop-schemas
, gsettings-desktop-schemas
}:
stdenv.mkDerivation rec {
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ];
buildInputs = [
gnome.adwaita-icon-theme
avahi gtk3 libayatana-appindicator libnotify libpulseaudio xlibsWrapper
avahi gtk3 libayatana-appindicator libnotify libpulseaudio
gsettings-desktop-schemas
];

View File

@ -1,5 +1,17 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, boost
, zlib, libpng, libjpeg, libtiff, xlibsWrapper, SDL
{ lib
, stdenv
, fetchFromGitHub
, autoconf
, automake
, boost
, zlib
, libX11
, libICE
, libSM
, libpng
, libjpeg
, libtiff
, SDL
}:
stdenv.mkDerivation rec {
@ -14,7 +26,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ automake autoconf ];
buildInputs = [ boost zlib libpng libjpeg libtiff xlibsWrapper SDL ];
buildInputs = [ boost zlib libX11 libICE libSM libpng libjpeg libtiff SDL ];
# the installPhase wants to put files into $HOME. I let it put the files
# to $TMPDIR, so they don't get into the $out

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub,
xlibsWrapper, libev, libXi, libXfixes,
libev, libX11, libXext, libXi, libXfixes,
pkg-config, asciidoc, libxslt, docbook_xsl }:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config asciidoc libxslt docbook_xsl ];
buildInputs = [ xlibsWrapper libev libXi libXfixes ];
buildInputs = [ libev libX11 libXext libXi libXfixes ];
prePatch = ''
substituteInPlace Makefile --replace 'PKG_CONFIG =' 'PKG_CONFIG ?='

View File

@ -1,4 +1,8 @@
{lib, stdenv, fetchurl, xlibsWrapper}:
{ lib
, stdenv
, fetchurl
, libX11
}:
stdenv.mkDerivation rec {
pname = "unclutter";
@ -8,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6";
};
buildInputs = [xlibsWrapper];
buildInputs = [ libX11 ];
buildFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "minio-client";
version = "2022-10-22T03-39-29Z";
version = "2022-10-29T10-09-23Z";
src = fetchFromGitHub {
owner = "minio";
repo = "mc";
rev = "RELEASE.${version}";
sha256 = "sha256-/vEKLKbpjSy1vZC9+6iCEqK9+4z7vUaaLWJT8ZzqBNE=";
sha256 = "sha256-9fXxHfSA/h6JjhKEY7PmPBJX1P127V+AekrBPFQEtSI=";
};
vendorSha256 = "sha256-vW/hGvzAtd/q9Fbjr19TvpSZzFVX9HSGGSPWErw+v0A=";

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "netdiscover";
version = "0.9";
version = "0.10";
src = fetchFromGitHub {
owner = "netdiscover-scanner";
repo = pname;
rev = version;
sha256 = "sha256-4pSGWMTOMECXKpba5739OQA8FIuNmffFbniU9Gd4GlM=";
sha256 = "sha256-Pd/Rf1G9z8sBZA5i+bzuzYUCiNI0Tv7Bz0lJDJCQU9I=";
};
nativeBuildInputs = [ autoreconfHook ];

View File

@ -1550,6 +1550,8 @@ mapAliases ({
wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
wmii_hg = wmii;
ws = throw "ws has been dropped due to the lack of maintenance from upstream since 2018"; # Added 2022-06-03
wxGTK31-gtk2 = throw "'wxGTK31-gtk2' has been removed from nixpkgs as it depends on deprecated GTK2"; # Added 2022-10-27
wxGTK31-gtk3 = throw "'wxGTK31-gtk3' has been renamed to/replaced by 'wxGTK31'"; # Added 2022-10-27
wxmupen64plus = throw "wxmupen64plus was removed because the upstream disappeared"; # Added 2022-01-31
wxcam = throw "'wxcam' has seen no updates in ten years, crashes (SIGABRT) on startup and depends on deprecated wxGTK28/GNOME2/GTK2, use 'gnome.cheese'"; # Added 2022-06-15

View File

@ -1423,6 +1423,8 @@ with pkgs;
tnat64 = callPackage ../tools/networking/tnat64 { };
toast = callPackage ../development/tools/toast { };
topicctl = callPackage ../tools/misc/topicctl { };
ttchat = callPackage ../tools/misc/ttchat { };
@ -17337,7 +17339,6 @@ with pkgs;
patchelf_0_13
else
patchelf_0_14;
patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { };
patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix {
patchelf = patchelf_0_14;
};
@ -22818,8 +22819,6 @@ with pkgs;
inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;
};
wxGTK31-gtk2 = wxGTK31.override { withGtk2 = true; };
wxGTK31-gtk3 = wxGTK31.override { withGtk2 = false; };
wxGTK32 = callPackage ../development/libraries/wxwidgets/wxGTK32.nix {
inherit (darwin.stubs) setfile;
@ -31804,14 +31803,14 @@ with pkgs;
prusa-slicer = callPackage ../applications/misc/prusa-slicer { };
super-slicer = callPackage ../applications/misc/prusa-slicer/super-slicer.nix {
wxGTK31-gtk3 = wxGTK31-gtk3.override {
wxGTK31 = wxGTK31.override {
# https://github.com/supermerill/SuperSlicer/issues/1093
withEGL = false;
};
};
super-slicer-latest = (callPackage ../applications/misc/prusa-slicer/super-slicer.nix {
wxGTK31-gtk3 = wxGTK31-gtk3.override {
wxGTK31 = wxGTK31.override {
# https://github.com/supermerill/SuperSlicer/issues/1093
withEGL = false;
};
@ -32093,7 +32092,7 @@ with pkgs;
temporal-cli = callPackage ../applications/networking/cluster/temporal-cli { };
tenacity = callPackage ../applications/audio/tenacity { wxGTK = wxGTK31-gtk3; };
tenacity = callPackage ../applications/audio/tenacity { };
tendermint = callPackage ../tools/networking/tendermint { };
@ -37200,6 +37199,8 @@ with pkgs;
vazir-fonts = callPackage ../data/fonts/vazir-fonts { };
vhs = callPackage ../applications/misc/vhs { };
vgmstream = callPackage ../applications/audio/vgmstream { };
viddy = callPackage ../tools/misc/viddy { };

View File

@ -4311,6 +4311,8 @@ self: super: with self; {
hydrawiser = callPackage ../development/python-modules/hydrawiser { };
hydrus-api = callPackage ../development/python-modules/hydrus-api { };
hypchat = callPackage ../development/python-modules/hypchat { };
hypercorn = callPackage ../development/python-modules/hypercorn { };
@ -5987,6 +5989,8 @@ self: super: with self; {
napari-svg = callPackage ../development/python-modules/napari-svg { };
nasdaq-data-link = callPackage ../development/python-modules/nasdaq-data-link { };
nats-py = callPackage ../development/python-modules/nats-py { };
nats-python = callPackage ../development/python-modules/nats-python { };
@ -11911,7 +11915,7 @@ self: super: with self; {
wxPython_4_1 = callPackage ../development/python-modules/wxPython/4.1.nix {
inherit (pkgs.darwin.apple_sdk.frameworks) AGL AudioToolbox AVFoundation AVKit Carbon Cocoa CoreMedia CoreFoundation IOKit Kernel OpenGL Security WebKit;
wxGTK = pkgs.wxGTK31-gtk3.override {
wxGTK = pkgs.wxGTK31.override {
withWebKit = true;
};
};