Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2023-05-29 12:02:05 +00:00 committed by GitHub
commit a0de937efb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
97 changed files with 7038 additions and 7600 deletions

View File

@ -19,18 +19,6 @@ in
description = mdDoc "The ntfy.sh package to use.";
};
user = mkOption {
default = "ntfy-sh";
type = types.str;
description = lib.mdDoc "User the ntfy-sh server runs under.";
};
group = mkOption {
default = "ntfy-sh";
type = types.str;
description = lib.mdDoc "Primary group of ntfy-sh user.";
};
settings = mkOption {
type = types.submodule { freeformType = settingsFormat.type; };
@ -61,6 +49,9 @@ in
services.ntfy-sh.settings = {
auth-file = mkDefault "/var/lib/ntfy-sh/user.db";
listen-http = mkDefault "127.0.0.1:2586";
attachment-cache-dir = mkDefault "/var/lib/ntfy-sh/attachments";
cache-file = mkDefault "/var/lib/ntfy-sh/cache-file.db";
};
systemd.services.ntfy-sh = {
@ -70,10 +61,15 @@ in
after = [ "network.target" ];
serviceConfig = {
ExecStartPre = [
"${pkgs.coreutils}/bin/touch ${cfg.settings.auth-file}"
"${pkgs.coreutils}/bin/mkdir -p ${cfg.settings.attachment-cache-dir}"
"${pkgs.coreutils}/bin/touch ${cfg.settings.cache-file}"
];
ExecStart = "${cfg.package}/bin/ntfy serve -c ${configuration}";
User = cfg.user;
StateDirectory = "ntfy-sh";
DynamicUser = true;
AmbientCapabilities = "CAP_NET_BIND_SERVICE";
PrivateTmp = true;
NoNewPrivileges = true;
@ -88,17 +84,8 @@ in
RestrictNamespaces = true;
RestrictRealtime = true;
MemoryDenyWriteExecute = true;
};
};
users.groups = optionalAttrs (cfg.group == "ntfy-sh") {
ntfy-sh = { };
};
users.users = optionalAttrs (cfg.user == "ntfy-sh") {
ntfy-sh = {
isSystemUser = true;
group = cfg.group;
# Upstream Requirements
LimitNOFILE = 20500;
};
};
};

View File

