Merge master into staging-next
This commit is contained in:
@@ -76,6 +76,9 @@ in
|
||||
|
||||
cl-print = null; # builtin
|
||||
|
||||
# https://github.com/NixOS/nixpkgs/issues/483425
|
||||
consult = addPackageRequires super.consult [ self.flymake ];
|
||||
|
||||
# missing optional dependencies https://codeberg.org/rahguzar/consult-hoogle/issues/4
|
||||
consult-hoogle = addPackageRequiresIfOlder super.consult-hoogle [ self.consult ] "0.2.2";
|
||||
|
||||
|
||||
@@ -310,11 +310,11 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"digitalocean_digitalocean": {
|
||||
"hash": "sha256-SmpbPDlJxsXT63d4KnUSzbPLSG5c2mPy6SCA8TCpxe4=",
|
||||
"hash": "sha256-inPOojpjliZpEN3Bk67mPdmq0XDCFHFpwthwuJjyIZg=",
|
||||
"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
|
||||
"owner": "digitalocean",
|
||||
"repo": "terraform-provider-digitalocean",
|
||||
"rev": "v2.73.0",
|
||||
"rev": "v2.74.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -382,11 +382,11 @@
|
||||
"vendorHash": "sha256-M5cX70GwfdEJ22V8CwoaNEdEWb1CX7wsBgvj3GvjE0Q="
|
||||
},
|
||||
"exoscale_exoscale": {
|
||||
"hash": "sha256-8FIZO+iRqYa7y5Li8GoGnFT069vx4q4KczCgEB4SKuk=",
|
||||
"hash": "sha256-V7mG584wyr99myizr/jx9AadkAnBCZvUvAKF0sX/CIA=",
|
||||
"homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
|
||||
"owner": "exoscale",
|
||||
"repo": "terraform-provider-exoscale",
|
||||
"rev": "v0.67.1",
|
||||
"rev": "v0.67.2",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": null
|
||||
},
|
||||
@@ -472,13 +472,13 @@
|
||||
"vendorHash": "sha256-mzDFyk2oImRXt72kFV5Ln++ScgoecpJEJtzUKjvCaws="
|
||||
},
|
||||
"grafana_grafana": {
|
||||
"hash": "sha256-gfS+sJREaObaXSgfVK7oUAgm05EqSRhiLauGP6V9Vhw=",
|
||||
"hash": "sha256-EO18AHTtuchRpHxcXa5shmCpoLR91Ows8doBUTjollI=",
|
||||
"homepage": "https://registry.terraform.io/providers/grafana/grafana",
|
||||
"owner": "grafana",
|
||||
"repo": "terraform-provider-grafana",
|
||||
"rev": "v4.23.0",
|
||||
"rev": "v4.25.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-sP86GbNZUmltn5a7AREyw54Fa3eFNwW/lMIFZIEj/Bo="
|
||||
"vendorHash": "sha256-5+nBYEAdiyNYsZsWvghciCYixQB3ojRlpSiSdjNWDHY="
|
||||
},
|
||||
"gridscale_gridscale": {
|
||||
"hash": "sha256-FAKvQ/MEod5Ck0PG4ffQ+gQp6zZ0JDRXPOrOiDpWMls=",
|
||||
@@ -923,13 +923,13 @@
|
||||
"vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU="
|
||||
},
|
||||
"mongodb_mongodbatlas": {
|
||||
"hash": "sha256-yVkhW1cYH+1biC1kUI6MdAK00QpiCyG/sGbOOxTEmm8=",
|
||||
"hash": "sha256-PACDH+CIEzUC/LYmppXin93vi0xp+1fMev2xn9iroRo=",
|
||||
"homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
|
||||
"owner": "mongodb",
|
||||
"repo": "terraform-provider-mongodbatlas",
|
||||
"rev": "v2.4.0",
|
||||
"rev": "v2.5.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-5xHm81ribxzdgSkMPAY7JEnlwf7wN/QGD8UyxUx2FOQ="
|
||||
"vendorHash": "sha256-3LMym5LFcrtEPA1exhrqbn3lqur7Vh8RP9wOwWChuKc="
|
||||
},
|
||||
"namecheap_namecheap": {
|
||||
"hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
|
||||
|
||||
@@ -6,14 +6,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cargo-tally";
|
||||
version = "1.0.71";
|
||||
version = "1.0.72";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-jJj4aXhGMU5L7Yya65wi022M6lE/nHiyjozptSJcMGg=";
|
||||
hash = "sha256-YkjRCP6VAp2Az0iM5HIG984ScJ3b3iKm34j4YuIs0kQ=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-GC4rYaNwTLfbSAojnhZb0vi6FmNiXL6YJ5TEVtQom6M=";
|
||||
cargoHash = "sha256-SAO1VqlYzySIiBV3j6PCo7gknekmULpG/Two/8R0pv4=";
|
||||
|
||||
meta = {
|
||||
description = "Graph the number of crates that depend on your crate over time";
|
||||
|
||||
@@ -29,7 +29,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "freefilesync";
|
||||
version = "14.6";
|
||||
version = "14.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
|
||||
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rm -f "$out"
|
||||
tryDownload "$url" "$out"
|
||||
'';
|
||||
hash = "sha256-OST2QIhPhKl9Qh4nHIno5XAJmLPNki0bU5A1ZXcUVTw=";
|
||||
hash = "sha256-WMSaKA3OA63V6Vis83vXa+y0ZRE0YxgXiB8YAyTSTc8=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
@@ -2,29 +2,29 @@ diff --git a/FreeFileSync/Source/ui/gui_generated.cpp b/FreeFileSync/Source/ui/g
|
||||
index a40eea3..23ec896 100644
|
||||
--- a/FreeFileSync/Source/ui/gui_generated.cpp
|
||||
+++ b/FreeFileSync/Source/ui/gui_generated.cpp
|
||||
@@ -5573,8 +5573,6 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
|
||||
wxBoxSizer* bSizer183;
|
||||
bSizer183 = new wxBoxSizer( wxHORIZONTAL );
|
||||
@@ -5553,8 +5553,6 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
|
||||
wxBoxSizer* bSizer183;
|
||||
bSizer183 = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
- m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
- bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
- m_bitmapAnimalSmall = new wxStaticBitmap( m_panelDonate, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
- bSizer183->Add( m_bitmapAnimalSmall, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
|
||||
|
||||
wxPanel* m_panel39;
|
||||
m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||
@@ -5587,13 +5585,11 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
|
||||
m_staticTextDonate->Wrap( -1 );
|
||||
m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
|
||||
wxPanel* m_panel39;
|
||||
m_panel39 = new wxPanel( m_panelDonate, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
|
||||
@@ -5567,13 +5565,11 @@ AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxS
|
||||
m_staticTextDonate->Wrap( -1 );
|
||||
m_staticTextDonate->SetForegroundColour( wxColour( 0, 0, 0 ) );
|
||||
|
||||
- bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
|
||||
- bSizer184->Add( m_staticTextDonate, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxALIGN_CENTER_VERTICAL, 10 );
|
||||
|
||||
|
||||
m_panel39->SetSizer( bSizer184 );
|
||||
m_panel39->Layout();
|
||||
bSizer184->Fit( m_panel39 );
|
||||
- bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
|
||||
m_panel39->SetSizer( bSizer184 );
|
||||
m_panel39->Layout();
|
||||
bSizer184->Fit( m_panel39 );
|
||||
- bSizer183->Add( m_panel39, 1, wxTOP|wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
|
||||
|
||||
|
||||
m_panelDonate->SetSizer( bSizer183 );
|
||||
m_panelDonate->SetSizer( bSizer183 );
|
||||
diff --git a/FreeFileSync/Source/ui/small_dlgs.cpp b/FreeFileSync/Source/ui/small_dlgs.cpp
|
||||
index 933fe81..734201f 100644
|
||||
--- a/FreeFileSync/Source/ui/small_dlgs.cpp
|
||||
|
||||
+21
-4
@@ -2,6 +2,7 @@
|
||||
stdenv,
|
||||
lib,
|
||||
replaceVars,
|
||||
buildPackages,
|
||||
fetchurl,
|
||||
meson,
|
||||
ninja,
|
||||
@@ -36,15 +37,17 @@
|
||||
tzdata,
|
||||
gcr_4,
|
||||
gnome-session-ctl,
|
||||
udevCheckHook,
|
||||
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gnome-settings-daemon";
|
||||
version = "46.0";
|
||||
version = "48.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c=";
|
||||
hash = "sha256-OGCi6iFNy8tmAK56HjNYpTiSFQh7w+SkfO4/h7ruBi4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@@ -56,17 +59,24 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
];
|
||||
|
||||
depsBuildBuild = [
|
||||
buildPackages.stdenv.cc
|
||||
pkg-config
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
perl
|
||||
gettext
|
||||
glib
|
||||
libxml2
|
||||
libxslt
|
||||
docbook_xsl
|
||||
wrapGAppsHook3
|
||||
python3
|
||||
udevCheckHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
@@ -87,14 +97,19 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
polkit
|
||||
geocode-glib_2
|
||||
geoclue2
|
||||
systemd
|
||||
libgudev
|
||||
libwacom
|
||||
gcr_4
|
||||
]
|
||||
++ lib.optionals withSystemd [
|
||||
systemd
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
"-Dudev_dir=${placeholder "out"}/lib/udev"
|
||||
(lib.mesonBool "systemd" withSystemd)
|
||||
]
|
||||
++ lib.optionals withSystemd [
|
||||
"-Dgnome_session_ctl_path=${gnome-session-ctl}/libexec/gnome-session-ctl"
|
||||
];
|
||||
|
||||
@@ -103,12 +118,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS";
|
||||
|
||||
postPatch = ''
|
||||
for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do
|
||||
for f in plugins/power/gsd-power-constants-update.pl; do
|
||||
chmod +x $f
|
||||
patchShebangs $f
|
||||
done
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "GNOME Settings Daemon";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/";
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "gradle-completion";
|
||||
version = "1.6.0";
|
||||
version = "9.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gradle";
|
||||
repo = "gradle-completion";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-HY/woUOzkRVb6ekIaQrY1+5pKxd5+cpG74+xqzpkazs=";
|
||||
hash = "sha256-kmjlEO0MI7+OwZqgwkv5z8iX1iAZDiIpqevoeb1sDUU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -6,19 +6,19 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "grafana-image-renderer";
|
||||
version = "5.2.3";
|
||||
version = "5.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "grafana";
|
||||
repo = "grafana-image-renderer";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-YoJ50PhpxXQLpZpq+fLiN2uYU1C6w8C2UVun/klee4E=";
|
||||
hash = "sha256-rCFdjM5ZBHcfl4/WXM4CPdLlIprJr3HATboBF89sMFA=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-kGLvstSkucM0tN5l+Vp78IP9EwDx62kukAiOwYD4Vfs=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace go.mod --replace-fail 'go 1.25.5' 'go 1.25.4'
|
||||
substituteInPlace go.mod --replace-fail 'go 1.25.6' 'go 1.25.5'
|
||||
'';
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
lib,
|
||||
appimageTools,
|
||||
fetchurl,
|
||||
version ? "0.9.14.0",
|
||||
hash ? "sha256-ABAGXTszJPdmVuRuJddZ2VgMhiABtAYFuxAteP8S44w=",
|
||||
version ? "0.9.15.1",
|
||||
hash ? "sha256-MvzvTa+05oTBVHgoKyGwsC/Ab02RABL2rcUguNICr2o=",
|
||||
}:
|
||||
|
||||
let
|
||||
|
||||
@@ -8,13 +8,16 @@
|
||||
gobject-introspection,
|
||||
cairo,
|
||||
colord,
|
||||
docutils,
|
||||
lcms2,
|
||||
pango,
|
||||
libstartup_notification,
|
||||
libcanberra,
|
||||
ninja,
|
||||
xvfb-run,
|
||||
libadwaita,
|
||||
libxcvt,
|
||||
libGL,
|
||||
libICE,
|
||||
libX11,
|
||||
libXcomposite,
|
||||
@@ -27,7 +30,6 @@
|
||||
libxkbfile,
|
||||
xkeyboard_config,
|
||||
libxkbcommon,
|
||||
libXrender,
|
||||
libxcb,
|
||||
libXrandr,
|
||||
libXinerama,
|
||||
@@ -69,7 +71,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "mutter";
|
||||
version = "46.8";
|
||||
version = "48.7";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -80,13 +82,15 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
|
||||
hash = "sha256-+8CDVEr7O4Vn18pobCF/g3sG+UeNbiV0FZ/5ocjhyWI=";
|
||||
hash = "sha256-7BAqo8uw45ABIGYnrKMFUxRVX3BgneXmwrfvzR+pDyA=";
|
||||
};
|
||||
|
||||
mesonFlags = [
|
||||
"-Degl_device=true"
|
||||
"-Dinstalled_tests=false" # TODO: enable these
|
||||
"-Dtests=false"
|
||||
"-Dtests=disabled"
|
||||
# For NVIDIA proprietary driver up to 470.
|
||||
# https://src.fedoraproject.org/rpms/mutter/pull-request/49
|
||||
"-Dwayland_eglstream=true"
|
||||
"-Dprofiler=true"
|
||||
"-Dxwayland_path=${lib.getExe xwayland}"
|
||||
@@ -104,13 +108,16 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
desktop-file-utils
|
||||
docutils # for rst2man
|
||||
gettext
|
||||
glib
|
||||
libxcvt
|
||||
meson
|
||||
ninja
|
||||
xvfb-run
|
||||
pkg-config
|
||||
python3
|
||||
python3.pkgs.argcomplete # for register-python-argcomplete
|
||||
wayland-scanner
|
||||
wrapGAppsHook4
|
||||
gi-docgen
|
||||
@@ -134,6 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libgbm
|
||||
libei
|
||||
libdisplay-info
|
||||
libGL
|
||||
libgudev
|
||||
libinput
|
||||
libstartup_notification
|
||||
@@ -162,36 +170,43 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
libxkbfile
|
||||
xkeyboard_config
|
||||
libxkbcommon
|
||||
libXrender
|
||||
libxcb
|
||||
libXrandr
|
||||
libXinerama
|
||||
libXau
|
||||
|
||||
# for gdctl shebang
|
||||
(python3.withPackages (pp: [
|
||||
pp.pygobject3
|
||||
pp.argcomplete
|
||||
]))
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs src/backends/native/gen-default-modes.py
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas"
|
||||
# https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3981
|
||||
substituteInPlace src/frames/main.c \
|
||||
--replace-fail "libadwaita-1.so.0" "${libadwaita}/lib/libadwaita-1.so.0"
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
# Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
|
||||
# TODO: Move this into a directory devhelp can find.
|
||||
moveToOutput "share/mutter-14/doc" "$devdoc"
|
||||
moveToOutput "share/mutter-${finalAttrs.passthru.libmutter_api_version}/doc" "$devdoc"
|
||||
'';
|
||||
|
||||
# Install udev files into our own tree.
|
||||
env.PKG_CONFIG_UDEV_UDEVDIR = "${placeholder "out"}/lib/udev";
|
||||
|
||||
separateDebugInfo = true;
|
||||
strictDeps = true;
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
passthru = {
|
||||
libdir = "${finalAttrs.finalPackage}/lib/mutter-14";
|
||||
libmutter_api_version = "16"; # bumped each dev cycle
|
||||
libdir = "${finalAttrs.finalPackage}/lib/mutter-${finalAttrs.passthru.libmutter_api_version}";
|
||||
|
||||
tests = {
|
||||
libdirExists = runCommand "mutter-libdir-exists" { } ''
|
||||
@@ -208,6 +223,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
description = "Window manager for GNOME";
|
||||
mainProgram = "mutter";
|
||||
homepage = "https://gitlab.gnome.org/GNOME/mutter";
|
||||
changelog = "https://gitlab.gnome.org/GNOME/mutter/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
|
||||
license = lib.licenses.gpl2Plus;
|
||||
teams = [ lib.teams.pantheon ];
|
||||
platforms = lib.platforms.linux;
|
||||
@@ -14,13 +14,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "nixbit";
|
||||
version = "0.7.1";
|
||||
version = "0.7.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pbek";
|
||||
repo = "nixbit";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-VBstZEs1ptLWjqiat5vLdrduUDTBj2Lm9CwpMt1puyM=";
|
||||
hash = "sha256-fKDNoDrJvbRl81N3fAvUugorsL6HspOSgopxBATcBBo=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
fetchpatch2,
|
||||
fontconfig,
|
||||
gettext,
|
||||
groff,
|
||||
@@ -30,6 +31,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-L7WL8zn1Qkf5sqrhqZJqFe4B1l9ULXI3pt3Jpc87huk=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# GCC 15 fix
|
||||
(fetchpatch2 {
|
||||
url = "https://github.com/raboof/notion/commit/89c92f49abfeae1168ad343d4f529a52d0edd78c.patch?full_index=1";
|
||||
hash = "sha256-+4GGeY2j7B54Ffw5gFNpG4704Egc7rA6w5z0sZG8210=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
gettext
|
||||
groff
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
withUi ? true,
|
||||
buildFeatures ?
|
||||
# enable all features except self_update by default
|
||||
# https://github.com/dathere/qsv/blob/11.0.2/Cargo.toml#L370
|
||||
# https://github.com/dathere/qsv/blob/14.0.0/Cargo.toml#L370
|
||||
[
|
||||
"apply"
|
||||
"feature_capable"
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
let
|
||||
pname = "qsv";
|
||||
version = "11.0.2";
|
||||
version = "14.0.0";
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
inherit pname version buildFeatures;
|
||||
@@ -42,10 +42,10 @@ rustPlatform.buildRustPackage {
|
||||
owner = "dathere";
|
||||
repo = "qsv";
|
||||
rev = version;
|
||||
hash = "sha256-EuNDwzO4tVjJUz8mXI0fDczoPLD89zmbSyfFI8ZrgwU=";
|
||||
hash = "sha256-Y/rCNG74R9EZMp+vLdGr+62HRM5Y4LpXq2C9S7gZ3fM=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-l8hkDr3CtpyXWDTS8oje6W0iu5O28j4rLIXprxTEwHc=";
|
||||
cargoHash = "sha256-5Q3Eim6Yk0a+0Pq0JHHQw/X9Zl4TNml2OjoCRwjd5Lw=";
|
||||
|
||||
buildInputs = [
|
||||
file
|
||||
|
||||
@@ -25,13 +25,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "scummvm";
|
||||
version = "2.9.1";
|
||||
version = "2026.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scummvm";
|
||||
repo = "scummvm";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-+MM47piuXuIBmAQd0g/cAg5t02qSQ0sw/DwFrMUSIAA=";
|
||||
hash = "sha256-wgMOhQ6yHk4dG94J4EdHTxsaCqapyFhJU1GjRuQY8TY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ nasm ];
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "snac2";
|
||||
version = "2.88";
|
||||
version = "2.89";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "grunfink";
|
||||
repo = "snac2";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-3IqPIIfU4MKXMMpOFYgI0RN+DZE+oTgLGOYIKwfKCsI=";
|
||||
hash = "sha256-MnDvEnwdrqrWm2qSTieaE4aB1GbrMtpps+rX/ff7EDQ=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sof-tools";
|
||||
version = "2.14";
|
||||
version = "2.14.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "thesofproject";
|
||||
repo = "sof";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-Y3byJmoANVeilJpO82aljBZas/6u6VqfynYl0csW1as=";
|
||||
hash = "sha256-1LLpmcwz0NYhJ9eCeuQWCwjROPptS6MWq+LkkN4Bsek=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -9,16 +9,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ttl";
|
||||
version = "0.13.0";
|
||||
version = "0.13.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lance0";
|
||||
repo = "ttl";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-cHiAIWUewdUwV9PO1He2V/+FML8XSVJOlyp+J+tdB24=";
|
||||
hash = "sha256-r1rmyQI4EnLpCYpcz3cNO5XI6uLaBVYTGC8+ttyzUu8=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6TehH3p9ikt1lx7p2Y2jM/21gASk8Taqoe/2bBfFs94=";
|
||||
cargoHash = "sha256-fcfgj26cgM7q3byxfVJ2GKRXg4oNd6tj5plEylfJXjQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
|
||||
@@ -9,11 +9,11 @@
|
||||
}:
|
||||
let
|
||||
pname = "volanta";
|
||||
version = "1.15.0";
|
||||
build = "1240645b";
|
||||
version = "1.15.2";
|
||||
build = "32c42adb";
|
||||
src = fetchurl {
|
||||
url = "https://cdn.volanta.app/software/volanta-app/${version}-${build}/volanta-${version}.AppImage";
|
||||
hash = "sha256-6QF9o5BFeGZBjpusFMYrWlnYhAdItfxg+gS0Xf2q7io=";
|
||||
hash = "sha256-2f6/zl+N3sZ6en50T8lo2EDMGi/sBk2SHKKBxm/oGQw=";
|
||||
};
|
||||
appImageContents = appimageTools.extract { inherit pname version src; };
|
||||
in
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "wireguard-vanity-keygen";
|
||||
version = "0.1.2";
|
||||
version = "0.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "axllent";
|
||||
repo = "wireguard-vanity-keygen";
|
||||
rev = version;
|
||||
hash = "sha256-IF5z0qkVOzcwVQNfem18DTn6KbEjjPspGfneG1ekGJI=";
|
||||
hash = "sha256-TpfSowOS1dNKIcoTV1hTnMzEbAax8uwYoan3SIJ03Lc=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-dYpkAdOjiXm1REGsUUTRb8de6okdZ9GpKppBnb6oo9g=";
|
||||
vendorHash = "sha256-eh7zTM88qgXKqmhf1WyWsKve+YneQAUji2mDMEHUCIA=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "woodpecker-plugin-git";
|
||||
version = "2.8.0";
|
||||
version = "2.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "woodpecker-ci";
|
||||
repo = "plugin-git";
|
||||
tag = version;
|
||||
hash = "sha256-fUGTO60ZgMt8t/O4Cb3trSMmTFhKBxG8sjft+hrmUjQ=";
|
||||
hash = "sha256-MhtqRWmZCjtb2QOwlbnlZUPHDNunjgWlhHCtM9pvYMM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-FbtktDU6Rl3lu3U2vu20M+hz1HdLMu1krUcqXX3HfeA=";
|
||||
vendorHash = "sha256-hOktS+CQQ6TaHt96DaAcZXhqJGGleD/RdjdUfgv7oxw=";
|
||||
|
||||
env.CGO_ENABLED = "0";
|
||||
|
||||
|
||||
+110
-10
@@ -15,14 +15,15 @@
|
||||
icu,
|
||||
jdk,
|
||||
lib,
|
||||
# workaround https://github.com/NixOS/nixpkgs/issues/477805
|
||||
nodejs_22,
|
||||
# needs to be static and built with MD2 support!
|
||||
openssl,
|
||||
pkg-config,
|
||||
python3,
|
||||
qt5,
|
||||
runCommand,
|
||||
stdenv,
|
||||
writers,
|
||||
writeScript,
|
||||
x2t,
|
||||
grunt-cli,
|
||||
@@ -30,7 +31,6 @@
|
||||
|
||||
let
|
||||
qmake = qt5.qmake;
|
||||
libv8 = nodejs_22.libv8;
|
||||
fixIcu = writeScript "fix-icu.sh" ''
|
||||
substituteInPlace \
|
||||
$BUILDRT/Common/3dParty/icu/icu.pri \
|
||||
@@ -131,8 +131,90 @@ let
|
||||
rev = core-rev;
|
||||
hash = "sha256-RSoCRcUGnavcNdZEfmBdtxJbEXhiOvbA8IwSeGBkWcs=";
|
||||
};
|
||||
# mini implementation of https://github.com/kentcdodds/cross-env
|
||||
# because that was not trivial to package and we don't need most
|
||||
# of its functionality anyway
|
||||
cross-env = writers.writePython3Bin "cross-env" { } ''
|
||||
import os
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
env = os.environ
|
||||
cmd = []
|
||||
|
||||
for k in sys.argv[1:]:
|
||||
if '=' in k:
|
||||
env[k.split('=')[0]] = k.split('=')[1]
|
||||
else:
|
||||
cmd += [k]
|
||||
|
||||
subprocess.run(cmd, env=env)
|
||||
'';
|
||||
# rev that the 'web-apps' submodule in documentserver points at
|
||||
web-apps-rev = "c2074bbff69902490d49fa7fb511801a11c581f4";
|
||||
web-apps-hash = "sha256-i+m8a1b8RaVmyUAC+FiEdSyXmPWse9XaJaaLL7iq73o=";
|
||||
web-apps-mobile = buildNpmPackage (finalAttrs: {
|
||||
name = "web-apps-mobile";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ONLYOFFICE";
|
||||
repo = "web-apps";
|
||||
rev = web-apps-rev;
|
||||
hash = web-apps-hash;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# the spinner floods the output to the point of
|
||||
# exhausting memory...
|
||||
./web-apps-mobile-no-spinner.patch
|
||||
];
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/vendor/framework7-react";
|
||||
|
||||
npmDepsHash = "sha256-EBUseLFZ5Hc1DHRWL/2erOjlxfm4wHgyIURi5XTXNP8=";
|
||||
|
||||
dontNpmBuild = true;
|
||||
|
||||
preBuild = ''
|
||||
export PRODUCT_VERSION=${version}
|
||||
# 'd' is for 'debug'
|
||||
export BUILD_NUMBER=$(echo "${web-apps-rev}" | tr d _)
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
chmod u+wx ../../apps/*/mobile
|
||||
|
||||
npm run deploy-word
|
||||
mkdir -p $out/documenteditor/mobile
|
||||
mv ../../apps/documenteditor/mobile/css $out/documenteditor/mobile
|
||||
mv ../../apps/documenteditor/mobile/dist $out/documenteditor/mobile
|
||||
mv ../../apps/documenteditor/mobile/index.html $out/documenteditor/mobile
|
||||
|
||||
npm run deploy-cell
|
||||
mkdir -p $out/spreadsheeteditor/mobile
|
||||
mv ../../apps/spreadsheeteditor/mobile/css $out/spreadsheeteditor/mobile
|
||||
mv ../../apps/spreadsheeteditor/mobile/dist $out/spreadsheeteditor/mobile
|
||||
mv ../../apps/spreadsheeteditor/mobile/index.html $out/spreadsheeteditor/mobile
|
||||
|
||||
npm run deploy-slide
|
||||
mkdir -p $out/presentationeditor/mobile
|
||||
mv ../../apps/presentationeditor/mobile/css $out/presentationeditor/mobile
|
||||
mv ../../apps/presentationeditor/mobile/dist $out/presentationeditor/mobile
|
||||
mv ../../apps/presentationeditor/mobile/index.html $out/presentationeditor/mobile
|
||||
|
||||
npm run deploy-visio
|
||||
mkdir -p $out/visioeditor/mobile
|
||||
mv ../../apps/visioeditor/mobile/css $out/visioeditor/mobile
|
||||
mv ../../apps/visioeditor/mobile/dist $out/visioeditor/mobile
|
||||
mv ../../apps/visioeditor/mobile/index.html $out/visioeditor/mobile
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
});
|
||||
web-apps = buildNpmPackage (finalAttrs: {
|
||||
name = "onlyoffice-core-webapps";
|
||||
name = "onlyoffice-core-web-apps";
|
||||
|
||||
# workaround for https://github.com/NixOS/nixpkgs/issues/477803
|
||||
nodejs = nodejs_22;
|
||||
@@ -141,13 +223,16 @@ let
|
||||
owner = "ONLYOFFICE";
|
||||
repo = "web-apps";
|
||||
# rev that the 'web-apps' submodule in documentserver points at
|
||||
rev = "c2074bbff69902490d49fa7fb511801a11c581f4";
|
||||
hash = "sha256-i+m8a1b8RaVmyUAC+FiEdSyXmPWse9XaJaaLL7iq73o=";
|
||||
rev = web-apps-rev;
|
||||
hash = web-apps-hash;
|
||||
};
|
||||
sourceRoot = "${finalAttrs.src.name}/build";
|
||||
|
||||
patches = [
|
||||
./web-apps-avoid-phantomjs.patch
|
||||
# mobile resources are created separately
|
||||
# in the web-apps-mobile derivation
|
||||
./web-apps-no-mobile.patch
|
||||
];
|
||||
|
||||
npmDepsHash = "sha256-Uen7gl6w/0A4MDk+7j+exkdwfCYqMSPJidad8AM60eQ=";
|
||||
@@ -163,6 +248,10 @@ let
|
||||
|
||||
preBuild = ''
|
||||
export PRODUCT_VERSION=${version}
|
||||
|
||||
# for device_scale.js
|
||||
chmod u+rwx ../..
|
||||
ln -s ${sdkjs.src} ../../sdkjs
|
||||
'';
|
||||
|
||||
postBuild = ''
|
||||
@@ -173,13 +262,20 @@ let
|
||||
mkdir -p ./node_modules/optipng-bin/vendor
|
||||
ln -s ${optipng}/bin/optipng ./node_modules/optipng-bin/vendor/optipng
|
||||
|
||||
grunt --force
|
||||
grunt
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r ../deploy/web-apps $out
|
||||
mv ../deploy/web-apps $out
|
||||
|
||||
for component in documenteditor spreadsheeteditor presentationeditor visioeditor; do
|
||||
ln -s ${web-apps-mobile}/$component/mobile/css $out/apps/$component/mobile/css
|
||||
rm -r $out/apps/$component/mobile/dist
|
||||
ln -s ${web-apps-mobile}/$component/mobile/dist $out/apps/$component/mobile/dist
|
||||
ln -s ${web-apps-mobile}/$component/mobile/index.html $out/apps/$component/mobile/index.html
|
||||
done
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@@ -220,7 +316,8 @@ let
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cp -r ../deploy/sdkjs $out
|
||||
mv ../deploy/sdkjs $out
|
||||
cp ../common/device_scale.js $out/common
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
@@ -633,8 +730,9 @@ let
|
||||
|
||||
echo "== v8 =="
|
||||
mkdir -p Common/3dParty/v8_89/v8/out.gn/linux_64
|
||||
ln -s ${libv8}/lib Common/3dParty/v8_89/v8/out.gn/linux_64/obj
|
||||
tar xf ${libv8.src} --one-top-level=/tmp/xxxxx
|
||||
# using nodejs_22 here is a workaround for https://github.com/NixOS/nixpkgs/issues/477805
|
||||
ln -s ${nodejs_22.libv8}/lib Common/3dParty/v8_89/v8/out.gn/linux_64/obj
|
||||
tar xf ${nodejs_22.libv8.src} --one-top-level=/tmp/xxxxx
|
||||
for i in /tmp/xxxxx/*/deps/v8/*; do
|
||||
cp -r $i Common/3dParty/v8_89/v8/
|
||||
done
|
||||
@@ -868,6 +966,8 @@ buildCoreComponent "X2tConverter/build/Qt" {
|
||||
fb2file
|
||||
iworkfile
|
||||
web-apps
|
||||
web-apps-mobile
|
||||
cross-env
|
||||
sdkjs
|
||||
dictionaries
|
||||
;
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
diff --git a/vendor/framework7-react/build/build.js b/vendor/framework7-react/build/build.js
|
||||
index 50828275f1..48a609e033 100644
|
||||
--- a/build/build.js
|
||||
+++ b/build/build.js
|
||||
@@ -12,14 +12,13 @@ Promise.all([
|
||||
const { default: ora } = oramodule,
|
||||
{ default: chalk } = chalkmodule;
|
||||
|
||||
- const spinner = ora(env === 'production' ? 'building for production...' : 'building development version...').start();
|
||||
+ console.log(env === 'production' ? 'building for production...' : 'building development version...');
|
||||
|
||||
rm('./www/', (removeErr) => {
|
||||
if (removeErr) throw removeErr;
|
||||
|
||||
webpack(config, (err, stats) => {
|
||||
if (err) throw err;
|
||||
- spinner.stop();
|
||||
|
||||
process.stdout.write(`${stats.toString({
|
||||
colors: true,
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/build/Gruntfile.js b/build/Gruntfile.js
|
||||
index 044fa02213..d4fac2ff01 100644
|
||||
--- a/Gruntfile.js
|
||||
+++ b/Gruntfile.js
|
||||
@@ -830,7 +830,7 @@ module.exports = function(grunt) {
|
||||
'replace:writeVersion', 'replace:prepareHelp', 'clean:postbuild']);
|
||||
|
||||
grunt.registerTask('deploy-app-mobile', ['mobile-app-init', 'clean:deploy', /*'cssmin',*/ /*'copy:template-backup',*/
|
||||
- 'htmlmin', /*'requirejs',*/ 'exec:webpack_install', 'exec:webpack_app_build', /*'copy:template-restore',*/
|
||||
+ 'htmlmin', /*'requirejs',*/ /*'exec:webpack_install', 'exec:webpack_app_build',*/ /*'copy:template-restore',*/
|
||||
/*'clean:template-backup',*/ 'copy:localization', 'copy:index-page',
|
||||
'copy:images-app', 'copy:webpack-dist', 'concat', 'json-minify'/*,*/
|
||||
/*'replace:writeVersion', 'replace:fixResourceUrl'*/]);
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "compress.yazi";
|
||||
version = "0-unstable-2026-01-10";
|
||||
version = "25.12.29-unstable-2026-01-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "KKV9";
|
||||
repo = "compress.yazi";
|
||||
rev = "e6007f7c3f364cdb7146f5b6b282790948fb0bd6";
|
||||
hash = "sha256-m5FfN2gnTHsbwP2aYaE+K6kNGfAC7HBVtCyy6HzNRrE=";
|
||||
rev = "cb6e8ec0141915dc319ccd6b904dcd2f03502576";
|
||||
hash = "sha256-D/EpcRDIc3toeyjHqi+vGw0v9B22HVvKJua5EVEAc0U=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "diff.yazi";
|
||||
version = "25.2.7-unstable-2025-12-31";
|
||||
version = "26.1.22-unstable-2026-01-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yazi-rs";
|
||||
repo = "plugins";
|
||||
rev = "398796d88fee7bf9c99c4dc29089b865d4f47722";
|
||||
hash = "sha256-LOQ/0LYVrXsqQjeBeERKQ2M8BwN8xo3yej1mxNHphOU=";
|
||||
rev = "6c71385af67c71cb3d62359e94077f2e940b15df";
|
||||
hash = "sha256-+akz8E6Fmk6KwmeZOePEm/KqfbDaKeL4wiUgtm12SAE=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "lsar.yazi";
|
||||
version = "25.5.31-unstable-2025-12-31";
|
||||
version = "26.1.22-unstable-2026-01-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yazi-rs";
|
||||
repo = "plugins";
|
||||
rev = "398796d88fee7bf9c99c4dc29089b865d4f47722";
|
||||
hash = "sha256-LOQ/0LYVrXsqQjeBeERKQ2M8BwN8xo3yej1mxNHphOU=";
|
||||
rev = "6c71385af67c71cb3d62359e94077f2e940b15df";
|
||||
hash = "sha256-+akz8E6Fmk6KwmeZOePEm/KqfbDaKeL4wiUgtm12SAE=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "mediainfo.yazi";
|
||||
version = "25.5.31-unstable-2026-01-07";
|
||||
version = "25.5.31-unstable-2026-01-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boydaihungst";
|
||||
repo = "mediainfo.yazi";
|
||||
rev = "7cd6b042aba45367701e00819705bd0bac2c963c";
|
||||
hash = "sha256-Ehg8PFiOLy4iKgsOjj8KiNGTdj3VwkdmNP3lvdBi9aY=";
|
||||
rev = "ae2a1f18feb55ea9148032ce247109f2303ddbfd";
|
||||
hash = "sha256-QH1vvPjPYGbf47kSgxV97pxZrdSFcqAEyXtQbJhusLg=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "piper.yazi";
|
||||
version = "25.9.15-unstable-2026-01-12";
|
||||
version = "26.1.22-unstable-2026-01-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yazi-rs";
|
||||
repo = "plugins";
|
||||
rev = "c179ea49753b3a784935986d36b077a6df24bdb3";
|
||||
hash = "sha256-0VKoUusTmKVxW8fJkYf0lm17bMjvkN1/tmx7+pNJdWI=";
|
||||
rev = "6c71385af67c71cb3d62359e94077f2e940b15df";
|
||||
hash = "sha256-+akz8E6Fmk6KwmeZOePEm/KqfbDaKeL4wiUgtm12SAE=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "recycle-bin.yazi";
|
||||
version = "0-unstable-2026-01-04";
|
||||
version = "0-unstable-2026-01-17";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "uhs-robert";
|
||||
repo = "recycle-bin.yazi";
|
||||
rev = "69d7d4ce9e102b9249166c8ea783cfd24bdf7bb4";
|
||||
hash = "sha256-oGmgqe8ZUJM3cxIPw019PwcNaQjLYquFpD1awabPrPc=";
|
||||
rev = "fa687116c46a784e664ef96619b32abf51f29b06";
|
||||
hash = "sha256-lpxTGWA15szM5VJ+qvV2+GTg7HXiZaZfyWyjeNMsTSM=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
}:
|
||||
mkYaziPlugin {
|
||||
pname = "vcs-files.yazi";
|
||||
version = "25.12.29-unstable-2026-01-06";
|
||||
version = "26.1.22-unstable-2026-01-24";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yazi-rs";
|
||||
repo = "plugins";
|
||||
rev = "4e5590280db0de5f130bf377e9c32a202110f575";
|
||||
hash = "sha256-/yGS8R1YsYqqX4JTlIJeg+NfFSxGUHvSdKQZGk6KiBU=";
|
||||
rev = "6c71385af67c71cb3d62359e94077f2e940b15df";
|
||||
hash = "sha256-+akz8E6Fmk6KwmeZOePEm/KqfbDaKeL4wiUgtm12SAE=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "zensical";
|
||||
version = "0.0.18";
|
||||
version = "0.0.19";
|
||||
pyproject = true;
|
||||
|
||||
# We fetch from PyPi, because GitHub repo does not contain all sources.
|
||||
@@ -16,12 +16,12 @@ python3Packages.buildPythonApplication rec {
|
||||
# We could combine sources, but then nix-update won't work.
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-H7ERAygza6RFliocZhV74Wmhz+fRxO3//7GEw/iE3wc=";
|
||||
hash = "sha256-xCQQ+j9nOOIiOGN8dMugCID1nbRuPpOU9UToh8cu5LY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit pname version src;
|
||||
hash = "sha256-r8X8td94+0wd4/riE+YCBBIe417xh0IK4vvPwPuRsGg=";
|
||||
hash = "sha256-r0ToUJPCrZFwqjbHCsnGS7WHdEcmOqpoBQvqWbnUuPU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
|
||||
@@ -36,13 +36,13 @@ in
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "zipline";
|
||||
version = "4.4.0";
|
||||
version = "4.4.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "diced";
|
||||
repo = "zipline";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-H3WzCe1AgnYYI5oskWPi4k1NdpyXCFMmeulPJtwvuIo=";
|
||||
hash = "sha256-9+r3padIhpmLNfiL68eut7e+VemhsqhvRcJhyOdA7+k=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
git -C $out rev-parse --short HEAD > $out/.git_head
|
||||
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit (finalAttrs) pname version src;
|
||||
pnpm = pnpm';
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-JphaLunhwPdeKxlHdpMNGAl8um7wsOkNCCWYxQhLuBM=";
|
||||
hash = "sha256-cYoZNalVDI1rLEYFLhJZ9pAZQCvieZL+Rj5VK7Q2/vk=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -45,10 +45,10 @@ lib.makeScope pkgs.newScope (
|
||||
|
||||
teams = [ lib.teams.pantheon ];
|
||||
|
||||
mutter = pkgs.mutter46;
|
||||
mutter = pkgs.mutter48;
|
||||
|
||||
# Using 43 to match Mutter used in Pantheon
|
||||
gnome-settings-daemon = pkgs.gnome-settings-daemon46;
|
||||
# Using 48 to match Mutter used in Pantheon
|
||||
gnome-settings-daemon = pkgs.gnome-settings-daemon48;
|
||||
|
||||
elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { };
|
||||
|
||||
|
||||
@@ -31,15 +31,17 @@
|
||||
wrapGAppsHook3,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "elementary-greeter";
|
||||
version = "8.1.2";
|
||||
version = "8.1.2-unstable-2025-01-12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "greeter";
|
||||
tag = version;
|
||||
hash = "sha256-PIhvSY+p66B/dYmgmAioVbVLEUQgoMKNnKGE4HSquI4=";
|
||||
# Contains crash fixes for mutter 48.
|
||||
# nixpkgs-update: no auto update
|
||||
rev = "5510466126f7aa3412a21c055d59f8eb5fcc8d29";
|
||||
hash = "sha256-30XvdeibAptwH4L5MDPPrqQJF0GuPCwwvRc51DgxZp0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -26,15 +26,17 @@
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
pname = "gala";
|
||||
version = "8.4.0";
|
||||
version = "8.4.0-unstable-2026-01-06";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "gala";
|
||||
tag = version;
|
||||
hash = "sha256-Tb6+NfJ2/WRJb3R/W8oBJ5HIT8vwQUxiwqKul2hzlXY=";
|
||||
# Contains crash fixes for mutter 48.
|
||||
# nixpkgs-update: no auto update
|
||||
rev = "8fb60a9c9b04245913733208df1c061d6c353a35";
|
||||
hash = "sha256-GBNrcUAC7UBdyrqoja81bD1oVHjLXWhnDz3gtjMbjII=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "compit-inext-api";
|
||||
version = "0.3.4";
|
||||
version = "0.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Przemko92";
|
||||
repo = "compit-inext-api";
|
||||
tag = version;
|
||||
hash = "sha256-J3V7ahETbCTJW/6jYvF9BbuIffVvbMH329nO1bmVKEw=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-DlNkDfV3fp/7DetiIDx3yi8SfJHV4sFIMHEam5rcYrg=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -34,7 +34,8 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Python client for the Compit iNext API";
|
||||
homepage = "https://github.com/Przemko92/compit-inext-api";
|
||||
changelog = "https://github.com/Przemko92/compit-inext-api/releases/tag/${finalAttrs.src.tag}";
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = [ lib.maintainers.dotlambda ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cucumber-tag-expressions";
|
||||
version = "6.2.0";
|
||||
version = "7.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cucumber";
|
||||
repo = "tag-expressions";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-m6CmRs/Fz2e9GTtHrE3FF8GPK2vs6i37xcI3BM64rlc=";
|
||||
hash = "sha256-U8x7c4NeP9GdwormQD79RWcAA2B39Yvrf/Zk0xTUtNA=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/python";
|
||||
|
||||
@@ -779,6 +779,7 @@ mapAliases {
|
||||
gnome-passwordsafe = throw "'gnome-passwordsafe' has been renamed to/replaced by 'gnome-secrets'"; # Converted to throw 2025-10-27
|
||||
gnome-recipes = throw "'gnome-recipes' has been removed due to lack of upstream maintenance and dependency on insecure libraries"; # Added 2025-09-06
|
||||
gnome-resources = throw "'gnome-resources' has been renamed to/replaced by 'resources'"; # Converted to throw 2025-10-27
|
||||
gnome-settings-daemon46 = throw "'gnome-settings-daemon46' has been removed, no longer used by Pantheon"; # Added 2026-01-24
|
||||
gns3Packages = throw "'gns3Packages' has been removed. Use 'gns3-gui' and 'gns3-server' instead."; # Added 2026-01-18
|
||||
gnu-cobol = throw "'gnu-cobol' has been renamed to/replaced by 'gnucobol'"; # Converted to throw 2025-10-27
|
||||
gnubik = throw "'gnubik' has been removed due to lack of maintenance upstream and its dependency on GTK 2"; # Added 2025-09-16
|
||||
@@ -1218,6 +1219,7 @@ mapAliases {
|
||||
mumps_par = throw "'mumps_par' has been renamed to/replaced by 'mumps-mpi'"; # Converted to throw 2025-10-27
|
||||
mustache-tcl = throw "'mustache-tcl' has been renamed to/replaced by 'tclPackages.mustache-tcl'"; # Converted to throw 2025-10-27
|
||||
mutt-with-sidebar = throw "'mutt-with-sidebar' has been renamed to/replaced by 'mutt'"; # Converted to throw 2025-10-27
|
||||
mutter46 = throw "'mutter46' has been removed, no longer used by Pantheon"; # Added 2026-01-24
|
||||
muzika = throw "muzika was discontinued upstream in november 2024"; # Added 2025-12-15;
|
||||
mx-puppet-discord = throw "mx-puppet-discord was removed since the packaging was unmaintained and was the sole user of sha1 hashes in nixpkgs"; # Added 2025-07-24
|
||||
mysql-client = throw "mysql-client has been replaced by mariadb.client"; # Converted to throw 2025-10-26
|
||||
|
||||
Reference in New Issue
Block a user