diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e354cf6f8514..1f1948306cd3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -436,13 +436,13 @@ "vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA=" }, "gitlabhq_gitlab": { - "hash": "sha256-BDgNtPtK43O9PlQVmGqWj3Vtv18p9KlIfl+zky1pYlw=", + "hash": "sha256-0zU1HXGs+4qJ/IYePgX3uE7/i7vV85nXD1jiwKasgxA=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v18.10.0", + "rev": "v18.11.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-3A8nlFIdxUVUUnW8D//7FR3/ic3iAPiH1xRIMC1IUhY=" + "vendorHash": "sha256-a82yKFb82R6mlts5X2igussJTBldNAtwaz35QIe/hSk=" }, "go-gandi_gandi": { "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=", diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix index 6de86685b8f0..5cf7ae30268d 100644 --- a/pkgs/by-name/ac/acpica-tools/package.nix +++ b/pkgs/by-name/ac/acpica-tools/package.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.acpica.org/"; description = "ACPICA Tools"; + changelog = "https://github.com/acpica/acpica/releases/tag/${finalAttrs.version}"; license = with lib.licenses; [ iasl gpl2Only diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index 83ca27712175..3a9dae6eccfc 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -5,45 +5,48 @@ nodejs-slim, fetchNpmDeps, buildPackages, - php84, + php85, nixosTests, nix-update-script, dataDir ? "/var/lib/firefly-iii", }: +let + php = php85; +in stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii"; - version = "6.4.22"; + version = "6.5.9"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "firefly-iii"; tag = "v${finalAttrs.version}"; - hash = "sha256-i20D0/z6GA7pZYrWvRJ8tUlptNI5Cl/e9UY0hKg9SP8="; + hash = "sha256-8Orha6/cLjE9J01m77LwpvXlYrOmb/28TzxQ/RJdvDQ="; }; - buildInputs = [ php84 ]; + buildInputs = [ php ]; nativeBuildInputs = [ nodejs-slim nodejs-slim.npm nodejs-slim.python buildPackages.npmHooks.npmConfigHook - php84.packages.composer - php84.composerHooks2.composerInstallHook + php.packages.composer + php.composerHooks2.composerInstallHook ]; - composerVendor = php84.mkComposerVendor { + composerVendor = php.mkComposerVendor { inherit (finalAttrs) pname src version; composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-m+esW/yQs/GSwnw2iqVfSMXCf6/5M4634GUbt4Nnvbg="; + vendorHash = "sha256-9TTlMVlW7aXckIgpB5M0IxcLDtHqMboQgP00pmfK1zg="; }; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-pu8dxL0NRB1cyqlQEf2zT2wdVp2fbe+Vp85qMs7f6s0="; + hash = "sha256-UyViUi/bIXK2aIzRgYe3oTyIMBRHpKYHIIEb6Qq1Jkk="; }; preInstall = '' @@ -52,7 +55,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; passthru = { - phpPackage = php84; + phpPackage = php; tests = nixosTests.firefly-iii; updateScript = nix-update-script { extraArgs = [ diff --git a/pkgs/by-name/fq/fq/package.nix b/pkgs/by-name/fq/fq/package.nix index cb842850bd83..b4fd41668921 100644 --- a/pkgs/by-name/fq/fq/package.nix +++ b/pkgs/by-name/fq/fq/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "fq"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${finalAttrs.version}"; - hash = "sha256-b28zncqz0B1YIXHCjklAkVbIdXxC36bqIwJ4VrrCe18="; + hash = "sha256-rGuUvuq9hZrqt3Uy1s1he8O+c+iF83RU6PsUlatrPcQ="; }; - vendorHash = "sha256-bF3N+cPJAxAEFmr2Gl3xdKLtv7yLkxze19NgDFWaBn8="; + vendorHash = "sha256-Iga9g9VMTxtdselFn+8udjtInXWW9sNUfSzIc7OgvbY="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/go-grip/package.nix b/pkgs/by-name/go/go-grip/package.nix index 05beeb708ec0..32d1738e88f7 100644 --- a/pkgs/by-name/go/go-grip/package.nix +++ b/pkgs/by-name/go/go-grip/package.nix @@ -2,22 +2,19 @@ buildGoModule, fetchFromGitHub, lib, - gitUpdater, }: buildGoModule (finalAttrs: { pname = "go-grip"; - version = "0.5.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "chrishrb"; repo = "go-grip"; tag = "v${finalAttrs.version}"; - hash = "sha256-c3tl5nALPqIAMSqjbbQDi6mN6M1mKJvzxxDHcj/QyuY="; + hash = "sha256-HwD/pdWEEU+Hoo4HUJeK8y40jp1byNhw/TSpa5SNRak="; }; - vendorHash = "sha256-aU6vo/uqJzctD7Q8HPFzHXVVJwMmlzQXhAA6LSkRAow="; - - passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + vendorHash = "sha256-QsLiCsFY6nI85jsEZtAgmObEKpBSZWhzZk+TlukM8JU="; meta = { description = "Preview Markdown files locally before committing them"; diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index 6cc042a5c152..ffe0dcaf6d75 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -28,13 +28,13 @@ gcc15Stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; rev = "v${finalAttrs.version}"; - hash = "sha256-/r7jqBLcm3NSkqVYk8AE8b/qWKo8AKgzX3y2yLZeGvg="; + hash = "sha256-VFlM1cN4jmUAbfmZbeg7vL+AN9miXEUqqpk5EkHNq2c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprwhspr-rs/package.nix b/pkgs/by-name/hy/hyprwhspr-rs/package.nix index bd13c8ab1882..3438e0d923be 100644 --- a/pkgs/by-name/hy/hyprwhspr-rs/package.nix +++ b/pkgs/by-name/hy/hyprwhspr-rs/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprwhspr-rs"; - version = "0.3.23"; + version = "0.3.24"; src = fetchFromGitHub { owner = "better-slop"; repo = "hyprwhspr-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-O4mb7pIdhu6D9zJNm/1MKh3YO7WIGYtHM4IAPRFLDSY="; + hash = "sha256-tnscv2DYRS6BrFgshEg/X37Yh7yIBKAtUkDemg0RqgU="; }; - cargoHash = "sha256-f1aXLMzAzdUhQw6eK0wuWO19HAg2iJgo+Im9Oto+VO4="; + cargoHash = "sha256-C7gn0XJRfYaoswSJcnLNQZvYY7lxLrvKp5fUSIsZ0BY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 9b0236119a3b..b24e31ee9e4a 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "11.3.1"; + version = "11.4.0"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-7vst33RyAn6q0tJNLvmrEigVFM+exUaj46dZ3y2GVOc="; + hash = "sha256-2ZEZgQPznh7BvE5OLxno/4aH49tzME3ffuOENKQ8IaA="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index d672715115f8..58ce253f0c5f 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,21 @@ { - "version": "3.201.0", + "version": "3.203.1", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.201.0/mirrord_linux_x86_64", - "hash": "sha256-R5wiIpOA/9mkYjDmAYKOfDjpffV1Wm/GOLfzyi8dNVE=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.203.1/mirrord_linux_x86_64", + "hash": "sha256-R4ub6Lh33YNzCa1t6aBTzGf/9EaK2wfTWBk4oal4CuI=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.201.0/mirrord_linux_aarch64", - "hash": "sha256-U8DTLhl/LfC7xf9yx4iHQx0WF1xI/d36ikiqWX+pFkk=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.203.1/mirrord_linux_aarch64", + "hash": "sha256-2H8O3xL50c31fyVMI5wi6eC3RsZCKV1o4rL4C6e3SoY=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.201.0/mirrord_mac_universal", - "hash": "sha256-n98D4F6XamC1BkB8VDGW/xEgVlejW/HLhcxrk+pkAHQ=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.203.1/mirrord_mac_universal", + "hash": "sha256-uI3Zgc42d4shPKiy0lVcS7NmYE6W10zMrRuG08JaSAw=" }, "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.201.0/mirrord_mac_universal", - "hash": "sha256-n98D4F6XamC1BkB8VDGW/xEgVlejW/HLhcxrk+pkAHQ=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.203.1/mirrord_mac_universal", + "hash": "sha256-uI3Zgc42d4shPKiy0lVcS7NmYE6W10zMrRuG08JaSAw=" } } } diff --git a/pkgs/by-name/mp/mpv-unwrapped/package.nix b/pkgs/by-name/mp/mpv-unwrapped/package.nix index 5ffd823e81db..85293e0b650d 100644 --- a/pkgs/by-name/mp/mpv-unwrapped/package.nix +++ b/pkgs/by-name/mp/mpv-unwrapped/package.nix @@ -287,6 +287,10 @@ stdenv.mkDerivation (finalAttrs: { ]; doInstallCheck = true; + # On macOS, mpv --version initializes the full Cocoa app framework and + # connects to the window server, which hangs in a headless build environment + dontVersionCheck = stdenv.hostPlatform.isDarwin; + passthru = { inherit # The wrapper consults luaEnv and lua.version diff --git a/pkgs/by-name/nu/nuxmv/package.nix b/pkgs/by-name/nu/nuxmv/package.nix index ae61e27a36ee..5896cbb0edf8 100644 --- a/pkgs/by-name/nu/nuxmv/package.nix +++ b/pkgs/by-name/nu/nuxmv/package.nix @@ -8,17 +8,17 @@ stdenv.mkDerivation rec { pname = "nuxmv"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://es-static.fbk.eu/tools/nuxmv/downloads/nuXmv-${version}-${ - if stdenv.hostPlatform.isDarwin then "macosx64" else "linux64" - }.tar.gz"; + url = "https://nuxmv.fbk.eu/downloads/nuXmv-${version}-${ + if stdenv.hostPlatform.isDarwin then "macos-universal" else "linux64" + }.tar.xz"; sha256 = if stdenv.hostPlatform.isDarwin then - "sha256-48I+FhJUUam1nMCMMM47CwGO82BYsNz0eHDHXBfqO2E=" + "sha256-3AoXEPCunzbhYjjUCzXc9m+CPTVwE70udMCfbpucbdU=" else - "sha256-Gf+QgAjTrysZj7qTtt1wcQPganDtO0YtRY4ykhLPzVo="; + "sha256-x9/sQ3SbyyMMhX7+gQmbldhouU79n4G8zr5UKjBqfIM="; }; nativeBuildInputs = [ makeWrapper ]; @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "x86_64-darwin" + "aarch64-darwin" ]; }; } diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix index 49b82b18eb30..151cadf6d03c 100644 --- a/pkgs/by-name/s7/s7/package.nix +++ b/pkgs/by-name/s7/s7/package.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "s7"; - version = "11.8-unstable-2026-04-08"; + version = "11.8-unstable-2026-04-17"; src = fetchFromGitLab { domain = "cm-gitlab.stanford.edu"; owner = "bil"; repo = "s7"; - rev = "efc7d6d94f538fa38c0dc51b967fb561bca63bbb"; - hash = "sha256-MUP68vOhX+u4Smihe5bMIM5Kf6QCa1TMvKavaUIpX3o="; + rev = "57121b5633e0b276c8f13f5abb3cde0db1229d69"; + hash = "sha256-dbc2H5HML4q3UI9QixykvXlg7SGudMC4Grf9ASsCcG0="; }; buildInputs = diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index ac6986725984..af721759e4e7 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "saga"; - version = "9.11.4"; + version = "9.12.2"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${finalAttrs.version}.tar.gz"; - hash = "sha256-lnpHbcqLsD2C9RcRWt0aACro7dadq8wlaMPyrryNLsM="; + hash = "sha256-1q7/dBhmXSaj0bEGU8EAOJesR2sfnQPVK6DVL9TD3V0="; }; sourceRoot = "saga-${finalAttrs.version}/saga-gis"; diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index a7e16632c392..c3667820f8c3 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.90.7"; + version = "2.92.19"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-0ud5GHkldJ7/86bmeXV1SdShXKLjUIu7oOxZBbB+068="; + hash = "sha256-XqpLEJ/jmAzw+m2LEhP+oNCNGVRLkDCgNuYkEeZgf8Q="; }; postPatch = '' diff --git a/pkgs/by-name/tw/twinejs/package.nix b/pkgs/by-name/tw/twinejs/package.nix index fb0a3fdb9461..5f5a5d138e74 100644 --- a/pkgs/by-name/tw/twinejs/package.nix +++ b/pkgs/by-name/tw/twinejs/package.nix @@ -14,16 +14,16 @@ buildNpmPackage (finalAttrs: { pname = "twine"; - version = "2.11.1"; + version = "2.12.0"; src = fetchFromGitHub { owner = "klembot"; repo = "twinejs"; tag = finalAttrs.version; - hash = "sha256-+y25XxTRxmCKjNL74Wb3hgAkw8yQNznYNzTuDL3uIvg="; + hash = "sha256-3/0pEzN90ZAeAoN7i+f604DvJl4VaQWkoOia1r5yQZY="; }; - npmDepsHash = "sha256-9gMdbFibt6RwMxEsBAQE7nM0rfE7PqgUxTs87+g0Ok8="; + npmDepsHash = "sha256-k2OHeLcGcVCurTSefEqtqwUzolZ72rKA4WRFJifUPyY="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"; diff --git a/pkgs/by-name/xb/xbindkeys-config/.editorconfig b/pkgs/by-name/xb/xbindkeys-config/.editorconfig deleted file mode 100644 index 40706d3ac28e..000000000000 --- a/pkgs/by-name/xb/xbindkeys-config/.editorconfig +++ /dev/null @@ -1,2 +0,0 @@ -[xbindkeys-config.1] -trim_trailing_whitespace = unset diff --git a/pkgs/by-name/xb/xbindkeys-config/package.nix b/pkgs/by-name/xb/xbindkeys-config/package.nix deleted file mode 100644 index 41df8a5d8561..000000000000 --- a/pkgs/by-name/xb/xbindkeys-config/package.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - gtk2, - pkg-config, - procps, - makeWrapper, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "xbindkeys-config"; - version = "0.1.3"; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - nativeBuildInputs = [ - pkg-config - makeWrapper - ]; - buildInputs = [ gtk2 ]; - - src = fetchurl { - url = "mirror://debian/pool/main/x/xbindkeys-config/xbindkeys-config_${finalAttrs.version}.orig.tar.gz"; - sha256 = "1rs3li2hyig6cdzvgqlbz0vw6x7rmgr59qd6m0cvrai8xhqqykda"; - }; - - hardeningDisable = [ "format" ]; - - meta = { - homepage = "https://packages.debian.org/source/xbindkeys-config"; - description = "Graphical interface for configuring xbindkeys"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ benley ]; - platforms = with lib.platforms; linux; - mainProgram = "xbindkeys-config"; - }; - - patches = [ ./xbindkeys-config-patch1.patch ]; - - # killall is dangerous on non-gnu platforms. Use pkill instead. - postPatch = '' - substituteInPlace middle.c --replace "killall" "pkill -x" - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - gzip -c ${./xbindkeys-config.1} > $out/share/man/man1/xbindkeys-config.1.gz - cp xbindkeys_config $out/bin/xbindkeys-config - wrapProgram $out/bin/xbindkeys-config --prefix PATH ":" "${procps}/bin" - ''; -}) diff --git a/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config-patch1.patch b/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config-patch1.patch deleted file mode 100644 index d4620b5d9071..000000000000 --- a/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config-patch1.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- - Makefile | 6 +++--- - menu.c | 11 ++++++++--- - middle.c | 9 +++++++-- - xbindkeys_config.c | 3 ++- - 4 files changed, 20 insertions(+), 9 deletions(-) - -diff --git a/Makefile b/Makefile -index 602875c..28e46cd 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,9 +1,9 @@ - # makefile crée par Laurent VUIBERT - --CC= gcc -O3 -Wall -+CC= gcc $(CFLAGS) - STD= _GNU_SOURCE --GTK= `gtk-config --cflags --libs` --GTK2= `gtk-config --cflags` -+GTK= `pkg-config --cflags --libs gtk+-2.0` -+GTK2= `pkg-config --cflags gtk+-2.0` - OBJS= xbindkeys_config.o menu.o middle.o speedc.o - NOM= xbindkeys_config - -diff --git a/menu.c b/menu.c -index ed3e7ec..f11526d 100644 ---- a/menu.c -+++ b/menu.c -@@ -283,6 +283,8 @@ void menu_manual (GtkMenuItem *menuitem, gpointer user_data) - GtkWidget *window; - GtkWidget *text; - GtkWidget *vbox; -+ GtkTextBuffer *textbuffer; -+ GtkTextIter iter; - - window = gtk_window_new( GTK_WINDOW_TOPLEVEL ); - gtk_window_set_title(GTK_WINDOW(window), -@@ -293,10 +295,13 @@ void menu_manual (GtkMenuItem *menuitem, gpointer user_data) - text = gtk_label_new("\nManual\n"); - gtk_box_pack_start(GTK_BOX(vbox), text, FALSE, FALSE, 0); - -- text = gtk_text_new(NULL,NULL); -+/* BDD - FIXME */ -+/* text = gtk_text_new(NULL,NULL); */ -+ text = gtk_text_view_new(); -+ textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)); -+ gtk_text_buffer_get_iter_at_offset (textbuffer, &iter, 0); - -- -- gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL, -+ gtk_text_buffer_insert (textbuffer, &iter, - MANUAL_TEXT, sizeof(MANUAL_TEXT)-1); - gtk_box_pack_start(GTK_BOX(vbox), text, TRUE, TRUE, 0); - gtk_widget_set_usize(text,300,250); -diff --git a/middle.c b/middle.c -index daa61aa..605ab10 100644 ---- a/middle.c -+++ b/middle.c -@@ -551,6 +551,8 @@ void view_generated_file() - GtkWidget *window; - GtkWidget *text; - GtkWidget *src; -+ GtkTextBuffer *textbuffer; -+ GtkTextIter iter; - char line [1024]; - - unlink(TEMP_FILE); -@@ -561,11 +563,13 @@ void view_generated_file() - gtk_window_set_title(GTK_WINDOW(window), "Generated File"); - src = gtk_scrolled_window_new ( NULL, NULL ); - gtk_widget_set_usize(src,500,400); -- text = gtk_text_new (NULL, NULL); -+ text = gtk_text_view_new (); -+ textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text)); -+ gtk_text_buffer_get_iter_at_offset (textbuffer, &iter, 0); - gtk_container_add (GTK_CONTAINER(src), text); - - while (fgets (line, sizeof(line), f)) -- gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL, -+ gtk_text_buffer_insert (textbuffer, &iter, - line, strlen(line)); - - gtk_container_add(GTK_CONTAINER(window),src); -@@ -610,6 +614,7 @@ void save_file(char file_out[]) - fprintf(f, "# m:xxx + c:xxx \n"); - fprintf(f, "# Shift+... \n\n\n\n\n"); - -+ - if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Flag_NumLock))) - fprintf(f,"keystate_numlock = enable\n"); - else -diff --git a/xbindkeys_config.c b/xbindkeys_config.c -index 75bad30..3c02a2b 100644 ---- a/xbindkeys_config.c -+++ b/xbindkeys_config.c -@@ -95,7 +95,8 @@ int main (int argc, char *argv[]) - accel_group = gtk_accel_group_new(); - menu=xbindkeys_config_menu(accel_group); - gtk_box_pack_start(GTK_BOX(vbox),menu,FALSE,FALSE,0); -- gtk_accel_group_attach(accel_group, GTK_OBJECT(window)); -+/* BDD - FIXME - Don't need this? */ -+/* gtk_accel_group_attach(accel_group, GTK_OBJECT(window)); */ - - middle= xbindkeys_config_middle(); - gtk_box_pack_start(GTK_BOX(vbox),middle,TRUE,TRUE,0); --- -2.1.3 - diff --git a/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config.1 b/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config.1 deleted file mode 100644 index e3f8de1a8046..000000000000 --- a/pkgs/by-name/xb/xbindkeys-config/xbindkeys-config.1 +++ /dev/null @@ -1,21 +0,0 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.27. -.TH XBINDKEYS_CONFIG "1" "April 2002" "xbindkeys-config" "User Commands" -.SH NAME -xbindkeys-config \- GTK+ configuration tool for xbindkeys -.SH "SYNOPSIS" -xbindkeys-config -[\-\-file|\-f file] -[\-\-help|\-h] -[\-\-show|\-s] -.TP -\fB\-h\fR, \fB\-\-help\fR -This Help -.TP -\fB\-f\fR, \fB\-\-file\fR -Use an alternative rc file -.TP -\fB\-s\fR, \fB\-\-show\fR -show only the rc file -.SH AUTHOR -This manual page was written by Joerg Jaspert , -for the Debian GNU/Linux system (but may be used by others). diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 50cbdebc87d0..e0bc6063b033 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -85,7 +85,7 @@ in # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang. clangStdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.52.2"; + version = "2.52.3"; name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}"; outputs = [ @@ -100,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-Bd4rRIdLotraV1X4mM+1N4PDFz+RtGNo+i3MxYSXKrs="; + hash = "sha256-Wz4NF05j3MKISLEZTg50SNWUjDwkJ+zZMcLFvlJhrrs="; }; patches = lib.optionals clangStdenv.hostPlatform.isLinux [ @@ -117,13 +117,6 @@ clangStdenv.mkDerivation (finalAttrs: { hash = "sha256-MgaSpXq9l6KCLQdQyel6bQFHG53l3GY277WePpYXdjA="; name = "fix_ftbfs_riscv64.patch"; }) - - # Fix FTBFS on platforms that don't use Skia - # https://bugs.webkit.org/show_bug.cgi?id=312160 - (fetchpatch { - url = "https://github.com/WebKit/WebKit/commit/36df921c686c07f2b20e3eed20afad5471b96897.patch"; - hash = "sha256-iYOs1V/p02XHtytw+r1+TyW08pk6PgUH76U1fXG8w34="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 0760c299b336..008a107ffc20 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "eth-typing"; - version = "5.2.1"; + version = "6.0.0"; pyproject = true; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-typing"; tag = "v${version}"; - hash = "sha256-w/xYqDmtlNs9dk4lTX0zxjdlUc7l7vi8ZnSE62W0m8o="; + hash = "sha256-bdZrrglsJGNsqD6ShsqPO6ljViZr9Ms9A8Km45pnEYA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/ping3/default.nix b/pkgs/development/python-modules/ping3/default.nix index aa89ebbc24b2..7098deb96e69 100644 --- a/pkgs/development/python-modules/ping3/default.nix +++ b/pkgs/development/python-modules/ping3/default.nix @@ -1,18 +1,20 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, }: buildPythonPackage rec { pname = "ping3"; - version = "5.1.5"; + version = "5.1.6"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-bJm8hE4Lfbxcl2XotTAUDa8czSESyZ2wGreYMb2Agc0="; + src = fetchFromGitHub { + owner = "kyan001"; + repo = "ping3"; + tag = "v${version}"; + hash = "sha256-9HWqJK8cxVKetrhcivI0p63I99XqkBVgZa6aR4Hablc="; }; build-system = [ setuptools ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1ea26be9b8b7..3821deb1cbad 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2131,6 +2131,7 @@ mapAliases { wxGTK33 = wxwidgets_3_3; # Added 2025-07-20 wxSVG = warnAlias "'wxSVG' has been renamed to 'wxsvg'" wxsvg; Xaw3d = warnAlias "'Xaw3d' has been renamed to 'libxaw3d'" libxaw3d; # Added 2026-02-12 + xbindkeys-config = throw "'xbindkeys-config' has been removed as it is broken and unmaintained upstream"; # Added 2026-04-18 xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28 xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12 xcb-util-cursor = libxcb-cursor; # Added 2026-02-04