Merge master into staging-next

This commit is contained in:
github-actions[bot] 2022-11-08 06:01:15 +00:00 committed by GitHub
commit 917a1408b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
58 changed files with 2402 additions and 2627 deletions

6
.github/dependabot.yml vendored Normal file
View file

@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"

View file

@ -889,6 +889,14 @@
support for 1.22 and older has been dropped.
</para>
</listitem>
<listitem>
<para>
The <literal>zrepl</literal> package has been updated from
0.5.0 to 0.6.0. See the
<link xlink:href="https://zrepl.github.io/changelog.html">changelog</link>
for details.
</para>
</listitem>
<listitem>
<para>
<literal>k3s</literal> no longer supports docker as runtime

View file

@ -273,6 +273,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).
- The default `kops` version is now 1.25.1 and support for 1.22 and older has been dropped.
- The `zrepl` package has been updated from 0.5.0 to 0.6.0. See the [changelog](https://zrepl.github.io/changelog.html) for details.
- `k3s` no longer supports docker as runtime due to upstream dropping support.
- `cassandra_2_1` and `cassandra_2_2` have been removed. Please update to `cassandra_3_11` or `cassandra_3_0`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-3.11.14/NEWS.txt) for more information about the upgrade process.

View file

@ -58,8 +58,8 @@ import ./make-test-python.nix (
out = host.succeed("curl -f localhost:9811/metrics")
assert (
"zrepl_version_daemon" in out
), "zrepl version metric was not found in Prometheus output"
"zrepl_start_time" in out
), "zrepl start time metric was not found in Prometheus output"
assert (
"zrepl_zfs_snapshot_duration_count{filesystem=\"test\"}" in out

View file

@ -2,12 +2,12 @@
let
pname = "plexamp";
version = "4.4.0";
version = "4.5.2";
src = fetchurl {
url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
name="${pname}-${version}.AppImage";
sha512 = "VYdeZUgVWDce9XGyf5AnwPV/Ja6p2i3IRAcnSj7J7KqTUdgoNsPl4gqs4HcdrSCEX8PfloimJihoBuEKtgXcNA==";
sha512 = "/0CW5S5n4xh9FF/Sfxl3H0bNCpbUfz4ik4ptVTIwvEcXw2NoKS5dLxFSTn9lfVZAV+UfzSqcrWH5HknN+o5wQw==";
};
appimageContents = appimageTools.extractType2 {
@ -33,7 +33,7 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "A beautiful Plex music player for audiophiles, curators, and hipsters";
homepage = "https://plexamp.com/";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/46";
changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/47";
license = licenses.unfree;
maintainers = with maintainers; [ killercup synthetica ];
platforms = [ "x86_64-linux" ];

View file

@ -46,13 +46,13 @@ in
stdenv.mkDerivation rec {
pname = "imagemagick";
version = "7.1.0-51";
version = "7.1.0-52";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = version;
hash = "sha256-u2QUtCQ4LzS60iVOOKWx/itmC9uMxPhNvsNANPHrvpE=";
hash = "sha256-GV71O4cHUKJ7+6u4T+vdaFz5q2SpZVDCfEAbfz0s6f4=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

View file

@ -1,104 +0,0 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, meson
, ninja
, pkg-config
, wrapGAppsHook4
, gettext
, gnome
, glib
, gtk4
, wayland
, libadwaita
, libpeas
, gnome-online-accounts
, gsettings-desktop-schemas
, libportal-gtk4
, evolution-data-server-gtk4
, libical
, librest
, json-glib
, itstool
, gitUpdater
}:
stdenv.mkDerivation rec {
pname = "endeavour";
version = "42.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "Endeavour";
rev = "v${version}";
sha256 = "U91WAoyIeQ0WbFbOCrbFJjbWe2eT7b/VL2M1hNXxyzQ=";
};
patches = [
# fix build race bug https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=257667
(fetchpatch {
url = "https://cgit.freebsd.org/ports/plain/deskutils/gnome-todo/files/patch-src_meson.build?id=a4faaf6cf7835014b5f69a337b544ea4ee7f9655";
sha256 = "sha256-dio4Mg+5OGrnjtRAf4LwowO0sG50HRmlNR16cbDvEUY=";
extraPrefix = "";
name = "gnome-todo_meson-build.patch";
})
# build: Fix building with -Werror=format-security
# https://gitlab.gnome.org/World/Endeavour/-/merge_requests/132
(fetchpatch {
url = "https://gitlab.gnome.org/World/Endeavour/-/commit/3bad03e90fcc28f6e3f87f2c90df5984dbeb0791.patch";
sha256 = "sha256-HRkNfhn+EH0Fc+KBDdX1Q+T9QWSctTOn1cvecP2N0zo=";
})
# build: Use GNOME module post_install()
# https://gitlab.gnome.org/World/Endeavour/-/merge_requests/135
(fetchpatch {
url = "https://gitlab.gnome.org/World/Endeavour/-/commit/a8daa1d8acd0a5da7aef54d6e16d8a585c71e555.patch";
sha256 = "sha256-zUTQ36eUMOY9ODAgwSKUhSlB9Cj0Yu/60KjFFW5fx2I=";
})
];
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
wrapGAppsHook4
itstool
];
buildInputs = [
glib
gtk4
wayland # required by gtk header
libadwaita
libpeas
gnome-online-accounts
gsettings-desktop-schemas
gnome.adwaita-icon-theme
# Plug-ins
libportal-gtk4 # background
evolution-data-server-gtk4 # eds
libical
librest # todoist
json-glib # todoist
];
passthru = {
updateScript = gitUpdater {
inherit pname version;
rev-prefix = "v";
};
};
meta = with lib; {
description = "Personal task manager for GNOME";
homepage = "https://gitlab.gnome.org/World/Endeavour";
license = licenses.gpl3Plus;
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
}

View file

@ -0,0 +1,57 @@
{ lib
, stdenv
, fetchFromGitHub
, autoreconfHook
, pkg-config
, which
, fltk
, mbedtls
}:
stdenv.mkDerivation {
pname = "dillong";
version = "unstable-2021-12-13";
src = fetchFromGitHub {
owner = "w00fpack";
repo = "dilloNG";
rev = "2804e6e9074b840de3084abb80473983f8e49f5b";
hash = "sha256-JSBd8Lgw3I20Es/jQHBtybnLd0iAcs16TqOrOxGPGiU=";
};
nativeBuildInputs = [
autoreconfHook
pkg-config
which
];
buildInputs = [
fltk
mbedtls
];
# The start_page and home settings refer to /usr.
# We can't change /usr to $out because dillorc is copied to the home directory
# on first launch, so the paths would quickly become outdated.
# So we just comment them out, and let dillong use the defaults.
postPatch = ''
substituteInPlace dillorc \
--replace "start_page=" "#start_page=" \
--replace "home=" "#home="
'';
configureFlags = [ "--enable-ssl=yes" ];
# Workaround build failure on -fno-common toolchains:
# ld: main.o:/build/dillo-3.0.5/dpid/dpid.h:64: multiple definition of `sock_set';
# dpid.o:/build/dillo-3.0.5/dpid/dpid.h:64: first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
meta = with lib; {
description = "Fork of Dillo, a lightweight web browser";
homepage = "https://github.com/w00fpack/dilloNG";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ fgaz ];
};
}