@ -19,7 +19,7 @@ in
services.pufferpanel = {
enable = true;
extraPackages = with pkgs; [ bash curl gawk gnutar gzip ];
package = pkgs.buildFHSUserEnv {
package = pkgs.buildFHSEnv {
name = "pufferpanel-fhs";
runScript = lib.getExe pkgs.pufferpanel;
targetPkgs = pkgs': with pkgs'; [ icu openssl zlib ];
@ -162,7 +162,7 @@ in
PrivateUsers = true;
PrivateDevices = true;
RestrictRealtime = true;
RestrictNamespaces = [ "user" "mnt" ]; # allow buildFHSUserEnv
RestrictNamespaces = [ "user" "mnt" ]; # allow buildFHSEnv
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ];
LockPersonality = true;
DeviceAllow = [ "" ];

View File

@ -19,5 +19,7 @@ import ./make-test-python.nix {
notif = json.loads(machine.succeed("curl -s localhost:80/test/json?poll=1"))
assert msg == notif["message"], "Wrong message"
machine.succeed("ntfy user list")
'';
}

View File

@ -69,6 +69,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: {
start_all()
server.wait_for_unit("shadowsocks-libev.service")
server.wait_for_unit("nginx.service")
client.wait_for_unit("shadowsocks-client.service")
client.fail(

View File

@ -8,11 +8,11 @@
stdenv.mkDerivation rec {
pname = "urbackup-client";
version = "2.5.20";
version = "2.5.24";
src = fetchzip {
url = "https://hndl.urbackup.org/Client/${version}/urbackup-client-${version}.tar.gz";
sha256 = "sha256-i1g3xUhspqQRfIUhy6STOWNuncK3tMFocJw652r1X9g=";
sha256 = "sha256-n0/NVClZz6ANgEdPCtdZxsEvllIl32vwDjC2nq5R8Z4=";
};
buildInputs = [

View File

@ -29,13 +29,13 @@
buildDotnetModule rec {
pname = "ryujinx";
version = "1.1.819"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
version = "1.1.826"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
src = fetchFromGitHub {
owner = "Ryujinx";
repo = "Ryujinx";
rev = "4ca78eded52f21089400cc28351b9353279b8171";
sha256 = "13g5sgql14rr7qmsiavm6kkjkv9sqqq7cmwpy9iiahbfzc9w1wc1";
rev = "42b9c1e8fede88880454154f8c3683f1f8424ed9";
sha256 = "1r879kvs6v08lrxw75xs5jsffmf8j6bb7bs9szrrgj24aza0kl72";
};
dotnet-sdk = dotnetCorePackages.sdk_7_0;

View File

@ -63,6 +63,7 @@ let
mauikit-calendar = callPackage ./mauikit-calendar { };
mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { };
mauikit-imagetools = callPackage ./mauikit-imagetools.nix { };
mauikit-terminal = callPackage ./mauikit-terminal.nix { };
mauikit-texteditor = callPackage ./mauikit-texteditor.nix { };
mauiman = callPackage ./mauiman.nix { };

View File

@ -1,10 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,6 +89,7 @@ set_package_properties(Qt5QuickCompiler PROPERTIES
find_package(MauiKit)
find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
+find_package(KF5AkonadiCalendar ${AKONADI_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiContact ${AKONADI_CONTACT_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION} CONFIG REQUIRED)

View File

@ -14,8 +14,6 @@
mkDerivation {
pname = "mauikit-calendar";
patches = [ ./add-akonadi-calendar.patch ];
nativeBuildInputs = [
cmake
extra-cmake-modules

View File

@ -1,6 +1,5 @@
{ lib
, mkDerivation
, fetchpatch
, cmake
, extra-cmake-modules
, kconfig
@ -17,14 +16,6 @@
mkDerivation {
pname = "mauikit-imagetools";
patches = [
(fetchpatch {
name = "remove-unused-method.patch";
url = "https://invent.kde.org/maui/mauikit-imagetools/-/commit/344852044d407b144bca01c41a409ceaa548bec0.patch";
hash = "sha256-Cpq/XzDgrKD8YVex2z9VxGTA+iDI5703+fHwkn0cIWA=";
})
];
nativeBuildInputs = [
cmake
extra-cmake-modules

View File

@ -0,0 +1,32 @@
{ lib
, mkDerivation
, cmake
, extra-cmake-modules
, kconfig
, kcoreaddons
, ki18n
, mauikit
}:
mkDerivation {
pname = "mauikit-terminal";
nativeBuildInputs = [
cmake
extra-cmake-modules
];
buildInputs = [
kconfig
kcoreaddons
ki18n
mauikit
];
meta = with lib; {
homepage = "https://invent.kde.org/maui/mauikit-terminal";
description = "Terminal support components for Maui applications";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ dotlambda ];
};
}

View File

@ -4,19 +4,19 @@
{
agenda = {
version = "0.1.1";
version = "0.5.0";
src = fetchurl {
url = "${mirror}/stable/maui/agenda/0.1.1/agenda-0.1.1.tar.xz";
sha256 = "0czpsybvvvnfg0n1ri94a2agwhdnmy124ggxqb5kjnsw35ivz35a";
name = "agenda-0.1.1.tar.xz";
url = "${mirror}/stable/maui/agenda/0.5.0/agenda-0.5.0.tar.xz";
sha256 = "1ak87cda64c05knzdjf6sxjn70chs2sa6zh2adhq3mqm3dh9flf7";
name = "agenda-0.5.0.tar.xz";
};
};
arca = {
version = "0.1.1";
version = "0.5.0";
src = fetchurl {
url = "${mirror}/stable/maui/arca/0.1.1/arca-0.1.1.tar.xz";
sha256 = "0d4mdv1israljn9mhpb3nx8442g7kiqg87gmsb74z08v02yywmc0";
name = "arca-0.1.1.tar.xz";
url = "${mirror}/stable/maui/arca/0.5.0/arca-0.5.0.tar.xz";
sha256 = "12bqk5dxh1rqnbj61kymkzzgmilas6jilid4rijdgjaahdahw6hk";
name = "arca-0.5.0.tar.xz";
};
};
bonsai = {
@ -28,35 +28,35 @@
};
};
booth = {
version = "1.0.2";
version = "1.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/booth/1.0.2/booth-1.0.2.tar.xz";
sha256 = "1b9akwwi1cmvk87zna0yrw1a6mwjd8qg0k3lnivwqfm5zi1xlpb6";
name = "booth-1.0.2.tar.xz";
url = "${mirror}/stable/maui/booth/1.1.0/booth-1.1.0.tar.xz";
sha256 = "1jr5iha1lvqnsh29y6k60nd63dqyh1clj8idqssfvaz09skbyk1q";
name = "booth-1.1.0.tar.xz";
};
};
buho = {
version = "2.2.2";
version = "3.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/buho/2.2.2/buho-2.2.2.tar.xz";
sha256 = "0kvg34dmk46aawa8vnl70m8gi6qjr709czgmzb8a7pa77clyyyg8";
name = "buho-2.2.2.tar.xz";
url = "${mirror}/stable/maui/buho/3.0.0/buho-3.0.0.tar.xz";
sha256 = "1426b9wr8l8rzxgyahlchv9d4dgpqz5dr5nza3jax6mlh4ams507";
name = "buho-3.0.0.tar.xz";
};
};
clip = {
version = "2.2.2";
version = "3.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/clip/2.2.2/clip-2.2.2.tar.xz";
sha256 = "1dk9x5lrp197g2qgi10p536dshaaxacgrkwr3pqywqcqqyrvjiyf";
name = "clip-2.2.2.tar.xz";
url = "${mirror}/stable/maui/clip/3.0.0/clip-3.0.0.tar.xz";
sha256 = "0a6z4h5rp3kmy5pp37df0abvbqxd6hx1jkss9w2sh59v8zijvrck";
name = "clip-3.0.0.tar.xz";
};
};
communicator = {
version = "2.2.2";
version = "3.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/communicator/2.2.2/communicator-2.2.2.tar.xz";
sha256 = "02c7w6km6a5plf56g4wwdw8k8kif3pmwd1agvhvfpq84yq73naz4";
name = "communicator-2.2.2.tar.xz";
url = "${mirror}/stable/maui/communicator/3.0.0/communicator-3.0.0.tar.xz";
sha256 = "01qgqirjax3l8sn9813dl6ppz9p2syg83ljrxqgaj94h08ll2vi0";
name = "communicator-3.0.0.tar.xz";
};
};
era = {
@ -68,123 +68,123 @@
};
};
fiery = {
version = "1.0.2";
version = "1.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/fiery/1.0.2/fiery-1.0.2.tar.xz";
sha256 = "0xw3p0dna3p05k8mv8sw8aw3clgb3kx72405826k0ldva8mh5q55";
name = "fiery-1.0.2.tar.xz";
url = "${mirror}/stable/maui/fiery/1.1.0/fiery-1.1.0.tar.xz";
sha256 = "16kwi6gwxzrb2c8x9s97ibsflv30j3z3sp2if6ypand74ni1b4px";
name = "fiery-1.1.0.tar.xz";
};
};
index-fm = {
version = "2.2.2";
version = "3.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/index/2.2.2/index-fm-2.2.2.tar.xz";
sha256 = "156fb5kx9hkdg4q4c2r0822s49w86kixvn3m7m1gfxbc6hr5h291";
name = "index-fm-2.2.2.tar.xz";
url = "${mirror}/stable/maui/index/3.0.0/index-fm-3.0.0.tar.xz";
sha256 = "1w9fdwn7yvy389300p8qhb3795zzaqkqfrc1vnxydgzn995yv80w";
name = "index-fm-3.0.0.tar.xz";
};
};
mauikit = {
version = "2.2.1";
version = "3.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit/2.2.1/mauikit-2.2.1.tar.xz";
sha256 = "0rwjd2g82j1cvspr0l889nss6p26yf19h39q20h3d9ls7fbj897h";
name = "mauikit-2.2.1.tar.xz";
url = "${mirror}/stable/maui/mauikit/3.0.0/mauikit-3.0.0.tar.xz";
sha256 = "1n95fcwgda9m9fmc90q0079xx4m9yh99yd51pj0nw7ynazlq2wyy";
name = "mauikit-3.0.0.tar.xz";
};
};
mauikit-accounts = {
version = "2.2.2";
version = "3.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-accounts/2.2.2/mauikit-accounts-2.2.2.tar.xz";
sha256 = "10rvzy5m5bmf98q5akvq87q00nz9mxmnp9ywnswl65gnmihiwis8";
name = "mauikit-accounts-2.2.2.tar.xz";
url = "${mirror}/stable/maui/mauikit-accounts/3.0.0/mauikit-accounts-3.0.0.tar.xz";
sha256 = "0ff7zrlvhqfsnwbfbp5bz3vgxldxl09rlaajz4g9k7n81apa0fgv";
name = "mauikit-accounts-3.0.0.tar.xz";
};
};
mauikit-calendar = {
version = "1.0.1";
version = "1.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-calendar/1.0.1/mauikit-calendar-1.0.1.tar.xz";
sha256 = "0l3195zy2qzcc1in9m0k8lpzbqbhdjvlr40n23plr6ldwc61q34b";
name = "mauikit-calendar-1.0.1.tar.xz";
url = "${mirror}/stable/maui/mauikit-calendar/1.1.0/mauikit-calendar-1.1.0.tar.xz";
sha256 = "1532ndxw6a2isw1zxhp5khk0ydczm03d7b42c5smjy56fkp7xmgx";
name = "mauikit-calendar-1.1.0.tar.xz";
};
};
mauikit-documents = {
version = "1.0.1";
version = "1.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-documents/1.0.1/mauikit-documents-1.0.1.tar.xz";
sha256 = "0rfznsdlfhf0bjk4fkybbvv56c55w0krjaa8by26fzkqannd7smd";
name = "mauikit-documents-1.0.1.tar.xz";
url = "${mirror}/stable/maui/mauikit-documents/1.1.0/mauikit-documents-1.1.0.tar.xz";
sha256 = "06r5jf0rmrry9hd0gbjz63a0f5r8dykkggww531jaqm898h79wrs";
name = "mauikit-documents-1.1.0.tar.xz";
};
};
mauikit-filebrowsing = {
version = "2.2.2";
version = "3.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-filebrowsing/2.2.2/mauikit-filebrowsing-2.2.2.tar.xz";
sha256 = "0dj06qak410gf4xykhigxrswbchfkicgihzksgv63z9ggfg64jbr";
name = "mauikit-filebrowsing-2.2.2.tar.xz";
url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.0/mauikit-filebrowsing-3.0.0.tar.xz";
sha256 = "03qdiww4dh6picsfhmzg0v5mf3ygsnprwq3x6s1lzlanl5a83pyk";
name = "mauikit-filebrowsing-3.0.0.tar.xz";
};
};
mauikit-imagetools = {
version = "2.2.2";
version = "3.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-imagetools/2.2.2/mauikit-imagetools-2.2.2.tar.xz";
sha256 = "1jf60725v887dfl3l9sbknkwns15bz7a7b9v0p6llhw00hiq83b4";
name = "mauikit-imagetools-2.2.2.tar.xz";
url = "${mirror}/stable/maui/mauikit-imagetools/3.0.0/mauikit-imagetools-3.0.0.tar.xz";
sha256 = "0lj8d6k78xiy3wcc2jhhqvdw0p5vji95280dvclkmh0ilvb7lfrd";
name = "mauikit-imagetools-3.0.0.tar.xz";
};
};
mauikit-terminal = {
version = "1.0.0";
version = "1.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-terminal/1.0.0/mauikit-terminal-1.0.0.tar.xz";
sha256 = "1r6dcna2fyglj4q33i5qnzv763y3y65fcqb4ralyydlb8x2nb248";
name = "mauikit-terminal-1.0.0.tar.xz";
url = "${mirror}/stable/maui/mauikit-terminal/1.1.0/mauikit-terminal-1.1.0.tar.xz";
sha256 = "0aki6m39yy2cnq3v6mdgyzld3slp0k5qd7v5g5hqb38mrbsbl66a";
name = "mauikit-terminal-1.1.0.tar.xz";
};
};
mauikit-texteditor = {
version = "2.2.2";
version = "3.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauikit-texteditor/2.2.2/mauikit-texteditor-2.2.2.tar.xz";
sha256 = "0g8n0xzn9iiq122hb23rhn3c9vkq6hm7kgv5mv8dx2kv17gdyzcg";
name = "mauikit-texteditor-2.2.2.tar.xz";
url = "${mirror}/stable/maui/mauikit-texteditor/3.0.0/mauikit-texteditor-3.0.0.tar.xz";
sha256 = "1flbgsrp91fgv9m1xvlzsng3ks94i07k79832nx2azzs4g704sgf";
name = "mauikit-texteditor-3.0.0.tar.xz";
};
};
mauiman = {
version = "1.0.2";
version = "1.1.0";
src = fetchurl {
url = "${mirror}/stable/maui/mauiman/1.0.2/mauiman-1.0.2.tar.xz";
sha256 = "0v3jhy3j04aq5935pr6mzgdjwj6mgj1rwscmmg3b9vsi9f6s17n4";
name = "mauiman-1.0.2.tar.xz";
url = "${mirror}/stable/maui/mauiman/1.1.0/mauiman-1.1.0.tar.xz";
sha256 = "13s6wvp7h4zivw2m4hblsyha9qkihfqx41gh9jyw9pj8kmfp08v5";
name = "mauiman-1.1.0.tar.xz";
};
};
nota = {
version = "2.2.2";
version = "3.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/nota/2.2.2/nota-2.2.2.tar.xz";
sha256 = "1c72s4ra5gl9gpq8amwhaw9wkgrgd0fiaknxhn528gzpmq52i8rn";
name = "nota-2.2.2.tar.xz";
url = "${mirror}/stable/maui/nota/3.0.0/nota-3.0.0.tar.xz";
sha256 = "0jk18qxkcx6n54pnm4mr2vpnhi07hscavacr1kijk4rxf0dyxf1i";
name = "nota-3.0.0.tar.xz";
};
};
pix = {
version = "2.2.2";
version = "3.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/pix/2.2.2/pix-2.2.2.tar.xz";
sha256 = "0j315n1aka0pikqyq2hy15k3indr7g8vkcyxsikdd3kj968386pv";
name = "pix-2.2.2.tar.xz";
url = "${mirror}/stable/maui/pix/3.0.0/pix-3.0.0.tar.xz";
sha256 = "1h82c3xip1s3ii5f1maq5d9invgbxzarai8ba6c274lkv70yv1ni";
name = "pix-3.0.0.tar.xz";
};
};
shelf = {
version = "2.2.2";
version = "3.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/shelf/2.2.2/shelf-2.2.2.tar.xz";
sha256 = "1aw6k7z7w0qslya20h0gv3k8h526jrz8a6vb10ack3i5gw6csp1k";
name = "shelf-2.2.2.tar.xz";
url = "${mirror}/stable/maui/shelf/3.0.0/shelf-3.0.0.tar.xz";
sha256 = "1944626qyxyybd8asfs00mkvljykz5ndxmnmi4jiz01j0xc70dyd";
name = "shelf-3.0.0.tar.xz";
};
};
station = {
version = "2.2.2";
version = "3.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/station/2.2.2/station-2.2.2.tar.xz";
sha256 = "1svs6kjbk09l3sprq64bdm01y73vcb10y4ifh5y2a1fwa99c59sb";
name = "station-2.2.2.tar.xz";
url = "${mirror}/stable/maui/station/3.0.0/station-3.0.0.tar.xz";
sha256 = "04kidqm8hcxf8l1r6qi5bfxg6rkdy77i4inzgsgf3i7ky6gvah96";
name = "station-3.0.0.tar.xz";
};
};
strike = {
@ -196,11 +196,11 @@
};
};
vvave = {
version = "2.2.2";
version = "3.0.0";
src = fetchurl {
url = "${mirror}/stable/maui/vvave/2.2.2/vvave-2.2.2.tar.xz";
sha256 = "0m8jg79gz3dljbkrgjqlfmbmpgwawzaz37avx5nj1rlpm36b195f";
name = "vvave-2.2.2.tar.xz";
url = "${mirror}/stable/maui/vvave/3.0.0/vvave-3.0.0.tar.xz";
sha256 = "1x2vbmc3qk2kgx64dm8k5xm16vlvnhfnhgzv5kx1qxpr7kr3vif8";
name = "vvave-3.0.0.tar.xz";
};
};
}

View File

