diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 2a76e1a8b26f..6e779df94e77 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -410,7 +410,7 @@ in config.hardware.firmwareCompression == "zstd" -> config.boot.kernelPackages.kernelAtLeast "5.19"; message = '' The firmware compression method is set to zstd, but the kernel version is too old. - The kernel version must be at least 5.3 to use zstd compression. + The kernel version must be at least 5.19 to use zstd compression. ''; } { diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index d8b19dfb282d..b43ecc58f156 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -270,7 +270,7 @@ in after = [ "network-online.target" ] ++ lib.optional cfg.configurePostgres "postgresql.target"; requires = lib.mkIf cfg.configurePostgres [ "postgresql.target" ]; wants = [ "network-online.target" ]; - path = with pkgs; [ openssl ]; + path = [ pkgs.openssl ]; serviceConfig = { User = user; Group = group; @@ -326,7 +326,7 @@ in DATA_FOLDER = dataDir; BACKUP_FOLDER = cfg.backupDir; }; - path = with pkgs; [ sqlite ]; + path = [ pkgs.sqlite ]; # if both services are started at the same time, vaultwarden fails with "database is locked" before = [ "vaultwarden.service" ]; serviceConfig = { diff --git a/nixos/modules/virtualisation/waydroid.nix b/nixos/modules/virtualisation/waydroid.nix index 706ee115ba8c..27c1e27083c8 100644 --- a/nixos/modules/virtualisation/waydroid.nix +++ b/nixos/modules/virtualisation/waydroid.nix @@ -66,7 +66,7 @@ in serviceConfig = { Type = "dbus"; UMask = "0022"; - ExecStart = "${cfg.package}/bin/waydroid -w container start"; + ExecStart = "${cfg.package}/bin/waydroid container start"; BusName = "id.waydro.Container"; }; }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index cf2ffff8d4ff..c12ed8350f25 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -6,11 +6,11 @@ melpaBuild rec { pname = "ebuild-mode"; - version = "1.79"; + version = "1.80"; src = fetchzip { url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2"; - hash = "sha256-FV9e6QF85yPnowfmseo53/Q36W3wlOgTG0/X4r7OHiI="; + hash = "sha256-pQ177zp0UTk9Koq+yhgaGIeFziV7KFng+Z6sAZs7qzY="; }; meta = { diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index 8b53f1711cfc..b240cfc8e9ef 100644 --- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -42,14 +42,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace CMakeLists.txt \ - --replace 'CMAKE_INSTALL_PREFIX "/usr"' "CMAKE_INSTALL_PREFIX $out" + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" \ + --replace-fail 'CMAKE_INSTALL_PREFIX "/usr"' "CMAKE_INSTALL_PREFIX $out" substituteInPlace data/CMakeLists.txt \ - --replace 'DESTINATION usr/share' "DESTINATION share" - ''; - - postConfigure = '' - substituteInPlace cmake_install.cmake \ - --replace "/var/empty" "/usr" + --replace-fail 'DESTINATION usr/share' "DESTINATION share" ''; meta = { diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix index b9054cba1846..7b42559620be 100644 --- a/pkgs/by-name/bo/bottom/package.nix +++ b/pkgs/by-name/bo/bottom/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, autoAddDriverRunpath, @@ -11,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "bottom"; - version = "0.11.4"; + version = "0.12.2"; src = fetchFromGitHub { owner = "ClementTsang"; repo = "bottom"; tag = finalAttrs.version; - hash = "sha256-hyEYSkoV86BWVMjolU9IjU0rTABxE4ag26el0UydsFQ="; + hash = "sha256-+VfXxLKIdrg+ytmx29TPm46t3yhAgqBSJ+ykiIjuNmA="; }; - cargoHash = "sha256-VnpSgaBxSHJj+brMtNwmbrXUN9H3y0oinF8ya+vsl88="; + cargoHash = "sha256-dvU/iAgLC0+l8FH1bnOdIvZrXHqltE1hMkf+IaLQZxE="; nativeBuildInputs = [ autoAddDriverRunpath @@ -38,9 +39,14 @@ rustPlatform.buildRustPackage (finalAttrs: { --zsh target/tmp/bottom/completion/_btm install -Dm444 desktop/bottom.desktop -t $out/share/applications - install -Dm644 assets/icons/bottom.svg -t $out/share/icons/hicolor/scalable/apps + install -Dm644 assets/icons/bottom-system-monitor.svg -t $out/share/icons/hicolor/scalable/apps ''; + checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ + # fails to get list of processes due to sandboxing, this functionality works at runtime + "--skip=collection::tests::test_data_collection" + ]; + doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix index 45a42f8f0d0d..d2029b0e660d 100644 --- a/pkgs/by-name/ch/chhoto-url/package.nix +++ b/pkgs/by-name/ch/chhoto-url/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "chhoto-url"; - version = "6.5.2"; + version = "6.5.3"; src = fetchFromGitHub { owner = "SinTan1729"; repo = "chhoto-url"; tag = finalAttrs.version; - hash = "sha256-OO/foBlo6O4sXT6iP85L3liMHFZkCOTcP6Nx9UxyLJg="; + hash = "sha256-y2bIRVlNOyz97RNfl1VkeR+4njclWM9Yo7NM/bI2J9k="; }; sourceRoot = "${finalAttrs.src.name}/actix"; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/" ''; - cargoHash = "sha256-WVSS2041oaxvISmZ9YoLUipSXAcikfeHlvbuN6ZjMb8="; + cargoHash = "sha256-/NgHR5Fuby05iXut4hMKDqGVvvWF+NJFFxcRXlp606E="; postInstall = '' mkdir -p $out/share/chhoto-url diff --git a/pkgs/by-name/co/contact/package.nix b/pkgs/by-name/co/contact/package.nix index 0d812515578f..3c49239f5f0c 100644 --- a/pkgs/by-name/co/contact/package.nix +++ b/pkgs/by-name/co/contact/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "contact"; - version = "1.4.6"; + version = "1.4.7"; pyproject = true; src = fetchFromGitHub { owner = "pdxlocations"; repo = "contact"; tag = version; - hash = "sha256-Mnb4SMU+pUWyyhacANG6MOz3u3FOZaVJZQbRCENR/U8="; + hash = "sha256-tsqnuofmQ5DqW5+Hepx2zUlTH/rk04s5SzL4cc64pDk="; }; dependencies = [ python3Packages.meshtastic ]; diff --git a/pkgs/by-name/do/dogdns/openssl3-support.patch b/pkgs/by-name/do/dogdns/openssl3-support.patch deleted file mode 100644 index f9d124420f17..000000000000 --- a/pkgs/by-name/do/dogdns/openssl3-support.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index b5fe1bb..5d1d055 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,5 +1,7 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. -+version = 4 -+ - [[package]] - name = "addr2line" - version = "0.14.1" -@@ -67,6 +69,12 @@ version = "1.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -+[[package]] -+name = "bitflags" -+version = "2.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" -+ - [[package]] - name = "bumpalo" - version = "3.7.0" -@@ -81,9 +89,12 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - - [[package]] - name = "cc" --version = "1.0.67" -+version = "1.2.23" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" -+checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766" -+dependencies = [ -+ "shlex", -+] - - [[package]] - name = "cfg-if" -@@ -390,18 +401,30 @@ checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" - - [[package]] - name = "openssl" --version = "0.10.33" -+version = "0.10.68" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577" -+checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5" - dependencies = [ -- "bitflags", -+ "bitflags 2.9.1", - "cfg-if", - "foreign-types", - "libc", - "once_cell", -+ "openssl-macros", - "openssl-sys", - ] - -+[[package]] -+name = "openssl-macros" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -+dependencies = [ -+ "proc-macro2", -+ "quote", -+ "syn", -+] -+ - [[package]] - name = "openssl-probe" - version = "0.1.2" -@@ -410,20 +433,19 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" - - [[package]] - name = "openssl-src" --version = "111.15.0+1.1.1k" -+version = "300.5.0+3.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a" -+checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f" - dependencies = [ - "cc", - ] - - [[package]] - name = "openssl-sys" --version = "0.9.61" -+version = "0.9.108" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f" -+checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847" - dependencies = [ -- "autocfg", - "cc", - "libc", - "openssl-src", -@@ -534,7 +556,7 @@ version = "0.2.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" - dependencies = [ -- "bitflags", -+ "bitflags 1.2.1", - ] - - [[package]] -@@ -612,7 +634,7 @@ version = "2.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84" - dependencies = [ -- "bitflags", -+ "bitflags 1.2.1", - "core-foundation", - "core-foundation-sys", - "libc", -@@ -660,6 +682,12 @@ dependencies = [ - "serde", - ] - -+[[package]] -+name = "shlex" -+version = "1.3.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -+ - [[package]] - name = "socket2" - version = "0.3.19" diff --git a/pkgs/by-name/do/dogdns/package.nix b/pkgs/by-name/do/dogdns/package.nix deleted file mode 100644 index 5601dfee0957..000000000000 --- a/pkgs/by-name/do/dogdns/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - installShellFiles, - stdenv, - pkg-config, - openssl, - just, - pandoc, -}: - -rustPlatform.buildRustPackage { - pname = "dogdns"; - version = "unstable-2021-10-07"; - - src = fetchFromGitHub { - owner = "ogham"; - repo = "dog"; - rev = "721440b12ef01a812abe5dc6ced69af6e221fad5"; - sha256 = "sha256-y3T0vXg7631FZ4bzcbQjz3Buui/DFxh9LG8BZWwynp0="; - }; - - cargoPatches = [ - # update Cargo.lock to work with openssl 3 - ./openssl3-support.patch - ]; - - cargoHash = "sha256-UY7+AhsVw/p+FDfzJWj9A6VRntceIDCWzJ5Zim8euAE="; - - patches = [ - # remove date info to make the build reproducible - # remove commit hash to avoid dependency on git and the need to keep `.git` - ./remove-date-info.patch - ]; - - nativeBuildInputs = [ - installShellFiles - just - pandoc - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ]; - - outputs = [ - "out" - "man" - ]; - - dontUseJustBuild = true; - dontUseJustCheck = true; - dontUseJustInstall = true; - - postBuild = '' - just man - ''; - - postInstall = '' - installShellCompletion completions/dog.{bash,fish,zsh} - installManPage ./target/man/*.1 - ''; - - meta = { - description = "Command-line DNS client"; - homepage = "https://dns.lookup.dog"; - license = lib.licenses.eupl12; - maintainers = [ lib.maintainers.matthiasbeyer ]; - mainProgram = "dog"; - }; -} diff --git a/pkgs/by-name/do/dogdns/remove-date-info.patch b/pkgs/by-name/do/dogdns/remove-date-info.patch deleted file mode 100644 index 539559a3911e..000000000000 --- a/pkgs/by-name/do/dogdns/remove-date-info.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/build.rs -+++ b/build.rs -@@ -34,7 +34,7 @@ fn main() -> io::Result<()> { - format!("{}\nv{} \\1;31m(pre-release debug build!)\\0m\n\\1;4;34m{}\\0m", tagline, version_string(), url) - } - else if is_development_version() { -- format!("{}\nv{} [{}] built on {} \\1;31m(pre-release!)\\0m\n\\1;4;34m{}\\0m", tagline, version_string(), git_hash(), build_date(), url) -+ format!("{}\nv{} [nixpkgs] \\1;31m(pre-release!)\\0m\n\\1;4;34m{}\\0m", tagline, version_string(), url) - } - else { - format!("{}\nv{}\n\\1;4;34m{}\\0m", tagline, version_string(), url) diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix index 5550c8faa1bc..2060b3d9fd81 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "JSON/JSONC code formatter"; - hash = "sha256-GIoIkW7szyQU4GyLUdj0TTaV8FWg1jzvOerOChHiR7w="; + hash = "sha256-CetVbLXlgZcrBs6yxFNqkK4DK4TThL7qiDfJkYhFTN8="; initConfig = { configExcludes = [ "**/*-lock.json" ]; configKey = "json"; @@ -9,6 +9,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-json"; updateUrl = "https://plugins.dprint.dev/dprint/json/latest.json"; - url = "https://plugins.dprint.dev/json-0.21.0.wasm"; - version = "0.21.0"; + url = "https://plugins.dprint.dev/json-0.21.1.wasm"; + version = "0.21.1"; } diff --git a/pkgs/by-name/dr/dracula-theme/package.nix b/pkgs/by-name/dr/dracula-theme/package.nix index b53a81a29072..9f2ce15826fb 100644 --- a/pkgs/by-name/dr/dracula-theme/package.nix +++ b/pkgs/by-name/dr/dracula-theme/package.nix @@ -8,7 +8,7 @@ let themeName = "Dracula"; - version = "4.0.0-unstable-2025-11-20"; + version = "4.0.0-unstable-2025-12-26"; in stdenvNoCC.mkDerivation { pname = "dracula-theme"; @@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation { src = fetchFromGitHub { owner = "dracula"; repo = "gtk"; - rev = "c04b3531f8db463cbc0481546f4477e455908473"; - hash = "sha256-eT0j//ALSqyhHMOBqTYtr9z/erov8IKHDd697vybMAo="; + rev = "d4163a5e6e598053567038c53777bf7682ecd17f"; + hash = "sha256-FalI8DvTCVzCHlZFh9j+CD0WMtELd174JaUWvuBHRRY="; }; propagatedUserEnvPkgs = [ diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix index 0e58264092d7..6a588d8ca82b 100644 --- a/pkgs/by-name/dr/drawterm/package.nix +++ b/pkgs/by-name/dr/drawterm/package.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2025-10-11"; + version = "0-unstable-2025-12-27"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "48d53278a8273bb39ca295e8f163563ab04b3530"; - hash = "sha256-SReZ6A5xEpi0vL2bchVszRl3Dvm4Rw8e/5TQa+8TPto="; + rev = "ec862e9c8acd30ec73eb9e11b8e849ed5b711e76"; + hash = "sha256-nFWOJnZKT5mr/Bf1r228v1Oexvy35bL2VS2JLPvJHp0="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/en/enscript/package.nix b/pkgs/by-name/en/enscript/package.nix index fb2efa08fd5d..0c6296adc0c9 100644 --- a/pkgs/by-name/en/enscript/package.nix +++ b/pkgs/by-name/en/enscript/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch2, gettext, }: @@ -19,6 +20,12 @@ stdenv.mkDerivation rec { # requires that compat/getopt.h is also removed # https://savannah.gnu.org/bugs/?64307 ./0001-use-system-getopt.patch + # Fix build with gcc15 + # regex.c:3565:13: error: too many arguments to function 're_match_2_internal'; expected 0, have 8 + (fetchpatch2 { + url = "https://salsa.debian.org/debian/enscript/-/raw/7a51479540a210dee5eee4ece5b54e3ce15dec52/debian/patches/1096582-gcc-15"; + hash = "sha256-0H8FNCKgQ1YCwcBaMChQSuFaYlmzSsoqtfsNSr567+Y="; + }) ]; postPatch = '' diff --git a/pkgs/by-name/fa/faugus-launcher/package.nix b/pkgs/by-name/fa/faugus-launcher/package.nix index 490ff032cbd0..c5892c70c4b5 100644 --- a/pkgs/by-name/fa/faugus-launcher/package.nix +++ b/pkgs/by-name/fa/faugus-launcher/package.nix @@ -1,6 +1,5 @@ { fetchFromGitHub, - gamemode, gobject-introspection, icoextract, imagemagick, @@ -18,18 +17,20 @@ python3Packages.buildPythonApplication rec { pname = "faugus-launcher"; - version = "1.11.7"; + version = "1.11.8"; pyproject = false; src = fetchFromGitHub { owner = "Faugus"; repo = "faugus-launcher"; tag = version; - hash = "sha256-ExvdbBZS70GfjzFkfStWrrS67lHgrzdOxsr0cabdm5M="; + hash = "sha256-VgafXX8EuX0WOpG0cxBNlUdLL4HrrcpdblpCMxka2ms="; }; nativeBuildInputs = [ gobject-introspection + meson + ninja wrapGAppsHook3 ]; @@ -37,11 +38,6 @@ python3Packages.buildPythonApplication rec { libayatana-appindicator ]; - build-system = [ - meson - ninja - ]; - dependencies = with python3Packages; [ filelock pillow @@ -60,9 +56,7 @@ python3Packages.buildPythonApplication rec { substituteInPlace faugus_run.py \ --replace-fail "PathManager.find_binary('faugus-components')" "'$out/bin/.faugus-components-wrapped'" \ - --replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'" \ - --replace-fail "PathManager.find_library('libgamemode.so.0')" "'${lib.getLib gamemode}/lib/libgamemode.so.0'" \ - --replace-fail "PathManager.find_library('libgamemodeauto.so.0')" "'${lib.getLib gamemode}/lib/libgamemodeauto.so.0'" + --replace-fail "PathManager.user_data('faugus-launcher/umu-run')" "'${lib.getExe umu-launcher}'" ''; dontWrapGApps = true; diff --git a/pkgs/by-name/fp/fping/package.nix b/pkgs/by-name/fp/fping/package.nix index 1e96ad27d3c7..ea2346a1d1e6 100644 --- a/pkgs/by-name/fp/fping/package.nix +++ b/pkgs/by-name/fp/fping/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "fping"; - version = "5.4"; + version = "5.5"; src = fetchurl { url = "https://www.fping.org/dist/fping-${version}.tar.gz"; - hash = "sha256-vjIHcfB15H3X5XBLSF6b3H3REQeIQ0XA98GHSTV/Zo0="; + hash = "sha256-FcTjK2xV/xBbr+A+jJHHyhsu2jG/mnEnMmu4eIfuGP4="; }; configureFlags = [ diff --git a/pkgs/by-name/ga/gallia/package.nix b/pkgs/by-name/ga/gallia/package.nix index 39970c1fb5b2..c63a101317fc 100644 --- a/pkgs/by-name/ga/gallia/package.nix +++ b/pkgs/by-name/ga/gallia/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication rec { pname = "gallia"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; src = fetchFromGitHub { owner = "Fraunhofer-AISEC"; repo = "gallia"; tag = "v${version}"; - hash = "sha256-sn6GNJ3rNhnJqFj7AL/0P+hBqasr17wH9i0GDDP32II="; + hash = "sha256-2jiD2ZZGinfTT+35TYl3+okWkkTrY1IdfSYbjC+/cvs="; }; postPatch = '' diff --git a/pkgs/by-name/gr/grayjay/deps.json b/pkgs/by-name/gr/grayjay/deps.json index 5777b554270e..51247df06851 100644 --- a/pkgs/by-name/gr/grayjay/deps.json +++ b/pkgs/by-name/gr/grayjay/deps.json @@ -16,8 +16,8 @@ }, { "pname": "FCastSenderSDKDotnet", - "version": "0.0.3", - "hash": "sha256-5pca9ywSOTVbNsuHKT980hz5sfWe8QQ0HzXwedqfF7M=" + "version": "0.0.5", + "hash": "sha256-UTCgJ1M0n7PcVoU/7slh5sFitJ+t7ZdgkdUDZ5CVvGk=" }, { "pname": "Fizzler", diff --git a/pkgs/by-name/gr/grayjay/package.nix b/pkgs/by-name/gr/grayjay/package.nix index e0f247491023..18d0fe18b2a7 100644 --- a/pkgs/by-name/gr/grayjay/package.nix +++ b/pkgs/by-name/gr/grayjay/package.nix @@ -35,13 +35,13 @@ _experimental-update-script-combinators, }: let - version = "12"; + version = "13"; src = fetchFromGitLab { domain = "gitlab.futo.org"; owner = "videostreaming"; repo = "Grayjay.Desktop"; tag = version; - hash = "sha256-KVmik/YaJAr76QwXYRajXj7EVTJBs2NdbkDvIpLxlFc="; + hash = "sha256-AKFPPfz5Cbk6fI0H6E3Q+KUvPW4YbVSKcQZUrJCyHeE="; fetchSubmodules = true; fetchLFS = true; }; @@ -184,7 +184,7 @@ buildDotnetModule (finalAttrs: { "https://gitlab.futo.org/api/v4/projects/videostreaming%2FGrayjay%2EDesktop/repository/archive.tar.gz?sha=refs%2Ftags%2F10" ]; }) - (finalAttrs.passthru.fetch-deps) + finalAttrs.passthru.fetch-deps ]; meta = { diff --git a/pkgs/by-name/gt/gt/package.nix b/pkgs/by-name/gt/gt/package.nix index 703df6551d1e..8d0aedb32a20 100644 --- a/pkgs/by-name/gt/gt/package.nix +++ b/pkgs/by-name/gt/gt/package.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/source"; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" + ''; + preConfigure = '' cmakeFlagsArray+=("-DBASH_COMPLETION_COMPLETIONSDIR=$out/share/bash-completions/completions") ''; diff --git a/pkgs/by-name/ig/igprof/package.nix b/pkgs/by-name/ig/igprof/package.nix index 2b5d3cf946a0..b188a0dfbadf 100644 --- a/pkgs/by-name/ig/igprof/package.nix +++ b/pkgs/by-name/ig/igprof/package.nix @@ -20,7 +20,10 @@ stdenv.mkDerivation rec { }; postPatch = '' - substituteInPlace src/igprof --replace libigprof.so $out/lib/libigprof.so + substituteInPlace src/igprof \ + --replace-fail libigprof.so $out/lib/libigprof.so + substituteInPlace CMakeLists.txt \ + --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)" ''; buildInputs = [ diff --git a/pkgs/by-name/io/iodash/package.nix b/pkgs/by-name/io/iodash/package.nix index ba18acdb079c..cc2fa56e6687 100644 --- a/pkgs/by-name/io/iodash/package.nix +++ b/pkgs/by-name/io/iodash/package.nix @@ -21,6 +21,11 @@ stdenv.mkDerivation { # https://github.com/YukiWorkshop/IODash/pull/2 patches = [ ./0001-Add-cmake-install-directives.patch ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)" + ''; + nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/le/legends-of-equestria/package.nix b/pkgs/by-name/le/legends-of-equestria/package.nix index 3f2c198ad6d3..e58c489d0684 100644 --- a/pkgs/by-name/le/legends-of-equestria/package.nix +++ b/pkgs/by-name/le/legends-of-equestria/package.nix @@ -33,21 +33,21 @@ let pname = "legends-of-equestria"; - version = "2025.05.001"; + version = "2025.06.002"; description = "Free-to-play MMORPG"; srcOptions = { x86_64-linux = { - url = "https://mega.nz/file/cjhDAZ5S#dsCHHfZ3rhmGBynu4FxooK5kf2w7oHYwgzf4E7vzerM"; - outputHash = "WbJL/+T/BNrk4GllCM4C4K2OymHmjzf5BuFR4V1N5Ds="; + url = "https://mega.nz/file/QmBXXDiC#XoG19N2_uBIHVKDNId5mE4cod9q29iPkYOfGDgAX_Oo"; + outputHash = "IdcowkU2k2grg133jTf3EOENATCCige64BMYXtFupRE="; }; x86_64-darwin = { - url = "https://mega.nz/file/dqQyjaSC#Aazc0tyu3v5WZcGet8ouHWlBB4to6Eu1SADYa3iSmAw"; - outputHash = "V8qGABS1uNnj/0CVLsFNXLjzBAjq/UXAT11gczVP298="; + url = "https://mega.nz/file/Uy4WzbCL#5tCRmmrizaIdilo2iYLSVkoSSNDleyQ8ZNYYT5hJsR4"; + outputHash = "D/2G7w89Z4JTP0TEjnlBKI7XCBx2LBurXZcEp0gW+JA="; }; aarch64-darwin = { - url = "https://mega.nz/file/I6QCSZqL#by23SjXBl0EMtgxex9Fhv5FO4qkhFX4uWSr3l5N4f-M"; - outputHash = "ISmtCw35kA4p6nWcDWIk4UucVT7fIGS9XC73rzwSigo="; + url = "https://mega.nz/file/xr4AHIrb#pD5wDIiYys2my4_59UWiYoqBpdyUQHf_CalPZe7hpME"; + outputHash = "PpDUFnobznB5FHYSF+m9S3RcNIdi7eWyxxDHRdS+zlY="; }; }; @@ -134,7 +134,7 @@ stdenv.mkDerivation { loeHome=$out/lib/${pname} mkdir -p $loeHome - cp -r LoE/* $loeHome + cp -r * $loeHome chmod +x $loeHome/LoE.x86_64 makeWrapper $loeHome/LoE.x86_64 $out/bin/LoE \ diff --git a/pkgs/by-name/li/libeb/package.nix b/pkgs/by-name/li/libeb/package.nix index 4cd718e20eaa..fc1528f811a4 100644 --- a/pkgs/by-name/li/libeb/package.nix +++ b/pkgs/by-name/li/libeb/package.nix @@ -18,9 +18,14 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "gcc-14.patch"; - url = "https://salsa.debian.org/debian/eb/-/raw/50c84ee2d190083fc88a14e62ef9fef779d088de/debian/patches/0002-gcc14-fix.patch"; + url = "https://salsa.debian.org/debian/eb/-/raw/7f4f013678f307efaa463b187e0ecd643df1d0ba/debian/patches/0002-gcc14-fix.patch"; hash = "sha256-0hht7ojj4MLNfFbemDR2hD1PbSmBxrC2JtDl2WJINlM="; }) + (fetchpatch { + name = "gcc-15.patch"; + url = "https://salsa.debian.org/debian/eb/-/raw/7f4f013678f307efaa463b187e0ecd643df1d0ba/debian/patches/0003-gcc15-fix.patch"; + hash = "sha256-2Q54Xy6I9NrHtXQeNmcR+r71KnRsXDma1GIk9qSOP1g="; + }) ]; nativeBuildInputs = [ perl ]; diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index cf45e52ae796..7f18f975163a 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -11,6 +11,7 @@ makeDesktopItem, electron_37, + nodejs_22, commandLineArgs ? "", }: @@ -63,6 +64,9 @@ buildNpmPackage rec { copyDesktopItems ]; + # Npm 11 (nodejs 24) can't resolve all dependencies from the prefetched cache. + nodejs = nodejs_22; + npmDepsHash = "sha256-t6I8ch36Yh6N+qZy4/yr/gSyJ3qdyMWss5LbsagEFMQ="; makeCacheWritable = true; diff --git a/pkgs/by-name/mi/microdnf/package.nix b/pkgs/by-name/mi/microdnf/package.nix index 989eeeed5cbf..028bcd2e1474 100644 --- a/pkgs/by-name/mi/microdnf/package.nix +++ b/pkgs/by-name/mi/microdnf/package.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { hash = "sha256-xWHE05CeX8I8YO0gqf5FDiqLexirwKdyCe4grclOVYc="; }; + # inlined of https://github.com/rpm-software-management/microdnf/pull/151 + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.8.5)" "cmake_minimum_required (VERSION 3.10)" + ''; + nativeBuildInputs = [ pkg-config cmake diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix index e6dd2c50332d..996d0d36c897 100644 --- a/pkgs/by-name/mo/moor/package.nix +++ b/pkgs/by-name/mo/moor/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "moor"; - version = "2.9.6"; + version = "2.10.1"; src = fetchFromGitHub { owner = "walles"; repo = "moor"; tag = "v${finalAttrs.version}"; - hash = "sha256-bvfbdNZvixfrCcN1oKBcKKWDolw/1H+GxRDrjKRkUQ0="; + hash = "sha256-xnm1ZKceij5V2AgfB1ZAabDvB+l+Ha6F2WuHAzcA1mo="; }; - vendorHash = "sha256-Zz0k/N5GnKTj+4h4l8sddJgFowB0obNTDHke1sETbaE="; + vendorHash = "sha256-MQPR4AW+Y+1l7akLxaWI5NAmKmhZdRKTzrueNEqHZoQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ne/nettee/package.nix b/pkgs/by-name/ne/nettee/package.nix index 5528cd19bc55..d0ff55435ebd 100644 --- a/pkgs/by-name/ne/nettee/package.nix +++ b/pkgs/by-name/ne/nettee/package.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./fix-cmake-output.patch ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required (VERSION 3.10)" + ''; + nativeBuildInputs = [ cmake ]; # additional shell scripts require accudate (not in nixpkgs) diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix index 4fd37338d4cb..815a31caa2c5 100644 --- a/pkgs/by-name/nu/nuclei/package.nix +++ b/pkgs/by-name/nu/nuclei/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "nuclei"; tag = "v${version}"; - hash = "sha256-CuR/8vTNnHsD4yuc39SF4kjh6SCH7VTVgicU7HekYhI="; + hash = "sha256-cWfX1W9foaCmqH17RDNHq38SYbl9enzZmyYZKkHz36k="; }; - vendorHash = "sha256-j5+PpCAYV5NsXQHbyXg7Of6MmEmGDbLZBsXBSKCBo+8="; + vendorHash = "sha256-yXXjYsLO3jQI0fS7f5LG/KTVpRg+ROc0DPUVYdNOW8I="; proxyVendor = true; # hash mismatch between Linux and Darwin diff --git a/pkgs/by-name/pe/penelope/package.nix b/pkgs/by-name/pe/penelope/package.nix index 4aa5ca554bdf..f1a2246e204a 100644 --- a/pkgs/by-name/pe/penelope/package.nix +++ b/pkgs/by-name/pe/penelope/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "penelope"; - version = "0.14.14"; + version = "0.15.0"; pyproject = true; src = fetchFromGitHub { owner = "brightio"; repo = "penelope"; tag = "v${version}"; - hash = "sha256-rSZkktq/XtlDV/bHC7ad4uhOzT3cnCxrHX7NH1t9cO0="; + hash = "sha256-paVKCqR8J1bINz80qOBqiG2wxGjiJlf0gv3LIyS/Xs0="; }; postPatch = '' diff --git a/pkgs/by-name/pi/piliplus/package.nix b/pkgs/by-name/pi/piliplus/package.nix index ad0ca313d0d2..a9a12c65409f 100644 --- a/pkgs/by-name/pi/piliplus/package.nix +++ b/pkgs/by-name/pi/piliplus/package.nix @@ -13,10 +13,11 @@ let srcInfo = lib.importJSON ./src-info.json; description = "Third-party Bilibili client developed in Flutter"; + version = "1.1.5.1"; in flutter338.buildFlutterApplication { pname = "piliplus"; - inherit (srcInfo) version; + inherit version; src = fetchFromGitHub { owner = "bggRGjQaUbCoE"; @@ -43,7 +44,7 @@ flutter338.buildFlutterApplication { cat < lib/build_config.dart class BuildConfig { static const int versionCode = ${toString srcInfo.revCount}; - static const String versionName = '${srcInfo.version}'; + static const String versionName = '${version}'; static const int buildTime = ${toString srcInfo.commitDate}; static const String commitHash = '${srcInfo.rev}'; @@ -85,7 +86,7 @@ flutter338.buildFlutterApplication { meta = { inherit description; homepage = "https://github.com/bggRGjQaUbCoE/PiliPlus"; - changelog = "https://github.com/bggRGjQaUbCoE/PiliPlus/releases/tag/${srcInfo.version}"; + changelog = "https://github.com/bggRGjQaUbCoE/PiliPlus/releases/tag/${version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ulysseszhan ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/pi/piliplus/pubspec.lock.json b/pkgs/by-name/pi/piliplus/pubspec.lock.json index 3334170c131e..7619b2ed80ac 100644 --- a/pkgs/by-name/pi/piliplus/pubspec.lock.json +++ b/pkgs/by-name/pi/piliplus/pubspec.lock.json @@ -1186,11 +1186,11 @@ "dependency": "transitive", "description": { "name": "image_picker_ios", - "sha256": "997d100ce1dda5b1ba4085194c5e36c9f8a1fb7987f6a36ab677a344cd2dc986", + "sha256": "956c16a42c0c708f914021666ffcd8265dde36e673c9fa68c81f7d085d9774ad", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.8.13+2" + "version": "0.8.13+3" }, "image_picker_linux": { "dependency": "transitive", @@ -1943,21 +1943,21 @@ "dependency": "transitive", "description": { "name": "shared_preferences", - "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", + "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.3" + "version": "2.5.4" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "46a46fd64659eff15f4638bbe19de43f9483f0e0bf024a9fb6b3582064bacc7b", + "sha256": "83af5c682796c0f7719c2bbf74792d113e40ae97981b8f266fa84574573556bc", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.17" + "version": "2.4.18" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -2541,6 +2541,6 @@ }, "sdks": { "dart": ">=3.10.0 <4.0.0", - "flutter": "3.38.3" + "flutter": "3.38.4" } } diff --git a/pkgs/by-name/pi/piliplus/src-info.json b/pkgs/by-name/pi/piliplus/src-info.json index 8a509adc027b..d06a6767a910 100644 --- a/pkgs/by-name/pi/piliplus/src-info.json +++ b/pkgs/by-name/pi/piliplus/src-info.json @@ -1,7 +1,6 @@ { - "version": "1.1.5", - "rev": "a48f6b1ca52e20fb459c070a9f72d62019136350", - "revCount": 4403, - "commitDate": 1764474094, - "hash": "sha256-KviltS9IC0cYl2+FKDQ535ot+ieZ21KrxRTBPxuDoe0=" + "rev": "3741fe54ff386f50c91e17b16046cb429648bb6a", + "revCount": 4442, + "commitDate": 1765360801, + "hash": "sha256-Y+/ukiy4DE6ofcE+PDvRdmSpAOKG4pfg7QOPyyzLvFU=" } diff --git a/pkgs/by-name/pi/piliplus/update.rb b/pkgs/by-name/pi/piliplus/update.rb index 638a4c5b9b71..a2c682c8df0e 100755 --- a/pkgs/by-name/pi/piliplus/update.rb +++ b/pkgs/by-name/pi/piliplus/update.rb @@ -64,13 +64,14 @@ nix_filename = package_attr('meta.position')[/([^:]+):\d+/, 1] or abort "Failed nix_dir = File.dirname nix_filename src_info_path = File.join nix_dir, 'src-info.json' json_write src_info_path, { - version: new_version, rev: new_rev, revCount: git_count, commitDate: date, hash: new_hash } log "Updated #{src_info_path}" +File.write nix_filename, File.read(nix_filename).sub(old_version, new_version) +log "Updated #{nix_filename}" pubspec_lock_path = File.join nix_dir, 'pubspec.lock.json' old_pubspec_lock = JSON.load_file pubspec_lock_path rescue abort "Failed to read #{pubspec_lock_path}" diff --git a/pkgs/by-name/pm/pmbootstrap/package.nix b/pkgs/by-name/pm/pmbootstrap/package.nix index 7e7d8fe6d331..bb5de8fb82dc 100644 --- a/pkgs/by-name/pm/pmbootstrap/package.nix +++ b/pkgs/by-name/pm/pmbootstrap/package.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "pmbootstrap"; - version = "3.7.0"; + version = "3.8.0"; pyproject = true; src = fetchFromGitLab { owner = "postmarketOS"; repo = "pmbootstrap"; tag = version; - hash = "sha256-l8y1GoNZd6JeWzO2TI0GIVc/WlMv9EunFGH94pZ7ibk="; + hash = "sha256-PbaWqtBcAXnVmB2a2DflQhayvuT3qNBCHaXuDfdrtrY="; domain = "gitlab.postmarketos.org"; }; diff --git a/pkgs/by-name/ps/psitransfer/package.nix b/pkgs/by-name/ps/psitransfer/package.nix index 64779298eaca..06c5ae1872c6 100644 --- a/pkgs/by-name/ps/psitransfer/package.nix +++ b/pkgs/by-name/ps/psitransfer/package.nix @@ -8,13 +8,13 @@ buildNpmPackage (finalAttrs: { pname = "psitransfer"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "psi-4ward"; repo = "psitransfer"; tag = "v${finalAttrs.version}"; - hash = "sha256-XUEvR8dWwFBbZdwVM8PQnYBc17SvGF5uO04vb/nAR2A="; + hash = "sha256-I5+SgPR53zdgTwHd4tdSoPr1y1iQ/JHH0KXqexgkGVE="; }; npmDepsHash = "sha256-BZpd/fsuV77uj2bGZcqBpIuOq3YlUw2bxovOfu8b9iE="; diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix index 53f9d474bc31..6d1a4bfbb252 100644 --- a/pkgs/by-name/qw/qwen-code/package.nix +++ b/pkgs/by-name/qw/qwen-code/package.nix @@ -1,6 +1,7 @@ { lib, buildNpmPackage, + nodejs_22, fetchFromGitHub, nix-update-script, jq, @@ -24,6 +25,10 @@ buildNpmPackage (finalAttrs: { npmDepsHash = "sha256-SPb+TSi4MCiAr9ruS1Idg3KfTbX6gtMK7f/+vdnabt8="; + # npm 11 incompatible with fetchNpmDeps + # https://github.com/NixOS/nixpkgs/issues/474535 + nodejs = nodejs_22; + nativeBuildInputs = [ jq pkg-config diff --git a/pkgs/by-name/ra/raze/package.nix b/pkgs/by-name/ra/raze/package.nix index 70f394550da9..37d5249f89e5 100644 --- a/pkgs/by-name/ra/raze/package.nix +++ b/pkgs/by-name/ra/raze/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "raze"; - version = "1.11.0"; + version = "1.11.0-unstable-2025-11-19"; src = fetchFromGitHub { owner = "ZDoom"; repo = "Raze"; - tag = finalAttrs.version; - hash = "sha256-P8iwCkLch8054PwnGmgqTPWA8O2yyMruDeUDJGxDI2Q="; + rev = "76fe82f5eb318fdeb30ba9fb27093a9a10bc3821"; + hash = "sha256-QCxszreIExqWVVJL8GFNzfayeSwaelhGpimqn3spEJY="; leaveDotGit = true; postFetch = '' cd $out diff --git a/pkgs/by-name/sp/sparkle/package.nix b/pkgs/by-name/sp/sparkle/package.nix deleted file mode 100644 index 8af81c16c516..000000000000 --- a/pkgs/by-name/sp/sparkle/package.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - autoPatchelfHook, - dpkg, - alsa-lib, - at-spi2-atk, - cairo, - cups, - dbus, - expat, - glib, - gtk3, - libGL, - libgbm, - libxkbcommon, - musl, - nspr, - nss, - pango, - udev, - xorg, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "sparkle"; - version = "1.6.15"; - - src = - let - selectSystem = - attrs: - attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - arch = selectSystem { - x86_64-linux = "amd64"; - aarch64-linux = "arm64"; - }; - in - fetchurl { - url = "https://github.com/xishang0128/sparkle/releases/download/${finalAttrs.version}/sparkle-linux-${finalAttrs.version}-${arch}.deb"; - hash = selectSystem { - x86_64-linux = "sha256-6WGMFmsUr/17lxZd+Q2Ellgs8ftn2YRb/lwmSR7uqLE="; - aarch64-linux = "sha256-lo19xwSqNgTxBxZuNIV7cq2qE93xtbxnsn7K3vROmrc="; - }; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - ]; - - buildInputs = [ - alsa-lib - at-spi2-atk - cairo - cups - dbus - expat - glib - gtk3 - libGL - libgbm - libxkbcommon - musl - nspr - nss - pango - udev - xorg.libX11 - xorg.libXcomposite - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXrandr - xorg.libxcb - (lib.getLib stdenv.cc.cc) - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp -r opt $out/opt - substituteInPlace usr/share/applications/sparkle.desktop \ - --replace-fail "/opt/sparkle/sparkle" "sparkle" - cp -r usr/share $out/share - ln -s $out/opt/sparkle/sparkle $out/bin/sparkle - - runHook postInstall - ''; - - preFixup = '' - patchelf --add-needed libGL.so.1 $out/opt/sparkle/sparkle - ''; - - passthru.updateScript = ./update.sh; - - meta = { - description = "Another Mihomo GUI"; - homepage = "https://github.com/xishang0128/sparkle"; - license = lib.licenses.gpl3Plus; - mainProgram = "sparkle"; - maintainers = [ ]; - platforms = [ - "aarch64-linux" - "x86_64-linux" - ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -}) diff --git a/pkgs/by-name/sp/sparkle/update.sh b/pkgs/by-name/sp/sparkle/update.sh deleted file mode 100755 index c7e559d34660..000000000000 --- a/pkgs/by-name/sp/sparkle/update.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p bash nix curl coreutils common-updater-scripts nix-update jq - -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; sparkle.version or (lib.getVersion sparkle)" | tr -d '"') -latestVersion=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/xishang0128/sparkle/releases/latest | jq --raw-output .tag_name) - -echo "latest version: $latestVersion" -echo "current version: $currentVersion" - -if [[ "$latestVersion" == "$currentVersion" ]]; then - echo "package is up-to-date" - exit 0 -fi - -nix-update sparkle --version $latestVersion --system x86_64-linux -hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; sparkle.src.url" --system aarch64-linux | tr -d '"'))) -update-source-version sparkle $latestVersion $hash --system=aarch64-linux --ignore-same-version diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix index cf1d4b457919..f5a17eb0c58c 100644 --- a/pkgs/by-name/sq/sqlfluff/package.nix +++ b/pkgs/by-name/sq/sqlfluff/package.nix @@ -1,10 +1,11 @@ { lib, fetchFromGitHub, - python3, + python3Packages, + versionCheckHook, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "sqlfluff"; version = "3.5.0"; pyproject = true; @@ -16,10 +17,13 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-fO4a1DCDM5RCeaPUHtPPGgTtZPRHOl9nuxbipDJZy7A="; }; - build-system = with python3.pkgs; [ setuptools ]; + build-system = with python3Packages; [ setuptools ]; + pythonRelaxDeps = [ + "click" + ]; dependencies = - with python3.pkgs; + with python3Packages; [ appdirs cached-property @@ -44,10 +48,12 @@ python3.pkgs.buildPythonApplication rec { importlib_metadata ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ hypothesis pytestCheckHook + versionCheckHook ]; + versionCheckProgramArg = "--version"; disabledTestPaths = [ # Don't run the plugin related tests diff --git a/pkgs/by-name/su/sub-store-frontend/package.nix b/pkgs/by-name/su/sub-store-frontend/package.nix index 0bbdf7428215..15a88ad745b0 100644 --- a/pkgs/by-name/su/sub-store-frontend/package.nix +++ b/pkgs/by-name/su/sub-store-frontend/package.nix @@ -13,13 +13,13 @@ buildNpmPackage (finalAttrs: { pname = "sub-store-frontend"; - version = "2.15.85"; + version = "2.15.86"; src = fetchFromGitHub { owner = "sub-store-org"; repo = "Sub-Store-Front-End"; tag = finalAttrs.version; - hash = "sha256-K7tAqbM7cQpmZmRQFwJhpiesUoPzvXEKu5q0pYsj+ZA="; + hash = "sha256-87ELt2HAzaNsM9pPnxei84nrew5oYag6cJq7BkqDX+w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/su/sub-store/package.nix b/pkgs/by-name/su/sub-store/package.nix index cd1c85e268f4..4abacee002a1 100644 --- a/pkgs/by-name/su/sub-store/package.nix +++ b/pkgs/by-name/su/sub-store/package.nix @@ -15,13 +15,13 @@ buildNpmPackage (finalAttrs: { pname = "sub-store"; - version = "2.20.61"; + version = "2.20.65"; src = fetchFromGitHub { owner = "sub-store-org"; repo = "Sub-Store"; tag = finalAttrs.version; - hash = "sha256-6NHPVCIlModWXzKOJnPwA41cHrNWy6yXUEwoKpbwpmw="; + hash = "sha256-HGaxpQJ9evcxz7nSJ5VBtjeS2xBLeJrkIcnUMNDr/L0="; }; sourceRoot = "${finalAttrs.src.name}/backend"; diff --git a/pkgs/by-name/ur/url-parser/package.nix b/pkgs/by-name/ur/url-parser/package.nix index 45c8d73237e8..d7ba84af6c85 100644 --- a/pkgs/by-name/ur/url-parser/package.nix +++ b/pkgs/by-name/ur/url-parser/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "url-parser"; - version = "2.1.12"; + version = "2.1.13"; src = fetchFromGitHub { owner = "thegeeklab"; repo = "url-parser"; tag = "v${version}"; - hash = "sha256-LZAOQ1/4tfH1Q4H/YPIoLUnfbRplWqmf5A48qsQpahE="; + hash = "sha256-/eu3smf3CeAO+cwhKTL0DB7UVJJ4AJjFjZbNyBbwIZg="; }; - vendorHash = "sha256-dnBZsV9f3V0o2VifEAIK8YxX+VnlRxL35TtaNW2nd4g="; + vendorHash = "sha256-bcMcooi5dYWs5bIOwSC/rOeb3+FBSFnWjaflTeaA4OU="; ldflags = [ "-s" diff --git a/pkgs/by-name/us/usb-modeswitch/data.nix b/pkgs/by-name/us/usb-modeswitch/data.nix index 64ca4d67c68f..347f19b48115 100644 --- a/pkgs/by-name/us/usb-modeswitch/data.nix +++ b/pkgs/by-name/us/usb-modeswitch/data.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "usb-modeswitch-data"; - version = "20191128"; + version = "20251207"; src = fetchurl { url = "http://www.draisberghof.de/usb_modeswitch/${pname}-${version}.tar.bz2"; - sha256 = "1ygahl3r26r38ai8yyblq9nhf3v5i6n6r6672p5wf88wg5h9n0rz"; + sha256 = "sha256-C7EtZK7l5GfDGvYaU/uCj/eqWcVKgsqF7u3kxWkL+mY="; }; doInstallCheck = true; diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json index 03b57f5c569e..69d3bf82167a 100644 --- a/pkgs/by-name/v2/v2rayn/deps.json +++ b/pkgs/by-name/v2/v2rayn/deps.json @@ -6,8 +6,13 @@ }, { "pname": "Avalonia", - "version": "11.1.3", - "hash": "sha256-kz+k/vkuWoL0XBvRT8SadMOmmRCFk9W/J4k/IM6oYX0=" + "version": "11.1.5", + "hash": "sha256-2wgJepxpJfO26gCgqnf4NZjj7j+OIyka9BKd3p44tR8=" + }, + { + "pname": "Avalonia", + "version": "11.3.10", + "hash": "sha256-M5eDqPQ1Vt6dteY3ecgpffy5L6245TJcxaovpRF8PtA=" }, { "pname": "Avalonia", @@ -44,35 +49,40 @@ "version": "11.3.1", "hash": "sha256-JYcA/DgTHRJ02/FcURqtJnXYhhdzki8DGECLkZ4zONg=" }, + { + "pname": "Avalonia.BuildServices", + "version": "11.3.2", + "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40=" + }, { "pname": "Avalonia.Controls.ColorPicker", - "version": "11.3.8", - "hash": "sha256-cB3mYR1X8Gzu1FQfWCJpfWosnpojIQhRSxrjYz4zD6g=" + "version": "11.3.10", + "hash": "sha256-d8VTsT6yYAa8uZAodX7SWgf4+izVHrP/hy/pDpT91Wk=" }, { "pname": "Avalonia.Controls.DataGrid", - "version": "11.3.8", - "hash": "sha256-5rB33sqLIoDIEjlGlJFRGf1lLwvnVh8o8/16GQzu15Q=" + "version": "11.3.10", + "hash": "sha256-M1o7/n7VR/TbeKNd/+mkG0ck+1vrRhkyjOuBzcuqW6g=" }, { "pname": "Avalonia.Desktop", - "version": "11.3.8", - "hash": "sha256-X/ggsRzsN7o3O4Iw4uvjgOdlW58Xbe8Jpv4llRuFcoA=" + "version": "11.3.10", + "hash": "sha256-ps3trTNzHClRg9VrupTd7+cIShkd0dA+Awy/39IHsjE=" }, { "pname": "Avalonia.Diagnostics", - "version": "11.3.8", - "hash": "sha256-eOLf2Id4Olbq/nMWERarked+vg5ZnVMCxMKOXBfqAqM=" + "version": "11.3.10", + "hash": "sha256-9tvHMi/D6eJLC1K1jmQMvT6LbljojK94rVlfY8zNJug=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.3.8", - "hash": "sha256-XJogaWo4ZNg/PvckA6D5EEuyQneYUKDePnT9snNwaHs=" + "version": "11.3.10", + "hash": "sha256-XEmzwLsndS+l76quLpddzuBPL+BQie0Rv5HN3I5V2kA=" }, { "pname": "Avalonia.Native", - "version": "11.3.8", - "hash": "sha256-Hm4uneEN3rQVmSp1Ai4cDSTJpixYDzYJzEkAesvwxPw=" + "version": "11.3.10", + "hash": "sha256-nd44zlwFNDrFa9OAT3zd2Yg12TOykQW2smXza6ZNmN4=" }, { "pname": "Avalonia.Remote.Protocol", @@ -81,8 +91,13 @@ }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.1.3", - "hash": "sha256-CKF+62zCbK1Rd/HiC6MGrags3ylXrVQ1lni3Um0Muqk=" + "version": "11.1.5", + "hash": "sha256-yahGv3P65/QLSsYpnbV7/zu1zPtB0v2LS5dWPqLrd+8=" + }, + { + "pname": "Avalonia.Remote.Protocol", + "version": "11.3.10", + "hash": "sha256-DB7JzQjJs5XkPyUjQL4N0Bbm84QG20IZf8UEs7mhcqg=" }, { "pname": "Avalonia.Remote.Protocol", @@ -96,28 +111,28 @@ }, { "pname": "Avalonia.Skia", - "version": "11.3.8", - "hash": "sha256-FeJ6tdgeGKHkv0JKPOq2eHTxaDTT0t2yJ7wavBKnr68=" + "version": "11.3.10", + "hash": "sha256-XJXyK19ow9mvcssdmjPvh8zyh4VExcVEoiIauqPNC5s=" }, { "pname": "Avalonia.Themes.Simple", - "version": "11.3.8", - "hash": "sha256-GSD4yvyDKqBSGV/rwE/EO3CTp9dG4eR4B5H0Y/u9+hE=" + "version": "11.3.10", + "hash": "sha256-5xOBZ+dHye75R28iQLieQgCPlcfQBHF7tzQsHIhTiDg=" }, { "pname": "Avalonia.Win32", - "version": "11.3.8", - "hash": "sha256-YwzyF4YJtCzcLpGxDe6U3Tpxjcqft8mcYjUNnL2Ockg=" + "version": "11.3.10", + "hash": "sha256-jV0VrDKLS8GqQkgyescrOfJPg4r/YQBJHbpmfRh0qFw=" }, { "pname": "Avalonia.X11", - "version": "11.3.8", - "hash": "sha256-SlAWkiaGYc+Ynq4QcO3/xorz2EIWWyrZcHXIk7F68i0=" + "version": "11.3.10", + "hash": "sha256-fgp68h5siTweduPxKeKYwb4LJ7lhmtf7Fw2b1B4FrKo=" }, { "pname": "CliWrap", - "version": "3.9.0", - "hash": "sha256-WC1bX8uy+8VZkrV6eK8nJ24Uy81Bj4Aao27OsP1sGyE=" + "version": "3.10.0", + "hash": "sha256-XMGTr0gkZxSOC72hrCjpIChpN0c0A19X3TqOAdBtgb4=" }, { "pname": "DialogHost.Avalonia", @@ -166,8 +181,8 @@ }, { "pname": "MessageBox.Avalonia", - "version": "3.2.0", - "hash": "sha256-LoB1rWPLGmeCypbn54qwE7T9nxHDqFVIJNL6qezS6Kw=" + "version": "3.3.1", + "hash": "sha256-W726OnJQA0x7RJ6bzaLWKw1PSIL50WsVC5FIYXwOZ9U=" }, { "pname": "MicroCom.Runtime", @@ -196,8 +211,8 @@ }, { "pname": "NLog", - "version": "6.0.5", - "hash": "sha256-aP7PsAkzjlZF6m1Tr87dX+5X0YIGov7DrTrIdsqhLUY=" + "version": "6.0.7", + "hash": "sha256-Le6ocjCN29rtgRiAroVfjUbMXCrjk0pSv2GEtZZy0qU=" }, { "pname": "QRCoder", @@ -206,8 +221,8 @@ }, { "pname": "ReactiveUI", - "version": "22.2.1", - "hash": "sha256-MZNBNP2ajvfRU4OaG8JjbbaQ3xbE+FjE9RZK+TZdOCE=" + "version": "22.3.1", + "hash": "sha256-NltfWhlz+99yaYEDkPXeBgPtqbqW5xJDEhedH5cesUk=" }, { "pname": "ReactiveUI.Avalonia", @@ -221,8 +236,8 @@ }, { "pname": "Semi.Avalonia", - "version": "11.3.7", - "hash": "sha256-iOf7KhTmHt0vqkRyloM+yueo/acHHwFQd/5UZ1r0SD8=" + "version": "11.3.7.1", + "hash": "sha256-LMf15T7QxgcQ43OG9NgfQGMwJ0IJkTdr42jI/Y3PAGg=" }, { "pname": "Semi.Avalonia.AvaloniaEdit", @@ -231,8 +246,8 @@ }, { "pname": "Semi.Avalonia.DataGrid", - "version": "11.3.7", - "hash": "sha256-XD7a6YY5L24peG24GaItZq7PZEdK1RP1eS0QxFbASJU=" + "version": "11.3.7.1", + "hash": "sha256-xZAvVT8Sb9evv5DubKPUi3uYGWlx/KnCKqQgoghGX0A=" }, { "pname": "SkiaSharp", diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix index 9bcf2f643d49..a1f8e679595c 100644 --- a/pkgs/by-name/v2/v2rayn/package.nix +++ b/pkgs/by-name/v2/v2rayn/package.nix @@ -20,13 +20,13 @@ buildDotnetModule (finalAttrs: { pname = "v2rayn"; - version = "7.15.7"; + version = "7.16.9"; src = fetchFromGitHub { owner = "2dust"; repo = "v2rayN"; tag = finalAttrs.version; - hash = "sha256-xTD1bdL/UUGqUxDmrguO6Oapv37clDD2b3YWCe7B+Bs="; + hash = "sha256-co2JLOlt2TafpSwxD6E/Q0dMbXADBdTL7C4DZTJQCNs="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/va/vatprism/package.nix b/pkgs/by-name/va/vatprism/package.nix index 1f4c5b07b545..fa5f38169374 100644 --- a/pkgs/by-name/va/vatprism/package.nix +++ b/pkgs/by-name/va/vatprism/package.nix @@ -73,7 +73,7 @@ maven.buildMavenPackage rec { if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) then "sha256-gerjxTj8UQEVthMO3unWPEG7SPseMt5JPPureC/wUsw=" else - "sha256-QH14GJ8JUYuu5XWnSKPYsamFeP0o+5Sobl+a0FUOIzs="; + "sha256-LoOiLisqc99gIGClpVe8tq5/2prmyyOzLDkpmuSgwVo="; installPhase = '' runHook preInstall diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix index 8e75a1dbcc94..5214f5c0c7b4 100644 --- a/pkgs/by-name/vi/vicinae/package.nix +++ b/pkgs/by-name/vi/vicinae/package.nix @@ -22,13 +22,13 @@ }: gcc15Stdenv.mkDerivation (finalAttrs: { pname = "vicinae"; - version = "0.17.1"; + version = "0.17.3"; src = fetchFromGitHub { owner = "vicinaehq"; repo = "vicinae"; tag = "v${finalAttrs.version}"; - hash = "sha256-xKEfWYf3gJ5wEYd8krT5w70rr0QYEu+7rqJ/IZmCHeQ="; + hash = "sha256-EzvASqrcGZqWyESuYNKRnH17s5hBJK2woIrS6iD6nOs="; }; apiDeps = fetchNpmDeps { diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix index 4d6920f37407..8be28b6cc1ad 100644 --- a/pkgs/by-name/wa/waydroid/package.nix +++ b/pkgs/by-name/wa/waydroid/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch, python3Packages, dnsmasq, gawk, @@ -23,24 +22,16 @@ python3Packages.buildPythonApplication rec { pname = "waydroid"; - version = "1.5.4"; + version = "1.6.1"; format = "other"; src = fetchFromGitHub { owner = "waydroid"; repo = "waydroid"; tag = version; - hash = "sha256-K4uJ9MVmr5+7O1em1yUJXZj6H8bpfm2ZAE2uqgiyDBQ="; + hash = "sha256-2ywAgWYMQ7N2P4x/0maNUSn3pdaRAWyATaraRAGafxI="; }; - patches = [ - (fetchpatch { - url = "https://github.com/waydroid/waydroid/commit/af296c90a788dde0b33813b12607cfab2fa65b98.patch"; - hash = "sha256-1vkEKk00dbBLbbBxZIhcoOYUP976SJlaWyzYSWBy0nU="; - revert = true; - }) - ]; - nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 @@ -63,14 +54,11 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; installFlags = [ - "PREFIX=$(out)" + "PREFIX=${placeholder "out"}" "USE_SYSTEMD=0" - "SYSCONFDIR=$(out)/etc" - ]; - postInstall = lib.optionalString withNftables '' - substituteInPlace $out/lib/waydroid/data/scripts/waydroid-net.sh \ - --replace-fail 'LXC_USE_NFT="false"' 'LXC_USE_NFT="true"' - ''; + "SYSCONFDIR=${placeholder "out"}/etc" + ] + ++ lib.optional withNftables "USE_NFTABLES=1"; preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") @@ -102,8 +90,8 @@ python3Packages.buildPythonApplication rec { ) }" - substituteInPlace $out/lib/waydroid/tools/helpers/*.py \ - --replace '"sh"' '"${runtimeShell}"' + substituteInPlace $out/lib/waydroid/tools/helpers/run.py $out/lib/waydroid/tools/helpers/lxc.py \ + --replace-fail '"sh"' '"${runtimeShell}"' ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix deleted file mode 100644 index f4021dbc853e..000000000000 --- a/pkgs/by-name/za/zashboard/package.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pnpm_9, - fetchPnpmDeps, - pnpmConfigHook, - nodejs, - nix-update-script, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "zashboard"; - version = "1.108.0"; - - src = fetchFromGitHub { - owner = "Zephyruso"; - repo = "zashboard"; - tag = "v${finalAttrs.version}"; - hash = "sha256-+CSih7AoP9rOkxVBtX+GkEWrpo6mpPy6d/zF5iyVCt4="; - }; - - nativeBuildInputs = [ - pnpmConfigHook - pnpm_9 - nodejs - ]; - - pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) pname version src; - pnpm = pnpm_9; - fetcherVersion = 1; - hash = "sha256-0qoyN46DDdj9vy7qMRGtNrWKZVsBRv22NQBhB7sz1+U="; - }; - - buildPhase = '' - runHook preBuild - - pnpm run build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cp -r dist $out - - runHook postInstall - ''; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Dashboard Using Clash API"; - homepage = "https://github.com/Zephyruso/zashboard"; - changelog = "https://github.com/Zephyruso/zashboard/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - maintainers = [ ]; - }; -}) diff --git a/pkgs/desktops/gnome/extensions/forge/default.nix b/pkgs/desktops/gnome/extensions/forge/default.nix index f51bfd14205c..eeb41376e369 100644 --- a/pkgs/desktops/gnome/extensions/forge/default.nix +++ b/pkgs/desktops/gnome/extensions/forge/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation { pname = "gnome-shell-extension-forge"; - version = "49.2-development"; + version = "49.3-development"; src = fetchFromGitHub { owner = "forge-ext"; repo = "forge"; - rev = "701e7587e88fd51cc10e0f2fc5124ac61c82cf1c"; - hash = "sha256-yKBH4Hv4b0CUVubsfs8a8fg3nIuogvGp5DJT/HjBcns="; + rev = "a2fabeb5102d3b96661cde0e332c288bea21a1a5"; + hash = "sha256-nk2olkhNX7dIKO9xYR1yWaaKHjxtMv7mPvmUf2sCDD8="; }; nativeBuildInputs = [ glib ]; diff --git a/pkgs/desktops/gnome/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix index e95c1526de07..3b30fc61dccd 100644 --- a/pkgs/desktops/gnome/extensions/impatience/default.nix +++ b/pkgs/desktops/gnome/extensions/impatience/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "gnome-shell-extension-impatience"; - version = "0.5.2-unstable-2025-02-24"; + version = "0.5.3-unstable-2025-10-06"; src = fetchFromGitHub { owner = "timbertson"; repo = "gnome-shell-impatience"; - rev = "527295a35b352596fed1fc07799f1e0792a77040"; # shows gnome 48 support - hash = "sha256-9xfZcKJpBttSP2IbGtjo4UxFEnADgQjyV3vx0jSg8nI="; + rev = "593f9cd52ffd7875265e7cfa2d03e0309fec55b1"; # shows gnome 49 support + hash = "sha256-Slcd47DX1Gdl5H1kkrn19s95eDpftyS2Wn25UpYCjYQ="; }; buildInputs = [ diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 2b9b105f3e41..77b459ac56a9 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -89,6 +89,10 @@ tcl.mkTclDerivation { inherit tcl; + env = lib.optionalAttrs (lib.versionOlder tcl.version "8.6") { + NIX_CFLAGS_COMPILE = "-std=gnu17"; + }; + passthru = rec { inherit (tcl) release version; libPrefix = "tk${tcl.release}"; diff --git a/pkgs/development/python-modules/beanhub-import/default.nix b/pkgs/development/python-modules/beanhub-import/default.nix index f402db8fa10b..497d2a3ce9a7 100644 --- a/pkgs/development/python-modules/beanhub-import/default.nix +++ b/pkgs/development/python-modules/beanhub-import/default.nix @@ -2,7 +2,6 @@ lib, fetchFromGitHub, buildPythonPackage, - pythonOlder, pytestCheckHook, beancount-black, beancount-parser, @@ -16,16 +15,14 @@ buildPythonPackage rec { pname = "beanhub-import"; - version = "1.2.0"; + version = "1.2.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "LaunchPlatform"; repo = "beanhub-import"; tag = version; - hash = "sha256-oExJ8BWJmJkJMGGIYp+Xtf0rzUcQKD8YKo51E+KbRN0="; + hash = "sha256-zKlw8KEVc0FJrxWHOx95UXGzqxFFCaYBKID4hRbTQas="; }; build-system = [ hatchling ]; @@ -53,7 +50,7 @@ buildPythonPackage rec { description = "Declarative idempotent rule-based Beancount transaction import engine in Python"; homepage = "https://github.com/LaunchPlatform/beanhub-import/"; changelog = "https://github.com/LaunchPlatform/beanhub-import/releases/tag/${src.tag}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fangpen ]; }; } diff --git a/pkgs/development/python-modules/cryptoparser/default.nix b/pkgs/development/python-modules/cryptoparser/default.nix index df67fc5f5a9b..ec940c13da59 100644 --- a/pkgs/development/python-modules/cryptoparser/default.nix +++ b/pkgs/development/python-modules/cryptoparser/default.nix @@ -4,29 +4,35 @@ attrs, buildPythonPackage, cryptodatahub, - fetchPypi, - python-dateutil, + fetchFromGitLab, + fetchpatch2, + pyfakefs, pythonOlder, setuptools, setuptools-scm, + unittestCheckHook, urllib3, }: buildPythonPackage rec { pname = "cryptoparser"; - version = "1.0.0"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-bEvhMVcm9sXlfhxUD2K4N10nusgxpGYFJQLtJE1/qok="; + src = fetchFromGitLab { + owner = "coroner"; + repo = "cryptoparser"; + tag = "v${version}"; + hash = "sha256-CsG4hfA3pfE7FwxNfaUTLMS8RV0tv1czoHdIlolUX34="; }; patches = [ - # https://gitlab.com/coroner/cryptoparser/-/merge_requests/2 - ./fix-dirs-exclude.patch + (fetchpatch2 { + url = "https://gitlab.com/coroner/cryptoparser/-/merge_requests/2.diff"; + hash = "sha256-T8dK6OMR41XUMrZ6B7ZybEtljZJOR2QbCiZl04dT3wA="; + }) ]; build-system = [ @@ -38,16 +44,18 @@ buildPythonPackage rec { asn1crypto attrs cryptodatahub - python-dateutil urllib3 ]; - postInstall = '' - find $out -name "__pycache__" -type d | xargs rm -rv + env.PYTHONDONTWRITEBYTECODE = 1; - # Prevent creating more binary byte code later (e.g. during - # pythonImportsCheck) - export PYTHONDONTWRITEBYTECODE=1 + nativeCheckInputs = [ + pyfakefs + unittestCheckHook + ]; + + postInstall = '' + find $out -name __pycache__ -type d | xargs rm -rv ''; pythonImportsCheck = [ "cryptoparser" ]; @@ -55,8 +63,9 @@ buildPythonPackage rec { meta = { description = "Security protocol parser and generator"; homepage = "https://gitlab.com/coroner/cryptoparser"; - changelog = "https://gitlab.com/coroner/cryptoparser/-/blob/v${version}/CHANGELOG.md"; + changelog = "https://gitlab.com/coroner/cryptoparser/-/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ kranzes ]; + teams = with lib.teams; [ ngi ]; }; } diff --git a/pkgs/development/python-modules/cryptoparser/fix-dirs-exclude.patch b/pkgs/development/python-modules/cryptoparser/fix-dirs-exclude.patch deleted file mode 100644 index c667b3b1a8e5..000000000000 --- a/pkgs/development/python-modules/cryptoparser/fix-dirs-exclude.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 512b5d6e30784594db46bcd0071d63da7065e478 Mon Sep 17 00:00:00 2001 -From: Ivan Mincik -Date: Wed, 17 Sep 2025 14:09:31 +0200 -Subject: [PATCH] Fix directories exclude from package - -* correctly exclude submodules directory -* also exclude docs directory ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 73897d6..74d43e4 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -75,7 +75,7 @@ technical_name = 'cryptoparser' - license-files = ['LICENSE.txt'] - - [tool.setuptools.packages.find] --exclude = ['submodules'] -+exclude = ['submodules*', 'docs'] - - [tool.tox] - envlist = [ --- -GitLab - diff --git a/pkgs/development/python-modules/gbinder-python/default.nix b/pkgs/development/python-modules/gbinder-python/default.nix index d63c86c78f6d..9ede6d2c28fa 100644 --- a/pkgs/development/python-modules/gbinder-python/default.nix +++ b/pkgs/development/python-modules/gbinder-python/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "gbinder-python"; - version = "1.1.2"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { - owner = "erfanoabdi"; + owner = "waydroid"; repo = "gbinder-python"; tag = version; - hash = "sha256-up1EDuR05a7TlCErd2BXkp01oqi6hEskt7xVxsJqquM="; + hash = "sha256-z0hMAvwB+uttPcP+in+C3o1ujhFSiDXKktOajnsXhPI="; }; build-system = [ @@ -34,14 +34,13 @@ buildPythonPackage rec { postPatch = '' # Fix pkg-config name for cross-compilation substituteInPlace setup.py \ - --replace-fail "pkg-config" "$PKG_CONFIG" \ - --replace-fail "USE_CYTHON = False" "USE_CYTHON = True" + --replace-fail "pkg-config" "$PKG_CONFIG" ''; meta = { description = "Python bindings for libgbinder"; - homepage = "https://github.com/erfanoabdi/gbinder-python"; - license = lib.licenses.gpl3; + homepage = "https://github.com/waydroid/gbinder-python"; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index bd6b4954f440..ba75fc5687c2 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -3,22 +3,19 @@ buildPythonPackage, fetchPypi, google-api-core, - pythonOlder, protobuf, setuptools, }: buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.2.3"; + version = "0.3.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "google_cloud_access_context_manager"; inherit version; - hash = "sha256-wt6A+6EZDkZ50zYmOE0Z4EpWujtNRh7VIeiSCa9jogk="; + hash = "sha256-86o1ySJbeq74Xs2s7cwVd3ib6NRYt6QbatI7UEeG5fk="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index b51ae9ffd229..001b138a8a09 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -9,21 +9,18 @@ protobuf, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.59.0"; + version = "2.61.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "google_cloud_container"; inherit version; - hash = "sha256-ZsTKUV0zzGbzf9jltrqJBjsG66sz4UlbjEJMcgs/tgM="; + hash = "sha256-mkkbT7ybP7bjNo8fCPo8rsXGzw8WoDh7l2YS+5CJOr8="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index b56b310f2e79..01762d7bd474 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -10,21 +10,18 @@ protobuf, pytestCheckHook, pytest-asyncio, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.22.0"; + version = "5.23.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "google_cloud_dataproc"; inherit version; - hash = "sha256-zkGy0LLTnTqvLckUCRMtNP4n+KpdKtat3fQqz78rW/A="; + hash = "sha256-lLOFvb9nt+K29TyglTrC3yGV4T4TG60TLvyGZFn2BqM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index ae6307fcc187..c32eb5c870bf 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -9,21 +9,18 @@ protobuf, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.32.0"; + version = "3.33.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "google_cloud_dlp"; inherit version; - hash = "sha256-lXsPTvwTd9e0+6tNRwxyD4CPTw7dVXkmPwDroR9VVTk="; + hash = "sha256-qRC+EY7DyImMOFIWENYvShbzM6Tesqvrdz5yD25fZ+M="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix index b80db05053de..a95c4b24006c 100644 --- a/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix @@ -6,22 +6,23 @@ google-cloud-core, mock, pytestCheckHook, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.34.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "0.36.0"; + pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-hyxvTChxCGC6YjjvYGqaJDvgBbve7EjzfPELl+LB2D8="; + pname = "google_cloud_runtimeconfig"; + inherit version; + hash = "sha256-+pDFyELolBTJfz/RIoNbGNHC30tyKhZ7D6XiQTKO2t0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ google-api-core google-cloud-core ]; diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 8301e3ab1a07..4c58b1ec2993 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.25.0"; + version = "2.26.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_secret_manager"; inherit version; - hash = "sha256-o3krscswcyaQgpemFTYDGslIUsIiSPBK4RL/UahTtWE="; + hash = "sha256-DR1vdjJ2haDteKTPUPKJ4b+75WAm7Qr/qYZjuG1tUNY="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 063ee9118edd..d1f5aa99b7e1 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -9,21 +9,18 @@ protobuf, pytest-asyncio, pytestCheckHook, - pythonOlder, setuptools, }: buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.16.2"; + version = "1.17.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchPypi { pname = "google_cloud_trace"; inherit version; - hash = "sha256-ib7yI6USRllR60kzW+bWC+4DltV2YC2/VjaEOdMDyrQ="; + hash = "sha256-aHA7/JNxgIPwYdkTCjhS4xgewba3lrdoVpl8KPUblZU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 150b42736e9d..5d1c3c920efc 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "iamdata"; - version = "0.1.202512311"; + version = "0.1.202601011"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${version}"; - hash = "sha256-T5cgAVV5X67aT8i7pumXl30I4Eb0flp6g+UvVtAbkUY="; + hash = "sha256-tDGY7d8rmD4vKyoFmDAYppuF56aHcb5Ry3nMxOv6PRs="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index ad641d3aa43c..0d4a256d4af9 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "16.12.0"; + version = "16.13.0"; pyproject = true; src = fetchFromGitHub { @@ -41,7 +41,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-1KaSUitQG/c49s7X17+4x29lRM9mvA8F1EX/2I7dE0E="; + hash = "sha256-xxVtncIQ72echi0VogfgqwfB8IA7JEKVUV2lmL1coeU="; }; patches = [ diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index 1817c6d8dbd5..b45c1ac58d24 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pygitguardian"; - version = "1.27.0"; + version = "1.28.0"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "py-gitguardian"; tag = "v${version}"; - hash = "sha256-Jn8wy5UmuzqEputujGJQtAe8AoGCLYpSwZWHpDGlSWg="; + hash = "sha256-56Z0peJcjBbNX51MLLaIKcD9Qg+5q+5I0gKRu84/8TM="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 0cd64d037cef..29b2c3b940a5 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "scapy"; - version = "2.6.1"; + version = "2.7.0"; format = "setuptools"; disabled = isPyPy; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "secdev"; repo = "scapy"; tag = "v${version}"; - hash = "sha256-m2L30aEpPp9cfW652yd+0wFkNlMij6FF1RzWZbwJ79A="; + hash = "sha256-Pp7pPfaWyzJGf+soENfOPynN8logc5FM848hyVCcdKk="; }; patches = [ ./find-library.patch ]; diff --git a/pkgs/development/python-modules/superqt/default.nix b/pkgs/development/python-modules/superqt/default.nix index aa0109a6b3b2..84132e697372 100644 --- a/pkgs/development/python-modules/superqt/default.nix +++ b/pkgs/development/python-modules/superqt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "superqt"; - version = "0.7.6"; + version = "0.7.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = "superqt"; tag = "v${version}"; - hash = "sha256-Hdi1aTMZeQqaqeK7B4yynTOBc6Cy1QcX5BHsr6g1xwM="; + hash = "sha256-l6O3qI1mkaqiQAVL2jIf/ylRntsqa5p2x+ojV1ZdAtE="; }; build-system = [ diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index e214dcfadc69..0727c34b77a6 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.1.23"; + version = "3.1.24"; pyproject = true; src = fetchFromGitHub { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-TAhWPyUZu8PKO5tirjQ00djspW177jX1TrqTvS+7YIA="; + hash = "sha256-jRuQOcmBBbzpQHapezXmHwCfGJXv6zkXrdpW+W8biaQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 35cfabc35dc1..316a281a106f 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -186,6 +186,12 @@ buildPythonPackage rec { "ProcessTestsBuilder_AsyncioSelectorReactorTests.test_processEnded" "ProcessTestsBuilder_SelectReactorTests.test_processEnded" ]; + "src/twisted/internet/test/test_tcp.py" = [ + # marked as flaky on macOS by upstream + # https://github.com/twisted/twisted/blob/twisted-25.5.0/src/twisted/internet/test/test_tcp.py + "AbortConnectionTests_AsyncioSelectorReactorTests.test_resumeProducingAbort" + "AbortConnectionTests_AsyncioSelectorReactorTests.test_resumeProducingAbortLater" + ]; }; in lib.concatStringsSep "\n" ( diff --git a/pkgs/development/python-modules/zope-schema/default.nix b/pkgs/development/python-modules/zope-schema/default.nix index dc72078d66b8..f6392e28fbb1 100644 --- a/pkgs/development/python-modules/zope-schema/default.nix +++ b/pkgs/development/python-modules/zope-schema/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "zope-schema"; - version = "8.0"; + version = "8.1"; pyproject = true; src = fetchFromGitHub { owner = "zopefoundation"; repo = "zope.schema"; tag = version; - hash = "sha256-qZ7OWpDTBV/wT3FZBUhe6D4olCTBaYkilj+JSwjHKOU="; + hash = "sha256-pO3yL0gej2PGD01ySiPJPU66P/9hW73T2n/ZnUPa3C0="; }; postPatch = '' diff --git a/pkgs/shells/fish/plugins/foreign-env/default.nix b/pkgs/shells/fish/plugins/foreign-env/default.nix index fe1713f991e0..287009acce4d 100644 --- a/pkgs/shells/fish/plugins/foreign-env/default.nix +++ b/pkgs/shells/fish/plugins/foreign-env/default.nix @@ -1,36 +1,32 @@ { + bash, lib, buildFishPlugin, fetchFromGitHub, - gnused, - bash, - coreutils, }: buildFishPlugin { pname = "foreign-env"; - version = "0-unstable-2020-02-09"; + version = "0-unstable-2023-08-23"; src = fetchFromGitHub { owner = "oh-my-fish"; repo = "plugin-foreign-env"; - rev = "dddd9213272a0ab848d474d0cbde12ad034e65bc"; - sha256 = "00xqlyl3lffc5l0viin1nyp819wf81fncqyz87jx8ljjdhilmgbs"; + rev = "7f0cf099ae1e1e4ab38f46350ed6757d54471de7"; + hash = "sha256-4+k5rSoxkTtYFh/lEjhRkVYa2S4KEzJ/IJbyJl+rJjQ="; }; - patches = [ ./suppress-harmless-warnings.patch ]; - preInstall = '' - sed -e "s|sed|${gnused}/bin/sed|" \ - -e "s|bash|${bash}/bin/bash|" \ - -e "s|\| tr|\| ${coreutils}/bin/tr|" \ - -i functions/* + sed -i -e "s|bash|${lib.getExe bash}|" functions/fenv.main.fish ''; meta = { description = "Foreign environment interface for Fish shell"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ jgillich ]; + maintainers = with lib.maintainers; [ + jgillich + prince213 + ]; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/shells/fish/plugins/foreign-env/suppress-harmless-warnings.patch b/pkgs/shells/fish/plugins/foreign-env/suppress-harmless-warnings.patch deleted file mode 100644 index 6eed35152120..000000000000 --- a/pkgs/shells/fish/plugins/foreign-env/suppress-harmless-warnings.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/functions/fenv.apply.fish b/functions/fenv.apply.fish -index 34a25e3..3d94135 100644 ---- a/functions/fenv.apply.fish -+++ b/functions/fenv.apply.fish -@@ -27,11 +27,17 @@ function fenv.apply - for variable in $variables - set key (echo $variable | sed 's/=.*//') - set value (echo $variable | sed 's/[^=]*=//') -+ set ignore PATH _ - - if test "$key" = 'PATH' - set value (echo $value | tr ':' '\n') - end - -- set -g -x $key $value -+ if contains $key $ignore -+ set -g -x $key $value 2>/dev/null -+ else -+ set -g -x $key $value -+ end -+ - end - end diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index d89d12f1b735..b0309997542a 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -27,13 +27,13 @@ }: stdenv.mkDerivation rec { pname = "tlp"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "linrunner"; repo = "TLP"; rev = version; - hash = "sha256-Bqg0IwLh3XIVJd2VkPQFDCZ/hVrzRFrRLlSHJXlJGWU="; + hash = "sha256-aM/4+cgtUe6qv3MNT4moXvNzqG5gKvwMbg14L8ifWlc="; }; # XXX: See patch files for relevant explanations. diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3dbf40cc5018..072d1442da8f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -533,6 +533,7 @@ mapAliases { docker_26 = throw "'docker_26' has been removed because it has been unmaintained since February 2025. Use docker_28 or newer instead."; # Added 2025-06-21 docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15 dockerfile-language-server-nodejs = warnAlias "'dockerfile-language-server-nodejs' has been renamed to 'dockerfile-language-server'" dockerfile-language-server; # Added 2025-09-12 + dogdns = throw "'dogdns' has been removed as it is unmaintained upstream and vendors insecure dependencies. Consider switching to 'doggo', a similar tool."; # Added 2025-12-31 dolphin-emu-beta = throw "'dolphin-emu-beta' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2025-10-27 dontRecurseIntoAttrs = warnAlias "dontRecurseIntoAttrs has been removed from pkgs, use `lib.dontRecurseIntoAttrs` instead" lib.dontRecurseIntoAttrs; # Added 2025-10-30 dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11 @@ -1532,6 +1533,7 @@ mapAliases { SPAdes = throw "'SPAdes' has been renamed to/replaced by 'spades'"; # Converted to throw 2025-10-27 spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet spark2014 = throw "'spark2014' has been renamed to/replaced by 'gnatprove'"; # Converted to throw 2025-10-27 + sparkle = throw "'sparkle' has been removed because upstream repository source code has been deleted"; # Added 2025-12-29 spidermonkey_91 = throw "'spidermonkey_91 is EOL since 2022/09"; # Added 2025-08-26 spoof = throw "'spoof' has been removed, as it is broken with the latest MacOS versions and is unmaintained upstream"; # Added 2025-11-14 spotify-unwrapped = throw "'spotify-unwrapped' has been renamed to/replaced by 'spotify'"; # Converted to throw 2025-10-27 @@ -1766,6 +1768,7 @@ mapAliases { yubikey-personalization-gui = throw "'yubikey-personalization-gui' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07 zandronum-alpha = throw "'zandronum-alpha' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19 zandronum-alpha-server = throw "'zandronum-alpha-server' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19 + zashboard = throw "'zashboard' has been removed because upstream repository source code has been deleted"; # Added 2025-12-29 zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22 zeal-qt5 = warnAlias "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31 zeal-qt6 = warnAlias "'zeal-qt6' has been renamed to 'zeal'" zeal; # Added 2025-08-31