View file

@ -84,13 +84,13 @@
"version": "4.1.0"
},
"auth0": {
"hash": "sha256-kyQBl/gdTj1Dlu4/FFowAQbBDTYMjp0JGQ09eBqwHEc=",
"hash": "sha256-l41GOH5J0ZF+Vp/Vabhm30ZLG6/XJrI7QeCdl2WvNso=",
"owner": "auth0",
"provider-source-address": "registry.terraform.io/auth0/auth0",
"repo": "terraform-provider-auth0",
"rev": "v0.39.0",
"vendorHash": "sha256-Cusw/qNi+xFblwjvh1xkN28z28TNz3gvTyIRaX/QvH4=",
"version": "0.39.0"
"rev": "v0.40.0",
"vendorHash": "sha256-0BE+NZe4DgAU0lNuwsHiGogMJKhM2fy9CriMtKzmJcI=",
"version": "0.40.0"
},
"avi": {
"hash": "sha256-0FcdVd7EGVHZ0iRonoGfjwYgXpJtUhqX5i925Ejhv54=",
@ -148,13 +148,13 @@
"version": "1.0.0"
},
"baiducloud": {
"hash": "sha256-NKeCPoyeWGWyWScCqCsm4s0U9zCojJ6+OOr+nDdIFqM=",
"hash": "sha256-kG0tE929wtiuSIwT0r6t/odirvZpdnTgcPGFHXmLYYQ=",
"owner": "baidubce",
"provider-source-address": "registry.terraform.io/baidubce/baiducloud",
"repo": "terraform-provider-baiducloud",
"rev": "v1.17.0",
"rev": "v1.17.1",
"vendorHash": null,
"version": "1.17.0"
"version": "1.17.1"
},
"bigip": {
"hash": "sha256-uSe+J4AlW8Dt96BVF1ZI/yrgWUbZsl64b/D+k5ysHC0=",
@ -451,24 +451,24 @@
"version": "3.18.0"
},
"google": {
"hash": "sha256-MvLzXucKSqyTO9bjbXtBzh3XsOizw0waMGDFhrYtoWM=",
"hash": "sha256-guE04J0RCFOHPXGtEpxGZu8s6fnfoh0WLRRZ5GW/gLk=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.42.1",
"rev": "v4.43.0",
"vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=",
"version": "4.42.1"
"version": "4.43.0"
},
"google-beta": {
"hash": "sha256-dtj1LWIXvjInGtbXy5FBdNmQzp+PRKXpnYzsSL/fIaE=",
"hash": "sha256-HB37OQKULhqiMHOE3gs24sjuPsjMessO98z3+5TNNnM=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/google-beta",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.42.1",
"rev": "v4.43.0",
"vendorHash": "sha256-Hzl95NLEZlvTBpCGJYzF5rtHWfYe26TwW0pbtqWmxOo=",
"version": "4.42.1"
"version": "4.43.0"
},
"googleworkspace": {
"hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=",
@ -489,13 +489,13 @@
"version": "1.30.0"
},
"gridscale": {
"hash": "sha256-0XKSGfvJ61iD6zZ3Re3tB6Orb2Dklu5tbD8hBGyzlgo=",
"hash": "sha256-k87g+MwzKl++VfKerzRllHsKN8Y8AyEFm1yWV5xrgwI=",
"owner": "gridscale",
"provider-source-address": "registry.terraform.io/gridscale/gridscale",
"repo": "terraform-provider-gridscale",
"rev": "v1.16.1",
"rev": "v1.16.2",
"vendorHash": null,
"version": "1.16.1"
"version": "1.16.2"
},
"hcloud": {
"hash": "sha256-DWDM3yWKkRV9FJMzKK7JJQdI0WvFILF/bsZFv2CjrvM=",
@ -544,13 +544,13 @@
"version": "1.0.4"
},
"http": {
"hash": "sha256-04OMH0+fT4QOV34YdE67avnbC3GoK7xyMGxpILNM7Jk=",
"hash": "sha256-cxAii7doJ9mv1LQWjoPqMgOuu0COIL91llhsm/2MOms=",
"owner": "hashicorp",
"provider-source-address": "registry.terraform.io/hashicorp/http",
"repo": "terraform-provider-http",
"rev": "v3.2.0",
"vendorHash": "sha256-diQ5bYFywVZXziRKiKdIU4grg93vF68bkbMrRpM/vQc=",
"version": "3.2.0"
"rev": "v3.2.1",
"vendorHash": "sha256-rxh8Me+eOKPCbfHFT3tRsbM7JU67dBqv2JOiWArI/2Y=",
"version": "3.2.1"
},
"huaweicloud": {
"hash": "sha256-cr7xV7Z4UU+kRykVSOKeuXDiHQPL4CsCJVXf2uTZOms=",
@ -761,13 +761,13 @@
"version": "1.8.0"
},
"mongodbatlas": {
"hash": "sha256-NVbUKSG5rGUtRlaJVND3nW+0Svc2d8R8uvxGKcQktco=",
"hash": "sha256-xyKBhIsTawksKruRPXBJ3pEo+ssK7Gol3xCCdNPOes8=",
"owner": "mongodb",
"provider-source-address": "registry.terraform.io/mongodb/mongodbatlas",
"repo": "terraform-provider-mongodbatlas",
"rev": "v1.4.6",
"vendorHash": "sha256-OwyzkTgOcn9brsQS1bfOEaXYk9nNLyHsEwli+5PAIPE=",
"version": "1.4.6"
"rev": "v1.5.0",
"vendorHash": "sha256-zaILkt1uuw21r/ZHeSUWcfgPP2gCNRJYfn4DHUtVC2Q=",
"version": "1.5.0"
},
"namecheap": {
"hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=",
@ -1005,13 +1005,13 @@
"version": "0.4.3"
},
"scaleway": {
"hash": "sha256-mo8zq/EdT6RrOxBAnWu1rhQpZ26DZcU7I/dMCUIHxBE=",
"hash": "sha256-HQljeUvK010LSWObuZmTkkB6ByrtgBRAeZPYv3d/KSs=",
"owner": "scaleway",
"provider-source-address": "registry.terraform.io/scaleway/scaleway",
"repo": "terraform-provider-scaleway",
"rev": "v2.5.0",
"vendorHash": "sha256-CycLXG84Sfi1aciXn2darHIGfE6DpCYOHc7Op/0R26I=",
"version": "2.5.0"
"rev": "v2.6.0",
"vendorHash": "sha256-XlEvaXd+mAvbFeQmTOE+bFsYok/Ke1mVwIUY3VY8zDI=",
"version": "2.6.0"
},
"secret": {
"hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=",
@ -1068,13 +1068,13 @@
"version": "0.15.1"
},
"snowflake": {
"hash": "sha256-Hoaqj3hksiWm60cSr8OPqAvS29SMVLtwkSWXZvpBePA=",
"hash": "sha256-ED8Sjtimt+9Lg62ZZARtvNNIHePcfLCyxrjQCCpxU9U=",
"owner": "Snowflake-Labs",
"provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake",
"repo": "terraform-provider-snowflake",
"rev": "v0.50.0",
"rev": "v0.51.0",
"vendorHash": "sha256-n6ov9eTlNF/jNDTDOZuuqyFfuv8lDZHKP/5jhFauwY8=",
"version": "0.50.0"
"version": "0.51.0"
},
"sops": {
"hash": "sha256-6FuThi6iuuUGcMhswAk3Z6Lxth/2nuI57A02Xu2s+/U=",
@ -1195,13 +1195,13 @@
"version": "1.9.1"
},
"ucloud": {
"hash": "sha256-O/M864JY7nW+PZ53z26QvOAar5DeqBGk+dfzarfUy+g=",
"hash": "sha256-x3+OuRzZdS429v0JNyZkM3v1etUgURSyi9qkt7RhqlI=",
"owner": "ucloud",
"provider-source-address": "registry.terraform.io/ucloud/ucloud",
"repo": "terraform-provider-ucloud",
"rev": "v1.32.4",
"rev": "v1.32.5",
"vendorHash": null,
"version": "1.32.4"
"version": "1.32.5"
},
"utils": {
"hash": "sha256-6o55uGTaqf3rbqoIGiYi5F4zOkK7D0YP+LdaMmBtw24=",

View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "werf";
version = "1.2.184";
version = "1.2.187";
src = fetchFromGitHub {
owner = "werf";
repo = "werf";
rev = "v${version}";
hash = "sha256-u3Mf7a+IGLWYvAt/Db/BwvtGc66SnYz5Qx2BkCCLKPg=";
hash = "sha256-rezLmdAR6OCDVsi/rguc3iLjkeQ7Jrny4MlnCFYD5+4=";
};
vendorHash = "sha256-T9xGLQcnO9xyRVNX3xCwsOOXWvBbhhw9dH8gW7aBUjE=";
vendorHash = "sha256-GjcmpHyjhjCWE5gQR/oTHfhHYg5WRu8uhgAuWhdxlYk=";
proxyVendor = true;

View file

@ -22,11 +22,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "gajim";
version = "1.5.2";
version = "1.5.3";
src = fetchurl {
url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
sha256 = "sha256-kXpGaGp9OWdDa1q3hx7nrD1ZeKH5CKlTgZbyuNZ05/8=";
sha256 = "sha256-JSV4592s7oKJzxBghtlrvXqCoO6iCRoYNu/eaqPfuLA=";
};
buildInputs = [

View file

@ -0,0 +1,70 @@
{ lib
, stdenv
, fetchFromGitLab
, meson
, ninja
, pkg-config
, wrapGAppsHook4
, gettext
, gnome
, glib
, gtk4
, wayland
, libadwaita
, libpeas
, gnome-online-accounts
, gsettings-desktop-schemas
, evolution-data-server-gtk4
, libical
, itstool
, gitUpdater
}:
stdenv.mkDerivation rec {
pname = "endeavour";
version = "43.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "Endeavour";
rev = version;
sha256 = "sha256-1mCTw+nJ1w7RdCXfPCO31t1aYOq9Bki3EaXsHiiveD0=";
};
nativeBuildInputs = [
meson
ninja
pkg-config
gettext
wrapGAppsHook4
itstool
];
buildInputs = [
glib
gtk4
wayland # required by gtk header
libadwaita
libpeas
gnome-online-accounts
gsettings-desktop-schemas
gnome.adwaita-icon-theme
# Plug-ins
evolution-data-server-gtk4 # eds
libical
];
passthru = {
updateScript = gitUpdater { };
};
meta = with lib; {
description = "Personal task manager for GNOME";
homepage = "https://gitlab.gnome.org/World/Endeavour";
license = licenses.gpl3Plus;
maintainers = teams.gnome.members;
platforms = platforms.linux;
};
}

View file

@ -1,52 +0,0 @@
{ lib
, stdenv
, fetchurl
, perlPackages
, pkg-config
, gtk2
, scrollkeeper
, libglade
, libXmu
, libX11
, libXext
, gettext
, lame
, libXfixes
, libXdamage
}:
stdenv.mkDerivation rec {
pname = "xvidcap";
version = "1.1.7";
src = fetchurl {
url = "mirror://sourceforge/xvidcap/xvidcap-${version}.tar.gz";
sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm";
};
patches = [ ./xlib.patch ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
gtk2
scrollkeeper
libglade
libXmu
gettext
lame
libXdamage
libXfixes
libXext
libX11
] ++ (with perlPackages; [ perl XMLParser ]);
# !!! don't know why this is necessary
NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s";
meta = with lib; {
description = "Screencast video catpuring tool";
homepage = "http://xvidcap.sourceforge.net/";
license = licenses.gpl2;
platforms = platforms.linux;
};
}

View file

@ -1,15 +0,0 @@
diff --git a/src/app_data.c b/src/app_data.c
index 5a44363..482b115 100644
--- a/src/app_data.c
+++ b/src/app_data.c
@@ -52,9 +52,9 @@
#include <pthread.h>
#include <signal.h>
+#include <X11/Xlib.h>
#ifdef HAVE_LIBXFIXES
#include <X11/X.h>
-#include <X11/Xlib.h>
#include <X11/Xlibint.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>

View file

@ -55,9 +55,6 @@ lib.makeScope pkgs.newScope (self: with self; {
#### DESKTOP
# Removed from recent GNOME releases, but still required
scrollkeeper = callPackage ./desktop/scrollkeeper { };
gtksourceview = callPackage ./desktop/gtksourceview {
autoreconfHook = pkgs.autoreconfHook269;
};

View file

@ -1,22 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext }:
stdenv.mkDerivation rec {
pname = "scrollkeeper";
version = "0.3.14";
src = fetchurl {
url = "mirror://gnome/sources/scrollkeeper/${lib.versions.majorMinor version}/scrollkeeper-${version}.tar.bz2";
sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc";
};
# The fuloong2f is not supported by scrollkeeper-0.3.14 config.guess
preConfigure = "
substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog
cp ${automake}/share/automake*/config.{sub,guess} .
";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libxml2 libxslt gettext ]
++ (with perlPackages; [ perl XMLParser ]);
configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml" ];
}

View file

@ -1,6 +1,6 @@
{ mkDerivation }:
mkDerivation {
version = "25.1";
sha256 = "1wrdcc576ad4fibm95c3mfni8sg1h536b4affdj05qg5cyjjwwis";
version = "25.1.2";
sha256 = "0fn6zyqrgyiznyghkhygak524f3clc3kz91rarq8cqn3r920dmg9";
}

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "janet";
version = "1.24.1";
version = "1.25.1";
src = fetchFromGitHub {
owner = "janet-lang";
repo = pname;
rev = "v${version}";
sha256 = "sha256-uGbaoWJAWbSQ7QkocU7gFZUiWb0GD8mtuO7V0sUXTv0=";
sha256 = "sha256-TWKiSE8mqXz5i4vd32WylTsyxMXXKGmVl3U2q2sMwDQ=";
};
postPatch = ''

View file

@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-mqtt";
version = "0.7.12";
version = "0.7.13";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-mqtt";
rev = "v${version}";
sha256 = "sha256-0u3t0m5GQ7wxxLI8rY7j9AMliPzrAR9J/c/7DcT43WU=";
sha256 = "sha256-m0PJTJ+yZdJ4zU25g6H80jURPPU7wHuePcgfN6y8SKU=";
};
nativeBuildInputs = [

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "aws-c-sdkutils";
version = "0.1.4";
version = "0.1.6";
src = fetchFromGitHub {
owner = "awslabs";
repo = "aws-c-sdkutils";
rev = "v${version}";
sha256 = "sha256-B7BTafeN60csYhhscuHsynI183AvCqLljQgm8NgE6xo=";
sha256 = "sha256-KfQKOQrSgTy9Z+iUGnLblRArkq3xnFEnSq6HajcbysQ=";
};
nativeBuildInputs = [

View file

@ -22,13 +22,13 @@
stdenv.mkDerivation rec {
pname = "folly";
version = "2022.09.05.00";
version = "2022.11.07.00";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "sha256-V+CmsHPq+nIJrn7jPnwRls3ICW6JSqwOeDUQMvSyyrQ=";
sha256 = "sha256-RzVJuhyLZe5KGnNYUxkiAeYdQf4Amm8cAlV/12kmTj4=";
};
nativeBuildInputs = [

View file

@ -1,16 +1,20 @@
{ lib, stdenv, fetchFromGitHub, cmake, unixODBC }:
{ lib, stdenv, fetchFromGitHub, catch2, cmake, unixODBC }:
stdenv.mkDerivation rec {
pname = "nanodbc";
version = "2.13.0";
version = "2.14.0";
src = fetchFromGitHub {
owner = "nanodbc";
repo = "nanodbc";
rev = "v${version}";
sha256 = "1q80p7yv9mcl4hyvnvcjdr70y8nc940ypf368lp97vpqn5yckkgm";
hash = "sha256-dVUOwA7LfLqcQq2nc6OAha0krmgTy5RUHupBVrNdo4g=";
};
postPatch = ''
cp ${catch2}/include/catch2/catch.hpp test/catch/catch.hpp
'';
nativeBuildInputs = [ cmake ];
buildInputs = [ unixODBC ];
@ -20,15 +24,6 @@ stdenv.mkDerivation rec {
else
[ "-DBUILD_SHARED_LIBS=ON" ];
# fix compilation on macOS
# https://github.com/nanodbc/nanodbc/issues/274
# remove after the next version update
postUnpack = if stdenv.isDarwin then ''
mv $sourceRoot/VERSION $sourceRoot/VERSION.txt
substituteInPlace $sourceRoot/CMakeLists.txt \
--replace 'file(STRINGS VERSION' 'file(STRINGS VERSION.txt'
'' else "";
meta = with lib; {
homepage = "https://github.com/nanodbc/nanodbc";
changelog = "https://github.com/nanodbc/nanodbc/raw/v${version}/CHANGELOG.md";

View file

@ -239,7 +239,6 @@ qtModule {
'';
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64);
description = "A web engine based on the Chromium web browser";
platforms = platforms.linux;
# This build takes a long time; particularly on slow architectures

View file

@ -4,28 +4,44 @@
, pkg-config
, cmake
, IOKit
, cctools
}:
stdenv.mkDerivation rec {
pname = "unicorn";
version = "2.0.0-rc7";
version = "2.0.1";
src = fetchFromGitHub {
owner = "unicorn-engine";
repo = pname;
rev = version;
hash = "sha256-qlxtFCJBmouPuUEu8RduZM+rbOr52sGjdb8ZRHWmJ/w=";
hash = "sha256-D8kwrHo58zksVjB13VtzoVqmz++FRfJ4zI2CT+YeBVE=";
};
patches = [
# Fix compilation on aarch64-darwin
# See https://github.com/unicorn-engine/unicorn/issues/1730
./tests_unit_endian_aarch64.patch
];
nativeBuildInputs = [
cmake
pkg-config
] ++ lib.optionals stdenv.isDarwin [
cctools
];
buildInputs = lib.optionals stdenv.isDarwin [
IOKit
];
cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
# Some x86 tests are interrupted by signal 10
"-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;test_x86"
];
doCheck = true;
meta = with lib; {
description = "Lightweight multi-platform CPU emulator library";
homepage = "https://www.unicorn-engine.org";

View file

@ -0,0 +1,20 @@
diff --git a/tests/unit/endian.h b/tests/unit/endian.h
index 5bc86308..b455899e 100644
--- a/tests/unit/endian.h
+++ b/tests/unit/endian.h
@@ -54,6 +54,7 @@
|| defined(_POWER) || defined(__powerpc__) \
|| defined(__ppc__) || defined(__hpux) || defined(__hppa) \
|| defined(_MIPSEB) || defined(_POWER) \
+ || defined(__ARMEB__) || defined(__AARCH64EB__) \
|| defined(__s390__)
# define BOOST_BIG_ENDIAN
# define BOOST_BYTE_ORDER 4321
@@ -63,6 +64,7 @@
|| defined(_M_ALPHA) || defined(__amd64) \
|| defined(__amd64__) || defined(_M_AMD64) \
|| defined(__x86_64) || defined(__x86_64__) \
+ || defined(__ARMEL__) || defined(__AARCH64EL__) \
|| defined(_M_X64) || defined(__bfin__)
# define BOOST_LITTLE_ENDIAN

View file

@ -57,6 +57,7 @@
kaput-cli = "kaput";
leetcode-cli = "leetcode";
less = "lessc";
localtunnel = "lt";
lua-fmt = "luafmt";
markdownlint-cli = "markdownlint";
near-cli = "near";

View file

@ -124,6 +124,7 @@
, "@electron-forge/cli"
, "eas-cli"
, "elm-oracle"
, "elm-test"
, "emoj"
, "emojione"
, {"epgstation": "../../applications/video/epgstation"}
@ -208,6 +209,7 @@
, "less-plugin-clean-css"
, "live-server"
, "livedown"
, "localtunnel"
, "lodash"
, "lua-fmt"
, "lv_font_conv"

File diff suppressed because it is too large Load diff

View file

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "aiohomekit";
version = "2.2.17";
version = "2.2.18";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "Jc2k";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-eqLWHa7qUZ6UzNr9onwF2xmntKwdbNMWt2KvwG3kQjc=";
hash = "sha256-yE3+1dhgqgqmoBhBVsivXvn7MTKaY8FYiyqBRkg3h1U=";
};
nativeBuildInputs = [

View file

@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "aiopyarr";
version = "22.10.0";
version = "22.11.0";
format = "setuptools";
disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
owner = "tkdrob";
repo = pname;
rev = version;
hash = "sha256-FpBKhxFFMG5WgQ3TCAcg1P+cGVGU7LiJ+Zr4kL2Nl88=";
hash = "sha256-8/ixL4ByaBYoPbB4g+Rgx+5OM6vjrFTUEPR42wBKyyg=";
};
propagatedBuildInputs = [

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "lightwave2";
version = "0.8.15";
version = "0.8.16";
format = "setuptools";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-FKEUpfHnPwiLwC8fk+6AikviZKX7DBoWpSMxK1cHC2Y=";
sha256 = "sha256-9hWkRY71Ab2J2oQSnGu/rb0KmV3+cJb7vY2sAexDGzU=";
};
propagatedBuildInputs = [

View file

@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "nbxmpp";
version = "3.2.4";
version = "3.2.5";
disabled = pythonOlder "3.7";
@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "gajim";
repo = "python-nbxmpp";
rev = version;
sha256 = "sha256-ydOJBgKPkmw2Qf0TB3ukWGpi8P0BgcCGA47dASjRrgQ=";
sha256 = "sha256-HIPvZu8Zj69k1FCbkrlSeGtur5cT0TNIYfdXcRbYLwQ=";
};
nativeBuildInputs = [

View file

@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "pick";
version = "2.0.2";
version = "2.1.0";
format = "pyproject";
disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "wong2";
repo = pname;
rev = "refs/tags/v${version}";
sha256 = "sha256-W7jEVe2HvkZp3hFQpoqT8M7eYxwj2hfsOIhM0WZPvr8=";
sha256 = "sha256-rpUcWMVshlAhprvySqJJjVXpq92ITuhlV+DNwTXSfMc=";
};
nativeBuildInputs = [

View file

@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "pycfdns";
version = "1.2.2";
version = "2.0.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "ludeeus";
repo = pname;
rev = version;
sha256 = "sha256-bsalfZEkZrBG0/SyEXCWOZyrhOYU/3YJR/78FQTpXYk=";
sha256 = "sha256-2vjeoI+IqvCIHb51BLkuTISbG0PxFGHlmpSiCaV+E0w=";
};
propagatedBuildInputs = [

View file

@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "pymunk";
version = "6.2.1";
version = "6.3.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
sha256 = "18ae0f83ec2dc20892b98c84127ce9149ab40fa3c3120097377e1506884b27b8";
sha256 = "sha256-er0+HuCQw2FPeyuBc1BVdutmidYzcKIBqdeteqwsXiA=";
};
propagatedBuildInputs = [ cffi ];

View file

@ -0,0 +1,25 @@
{ lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec {
pname = "pyspellchecker";
version = "0.7.0";
format = "setuptools";
src = fetchPypi {
inherit pname version;
hash = "sha256-zKbDJCjuOI0Vsbh+lK/Dv5T7GGK6hIo7RJvs1inSatM=";
};
# no tests in PyPI
doCheck = false;
meta = with lib; {
description = "Pure python spell checking";
homepage = "https://github.com/barrust/pyspellchecker";
license = licenses.mit;
maintainers = with maintainers; [ zendo ];
};
}

View file

@ -29,7 +29,7 @@
buildPythonPackage rec {
pname = "pyunifiprotect";
version = "4.3.4";
version = "4.4.0";
format = "pyproject";
disabled = pythonOlder "3.9";
@ -38,7 +38,7 @@ buildPythonPackage rec {
owner = "briis";
repo = pname;
rev = "refs/tags/v${version}";
hash = "sha256-EMKbSNlMTHvwiTPb9jnA2NIG6OhyNJshrRPYpYdHsM8=";
hash = "sha256-2qgR9NCEIAENUatv9Bt0n7qp2md293xDTfE/U9zN1fI=";
};
postPatch = ''

View file

@ -26,22 +26,27 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [
boto3
click
click-default-group
boto3
];
checkInputs = [
pytestCheckHook
hypothesis
pytest-mock
moto
pytest-mock
pytestCheckHook
];
pythonImportsCheck = [
"s3_credentials"
];
disabledTests = [
# AssertionError: assert 'directory/th...ory/...
"test_put_objects"
];
meta = with lib; {
description = "Python CLI utility for creating credentials for accessing S3 buckets";
homepage = "https://github.com/simonw/s3-credentials";

View file

@ -15,8 +15,7 @@ buildPythonPackage rec {
sourceRoot = "source/bindings/python";
prePatch = ''
ln -s ${unicorn-emu}/lib/libunicorn${stdenv.targetPlatform.extensions.sharedLibrary} prebuilt/
ln -s ${unicorn-emu}/lib/libunicorn.a prebuilt/
ln -s ${unicorn-emu}/lib/libunicorn.* prebuilt/
'';
# needed on non-x86 linux

View file

@ -5,14 +5,14 @@
}:
python.pkgs.buildPythonApplication rec {
version = "2.1";
version = "2.1.1";
pname = "fdroidserver";
src = fetchFromGitLab {
owner = "fdroid";
repo = "fdroidserver";
rev = version;
sha256 = "0xmmjj7f05p4q8xbbkxqns2vvk2rsvb9n43vjdv0wbydmgpa34k7";
sha256 = "0qg4vxjcgm05dqk3kyj8lry9wh5bxy0qwz70fiyxb5bi1kwai9ss";
};
postPatch = ''

View file

@ -6,16 +6,16 @@
rustPlatform.buildRustPackage rec {
pname = "lightningcss";
version = "1.16.0";
version = "1.16.1";
src = fetchFromGitHub {
owner = "parcel-bundler";
repo = "lightningcss";
rev = "v${version}";
sha256 = "sha256-ze8+/34KeSQi2ftcpJYjF/EEFKYxkYijkpf+5eTo0Nk=";
sha256 = "sha256-Mr3sqPrP9fIuQrE+XtDe5lu8dGwYNtKElfxFvLIllb4=";
};
cargoSha256 = "sha256-4lJi1jCJoJdOz+NrlXS4O59rSq9Mz4e4O3zFNE/v+dE=";
cargoSha256 = "sha256-mF7bUcy5np/odQvhz0PEsWWgWRL2k8X0VaO9y1pDtzE=";
buildFeatures = [ "cli" ];

View file

@ -8,16 +8,16 @@
rustPlatform.buildRustPackage rec {
pname = "ruff";
version = "0.0.105";
version = "0.0.107";
src = fetchFromGitHub {
owner = "charliermarsh";
repo = pname;
rev = "v${version}";
sha256 = "sha256-aFBNSEGCutYpjVjAJb1DABv27wfE/qALCFL2r6m/zyQ=";
sha256 = "sha256-Um93keYzoMx0n/znYkvHVTNt4ov+xa2q5pM5XnJwYeY=";
};
cargoSha256 = "sha256-klxpqiT7pf9rHuGPnhAZKEqbuHFIGU7DAbiB6ZptyRI=";
cargoSha256 = "sha256-UxzVpZHS/hKfmAK4Zbejm9iUaALtbBJi4d1OS7vdRg4=";
buildInputs = lib.optionals stdenv.isDarwin [
CoreServices

View file

@ -8,20 +8,23 @@
, python3
}:
let
system = stdenv.hostPlatform.system;
in
buildBazelPackage rec {
pname = "verible";
version = "0.0-2172-g238b6df6";
version = "0.0-2472-ga80124e1";
# These environment variables are read in bazel/build-version.py to create
# a build string. Otherwise it would attempt to extract it from .git/.
GIT_DATE = "2022-08-08";
GIT_DATE = "2022-10-21";
GIT_VERSION = version;
src = fetchFromGitHub {
owner = "chipsalliance";
repo = "verible";
rev = "v${version}";
sha256 = "sha256-iOJhdbipuqqBiYGgk95d1c8bEK6Z16l16GuzYCQRc2g=";
sha256 = "sha256:0jpdxqhnawrl80pbc8544pyggdp5s3cbc7byc423d5v0sri2f96v";
};
patches = [
@ -38,8 +41,14 @@ buildBazelPackage rec {
];
fetchAttrs = {
# Fixed output derivation hash after bazel fetch
sha256 = "sha256-45PINJ7VtL5Jl/nAQNkiSCt8wUwtytNfgeNMZaz3Y9U=";
# Fixed output derivation hash after bazel fetch.
# This varies per platform, probably from the JDK pulled in being part
# of the output derivation ? Is there a more robust way to do this ?
# (Hashes extracted from the ofborg build logs)
sha256 = {
aarch64-linux = "sha256-6Udp7sZKGU8gcy6+5WPhkSWunf1sVkha8l5S1UQsC04=";
x86_64-linux = "sha256-WfhgbJFaM/ipdd1dRjPeVZ1mK2hotb0wLmKjO7e+BO4=";
}.${system} or (throw "No hash for system: ${system}");
};
nativeBuildInputs = [
@ -63,6 +72,7 @@ buildBazelPackage rec {
verilog/tools
'';
bazel = bazel_4;
removeRulesCC = false;
bazelTarget = ":install-binaries";
bazelTestTargets = [ "//..." ];
@ -93,6 +103,6 @@ buildBazelPackage rec {
description = "Suite of SystemVerilog developer tools. Including a style-linter, indexer, formatter, and language server.";
license = licenses.asl20;
platforms = platforms.linux;
maintainers = with maintainers; [ hzeller ];
maintainers = with maintainers; [ hzeller newam ];
};
}

View file

@ -1,16 +1,16 @@
{ lib, buildGoModule, fetchFromGitHub }:
buildGoModule rec {
pname = "thanos";
version = "0.28.1";
version = "0.29.0";
src = fetchFromGitHub {
rev = "v${version}";
owner = "thanos-io";
repo = "thanos";
sha256 = "sha256-Me97owPOTOuZkK/DQlPijff5Lq7Owx3VXyVB2PLJLnE=";
sha256 = "sha256-hGIhjv3q9zovEqPlC/xHg9Df2VxTL7QvC5ve6kodsks=";
};
vendorSha256 = "sha256-sZZCRLOXS2Zrpkrc362nyv7OhOooM130V2CrohM8U+E=";
vendorSha256 = "sha256-5Zj3m8RYFci0nTTeWP5mW5fGTN1hJ5R+ZblKuozACfs=";
doCheck = false;

View file

@ -12,14 +12,14 @@
mkYarnPackage rec {
pname = "hedgedoc";
version = "1.9.5";
version = "1.9.6";
# we use the upstream compiled js files because yarn2nix cannot handle different versions of dependencies
# in development and production and the web assets muts be compiled with js-yaml 3 while development
# uses js-yaml 4 which breaks the text editor
src = fetchzip {
url = "https://github.com/hedgedoc/hedgedoc/releases/download/${version}/hedgedoc-${version}.tar.gz";
hash = "sha256-dcqCc4UUI1knRlDfQlXq3cpTRTh+kbgFynbypDzw9y8=";
hash = "sha256-NoA4mv9LyvShr4fdfBSHgDoyxY59ubRC8YC6hvOimZc=";
};
nativeBuildInputs = [ which makeWrapper ];
@ -30,7 +30,7 @@ mkYarnPackage rec {
offlineCache = fetchYarnDeps {
yarnLock = src + "/yarn.lock";
sha256 = "18k2q2llngdk0gsyjrwpirhvwmkwgzhx8nw1rx7g7v2nfzyz189b";
sha256 = "1xxq02mgys3bp7ivgsr9hyafd866ygw2bp3rbld2500afvayz89v";
};
configurePhase = ''

View file

@ -1,6 +1,6 @@
{
"name": "HedgeDoc",
"version": "1.9.5",
"version": "1.9.6",
"description": "The best platform to write and share markdown.",
"main": "app.js",
"license": "AGPL-3.0",
@ -150,10 +150,10 @@
"emojify.js": "1.1.0",
"esbuild-loader": "2.20.0",
"escape-html": "1.0.3",
"eslint": "8.26.0",
"eslint": "8.27.0",
"eslint-config-standard": "17.0.0",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-n": "15.3.0",
"eslint-plugin-n": "15.5.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-promise": "6.1.1",
"eslint-plugin-standard": "4.1.0",

View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "scaleway-cli";
version = "2.6.1";
version = "2.6.2";
src = fetchFromGitHub {
owner = "scaleway";
repo = "scaleway-cli";
rev = "v${version}";
sha256 = "sha256-RygMrhXU36pjjlYVZLj5jryf2dzsg+o7QIcsmQN3dlw=";
sha256 = "sha256-WEEmU0YslQcjleM6jFLXNxogkXlRAUjkj0q+saugPYA=";
};
vendorSha256 = "sha256-7GslyeUz3S3yhki64DMOw1ixQUWstu/wAz9P2tQahA8=";
vendorSha256 = "sha256-1YXw6b8xUa2yEfMURetImg2TnFTDUsiQi441pX/O57M=";
ldflags = [
"-w"

View file

@ -8,24 +8,16 @@
}:
buildGoModule rec {
pname = "zrepl";
version = "0.5.0";
version = "0.6.0";
src = fetchFromGitHub {
owner = "zrepl";
repo = "zrepl";
rev = "v${version}";
sha256 = "4q/wwlF11HPDS2lTXUizJ3RFQ9sX5qNnWZUKAgnvDiE=";
sha256 = "sha256-XazwuaAzgTuKITF1mYihsNwkIKi5fvZrCvlCDKwxj4U=";
};
patches = [
# fix build with go 1.18
(fetchpatch {
url = "https://github.com/zrepl/zrepl/commit/19b2deb2cfe5e63b944fa83d12f474b11946ca3f.patch";
sha256 = "sha256-/SQhU1LnN2n4nwgWF6mq7sW2u52y8mwr6yntakAvSuk=";
})
];
vendorSha256 = "sha256-xToq9pKAxxknh4kE8S3uUg5ySPMbJkLftkMhofNxotc=";
vendorSha256 = "sha256-75fGejR7eiECsm1j3yIU1lAWaW9GrorrVnv8JEzkAtU=";
subPackages = [ "." ];

View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "atuin";
version = "11.0.0";
version = "12.0.0";
src = fetchFromGitHub {
owner = "ellie";
repo = pname;
rev = "v${version}";
sha256 = "sha256-fHqZkFWueC2jr86kR3T1qcFaMMhEqfu2pzt8VfqmBnE=";
sha256 = "sha256-kt0Xu95E3MayUybSh1mU5frJoU7BF41Hnjqqrz/cVHE=";
};
cargoSha256 = "sha256-BkrrVlqEtQWjc+jaKilAtf9xyaENAuvqCxIrxxmglOY=";
cargoSha256 = "sha256-WAAelEFtHlFGDk0AI381OS5bxN58Z46kyMAuL+XX/Ac=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -29,6 +29,7 @@ rustPlatform.buildRustPackage rec {
description = "Alternative to *fetch, uwuifies all stats";
homepage = "https://github.com/netthier/owofetch-rs";
license = licenses.gpl3Only;
platforms = platforms.x86_64;
maintainers = with maintainers; [ nullishamy ];
};
}

View file

@ -10,16 +10,16 @@
rustPlatform.buildRustPackage rec {
pname = "topgrade";
version = "10.0.1";
version = "10.1.1";
src = fetchFromGitHub {
owner = "topgrade-rs";
repo = "topgrade";
rev = "v${version}";
sha256 = "sha256-mrBcgzlAsikpxkCD8OGKyUPOYkgp7giPCaZPbzCcXg4=";
sha256 = "sha256-dcMTjJTcGjE+2sVuNlb3S/MECLMM9mPh27z8Kr+wBEI=";
};
cargoSha256 = "sha256-ImEnGhBjjHtAeoFqyeNKm39Bqs/icPstybFUlouBbFM=";
cargoSha256 = "sha256-UGR0k1bmhRFSKUCpA/DlI0XfMy/JTVWe8nIoiD5QVqc=";
nativeBuildInputs = [ installShellFiles ];

View file

@ -1,23 +1,23 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, pkg-config
, installShellFiles
, libxml2
, openssl
, stdenv
, curl
}:
rustPlatform.buildRustPackage rec {
pname = "hurl";
version = "1.7.0";
version = "1.8.0";
src = fetchFromGitHub {
owner = "Orange-OpenSource";
repo = pname;
rev = version;
sha256 = "sha256-bv51OOOQFHkFjtv/VXeemMybohtzrhyGfXQkVPDjcps=";
sha256 = "sha256-d2iWLswlKBow1B+cOaSmsHVWXk/ugwf3pn3OiLhCml0=";
};
nativeBuildInputs = [
@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
# Tests require network access to a test server
doCheck = false;
cargoSha256 = "sha256-BIt8xZveOeDUktLldtymYQqlkgqa7MJjKeSPby70Czg=";
cargoSha256 = "sha256-A3vl7QRKuox8aE0FsEOiVH/5sRMnKNcdjT2wWPLhd+4=";
postInstall = ''
installManPage docs/manual/hurl.1 docs/manual/hurlfmt.1
@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
description = "Command line tool that performs HTTP requests defined in a simple plain text format.";
homepage = "https://hurl.dev/";
changelog = "https://github.com/Orange-OpenSource/hurl/raw/${version}/CHANGELOG.md";
maintainers = with maintainers; [ eonpatapon ];
maintainers = with maintainers; [ eonpatapon figsoda ];
license = licenses.asl20;
};
}

View file

@ -0,0 +1,34 @@
From e8a3a20aed135272a9ec0103f4055411c075f043 Mon Sep 17 00:00:00 2001
From: Michal Sojka <michal.sojka@cvut.cz>
Date: Mon, 7 Nov 2022 00:07:22 +0100
Subject: [PATCH] Increase imap_vprintf buffer size
This fixes "Fatal: buffer too small. Please report a bug." error. See
https://sourceforge.net/p/isync/mailman/isync-devel/thread/87fsevvebj.fsf%40steelpick.2x.cz/#msg37731590
for related discussion.
When using mbsync with XOAUTH2 authentication (needed for Office365
mailboxes), the access token used for the LOGIN command may not fit
into the currently used buffer of 1000 characters. In my case, I need
the buffer to be at least 2000 characters long. To make this more
future-proof, I increase the buffer size to 4000 characters.
---
src/drv_imap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/drv_imap.c b/src/drv_imap.c
index c5a7aed..7847192 100644
--- a/src/drv_imap.c
+++ b/src/drv_imap.c
@@ -528,7 +528,7 @@ imap_vprintf( const char *fmt, va_list ap )
uint totlen = 0;
const char *segs[MAX_SEGS];
uint segls[MAX_SEGS];
- char buf[1000];
+ char buf[4000];
d = buf;
ed = d + sizeof(buf);
--
2.38.1

View file

@ -12,6 +12,11 @@ stdenv.mkDerivation rec {
sha256 = "1zq0wwvmqsl9y71546dr0aygzn9gjjfiw19hlcq87s929y4p6ckw";
};
patches = [
# Fixes "Fatal: buffer too small" error
./0001-Increase-imap_vprintf-buffer-size.patch
];
nativeBuildInputs = [ pkg-config perl ];
buildInputs = [ openssl db cyrus_sasl zlib ]
++ lib.optionals stdenv.isDarwin [ Security ];

View file

@ -2,17 +2,17 @@
buildGoModule rec {
pname = "lux";
version = "0.15.0";
version = "0.16.0";
src = fetchFromGitHub {
owner = "iawia002";
repo = "lux";
rev = "v${version}";
sha256 = "sha256-fZR+Q0duITZq3Ynr2WTZAhDnmEkXrT2gXUlpuN0+aFo=";
sha256 = "sha256-kB625R6Qlo9sw0iz8MbaCFOjxpMyH+9ugC6JDn7L7eM=";
};
nativeBuildInputs = [ makeWrapper ];
vendorSha256 = "sha256-SHUtyfGRGriEaESo6th7gGQn6V4REdk3XT0ZlGwky7E=";
vendorSha256 = "sha256-2cH5xVz3k9PPjzoMjWch3o8VBfP4nWAvakNwZNQLOeI=";
ldflags = [ "-s" "-w" ];

View file

@ -1332,6 +1332,7 @@ mapAliases ({
scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22
scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22
scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13
scrollkeeper = throw "'scrollkeeper' has been removed due to deprecated LibXML2 headers"; # Added 2022-11-08
scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07
sdlmame = mame; # Added 2019-10-30
seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21
@ -1599,6 +1600,7 @@ mapAliases ({
); # Added 2022-08-02
xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22
xv = xxv; # Added 2020-02-22
xvidcap = throw "'xvidcap' has been removed because of a broken dependency"; # Added 2022-11-08
xvfb_run = xvfb-run; # Added 2021-05-07
### Y ###

View file

@ -4830,7 +4830,9 @@ with pkgs;
shab = callPackage ../tools/text/shab { };
sheldon = callPackage ../tools/misc/sheldon { };
sheldon = callPackage ../tools/misc/sheldon {
inherit (darwin.apple_sdk.frameworks) Security;
};
shell-hist = callPackage ../tools/misc/shell-hist { };
@ -12730,6 +12732,7 @@ with pkgs;
unicorn = callPackage ../development/libraries/unicorn {
inherit (darwin.apple_sdk.frameworks) IOKit;
inherit (darwin) cctools;
};
units = callPackage ../tools/misc/units {
@ -18550,6 +18553,8 @@ with pkgs;
fltk = fltk13;
};
dillong = callPackage ../applications/networking/browsers/dillong { };
directfb = callPackage ../development/libraries/directfb { };
discordchatexporter-cli = callPackage ../tools/backup/discordchatexporter-cli { };
@ -28114,7 +28119,7 @@ with pkgs;
inherit (gnome) empathy;
endeavour = callPackage ../applications/misc/endeavour { };
endeavour = callPackage ../applications/office/endeavour { };
enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { };
@ -33236,10 +33241,6 @@ with pkgs;
xnotify = callPackage ../tools/X11/xnotify { };
xvidcap = callPackage ../applications/video/xvidcap {
inherit (gnome2) scrollkeeper libglade;
};
xygrib = libsForQt514.callPackage ../applications/misc/xygrib {};
xzgv = callPackage ../applications/graphics/xzgv { };
@ -37854,9 +37855,7 @@ with pkgs;
zfs-replicate = python3Packages.callPackage ../tools/backup/zfs-replicate { };
zrepl = callPackage ../tools/backup/zrepl {
buildGoModule = buildGo118Module; # nixosTests.zrepl fails with 1.19
};
zrepl = callPackage ../tools/backup/zrepl { };
uhubctl = callPackage ../tools/misc/uhubctl {};

View file

@ -8612,6 +8612,8 @@ self: super: with self; {
pyspcwebgw = callPackage ../development/python-modules/pyspcwebgw { };
pyspellchecker = callPackage ../development/python-modules/pyspellchecker { };
pyspf = callPackage ../development/python-modules/pyspf { };
pyspice = callPackage ../development/python-modules/pyspice { };