@ -8,7 +8,9 @@
, kirigami2
, mauikit
, mauikit-filebrowsing
, mauikit-terminal
, qmltermwidget
, qtmultimedia
}:
mkDerivation {
@ -26,7 +28,9 @@ mkDerivation {
kirigami2
mauikit
mauikit-filebrowsing
mauikit-terminal
qmltermwidget
qtmultimedia
];
meta = with lib; {

View File

@ -22,13 +22,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gpxsee";
version = "13.0";
version = "13.3";
src = fetchFromGitHub {
owner = "tumic0";
repo = "GPXSee";
rev = version;
hash = "sha256-3s+LPD4KcnSWrg4JHPcbUjilwztjX8lAdQpx0h4dH0Y=";
hash = "sha256-eJ5jW81GQr/MvOrxinZdalZ4cvGYlVGv7JbePwHGEDY=";
};
patches = (substituteAll {

View File

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "hugo";
version = "0.112.3";
version = "0.112.5";
src = fetchFromGitHub {
owner = "gohugoio";
repo = pname;
rev = "v${version}";
hash = "sha256-5vAPDN4yoecCMuBF+ruedsKMEQhI49dB1pXbY6V1U5I=";
hash = "sha256-phtiYh5+xSc4eeK2hM6bHFg4/Owm1EkInRE+NhuQAUA=";
};
vendorHash = "sha256-A4mWrTSkE1NcLj8ozGXQJIrFMvqeoBC7y7eOTeh3ktw=";

View File

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "alfaview";
version = "8.65.0";
version = "8.67.1";
src = fetchurl {
url = "https://production-alfaview-assets.alfaview.com/stable/linux/${pname}_${version}.deb";
sha256 = "sha256-/1qYC2JCbgiR8fGL9R0mnRm8fY1DbAKhkjkDwEENWsA=";
url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
sha256 = "sha256-ms2mTmme+vaMa1uh9CDb4gxt2RCk9JSdHceYgmdc9kg=";
};
nativeBuildInputs = [

View File

@ -1,6 +1,6 @@
{ lib, stdenv, darwin, fetchFromGitHub, openssl, sqlite }:
(if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv).mkDerivation rec {
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230523";

View File

@ -11,6 +11,8 @@
, qt5compat
, makeWrapper
, wrapQtAppsHook
, botan2
, pkg-config
}:
let
@ -30,6 +32,7 @@ stdenv.mkDerivation {
qmake
qttools
wrapQtAppsHook
pkg-config
] ++ lib.optionals stdenv.isDarwin [ makeWrapper ];
buildInputs = [
@ -38,8 +41,13 @@ stdenv.mkDerivation {
qtsvg
qtwebsockets
qt5compat
botan2
] ++ lib.optionals stdenv.isLinux [ qtwayland ];
qmakeFlags = [
"USE_SYSTEM_BOTAN=1"
];
postInstall =
# Create a lowercase symlink for Linux
lib.optionalString stdenv.isLinux ''

View File

@ -3,22 +3,22 @@
{
"kicad" = {
kicadVersion = {
version = "7.0.4";
version = "7.0.5";
src = {
rev = "4faf1bf99feaa338516c3abe0726232557f2098d";
sha256 = "0kxn4aaaw0n47avw4fvx2v6wp4vh2r7w9vw69f87aqas15w2x1gs";
rev = "4d25ed10349077742994d7e985876b45a224a964";
sha256 = "04mkvz4l6i8bb6mw4y0vmlkg2kvdhkj980w6y6sphb9xq8vzmcxs";
};
};
libVersion = {
version = "7.0.4";
version = "7.0.5";
libSources = {
symbols.rev = "833e50e9cefa929c4e50259a7754040c6c89a262";
symbols.rev = "22b3e34e9221d2fa165b6b5cccf5f162f070de01";
symbols.sha256 = "15100z8g4x28sxz8097ay1vxfxz2c4a1nvvzyx5vjfmhydwqwk49";
templates.rev = "b9de2281e38524068703e6d4876999e323f8c735";
templates.rev = "33cda687a1af1e1907a9fcb916010436df9ab1ae";
templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq";
footprints.rev = "651238cdd56ea8ba601665eb754005d7eec4c89f";
footprints.sha256 = "18w9l9fszbsq8gmfi0118f1m91q88cwijz4nyivyw824qk4vwx3f";
packages3d.rev = "0cf4dc05de6369d653051c4c2800820bb5dabfaa";
footprints.rev = "208252e63ade41c127b362c4cc676fd123dfeeb2";
footprints.sha256 = "11d3mwmivi6rc778a2x118a5mk11d9mr8miadxmy1mbc41jbx2dh";
packages3d.rev = "b7f731784124742a692008b3150662188ebc6193";
packages3d.sha256 = "1bzb6b7llzwabjkdd0xsyan0x8kihccap4gwvipzydfg7gm5fjxm";
};
};

View File

@ -125,8 +125,10 @@ stdenv.mkDerivation rec {
wrapQtApp "$out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer" \
--set LD_LIBRARY_PATH "${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}" \
--set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb"
substituteInPlace $out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer \
--replace "TopDirectory=" "TopDirectory=$out/libexec/${dirName} #"
if ! isELF "$out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer"; then
substituteInPlace $out/libexec/${dirName}/SystemFiles/FrontEnd/Binaries/Linux-x86-64/WolframPlayer \
--replace "TopDirectory=" "TopDirectory=$out/libexec/${dirName} #";
fi
for path in WolframPlayer wolframplayer; do
makeWrapper $out/libexec/${dirName}/Executables/$path $out/bin/$path

View File

@ -7,6 +7,13 @@
let allVersions = with lib; flip map
# N.B. Versions in this list should be ordered from newest to oldest.
[
{
version = "13.2.0";
lang = "en";
language = "English";
sha256 = "1xvg1n64iq52jxnk9y551m5iwkkz6cxzwyw28h8d0kq36aaiky24";
installer = "WolframEngine_13.2.0_LINUX.sh";
}
{
version = "13.1.0";
lang = "en";

View File

@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "obs-source-clone";
version = "0.1.3";
version = "0.1.4";
src = fetchFromGitHub {
owner = "exeldro";
repo = "obs-source-clone";
rev = version;
sha256 = "sha256-cgqv2QdeGz4Aeoy4Dncw03l7NWGsZN1lsrZH7uHxGxw=";
sha256 = "sha256-E2pHJO3cdOXmSlTVGsz4tncm9fMaa8Rhsq9YZDNidjs=";
};
nativeBuildInputs = [ cmake ];

View File

@ -17,4 +17,4 @@ assert pname == null || pname == crateName;
url = "${registryDl}/${crateName}/${version}/download";
} // lib.optionalAttrs unpack {
extension = "tar.gz";
} // removeAttrs args [ "crateName" "pname" "version" "unpack" ])
} // removeAttrs args [ "crateName" "pname" "registryDl" "version" "unpack" ])

View File

@ -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.2" = {
sha256 = "sha256-RMwWLPpjMqmojHoSHRkDiCikuk9r/7d+8cexdAfLHqo=";
};
"2.3.4" = {
sha256 = "sha256-8RtHZMbqvbJ+WpxGshcgTRG82lNOc7+XBz1Xgx0gnE4=";
};
"2.3.5" = {
sha256 = "sha256-ickHIM+dBdvNkNaQ44GiUUwPGAcVng1yIiIMWowtUYY=";
};
};
in with versionMap.${version};

View File

@ -24,14 +24,14 @@ let
in
stdenv.mkDerivation rec {
pname = "libei";
version = "0.99.1";
version = "0.99.2";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "libinput";
repo = "libei";
rev = version;
hash = "sha256-r/rkN2d8P30P/IL1YaLWWRbA5s3uVq5Fc/K1vhS31tw=";
hash = "sha256-hxWWOvqenHHnzrvRwSwNT1GFVx9NR+Mm1XK9nisF8fA=";
};
buildInputs = [

View File

@ -1,4 +1,26 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices, pkgsStatic }:
{ stdenv
, lib
, fetchFromGitHub
, autoconf
, automake
, libtool
, pkg-config
, ApplicationServices
, CoreServices
, pkgsStatic
# for passthru.tests
, bind
, cmake
, knot-resolver
, lispPackages
, luajitPackages
, mosquitto
, neovim
, nodejs
, ocamlPackages
, python3
}:
stdenv.mkDerivation rec {
version = "1.45.0";
@ -76,7 +98,16 @@ stdenv.mkDerivation rec {
# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;
passthru.tests.static = pkgsStatic.libuv;
passthru.tests = {
inherit bind cmake knot-resolver mosquitto neovim nodejs;
inherit (lispPackages) cl-libuv;
luajit-libluv = luajitPackages.libluv;
luajit-luv = luajitPackages.luv;
ocaml-luv = ocamlPackages.luv;
python-pyuv = python3.pkgs.pyuv;
python-uvloop = python3.pkgs.uvloop;
static = pkgsStatic.libuv;
};
meta = with lib; {
description = "A multi-platform support library with a focus on asynchronous I/O";

View File

@ -322,13 +322,27 @@ let
};
buildScript = pkgs.writeText "build-stumpwm.lisp" ''
(load "${super.stumpwm.asdfFasl}/asdf.${super.stumpwm.faslExt}")
(asdf:load-system 'stumpwm/build)
(asdf:load-system 'stumpwm)
;; Prevents package conflict error
(when (uiop:version<= "3.1.5" (asdf:asdf-version))
(uiop:symbol-call '#:asdf '#:register-immutable-system :stumpwm)
(dolist (system-name (uiop:symbol-call '#:asdf
'#:system-depends-on
(asdf:find-system :stumpwm)))
(uiop:symbol-call '#:asdf '#:register-immutable-system system-name)))
;; Prevents "cannot create /homeless-shelter" error
(asdf:disable-output-translations)
(sb-ext:save-lisp-and-die
"stumpwm"
:executable t
:purify t
#+sb-core-compression :compression
#+sb-core-compression t
:toplevel #'stumpwm:main)
:toplevel #'stumpwm:stumpwm)
'';
installPhase = ''
mkdir -p $out/bin
@ -336,6 +350,8 @@ let
'';
});
stumpwm-unwrapped = super.stumpwm;
ltk = super.ltk.overrideLispAttrs (o: {
src = pkgs.fetchzip {
url = "https://github.com/uthar/ltk/archive/f19162e76d6c7c2f51bd289b811d9ba20dd6555e.tar.gz";

View File

@ -7,7 +7,9 @@
, "@commitlint/config-conventional"
, "@emacs-eask/cli"
, "@forge/cli"
, "@maizzle/cli"
, "@medable/mdctl-cli"
, "@mermaid-js/mermaid-cli"
, "@microsoft/rush"
, "@nerdwallet/shepherd"
, "@shopify/cli"
@ -212,6 +214,7 @@
, "lua-fmt"
, "lv_font_conv"
, "madoko"
, "mailwind"
, "markdownlint-cli"
, "markdownlint-cli2"
, "markdown-link-check"
@ -219,7 +222,6 @@
, "mastodon-bot"
, "mathjax"
, "meat"
, "@mermaid-js/mermaid-cli"
, "mocha"
, "multi-file-swagger"
, "musescore-downloader"

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@
buildDunePackage rec {
pname = "gapi-ocaml";
version = "0.4.3";
version = "0.4.4";
duneVersion = "3";
minimalOCamlVersion = "4.08";
@ -14,7 +14,7 @@ buildDunePackage rec {
owner = "astrada";
repo = pname;
rev = "v${version}";
sha256 = "sha256-V0GB9Bd06IdcI5PDFHGVZ0Y/qi7tTs/4ITqPXUOxCLs=";
hash = "sha256-+UNFW5tmIh5dVyTDEOfOmy1j+gV4P28jlnBTdpQNAjE=";
};
propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ];
@ -24,7 +24,7 @@ buildDunePackage rec {
meta = {
description = "OCaml client for google services";
inherit (src.meta) homepage;
homepage = "https://github.com/astrada/gapi-ocaml";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ bennofs ];
};

View File

@ -2,13 +2,13 @@
buildDunePackage rec {
pname = "ocamlfuse";
version = "2.7.1_cvs7";
version = "2.7.1_cvs8";
src = fetchFromGitHub {
owner = "astrada";
repo = "ocamlfuse";
rev = "v${version}";
sha256 = "6nmPXZx38hBGlg+gV9nnlRpPfeSAqDj4zBPcjUNvTRo=";
hash = "sha256-Cm9mdYzpKnYoNyAJvjJkiDBP/O4n1JiTkhXQO3w7+hA=";
};
nativeBuildInputs = [ camlidl ];

View File

@ -1,21 +1,19 @@
{ lib, fetchFromGitHub, buildDunePackage
, seq
, containers, qcheck
}:
buildDunePackage rec {
version = "0.4";
version = "0.5";
pname = "oseq";
src = fetchFromGitHub {
owner = "c-cube";
repo = pname;
rev = "v${version}";
hash = "sha256-FoCBvvPwa/dUCrgDEd0clEKAO7EcpedjaO4v+yUO874=";
hash = "sha256-JMIcRyciNvLOE1Gpin7CpcDNSmGYFxZWsDN0X6D/NVI=";
};
propagatedBuildInputs = [ seq ];
minimalOCamlVersion = "4.08";
duneVersion = "3";
doCheck = true;

View File

@ -0,0 +1,49 @@
{ lib
, aiofiles
, buildPythonPackage
, cryptography
, fetchFromGitHub
, protobuf
, pythonOlder
, setuptools
}:
buildPythonPackage rec {
pname = "androidtvremote2";
version = "0.0.9";
format = "pyproject";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "tronikos";
repo = "androidtvremote2";
rev = "refs/tags/v${version}";
hash = "sha256-gQ2PVEhX1jwd0yvMf/Z0yKvruDzpY5080x4IU2i/PJ4=";
};
nativeBuildInputs = [
setuptools
];
propagatedBuildInputs = [
aiofiles
cryptography
protobuf
];
pythonImportsCheck = [
"androidtvremote2"
];
# Module only has a dummy test
doCheck = false;
meta = with lib; {
description = "Library to interact with the Android TV Remote protocol v2";
homepage = "https://github.com/tronikos/androidtvremote2";
changelog = "https://github.com/tronikos/androidtvremote2/releases/tag/v${version}";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -1,6 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, hatchling
, freezegun
, graphql-core
, opentracing
@ -17,7 +18,7 @@
buildPythonPackage rec {
pname = "ariadne";
version = "0.18.1";
format = "setuptools";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -28,6 +29,10 @@ buildPythonPackage rec {
hash = "sha256-E7uC+l0Yjol8UPLF4CV+PN49tOUJXNUS5yYdF1oyfwU=";
};
nativeBuildInputs = [
hatchling
];
propagatedBuildInputs = [
graphql-core
starlette
@ -55,6 +60,12 @@ buildPythonPackage rec {
"test_attempt_parse_non_json_request_body_raises_bad_request_error"
];
disabledTestPaths = [
# missing graphql-sync-dataloader test dep
"tests/test_dataloaders.py"
"tests/wsgi/test_configuration.py"
];
meta = with lib; {
description = "Python library for implementing GraphQL servers using schema-first approach";
homepage = "https://ariadnegraphql.org";

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "bc-detect-secrets";
version = "1.4.28";
version = "1.4.29";
format = "setuptools";
disabled = pythonOlder "3.8";
@ -24,7 +24,7 @@ buildPythonPackage rec {
owner = "bridgecrewio";
repo = "detect-secrets";
rev = "refs/tags/${version}";
hash = "sha256-SH45I+81fqvViyiiSwYJq6v8PPcWENCh0Ey6taKI3Us=";
hash = "sha256-oMJMiXS4/OU5/LWV2i2CcDQZL5yuusXGwgZG2OMMlaQ=";
};
propagatedBuildInputs = [

View File

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "django-webpack-loader";
version = "1.8.1";
version = "2.0.0";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-BzvtoY4pKfpc2DuvvKr5deWUXoShe/qBkny2yfWhe5Q=";
hash = "sha256-2hgi5tg//A6ZSbPhWlUEbrumxBY4G2Am5fLK9uHv9lQ=";
};
propagatedBuildInputs = [

View File

@ -0,0 +1,39 @@
{ lib
, buildPythonPackage
, fetchPypi
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "google-search-results";
version = "2.4.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit version;
pname = builtins.replaceStrings [ "-" ] [ "_" ] pname;
hash = "sha256-YDow7K4q+OYAsiY1dXpt8nXa1Lk0+XXmeHjM1kC3gkU=";
};
propagatedBuildInputs = [
requests
];
# almost all tests require an API key or network access
doCheck = false;
pythonImportsCheck = [
"serpapi"
];
meta = with lib; {
description = "Scrape and search localized results from Google, Bing, Baidu, Yahoo, Yandex, Ebay, Homedepot, youtube at scale using SerpApi.com";
homepage = "https://github.com/serpapi/google-search-results-python";
changelog = "https://github.com/serpapi/google-search-results-python/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ natsukium ];
};
}

View File

@ -31,6 +31,7 @@
, azure-core
, elasticsearch
, opensearch-py
, google-search-results
, faiss
, spacy
, nltk
@ -73,7 +74,7 @@
buildPythonPackage rec {
pname = "langchain";
version = "0.0.180";
version = "0.0.183";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -82,7 +83,7 @@ buildPythonPackage rec {
owner = "hwchase17";
repo = "langchain";
rev = "refs/tags/v${version}";
hash = "sha256-5ZA5CXS9+NCyOXGbjgGk+iNCF/B2Wm4xRpR6t5uJ+yg=";
hash = "sha256-AE3OKrp+F6z7j5rGaqeo+hwN5Wi6ik638WrxCtAJ7Ro=";
};
postPatch = ''
@ -160,7 +161,7 @@ buildPythonPackage rec {
manifest-ml
elasticsearch
opensearch-py
# google-search-results
google-search-results
faiss
sentence-transformers
transformers

View File

@ -1,5 +1,6 @@
{ buildPythonPackage
, lib
, stdenv
, libsixel
}:
@ -13,7 +14,7 @@ buildPythonPackage rec {
prePatch = ''
substituteInPlace libsixel/__init__.py --replace \
'from ctypes.util import find_library' \
'find_library = lambda _x: "${lib.getLib libsixel}/lib/libsixel.so"'
'find_library = lambda _x: "${lib.getLib libsixel}/lib/libsixel${stdenv.hostPlatform.extensions.sharedLibrary}"'
'';
# no tests

View File

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "neo4j";
version = "5.8.1";
version = "5.9.0";
format = "setuptools";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "neo4j";
repo = "neo4j-python-driver";
rev = "refs/tags/${version}";
hash = "sha256-kcZtfK4OogHvnZT789LfF7yi9jSWSCXPp0QC2RWAe+I=";
hash = "sha256-HyoIr2ZIOAzFlMrkIDV71JJAFwrxCqExMFXF3U2p9Po=";
};
propagatedBuildInputs = [

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "pydaikin";
version = "2.9.0";
version = "2.9.1";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "mustang51";
repo = pname;
rev = "v${version}";
hash = "sha256-cJkrBt4HRH2SX4YWo+gK4rd7uyZRzLUvFXJ6L5nxzeM=";
hash = "sha256-HWJ+VHrSwdVN+PNp5NoqmDTVqb6RJy2Sr3zlrDuSBgA=";
};
propagatedBuildInputs = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "pyezviz";
version = "0.2.0.12";
version = "0.2.0.15";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "baqs";
repo = "pyEzviz";
rev = "refs/tags/${version}";
hash = "sha256-RHwsKNbjKPMp0Ddc3eEsJbLwCAgbFd+5hpzUABYnTso=";
hash = "sha256-za3LVCOsF5Nw/hvhqKWRkXw5o7ozqJnTbd274x113IE=";
};
propagatedBuildInputs = [

View File

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "pyipp";
version = "0.12.1";
version = "0.13.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -24,9 +24,15 @@ buildPythonPackage rec {
owner = "ctalkington";
repo = "python-ipp";
rev = version;
hash = "sha256-xTSi5Eh6vVuQ+Kr/oVMlh5YcckVRsfTUgdmGHndmX+Q=";
hash = "sha256-lVpXtPxZZCyWycmkXZTMo5WTPtlehNY5IX7tiyIb1uM=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'version = "0.0.0"' 'version = "${version}"' \
--replace "--cov" ""
'';
nativeBuildInputs = [
poetry-core
];
@ -45,17 +51,14 @@ buildPythonPackage rec {
pytestCheckHook
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace 'version = "0.0.0"' 'version = "${version}"' \
--replace " --cov" ""
'';
__darwinAllowLocalNetworking = true;
pythonImportsCheck = [
"pyipp"
];
meta = with lib; {
changelog = "https://github.com/ctalkington/python-ipp/releases/tag/${version}";
description = "Asynchronous Python client for Internet Printing Protocol (IPP)";
homepage = "https://github.com/ctalkington/python-ipp";
license = licenses.mit;

View File

@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "pysqueezebox";
version = "0.6.1";
version = "0.7.0";
format = "setuptools";
disabled = pythonOlder "3.6";
@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "rajlaud";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-NCADVSsnaOJfLJ7i18i7d7wlWcyt1DoRFGOVXEEYHPI=";
hash = "sha256-nNCxptQDabNPKtKFy19kBl5rIhlHlgvvKkz/JWj3k8A=";
};
propagatedBuildInputs = [

View File

@ -11,14 +11,14 @@
buildPythonPackage rec {
pname = "pytest-md-report";
version = "0.3.0";
version = "0.3.1";
format = "setuptools";
disabled = pythonOlder "3.6";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-ra88WXG6+xHSjOcy6tdYjvpKpNlvu6lq+sZckLadAlU=";
hash = "sha256-muQ8lb00tdhAvaLaNupuHh6YqbDEvkaGFbnb4tR2Wes=";
};
propagatedBuildInputs = [

View File

@ -14,7 +14,7 @@
buildPythonPackage rec {
pname = "pytorch-metric-learning";
version = "2.1.1";
version = "2.1.2";
disabled = isPy27;
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "KevinMusgrave";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-XQ7lHhtcsqANuNVmjNMRjVdvwVo5hIVqTeNrnMF80uE=";
hash = "sha256-B2gDPOQSJGg29xjJbZsWUrSalBnn+S8h+2j8NQ4tfTM=";
};
propagatedBuildInputs = [

View File

@ -8,13 +8,13 @@
buildPythonPackage rec {
pname = "shlib";
version = "1.5";
version = "1.6";
src = fetchFromGitHub {
owner = "KenKundert";
repo = "shlib";
rev = "v${version}";
hash = "sha256-2fwRxa64QXKJuhYwt9Z4BxhTeq1iwbd/IznfxPUjeSM=";
rev = "refs/tags/v${version}";
hash = "sha256-f2jJgpjybutCpYnIT+RihtoA1YlXdhTs+MvV8bViSMQ=";
};
pythonImportsCheck = [ "shlib" ];

View File

@ -1,36 +0,0 @@
From 7b5ac168892dedc5bd6be4244b18dc32d37d00fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Fri, 22 Apr 2022 15:26:05 +0200
Subject: [PATCH] xep_0030: allow extra args in get_info_from_domain
Aftermath of ea2d851a.
http_upload from xep_0363 is now forwarding all its extra input args
to get_info_from_domain. Sadly for us, get_info_from_domain won't
accept any extra args passed that way and will yield a "got an
unexpected keyword argument".
Modifying get_info_from_domain to accept these extra args.
I hit this bug by passing a timeout_callback argument to http_upload.
Adding this scenario to the relevant integration test.
---
itests/test_httpupload.py | 1 +
slixmpp/plugins/xep_0030/disco.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/slixmpp/plugins/xep_0030/disco.py b/slixmpp/plugins/xep_0030/disco.py
index 37d453aa..9f9a45f2 100644
--- a/slixmpp/plugins/xep_0030/disco.py
+++ b/slixmpp/plugins/xep_0030/disco.py
@@ -307,7 +307,7 @@ class XEP_0030(BasePlugin):
return self.api['has_identity'](jid, node, ifrom, data)
async def get_info_from_domain(self, domain=None, timeout=None,
- cached=True, callback=None):
+ cached=True, callback=None, **iqkwargs):
"""Fetch disco#info of specified domain and one disco#items level below
"""
--
2.35.1

View File

@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "slixmpp";
version = "1.8.3";
version = "1.8.4";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-rJtZqq7tZ/VFk4fMpDZYyTQRa1Pokmn2aw6LA+FBGXw=";
hash = "sha256-QG8fS6t+dXPdVZpEECfT3jPRe7o1S88g3caq+6JyKGs=";
};
propagatedBuildInputs = [
@ -39,8 +39,6 @@ buildPythonPackage rec {
src = ./hardcode-gnupg-path.patch;
inherit gnupg;
})
# Upstream MR: https://lab.louiz.org/poezio/slixmpp/-/merge_requests/198
./0001-xep_0030-allow-extra-args-in-get_info_from_domain.patch
];
disabledTestPaths = [
@ -56,6 +54,7 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library for XMPP";
homepage = "https://slixmpp.readthedocs.io/";
changelog = "https://lab.louiz.org/poezio/slixmpp/-/tags/slix-${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};

View File

@ -6,22 +6,31 @@
, pytest-cov
, pytest-httpserver
, pytestCheckHook
, pythonOlder
, setuptools-scm
, voluptuous
}:
buildPythonPackage rec {
pname = "solax";
version = "0.3.0";
version = "0.3.1";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-lqzFY2Rfmc/9KUuFfq07DZkIIS2cJ1JqZ/8gP3+pu5U=";
hash = "sha256-kseU6JK00GTPyqdWku2ceT5/mChMVVPgEEib3BmjI/g=";
};
nativeBuildInputs = [ setuptools-scm ];
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [ aiohttp voluptuous ];
propagatedBuildInputs = [
aiohttp
voluptuous
];
nativeCheckInputs = [
pytest-asyncio
@ -30,7 +39,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "solax" ];
pythonImportsCheck = [
"solax"
];
meta = with lib; {
description = "Python wrapper for the Solax Inverter API";

View File

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "soxr";
version = "0.3.4";
version = "0.3.5";
format = "pyproject";
src = fetchFromGitHub {
@ -26,7 +26,7 @@ buildPythonPackage rec {
repo = "python-soxr";
rev = "refs/tags/v${version}";
fetchSubmodules = true;
hash = "sha256-/NFGzOF1X9c0yccgtVNUO+1aIWoNdJqP/OKcNj+uKpk=";
hash = "sha256-q/K7XlqvDHAna+fqN6iiJ9wD8efsuwHiEfKjXS46jz8=";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;

View File

@ -0,0 +1,28 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
}:
buildPythonPackage rec {
pname = "tftpy";
version = "0.8.2";
format = "pyproject";
src = fetchPypi {
inherit pname version;
hash = "sha256-4dGmgO/YjroXazURdYRCUwZzkqmw+LgViOP/K557u1s=";
};
nativeBuildInputs = [ setuptools ];
pythonImportsCheck = [ "tftpy" ];
meta = {
description = "Pure Python TFTP library";
homepage = "https://github.com/msoulier/tftpy";
changelog = "https://github.com/msoulier/tftpy/releases/tag/${version}";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ otavio ];
};
}

View File

@ -1,7 +1,8 @@
{ lib
, stdenv
, buildPythonPackage
, fetchFromGitHub
, async_generator
, exceptiongroup
, pytest-trio
, pytestCheckHook
, trio
@ -11,17 +12,18 @@
buildPythonPackage rec {
pname = "trio-websocket";
version = "0.9.2";
version = "0.10.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "HyperionGray";
repo = "trio-websocket";
rev = version;
hash = "sha256-8VrpI/pk5IhEvqzo036cnIbJ1Hu3UfQ6GHTNkNJUYvo=";
hash = "sha256-djoTxkIKY52l+WnxL1FwlqrU/zvsLVkPUAHn9BxJ45k=";
};
propagatedBuildInputs = [
async_generator
exceptiongroup
trio
wsproto
];
@ -32,10 +34,25 @@ buildPythonPackage rec {
trustme
];
disabledTests = lib.optionals stdenv.isDarwin [
# Failed: DID NOT RAISE <class 'ValueError'>
"test_finalization_dropped_exception"
# Timing related
"test_client_close_timeout"
"test_cm_exit_with_pending_messages"
"test_server_close_timeout"
"test_server_handler_exit"
"test_server_open_timeout"
];
__darwinAllowLocalNetworking = true;
pythonImportsCheck = [ "trio_websocket" ];
meta = with lib; {
changelog = "https://github.com/HyperionGray/trio-websocket/blob/${version}/CHANGELOG.md";
description = "WebSocket client and server implementation for Python Trio";
homepage = "https://github.com/HyperionGray/trio-websocket";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};

View File

@ -6,26 +6,24 @@
, docopt
, pythonOlder
, urllib3
, pythonRelaxDepsHook
}:
buildPythonPackage rec {
pname = "tubeup";
version = "0.0.35";
version = "28.5.2023";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
sha256 = "006aea68bb8d967a7427c58ee7862e3f2481dae667c2bbcfb1a1f2fd80e665d1";
sha256 = "sha256-wsYap8OspTPW3BBtFF3a2oyRgmu3W/dywbkFuNjvzhg=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "internetarchive==3.0.2" "internetarchive" \
--replace "urllib3==1.26.13" "urllib3" \
--replace "docopt==0.6.2" "docopt"
'';
nativeBuildInputs = [
pythonRelaxDepsHook
];
propagatedBuildInputs = [
internetarchive
@ -34,6 +32,12 @@ buildPythonPackage rec {
yt-dlp
];
pythonRelaxDeps = [
"internetarchive"
"urllib3"
"docopt"
];
pythonImportsCheck = [
"tubeup"
];

View File

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "xknx";
version = "2.9.0";
version = "2.10.0";
format = "pyproject";
disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "XKNX";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-1Nt69lIle4vKSXfsTKWry1DXqCBEvBJz2JOOWrUYdX4=";
hash = "sha256-3eSS3V1EgLRf8lB3icG4pNGq0VbXjfgwEQ91mMRKyAE=";
};
nativeBuildInputs = [

View File

@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
brakeman (5.4.1)
brakeman (6.0.0)
PLATFORMS
ruby
@ -10,4 +10,4 @@ DEPENDENCIES
brakeman
BUNDLED WITH
2.4.6
2.4.13

View File

@ -4,9 +4,9 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0wzvxpabnjwwjgr9s13965dbdgl3qfvwjbmhimh83p81bm5lsrnw";
sha256 = "1l2584f7cm7lmwihm1l449rk6vl4wlx3s7x317cm2inapzjhiybg";
type = "gem";
};
version = "5.4.1";
version = "6.0.0";
};
}

View File

@ -22,14 +22,14 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
version = "2.3.259";
version = "2.3.261";
format = "setuptools";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-TQSty1X0jD4Z5gZfl8ecpt4/7FLOjpNBXs5hVblwKvs=";
hash = "sha256-GRP9crehMlU+T2Iss0fUh00M6nD7dJYDtagDvBakipo=";
};
patches = [

View File

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage rec {
pname = "pylyzer";
version = "0.0.28";
version = "0.0.29";
src = fetchFromGitHub {
owner = "mtshiba";
repo = "pylyzer";
rev = "v${version}";
hash = "sha256-+i35dkYtvGrjN3KWtCfr6W4TkNmV0T8CF+WcaodPbX4=";
hash = "sha256-9oZAkbA/KCP0fIzsC91xTrEnqiID1knxvY7Y2syfK+o=";
};
cargoHash = "sha256-y/CZDh7TURi6VBko+/3U2HQ41asn1IWJF/1WPD0DyT4=";
cargoHash = "sha256-MRoCPoxv8mhoxty04f5aLVgb0U4WEmkRWZmCOy9zTf0=";
nativeBuildInputs = [
git

View File

@ -16,8 +16,10 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ texinfo ];
pkgsBuildBuild = [ buildPackages.stdenv.cc ]; # needed when cross-compiling
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang
"-Wno-implicit-function-declaration";
env.NIX_CFLAGS_COMPILE = toString (
lib.optional stdenv.cc.isClang "-Wno-implicit-function-declaration"
++ lib.optional (stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc) "13") "-Wno-unused-but-set-variable"
);
hardeningDisable = [ "format" ];

View File

@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o
buildGoModule rec {
pname = "open-policy-agent";
version = "0.52.0";
version = "0.53.0";
src = fetchFromGitHub {
owner = "open-policy-agent";
repo = "opa";
rev = "v${version}";
hash = "sha256-6mMFu4jkH9k9K836p0007a9rwbe9tBZZoW+Bw9Rfwek=";
hash = "sha256-HfQkd0Vl48zGMTXHJoTfVLV/OHHC+T6gcA6pcewhFJU=";
};
vendorHash = null;

View File

@ -5,16 +5,16 @@
rustPlatform.buildRustPackage rec {
pname = "cargo-expand";
version = "1.0.51";
version = "1.0.52";
src = fetchFromGitHub {
owner = "dtolnay";
repo = pname;
rev = version;
sha256 = "sha256-hVJFVmMfdUNkieN7Xog+UjtcQ7nws0ETipJpeYArTM8=";
sha256 = "sha256-xPVS1pynqUiCmM5n+GGgzemOulfM280Zx6GRbvRm0lM=";
};
cargoHash = "sha256-Y1FzWIcHAA0aL4NG2ENVBoNzHcxA40IIA2gdmLKh/o0=";
cargoHash = "sha256-9T5Ro9tX9az23leVaKTz3aMQHN33cxdVTRgvVjLEbeU=";
meta = with lib; {
description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code";

View File

@ -16,12 +16,12 @@ let
];
in stdenv.mkDerivation rec {
pname = "insomnia";
version = "2023.2.0";
version = "2023.2.2";
src = fetchurl {
url =
"https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";
sha256 = "sha256-RI7i/yfGfwmube3Utuidw9Y3OqC+5htsyx1Vi1730WQ=";
sha256 = "sha256-XM7OLr5ety95jjlVqNuQp3rD9laoe1uC1HNP66HJe5M=";
};
nativeBuildInputs = [

View File

@ -13,6 +13,8 @@
libICE,
libSM,
fontconfig,
xdg-utils,
}:
buildDotnetModule rec {
@ -47,6 +49,11 @@ buildDotnetModule rec {
fontconfig
];
# Required for OneClick
makeWrapperArgs = [
''--prefix PATH : "${lib.makeBinPath [ xdg-utils ]}"''
];
meta = with lib; {
description = "Yet another mod installer for Beat Saber, heavily inspired by ModAssistant";
homepage = "https://github.com/affederaffe/BeatSaberModManager";

View File

@ -0,0 +1,20 @@
{ alephone, requireFile }:
alephone.makeWrapper rec {
pname = "apotheosis-x";
version = "1.1";
desktopName = "Marathon-Apotheosis-X";
zip = requireFile {
name = "Apotheosis_X_1.1.zip";
url = "https://www.moddb.com/mods/apotheosis-x/downloads";
sha256 = "sha256-4Y/RQQeN4VTpig8ZyxUpVHwzN8W8ciTBCkSzND8SMbs=";
};
sourceRoot = "Apotheosis X 1.1";
meta = {
description = "Total conversion for Marathon Infinity running on the Aleph One engine";
homepage = "https://simplici7y.com/items/apotheosis-x-5";
};
}

View File

@ -1,23 +1,24 @@
{ lib, stdenv, fetchurl, boost, curl, ffmpeg_4, icoutils, libGLU, libmad, libogg
, libpng, libsndfile, libvorbis, lua, pkg-config, SDL2, SDL2_image, SDL2_net
, SDL2_ttf, smpeg, speex, zziplib, zlib, makeWrapper, makeDesktopItem, unzip
, alephone }:
{ lib, stdenv, fetchurl, alsa-lib, boost, curl, ffmpeg_4, icoutils, libGLU
, libmad, libogg, libpng, libsndfile, libvorbis, lua, miniupnpc, pkg-config
, SDL2, SDL2_image, SDL2_net, SDL2_ttf, speex, zziplib, zlib, makeWrapper
, makeDesktopItem, unzip, alephone }:
let
self = stdenv.mkDerivation rec {
outputs = [ "out" "icons" ];
pname = "alephone";
version = "1.4";
version = "1.6.1";
src = fetchurl {
url = let date = "20210408";
url = let date = "20230119";
in "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${date}/AlephOne-${date}.tar.bz2";
sha256 = "sha256-tMwATUhUpo8W2oSWxGSZcAHVkj1PWEvUR/rpMZwWCWA=";
sha256 = "sha256-rC9RfWUolsKjKGsJaGj0PaO+J4HNF/gQhd56XapcMCY=";
};
nativeBuildInputs = [ pkg-config icoutils ];
buildInputs = [
alsa-lib
boost
curl
ffmpeg_4
@ -28,17 +29,17 @@ let
libpng
libvorbis
lua
miniupnpc
SDL2
SDL2_image
SDL2_net
SDL2_ttf
smpeg
speex
zziplib
zlib
];
configureFlags = [ "--with-boost=${boost}" ];
configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
makeFlags = [ "AR:=$(AR)" ];
enableParallelBuilding = true;

View File

@ -3,13 +3,13 @@
alephone.makeWrapper rec {
pname = "durandal";
desktopName = "Marathon-Durandal";
version = "20150620";
version = "20230119";
icon = alephone.icons + "/marathon2.png";
zip = fetchurl {
url =
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon2-${version}-Data.zip";
sha256 = "1gpg0dk3z8irvdkm4nj71v14lqx77109chqr2ly594jqf6j9wwqv";
sha256 = "sha256-Vbfk5wLgvNEZW2BohMY5mPXaRbNlHxJdWLYTsE8CSwI=";
};
meta = {
@ -18,7 +18,7 @@ alephone.makeWrapper rec {
Fresh from your triumph on the starship Marathon, you are seized by the rogue computer Durandal to do his bidding in a distant part of the galaxy. Within the ruins of an ancient civilization, you must seek the remnants of a lost clan and uncover their long-buried secrets. Battle opponents ancient and terrible, with sophisticated weapons and devious strategies, all the while struggling to escape the alien nightmare
This release of Marathon 2: Durandal includes the classic graphics, and revamped high-definition textures and monsters from the Xbox Live Arcade edition.
'';
'';
homepage = "https://alephone.lhowon.org/games/marathon2.html";
};

View File

@ -3,13 +3,13 @@
alephone.makeWrapper rec {
pname = "marathon-infinity";
desktopName = "Marathon-Infinity";
version = "20220115";
version = "20230119";
icon = alephone.icons + "/marathon-infinity.png";
zip = fetchurl {
url =
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip";
sha256 = "sha256-00Wp+y+b82uZZ8fNeU3N5UAKlk0Sd1SfAEGL6RpyVf8=";
sha256 = "sha256-0+xokhzWdXM+L4DBjWnfNVXZve4n1X/Aq6rxNGAFb3Q=";
};
meta = {

View File

@ -3,12 +3,13 @@
alephone.makeWrapper rec {
pname = "marathon";
desktopName = "Marathon";
version = "20210408";
version = "20230119";
icon = alephone.icons + "/marathon.png";
zip = fetchurl {
url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip";
sha256 = "sha256-WM5c0X/BGeDu8d7hME3LiZavkgJll6rc3Beat/2bsdg=";
url =
"https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip";
sha256 = "sha256-uz/1ZW9epd1HP/pzTNN3d2EEbOzjj0qpdMkrVoxb8Aw=";
};
meta = {

View File

@ -0,0 +1,18 @@
{ alephone, fetchurl }:
alephone.makeWrapper rec {
pname = "yuge";
version = "0";
desktopName = "Marathon-Yuge";
zip = fetchurl {
url = "https://lochnits.com/marathon/yuge/files/Mararthon_Yuge.zip";
sha256 = "sha256-dZHInYThB/4igpAXbUadXwPvh2Fl3XGZ4ficg7IEnNc=";
};
meta = {
description =
"30 level Marathon scenario, plus 225 secret levels for many extra hours of gameplay";
homepage = "https://lochnits.com/marathon/yuge/";
};
}

View File

@ -1,17 +1,16 @@
{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, curl, zlib, ffmpeg, glew, pcre
, rtmpdump, cairo, boost, SDL2, SDL2_mixer, libjpeg, pango, xz, nasm
, llvm, glibmm
, rtmpdump, cairo, boost, SDL2, libjpeg, pango, xz, nasm, llvm, glibmm
}:
stdenv.mkDerivation rec {
pname = "lightspark";
version = "0.8.6.1";
version = "0.8.7";
src = fetchFromGitHub {
owner = "lightspark";
repo = "lightspark";
rev = version;
sha256 = "sha256-/w0cqPIeQC1Oz1teSjMpeiQEI6bIpnyOOu0GoGyi6Kg=";
hash = "sha256-qX/ft9slWTbvuSyi2jB6YC7D7QTtCybL/dTo1dJp3pQ=";
};
postPatch = ''
@ -21,8 +20,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [
curl zlib ffmpeg glew pcre rtmpdump cairo boost SDL2 SDL2_mixer libjpeg
pango xz nasm llvm glibmm
curl zlib ffmpeg glew pcre rtmpdump cairo boost SDL2 libjpeg pango xz nasm
llvm glibmm
];
meta = with lib; {

View File

@ -29,13 +29,13 @@
stdenv.mkDerivation rec {
pname = "pacemaker";
version = "2.1.5";
version = "2.1.6";
src = fetchFromGitHub {
owner = "ClusterLabs";
repo = pname;
rev = "Pacemaker-${version}";
sha256 = "sha256-vsHWNKCrHJIgXlJYyZZEUfuIUBnaejPrPCM1HrYOTKQ=";
sha256 = "sha256-3+eRQ3NqPusdFhKc0wE7UMMNKsDLRVvh+EhD6zYGoP0=";
};
nativeBuildInputs = [

View File

@ -71,7 +71,12 @@ let
stdenvs = {
stdenv = mkStdenv stdenv;
} // builtins.listToAttrs (map
(v: { name = "clang${v}Stdenv"; value = mkStdenv pkgs."llvmPackages_${v}".stdenv; })
(v: {
name = "llvmPackages_${v}";
value = pkgs."llvmPackages_${v}" // {
stdenv = mkStdenv pkgs."llvmPackages_${v}".stdenv;
};
})
[ "12" "13" "14" "15" "16" ]
);

View File

@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
license = licenses.unlicense;
maintainers = with maintainers; [ zowoq ];
platforms = [ "aarch64-darwin" "x86_64-darwin" ];
broken = stdenv.isx86_64; # https://hydra.nixos.org/build/219354133/nixlog/3
};
}

View File

@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
version = "6.3.1"; #zen
version = "6.3.4"; #zen
suffix = "zen1"; #zen
sha256 = "1m3jvgvqycig8ls4dgqglz8f0hphc0dmvi0v98xdcxqclkhz87nj"; #zen
sha256 = "1dj5pk8fqf4plk5nri6cajwvdcs9b6gpfk1y620vi3g7w15p1gvx"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
version = "6.2.14"; #lqx
version = "6.3.4"; #lqx
suffix = "lqx1"; #lqx
sha256 = "18c95lal9f2hak49rw888sc454pj7bmh1wnphlwb7sp8j944g8cf"; #lqx
sha256 = "06xkcrd4wjpj23dnrfbyxyx1699vxzswb3r6p2xjwmpy44j5wjgf"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

View File

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qc71_laptop";
version = "unstable-2022-06-01";
version = "unstable-2023-03-02";
src = fetchFromGitHub {
owner = "pobrn";
repo = "qc71_laptop";
rev = "28106e0602807d78d1f5fa220ab6148dd6477c1c";
hash = "sha256-3bhw2HbEVuxPfGMt/eE2nCuMLHzYHRY3nRWPzZxKHro=";
rev = "8805dc5639f6659addf153a295ad4bbaa2483fa3";
hash = "sha256-wg7APGArjrl9DEAHTG6BknOBx+UbtNrzziwmLueKPfA=";
};
nativeBuildInputs = kernel.moduleBuildDependencies;

View File

@ -3,13 +3,13 @@
# rtl8189fs is a branch of the rtl8189es driver
rtl8189es.overrideAttrs (drv: rec {
name = "rtl8189fs-${kernel.version}-${version}";
version = "2022-10-30";
version = "2023-03-27";
src = fetchFromGitHub {
owner = "jwrdegoede";
repo = "rtl8189ES_linux";
rev = "e58bd86c9d9408c648b1246a0dd76b16856ec172";
sha256 = "sha256-KKly72N6ACBTB4CSBM6Q/S1wGMTg5NZA3QYslYPNUr8=";
rev = "c223a25b1000d64432eca4201a8f012414dfc7ce";
sha256 = "sha256-5b5IshLbWxvmzcKy/xLsqKa3kZpwDQXTQtjqZLHyOCo=";
};
meta = with lib; {

View File

@ -1,15 +1,29 @@
{ lib, fetchzip }:
{ lib, stdenvNoCC, fetchurl, unzip }:
let
rev = "e764ba00b9c34524e3ff3ffd19a44fa2a5c296a5";
in fetchzip {
in
stdenvNoCC.mkDerivation {
pname = "blobs.gg";
version = "unstable-2019-07-24";
url = "https://git.pleroma.social/pleroma/emoji-index/-/raw/${rev}/packs/blobs_gg.zip";
hash = "sha256-dnOwW93xTyJKRnYgvPgsqZHNWod4y80aNhBSVKNk6do=";
src = fetchurl {
url = "https://git.pleroma.social/pleroma/emoji-index/-/raw/${rev}/packs/blobs_gg.zip";
hash = "sha256-OhLzoYFnjVs1hKYglUEbDWCjNRGBNZENh5kg+K3lpX8=";
};
stripRoot = false;
sourceRoot = ".";
nativeBuildInputs = [ unzip ];
installPhase = ''
runHook preInstall
mkdir -p $out
cp *.png LICENSE $out
runHook postInstall
'';
meta = with lib; {
description = "Blob emoji from blobs.gg repacked as APNG";

View File

@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
"--with-jwt=${libjwt}"
"--with-lz4=${lz4.dev}"
"--with-munge=${munge}"
"--with-yaml=${libyaml}"
"--with-yaml=${libyaml.dev}"
"--with-ofed=${rdma-core}"
"--sysconfdir=/etc/slurm"
"--with-pmix=${pmix}"

View File

@ -150,7 +150,8 @@
++ androidtv.optional-dependencies.async
++ pure-python-adb.optional-dependencies.async;
"androidtv_remote" = ps: with ps; [
]; # missing inputs: androidtvremote2
androidtvremote2
];
"anel_pwrctrl" = ps: with ps; [
]; # missing inputs: anel_pwrctrl-homeassistant
"anova" = ps: with ps; [
@ -4732,6 +4733,7 @@
"analytics"
"android_ip_webcam"
"androidtv"
"androidtv_remote"
"apache_kafka"
"apcupsd"
"api"

View File

@ -1,4 +1,10 @@
{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
{ lib
, buildGoModule
, fetchFromGitHub
, nixosTests
, testers
, telegraf
}:
buildGoModule rec {
pname = "telegraf";
@ -19,15 +25,24 @@ buildGoModule rec {
proxyVendor = true;
ldflags = [
"-w" "-s" "-X main.version=${version}"
"-s"
"-w"
"-X=github.com/influxdata/telegraf/internal.Commit=${src.rev}"
"-X=github.com/influxdata/telegraf/internal.Version=${version}"
];
passthru.tests = { inherit (nixosTests) telegraf; };
passthru.tests = {
inherit (nixosTests) telegraf;
version = testers.testVersion {
package = telegraf;
};
};
meta = with lib; {
description = "The plugin-driven server agent for collecting & reporting metrics";
license = licenses.mit;
homepage = "https://www.influxdata.com/time-series-platform/telegraf/";
changelog = "https://github.com/influxdata/telegraf/blob/${src.rev}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ mic92 roblabla timstott ];
};
}

View File

@ -57,8 +57,8 @@ in {
};
nextcloud26 = generic {
version = "26.0.1";
sha256 = "sha256-b5xqEkjXyK9K1HPXOkJWX2rautRTHFz6V7w0l7K2T0g=";
version = "26.0.2";
sha256 = "sha256-89sOxeCq/3wIjrNPdS1315kTvGeE4PxHqEzaoo5WejM=";
};
# tip: get the sha with:

View File

@ -3,8 +3,6 @@
, rustPlatform
, fetchFromGitHub
, Security
, DiskArbitration
, Foundation
, nixosTests
, nix-update-script
}:
@ -41,8 +39,6 @@ rustPlatform.buildRustPackage {
buildInputs = lib.optionals stdenv.isDarwin [
Security
DiskArbitration
Foundation
];
passthru = {

View File

@ -15,12 +15,12 @@ let
}.${system} or throwSystem;
sha256 = {
x86_64-linux = "sha256-nvLQDMCm/w1NVSUOMlOKi6GX3R5KoA5pQ63sfhAwn2M=";
x86_64-darwin = "sha256-UxEcn1cD5ITg6YLSY/cp9ylimv1Pxee1kBW5SP9ux4E=";
aarch64-darwin = "sha256-UxEcn1cD5ITg6YLSY/cp9ylimv1Pxee1kBW5SP9ux4E=";
x86_64-linux = "sha256-DrPV1TSoWACk9331lYznLZbkPvx124XWrtCet4uSroo=";
x86_64-darwin = "sha256-UDovorRWOAEP8zugtd7iXmJe2YusH0ShBr8Hz4bc9Qk=";
aarch64-darwin = "sha256-UDovorRWOAEP8zugtd7iXmJe2YusH0ShBr8Hz4bc9Qk=";
}.${system} or throwSystem;
version = "16.0.0";
version = "16.2.7";
src = fetchzip {
url = "https://github.com/balena-io/balena-cli/releases/download/v${version}/balena-cli-v${version}-${plat}-standalone.zip";
inherit sha256;

View File

@ -60,7 +60,8 @@ stdenv.mkDerivation rec {
# configuration.default.ini, which is in the installation directory
# after all. So we need to counter-patch it here so it can find it absolutely
substituteInPlace mumbleBot.py \
--replace "configuration.default.ini" "$out/share/botamusique/configuration.default.ini"
--replace "configuration.default.ini" "$out/share/botamusique/configuration.default.ini" \
--replace "version = 'git'" "version = '${version}'"
'';
NODE_OPTIONS = "--openssl-legacy-provider";

View File

@ -11,13 +11,13 @@
stdenv.mkDerivation rec {
pname = "vulkan-caps-viewer";
version = "3.30";
version = "3.31";
src = fetchFromGitHub {
owner = "SaschaWillems";
repo = "VulkanCapsViewer";
rev = version;
hash = "sha256-sTJwPPiSPCt+X2FADcDpKtjiQ+GNHB3Jp3Mn+bK9tgA=";
hash = "sha256-+cJtJPpEFHyy+CbPm0IB2nDa7FM1JY8NOsqGB/WIY2A=";
# Note: this derivation strictly requires vulkan-header to be the same it was developed against.
# To help us, they've put it in a git-submodule.
# The result will work with any vulkan-loader version.

View File

@ -16,14 +16,14 @@ let
in
python.pkgs.buildPythonApplication rec {
pname = "esphome";
version = "2023.5.4";
version = "2023.5.5";
format = "setuptools";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-TjPlvp4neGWgPTpvG/I0JGVw8qK/wxa3qC65PvZH9OA=";
hash = "sha256-PV+uqJKXqnSMItWVg8iZVOQwxHrDHthezqyvciRq5+M=";
};
postPatch = ''

View File

@ -5,17 +5,17 @@
buildGoModule rec {
pname = "opentelemetry-collector";
version = "0.77.0";
version = "0.78.2";
src = fetchFromGitHub {
owner = "open-telemetry";
repo = "opentelemetry-collector";
rev = "v${version}";
hash = "sha256-koPkEOtB5KnePdx67hJ/WNBojNDqKvf9kqYb59bwh8k=";
hash = "sha256-zYKm5P+o59F1g5kCMirCEW0X5FrOwMdIRw64CMbUsAg=";
};
# there is a nested go.mod
sourceRoot = "source/cmd/otelcorecol";
vendorHash = "sha256-CXXv0GnMpebw2BWJz7Vvx7JfzPUIZ/zCrsmTgtMuvEw=";
vendorHash = "sha256-7rnj3hIdp12CMva0zxWzkTi+a4N1uBIbG6BBaKjzH+4=";
# upstream strongly recommends disabling CGO
# additionally dependencies have had issues when GCO was enabled that weren't caught upstream

View File

@ -0,0 +1,90 @@
{ lib
, stdenv
, dotnetCorePackages
, dotnet-runtime_6
, dotnet-runtime_7
, buildDotnetModule
, fetchFromGitHub
, autoPatchelfHook
, fontconfig
, xorg
, libglvnd
, makeDesktopItem
, copyDesktopItems
}:
# NOTES:
# 1. we need autoPatchelfHook for quite a number of things in $out/lib
let
version = "1.7.0.211";
sdk =
if lib.versionAtLeast (lib.versions.majorMinor version) "1.7"
then dotnetCorePackages.sdk_7_0
else dotnetCorePackages.sdk_6_0;
runtime =
if lib.versionAtLeast (lib.versions.majorMinor version) "1.7"
then dotnet-runtime_7
else dotnet-runtime_6;
in
buildDotnetModule rec {
pname = "mqttmultimeter";
inherit version;
src = fetchFromGitHub {
owner = "chkr1011";
repo = "mqttMultimeter";
rev = "v" + version;
hash = "sha256-/XQ5HD0dBfFn3ERlLwHknS9Fyd3YMpKHBXuvMwRXcQ8=";
};
sourceRoot = "source/Source";
projectFile = [ "mqttMultimeter.sln" ];
nugetDeps = ./deps.nix;
dotnet-sdk = sdk;
dotnet-runtime = runtime;
executables = [ "mqttMultimeter" ];
nativeBuildInputs = [
autoPatchelfHook
copyDesktopItems
];
buildInputs = [ stdenv.cc.cc.lib fontconfig ];
# don't care about musl and windows versions, as they fail autoPatchelfHook
postInstall = ''
rm -rf $out/lib/${lib.toLower pname}/runtimes/{*musl*,win*}
'';
runtimeDeps = [
libglvnd
xorg.libSM
xorg.libICE
xorg.libX11
];
desktopItems = makeDesktopItem {
name = meta.mainProgram;
exec = meta.mainProgram;
icon = meta.mainProgram;
desktopName = meta.mainProgram;
genericName = meta.description;
comment = meta.description;
type = "Application";
categories = [ "Network" ];
startupNotify = true;
};
meta = with lib; {
mainProgram = builtins.head executables;
description = "MQTT traffic monitor";
license = licenses.free;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.linux;
};
}

View File

@ -0,0 +1,145 @@
# This file was automatically generated by passthru.fetch-deps.
# Please dont edit it manually, your changes might get overwritten!
{ fetchNuGet }: [
(fetchNuGet { pname = "Avalonia"; version = "0.10.19"; sha256 = "1yzrbp0b6kv9h9d4kl96ldr6ln40xj1j2yvbvpm0pgv7ajwr7qhc"; })
(fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; })
(fetchNuGet { pname = "Avalonia.AvaloniaEdit"; version = "0.10.12.2"; sha256 = "1sn8k71xcfnjxgxfqzdrv1hy7h7pvdk820nyzkmrf02gi77mx7nw"; })
(fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.19"; sha256 = "0wlmr4dlz8x3madm7xwhmsf0kgdnwcy6n7zvfd9x6h0bllii1lbn"; })
(fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.19"; sha256 = "0vghwp1wx6l1z0dlvd9aqdaikz6k34q0i9yzaphqlzjp6ms2g2ny"; })
(fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.19"; sha256 = "1zlcp8mwn2nscrdsvxlspny22m054gsva9az27pvk7s2s5mrqgfk"; })
(fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.19"; sha256 = "01fin1w9nwa3c9kpvbri26x1r4g59hmayx9r5hxwbhq7s7vm5ghr"; })
(fetchNuGet { pname = "Avalonia.Native"; version = "0.10.19"; sha256 = "0c9rw2wckyx9h5yfhm0af5zbs53n9bnhv0mlshl7mn0p92v1wfl3"; })
(fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "0.10.19"; sha256 = "0kx4qka2rdmlp54qyn04hh79qc5w796gv3ryv24n82hpplzksqi9"; })
(fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.19"; sha256 = "0klk9hqas0h3d3lmr0di175nw2kwq5br1xpprkb4y4m83r5lfy0s"; })
(fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.19"; sha256 = "16cl9ssmyif2a25fq9kvxs2vr83j589yns53zkfr3wmggl9n6lf2"; })
(fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.19"; sha256 = "1pd3jmrdc738j7b4d8rzaj7fxrfq1m2pl3i62z2ym3h0sxl51xy2"; })
(fetchNuGet { pname = "Avalonia.X11"; version = "0.10.19"; sha256 = "1h71w73r7r9ci059qwsjqnhp60l8sfd3i3xsw37qfnbhslcna6hh"; })
(fetchNuGet { pname = "AvaloniaEdit.TextMate"; version = "0.10.12.2"; sha256 = "0d7i2vrv2lzyjb1xna4dxscl256g062c6b96ayh9aksnrygxxsx9"; })
(fetchNuGet { pname = "AvaloniaEdit.TextMate.Grammars"; version = "0.10.12.1"; sha256 = "0s3g1k0sqma5i6lq5qva2zkgghhba8s5iz4s6jy7dh984x6pp38b"; })
(fetchNuGet { pname = "DynamicData"; version = "7.1.1"; sha256 = "14xcqkw87zbjljy1pb727kwq5a4dfmsf5vg99fq0xxb71q828nvh"; })
(fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.1-preview.108"; sha256 = "16v7lrwwif2f5zfkx08n6y6w3m56mh4hy757biv0w9yffaf200js"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2.1-preview.108"; sha256 = "15kqb353snwpavz3jja63mq8xjqsrw1f902scm8wxmsqrm5q6x55"; })
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; })
(fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; })
(fetchNuGet { pname = "MessagePack"; version = "2.5.108"; sha256 = "0cnaz28lhrdmavnxjkakl9q8p2yv8mricvp1b0wxdfnz8v41gwzs"; })
(fetchNuGet { pname = "MessagePack.Annotations"; version = "2.5.108"; sha256 = "0nb1fx8dwl7304kw0bc375bvlhb7pg351l4cl3vqqd7d8zqjwx5v"; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; })
(fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; })
(fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; })
(fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "7.0.0"; sha256 = "1bqd3pqn5dacgnkq0grc17cgb2i0w8z1raw12nwm3p3zhrfcvgxf"; })
(fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "7.0.0"; sha256 = "1gn7d18i1wfy13vrwhmdv1rmsb4vrk26kqdld4cgvh77yigj90xs"; })
(fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "7.0.0"; sha256 = "0b90zkrsk5dw3wr749rbynhpxlg4bgqdnd7d5vdlw2g9c7zlhgx6"; })
(fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; })
(fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
(fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; })
(fetchNuGet { pname = "MQTTnet"; version = "4.2.0.706"; sha256 = "0125d2x62izlkplgyg5dazz2x38amkby6i8vlfvvjvng9zq159m3"; })
(fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
(fetchNuGet { pname = "ReactiveUI"; version = "13.2.10"; sha256 = "0x4pk45wipzsjzkv23as8l0sdds665l9404gaix8c0z2n24s76gg"; })
(fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
(fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; })
(fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; })
(fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; })
(fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; })
(fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; })
(fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; })
(fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; })
(fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; })
(fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; })
(fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; })
(fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; })
(fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; })
(fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; })
(fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; })
(fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; })
(fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; })
(fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; })
(fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; })
(fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; })
(fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; })
(fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; })
(fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; })
(fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; })
(fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; })
(fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; })
(fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; })
(fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; })
(fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; })
(fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; })
(fetchNuGet { pname = "SkiaSharp"; version = "2.88.1-preview.108"; sha256 = "01sm36hdgmcgkai9m09xn2qfz8v7xhh803n8fng8rlxwnw60rgg6"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.1-preview.108"; sha256 = "19jf2jcq2spwbpx3cfdi2a95jf4y8205rh56lmkh8zsxd2k7fjyp"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.1-preview.108"; sha256 = "1vcpqd7slh2b9gsacpd7mk1266r1xfnkm6230k8chl3ng19qlf15"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.108"; sha256 = "0a89gqjw8k97arr0kyd0fm3f46k1qamksbnyns9xdlgydjg557dd"; })
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.108"; sha256 = "05g9blprq5msw3wshrgsk19y0fvhjlqiybs1vdyhfmww330jlypn"; })
(fetchNuGet { pname = "Splat"; version = "10.0.1"; sha256 = "18fzrn7xwjzxj4v3drs8djd3yf14bnq5n9n8vdnwfa1zk5jqpsb9"; })
(fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
(fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; })
(fetchNuGet { pname = "System.Collections.Immutable"; version = "1.6.0"; sha256 = "1pbxzdz3pwqyybzv5ff2b7nrc281bhg7hq34w0fn1w3qfgrbwyw2"; })
(fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; })
(fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
(fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })
(fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; })
(fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; })
(fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
(fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
(fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; })
(fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
(fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
(fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; })
(fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; })
(fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; })
(fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
(fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; })
(fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; })
(fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; })
(fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; })
(fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; })
(fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; })
(fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; })
(fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; })
(fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
(fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; })
(fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; })
(fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; })
(fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
(fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
(fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; })
(fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; })
(fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; })
(fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; })
(fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
(fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; })
(fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
(fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; })
(fetchNuGet { pname = "System.Text.Json"; version = "7.0.2"; sha256 = "1i6yinxvbwdk5g5z9y8l4a5hj2gw3h9ijlz2f1c1ngyprnwz2ivf"; })
(fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
(fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
(fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; })
(fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; })
(fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; })
(fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.1"; sha256 = "15f9vd7r0bxmyv754238bdckfg6sxaa3d4yx71hdzkz9k0mhjcky"; })
(fetchNuGet { pname = "TextMateSharp"; version = "1.0.23"; sha256 = "1cx1ybzqp1cvxsip1kwdmk4jj1hg6vscywviv5qqqsyyww56p5xv"; })
(fetchNuGet { pname = "TextMateSharp"; version = "1.0.29"; sha256 = "011gqjvc6qmvqcq57jbyi9rv2ifcqsaw1h688xgmvwspsq95hfxg"; })
(fetchNuGet { pname = "TextMateSharp.Grammars"; version = "1.0.29"; sha256 = "1y8l2bjc4y151qfh5nx4zpdr0aii64xnsfmyzn4lawzsvl1j1g9s"; })
(fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; })
]

View File

@ -6,17 +6,17 @@
buildGoModule rec {
pname = "kubescape";
version = "2.3.3";
version = "2.3.4";
src = fetchFromGitHub {
owner = "kubescape";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-0mGsL3u3ilPBJCZrUx5UeNkFmeUoESdxZINH1e5y0VY=";
hash = "sha256-REUB7EsRZtgOImMaGyX2UGwWjTYZGfrIlwPNHV0NjbU=";
fetchSubmodules = true;
};
vendorHash = "sha256-tHFwseR6vQ78MX+YOiShW5/mQ7dyG2JxGOluy/Vo8ME=";
vendorHash = "sha256-VLEyfnLyXujzMQd/HBfjQ6MQcM/hav0SCEl3G2lxKbo=";
nativeBuildInputs = [
installShellFiles

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "tboot";
version = "1.11.0";
version = "1.11.1";
src = fetchurl {
url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz";
sha256 = "sha256-/hnuDEhnL7jIdZ4oUxDo1YYGseDoR+rKH9BhuXGiiQQ=";
sha256 = "sha256-1sPCbF/e5tWOEfBHM67lnK/QFyHRFZjRjAKxXAfw6nc=";
};
buildInputs = [ openssl trousers zlib ];

View File

@ -3,13 +3,13 @@
let
self = stdenv.mkDerivation rec {
pname = "highlight";
version = "4.5";
version = "4.6";
src = fetchFromGitLab {
owner = "saalen";
repo = "highlight";
rev = "v${version}";
sha256 = "sha256-0U8GN+y9jM3/kBXUvQ7XtvDHGO50Zn0jwPgt+6LMwaw=";
sha256 = "sha256-wMNmc7UIpvYPREpPK/2aKaqUDc6uifuxsXTNFH5SHyI=";
};
enableParallelBuilding = true;

View File

@ -0,0 +1,28 @@
{ lib
, buildGoModule
, fetchFromGitHub
}:
buildGoModule rec {
pname = "tml";
version = "0.6.0";
src = fetchFromGitHub {
owner = "liamg";
repo = "tml";
rev = "v${version}";
hash = "sha256-92GumJGdbqxhcIj1gdkiamUA4peDG/Ar6GEimj/E7lg=";
};
vendorHash = "sha256-YsEmxhyDMuvq48vdHFvgsIqbqDZbg8beS0nL7lsaFJ0=";
ldflags = [ "-s" "-w" ];
meta = with lib; {
description = "A tiny markup language for terminal output";
homepage = "https://github.com/liamg/tml";
changelog = "https://github.com/liamg/tml/releases/tag/v${version}";
license = licenses.unlicense;
maintainers = with maintainers; [ figsoda ];
};
}

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, system ? builtins.currentSystem, ovftoolBundles ? {}
, requireFile, autoPatchelfHook, makeWrapper, unzip
, glibc, c-ares, libxcrypt, expat, icu60, xercesc, zlib
, glibc, c-ares, libxcrypt-legacy, expat, icu60, xercesc, zlib
}:
let
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
# Some dependencies are not loaded until operations actually occur!
buildInputs = [
glibc
libxcrypt
libxcrypt-legacy
c-ares
expat
icu60

View File

@ -9457,7 +9457,7 @@ with pkgs;
};
meilisearch = callPackage ../servers/search/meilisearch {
inherit (darwin.apple_sdk.frameworks) Security DiskArbitration Foundation;
inherit (darwin.apple_sdk_11_0.frameworks) Security;
};
memtester = callPackage ../tools/system/memtester { };
@ -13065,6 +13065,8 @@ with pkgs;
tmate-ssh-server = callPackage ../servers/tmate-ssh-server { };
tml = callPackage ../tools/text/tml { };
tmpwatch = callPackage ../tools/misc/tmpwatch { };
tmpmail = callPackage ../applications/networking/tmpmail { };
@ -23082,6 +23084,8 @@ with pkgs;
mqtt-benchmark = callPackage ../tools/networking/mqtt-benchmark { };
mqttmultimeter = callPackage ../tools/networking/mqttmultimeter { };
mqttui = callPackage ../tools/networking/mqttui {
inherit (darwin.apple_sdk.frameworks) Security;
};
@ -25025,15 +25029,15 @@ with pkgs;
pkg = callPackage ../development/compilers/sbcl/bootstrap.nix {};
faslExt = "fasl";
};
sbcl_2_3_2 = wrapLisp {
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.2"; };
faslExt = "fasl";
};
sbcl_2_3_4 = wrapLisp {
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.4"; };
faslExt = "fasl";
};
sbcl = sbcl_2_3_4;
sbcl_2_3_5 = wrapLisp {
pkg = callPackage ../development/compilers/sbcl/2.x.nix { version = "2.3.5"; };
faslExt = "fasl";
};
sbcl = sbcl_2_3_5;
sbclPackages = recurseIntoAttrs sbcl.pkgs;
@ -32114,7 +32118,7 @@ with pkgs;
ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird {
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.clang14Stdenv else stdenv;
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv;
};
lazpaint = callPackage ../applications/graphics/lazpaint { };
@ -34365,6 +34369,8 @@ with pkgs;
stumpwm = sbclPackages.stumpwm;
stumpwm-unwrapped = sbclPackages.stumpwm-unwrapped;
sublime = callPackage ../applications/editors/sublime/2 { };
sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { });
@ -36249,6 +36255,7 @@ with pkgs;
airstrike = callPackage ../games/airstrike { };
alephone = callPackage ../games/alephone { };
alephone-apotheosis-x = callPackage ../games/alephone/apotheosis-x { };
alephone-durandal = callPackage ../games/alephone/durandal { };
alephone-eternal = callPackage ../games/alephone/eternal { };
alephone-evil = callPackage ../games/alephone/evil { };
@ -36259,6 +36266,8 @@ with pkgs;
alephone-rubicon-x = callPackage ../games/alephone/rubicon-x { };
alephone-pathways-into-darkness =
callPackage ../games/alephone/pathways-into-darkness { };
alephone-yuge =
callPackage ../games/alephone/yuge { };
alienarena = callPackage ../games/alienarena { };

View File

@ -468,6 +468,8 @@ self: super: with self; {
androidtv = callPackage ../development/python-modules/androidtv { };
androidtvremote2 = callPackage ../development/python-modules/androidtvremote2 { };
androguard = callPackage ../development/python-modules/androguard { };
angr = callPackage ../development/python-modules/angr { };
@ -4246,6 +4248,8 @@ self: super: with self; {
google-resumable-media = callPackage ../development/python-modules/google-resumable-media { };
google-search-results = callPackage ../development/python-modules/google-search-results { };
googletrans = callPackage ../development/python-modules/googletrans { };
gorilla = callPackage ../development/python-modules/gorilla { };
@ -11999,6 +12003,8 @@ self: super: with self; {
tflearn = callPackage ../development/python-modules/tflearn { };
tftpy = callPackage ../development/python-modules/tftpy { };
tgcrypto = callPackage ../development/python-modules/tgcrypto { };
theano-pymc = callPackage ../development/python-modules/theano-pymc { };