Merge master into staging-next
This commit is contained in:
@@ -9791,6 +9791,11 @@
|
||||
githubId = 28863828;
|
||||
name = "guserav";
|
||||
};
|
||||
guttermonk = {
|
||||
github = "guttermonk";
|
||||
githubId = 4753752;
|
||||
name = "guttermonk";
|
||||
};
|
||||
guyonvarch = {
|
||||
github = "guyonvarch";
|
||||
githubId = 6768842;
|
||||
@@ -22704,6 +22709,12 @@
|
||||
githubId = 34161949;
|
||||
keys = [ { fingerprint = "155C F413 0129 C058 9A5F 5524 3658 73F2 F0C6 153B"; } ];
|
||||
};
|
||||
sandarukasa = {
|
||||
name = "Sandaru Kasa";
|
||||
email = "SandaruKasa+nix@ya.ru";
|
||||
github = "SandaruKasa";
|
||||
githubId = 50824690;
|
||||
};
|
||||
sander = {
|
||||
email = "s.vanderburg@tudelft.nl";
|
||||
github = "svanderburg";
|
||||
|
||||
@@ -311,6 +311,7 @@ let
|
||||
bindsTo = optional (!config.boot.isContainer) "dev-net-tun.device";
|
||||
after = optional (!config.boot.isContainer) "dev-net-tun.device" ++ [ "network-pre.target" ];
|
||||
wantedBy = [
|
||||
"network.target"
|
||||
"network-setup.service"
|
||||
(subsystemDevice i.name)
|
||||
];
|
||||
@@ -337,6 +338,7 @@ let
|
||||
{
|
||||
description = "Bridge Interface ${n}";
|
||||
wantedBy = [
|
||||
"network.target"
|
||||
"network-setup.service"
|
||||
(subsystemDevice n)
|
||||
];
|
||||
@@ -441,6 +443,7 @@ let
|
||||
{
|
||||
description = "Open vSwitch Interface ${n}";
|
||||
wantedBy = [
|
||||
"network.target"
|
||||
"network-setup.service"
|
||||
(subsystemDevice n)
|
||||
]
|
||||
@@ -513,6 +516,7 @@ let
|
||||
{
|
||||
description = "Bond Interface ${n}";
|
||||
wantedBy = [
|
||||
"network.target"
|
||||
"network-setup.service"
|
||||
(subsystemDevice n)
|
||||
];
|
||||
@@ -561,6 +565,7 @@ let
|
||||
{
|
||||
description = "MACVLAN Interface ${n}";
|
||||
wantedBy = [
|
||||
"network.target"
|
||||
"network-setup.service"
|
||||
(subsystemDevice n)
|
||||
];
|
||||
@@ -604,6 +609,7 @@ let
|
||||
{
|
||||
description = "FOU endpoint ${n}";
|
||||
wantedBy = [
|
||||
"network.target"
|
||||
"network-setup.service"
|
||||
(subsystemDevice n)
|
||||
];
|
||||
@@ -633,6 +639,7 @@ let
|
||||
{
|
||||
description = "IPv6 in IPv4 Tunnel Interface ${n}";
|
||||
wantedBy = [
|
||||
"network.target"
|
||||
"network-setup.service"
|
||||
(subsystemDevice n)
|
||||
];
|
||||
@@ -675,6 +682,7 @@ let
|
||||
{
|
||||
description = "IP in IP Tunnel Interface ${n}";
|
||||
wantedBy = [
|
||||
"network.target"
|
||||
"network-setup.service"
|
||||
(subsystemDevice n)
|
||||
];
|
||||
@@ -722,6 +730,7 @@ let
|
||||
{
|
||||
description = "GRE Tunnel Interface ${n}";
|
||||
wantedBy = [
|
||||
"network.target"
|
||||
"network-setup.service"
|
||||
(subsystemDevice n)
|
||||
];
|
||||
@@ -756,6 +765,7 @@ let
|
||||
{
|
||||
description = "VLAN Interface ${n}";
|
||||
wantedBy = [
|
||||
"network.target"
|
||||
"network-setup.service"
|
||||
(subsystemDevice n)
|
||||
];
|
||||
|
||||
@@ -2,10 +2,11 @@
|
||||
lib,
|
||||
stdenvNoCC,
|
||||
fetchzip,
|
||||
nix-update-script,
|
||||
}:
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "0xproto";
|
||||
version = "2.100";
|
||||
version = "2.500";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -13,16 +14,23 @@ stdenvNoCC.mkDerivation rec {
|
||||
in
|
||||
fetchzip {
|
||||
url = "https://github.com/0xType/0xProto/releases/download/${version}/0xProto_${underscoreVersion}.zip";
|
||||
hash = "sha256-hUQGCsktnun9924+k6ECQuQ1Ddl/qGmtuLWERh/vDpc=";
|
||||
hash = "sha256-AmD5lUV341222gu/cCLnKWO87mjPn7gFkeklrV3OlOs=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
# Exclude files in ZxProto/. The fonts are identical, with only the filenames changed.:
|
||||
# https://github.com/0xType/0xProto/pull/112
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -Dm644 -t $out/share/fonts/opentype/ *.otf
|
||||
install -Dm644 -t $out/share/fonts/truetype/ *.ttf
|
||||
install -Dm644 -t $out/share/fonts/opentype/ *.otf ./No-Ligatures/*-NL.otf
|
||||
install -Dm644 -t $out/share/fonts/truetype/ *.ttf ./No-Ligatures/*-NL.ttf
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Free and Open-source font for programming";
|
||||
homepage = "https://github.com/0xType/0xProto";
|
||||
|
||||
@@ -6,17 +6,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "datafusion-cli";
|
||||
version = "49.0.0";
|
||||
version = "49.0.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "datafusion-cli-source";
|
||||
owner = "apache";
|
||||
repo = "arrow-datafusion";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-kwFSFatwX0czD6Mmfk9txggptPujkbywkqHkXPIrqo8=";
|
||||
hash = "sha256-/vqesGd0O/oZCx2UJLrFS1EeiLu7HkhHWhvGBEIZKdQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-404/AZ/LeXq7/u2Nem/kKyJwXC00srCrHwuvOwGnzUg=";
|
||||
cargoHash = "sha256-E7RT9n7zLoRGD4eNx5Fm89NtCxl2KujxfVhAeP+56vY=";
|
||||
|
||||
buildAndTestSubdir = "datafusion-cli";
|
||||
|
||||
|
||||
@@ -31,19 +31,19 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fractal";
|
||||
version = "12";
|
||||
version = "12.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "World";
|
||||
repo = "fractal";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-galaFpHcWrN+jQ6uOS78EB6wjfR8KIBLZvKmH7Rb1Xs=";
|
||||
hash = "sha256-xeB6N4ljXGzysy5RnDRK1wPiIRUSDcl+5BIdp6NO5ZA=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) src;
|
||||
hash = "sha256-DuEuCvhwulDHVCmUPXcM6PZ34nueRmKYHYffSsFCbLE=";
|
||||
hash = "sha256-CHduzW++BYzasFv/x0Q1T7EaTlo1EqYY2gxQJv+ek0A=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gexiv2";
|
||||
version = "0.14.5";
|
||||
version = "0.14.6";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "CRPFPaq6sfGrWGr9VbtVNweW8rirzG43ZAq3cErZnOE=";
|
||||
sha256 = "YGwoqq57Hz71yOq+Xn3/18WhyGbSW3Zx+4R/4oenK4s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "ghex";
|
||||
version = "48.beta2";
|
||||
version = "48.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/ghex/${lib.versions.major finalAttrs.version}/ghex-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-4vIgRVGNgWtG0wluCp075lTdggMBVGX8ck/okWrY70E=";
|
||||
hash = "sha256-qh0KtfdDBKqjGYehgtQh1j8ZzgJGXXxkJpbjFhI+MKg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "gnome-music";
|
||||
version = "48.0";
|
||||
version = "48.1";
|
||||
|
||||
format = "other";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-music/${lib.versions.major version}/gnome-music-${version}.tar.xz";
|
||||
hash = "sha256-jNqs0FJitjuxYIolrK1RboksMyIyNXy5t/aPLPuG1m4=";
|
||||
hash = "sha256-QL9XMC2l2zNraIVS7dAU2/vitEUEGWYAcpTGwrDAeN4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -9,10 +9,12 @@
|
||||
gettext,
|
||||
gperf,
|
||||
glib,
|
||||
localsearch,
|
||||
sqlite,
|
||||
libarchive,
|
||||
libdmapsharing,
|
||||
libsoup_3,
|
||||
librest_1_0,
|
||||
gnome,
|
||||
libxml2,
|
||||
lua5_4,
|
||||
@@ -33,11 +35,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "grilo-plugins";
|
||||
version = "0.3.16";
|
||||
version = "0.3.18";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "/m9Nvlhsa4uiQGOU4gLyLQCdZCqW6zpU8y9qIdCEzcs=";
|
||||
sha256 = "jjznTucXw8Mi0MsPjfJrsJFAKKXQFuKAVf+0nMmkbF4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -74,6 +76,7 @@ stdenv.mkDerivation rec {
|
||||
itstool
|
||||
gperf # for lua-factory
|
||||
glib # glib-compile-resources
|
||||
localsearch
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -88,6 +91,7 @@ stdenv.mkDerivation rec {
|
||||
libarchive
|
||||
libdmapsharing
|
||||
libsoup_3
|
||||
librest_1_0
|
||||
gmime
|
||||
gom
|
||||
json-glib
|
||||
|
||||
@@ -5,11 +5,9 @@
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
gi-docgen,
|
||||
gobject-introspection,
|
||||
vala,
|
||||
gtk-doc,
|
||||
docbook-xsl-nons,
|
||||
docbook_xml_dtd_412,
|
||||
glib,
|
||||
libxml2,
|
||||
gnome,
|
||||
@@ -17,7 +15,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gupnp-av";
|
||||
version = "0.14.3";
|
||||
version = "0.14.4";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -27,18 +25,22 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gupnp-av/${lib.versions.majorMinor version}/gupnp-av-${version}.tar.xz";
|
||||
sha256 = "q+IEYEPmapUpNl2JBZvhIhnCGk7eDEdDcDsP2arxe7Q=";
|
||||
sha256 = "Idl0sydctdz1uKodmj/IDn7cpwaTX2+9AEx5eHE4+Mc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
depsBuildBuild = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
gi-docgen
|
||||
gobject-introspection
|
||||
vala
|
||||
gtk-doc
|
||||
docbook-xsl-nons
|
||||
docbook_xml_dtd_412
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@@ -46,16 +48,17 @@ stdenv.mkDerivation rec {
|
||||
libxml2
|
||||
];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
"-Wno-error=deprecated-declarations"
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dgtk_doc=true"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc/gupnp-av-1.0" "$devdoc"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "gupnp-av";
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jsonrpc-glib";
|
||||
version = "3.44.1";
|
||||
version = "3.44.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "E2HRfpyAVkav5RAuWbr4ykUCOGAPyr0BWGxlS3i7MN8=";
|
||||
sha256 = "llSWtuExTzRotIKl2ANA3DsDQKVALXeDytJBVK7nc5Y=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
gitUpdater,
|
||||
mbedtls_2,
|
||||
mbedtls,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -28,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ mbedtls_2 ];
|
||||
buildInputs = [ mbedtls ];
|
||||
|
||||
cmakeFlags = [ (lib.cmakeBool "WITH_MBEDTLS" true) ];
|
||||
cmakeFlags = [ (lib.cmakeBool "WITH_MBEDTLS3" true) ];
|
||||
|
||||
env.NIX_LDFLAGS = "-lmbedcrypto -lmbedx509 -lmbedtls";
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libspelling";
|
||||
version = "0.4.8";
|
||||
version = "0.4.9";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/libspelling/${lib.versions.majorMinor finalAttrs.version}/libspelling-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-J3ZGKFgY2nspXvAHssXr2BXQkws60JdQWzztlpZa9Rc=";
|
||||
hash = "sha256-0JP9Na4PHJj7WIdlBSh/wKiF5H2p0kEdbXzVlfNNTr8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "near-facsimile";
|
||||
version = "1.0.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "msuchane";
|
||||
repo = "near-facsimile";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-JJoouEIccTEQtS8FliBEQr4zPcIqSt9PtAxAch5mOG0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-w6Diqvti8BJFk1OHIVP1cjez3KYFwShMqv1/f4oUnrI=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Find similar or identical text files in a directory";
|
||||
homepage = "https://github.com/msuchane/near-facsimile";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = with lib.maintainers; [ iamanaws ];
|
||||
mainProgram = "near-facsimile";
|
||||
};
|
||||
})
|
||||
@@ -22,11 +22,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "NetworkManager-openvpn";
|
||||
version = "1.12.2";
|
||||
version = "1.12.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/NetworkManager-openvpn/${lib.versions.majorMinor finalAttrs.version}/NetworkManager-openvpn-${finalAttrs.version}.tar.xz";
|
||||
sha256 = "qhtfmt341kvIxFk2HPDV4+uZ8Utg6oKjUAYxkor2Km8=";
|
||||
sha256 = "S9ochVm7jDX28THAntrpDN/M0DFOi4y5isVeCbYAWtw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -44,6 +44,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch = ''
|
||||
patchShebangs build-aux/cargo.sh
|
||||
meson rewrite kwargs set project / version '${finalAttrs.version}'
|
||||
substituteInPlace src/meson.build --replace-fail \
|
||||
"'src' / rust_target / 'news_flash_gtk'" \
|
||||
"'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / 'news_flash_gtk'"
|
||||
'';
|
||||
|
||||
strictDeps = true;
|
||||
@@ -88,6 +91,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
gst-plugins-bad
|
||||
]);
|
||||
|
||||
# For https://gitlab.com/news-flash/news_flash_gtk/-/blob/8e5fc4acf5ca6be5b8cd616466a17e7a273f9dda/src/meson.build#L47
|
||||
env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
|
||||
|
||||
passthru.updateScript = gitUpdater {
|
||||
rev-prefix = "v.";
|
||||
ignoredVersions = "(alpha|beta|rc)";
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
libpcap,
|
||||
libusb1,
|
||||
llvmPackages,
|
||||
nanoflann,
|
||||
|
||||
# nativeBuildInputs
|
||||
boost,
|
||||
@@ -32,13 +33,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "pcl";
|
||||
version = "1.15.0";
|
||||
version = "1.15.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PointCloudLibrary";
|
||||
repo = "pcl";
|
||||
tag = "pcl-${finalAttrs.version}";
|
||||
hash = "sha256-UCuQMWGwe+YxeGj0Y6m5IT58NW2lAWN5RqyZnvyFSr4=";
|
||||
hash = "sha256-+KyaajJM0I5CAcr8AiOLC4TkGV3Gm73a0/X8LQWFZMI=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
@@ -62,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libpcap
|
||||
libsForQt5.qtbase
|
||||
libusb1
|
||||
nanoflann
|
||||
]
|
||||
++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
|
||||
|
||||
|
||||
@@ -46,13 +46,13 @@
|
||||
patchRcPathCsh,
|
||||
patchRcPathFish,
|
||||
patchRcPathPosix,
|
||||
tbb,
|
||||
tbb_2022,
|
||||
xrootd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "root";
|
||||
version = "6.36.02";
|
||||
version = "6.36.04";
|
||||
|
||||
passthru = {
|
||||
tests = import ./tests { inherit callPackage; };
|
||||
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
|
||||
hash = "sha256-UQ1nezOsfKSKoNcSvbiNg1of9qN074bxoeFo+ieetHA=";
|
||||
hash = "sha256-zGNn2PVjxtSco0wJ0LU8sPQaUo22+GrxEf12dEzaRZY=";
|
||||
};
|
||||
|
||||
clad_src = fetchFromGitHub {
|
||||
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
|
||||
patchRcPathPosix
|
||||
pcre2
|
||||
python3
|
||||
tbb
|
||||
tbb_2022
|
||||
xrootd
|
||||
xxHash
|
||||
xz
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sensible-utils";
|
||||
version = "0.0.24";
|
||||
version = "0.0.26";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "salsa.debian.org";
|
||||
owner = "debian";
|
||||
repo = "sensible-utils";
|
||||
rev = "debian/${version}";
|
||||
sha256 = "sha256-omdg5df/TxURarrqawsB3+B85siDJxDaex/2rx5csXI=";
|
||||
sha256 = "sha256-vxzCICkF3KDBe+IIZ63JMiZmfHOllHf1Xtw/vWaimc8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
fetchpatch,
|
||||
fetchFromGitLab,
|
||||
meson,
|
||||
ninja,
|
||||
pkg-config,
|
||||
gettext,
|
||||
itstool,
|
||||
python3,
|
||||
wrapGAppsHook4,
|
||||
cairo,
|
||||
gdk-pixbuf,
|
||||
@@ -22,35 +20,28 @@
|
||||
libxml2,
|
||||
sane-backends,
|
||||
vala,
|
||||
gnome,
|
||||
gitUpdater,
|
||||
gobject-introspection,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "simple-scan";
|
||||
version = "46.0";
|
||||
version = "48.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/simple-scan/${lib.versions.major version}/simple-scan-${version}.tar.xz";
|
||||
hash = "sha256-wW5lkBQv5WO+UUMSKzu7U/awCn2p2VL2HEf6Jve08Kk=";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "simple-scan";
|
||||
tag = version;
|
||||
hash = "sha256-Y+uVAW0jpXJgadP6CjG8zeLgikFY2Pm0z4TZoyYK4+g=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# simple-scan: Use RDNN app ID
|
||||
# https://gitlab.gnome.org/GNOME/simple-scan/-/issues/390
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/simple-scan/-/commit/c09a6def153e52494072a36233c7e7b3307b67bf.patch";
|
||||
hash = "sha256-deyssrsVwPAfT5ru6c0LFwR2pEFnZ0v8wMqoi96tw8s=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
gettext
|
||||
itstool
|
||||
pkg-config
|
||||
python3
|
||||
wrapGAppsHook4
|
||||
libxml2
|
||||
gobject-introspection # For setup hook
|
||||
@@ -70,15 +61,12 @@ stdenv.mkDerivation rec {
|
||||
sane-backends
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs data/meson_compile_gschema.py
|
||||
'';
|
||||
|
||||
doCheck = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = "simple-scan";
|
||||
updateScript = gitUpdater {
|
||||
# Ignore tags like 48.1-2, which actually does not introduce any changes.
|
||||
ignoredVersions = "-";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -35,20 +35,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "siyuan";
|
||||
version = "3.2.1";
|
||||
version = "3.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "siyuan-note";
|
||||
repo = "siyuan";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-QDuSYEp9wdhVQt9cydxEMkjJyom+VwhJYl6vBbA1S00=";
|
||||
hash = "sha256-WJYokZXP+55QqA1B8LKz2PP0c5gZIccqCOkLjATMxPE=";
|
||||
};
|
||||
|
||||
kernel = buildGoModule {
|
||||
name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
|
||||
inherit (finalAttrs) src;
|
||||
sourceRoot = "${finalAttrs.src.name}/kernel";
|
||||
vendorHash = "sha256-5BCwk1bP4dHMLNV175OMHrmZVPInpjdE5vcETcsLhVw=";
|
||||
vendorHash = "sha256-1ST48PZcrFd2gjp56K/+hQN213vUYGtmvAJsPYH5z+M=";
|
||||
|
||||
patches = [
|
||||
(replaceVars ./set-pandoc-path.patch {
|
||||
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
postPatch
|
||||
;
|
||||
fetcherVersion = 1;
|
||||
hash = "sha256-WktlH+HmV4tegHxPb3BjYMr6EPsslCKb6p8aJ5bSdlY=";
|
||||
hash = "sha256-dyuKO4VQ3V2q2sIdR+tyEtxEDzfJD7g9rPpIMATW/So=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/app";
|
||||
|
||||
@@ -47,6 +47,7 @@ buildRustPackage rec {
|
||||
url = "https://github.com/tectonic-typesetting/tectonic/commit/fbb145cd079497b8c88197276f92cb89685b4d54.patch";
|
||||
hash = "sha256-6FW5MFkOWnqzYX8Eg5DfmLaEhVWKYVZwodE4SGXHKV0=";
|
||||
})
|
||||
./tectonic-0.15-fix-dangerous_implicit_autorefs.patch
|
||||
];
|
||||
|
||||
cargoPatches = [
|
||||
|
||||
+13
@@ -0,0 +1,13 @@
|
||||
diff --git a/crates/engine_bibtex/src/xbuf.rs b/crates/engine_bibtex/src/xbuf.rs
|
||||
index 8f3949e7..c216eb4d 100644
|
||||
--- a/crates/engine_bibtex/src/xbuf.rs
|
||||
+++ b/crates/engine_bibtex/src/xbuf.rs
|
||||
@@ -52,7 +52,7 @@ pub unsafe fn xrealloc_zeroed<T: SafelyZero>(
|
||||
old: *mut [T],
|
||||
new_len: usize,
|
||||
) -> Option<&'static mut [T]> {
|
||||
- let old_len = (*old).len();
|
||||
+ let old_len = (&(*old)).len();
|
||||
let new_size = new_len * mem::size_of::<T>();
|
||||
// SAFETY: realloc can be called with any size, even 0, that will just deallocate and return null
|
||||
let ptr = unsafe { xrealloc(old.cast(), new_size) }.cast::<T>();
|
||||
@@ -0,0 +1,24 @@
|
||||
{
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
mkYaziPlugin,
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "recycle-bin.yazi";
|
||||
version = "1.0.0-unstable-2025-08-20";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uhs-robert";
|
||||
repo = "recycle-bin.yazi";
|
||||
rev = "52f6fe08f5f42cbae56d8c46abc368560e1e2d6e";
|
||||
hash = "sha256-krZAbL7JRRvJbT+23C6fw8Zbav+8I+bvIFAYrpeNuhw=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A Recycle Bin for Yazi with browse, restore, and cleanup capabilities";
|
||||
homepage = "https://github.com/uhs-robert/recycle-bin.yazi";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ guttermonk ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
@@ -99,7 +99,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "zed-editor";
|
||||
version = "0.201.4";
|
||||
version = "0.201.5";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yFGi5Xy/a3pMyvVVQkX+Iv1pSm5HwQ6/1j+Vp9dKjbQ=";
|
||||
hash = "sha256-KMUF8k+cJg44Ta5Txb67vbO0zFTU2mKtLODhqbj6xXk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -138,7 +138,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-Y/Q1+LBHA0MntaYnOj4F/shy3aLj8e+U1QyS6husWt0=";
|
||||
cargoHash = "sha256-dKjp3gw+woqT3qqXbwbe57exqzcaufiMSR4RnrImXFI=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
|
||||
@@ -7,15 +7,15 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "zwave-js-ui";
|
||||
version = "11.1.0";
|
||||
version = "11.2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zwave-js";
|
||||
repo = "zwave-js-ui";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-7EjtxT8CnH73U58LeM9+WoBzQzFJ+7knJFfbq8vYk7c=";
|
||||
hash = "sha256-aEJfJyGuSNAY+QWJ51j3cP9gwBCwaq+PilGqCKjlzqc=";
|
||||
};
|
||||
npmDepsHash = "sha256-uSAkNc7T+il/Ew6mZzStSqvCl9hB0xdc2/zcaDNIip0=";
|
||||
npmDepsHash = "sha256-eAOoRolOlU5GwxvnQHxoNMhyMfxqZvcOQyLcHnGdVGU=";
|
||||
|
||||
passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
|
||||
|
||||
|
||||
@@ -17,11 +17,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libgnome-games-support";
|
||||
version = "2.0.1";
|
||||
version = "2.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "AYbyXEiSyGx+rEOjB/wZ22lt9PGayn9U6DwiHfnZeQo=";
|
||||
sha256 = "grvHTwj5i4M6m2REuEeeG9hN7QoHQl0Fe0XzjoeD5b0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchpatch,
|
||||
fetchurl,
|
||||
meson,
|
||||
ninja,
|
||||
@@ -16,8 +15,8 @@
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rest";
|
||||
version = "0.9.1";
|
||||
pname = "librest";
|
||||
version = "0.10.2";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -26,22 +25,10 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "kmalwQ7OOD4ZPft/+we1CcwfUVIauNrXavlu0UISwuM=";
|
||||
url = "mirror://gnome/sources/librest/${lib.versions.majorMinor version}/librest-${version}.tar.xz";
|
||||
sha256 = "e2y5Ers6Is+n3PAFkl3LYogwJNsMCQmUhufWhRGFybg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Pick up MR 30 (https://gitlab.gnome.org/GNOME/librest/-/merge_requests/30) to fix GOA crashes with libsoup 3
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/librest/-/commit/fbad64abe28a96f591a30e3a5d3189c10172a414.patch";
|
||||
hash = "sha256-r8+h84Y/AdM1IOMRcBVwDvfqapqOY8ZtRXdOIQvFR9w=";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/librest/-/commit/8049048a0f7d52b3f4101c7123797fed099d4cc8.patch";
|
||||
hash = "sha256-AMhHKzzOoTIlkRwN4KfUwdhxlqvtRgiVjKRfnG7KZwc=";
|
||||
})
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [
|
||||
@@ -67,18 +54,6 @@ stdenv.mkDerivation rec {
|
||||
"-Dca_certificates_path=/etc/ssl/certs/ca-certificates.crt"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# https://gitlab.gnome.org/GNOME/librest/-/merge_requests/19
|
||||
substituteInPlace meson.build \
|
||||
--replace "con." "conf."
|
||||
|
||||
# Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
|
||||
# it should be a build-time dep for build
|
||||
# TODO: send upstream
|
||||
substituteInPlace docs/meson.build \
|
||||
--replace "'gi-docgen', ver" "'gi-docgen', native:true, ver"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
moveToOutput "share/doc" "$devdoc"
|
||||
@@ -88,7 +63,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru = {
|
||||
updateScript = gnome.updateScript {
|
||||
packageName = pname;
|
||||
packageName = "librest";
|
||||
attrPath = "librest_1_0";
|
||||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchPypi,
|
||||
pythonOlder,
|
||||
poetry-core,
|
||||
importlib-metadata,
|
||||
importlib-resources,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cmudict";
|
||||
version = "1.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-I8ORTIVGX2p9JtLYl0+jQd17ySTR/6UBtBQGuTaSPbE=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
importlib-metadata
|
||||
importlib-resources
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"cmudict"
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/prosegrinder/python-cmudict/blob/main/CHANGELOG.md";
|
||||
description = "A versioned python wrapper package for The CMU Pronouncing Dictionary data files";
|
||||
homepage = "https://pypi.org/project/cmudict/";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [ sandarukasa ];
|
||||
};
|
||||
}
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "hf-xet";
|
||||
version = "1.1.8";
|
||||
version = "1.1.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = "xet-core";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-6KANNPFFZCpmDPnMgIBDBypYkkkeI0Las7BFiCHwzXI=";
|
||||
hash = "sha256-wbgGc2B3K0SRA37HaDbDKztBZgM9B8CwCLPLAd6oZ2U=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/hf_xet";
|
||||
@@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-G/O2PxdXDCFBSy0PvC8uvRhWib4+DAKPeK5WNV1gxAY=";
|
||||
hash = "sha256-YaWdF6uA++d3bgOZNAkN92oB6lUiBBQb1Q+4CrMaATA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "linode-api";
|
||||
version = "5.33.1";
|
||||
version = "5.34.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "linode";
|
||||
repo = "python-linode-api";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-RFnsz04Z3oB86VPzClYdQfgup27FNhSwvR0Q4hJclE8=";
|
||||
hash = "sha256-yaItHYxO2+oMiqNAHJJG1B0VRHyKNvicupktihbTNr8=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -13,22 +13,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytest-shared-session-scope";
|
||||
version = "0.5.0";
|
||||
version = "0.5.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "StefanBRas";
|
||||
repo = "pytest-shared-session-scope";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-/26iwaV6E15TWrObIvXE4AipEboe1gv6WYu4BndPtUs=";
|
||||
hash = "sha256-HB8RuF/+BmW3KBZ7C8EpUMuBntvcjSsrkLUiBvPwcf8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
# https://github.com/StefanBRas/pytest-shared-session-scope/issues/39
|
||||
substituteInPlace src/pytest_shared_session_scope/_scheduler.py \
|
||||
--replace-fail parse_spec_config parse_tx_spec_config
|
||||
'';
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitLab,
|
||||
setuptools,
|
||||
setuptools-scm,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "qemu-qmp";
|
||||
version = "0.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "qemu-project";
|
||||
repo = "python-qemu-qmp";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-NOtBea81hv+swJyx8Mv2MIqoK4/K5vyMiN12hhDEpJY=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "qemu.qmp" ];
|
||||
|
||||
meta = {
|
||||
description = "Asyncio library for communicating with QEMU Monitor Protocol (“QMP”) servers";
|
||||
# no changelog, included in the README of the homepage
|
||||
homepage = "https://gitlab.com/qemu-project/python-qemu-qmp";
|
||||
license = with lib.licenses; [
|
||||
lgpl2Plus
|
||||
gpl2Only
|
||||
];
|
||||
|
||||
maintainers = with lib.maintainers; [ brianmcgillion ];
|
||||
};
|
||||
}
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "schemdraw";
|
||||
version = "0.20";
|
||||
version = "0.21";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -25,7 +25,7 @@ buildPythonPackage rec {
|
||||
owner = "cdelker";
|
||||
repo = "schemdraw";
|
||||
tag = version;
|
||||
hash = "sha256-mt1XTrUH570zrJpCFo0jORAE/jo7H2T7sKpIskYw8bk=";
|
||||
hash = "sha256-+pvVt7Of5v17PNdZMj8hHvE5tICiTRMelp4trdUZsz4=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -2720,6 +2720,8 @@ self: super: with self; {
|
||||
|
||||
cmsis-svd = callPackage ../development/python-modules/cmsis-svd { };
|
||||
|
||||
cmudict = callPackage ../development/python-modules/cmudict { };
|
||||
|
||||
cnvkit = callPackage ../development/python-modules/cnvkit { };
|
||||
|
||||
co2signal = callPackage ../development/python-modules/co2signal { };
|
||||
@@ -15333,6 +15335,8 @@ self: super: with self; {
|
||||
|
||||
qemu = callPackage ../development/python-modules/qemu { qemu = pkgs.qemu; };
|
||||
|
||||
qemu-qmp = callPackage ../development/python-modules/qemu-qmp { };
|
||||
|
||||
qgrid = callPackage ../development/python-modules/qgrid { };
|
||||
|
||||
qiling = callPackage ../development/python-modules/qiling { };
|
||||
|
||||
Reference in New Issue
Block a user