From d3f08f68772f74a51119804077edfa352fc5c2c7 Mon Sep 17 00:00:00 2001 From: kyehn Date: Sat, 18 Oct 2025 12:15:49 +0800 Subject: [PATCH 01/74] reposurgeon: 4.26 -> 5.3 --- pkgs/by-name/re/reposurgeon/package.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/re/reposurgeon/package.nix b/pkgs/by-name/re/reposurgeon/package.nix index aec51ab75d22..4d4533d640be 100644 --- a/pkgs/by-name/re/reposurgeon/package.nix +++ b/pkgs/by-name/re/reposurgeon/package.nix @@ -4,24 +4,32 @@ buildGoModule, asciidoctor, ruby, + which, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "reposurgeon"; - version = "4.26"; + version = "5.3"; src = fetchurl { - url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-${version}.tar.xz"; - sha256 = "sha256-FuL5pvIM468hEm6rUBKGW6+WlYv4DPHNnpwpRGzMwlY="; + url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-${finalAttrs.version}.tar.xz"; + hash = "sha256-XEPpZyBlTfLGtFQSCHND8OrIPB6ml8HDdg0DSvnmWh8="; }; - vendorHash = "sha256-QpgRCnsOOZujE405dCe+PYg/zNkqnrfZFfbBFo7adjY="; + postPatch = '' + substituteInPlace Makefile \ + --replace-fail "./repocutter -q docgen >cuttercommands.inc" 'echo "/* skipped */" >cuttercommands.inc' \ + --replace-fail "./repotool docgen >toolcommands.inc" 'echo "/* skipped */" >toolcommands.inc' + ''; + + vendorHash = "sha256-4bNhAWkO84imCaBzjBxNCOzG2A/z4lhqvu51wF2GVUo="; subPackages = [ "." ]; nativeBuildInputs = [ asciidoctor ruby + which ]; postBuild = '' @@ -40,4 +48,4 @@ buildGoModule rec { maintainers = with lib.maintainers; [ dfoxfranke ]; platforms = lib.platforms.all; }; -} +}) From c365e306b545d4a1bb184375060149c0c8d5e3f5 Mon Sep 17 00:00:00 2001 From: kyehn Date: Tue, 21 Oct 2025 05:41:19 +0800 Subject: [PATCH 02/74] quint: 0.25.1 -> 0.29.0 --- pkgs/by-name/qu/quint/package.nix | 42 ++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/qu/quint/package.nix b/pkgs/by-name/qu/quint/package.nix index a08c6e35f12d..3c62a4d8426f 100644 --- a/pkgs/by-name/qu/quint/package.nix +++ b/pkgs/by-name/qu/quint/package.nix @@ -9,12 +9,18 @@ jre, fetchzip, buildNpmPackage, + _experimental-update-script-combinators, + nix-update-script, + writeShellScript, + gnugrep, + nix-update, + common-updater-scripts, }: let - version = "0.25.1"; - apalacheVersion = "0.47.2"; - evaluatorVersion = "0.2.0"; + version = "0.29.0"; + apalacheVersion = "0.50.3"; + evaluatorVersion = "0.3.0"; metaCommon = { description = "Formal specification language with TLA+ semantics"; @@ -28,7 +34,7 @@ let owner = "informalsystems"; repo = "quint"; tag = "v${version}"; - hash = "sha256-CYQesIoDlIGCKXIJ/hpZqOZBVd19Or5VEKVERchJz68="; + hash = "sha256-q2pahCsNNJEVivRBijFw5YUCWDzLAtZSYRgxaaROTLo="; }; # Build the Quint CLI from source @@ -40,7 +46,7 @@ let sourceRoot = "${src.name}/quint"; - npmDepsHash = "sha256-FYNSr5B0/oJ4PbU/HUVqSdPG8kFvq4vRFnYwwdMf+jQ="; + npmDepsHash = "sha256-wbjktm7A1ey25rWbtBD5uvD1mM9vbwBhGIX5ECzJThI="; npmBuildScript = "compile"; @@ -82,7 +88,7 @@ let # Download Apalache. It runs on the JVM, so no need to build it from source. apalacheDist = fetchzip { url = "https://github.com/apalache-mc/apalache/releases/download/v${apalacheVersion}/apalache.tgz"; - hash = "sha256-P0QOxB14OSlphqBALR1YL9WJ0XYaUYE/R52yZytVzds="; + hash = "sha256-pePoXbuJq1UNt0yY/Is3jFHtvvX3r/yjOoqG4clsgBw="; }; in stdenv.mkDerivation (finalAttrs: { @@ -113,6 +119,30 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + inherit + quint-cli + quint-evaluator + apalacheDist + apalacheVersion + ; + updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { + extraArgs = [ + "--subpackage" + "quint-cli" + ]; + }) + (writeShellScript "update" '' + src=$(nix build --print-out-paths --no-link .#quint.src) + QUINT_EVALUATOR_VERSION=$(${lib.getExe gnugrep} -m1 "const QUINT_EVALUATOR_VERSION" $src/quint/src/quintRustWrapper.ts | sed -E "s/.*= 'v?([^']+)'.*/\1/") + ${lib.getExe nix-update} quint.quint-evaluator --version $QUINT_EVALUATOR_VERSION + DEFAULT_APALACHE_VERSION_TAG=$(${lib.getExe gnugrep} "DEFAULT_APALACHE_VERSION_TAG" $src/quint/src/apalache.ts | sed -E "s/.*= '([^']+)'.*/\1/") + ${lib.getExe' common-updater-scripts "update-source-version"} quint $DEFAULT_APALACHE_VERSION_TAG --version-key=apalacheVersion --source-key=apalacheDist --ignore-same-version --ignore-same-hash + '') + ]; + }; + meta = metaCommon // { mainProgram = "quint"; }; From 3f4b707ea89f5f720f33a21925a76abd8e6cd751 Mon Sep 17 00:00:00 2001 From: kyehn Date: Thu, 13 Nov 2025 07:39:29 +0000 Subject: [PATCH 03/74] quint: 0.29.0 -> 0.29.1 --- pkgs/by-name/qu/quint/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/qu/quint/package.nix b/pkgs/by-name/qu/quint/package.nix index 3c62a4d8426f..2b48be3b4102 100644 --- a/pkgs/by-name/qu/quint/package.nix +++ b/pkgs/by-name/qu/quint/package.nix @@ -18,8 +18,8 @@ }: let - version = "0.29.0"; - apalacheVersion = "0.50.3"; + version = "0.29.1"; + apalacheVersion = "0.51.1"; evaluatorVersion = "0.3.0"; metaCommon = { @@ -34,7 +34,7 @@ let owner = "informalsystems"; repo = "quint"; tag = "v${version}"; - hash = "sha256-q2pahCsNNJEVivRBijFw5YUCWDzLAtZSYRgxaaROTLo="; + hash = "sha256-lnvtyL4GKOyKdBDC5vevx5LgaiB7xTkfuN1rRTxKyv4="; }; # Build the Quint CLI from source @@ -46,7 +46,7 @@ let sourceRoot = "${src.name}/quint"; - npmDepsHash = "sha256-wbjktm7A1ey25rWbtBD5uvD1mM9vbwBhGIX5ECzJThI="; + npmDepsHash = "sha256-CBwovC7PTdjJHwL9lKRlJbl8rNjd9J3hVBFJz24+cbw="; npmBuildScript = "compile"; @@ -88,7 +88,7 @@ let # Download Apalache. It runs on the JVM, so no need to build it from source. apalacheDist = fetchzip { url = "https://github.com/apalache-mc/apalache/releases/download/v${apalacheVersion}/apalache.tgz"; - hash = "sha256-pePoXbuJq1UNt0yY/Is3jFHtvvX3r/yjOoqG4clsgBw="; + hash = "sha256-xYQQH9XxPwf3+YmjiRs7XlW49LdHrEnMeuvd16Ir0B4="; }; in stdenv.mkDerivation (finalAttrs: { From 2722f5002671c81d242b9206fa511b267062e57b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Mon, 10 Nov 2025 22:29:26 +0100 Subject: [PATCH 04/74] treewide: use pname and version --- pkgs/applications/misc/redshift/default.nix | 1 - pkgs/by-name/ca/cables/package.nix | 7 +++---- pkgs/by-name/ca/capacities/package.nix | 1 - pkgs/by-name/cl/clutter-gtk/package.nix | 7 +++---- pkgs/by-name/cl/clutter/package.nix | 10 +++++----- pkgs/by-name/ed/edukai/package.nix | 1 - pkgs/by-name/ed/eduli/package.nix | 3 +-- pkgs/by-name/fi/fira/package.nix | 3 +-- pkgs/by-name/ho/hol/package.nix | 2 +- pkgs/by-name/jn/jnr-posix/package.nix | 4 ++-- pkgs/by-name/me/meslo-lg/package.nix | 11 +++++------ pkgs/by-name/mo/monosat/package.nix | 8 ++++++-- pkgs/by-name/ms/msr/package.nix | 2 +- pkgs/by-name/na/nailgun/package.nix | 1 - pkgs/by-name/ni/niff/package.nix | 4 ++-- pkgs/by-name/pu/pulseaudio-ctl/package.nix | 7 +++---- pkgs/by-name/qu/quivira/package.nix | 2 +- pkgs/by-name/ra/ratman/package.nix | 3 ++- pkgs/by-name/sc/scummvm/games.nix | 2 +- pkgs/by-name/sw/sway/package.nix | 3 +-- pkgs/by-name/ta/talkfilters/package.nix | 2 +- pkgs/by-name/va/vagrant/package.nix | 1 - .../compilers/corretto/mk-corretto.nix | 1 - pkgs/development/compilers/mozart/default.nix | 17 ++++++++--------- .../fast-query-parsers/default.nix | 3 +-- .../python-modules/hypothesis/default.nix | 4 ++-- .../python-modules/jinja2/default.nix | 4 ++-- .../python-modules/tensorflow/default.nix | 8 +++++--- .../vl-convert-python/default.nix | 3 +-- pkgs/development/tools/ocaml/cppo/default.nix | 3 +-- pkgs/os-specific/bsd/netbsd/pkgs/libc.nix | 3 +-- pkgs/os-specific/bsd/openbsd/pkgs/libc.nix | 3 +-- pkgs/os-specific/linux/acpi-call/default.nix | 8 +++++--- pkgs/tools/misc/html-proofer/default.nix | 1 - 34 files changed, 66 insertions(+), 77 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index aec14488480b..7da9822d2b1c 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -174,7 +174,6 @@ rec { }; meta = redshift.meta // { - name = "${pname}-${version}"; longDescription = "Gammastep" + lib.removePrefix "Redshift" redshift.meta.longDescription; homepage = "https://gitlab.com/chinstrap/gammastep"; mainProgram = "gammastep"; diff --git a/pkgs/by-name/ca/cables/package.nix b/pkgs/by-name/ca/cables/package.nix index 5373e2bd7518..620ba21e47b4 100644 --- a/pkgs/by-name/ca/cables/package.nix +++ b/pkgs/by-name/ca/cables/package.nix @@ -8,7 +8,6 @@ let pname = "cables"; version = "0.8.0"; - name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/cables-gl/cables_electron/releases/download/v${version}/cables-${version}-linux-x64.AppImage"; @@ -18,7 +17,7 @@ let appimageContents = appimageTools.extract { inherit pname version src; postExtract = '' - substituteInPlace $out/${pname}-${version}.desktop --replace 'Exec=AppRun' 'Exec=cables' + substituteInPlace $out/cables-${version}.desktop --replace 'Exec=AppRun' 'Exec=cables' ''; }; @@ -27,8 +26,8 @@ appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${name}.desktop $out/share/applications/cables.desktop - install -m 444 -D ${appimageContents}/${name}.png $out/share/icons/hicolor/512x512/apps/cables.png + install -m 444 -D ${appimageContents}/cables-${version}.desktop $out/share/applications/cables.desktop + install -m 444 -D ${appimageContents}/cables-${version}.png $out/share/icons/hicolor/512x512/apps/cables.png ''; meta = with lib; { diff --git a/pkgs/by-name/ca/capacities/package.nix b/pkgs/by-name/ca/capacities/package.nix index 7d2e6c68fd64..d6fe437de88d 100644 --- a/pkgs/by-name/ca/capacities/package.nix +++ b/pkgs/by-name/ca/capacities/package.nix @@ -8,7 +8,6 @@ let pname = "capacities"; version = "1.52.6"; - name = "${pname}-${version}"; src = fetchurl { url = "https://web.archive.org/web/20250519011655/https://capacities-desktop-app.fra1.cdn.digitaloceanspaces.com/capacities-${version}.AppImage"; diff --git a/pkgs/by-name/cl/clutter-gtk/package.nix b/pkgs/by-name/cl/clutter-gtk/package.nix index 30a4607056c4..036171764216 100644 --- a/pkgs/by-name/cl/clutter-gtk/package.nix +++ b/pkgs/by-name/cl/clutter-gtk/package.nix @@ -12,15 +12,14 @@ }: let - pname = "clutter-gtk"; version = "1.8.4"; in - stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "clutter-gtk"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/clutter-gtk/${lib.versions.majorMinor version}/clutter-gtk-${version}.tar.xz"; sha256 = "01ibniy4ich0fgpam53q252idm7f4fn5xg5qvizcfww90gn9652j"; }; diff --git a/pkgs/by-name/cl/clutter/package.nix b/pkgs/by-name/cl/clutter/package.nix index d4f6cf46fdc0..9b224902df09 100644 --- a/pkgs/by-name/cl/clutter/package.nix +++ b/pkgs/by-name/cl/clutter/package.nix @@ -25,14 +25,14 @@ }: let - pname = "clutter"; version = "1.26.4"; in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +stdenv.mkDerivation { + pname = "clutter"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/clutter/${lib.versions.majorMinor version}/clutter-${version}.tar.xz"; sha256 = "1rn4cd1an6a9dfda884aqpcwcgq8dgydpqvb19nmagw4b70zlj4b"; }; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "clutter"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/by-name/ed/edukai/package.nix b/pkgs/by-name/ed/edukai/package.nix index 2e46cd0a0bdf..a9a3c9ec9374 100644 --- a/pkgs/by-name/ed/edukai/package.nix +++ b/pkgs/by-name/ed/edukai/package.nix @@ -9,7 +9,6 @@ stdenvNoCC.mkDerivation rec { version = "5.0"; src = fetchzip { - name = "${pname}-${version}"; url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/edukai-${version}.zip"; sha256 = "sha256-3+w9n6GJQg9+HfHYukC7tlm4GVs8vEOO23hrLw6qjTY="; }; diff --git a/pkgs/by-name/ed/eduli/package.nix b/pkgs/by-name/ed/eduli/package.nix index 05d8325df41a..f4f547f43ba2 100644 --- a/pkgs/by-name/ed/eduli/package.nix +++ b/pkgs/by-name/ed/eduli/package.nix @@ -4,12 +4,11 @@ fetchzip, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "eduli"; version = "3.0"; src = fetchzip { - name = "${pname}-${version}"; url = "https://language.moe.gov.tw/001/Upload/Files/site_content/M0001/MoeLI-3.0.zip"; hash = "sha256-bDQtLugYPWwJJNusBLEJrgIVufocRK4NIR0CCGaTkyw="; }; diff --git a/pkgs/by-name/fi/fira/package.nix b/pkgs/by-name/fi/fira/package.nix index 6c317c016808..67039b3c95ba 100644 --- a/pkgs/by-name/fi/fira/package.nix +++ b/pkgs/by-name/fi/fira/package.nix @@ -5,10 +5,9 @@ fira-sans, }: -symlinkJoin rec { +symlinkJoin { pname = "fira"; inherit (fira-sans) version; - name = "${pname}-${version}"; paths = [ fira-mono diff --git a/pkgs/by-name/ho/hol/package.nix b/pkgs/by-name/ho/hol/package.nix index aa3b75810fec..0ee51dd8a5c4 100644 --- a/pkgs/by-name/ho/hol/package.nix +++ b/pkgs/by-name/ho/hol/package.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation { - name = "${pname}-${version}"; + inherit pname version; src = fetchurl { url = "mirror://sourceforge/hol/hol/${longVersion}/${holsubdir}.tar.gz"; diff --git a/pkgs/by-name/jn/jnr-posix/package.nix b/pkgs/by-name/jn/jnr-posix/package.nix index 0199e379a154..92780b221d5a 100644 --- a/pkgs/by-name/jn/jnr-posix/package.nix +++ b/pkgs/by-name/jn/jnr-posix/package.nix @@ -18,8 +18,8 @@ let }; deps = stdenv.mkDerivation { - name = "${pname}-${version}-deps"; - inherit src; + pname = "deps-${pname}"; + inherit src version; nativeBuildInputs = [ jdk diff --git a/pkgs/by-name/me/meslo-lg/package.nix b/pkgs/by-name/me/meslo-lg/package.nix index 379f2ff92986..3a2689b8dcbe 100644 --- a/pkgs/by-name/me/meslo-lg/package.nix +++ b/pkgs/by-name/me/meslo-lg/package.nix @@ -4,23 +4,22 @@ fetchurl, unzip, }: - -stdenv.mkDerivation rec { - version = "1.2.1"; - +let pname = "meslo-lg"; + version = "1.2.1"; meslo-lg = fetchurl { url = "https://raw.githubusercontent.com/andreberg/Meslo-Font/09a431d546d211130352c28eb0466e5d7d5aeaf0/dist/v${version}/Meslo%20LG%20v${version}.zip"; - name = "${pname}-${version}"; sha256 = "1l08mxlzaz3i5bamnfr49s2k4k23vdm64b8nz2ha33ysimkbgg6h"; }; meslo-lg-dz = fetchurl { url = "https://raw.githubusercontent.com/andreberg/Meslo-Font/09a431d546d211130352c28eb0466e5d7d5aeaf0/dist/v${version}/Meslo%20LG%20DZ%20v${version}.zip"; - name = "${pname}-${version}-dz"; sha256 = "0lnbkrvcpgz9chnvix79j6fiz36wj6n46brb7b1746182rl1l875"; }; +in +stdenv.mkDerivation { + inherit pname version; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/by-name/mo/monosat/package.nix b/pkgs/by-name/mo/monosat/package.nix index 02a828ceb247..97a0e2cc5376 100644 --- a/pkgs/by-name/mo/monosat/package.nix +++ b/pkgs/by-name/mo/monosat/package.nix @@ -45,8 +45,12 @@ let ''; core = stdenv.mkDerivation { - name = "${pname}-${version}"; - inherit src patches; + inherit + pname + version + src + patches + ; postPatch = commonPostPatch + '' substituteInPlace CMakeLists.txt \ --replace-fail "cmake_minimum_required(VERSION 3.02)" "cmake_minimum_required(VERSION 3.10)" diff --git a/pkgs/by-name/ms/msr/package.nix b/pkgs/by-name/ms/msr/package.nix index e99d2cec9736..19bda1c09a81 100644 --- a/pkgs/by-name/ms/msr/package.nix +++ b/pkgs/by-name/ms/msr/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "20060208"; src = fetchzip { - name = "${pname}-${version}"; + inherit pname version; url = "http://www.etallen.com/msr/${pname}-${version}.src.tar.gz"; hash = "sha256-e01qYWbOALkXp5NpexuVodMxA3EBySejJ6ZBpZjyT+E="; }; diff --git a/pkgs/by-name/na/nailgun/package.nix b/pkgs/by-name/na/nailgun/package.nix index 94541e952287..ec5917aeae3d 100644 --- a/pkgs/by-name/na/nailgun/package.nix +++ b/pkgs/by-name/na/nailgun/package.nix @@ -69,7 +69,6 @@ symlinkJoin rec { pname = "nailgun"; inherit client server version; - name = "${pname}-${version}"; paths = [ client server diff --git a/pkgs/by-name/ni/niff/package.nix b/pkgs/by-name/ni/niff/package.nix index 768d8b4047b7..ae8cbb5761a1 100644 --- a/pkgs/by-name/ni/niff/package.nix +++ b/pkgs/by-name/ni/niff/package.nix @@ -6,11 +6,11 @@ }: let - pname = "niff"; version = "0.1"; in stdenv.mkDerivation { - name = "${pname}-${version}"; + pname = "niff"; + inherit version; src = fetchFromGitHub { owner = "FRidh"; diff --git a/pkgs/by-name/pu/pulseaudio-ctl/package.nix b/pkgs/by-name/pu/pulseaudio-ctl/package.nix index 03a40c350078..eacacd24ad51 100644 --- a/pkgs/by-name/pu/pulseaudio-ctl/package.nix +++ b/pkgs/by-name/pu/pulseaudio-ctl/package.nix @@ -21,11 +21,10 @@ let pulseaudio ]; pname = "pulseaudio-ctl"; - -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "1.70"; +in +stdenv.mkDerivation { + inherit pname version; src = fetchFromGitHub { owner = "graysky2"; diff --git a/pkgs/by-name/qu/quivira/package.nix b/pkgs/by-name/qu/quivira/package.nix index 0649c5972fa5..b90e4fc6e068 100644 --- a/pkgs/by-name/qu/quivira/package.nix +++ b/pkgs/by-name/qu/quivira/package.nix @@ -4,7 +4,7 @@ let version = "4.1"; in fetchurl { - name = "${pname}-${version}"; + inherit pname version; url = "http://www.quivira-font.com/files/Quivira.otf"; # Download the source file to a temporary directory so that $out can be a diff --git a/pkgs/by-name/ra/ratman/package.nix b/pkgs/by-name/ra/ratman/package.nix index ddb3289d9a32..d64617c44ab1 100644 --- a/pkgs/by-name/ra/ratman/package.nix +++ b/pkgs/by-name/ra/ratman/package.nix @@ -46,7 +46,8 @@ rustPlatform.buildRustPackage rec { sourceRoot = "${src.name}/ratman/dashboard"; npmDeps = fetchNpmDeps { - name = "${pname}-${version}-npm-deps"; + pname = "npm-deps-${pname}"; + inherit version; src = "${src}/ratman/dashboard"; hash = "sha256-47L4V/Vf8DK3q63MYw3x22+rzIN3UPD0N/REmXh5h3w="; }; diff --git a/pkgs/by-name/sc/scummvm/games.nix b/pkgs/by-name/sc/scummvm/games.nix index 0275b50039da..9326b490c5e1 100644 --- a/pkgs/by-name/sc/scummvm/games.nix +++ b/pkgs/by-name/sc/scummvm/games.nix @@ -61,7 +61,7 @@ let in stdenv.mkDerivation ( { - name = "${pname}-${version}"; + inherit pname version; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/by-name/sw/sway/package.nix b/pkgs/by-name/sw/sway/package.nix index 39d0728c0848..ebfecee68ad4 100644 --- a/pkgs/by-name/sw/sway/package.nix +++ b/pkgs/by-name/sw/sway/package.nix @@ -46,10 +46,9 @@ let fi ''; in -symlinkJoin rec { +symlinkJoin { pname = replaceStrings [ "-unwrapped" ] [ "" ] sway.pname; inherit (sway) version; - name = "${pname}-${version}"; paths = (optional withBaseWrapper baseWrapper) ++ [ sway ]; diff --git a/pkgs/by-name/ta/talkfilters/package.nix b/pkgs/by-name/ta/talkfilters/package.nix index 6222b80b159f..6b8202364c5e 100644 --- a/pkgs/by-name/ta/talkfilters/package.nix +++ b/pkgs/by-name/ta/talkfilters/package.nix @@ -10,7 +10,7 @@ let in stdenv.mkDerivation { - name = "${pname}-${version}"; + inherit pname version; src = fetchurl { url = "http://www.hyperrealm.com/${pname}/${pname}-${version}.tar.gz"; diff --git a/pkgs/by-name/va/vagrant/package.nix b/pkgs/by-name/va/vagrant/package.nix index b7c3fb89c1ef..82e6deb1f162 100644 --- a/pkgs/by-name/va/vagrant/package.nix +++ b/pkgs/by-name/va/vagrant/package.nix @@ -27,7 +27,6 @@ let ruby = ruby_3_4; deps = bundlerEnv rec { - name = "${pname}-${version}"; pname = "vagrant"; inherit version; diff --git a/pkgs/development/compilers/corretto/mk-corretto.nix b/pkgs/development/compilers/corretto/mk-corretto.nix index b40c34167537..9fdc03d3059e 100644 --- a/pkgs/development/compilers/corretto/mk-corretto.nix +++ b/pkgs/development/compilers/corretto/mk-corretto.nix @@ -28,7 +28,6 @@ in jdk.overrideAttrs ( finalAttrs: oldAttrs: { inherit pname version src; - name = "${pname}-${version}"; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ jdk diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix index d9f82898c8e7..e9f6c2f7fc80 100644 --- a/pkgs/development/compilers/mozart/default.nix +++ b/pkgs/development/compilers/mozart/default.nix @@ -16,17 +16,8 @@ let stdenv = llvmPackages.stdenv; - -in -stdenv.mkDerivation rec { pname = "mozart2"; version = "2.0.1"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "https://github.com/mozart/mozart2/releases/download/v${version}/${name}-Source.zip"; - sha256 = "1mad9z5yzzix87cdb05lmif3960vngh180s2mb66cj5gwh5h9dll"; - }; # This is a workaround to avoid using sbt. # I guess it is acceptable to fetch the bootstrapping compiler in binary form. @@ -34,6 +25,14 @@ stdenv.mkDerivation rec { url = "https://github.com/layus/mozart2/releases/download/v2.0.0-beta.1/bootcompiler.jar"; sha256 = "1hgh1a8hgzgr6781as4c4rc52m2wbazdlw3646s57c719g5xphjz"; }; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchurl { + url = "https://github.com/mozart/mozart2/releases/download/v${version}/${pname}-${version}-Source.zip"; + sha256 = "1mad9z5yzzix87cdb05lmif3960vngh180s2mb66cj5gwh5h9dll"; + }; patches = [ ./patch-limits.diff diff --git a/pkgs/development/python-modules/fast-query-parsers/default.nix b/pkgs/development/python-modules/fast-query-parsers/default.nix index 971a38394137..3ee5c99419d5 100644 --- a/pkgs/development/python-modules/fast-query-parsers/default.nix +++ b/pkgs/development/python-modules/fast-query-parsers/default.nix @@ -22,8 +22,7 @@ buildPythonPackage rec { }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-kp5bCmHYMS/e8eM6HrRw0JlVaxwPscFGDLQ0PX4ZIC4="; }; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 22b65220f4e4..dfe3b1127402 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -147,8 +147,8 @@ buildPythonPackage rec { # Forge look and feel of multi-output derivation as best as we can. # # Using 'outputs = [ "doc" ];' breaks a lot of assumptions. - name = "${pname}-${version}-doc"; - inherit src pname version; + pname = "${pname}-doc"; + inherit src version; postInstallSphinx = '' mv $out/share/doc/* $out/share/doc/python$pythonVersion-$pname-$version diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index ccd2577b09af..29a9d6c40881 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -58,8 +58,8 @@ buildPythonPackage rec { # Forge look and feel of multi-output derivation as best as we can. # # Using 'outputs = [ "doc" ];' breaks a lot of assumptions. - name = "${pname}-${version}-doc"; - inherit src pname version; + pname = "${pname}-doc"; + inherit src version; patches = [ # Fix import of "sphinxcontrib-log-cabinet" diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 78c6a6bdf152..370ad401586f 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -211,7 +211,8 @@ let ]); rules_cc_darwin_patched = stdenv.mkDerivation { - name = "rules_cc-${pname}-${version}"; + pname = "rules_cc-${pname}"; + inherit version; src = _bazel-build.deps; @@ -245,7 +246,8 @@ let ''; }; llvm-raw_darwin_patched = stdenv.mkDerivation { - name = "llvm-raw-${pname}-${version}"; + pname = "llvm-raw-${pname}"; + inherit version; src = _bazel-build.deps; @@ -285,7 +287,7 @@ let _bazel-build; _bazel-build = buildBazelPackage.override { inherit stdenv; } { - name = "${pname}-${version}"; + inherit pname version; #bazel = bazel_5; bazel = bazel; diff --git a/pkgs/development/python-modules/vl-convert-python/default.nix b/pkgs/development/python-modules/vl-convert-python/default.nix index 9455a6fe3109..00e83458a5b3 100644 --- a/pkgs/development/python-modules/vl-convert-python/default.nix +++ b/pkgs/development/python-modules/vl-convert-python/default.nix @@ -24,8 +24,7 @@ buildPythonPackage rec { patches = [ ./libffi-sys-system-feature.patch ]; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit pname version src; hash = "sha256-oPUpX7aMZBSsVujcXkIBNL8pk2JJ0RyBCwoVsuARkkQ="; }; diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index 6a94480be688..2a1d0f7a5c11 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -49,8 +49,7 @@ else in stdenv.mkDerivation { - - name = "${pname}-${version}"; + inherit pname version; src = fetchFromGitHub { owner = "mjambon"; diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix b/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix index 665c9ce8ec8b..e23ba1a4fd36 100644 --- a/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix +++ b/pkgs/os-specific/bsd/netbsd/pkgs/libc.nix @@ -13,8 +13,7 @@ version, }: -symlinkJoin rec { - name = "${pname}-${version}"; +symlinkJoin { pname = "libc-netbsd"; inherit version; diff --git a/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix b/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix index b0362f434693..77a86619f0ba 100644 --- a/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix +++ b/pkgs/os-specific/bsd/openbsd/pkgs/libc.nix @@ -13,8 +13,7 @@ version, }: -symlinkJoin rec { - name = "${pname}-${version}"; +symlinkJoin { pname = "libc-openbsd"; inherit version; diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 504b713b908d..8bfdb07eefe3 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -5,11 +5,13 @@ kernel, kernelModuleMakeFlags, }: - -stdenv.mkDerivation rec { +let pname = "acpi-call"; version = "1.2.2"; - name = "${pname}-${version}-${kernel.version}"; +in +stdenv.mkDerivation { + inherit pname; + version = "${version}-${kernel.version}"; src = fetchFromGitHub { owner = "nix-community"; diff --git a/pkgs/tools/misc/html-proofer/default.nix b/pkgs/tools/misc/html-proofer/default.nix index 32d810ee4e41..315a5ceca612 100644 --- a/pkgs/tools/misc/html-proofer/default.nix +++ b/pkgs/tools/misc/html-proofer/default.nix @@ -6,7 +6,6 @@ }: bundlerEnv rec { - name = "${pname}-${version}"; pname = "html-proofer"; version = (import ./gemset.nix).html-proofer.version; From 6faf085b4f5466a5fd9294eb8ce3613330a2f4d6 Mon Sep 17 00:00:00 2001 From: transcaffeine Date: Wed, 10 Dec 2025 18:56:31 +0100 Subject: [PATCH 05/74] netbox_4_4: 4.4.6 -> 4.4.8 Release notes: - https://github.com/netbox-community/netbox/releases/tag/v4.4.7 - https://github.com/netbox-community/netbox/releases/tag/v4.4.8 Full changelog: https://github.com/netbox-community/netbox/compare/v4.4.6...v4.4.8 --- pkgs/by-name/ne/netbox_4_4/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/netbox_4_4/package.nix b/pkgs/by-name/ne/netbox_4_4/package.nix index 4653e670577b..ddb098392e8d 100644 --- a/pkgs/by-name/ne/netbox_4_4/package.nix +++ b/pkgs/by-name/ne/netbox_4_4/package.nix @@ -16,14 +16,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; - version = "4.4.6"; + version = "4.4.8"; pyproject = false; src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox"; tag = "v${version}"; - hash = "sha256-i/S9/WR+GKo7wb9t23nYYERf9F6DPsSOTef3tvfFENk="; + hash = "sha256-C7tzY6gp/jfoCf6uPGfAvO8+xHkGe7T0o0Dod+D6YRU="; }; patches = [ From 3b8f971ea03db46861a953e6e60de28ffa7cfa07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Dec 2025 16:07:47 +0000 Subject: [PATCH 06/74] morewaita-icon-theme: 48.4 -> 49 --- pkgs/by-name/mo/morewaita-icon-theme/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index b587cd65ee6f..51c986f1fdbd 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -8,13 +8,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "morewaita-icon-theme"; - version = "48.4"; + version = "49"; src = fetchFromGitHub { owner = "somepaulo"; repo = "MoreWaita"; tag = "v${finalAttrs.version}"; - hash = "sha256-c3wpxaANZL9SwYwUEHkW0bbv4VsdseuwORsC49kUSjg="; + hash = "sha256-DxZ7XnIIF3EKGMPXahD+aHp6lCLRmrnywn7+qWCVflo="; }; postPatch = '' From e9d9355154cb3693541265b5757f5844c3fd43bb Mon Sep 17 00:00:00 2001 From: chillcicada <2210227279@qq.com> Date: Fri, 12 Dec 2025 08:34:12 +0800 Subject: [PATCH 07/74] marvin: add dependencies --- pkgs/by-name/ma/marvin/package.nix | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/marvin/package.nix b/pkgs/by-name/ma/marvin/package.nix index bc456549e0a4..dced5f900a67 100644 --- a/pkgs/by-name/ma/marvin/package.nix +++ b/pkgs/by-name/ma/marvin/package.nix @@ -9,15 +9,22 @@ gnugrep, gnused, openjdk17, + freetype, + fontconfig, + libXi, + libX11, + libXext, + libXtst, + libXrender, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "marvin"; version = "25.3.5"; src = fetchurl { - name = "marvin-${version}.deb"; - url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${version}.deb"; + name = "marvin-${finalAttrs.version}.deb"; + url = "http://dl.chemaxon.com/marvin/${finalAttrs.version}/marvin_linux_${finalAttrs.version}.deb"; hash = "sha256-OiTHMGKAuHadoKQMTTPRcYl/zKL+bc0ts/UNsJlHn0Q="; }; @@ -26,6 +33,16 @@ stdenv.mkDerivation rec { makeWrapper ]; + buildInputs = [ + freetype + fontconfig + libXi + libX11 + libXext + libXtst + libXrender + ]; + unpackPhase = '' dpkg-deb -x $src opt ''; @@ -34,6 +51,7 @@ stdenv.mkDerivation rec { wrapBin() { makeWrapper $1 $out/bin/$(basename $1) \ --set INSTALL4J_JAVA_HOME "${openjdk17}" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} \ --prefix PATH : ${ lib.makeBinPath [ coreutils @@ -72,4 +90,4 @@ stdenv.mkDerivation rec { license = lib.licenses.unfree; platforms = lib.platforms.linux; }; -} +}) From e665bffccb81e1d8659cd21d6c91ce99c999c623 Mon Sep 17 00:00:00 2001 From: botnk Date: Fri, 12 Dec 2025 01:44:28 +0000 Subject: [PATCH 08/74] zed-editor: 0.216.0 -> 0.216.1 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.216.1 --- pkgs/by-name/ze/zed-editor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index c454d3bad84a..49459c74b12f 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -106,7 +106,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-editor"; - version = "0.216.0"; + version = "0.216.1"; outputs = [ "out" @@ -119,7 +119,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "zed-industries"; repo = "zed"; tag = "v${finalAttrs.version}"; - hash = "sha256-Sy178C5Z8F4qZzdVAnf6XI+S52Zl/8Z6dI4Qqk2d3dI="; + hash = "sha256-7rLrPXnPvKTE4w9FYs4RHSs3wBbmwbaWtTdvC2iC6yY="; }; postPatch = '' @@ -139,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm -r $out/git/*/candle-book/ ''; - cargoHash = "sha256-0aKEbdV41ZNbMLx30DotmYDBuuxOgFOET79jjNhhd4Y="; + cargoHash = "sha256-cnjLwoes71/M0vMB01dLBB7pujlVHT82hfQxwr/Z4XQ="; nativeBuildInputs = [ cmake From 6881ea13ec4d3da38f3fed20a97b9e2ddf88ddb2 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Fri, 12 Dec 2025 07:45:09 +0200 Subject: [PATCH 09/74] git: move to by-name --- .../gi}/git/docbook2texi.patch | 0 .../gi}/git/git-send-email-honor-PATH.patch | 0 .../gi}/git/git-sh-i18n.patch | 0 .../gi}/git/installCheck-path.patch | 0 .../default.nix => by-name/gi/git/package.nix} | 15 +++++++++++++-- .../gi}/git/ssh-path.patch | 0 .../gi}/git/update.sh | 0 pkgs/top-level/all-packages.nix | 16 ---------------- 8 files changed, 13 insertions(+), 18 deletions(-) rename pkgs/{applications/version-management => by-name/gi}/git/docbook2texi.patch (100%) rename pkgs/{applications/version-management => by-name/gi}/git/git-send-email-honor-PATH.patch (100%) rename pkgs/{applications/version-management => by-name/gi}/git/git-sh-i18n.patch (100%) rename pkgs/{applications/version-management => by-name/gi}/git/installCheck-path.patch (100%) rename pkgs/{applications/version-management/git/default.nix => by-name/gi/git/package.nix} (98%) rename pkgs/{applications/version-management => by-name/gi}/git/ssh-path.patch (100%) rename pkgs/{applications/version-management => by-name/gi}/git/update.sh (100%) diff --git a/pkgs/applications/version-management/git/docbook2texi.patch b/pkgs/by-name/gi/git/docbook2texi.patch similarity index 100% rename from pkgs/applications/version-management/git/docbook2texi.patch rename to pkgs/by-name/gi/git/docbook2texi.patch diff --git a/pkgs/applications/version-management/git/git-send-email-honor-PATH.patch b/pkgs/by-name/gi/git/git-send-email-honor-PATH.patch similarity index 100% rename from pkgs/applications/version-management/git/git-send-email-honor-PATH.patch rename to pkgs/by-name/gi/git/git-send-email-honor-PATH.patch diff --git a/pkgs/applications/version-management/git/git-sh-i18n.patch b/pkgs/by-name/gi/git/git-sh-i18n.patch similarity index 100% rename from pkgs/applications/version-management/git/git-sh-i18n.patch rename to pkgs/by-name/gi/git/git-sh-i18n.patch diff --git a/pkgs/applications/version-management/git/installCheck-path.patch b/pkgs/by-name/gi/git/installCheck-path.patch similarity index 100% rename from pkgs/applications/version-management/git/installCheck-path.patch rename to pkgs/by-name/gi/git/installCheck-path.patch diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/by-name/gi/git/package.nix similarity index 98% rename from pkgs/applications/version-management/git/default.nix rename to pkgs/by-name/gi/git/package.nix index df59adec8f1e..2835e6270b10 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/by-name/gi/git/package.nix @@ -31,8 +31,6 @@ libiconvReal, svnSupport ? false, subversionClient, - perlLibs, - smtpPerlLibs, perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform, nlsSupport ? true, osxkeychainSupport ? stdenv.hostPlatform.isDarwin, @@ -70,6 +68,19 @@ let FCGIProcManager HTMLTagCloud ]; + perlLibs = with perlPackages; [ + LWP + URI + TermReadKey + ]; + smtpPerlLibs = with perlPackages; [ + libnet + NetSMTPSSL + IOSocketSSL + NetSSLeay + AuthenSASL + DigestHMAC + ]; in stdenv.mkDerivation (finalAttrs: { diff --git a/pkgs/applications/version-management/git/ssh-path.patch b/pkgs/by-name/gi/git/ssh-path.patch similarity index 100% rename from pkgs/applications/version-management/git/ssh-path.patch rename to pkgs/by-name/gi/git/ssh-path.patch diff --git a/pkgs/applications/version-management/git/update.sh b/pkgs/by-name/gi/git/update.sh similarity index 100% rename from pkgs/applications/version-management/git/update.sh rename to pkgs/by-name/gi/git/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 538c13d721f1..a3e188f3815b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1150,22 +1150,6 @@ with pkgs; ### APPLICATIONS/VERSION-MANAGEMENT - git = callPackage ../applications/version-management/git { - perlLibs = [ - perlPackages.LWP - perlPackages.URI - perlPackages.TermReadKey - ]; - smtpPerlLibs = [ - perlPackages.libnet - perlPackages.NetSMTPSSL - perlPackages.IOSocketSSL - perlPackages.NetSSLeay - perlPackages.AuthenSASL - perlPackages.DigestHMAC - ]; - }; - # The full-featured Git. gitFull = git.override { svnSupport = stdenv.buildPlatform == stdenv.hostPlatform; From 3d1b816f040e9d3d8842403b5ab0adb36b92f97a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Dec 2025 14:04:07 +0000 Subject: [PATCH 10/74] ansel: 0-unstable-2025-12-01 -> 0-unstable-2025-12-08 --- pkgs/by-name/an/ansel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index f7199744612f..6117a91ea3b2 100644 --- a/pkgs/by-name/an/ansel/package.nix +++ b/pkgs/by-name/an/ansel/package.nix @@ -82,13 +82,13 @@ let in stdenv.mkDerivation { pname = "ansel"; - version = "0-unstable-2025-12-01"; + version = "0-unstable-2025-12-08"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "845679e472b40f092d574d1bcb71e9e95d3366da"; - hash = "sha256-6aB6sBDh/0XGLK3M206oxCTBPqy+AbDJL4DrvNbSFU4="; + rev = "06961da4b03abff051c4abff32eeb6356894809e"; + hash = "sha256-UJC1TBGga52/d1uRkZzCJtNcivql7zjGEUP7mav56wk="; fetchSubmodules = true; }; From 592833f06a70682a678bf891d366bb722cf9cfca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Dec 2025 16:08:25 +0000 Subject: [PATCH 11/74] opencloud-desktop: 3.0.2 -> 3.0.3 --- pkgs/by-name/op/opencloud-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/opencloud-desktop/package.nix b/pkgs/by-name/op/opencloud-desktop/package.nix index c6c77bd75e74..f0efe95d9d94 100644 --- a/pkgs/by-name/op/opencloud-desktop/package.nix +++ b/pkgs/by-name/op/opencloud-desktop/package.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "opencloud-desktop"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-ILOapZfySDJWZJDVFwNs46SEw/yPpe/+2dctyRl8iJ8="; + hash = "sha256-b6KaWrthL2z/Ep+O7wFIXxjd+H8+sBqZz8nmoQijTQU="; }; buildInputs = [ From 78a9aa59505176730f4582b8ded53fe7b329f6c4 Mon Sep 17 00:00:00 2001 From: Ludovic Ortega Date: Fri, 12 Dec 2025 17:41:04 +0100 Subject: [PATCH 12/74] llvm-vs-code-extensions.lldb-dap: fix typo in downloadPage url Signed-off-by: Ludovic Ortega --- .../extensions/llvm-vs-code-extensions.lldb-dap/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix b/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix index 464d5941db35..5b69faed8bba 100644 --- a/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix +++ b/pkgs/applications/editors/vscode/extensions/llvm-vs-code-extensions.lldb-dap/default.nix @@ -10,7 +10,7 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = { description = "Debugging with LLDB in Visual Studio Code"; - downloadPage = "hhttps://marketplace.visualstudio.com/items?itemName=llvm-vs-code-extensions.lldb-dap"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=llvm-vs-code-extensions.lldb-dap"; homepage = "https://github.com/llvm/llvm-project"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.m0nsterrr ]; From 285bb001a70e655eedd771b900fd432c8f464348 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Dec 2025 17:01:45 +0000 Subject: [PATCH 13/74] python3Packages.coiled: 1.129.3 -> 1.129.4 --- pkgs/development/python-modules/coiled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix index c50db9a69826..7a3d44bd73d2 100644 --- a/pkgs/development/python-modules/coiled/default.nix +++ b/pkgs/development/python-modules/coiled/default.nix @@ -39,12 +39,12 @@ buildPythonPackage rec { pname = "coiled"; - version = "1.129.3"; + version = "1.129.4"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-r1Y6SfU2sfEISYWh7raAXGyT/hcHoGAs0oF92uVkT54="; + hash = "sha256-OGgMfbERVC3PJXLwqVQlNpXZpAAMv6Y87S0kpv6NxLA="; }; build-system = [ From 6e9530df44c66a6517129d30b4e91aa7c16bd26e Mon Sep 17 00:00:00 2001 From: Mario <191101255+wariuccio@users.noreply.github.com> Date: Fri, 12 Dec 2025 17:08:23 +0000 Subject: [PATCH 14/74] maintainers: add wariuccio --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2bf8b3069d0d..a0723f46a4b8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -27852,6 +27852,11 @@ github = "wamserma"; githubId = 60148; }; + wariuccio = { + name = "Wariuccio"; + github = "wariuccio"; + githubId = 191101255; + }; water-sucks = { email = "varun@snare.dev"; name = "Varun Narravula"; From 6400d84511308937a4027418c67173c1b2876cce Mon Sep 17 00:00:00 2001 From: Mario <191101255+wariuccio@users.noreply.github.com> Date: Fri, 12 Dec 2025 17:08:29 +0000 Subject: [PATCH 15/74] python3Packages.miniflux: init at 1.1.4 --- .../python-modules/miniflux/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/miniflux/default.nix diff --git a/pkgs/development/python-modules/miniflux/default.nix b/pkgs/development/python-modules/miniflux/default.nix new file mode 100644 index 000000000000..1a847608f7ac --- /dev/null +++ b/pkgs/development/python-modules/miniflux/default.nix @@ -0,0 +1,34 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + requests, + pytestCheckHook, +}: +buildPythonPackage rec { + pname = "miniflux"; + version = "1.1.4"; + pyproject = true; + + src = fetchFromGitHub { + owner = "miniflux"; + repo = "python-client"; + tag = version; + hash = "sha256-SCam8WiQH0cOUcqMMvhNDaNPGs7hi1RP4x4eoa5WIa4="; + }; + build-system = [ setuptools ]; + + dependencies = [ requests ]; + + pythonImportsCheck = [ "miniflux" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = { + description = "Miniflux Python API Client"; + homepage = "https://github.com/miniflux/python-client"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ wariuccio ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 605d475eae08..e35290615318 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9578,6 +9578,8 @@ self: super: with self; { minidump = callPackage ../development/python-modules/minidump { }; + miniflux = callPackage ../development/python-modules/miniflux { }; + miniful = callPackage ../development/python-modules/miniful { }; minify-html = callPackage ../development/python-modules/minify-html { }; From 1a9ba440b5f3c270b80d96944f67337ab58e1c98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Dec 2025 23:46:55 +0000 Subject: [PATCH 16/74] iwe: 0.0.56 -> 0.0.57 --- pkgs/by-name/iw/iwe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/iw/iwe/package.nix b/pkgs/by-name/iw/iwe/package.nix index fb9951fe0290..9e3893ba4fce 100644 --- a/pkgs/by-name/iw/iwe/package.nix +++ b/pkgs/by-name/iw/iwe/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "iwe"; - version = "0.0.56"; + version = "0.0.57"; src = fetchFromGitHub { owner = "iwe-org"; repo = "iwe"; tag = "iwe-v${finalAttrs.version}"; - hash = "sha256-nEn2iR2/ROboalMAXJV4y8qZiN36QkaWin+sMLZSKMQ="; + hash = "sha256-BtNeTMDttAbozFHIe/hlOkEfIFPUFSDvWsJWY9+hKfk="; }; - cargoHash = "sha256-fi16wLc/ZQV2bJHiIo7HVP+IS8zuoJeQQ7kV0cJ9GZ8="; + cargoHash = "sha256-TvWoleEhjsV73Qfi/yTeje1CawhdETB/dFPlah6aDwY="; cargoBuildFlags = [ "--package=iwe" From e2395cd63edaf78d5d1ad8c1f9c7743449e5cbbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 00:09:06 +0000 Subject: [PATCH 17/74] microsoft-edge: 143.0.3650.66 -> 143.0.3650.80 --- pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index 8f73972ffd68..e470ebce1110 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -162,11 +162,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "143.0.3650.66"; + version = "143.0.3650.80"; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-Oak7r7ykODJsqzdb+cEmzkUrcezTUe+Xl9oo1lUrq6w="; + hash = "sha256-Uoh3cx2Cw7Af4fNiK3sP3vpppjP0vHuMFYK8ngfQjwA="; }; # With strictDeps on, some shebangs were not being patched correctly From 7df16156d49f4ecce57a23ef28d3875e49d1cf31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 00:51:44 +0000 Subject: [PATCH 18/74] oci-cli: 3.71.0 -> 3.71.1 --- pkgs/by-name/oc/oci-cli/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix index dc87d3bee4e3..866177eaf142 100644 --- a/pkgs/by-name/oc/oci-cli/package.nix +++ b/pkgs/by-name/oc/oci-cli/package.nix @@ -25,14 +25,14 @@ in py.pkgs.buildPythonApplication rec { pname = "oci-cli"; - version = "3.71.0"; + version = "3.71.1"; pyproject = true; src = fetchFromGitHub { owner = "oracle"; repo = "oci-cli"; tag = "v${version}"; - hash = "sha256-Yooaq7Jr8uu0yDGoVYhxJittJmMqhUDFSczWbFIyrN0="; + hash = "sha256-vV67ZCvRlykrBJLa77GJ/tjq4YlWmA8Rq4DBlpLZZEE="; }; nativeBuildInputs = [ installShellFiles ]; From d289043eae3bfa1c1b5e6227094220219f985918 Mon Sep 17 00:00:00 2001 From: aleksana Date: Sat, 13 Dec 2025 09:51:18 +0800 Subject: [PATCH 19/74] wike: 3.1.3 -> 3.2.0; fix wike-sp --- pkgs/by-name/wi/wike/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/wi/wike/package.nix b/pkgs/by-name/wi/wike/package.nix index c6864bfc8d79..b01cd436151a 100644 --- a/pkgs/by-name/wi/wike/package.nix +++ b/pkgs/by-name/wi/wike/package.nix @@ -20,14 +20,14 @@ python3Packages.buildPythonApplication rec { pname = "wike"; - version = "3.1.3"; + version = "3.2.0"; pyproject = false; # built with meson src = fetchFromGitHub { owner = "hugolabe"; repo = "Wike"; tag = version; - hash = "sha256-+N9yhzIErFc0z/2JqEtit02GZKqo11viGCLoyQxtxBU="; + hash = "sha256-4J23dUK844ZYQp9LAvaQgN2cnGaPt7eWGOFSAe7WRH8="; }; nativeBuildInputs = [ @@ -58,8 +58,9 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; preFixup = '' makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - - patchShebangs --update $out/share/wike/wike-sp + ''; + postFixup = '' + wrapPythonProgramsIn "$out/share/wike" "$out $pythonPath" ''; passthru = { @@ -68,7 +69,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Wikipedia Reader for the GNOME Desktop"; - homepage = "https://github.com/hugolabe/Wike"; + homepage = "https://hugolabe.github.io/Wike"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ samalws ]; From c82e3515a6cc55d5ca0fd828ff9454acd0fb0797 Mon Sep 17 00:00:00 2001 From: eljamm Date: Sat, 13 Dec 2025 06:37:10 +0000 Subject: [PATCH 20/74] linux_xanmod: 6.12.61 -> 6.12.62 - Changelog: https://dl.xanmod.org/changelog/6.12/ChangeLog-6.12.62-xanmod1.gz - Diff: https://gitlab.com/xanmod/linux/-/compare/6.12.61-xanmod1..6.12.62-xanmod1?from_project_id=51590166 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index f1737bdb50e0..9b64d7d0a161 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,8 +15,8 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.12.61"; - hash = "sha256-7m4Ehmy463rQK265fEvTMjndqZXs+PJ35HE+tZVKgGQ="; + version = "6.12.62"; + hash = "sha256-NAcE8ml7HDhpLNDKZEKlEFwdylRiFte+Gi+uxnlyVHQ="; isLTS = true; }; # ./update-xanmod.sh main From 32856ac21873a5ba742c81c50f88b34a5dea4615 Mon Sep 17 00:00:00 2001 From: eljamm Date: Sat, 13 Dec 2025 06:38:05 +0000 Subject: [PATCH 21/74] linux_xanmod_latest: 6.17.11 -> 6.17.12 - Changelog: https://dl.xanmod.org/changelog/6.17/ChangeLog-6.17.12-xanmod1.gz - Diff: https://gitlab.com/xanmod/linux/-/compare/6.17.11-xanmod1..6.17.12-xanmod1?from_project_id=51590166 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 9b64d7d0a161..d6831801d1fb 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -21,8 +21,8 @@ let }; # ./update-xanmod.sh main main = { - version = "6.17.11"; - hash = "sha256-NJQ67MOjFMScwECxQd00F3SZ+kITbuBp/3imNXdUqlQ="; + version = "6.17.12"; + hash = "sha256-1IdlQEh+BQID91j/KpkJwzM3WMymbw/AXWpcEMitYfs="; }; }; From 2b8775091336dfea9e7ac94825e6afa075214533 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 07:18:30 +0000 Subject: [PATCH 22/74] libretro.flycast: 0-unstable-2025-11-22 -> 0-unstable-2025-12-12 --- pkgs/applications/emulators/libretro/cores/flycast.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix index 761fec17bad3..0b7f425f1ce8 100644 --- a/pkgs/applications/emulators/libretro/cores/flycast.nix +++ b/pkgs/applications/emulators/libretro/cores/flycast.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "flycast"; - version = "0-unstable-2025-11-22"; + version = "0-unstable-2025-12-12"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "1666eb0875613ee16b04e08be8ed89c27dbd5c25"; - hash = "sha256-uQvr4C8iO+3FXh6ki+Rgv7Y/+p1WHwXuqy9Xyq4gSeo="; + rev = "37a9077304908196193b20d5f314dd86fe0578e1"; + hash = "sha256-zYQHP9DohTurAY4j1Vj73YvSHZHXFSsEa30UETORAyA="; fetchSubmodules = true; }; From eeb2ae68536da432198af22b41b3b939e254ccad Mon Sep 17 00:00:00 2001 From: Jost Alemann Date: Sat, 13 Dec 2025 09:42:00 +0100 Subject: [PATCH 23/74] harper: 1.1.0 -> 1.2.0 Changelog: https://github.com/Automattic/harper/releases/tag/v1.2.0 Diff: https://github.com/Automattic/harper/compare/v1.1.0...v1.2.0 --- .../vscode/extensions/elijah-potter.harper/default.nix | 2 +- pkgs/by-name/ha/harper/package.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix index 0eb911d40c5d..e89154ba7ea5 100644 --- a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix +++ b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix @@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "harper"; publisher = "elijah-potter"; version = harper.version; - hash = "sha256-ifOUhBsEtBNGB4m+y6p82ZNk2CAeyTzmgz76GRh+f90="; + hash = "sha256-84yN7qiGaNp9XtLYOOOw1vWkiH9wAH1Tp9rE/8Vpk7A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index 46688f772f7a..fa20362a3df9 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "harper"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${finalAttrs.version}"; - hash = "sha256-Lh612FwMvr3Dn8LxixF+igrLyGYiIFOSRzCpASB8zZ8="; + hash = "sha256-EyS07pkPvXaC5PVHt7T/w3et3Zfbqw4nPQNdif/8I4Y="; }; buildAndTestSubdir = "harper-ls"; - cargoHash = "sha256-lNFxnp1s7WMwgauPGexWc6swVSz8GpAOYJnUszXM3G0="; + cargoHash = "sha256-vNUsos2kI7jitS+1373npE/wS1VkcrFq3h4LvsnXne0="; passthru.updateScript = nix-update-script { }; From 735d0f558eee978b80de86db4a4699a4aa334b25 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 13 Dec 2025 12:38:30 +0100 Subject: [PATCH 24/74] corefonts: fix build with structuredAttrs --- pkgs/by-name/co/corefonts/package.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/co/corefonts/package.nix b/pkgs/by-name/co/corefonts/package.nix index 73bfae46c007..bf7dc985b2c4 100644 --- a/pkgs/by-name/co/corefonts/package.nix +++ b/pkgs/by-name/co/corefonts/package.nix @@ -66,13 +66,15 @@ stdenv.mkDerivation { pname = "corefonts"; version = "1"; - exes = map ( - { name, hash }: - fetchurl { - url = "mirror://sourceforge/corefonts/the%20fonts/final/${name}32.exe"; - inherit hash; - } - ) fonts; + env.exes = toString ( + map ( + { name, hash }: + fetchurl { + url = "mirror://sourceforge/corefonts/the%20fonts/final/${name}32.exe"; + inherit hash; + } + ) fonts + ); nativeBuildInputs = [ cabextract ]; @@ -137,6 +139,8 @@ stdenv.mkDerivation { done ''; + __structuredAttrs = true; + meta = { homepage = "https://corefonts.sourceforge.net/"; description = "Microsoft's TrueType core fonts for the Web"; From baee10e879207d567d390a1978365a38ebf06da0 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 13 Dec 2025 11:22:27 +0000 Subject: [PATCH 25/74] go-sendxmpp: Add nixosTests --- pkgs/by-name/go/go-sendxmpp/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/go/go-sendxmpp/package.nix b/pkgs/by-name/go/go-sendxmpp/package.nix index 5b0073d3c81e..a58ecfac147e 100644 --- a/pkgs/by-name/go/go-sendxmpp/package.nix +++ b/pkgs/by-name/go/go-sendxmpp/package.nix @@ -2,6 +2,7 @@ buildGoModule, fetchFromGitLab, lib, + nixosTests, nix-update-script, versionCheckHook, }: @@ -21,6 +22,7 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-FJjC2WU1DTP8Frk2cj9Adduxv49d9uyt4G8BotzWsYU="; passthru = { + tests = { inherit (nixosTests) ejabberd prosody; }; updateScript = nix-update-script { }; }; From 065b90ec5d70a6a4e9d198a238ec9f743f6f8d21 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 13 Dec 2025 16:28:39 +0100 Subject: [PATCH 26/74] nixos/dovecot: remove option for unit name introspection This was required for downstream projects during the 25.11 development period and can now safely be retired. --- nixos/modules/services/mail/dovecot.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 80397c9fd23c..fd6972283884 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -295,20 +295,6 @@ in enableLmtp = mkEnableOption "starting the LMTP listener (when Dovecot is enabled)"; - hasNewUnitName = mkOption { - type = types.bool; - default = true; - readOnly = true; - internal = true; - description = '' - Inspectable option to confirm that the dovecot module uses the new - `dovecot.service` name, instead of `dovecot2.service`. - - This is a helper added for the nixos-mailserver project and can be - removed after branching off nixos-25.11. - ''; - }; - protocols = mkOption { type = types.listOf types.str; default = [ ]; From e323a8264448bc1b21ed5b0f321e9a695602d207 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 13 Dec 2025 16:30:07 +0100 Subject: [PATCH 27/74] nixos/dovecot: remove dovecot2 alias This was here to ease the migration and can be retired for 26.05. --- nixos/modules/services/mail/dovecot.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index fd6972283884..94e92d233786 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -691,7 +691,6 @@ in environment.etc."dovecot/dovecot.conf".source = cfg.configFile; systemd.services.dovecot = { - aliases = [ "dovecot2.service" ]; description = "Dovecot IMAP/POP3 server"; documentation = [ "man:dovecot(1)" From 384030fff270030eba7d25de92071315c5bbb281 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sat, 13 Dec 2025 16:49:11 +0100 Subject: [PATCH 28/74] gnomeExtensions.icon-hider: remove unused derivation This extension was dropped in #296240 but the derivation was never removed from the tree. --- .../gnome/extensions/icon-hider/default.nix | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 pkgs/desktops/gnome/extensions/icon-hider/default.nix diff --git a/pkgs/desktops/gnome/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix deleted file mode 100644 index 7a7f959b700e..000000000000 --- a/pkgs/desktops/gnome/extensions/icon-hider/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - gnome-shell, -}: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-icon-hider"; - version = "23"; - - src = fetchFromGitHub { - owner = "ikalnytskyi"; - repo = "gnome-shell-extension-icon-hider"; - rev = "v${version}"; - sha256 = "18c8zkdrmdbghqqz7b450vhgpykgz25mgigwn2nggcb2lxmvm9ks"; - }; - - passthru = { - extensionUuid = "icon-hider@kalnitsky.org"; - extensionPortalSlug = "icon-hider"; - }; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r "icon-hider@kalnitsky.org" $out/share/gnome-shell/extensions - runHook postInstall - ''; - - meta = with lib; { - description = "Icon Hider is a GNOME Shell extension for managing status area items"; - license = lib.licenses.bsd3; - maintainers = [ ]; - platforms = gnome-shell.meta.platforms; - homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider"; - broken = versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34 - }; -} From 6534d3771b0580ac47526c01c85278d3fd1da126 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Sat, 13 Dec 2025 17:14:55 +0100 Subject: [PATCH 29/74] nixos/test-driver: Remove single-use trivial utility method --- nixos/lib/test-driver/src/test_driver/machine/__init__.py | 3 --- nixos/tests/mysql/mysql-autobackup.nix | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/nixos/lib/test-driver/src/test_driver/machine/__init__.py b/nixos/lib/test-driver/src/test_driver/machine/__init__.py index 31ea0d1364ae..926b743b17b2 100644 --- a/nixos/lib/test-driver/src/test_driver/machine/__init__.py +++ b/nixos/lib/test-driver/src/test_driver/machine/__init__.py @@ -790,9 +790,6 @@ class Machine: def stop_job(self, jobname: str, user: str | None = None) -> tuple[int, str]: return self.systemctl(f"stop {jobname}", user) - def wait_for_job(self, jobname: str) -> None: - self.wait_for_unit(jobname) - def connect(self) -> None: def shell_ready(timeout_secs: int) -> bool: """We sent some data from the backdoor service running on the guest diff --git a/nixos/tests/mysql/mysql-autobackup.nix b/nixos/tests/mysql/mysql-autobackup.nix index 09de1d46f93c..a28475e84a67 100644 --- a/nixos/tests/mysql/mysql-autobackup.nix +++ b/nixos/tests/mysql/mysql-autobackup.nix @@ -52,7 +52,7 @@ let with subtest("Do a backup and wait for it to start"): machine.start_job("automysqlbackup.service") - machine.wait_for_job("automysqlbackup.service") + machine.wait_for_unit("automysqlbackup.service") with subtest("wait for backup file and check that data appears in backup"): machine.wait_for_file("/var/backup/mysql/daily/testdb") From 5b5b8857867af670014e15d325f764b46abe7846 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 6 Dec 2025 20:15:28 +0100 Subject: [PATCH 30/74] lomiri.gsettings-qt: Migrate from top-level gsettings-qt --- pkgs/desktops/lomiri/default.nix | 1 + .../lomiri/development}/gsettings-qt/default.nix | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{development/libraries => desktops/lomiri/development}/gsettings-qt/default.nix (100%) diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 893165171bb5..fda0ef24c3f6 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -42,6 +42,7 @@ let deviceinfo = callPackage ./development/deviceinfo { }; geonames = callPackage ./development/geonames { }; gmenuharness = callPackage ./development/gmenuharness { }; + gsettings-qt = callPackage ./development/gsettings-qt { }; libusermetrics = callPackage ./development/libusermetrics { }; lomiri-api = callPackage ./development/lomiri-api { }; lomiri-app-launch = callPackage ./development/lomiri-app-launch { }; diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/desktops/lomiri/development/gsettings-qt/default.nix similarity index 100% rename from pkgs/development/libraries/gsettings-qt/default.nix rename to pkgs/desktops/lomiri/development/gsettings-qt/default.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 44d0faa99e6e..72ea5b6baecb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -711,6 +711,7 @@ mapAliases { graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20 gringo = throw "'gringo' has been renamed to/replaced by 'clingo'"; # Converted to throw 2025-10-27 grub2_full = throw "'grub2_full' has been renamed to/replaced by 'grub2'"; # Converted to throw 2025-10-27 + gsettings-qt = lomiri.gsettings-qt; # Added 2025-12-06 gtkcord4 = throw "'gtkcord4' has been renamed to/replaced by 'dissent'"; # Converted to throw 2025-10-27 gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10 guile-disarchive = throw "'guile-disarchive' has been renamed to/replaced by 'disarchive'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e1e26fedd55..2117494b434b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7250,8 +7250,6 @@ with pkgs; goocanvas2 = callPackage ../development/libraries/goocanvas/2.x.nix { }; goocanvas3 = callPackage ../development/libraries/goocanvas/3.x.nix { }; - gsettings-qt = libsForQt5.callPackage ../development/libraries/gsettings-qt { }; - gst_all_1 = recurseIntoAttrs (callPackage ../development/libraries/gstreamer { }); gnutls = callPackage ../development/libraries/gnutls { From dc0c3966d7c8cd938b66457164aef516e047519c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 6 Dec 2025 20:17:23 +0100 Subject: [PATCH 31/74] lomiri.gsettings-qt: Drop romildo from meta.maintainers Maintenance will be taken over by Lomiri team. --- pkgs/desktops/lomiri/development/gsettings-qt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/lomiri/development/gsettings-qt/default.nix b/pkgs/desktops/lomiri/development/gsettings-qt/default.nix index 8501c5477cbe..7705ac5e0ba2 100644 --- a/pkgs/desktops/lomiri/development/gsettings-qt/default.nix +++ b/pkgs/desktops/lomiri/development/gsettings-qt/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/ubports/core/gsettings-qt"; license = lib.licenses.lgpl3; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.romildo ]; + maintainers = [ ]; }; } From c09b50b960510690aa76c20b8392a98c76e5fefc Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 4 Dec 2025 09:23:29 +0100 Subject: [PATCH 32/74] lomiri.gsettings-qt: Modernise --- .../development/gsettings-qt/default.nix | 57 +++++++++++++------ 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/lomiri/development/gsettings-qt/default.nix b/pkgs/desktops/lomiri/development/gsettings-qt/default.nix index 7705ac5e0ba2..2a24f82e830c 100644 --- a/pkgs/desktops/lomiri/development/gsettings-qt/default.nix +++ b/pkgs/desktops/lomiri/development/gsettings-qt/default.nix @@ -2,33 +2,39 @@ lib, stdenv, fetchFromGitLab, + gitUpdater, + testers, + glib, + gobject-introspection, pkg-config, qmake, qtbase, qtdeclarative, - wrapQtAppsHook, - glib, - gobject-introspection, - gitUpdater, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gsettings-qt"; version = "0.2"; src = fetchFromGitLab { - group = "ubports"; - owner = "core"; - repo = "gsettings-qt"; - rev = "v${version}"; - sha256 = "14l8xphw4jd9ckqba13cyxq0i362x8lfsd0zlfawwi2z1q1vqm92"; + owner = "ubports"; + repo = "development/core/gsettings-qt"; + rev = "v${finalAttrs.version}"; + hash = "sha256-IlW8Aw5fRM6Vox807SjqwowIcPdsBLXwZKlJwuHtiJI="; }; + outputs = [ + "out" + "dev" + ]; + + # Current version still uses QMake + strictDeps = false; + nativeBuildInputs = [ pkg-config qmake gobject-introspection - wrapQtAppsHook ]; buildInputs = [ @@ -36,7 +42,10 @@ stdenv.mkDerivation rec { qtdeclarative ]; - patchPhase = '' + # Library + dontWrapQtApps = true; + + postPatch = '' # force ordered build of subdirs sed -i -e "\$aCONFIG += ordered" gsettings-qt.pro @@ -63,15 +72,29 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = gitUpdater { - rev-prefix = "v"; + postInstall = + # QMake-generated pkg-config files, hence fixes being done here + '' + substituteInPlace $out/lib/pkgconfig/gsettings-qt.pc \ + --replace-fail 'prefix=${lib.getDev qtbase}' 'prefix=${placeholder "out"}' \ + --replace-fail 'includedir=${placeholder "out"}' 'includedir=${placeholder "dev"}' + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { + rev-prefix = "v"; + }; }; meta = { description = "Library to access GSettings from Qt"; homepage = "https://gitlab.com/ubports/core/gsettings-qt"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Only; + teams = [ lib.teams.lomiri ]; platforms = lib.platforms.linux; - maintainers = [ ]; + pkgConfigModules = [ + "gsettings-qt" + ]; }; -} +}) From d27e8def02bdbd98218653bb1ca80a253c71d5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ha=CC=88cker?= Date: Sat, 13 Dec 2025 19:12:38 +0100 Subject: [PATCH 33/74] nixos/filesystem: fix doc by-id -> by-label Documentation was wrong, implementation already correct. --- nixos/modules/tasks/filesystems.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 74b3b83f09f7..108c1b495c9e 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -185,7 +185,7 @@ let type = types.nullOr nonEmptyStr; description = '' Label of the device. This simply sets {option}`device` to - `/dev/disk/by-id/''${label}`. Note that devices will not + `/dev/disk/by-label/''${label}`. Note that devices will not have a label unless they contain a filesystem which supports labels, such as ext4 or fat32. ''; From c7042f1ce1585bbff0e8ef806aa17c76b0c735c9 Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Sat, 13 Dec 2025 21:15:54 +0100 Subject: [PATCH 34/74] fabric: add shell completions --- pkgs/by-name/fa/fabric-ai/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index 21b6adf4c32d..61476bdb572f 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + installShellFiles, nix-update-script, }: @@ -26,6 +27,15 @@ buildGoModule rec { "-w" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion \ + --bash ./completions/fabric.bash \ + --zsh ./completions/_fabric \ + --fish ./completions/fabric.fish + ''; + passthru.updateScript = nix-update-script { }; meta = { From ce51c0adc34d4e15b970b42cdb722f307b46de40 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 4 Dec 2025 09:48:50 +0100 Subject: [PATCH 35/74] lomiri.gsettings-qt: 0.2 -> 1.1.0 --- .../development/gsettings-qt/default.nix | 74 ++++++++++--------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/pkgs/desktops/lomiri/development/gsettings-qt/default.nix b/pkgs/desktops/lomiri/development/gsettings-qt/default.nix index 2a24f82e830c..7a836d1f59fc 100644 --- a/pkgs/desktops/lomiri/development/gsettings-qt/default.nix +++ b/pkgs/desktops/lomiri/development/gsettings-qt/default.nix @@ -4,23 +4,23 @@ fetchFromGitLab, gitUpdater, testers, + cmake, + cmake-extras, glib, - gobject-introspection, pkg-config, - qmake, qtbase, qtdeclarative, }: stdenv.mkDerivation (finalAttrs: { pname = "gsettings-qt"; - version = "0.2"; + version = "1.1.0"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/gsettings-qt"; rev = "v${finalAttrs.version}"; - hash = "sha256-IlW8Aw5fRM6Vox807SjqwowIcPdsBLXwZKlJwuHtiJI="; + hash = "sha256-NUrJ3xQnef7TwPa7AIZaiI7TAkMe+nhuEQ/qC1H1Ves="; }; outputs = [ @@ -28,56 +28,58 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; - # Current version still uses QMake - strictDeps = false; + strictDeps = true; nativeBuildInputs = [ + cmake pkg-config - qmake - gobject-introspection + qtdeclarative ]; buildInputs = [ + cmake-extras glib - qtdeclarative ]; # Library dontWrapQtApps = true; - postPatch = '' - # force ordered build of subdirs - sed -i -e "\$aCONFIG += ordered" gsettings-qt.pro + postPatch = + # Upstream renamed WERROR option to ENABLE_WERROR, but forgot this line + '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'if (WERROR)' 'if (ENABLE_WERROR)' + '' + # The usual pkg-config fix + + '' + substituteInPlace src/gsettings-qt.pc.in \ + --replace-fail "\''${prefix}/@CMAKE_INSTALL_LIBDIR@" '@CMAKE_INSTALL_FULL_LIBDIR@' \ + --replace-fail "\''${prefix}/@QT_INCLUDE_DIR@/QGSettings" '@QT_FULL_INCLUDE_DIR@/QGSettings' + '' + # Adjust to where we keep QML modules + + '' + substituteInPlace GSettings/CMakeLists.txt \ + --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt\''${QT_VERSION_MAJOR}/qml" '${placeholder "out"}/${qtbase.qtQmlPrefix}' + ''; - # It seems that there is a bug in qtdeclarative: qmlplugindump fails - # because it can not find or load the Qt platform plugin "minimal". - # A workaround is to set QT_PLUGIN_PATH and QML2_IMPORT_PATH explicitly. - export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} - export QML2_IMPORT_PATH=${qtdeclarative.bin}/${qtbase.qtQmlPrefix} + preBuild = + # For qmlplugindump + '' + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + ''; - substituteInPlace GSettings/gsettings-qt.pro \ - --replace '$$[QT_INSTALL_QML]' "$out/$qtQmlPrefix" \ - --replace '$$[QT_INSTALL_BINS]/qmlplugindump' "qmlplugindump" + cmakeFlags = [ + (lib.cmakeBool "ENABLE_QT6" (lib.strings.versionAtLeast qtbase.version "6")) + (lib.cmakeBool "ENABLE_WERROR" true) + ]; - substituteInPlace src/gsettings-qt.pro \ - --replace '$$[QT_INSTALL_LIBS]' "$out/lib" \ - --replace '$$[QT_INSTALL_HEADERS]' "$out/include" - ''; - - preInstall = '' - # do not install tests - for f in tests/Makefile{,.cpptest}; do - substituteInPlace $f \ - --replace "install: install_target" "install: " - done - ''; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; postInstall = - # QMake-generated pkg-config files, hence fixes being done here + # *Something* is going wrong when the module path doesn't include the version + # https://gitlab.com/ubports/development/core/gsettings-qt/-/merge_requests/7#note_2952471601 '' - substituteInPlace $out/lib/pkgconfig/gsettings-qt.pc \ - --replace-fail 'prefix=${lib.getDev qtbase}' 'prefix=${placeholder "out"}' \ - --replace-fail 'includedir=${placeholder "out"}' 'includedir=${placeholder "dev"}' + mv -v $out/${qtbase.qtQmlPrefix}/GSettings $out/${qtbase.qtQmlPrefix}/GSettings.1.0 ''; passthru = { From 7df5125ae2f7f557ed4752868ecea1d7a59e19f2 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 4 Dec 2025 10:34:01 +0100 Subject: [PATCH 36/74] lomiri.lomiri-content-hub: Fix compat with newer gsettings-qt --- pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix index 9597f4176cc8..472c4de0d005 100644 --- a/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix +++ b/pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix @@ -59,6 +59,10 @@ stdenv.mkDerivation (finalAttrs: { # Don't override default theme search path (which honours XDG_DATA_DIRS) with a FHS assumption substituteInPlace import/Lomiri/Content/contenthubplugin.cpp \ --replace-fail 'QIcon::setThemeSearchPaths(QStringList() << ("/usr/share/icons/"));' "" + + # https://gitlab.com/ubports/development/core/lomiri-content-hub/-/merge_requests/54 + substituteInPlace src/com/lomiri/content/service/registry.h \ + --replace-fail '' '' ''; strictDeps = true; From 674dc8be57540f2ccaf3deb96dc6a60d97921043 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 13 Dec 2025 19:13:20 +0100 Subject: [PATCH 37/74] lomiri.libusermetrics: Fix compat with newer gsettings-qt --- pkgs/desktops/lomiri/development/libusermetrics/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/desktops/lomiri/development/libusermetrics/default.nix b/pkgs/desktops/lomiri/development/libusermetrics/default.nix index 4be4ab92d133..4ae7541b553a 100644 --- a/pkgs/desktops/lomiri/development/libusermetrics/default.nix +++ b/pkgs/desktops/lomiri/development/libusermetrics/default.nix @@ -49,6 +49,10 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace doc/CMakeLists.txt \ --replace-fail "\''${CMAKE_INSTALL_FULL_DATAROOTDIR}/doc/libusermetrics-doc" "\''${CMAKE_INSTALL_DOCDIR}" + + # https://gitlab.com/ubports/development/core/libusermetrics/-/merge_requests/22 + substituteInPlace src/libusermetricsoutput/GSettingsColorThemeProvider.h \ + --replace-fail '' '' ''; strictDeps = true; From 698fd47c44e043476e3f406c944b058326d6eb8a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 13 Dec 2025 19:13:53 +0100 Subject: [PATCH 38/74] lomiri.lomiri-system-settings: Fix compat with newer gsettings-qt --- .../lomiri/applications/lomiri-system-settings/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix index a51ddf0e4644..ccd744d9a239 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix @@ -88,6 +88,12 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'Icon=@SETTINGS_SHARE_DIR@/system-settings.svg' 'Icon=lomiri-system-settings' \ --replace-fail 'X-Lomiri-Splash-Image=@SETTINGS_SHARE_DIR@/system-settings-app-splash.svg' 'X-Lomiri-Splash-Image=lomiri-app-launch/splash/lomiri-system-settings.svg' \ --replace-fail 'X-Screenshot=@SETTINGS_SHARE_DIR@/screenshot.png' 'X-Screenshot=lomiri-app-launch/screenshot/lomiri-system-settings.png' + + # https://gitlab.com/ubports/development/core/lomiri-system-settings/-/merge_requests/525 + substituteInPlace \ + plugins/notifications/click_applications_model.h \ + plugins/notifications/general_notification_settings.h \ + --replace-fail '' '' ''; strictDeps = true; From 90fc633f0c790ba9f002578fa2fb38ae6ecaca08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Dec 2025 23:36:29 +0000 Subject: [PATCH 39/74] python3Packages.ripser: 0.6.13 -> 0.6.14 --- pkgs/development/python-modules/ripser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 86284af34989..2a18ef66991b 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "ripser"; - version = "0.6.13"; + version = "0.6.14"; pyproject = true; src = fetchFromGitHub { owner = "scikit-tda"; repo = "ripser.py"; tag = "v${version}"; - hash = "sha256-m6EJrz0RBuKlzDX41Gm/W2k71YQK9CgfZN4o84cQYCs="; + hash = "sha256-p47vhrG8+B226/no4PD7+XFNccbNJvi45Luwu287ygI="; }; build-system = [ From d98c92a36ae7d9298ec05ea266d3323905693a24 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 00:50:23 +0000 Subject: [PATCH 40/74] python3Packages.geodatasets: 2024.8.0 -> 2025.12.0 --- pkgs/development/python-modules/geodatasets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/geodatasets/default.nix b/pkgs/development/python-modules/geodatasets/default.nix index c6f941755078..ce2ac4e968c0 100644 --- a/pkgs/development/python-modules/geodatasets/default.nix +++ b/pkgs/development/python-modules/geodatasets/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "geodatasets"; - version = "2024.8.0"; + version = "2025.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "geopandas"; repo = "geodatasets"; tag = version; - hash = "sha256-GJ7RyFlohlRz0RbQ80EewZUmIX9CJkSfUMY/uMNTtEM="; + hash = "sha256-F5cGmcUKbIy35Lx50WFV7hVDmWwWCk66EScx8YW2OTE="; }; build-system = [ setuptools-scm ]; From 960d82bfc44f817c56c7ecd9284cf0f294e0a4ad Mon Sep 17 00:00:00 2001 From: Ohjne Date: Sat, 13 Dec 2025 20:55:27 -0600 Subject: [PATCH 41/74] vimPlugins.gruvbox-alabaster-nvim: init at 2025-12-08 --- pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 5a590676409b..e21822600e14 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -6036,6 +6036,19 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + gruvbox-alabaster-nvim = buildVimPlugin { + pname = "gruvbox-alabaster.nvim"; + version = "2025-12-08"; + src = fetchFromGitHub { + owner = "Xoconoch"; + repo = "gruvbox-alabaster.nvim"; + rev = "246822279aa2c23b9374c5aee8ee71dbc06d26e6"; + sha256 = "0l5r429al3m6l65lvq6mlvbgpga8081swpigixhbm5sw728npfhz"; + }; + meta.homepage = "https://github.com/Xoconoch/gruvbox-alabaster.nvim/"; + meta.hydraPlatforms = [ ]; + }; + gruvbox-baby = buildVimPlugin { pname = "gruvbox-baby"; version = "2024-01-25"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index df818b9d1532..4a569fc7aeae 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -462,6 +462,7 @@ https://github.com/liuchengxu/graphviz.vim/,, https://github.com/cbochs/grapple.nvim/,HEAD, https://github.com/blazkowolf/gruber-darker.nvim/,, https://github.com/morhetz/gruvbox/,, +https://github.com/Xoconoch/gruvbox-alabaster.nvim/,HEAD, https://github.com/luisiacc/gruvbox-baby/,HEAD, https://github.com/gruvbox-community/gruvbox/,,gruvbox-community https://github.com/eddyekofo94/gruvbox-flat.nvim/,, From 7f83c01c11815cd47b961ee1ef752ffbb8dca524 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 03:51:41 +0000 Subject: [PATCH 42/74] home-assistant-custom-components.daikin_onecta: 4.4.1 -> 4.4.2 --- .../custom-components/daikin_onecta/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix index 32eb1f9766f3..6b0a280c6166 100644 --- a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix +++ b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "jwillemsen"; domain = "daikin_onecta"; - version = "4.4.1"; + version = "4.4.2"; src = fetchFromGitHub { owner = "jwillemsen"; repo = "daikin_onecta"; tag = "v${version}"; - hash = "sha256-CGPc/6hpt+pBZtsNvyKffMwJkFNCPFajRiSMVwbXnls="; + hash = "sha256-rUvLLZFe2DMQ83/NVeFRBa1T1Z4t8BUmSUP3afS6RxQ="; }; meta = { From 4003ebd37cdd80e5d190dbe7ccf2e55f388c8a31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 05:15:26 +0000 Subject: [PATCH 43/74] rattler-build: 0.53.0 -> 0.54.0 --- pkgs/by-name/ra/rattler-build/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/rattler-build/package.nix b/pkgs/by-name/ra/rattler-build/package.nix index 9c173ae1f5f6..685df9511545 100644 --- a/pkgs/by-name/ra/rattler-build/package.nix +++ b/pkgs/by-name/ra/rattler-build/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rattler-build"; - version = "0.53.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "rattler-build"; tag = "v${finalAttrs.version}"; - hash = "sha256-QxFAHfaAM0lkfunY3Qte86S0sn26mZ59ix7y9QsKQp4="; + hash = "sha256-knbku4ckTe/iQUzixpZoraY6+tttpSlCmb6VLtVy+Bc="; }; - cargoHash = "sha256-JKaprdd6P7Bm9MLMZuDr5HTbuvwpPJOJ/4EGLvjn9iE="; + cargoHash = "sha256-6qCh+7aiVBOps6WEQ33395dzEx3mnwI7/qNQXvs+E+I="; doCheck = false; # test requires network access From 24c8501580e0e0c9dd36be8d870833d510ddc1d4 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Sun, 14 Dec 2025 06:19:40 +0000 Subject: [PATCH 44/74] bpftrace: 0.24.1 -> 0.24.2 Diff: https://github.com/bpftrace/bpftrace/compare/v0.24.1...v0.24.2 Changelog: https://github.com/bpftrace/bpftrace/releases/tag/v0.24.2 Signed-off-by: Muhammad Falak R Wani --- pkgs/by-name/bp/bpftrace/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix index 8ca62fb0ea9f..274a489c2c52 100644 --- a/pkgs/by-name/bp/bpftrace/package.nix +++ b/pkgs/by-name/bp/bpftrace/package.nix @@ -23,24 +23,15 @@ stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "bpftrace"; repo = "bpftrace"; rev = "v${version}"; - hash = "sha256-Wt1MXKOg48477HMszq1GAjs+ZELbfAfp+P2AYa+dg+Q="; + hash = "sha256-LkiHwmKU+TOtn6mDvlqIKvSOQaU320aVQOkcElzB7gM="; }; - patches = [ - (fetchpatch { - name = "attach_tracepoint_with_enums.patch"; - url = "https://github.com/bpftrace/bpftrace/pull/4714.patch"; - includes = [ "src/ast/passes/clang_parser.cpp" ]; - hash = "sha256-xk+/eBNJJJSUqNTs0HFr0BAaqRB5B7CNWRSmnoBMTs0="; - }) - ]; - buildInputs = with llvmPackages; [ llvm libclang From cdb5c801b39d6dda4cc23da412b82dcc69e847dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 06:24:44 +0000 Subject: [PATCH 45/74] libretro.play: 0-unstable-2025-11-03 -> 0-unstable-2025-12-10 --- pkgs/applications/emulators/libretro/cores/play.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index b79d1979bc1d..a05e6a688882 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2025-11-03"; + version = "0-unstable-2025-12-10"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "77c62d3a942e219bc9d072b4800fa0881208ce2a"; - hash = "sha256-ROrANubftSJwGl9THdAIRhSFOy1uHZ6v2kAmYWLDhN0="; + rev = "6400e0f0d8a1e2345def663bc646e8adc0e42e76"; + hash = "sha256-2hmeEuO+Z0FDyDYiA59ntXl24B5OcLWuvxbiLLfiWE8="; fetchSubmodules = true; }; From ab1889dd8d405c5b7a5fad9a45a0082644a79143 Mon Sep 17 00:00:00 2001 From: LuckShiba Date: Fri, 12 Dec 2025 02:04:46 -0300 Subject: [PATCH 46/74] teams/danklinux: init --- maintainers/team-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 6d09fe0932b7..be89875bead4 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -251,6 +251,15 @@ with lib.maintainers; shortName = "Cyberus Technology employees"; }; + danklinux = { + members = [ + luckshiba + marcusramberg + ]; + scope = "Maintain DankMaterialShell and related packages and modules from Dank Linux."; + shortName = "Dank Linux"; + }; + darwin = { github = "darwin-core"; enableFeatureFreezePing = true; From e60e3f9ded96318fdf6a1c079541b1013536e7f4 Mon Sep 17 00:00:00 2001 From: LuckShiba Date: Fri, 12 Dec 2025 02:24:25 -0300 Subject: [PATCH 47/74] teams/danklinux: inherit packages and modules --- nixos/modules/programs/dsearch.nix | 2 +- nixos/modules/programs/wayland/dms-shell.nix | 2 +- pkgs/by-name/dg/dgop/package.nix | 2 +- pkgs/by-name/dm/dms-shell/package.nix | 2 +- pkgs/by-name/ds/dsearch/package.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/programs/dsearch.nix b/nixos/modules/programs/dsearch.nix index c6d7509c91dd..a719631312be 100644 --- a/nixos/modules/programs/dsearch.nix +++ b/nixos/modules/programs/dsearch.nix @@ -49,5 +49,5 @@ in systemd.user.services.dsearch.wantedBy = mkIf cfg.systemd.enable [ cfg.systemd.target ]; }; - meta.maintainers = with lib.maintainers; [ luckshiba ]; + meta.maintainers = lib.teams.danklinux.maintainers; } diff --git a/nixos/modules/programs/wayland/dms-shell.nix b/nixos/modules/programs/wayland/dms-shell.nix index a49330fddcf5..15a8c01d03e7 100644 --- a/nixos/modules/programs/wayland/dms-shell.nix +++ b/nixos/modules/programs/wayland/dms-shell.nix @@ -198,5 +198,5 @@ in hardware.graphics.enable = lib.mkDefault true; }; - meta.maintainers = with lib.maintainers; [ luckshiba ]; + meta.maintainers = lib.teams.danklinux.maintainers; } diff --git a/pkgs/by-name/dg/dgop/package.nix b/pkgs/by-name/dg/dgop/package.nix index 406d29a53772..f3552c6c04f9 100644 --- a/pkgs/by-name/dg/dgop/package.nix +++ b/pkgs/by-name/dg/dgop/package.nix @@ -45,7 +45,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/AvengeMedia/dgop"; changelog = "https://github.com/AvengeMedia/dgop/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ luckshiba ]; + teams = [ lib.teams.danklinux ]; mainProgram = "dgop"; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/dm/dms-shell/package.nix b/pkgs/by-name/dm/dms-shell/package.nix index deba3b5218bd..5d49076a30c1 100644 --- a/pkgs/by-name/dm/dms-shell/package.nix +++ b/pkgs/by-name/dm/dms-shell/package.nix @@ -67,7 +67,7 @@ buildGoModule (finalAttrs: { homepage = "https://danklinux.com"; changelog = "https://github.com/AvengeMedia/DankMaterialShell/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ luckshiba ]; + teams = [ lib.teams.danklinux ]; mainProgram = "dms"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ds/dsearch/package.nix b/pkgs/by-name/ds/dsearch/package.nix index 18056b4016db..7030edcb7213 100644 --- a/pkgs/by-name/ds/dsearch/package.nix +++ b/pkgs/by-name/ds/dsearch/package.nix @@ -47,7 +47,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/AvengeMedia/danksearch"; changelog = "https://github.com/AvengeMedia/danksearch/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ luckshiba ]; + teams = [ lib.teams.danklinux ]; mainProgram = "dsearch"; platforms = lib.platforms.unix; }; From f2d16d9418755e83c0c234a29df6656dffb4638b Mon Sep 17 00:00:00 2001 From: LuckShiba Date: Sat, 13 Dec 2025 18:53:43 -0300 Subject: [PATCH 48/74] dms-shell: 0.6.2 -> 1.0.2 --- pkgs/by-name/dm/dms-shell/package.nix | 128 ++++++++++++++++---------- 1 file changed, 78 insertions(+), 50 deletions(-) diff --git a/pkgs/by-name/dm/dms-shell/package.nix b/pkgs/by-name/dm/dms-shell/package.nix index 5d49076a30c1..d317b77c9637 100644 --- a/pkgs/by-name/dm/dms-shell/package.nix +++ b/pkgs/by-name/dm/dms-shell/package.nix @@ -7,68 +7,96 @@ procps, nix-update-script, bashNonInteractive, + fprintd, + kdePackages, + qt6, }: -buildGoModule (finalAttrs: { - pname = "dms-shell"; - version = "0.6.2"; +buildGoModule ( + finalAttrs: + let + qmlPkgs = with kdePackages; [ + kirigami.unwrapped + sonnet + qtmultimedia + ]; - src = fetchFromGitHub { - owner = "AvengeMedia"; - repo = "DankMaterialShell"; - tag = "v${finalAttrs.version}"; - hash = "sha256-dLbiTWsKoF0if/Wqet/+L90ILdAaBqp+REGOou8uH3k="; - }; + qmlImportPath = lib.concatStringsSep ":" (map (o: "${o}/${qt6.qtbase.qtQmlPrefix}") qmlPkgs); + qtPluginPath = lib.concatStringsSep ":" (map (o: "${o}/${qt6.qtbase.qtPluginPrefix}") qmlPkgs); + in + { + pname = "dms-shell"; + version = "1.0.2"; - sourceRoot = "${finalAttrs.src.name}/core"; + src = fetchFromGitHub { + owner = "AvengeMedia"; + repo = "DankMaterialShell"; + tag = "v${finalAttrs.version}"; + hash = "sha256-rWjWYu5rs3ZOJ4YJpvIscBZSYu74thJHc0VYyYKJTUc="; + }; - vendorHash = "sha256-nc4CvEPfJ6l16/zmhnXr1jqpi6BeSXd3g/51djbEfpQ="; + sourceRoot = "${finalAttrs.src.name}/core"; - ldflags = [ - "-w" - "-s" - "-X main.Version=${finalAttrs.version}" - ]; + vendorHash = "sha256-2PCqiW4frxME8IlmwWH5ktznhd/G1bah5Ae4dp0HPTQ="; - subPackages = [ "cmd/dms" ]; + ldflags = [ + "-s" + "-w" + "-X main.Version=${finalAttrs.version}" + ]; - nativeBuildInputs = [ - installShellFiles - makeWrapper - ]; + subPackages = [ "cmd/dms" ]; - postInstall = '' - mkdir -p $out/share/quickshell - cp -r ${finalAttrs.src}/quickshell $out/share/quickshell/dms + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; - wrapProgram $out/bin/dms --add-flags "-c $out/share/quickshell/dms" + postInstall = '' + mkdir -p $out/share/quickshell/dms + cp -r ${finalAttrs.src}/quickshell/. $out/share/quickshell/dms/ - install -Dm644 ${finalAttrs.src}/quickshell/assets/systemd/dms.service \ - $out/lib/systemd/user/dms.service - substituteInPlace $out/lib/systemd/user/dms.service \ - --replace-fail /usr/bin/dms $out/bin/dms \ - --replace-fail /usr/bin/pkill ${procps}/bin/pkill + install -D ${finalAttrs.src}/assets/dms-open.desktop \ + $out/share/applications/dms-open.desktop + install -D ${finalAttrs.src}/core/assets/danklogo.svg \ + $out/share/hicolor/scalable/apps/danklogo.svg - substituteInPlace $out/share/quickshell/dms/Modules/Greetd/assets/dms-greeter \ - --replace-fail /bin/bash ${bashNonInteractive}/bin/bash + wrapProgram $out/bin/dms \ + --add-flags "-c $out/share/quickshell/dms" \ + --prefix "NIXPKGS_QT6_QML_IMPORT_PATH" ":" "${qmlImportPath}" \ + --prefix "QT_PLUGIN_PATH" ":" "${qtPluginPath}" - installShellCompletion --cmd dms \ - --bash <($out/bin/dms completion bash) \ - --fish <($out/bin/dms completion fish) \ - --zsh <($out/bin/dms completion zsh) - ''; + install -Dm644 ${finalAttrs.src}/assets/systemd/dms.service \ + $out/lib/systemd/user/dms.service - passthru = { - updateScript = nix-update-script { }; - }; + substituteInPlace $out/lib/systemd/user/dms.service \ + --replace-fail /usr/bin/dms $out/bin/dms \ + --replace-fail /usr/bin/pkill ${procps}/bin/pkill - meta = { - description = "Desktop shell for wayland compositors built with Quickshell & GO"; - homepage = "https://danklinux.com"; - changelog = "https://github.com/AvengeMedia/DankMaterialShell/releases/tag/v${finalAttrs.version}"; - license = lib.licenses.mit; - teams = [ lib.teams.danklinux ]; - mainProgram = "dms"; - platforms = lib.platforms.linux; - }; -}) + substituteInPlace $out/share/quickshell/dms/Modules/Greetd/assets/dms-greeter \ + --replace-fail /bin/bash ${bashNonInteractive}/bin/bash + + substituteInPlace $out/share/quickshell/dms/assets/pam/fprint \ + --replace-fail pam_fprintd.so ${fprintd}/lib/security/pam_fprintd.so + + installShellCompletion --cmd dms \ + --bash <($out/bin/dms completion bash) \ + --fish <($out/bin/dms completion fish) \ + --zsh <($out/bin/dms completion zsh) + ''; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "DankMaterialShell - Desktop shell for wayland compositors built with Quickshell & GO"; + homepage = "https://danklinux.com"; + changelog = "https://github.com/AvengeMedia/DankMaterialShell/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + teams = [ lib.teams.danklinux ]; + mainProgram = "dms"; + platforms = lib.platforms.linux; + }; + } +) From e9b36b8ab908f1431012c93756d206262112987a Mon Sep 17 00:00:00 2001 From: LuckShiba Date: Sat, 13 Dec 2025 18:55:53 -0300 Subject: [PATCH 49/74] nixos/dms-shell: update to dms-shell 1.0.2 --- nixos/modules/programs/wayland/dms-shell.nix | 130 ++++++++++++------- 1 file changed, 80 insertions(+), 50 deletions(-) diff --git a/nixos/modules/programs/wayland/dms-shell.nix b/nixos/modules/programs/wayland/dms-shell.nix index 15a8c01d03e7..48d180dc50a0 100644 --- a/nixos/modules/programs/wayland/dms-shell.nix +++ b/nixos/modules/programs/wayland/dms-shell.nix @@ -14,10 +14,20 @@ let types optional optionals + mapAttrs + mapAttrs' + filterAttrs ; cfg = config.programs.dms-shell; + path = [ + "programs" + "dms-shell" + ]; + + builtInRemovedMsg = "This is now built-in in DMS and doesn't need additional dependencies."; + optionalPackages = optionals cfg.enableSystemMonitoring [ pkgs.dgop ] ++ optionals cfg.enableClipboard [ @@ -28,20 +38,33 @@ let pkgs.glib pkgs.networkmanager ] - ++ optional cfg.enableBrightnessControl pkgs.brightnessctl - ++ optional cfg.enableColorPicker pkgs.hyprpicker ++ optional cfg.enableDynamicTheming pkgs.matugen ++ optional cfg.enableAudioWavelength pkgs.cava - ++ optional cfg.enableCalendarEvents pkgs.khal - ++ optional cfg.enableSystemSound pkgs.kdePackages.qtmultimedia; + ++ optional cfg.enableCalendarEvents pkgs.khal; in { + imports = [ + (lib.mkRemovedOptionModule (path ++ [ "enableBrightnessControl" ]) builtInRemovedMsg) + (lib.mkRemovedOptionModule (path ++ [ "enableColorPicker" ]) builtInRemovedMsg) + (lib.mkRemovedOptionModule ( + path ++ [ "enableSystemSound" ] + ) "qtmultimedia is now included on dms-shell package.") + ]; + options.programs.dms-shell = { enable = mkEnableOption "DankMaterialShell, a complete desktop shell for Wayland compositors"; package = mkPackageOption pkgs "dms-shell" { }; systemd = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable DankMaterialShell systemd startup service. + ''; + }; + target = mkOption { type = types.str; default = "graphical-session.target"; @@ -98,28 +121,6 @@ in ''; }; - enableBrightnessControl = mkOption { - type = types.bool; - default = true; - description = '' - Whether to install dependencies required for brightness and backlight control. - This enables screen brightness adjustment widgets. - - Requires: brightnessctl - ''; - }; - - enableColorPicker = mkOption { - type = types.bool; - default = true; - description = '' - Whether to install dependencies required for color picking functionality. - This enables on-screen color picker tools. - - Requires: hyprpicker - ''; - }; - enableDynamicTheming = mkOption { type = types.bool; default = true; @@ -153,48 +154,77 @@ in ''; }; - enableSystemSound = mkOption { - type = types.bool; - default = true; - description = '' - Whether to install dependencies required for system sound support. - This enables audio playback for system notifications and events. - - Requires: qtmultimedia - ''; - }; - quickshell = { package = mkPackageOption pkgs "quickshell" { }; }; + + plugins = mkOption { + type = types.attrsOf ( + types.submodule { + options = { + enable = mkOption { + type = types.bool; + default = true; + description = "Whether to enable this plugin"; + }; + src = mkOption { + type = types.either types.package types.path; + description = "Source of the plugin package or path"; + }; + }; + } + ); + default = { }; + description = "DMS Plugins to install and enable"; + example = lib.literalExpression '' + { + DockerManager = { + src = pkgs.fetchFromGitHub { + owner = "LuckShiba"; + repo = "DmsDockerManager"; + rev = "v1.2.0"; + sha256 = "sha256-VoJCaygWnKpv0s0pqTOmzZnPM922qPDMHk4EPcgVnaU="; + }; + }; + AnotherPlugin = { + enable = true; + src = pkgs.another-plugin; + }; + } + ''; + }; }; config = mkIf cfg.enable { - environment.etc."xdg/quickshell/dms".source = "${cfg.package}/share/quickshell/dms"; + systemd.packages = lib.mkIf cfg.systemd.enable [ cfg.package ]; - systemd.packages = [ cfg.package ]; - - systemd.user.services.dms = { + systemd.user.services.dms = lib.mkIf cfg.systemd.enable { wantedBy = [ cfg.systemd.target ]; - restartTriggers = optional cfg.systemd.restartIfChanged "${cfg.package}/share/quickshell/dms"; + restartIfChanged = cfg.systemd.restartIfChanged; path = lib.mkForce [ ]; }; environment.systemPackages = [ cfg.package cfg.quickshell.package - pkgs.ddcutil - pkgs.libsForQt5.qt5ct - pkgs.kdePackages.qt6ct ] ++ optionalPackages; - fonts.packages = with pkgs; [ - fira-code - inter - material-symbols - ]; + environment.etc = + mapAttrs' + (name: value: { + name = "xdg/quickshell/dms-plugins/${name}"; + inherit value; + }) + ( + mapAttrs (name: plugin: { + source = plugin.src; + }) (filterAttrs (n: v: v.enable) cfg.plugins) + ); + services.power-profiles-daemon.enable = lib.mkDefault true; + services.accounts-daemon.enable = lib.mkDefault true; + hardware.i2c.enable = lib.mkDefault true; hardware.graphics.enable = lib.mkDefault true; }; From 0de2873a44048f045695efb58ec198c74f7d1bf6 Mon Sep 17 00:00:00 2001 From: LuckShiba Date: Sat, 13 Dec 2025 18:56:06 -0300 Subject: [PATCH 50/74] nixos/dms-greeter: update to dms-shell 1.0.2 --- .../services/display-managers/dms-greeter.nix | 113 ++++++++++++------ 1 file changed, 75 insertions(+), 38 deletions(-) diff --git a/nixos/modules/services/display-managers/dms-greeter.nix b/nixos/modules/services/display-managers/dms-greeter.nix index 1355291516fa..246a02ea414f 100644 --- a/nixos/modules/services/display-managers/dms-greeter.nix +++ b/nixos/modules/services/display-managers/dms-greeter.nix @@ -13,16 +13,19 @@ let mkIf mkDefault mkPackageOption + mkRemovedOptionModule literalExpression getExe makeBinPath optionalString - concatMapStringsSep + escapeShellArgs ; cfg = config.services.displayManager.dms-greeter; cfgAutoLogin = config.services.displayManager.autoLogin; + cacheDir = "/var/lib/dms-greeter"; + greeterScript = pkgs.writeShellScriptBin "dms-greeter-start" '' export PATH=$PATH:${ makeBinPath [ @@ -30,18 +33,28 @@ let config.programs.${cfg.compositor.name}.package ] } - exec ${cfg.package}/share/quickshell/dms/Modules/Greetd/assets/dms-greeter \ - --command ${cfg.compositor.name} \ - -p ${cfg.package}/share/quickshell/dms \ - --cache-dir /var/lib/dms-greeter \ - ${ - optionalString ( - cfg.compositor.customConfig != "" - ) "-C ${pkgs.writeText "dms-greeter-compositor-config" cfg.compositor.customConfig}" - } \ - ${optionalString cfg.logs.save ">> ${cfg.logs.path} 2>&1"} + ${ + escapeShellArgs ( + [ + "sh" + "${cfg.package}/share/quickshell/dms/Modules/Greetd/assets/dms-greeter" + "--cache-dir" + cacheDir + "--command" + cfg.compositor.name + "-p" + "${cfg.package}/share/quickshell/dms" + ] + ++ lib.optionals (cfg.compositor.customConfig != "") [ + "-C" + "${pkgs.writeText "dmsgreeter-compositor-config" cfg.compositor.customConfig}" + ] + ) + } ${optionalString cfg.logs.save "> ${cfg.logs.path} 2>&1"} ''; + jq = getExe pkgs.jq; + configFilesFromHome = if cfg.configHome != null then [ @@ -180,7 +193,7 @@ in ]; services.greetd = { - enable = true; + enable = mkDefault true; settings = { default_session = { user = "dms-greeter"; @@ -200,7 +213,7 @@ in material-symbols ]; - systemd.tmpfiles.settings."10-dms-greeter"."/var/lib/dms-greeter".d = { + systemd.tmpfiles.settings."10-dms-greeter".${cacheDir}.d = { user = "dms-greeter"; group = "dms-greeter"; mode = "0750"; @@ -211,40 +224,64 @@ in allConfigFiles = cfg.configFiles ++ configFilesFromHome; in '' - set -euo pipefail - - cd /var/lib/dms-greeter || exit 1 - - ${concatMapStringsSep "\n" (f: '' - if [[ -f "${f}" ]]; then - cp "${f}" . || true - fi - '') allConfigFiles} - - # Handle session.json wallpaper path - if [[ -f session.json ]]; then - if wallpaper=$(${getExe pkgs.jq} -r '.wallpaperPath' session.json 2>/dev/null); then - if [[ -f "$wallpaper" ]]; then - cp "$wallpaper" wallpaper.jpg || true - mv session.json session.orig.json - ${getExe pkgs.jq} '.wallpaperPath = "/var/lib/dms-greeter/wallpaper.jpg"' \ - session.orig.json > session.json || true + cd ${cacheDir} + ${lib.concatStringsSep "\n" ( + lib.map (f: '' + if [ -f "${f}" ]; then + cp "${f}" . fi - fi + '') allConfigFiles + )} + + if [ -f session.json ]; then + copy_wallpaper() { + local path=$(${jq} -r ".$1 // empty" session.json) + if [ -f "$path" ]; then + cp "$path" "$2" + ${jq} ".$1 = \"${cacheDir}/$2\"" session.json > session.tmp + mv session.tmp session.json + fi + } + + copy_monitor_wallpapers() { + ${jq} -r ".$1 // {} | to_entries[] | .key + \":\" + .value" session.json 2>/dev/null | while IFS=: read monitor path; do + local dest="$2-$(echo "$monitor" | tr -c '[:alnum:]' '-')" + if [ -f "$path" ]; then + cp "$path" "$dest" + ${jq} --arg m "$monitor" --arg p "${cacheDir}/$dest" ".$1[\$m] = \$p" session.json > session.tmp + mv session.tmp session.json + fi + done + } + + copy_wallpaper "wallpaperPath" "wallpaper" + copy_wallpaper "wallpaperPathLight" "wallpaper-light" + copy_wallpaper "wallpaperPathDark" "wallpaper-dark" + copy_monitor_wallpapers "monitorWallpapers" "wallpaper-monitor" + copy_monitor_wallpapers "monitorWallpapersLight" "wallpaper-monitor-light" + copy_monitor_wallpapers "monitorWallpapersDark" "wallpaper-monitor-dark" fi - # Rename colors file if it exists - [[ -f dms-colors.json ]] && mv dms-colors.json colors.json || true + if [ -f settings.json ]; then + if cp "$(${jq} -r '.customThemeFile' settings.json)" custom-theme.json; then + mv settings.json settings.orig.json + ${jq} '.customThemeFile = "${cacheDir}/custom-theme.json"' settings.orig.json > settings.json + fi + fi - # Fix ownership of all files - chown -R "dms-greeter:dms-greeter" . || true + mv dms-colors.json colors.json || : + chown dms-greeter:dms-greeter * || : ''; + services.displayManager.dms-greeter.configFiles = lib.mkIf ( + cfg.configHome != null + ) configFilesFromHome; + users.groups.dms-greeter = { }; users.users.dms-greeter = { description = "DankMaterialShell greeter user"; isSystemUser = true; - home = "/var/lib/dms-greeter"; + home = cacheDir; homeMode = "0750"; createHome = true; group = "dms-greeter"; @@ -257,5 +294,5 @@ in services.libinput.enable = mkDefault true; }; - meta.maintainers = with lib.maintainers; [ luckshiba ]; + meta.maintainers = lib.teams.danklinux.maintainers; } From e25f99a9380fe9b084c1a1884d931ed929396d4a Mon Sep 17 00:00:00 2001 From: LuckShiba Date: Sat, 13 Dec 2025 21:43:24 -0300 Subject: [PATCH 51/74] nixos/release-notes: add entries for dms-shell, dms-greeter, and dsearch modules --- nixos/doc/manual/release-notes/rl-2605.section.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index d6aa01e7019c..cd40062aca34 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -20,6 +20,12 @@ - [LibreChat](https://www.librechat.ai/), open-source self-hostable ChatGPT clone with Agents and RAG APIs. Available as [services.librechat](#opt-services.librechat.enable). +- [DankMaterialShell](https://danklinux.com), a complete desktop shell for Wayland compositors built with Quickshell. Available as [programs.dms-shell](#opt-programs.dms-shell.enable). + +- [dms-greeter](https://danklinux.com), a modern display manager greeter for DankMaterialShell that works with greetd and supports multiple Wayland compositors. Available as [services.displayManager.dms-greeter](#opt-services.displayManager.dms-greeter.enable). + +- [dsearch](https://github.com/AvengeMedia/danksearch), a fast filesystem search service with fuzzy matching. Available as [programs.dsearch](#opt-programs.dsearch.enable). + - [udp-over-tcp](https://github.com/mullvad/udp-over-tcp), a tunnel for proxying UDP traffic over a TCP stream. Available as `services.udp-over-tcp`. - [Komodo Periphery](https://github.com/moghtech/komodo), a multi-server Docker and Git deployment agent by Komodo. Available as [services.komodo-periphery](#opt-services.komodo-periphery.enable). From 6b0fa5397c7a04a4e65c742b11901b28a6f130d6 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Sun, 14 Dec 2025 08:23:56 +0100 Subject: [PATCH 52/74] easyeffects: 8.0.6 -> 8.0.8 --- pkgs/by-name/ea/easyeffects/package.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index ebd59cc7ca31..e0962dbb811d 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -14,8 +14,7 @@ ladspaH, libbs2b, libebur128, - libportal-qt6, - libsamplerate, + libmysofa, libsigcxx30, libsndfile, lilv, @@ -43,11 +42,9 @@ let inherit (qt6) qtbase qtgraphs - qtwebengine wrapQtAppsHook ; inherit (kdePackages) - appstream-qt breeze breeze-icons extra-cmake-modules @@ -62,13 +59,13 @@ in stdenv.mkDerivation rec { pname = "easyeffects"; - version = "8.0.6"; + version = "8.0.8"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; tag = "v${version}"; - hash = "sha256-5UPwCdpFU1SiD9nlQd99lAK7QdC9jcizj5X3BhBYJ4U="; + hash = "sha256-Pw9rMYHrRBSttdtElWDH1YOF0tNWgb2zBzJBI9jJe4Q="; }; patches = [ ./qmlmodule-fix.patch ]; @@ -86,7 +83,6 @@ stdenv.mkDerivation rec { dontWrapGApps = true; buildInputs = [ - appstream-qt breeze breeze-icons deepfilternet @@ -103,8 +99,7 @@ stdenv.mkDerivation rec { qqc2-desktop-style libbs2b libebur128 - libportal-qt6 - libsamplerate + libmysofa libsigcxx30 libsndfile lilv @@ -113,7 +108,6 @@ stdenv.mkDerivation rec { pipewire qtbase qtgraphs - qtwebengine rnnoise rubberband soundtouch @@ -154,7 +148,7 @@ stdenv.mkDerivation rec { meta = { description = "Audio effects for PipeWire applications"; homepage = "https://github.com/wwmm/easyeffects"; - changelog = "https://github.com/wwmm/easyeffects/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/wwmm/easyeffects/blob/v${version}/src/contents/docs/community/CHANGELOG.md"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ getchoo From b615a8f823149ecb84b1fcfdee4159aaa15eeb6a Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sun, 14 Dec 2025 07:09:27 +0100 Subject: [PATCH 53/74] mumble: use binary wrappers on macOS Shell wrappers on macOS cause permission requests to come from Bash rather than the correct application. --- pkgs/applications/networking/mumble/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 555439460d5e..5628ada5a507 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -37,7 +37,7 @@ microsoft-gsl, nlohmann_json, xar, - makeWrapper, + makeBinaryWrapper, }: let @@ -57,6 +57,7 @@ let python3 qt5.wrapQtAppsHook qt5.qttools + makeBinaryWrapper ] ++ (overrides.nativeBuildInputs or [ ]); @@ -107,9 +108,6 @@ let platforms = lib.platforms.darwin; nativeBuildInputs = [ qt5.qttools - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - makeWrapper ]; buildInputs = [ @@ -173,11 +171,11 @@ let mv $out/Mumble.app $out/Applications/Mumble.app # ensure that the app can be started from the shell - makeWrapper $out/Applications/Mumble.app/Contents/MacOS/mumble $out/bin/mumble + makeBinaryWrapper $out/Applications/Mumble.app/Contents/MacOS/mumble $out/bin/mumble ''; postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - wrapProgram $out/bin/mumble \ + wrapProgramBinary $out/bin/mumble \ --prefix LD_LIBRARY_PATH : "${ lib.makeLibraryPath ( lib.optional pulseSupport libpulseaudio ++ lib.optional pipewireSupport pipewire From 263407a0fbe7aa6379e1b746d425d246ef879454 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 08:48:05 +0000 Subject: [PATCH 54/74] flirt: 0.4 -> 0.4.1 --- pkgs/by-name/fl/flirt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flirt/package.nix b/pkgs/by-name/fl/flirt/package.nix index 9ed8058c41c1..38614215dea0 100644 --- a/pkgs/by-name/fl/flirt/package.nix +++ b/pkgs/by-name/fl/flirt/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "flirt"; - version = "0.4"; + version = "0.4.1"; src = fetchFromSourcehut { owner = "~hadronized"; repo = "flirt"; rev = "v${version}"; - hash = "sha256-wH6WLLUqUj5YrrudNbGkzZ4i15xRPDBE3UKwyhkQSxg="; + hash = "sha256-L7BiNA/cG7e1GX9sOxwwLS5+2/Tpb1PeA/2rPz8ALf8="; }; - cargoHash = "sha256-m1aLJFa6C5X9HwNweezoUcFnpG09AuYf9ooet8GUGFE="; + cargoHash = "sha256-roPPL9zR8JBr3Ya2IhkvIOfnKxuRSXdxxaJ80ZUK87M="; passthru.updateScript = nix-update-script { }; From 4b2d7f25e76d1d8c7a2bcbc7fc58ffb39a7d3ed1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 08:55:51 +0000 Subject: [PATCH 55/74] python3Packages.nvidia-ml-py: 13.580.82 -> 13.590.44 --- pkgs/development/python-modules/nvidia-ml-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nvidia-ml-py/default.nix b/pkgs/development/python-modules/nvidia-ml-py/default.nix index 6390df8c714f..1b5289d0a540 100644 --- a/pkgs/development/python-modules/nvidia-ml-py/default.nix +++ b/pkgs/development/python-modules/nvidia-ml-py/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "nvidia-ml-py"; - version = "13.580.82"; + version = "13.590.44"; pyproject = true; src = fetchPypi { pname = "nvidia_ml_py"; inherit version; - hash = "sha256-DAKIBdxToOKmmF6oAYiBl3Zawu+PHJ4pp78NNhal78c="; + hash = "sha256-s1jHYUsP3upLlfBG8ckBI7/iXRSKuTuxwAJIuDRwM3M="; }; patches = [ From 094660f8da34014334c6d3e989e712552100288f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 09:11:39 +0000 Subject: [PATCH 56/74] scala-cli: 1.10.1 -> 1.11.0 --- pkgs/by-name/sc/scala-cli/sources.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sc/scala-cli/sources.json b/pkgs/by-name/sc/scala-cli/sources.json index 9d87d9acbf92..b5196be85564 100644 --- a/pkgs/by-name/sc/scala-cli/sources.json +++ b/pkgs/by-name/sc/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.10.1", + "version": "1.11.0", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "1013az3v223l1g4yqic2mx6g8f6vamqig0y10nkkxkqd8gjr57gb" + "sha256": "1xj5mb853qqsrrvqb3xpnh7x9yakf9vrb0xfszi5jw819ayidf4f" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "127azaiddpnb7vjgrkqc8w9a6ngplaxxb5q4l9z6pfg9j3amz615" + "sha256": "1lrwhbk0drzaq11q6jg4aszypfdsqqnwvsk50cz213jqvnzdazhc" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "0lfp42442ji7b5blr1mxf0p1xqricq08z8d64vnzrg13bzi3g865" + "sha256": "0hd2qhhk4ifciijdp3fsn1v9zqsmhh70mqa6b7km97lq4g1dx77r" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "0pnq95ymawcncyw0zasb3309k4rwrncmf2sqcgq3jkzi2sppmkym" + "sha256": "1jvd5fl85lhl57wj684g1p2rhwql83lfcjpwyflzgg370v052z3r" } } } From 457e452f9622f609a2a85d04411e3345e30b10a2 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Sun, 14 Dec 2025 11:15:20 +0100 Subject: [PATCH 57/74] tailwindcss_4: 4.1.17 -> 4.1.18 release notes https://github.com/tailwindlabs/tailwindcss/releases/tag/v4.1.18 --- pkgs/by-name/ta/tailwindcss_4/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix index feba98214600..1ed323d8fc9b 100644 --- a/pkgs/by-name/ta/tailwindcss_4/package.nix +++ b/pkgs/by-name/ta/tailwindcss_4/package.nix @@ -7,7 +7,7 @@ makeWrapper, }: let - version = "4.1.17"; + version = "4.1.18"; inherit (stdenv.hostPlatform) system; throwSystem = throw "tailwindcss has not been packaged for ${system} yet."; @@ -22,10 +22,10 @@ let hash = { - aarch64-darwin = "sha256-hSti2Rpt+laWloa8ikuuDkci3o9am0KxArtYm37OjP4="; - aarch64-linux = "sha256-JkaJmEMRzCyhBKnWpNA5tCZ67PRUPcnqC7wJTusMzI0="; - x86_64-darwin = "sha256-YzfIcYUyHAeSRN+9nCRQKjAGQBvRU50ZzcnfjekQGEM="; - x86_64-linux = "sha256-zBFdm2xO3k5CO/6mo8/D8D5sFwK32RA2m5VA4rTPOGA="; + aarch64-darwin = "sha256-fydxHc6sGlgLatWN2sRuWSAshabBby8I9v3N7iYQCOE="; + aarch64-linux = "sha256-encC22yTcYqbZlXUVTBO3aGGAPWk8ZUkI0LtO1tw6+g="; + x86_64-darwin = "sha256-Hop3/XlqOkqj2HJ4h96SbvnThHeroRP9fDLA0xoyo6s="; + x86_64-linux = "sha256-c3vs+NStERXqmN9p+pQCbUAsqP65EwagNbWwBBZ9qN0="; } .${system} or throwSystem; in From a62eb5dcfafa129579707c24869cb49a2a5d88eb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Dec 2025 12:25:53 +0100 Subject: [PATCH 58/74] python313Packages.geodatasets: remove disabled - use dependecies --- pkgs/development/python-modules/geodatasets/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/geodatasets/default.nix b/pkgs/development/python-modules/geodatasets/default.nix index ce2ac4e968c0..fc52fa497c09 100644 --- a/pkgs/development/python-modules/geodatasets/default.nix +++ b/pkgs/development/python-modules/geodatasets/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, - pythonOlder, geopandas, pooch, @@ -15,7 +14,6 @@ buildPythonPackage rec { pname = "geodatasets"; version = "2025.12.0"; pyproject = true; - disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "geopandas"; @@ -26,7 +24,7 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ pooch ]; + dependencies = [ pooch ]; nativeCheckInputs = [ geopandas From ab1fe7cfea00f437c4bf73626c61b108f5acdc0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 11:26:11 +0000 Subject: [PATCH 59/74] libretro.fbalpha2012: 0-unstable-2024-10-21 -> 0-unstable-2025-12-12 --- pkgs/applications/emulators/libretro/cores/fbalpha2012.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/fbalpha2012.nix b/pkgs/applications/emulators/libretro/cores/fbalpha2012.nix index 546daaa27b35..fd80db661746 100644 --- a/pkgs/applications/emulators/libretro/cores/fbalpha2012.nix +++ b/pkgs/applications/emulators/libretro/cores/fbalpha2012.nix @@ -7,13 +7,13 @@ }: mkLibretroCore rec { core = "fbalpha2012"; - version = "0-unstable-2024-10-21"; + version = "0-unstable-2025-12-12"; src = fetchFromGitHub { owner = "libretro"; repo = "fbalpha2012"; - rev = "77167cea72e808384c136c8c163a6b4975ce7a84"; - hash = "sha256-giEV09dT/e82bmDlRkxpkW04JcsEZc/enIPecqYtg3c="; + rev = "c547d8cf3f7748f4094cee658a5d31ec1b79ece4"; + hash = "sha256-owy8IuJ/dAEbUH7hGCR3oLiI4tYuwsNfRYRl6LmyYfc="; }; sourceRoot = "${src.name}/svn-current/trunk"; From 8c74b7276da6af4f6067cd559a6b3f0b555185ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 11:28:41 +0000 Subject: [PATCH 60/74] sql-formatter: 15.6.10 -> 15.6.11 --- pkgs/by-name/sq/sql-formatter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sq/sql-formatter/package.nix b/pkgs/by-name/sq/sql-formatter/package.nix index 0e3df381d733..8b21d80383eb 100644 --- a/pkgs/by-name/sq/sql-formatter/package.nix +++ b/pkgs/by-name/sq/sql-formatter/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "sql-formatter"; - version = "15.6.10"; + version = "15.6.11"; src = fetchFromGitHub { owner = "sql-formatter-org"; repo = "sql-formatter"; rev = "v${version}"; - hash = "sha256-3C1NdPUuBfrDN6HRSyfu76IEV2pFIirK94kwoEhr1ZU="; + hash = "sha256-wJfuewg3GFspcJDhR/qoymnksPvW3ZxFFOuGT/P/GDE="; }; yarnOfflineCache = fetchYarnDeps { From c4bec8d7b02567da2d130d373b25a3adbcabdff9 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 14 Dec 2025 12:49:47 +0100 Subject: [PATCH 61/74] kdePackages.powerdevil: fix build nondeterminism Cherry-pick https://invent.kde.org/plasma/powerdevil/-/merge_requests/595 for wider testing Fixes #467100 --- pkgs/kde/plasma/powerdevil/default.nix | 4 ++++ .../kde/plasma/powerdevil/rb-brightness.patch | 24 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/kde/plasma/powerdevil/rb-brightness.patch diff --git a/pkgs/kde/plasma/powerdevil/default.nix b/pkgs/kde/plasma/powerdevil/default.nix index ae2b56a004f2..095a45beb866 100644 --- a/pkgs/kde/plasma/powerdevil/default.nix +++ b/pkgs/kde/plasma/powerdevil/default.nix @@ -7,6 +7,10 @@ mkKdeDerivation { pname = "powerdevil"; + patches = [ + # https://invent.kde.org/plasma/powerdevil/-/merge_requests/595 + ./rb-brightness.patch + ]; extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ ddcutil diff --git a/pkgs/kde/plasma/powerdevil/rb-brightness.patch b/pkgs/kde/plasma/powerdevil/rb-brightness.patch new file mode 100644 index 000000000000..a73692a2cb9b --- /dev/null +++ b/pkgs/kde/plasma/powerdevil/rb-brightness.patch @@ -0,0 +1,24 @@ +commit a34d894278d2c7938427d3c4d0fc07d96c26e55f +Author: Arnout Engelen +Date: Sun Dec 14 11:33:08 2025 +0100 + + reproducible builds: make build deterministic by adding explicit deps + + Similar to https://qt-project.atlassian.net/browse/QTBUG-137440 + + To fix https://bugs.kde.org/show_bug.cgi?id=512867 + + I'll admit I don't quite know what I'm doing here, I'm mostly guessing and mimicking, but it does seem to remove the nondeterminism :) + + Inspired in part by https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/6075/diffs + +diff --git a/applets/brightness/CMakeLists.txt b/applets/brightness/CMakeLists.txt +index 3d1fce43..99331f85 100644 +--- a/applets/brightness/CMakeLists.txt ++++ b/applets/brightness/CMakeLists.txt +@@ -16,3 +16,5 @@ plasma_add_applet(org.kde.plasma.brightness + PopupDialog.qml + GENERATE_APPLET_CLASS + ) ++ ++add_dependencies(org.kde.plasma.brightness brightnesscontrolplugin) From 974bcac2df2b8445527b9607b7d2785882e7422e Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 14 Dec 2025 12:54:48 +0100 Subject: [PATCH 62/74] kdePackages.libplasma: fix build nondeterminism Cherry-pick https://invent.kde.org/plasma/libplasma/-/merge_requests/1406 for wider testing Fixes #458839 --- pkgs/kde/plasma/libplasma/default.nix | 5 +++ .../plasma/libplasma/rb-extracomponents.patch | 37 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/kde/plasma/libplasma/rb-extracomponents.patch diff --git a/pkgs/kde/plasma/libplasma/default.nix b/pkgs/kde/plasma/libplasma/default.nix index f13240876725..453c9d328f9e 100644 --- a/pkgs/kde/plasma/libplasma/default.nix +++ b/pkgs/kde/plasma/libplasma/default.nix @@ -8,6 +8,11 @@ mkKdeDerivation { pname = "libplasma"; + patches = [ + # https://invent.kde.org/plasma/libplasma/-/merge_requests/1406 + ./rb-extracomponents.patch + ]; + extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ diff --git a/pkgs/kde/plasma/libplasma/rb-extracomponents.patch b/pkgs/kde/plasma/libplasma/rb-extracomponents.patch new file mode 100644 index 000000000000..393a4df780f0 --- /dev/null +++ b/pkgs/kde/plasma/libplasma/rb-extracomponents.patch @@ -0,0 +1,37 @@ +commit 49d9faf0b11b3957d36c21f90b9f34933f507438 +Author: Arnout Engelen +Date: Sun Dec 14 10:43:57 2025 +0100 + + reproducible builds: make qml dependencies explicit + + Similar to https://qt-project.atlassian.net/browse/QTBUG-137440 + + To fix https://bugs.kde.org/show_bug.cgi?id=512868 + + I'll admit I don't quite know what I'm doing here, I'm mostly guessing and mimicking, but it does seem to remove the nondeterminism :) + +diff --git a/src/declarativeimports/plasmaextracomponents/CMakeLists.txt b/src/declarativeimports/plasmaextracomponents/CMakeLists.txt +index 1a7827819..a8e335af7 100644 +--- a/src/declarativeimports/plasmaextracomponents/CMakeLists.txt ++++ b/src/declarativeimports/plasmaextracomponents/CMakeLists.txt +@@ -1,4 +1,8 @@ +-ecm_add_qml_module(plasmaextracomponentsplugin VERSION 2.0 URI "org.kde.plasma.extras" GENERATE_PLUGIN_SOURCE) ++ecm_add_qml_module(plasmaextracomponentsplugin URI "org.kde.plasma.extras" ++ VERSION 2.0 ++ GENERATE_PLUGIN_SOURCE ++ LIBRARIES org_kde_plasmacomponents3 ++) + + target_sources(plasmaextracomponentsplugin PRIVATE + qmenu.cpp +@@ -42,7 +46,9 @@ target_link_libraries(plasmaextracomponentsplugin PRIVATE + Qt6::Qml + Qt6::Widgets + KF6::WidgetsAddons +- Plasma::Plasma) ++ Plasma::Plasma ++ org_kde_plasmacomponents3 ++) + + ecm_finalize_qml_module(plasmaextracomponentsplugin DESTINATION ${KDE_INSTALL_QMLDIR}) + From 0a8327815cf5ce230bbba677cde6a3365ae3c946 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sun, 14 Dec 2025 12:59:36 +0100 Subject: [PATCH 63/74] kdePackages.kirigami.unwrapped: fix build nondeterminism Cherry-pick https://invent.kde.org/plasma/libplasma/-/merge_requests/1991 for wider testing Fixes #450720 --- pkgs/kde/frameworks/kirigami/default.nix | 4 ++ .../frameworks/kirigami/rb-templates.patch | 52 +++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/kde/frameworks/kirigami/rb-templates.patch diff --git a/pkgs/kde/frameworks/kirigami/default.nix b/pkgs/kde/frameworks/kirigami/default.nix index 83edf8c52654..8344d03c1dbb 100644 --- a/pkgs/kde/frameworks/kirigami/default.nix +++ b/pkgs/kde/frameworks/kirigami/default.nix @@ -17,6 +17,10 @@ let unwrapped = mkKdeDerivation { pname = "kirigami"; + patches = [ + ./rb-templates.patch + ]; + extraNativeBuildInputs = [ qtsvg qttools diff --git a/pkgs/kde/frameworks/kirigami/rb-templates.patch b/pkgs/kde/frameworks/kirigami/rb-templates.patch new file mode 100644 index 000000000000..7e8cc53fe235 --- /dev/null +++ b/pkgs/kde/frameworks/kirigami/rb-templates.patch @@ -0,0 +1,52 @@ +commit a1801928b5eea0bf224c81a638f658bf3a9d9a6c +Author: Arnout Engelen +Date: Wed Nov 26 11:24:02 2025 +0100 + + Make qml generation deterministic by adding explicit dependencies + + Similar to https://qt-project.atlassian.net/browse/QTBUG-137440 + + To fix https://bugs.kde.org/show_bug.cgi?id=513292 + +diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt +index 9bf3cde9..c199c6f5 100644 +--- a/src/dialogs/CMakeLists.txt ++++ b/src/dialogs/CMakeLists.txt +@@ -5,6 +5,7 @@ ecm_add_qml_module(KirigamiDialogs URI "org.kde.kirigami.dialogs" + GENERATE_PLUGIN_SOURCE + INSTALLED_PLUGIN_TARGET KF6KirigamiDialogsplugin + DEPENDENCIES QtQuick org.kde.kirigami.platform ++ LIBRARIES KirigamiPrimitives + ) + + +@@ -26,7 +27,7 @@ set_target_properties(KirigamiDialogs PROPERTIES + + target_include_directories(KirigamiDialogs PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..) + +-target_link_libraries(KirigamiDialogs PRIVATE Qt6::Quick KirigamiPlatform) ++target_link_libraries(KirigamiDialogs PRIVATE Qt6::Quick KirigamiPlatform KirigamiPrimitives) + + ecm_finalize_qml_module(KirigamiDialogs EXPORT KirigamiTargets) + +diff --git a/src/templates/CMakeLists.txt b/src/templates/CMakeLists.txt +index b0027ea2..6813a6d0 100644 +--- a/src/templates/CMakeLists.txt ++++ b/src/templates/CMakeLists.txt +@@ -4,6 +4,8 @@ ecm_add_qml_module(KirigamiTemplates URI "org.kde.kirigami.templates" + VERSION 2.0 + GENERATE_PLUGIN_SOURCE + INSTALLED_PLUGIN_TARGET KF6KirigamiTemplates ++ DEPENDENCIES ++ LIBRARIES KirigamiPrimitives KirigamiLayouts + ) + + set_source_files_properties(AppHeaderSizeGroup.qml PROPERTIES +@@ -37,6 +39,7 @@ set_target_properties(KirigamiTemplates PROPERTIES + + target_include_directories(KirigamiTemplates PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..) + ++target_link_libraries(KirigamiTemplates PRIVATE KirigamiPrimitives KirigamiLayouts) + + ecm_finalize_qml_module(KirigamiTemplates EXPORT KirigamiTargets) + From 1611bb103585c1331f5ee1fd1b39b53bc0e6a64d Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 14 Dec 2025 20:26:41 +0800 Subject: [PATCH 64/74] yq-go: 4.49.2 -> 4.50.1 --- pkgs/by-name/yq/yq-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yq/yq-go/package.nix b/pkgs/by-name/yq/yq-go/package.nix index 1442dc3ec122..bb2161867e7d 100644 --- a/pkgs/by-name/yq/yq-go/package.nix +++ b/pkgs/by-name/yq/yq-go/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "yq-go"; - version = "4.49.2"; + version = "4.50.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; tag = "v${finalAttrs.version}"; - hash = "sha256-r+9TjdVRcHx5Ijea/4ITCqyJIngEcfzrCBP3Xlgd1xE="; + hash = "sha256-0KVO643y3ZnXpq/0Cv3LOAf1oOOMfVEnqOs4gPG2lso="; }; - vendorHash = "sha256-fcjHqWLDvXyALkh3TR8lOnv7McXUVtcb1VpVbMuUMtk="; + vendorHash = "sha256-U6T8gcHIb/Kr2xh2eB+aj0bdoqHUO887SYWqT9nrXBQ="; nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ installShellFiles From 7f562f73fd58e04fb0c82fbaba667a76ad1b2d40 Mon Sep 17 00:00:00 2001 From: mangoiv Date: Sun, 14 Dec 2025 13:41:45 +0100 Subject: [PATCH 65/74] gitlab: set postgresql package version to 16 --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index f0c21379ee3c..e34d23b187b7 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -22,7 +22,7 @@ let if config.services.postgresql.enable then config.services.postgresql.package else - pkgs.postgresql_14; + pkgs.postgresql_16; gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket"; gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket"; From 263a52ea8faa3400e84aca1c0982c27fadb7adf3 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 14 Dec 2025 21:09:13 +0800 Subject: [PATCH 66/74] nexttrace: fix build on darwin --- pkgs/by-name/ne/nexttrace/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ne/nexttrace/package.nix b/pkgs/by-name/ne/nexttrace/package.nix index 6204cd22246c..383fff3f8d92 100644 --- a/pkgs/by-name/ne/nexttrace/package.nix +++ b/pkgs/by-name/ne/nexttrace/package.nix @@ -2,6 +2,7 @@ lib, buildGoModule, fetchFromGitHub, + libpcap, }: buildGoModule rec { @@ -16,6 +17,8 @@ buildGoModule rec { }; vendorHash = "sha256-8KxY3KYcaaZZjk+IIKdu8tzGhgGUlJ5nyMMSKhe41kg="; + buildInputs = [ libpcap ]; + doCheck = false; # Tests require a network connection. ldflags = [ From 839ab5ecd6d6b1a003fe6cb84813f324fc222b97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 13:32:25 +0000 Subject: [PATCH 67/74] vimPlugins.fff-nvim: d88922e-unstable-2025-12-07 -> e3f788f-unstable-2025-12-13 --- .../vim/plugins/non-generated/fff-nvim/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix index a4d3edbf5aa1..ffd20d30cdb3 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix @@ -10,18 +10,18 @@ vimUtils, }: let - version = "d88922e-unstable-2025-12-07"; + version = "e3f788f-unstable-2025-12-13"; src = fetchFromGitHub { owner = "dmtrKovalenko"; repo = "fff.nvim"; - rev = "d88922e6c74b357cfd029128ce5ecd813b6eb747"; - hash = "sha256-XdDSyRHAZxRjziFwnEjjIrKSf8S+CHZw74P/O9O7C88="; + rev = "e3f788f87b014f61e39cd916edc766d10e563d73"; + hash = "sha256-NSTo5zs9DvGDVUp6PJNHCQsSNPgdkJCTYvlA/IP12h4="; }; fff-nvim-lib = rustPlatform.buildRustPackage { pname = "fff-nvim-lib"; inherit version src; - cargoHash = "sha256-+se3u1ib3Ghy1tHIPpCY8sPgaQRaYCYGdJ8up+bubpM="; + cargoHash = "sha256-kNTJC+0KBQKt0nMY2HAUWnr55x8nTd5oRGeDuam8X30="; nativeBuildInputs = [ pkg-config From d418fe008320d0ce06ea33fb3548aaa86e04f52d Mon Sep 17 00:00:00 2001 From: thesn10 <38666407+thesn10@users.noreply.github.com> Date: Sun, 14 Dec 2025 14:26:40 +0100 Subject: [PATCH 68/74] asleap: 0-unstable-2020-11-28 -> 0-unstable-2021-06-20 --- pkgs/by-name/as/asleap/package.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/as/asleap/package.nix b/pkgs/by-name/as/asleap/package.nix index 605d1dc0ee4f..91b27c56e6c6 100644 --- a/pkgs/by-name/as/asleap/package.nix +++ b/pkgs/by-name/as/asleap/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { pname = "asleap"; - version = "0-unstable-2020-11-28"; + version = "0-unstable-2021-06-20"; src = fetchFromGitHub { - owner = "joswr1ght"; + owner = "zackw"; repo = "asleap"; - rev = "254acabba34cb44608c9d2dcf7a147553d3d5ba3"; - hash = "sha256-MQjPup3EX7DCXY/zyroTj/+U2GIq12+VQQJD0gru7C8="; + rev = "eb3bd42098cba42b65f499c9d8c73d890861b94f"; + hash = "sha256-S6jS0cg9tHSfmP6VHyISkXJxczhPx3HDdxT46c+YmE8="; }; buildInputs = [ @@ -34,7 +34,9 @@ stdenv.mkDerivation { runHook postInstall ''; - passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch=zack/no-external-crypto" ]; + }; meta = { homepage = "https://github.com/zackw/asleap"; From 5432e1b39ca2ae54c494ba3276655061561dffcd Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sat, 13 Dec 2025 14:21:24 +0000 Subject: [PATCH 69/74] python3Packages.tantivy: init at 0.25.1 --- .../python-modules/tantivy/default.nix | 69 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/development/python-modules/tantivy/default.nix diff --git a/pkgs/development/python-modules/tantivy/default.nix b/pkgs/development/python-modules/tantivy/default.nix new file mode 100644 index 000000000000..3b7b9a700139 --- /dev/null +++ b/pkgs/development/python-modules/tantivy/default.nix @@ -0,0 +1,69 @@ +{ + lib, + pkgs, + buildPythonPackage, + fetchFromGitHub, + rustPlatform, + + # nativeBuildInputs + pkg-config, + + # tests + mktestdocs, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "tantivy"; + version = "0.25.1"; + pyproject = true; + + # # Python sources are not on the main GitHub repo + # src = fetchPypi { + # inherit pname version; + # hash = "sha256-aKMxRpmn0Y/PM4tSuujORql93hEoo+R+M/pNt/cfJl4="; + # }; + src = fetchFromGitHub { + owner = "quickwit-oss"; + repo = "tantivy-py"; + tag = version; + hash = "sha256-rayr38TfBYCKDddJabhC+r/jIyqJtpKct81h1z8YPFw="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + hash = "sha256-xJdAD/E17mzTkRq5wwNxYtNtv386U1xD4mJhY0LiZFE="; + }; + + nativeBuildInputs = [ + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + buildInputs = [ + pkgs.zstd + ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + pythonImportsCheck = [ "tantivy" ]; + + preCheck = '' + rm -rf tantivy + ''; + + nativeCheckInputs = [ + mktestdocs + pytestCheckHook + ]; + + meta = { + description = "Official Python bindings for the Tantivy search engine"; + homepage = "https://pypi.org/project/tantivy/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 31fa5a190bf3..d344e93c4964 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18388,6 +18388,8 @@ self: super: with self; { tank-utility = callPackage ../development/python-modules/tank-utility { }; + tantivy = callPackage ../development/python-modules/tantivy { }; + tappy = callPackage ../development/python-modules/tappy { }; tapsaff = callPackage ../development/python-modules/tapsaff { }; From 0b90ed8913d1bcdad80d99e1568e2139794efb08 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 Dec 2025 18:01:57 +0300 Subject: [PATCH 70/74] Revert "Minor `check-meta.nix` optimisations and cleanups" --- pkgs/stdenv/generic/check-meta.nix | 273 ++++++++++++++++------------- 1 file changed, 148 insertions(+), 125 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 0093298ca299..b99f2531831c 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -15,15 +15,15 @@ let concatMapStrings concatMapStringsSep concatStrings - filter findFirst - getName isDerivation length concatMap mutuallyExclusive optional + optionalAttrs optionalString + optionals isAttrs isString mapAttrs @@ -47,11 +47,6 @@ let toPretty ; - inherit (builtins) - getEnv - trace - ; - # If we're in hydra, we can dispense with the more verbose error # messages and make problems easier to spot. inHydra = config.inHydra or false; @@ -62,11 +57,11 @@ let getNameWithVersion = attrs: attrs.name or "${attrs.pname or "«name-missing»"}-${attrs.version or "«version-missing»"}"; - allowUnfree = config.allowUnfree || getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; + allowUnfree = config.allowUnfree || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; allowNonSource = let - envVar = getEnv "NIXPKGS_ALLOW_NONSOURCE"; + envVar = builtins.getEnv "NIXPKGS_ALLOW_NONSOURCE"; in if envVar != "" then envVar != "0" else config.allowNonSource or true; @@ -79,34 +74,33 @@ let else throw "allowlistedLicenses and blocklistedLicenses are not mutually exclusive."; + hasLicense = attrs: attrs ? meta.license; + hasListedLicense = assert areLicenseListsValid; - list: - if list == [ ] then - attrs: false - else - attrs: - attrs ? meta.license - && ( - if isList attrs.meta.license then - any (l: elem l list) attrs.meta.license - else - elem attrs.meta.license list - ); + list: attrs: + length list > 0 + && hasLicense attrs + && ( + if isList attrs.meta.license then + any (l: elem l list) attrs.meta.license + else + elem attrs.meta.license list + ); - hasAllowlistedLicense = hasListedLicense allowlist; + hasAllowlistedLicense = attrs: hasListedLicense allowlist attrs; - hasBlocklistedLicense = hasListedLicense blocklist; + hasBlocklistedLicense = attrs: hasListedLicense blocklist attrs; - allowBroken = config.allowBroken || getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; + allowBroken = config.allowBroken || builtins.getEnv "NIXPKGS_ALLOW_BROKEN" == "1"; allowUnsupportedSystem = - config.allowUnsupportedSystem || getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1"; + config.allowUnsupportedSystem || builtins.getEnv "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM" == "1"; isUnfree = licenses: if isAttrs licenses then - !(licenses.free or true) + !licenses.free or true # TODO: Returning false in the case of a string is a bug that should be fixed. # In a previous implementation of this function the function body # was `licenses: lib.lists.any (l: !l.free or true) licenses;` @@ -114,9 +108,9 @@ let else if isString licenses then false else - any (l: !(l.free or true)) licenses; + any (l: !l.free or true) licenses; - hasUnfreeLicense = attrs: attrs ? meta.license && isUnfree attrs.meta.license; + hasUnfreeLicense = attrs: hasLicense attrs && isUnfree attrs.meta.license; hasNoMaintainers = # To get usable output, we want to avoid flagging "internal" derivations. @@ -167,13 +161,19 @@ let attrs: hasUnfreeLicense attrs && !allowUnfree && !allowUnfreePredicate attrs; allowInsecureDefaultPredicate = - x: elem (getNameWithVersion x) (config.permittedInsecurePackages or [ ]); - allowInsecurePredicate = config.allowInsecurePredicate or allowInsecureDefaultPredicate; + x: builtins.elem (getNameWithVersion x) (config.permittedInsecurePackages or [ ]); + allowInsecurePredicate = x: (config.allowInsecurePredicate or allowInsecureDefaultPredicate) x; - allowInsecure = getEnv "NIXPKGS_ALLOW_INSECURE" == "1"; + hasAllowedInsecure = + attrs: + !(isMarkedInsecure attrs) + || allowInsecurePredicate attrs + || builtins.getEnv "NIXPKGS_ALLOW_INSECURE" == "1"; - hasDisallowedInsecure = - attrs: isMarkedInsecure attrs && !allowInsecure && !allowInsecurePredicate attrs; + isNonSource = sourceTypes: any (t: !t.isSource) sourceTypes; + + hasNonSourceProvenance = + attrs: (attrs ? meta.sourceProvenance) && isNonSource attrs.meta.sourceProvenance; # Allow granular checks to allow only some non-source-built packages # Example: @@ -188,11 +188,7 @@ let # package has non-source provenance and is not explicitly allowed by the # `allowNonSourcePredicate` function. hasDeniedNonSourceProvenance = - attrs: - attrs ? meta.sourceProvenance - && any (t: !t.isSource) attrs.meta.sourceProvenance - && !allowNonSource - && !allowNonSourcePredicate attrs; + attrs: hasNonSourceProvenance attrs && !allowNonSource && !allowNonSourcePredicate attrs; showLicenseOrSourceType = value: toString (map (v: v.shortName or v.fullName or "unknown") (toList value)); @@ -201,6 +197,17 @@ let pos_str = meta: meta.position or "«unknown-file»"; + remediation = { + unfree = remediate_allowlist "Unfree" (remediate_predicate "allowUnfreePredicate"); + non-source = remediate_allowlist "NonSource" (remediate_predicate "allowNonSourcePredicate"); + broken = remediate_allowlist "Broken" (x: ""); + unsupported = remediate_allowlist "UnsupportedSystem" (x: ""); + blocklisted = x: ""; + insecure = remediate_insecure; + broken-outputs = remediateOutputsToInstall; + unknown-meta = x: ""; + maintainerless = x: ""; + }; remediation_env_var = allow_attr: { @@ -223,7 +230,7 @@ let Alternatively you can configure a predicate to allow specific packages: { nixpkgs.config.${predicateConfigAttr} = pkg: builtins.elem (lib.getName pkg) [ - "${getName attrs}" + "${lib.getName attrs}" ]; } ''; @@ -293,7 +300,7 @@ let let expectedOutputs = attrs.meta.outputsToInstall or [ ]; actualOutputs = attrs.outputs or [ "out" ]; - missingOutputs = filter (output: !elem output actualOutputs) expectedOutputs; + missingOutputs = builtins.filter (output: !builtins.elem output actualOutputs) expectedOutputs; in '' The package ${getNameWithVersion attrs} has set meta.outputsToInstall to: ${builtins.concatStringsSep ", " expectedOutputs} @@ -305,6 +312,45 @@ let ${concatStrings (map (output: " - ${output}\n") missingOutputs)} ''; + handleEvalIssue = + { meta, attrs }: + { + reason, + errormsg ? "", + }: + let + msg = + if inHydra then + "Failed to evaluate ${getNameWithVersion attrs}: «${reason}»: ${errormsg}" + else + '' + Package ‘${getNameWithVersion attrs}’ in ${pos_str meta} ${errormsg}, refusing to evaluate. + + '' + + (builtins.getAttr reason remediation) attrs; + + handler = if config ? handleEvalIssue then config.handleEvalIssue reason else throw; + in + handler msg; + + handleEvalWarning = + { meta, attrs }: + { + reason, + errormsg ? "", + }: + let + remediationMsg = (builtins.getAttr reason remediation) attrs; + msg = + if inHydra then + "Warning while evaluating ${getNameWithVersion attrs}: «${reason}»: ${errormsg}" + else + "Package ${getNameWithVersion attrs} in ${pos_str meta} ${errormsg}, continuing anyway." + + (optionalString (remediationMsg != "") "\n${remediationMsg}"); + isEnabled = findFirst (x: x == reason) null showWarnings; + in + if isEnabled != null then builtins.trace msg true else true; + metaTypes = let types = import ./meta-types.nix { inherit lib; }; @@ -400,10 +446,11 @@ let identifiers = attrs; }; - # Map attrs directly to the verify function for performance - metaTypes' = mapAttrs (_: t: t.verify) metaTypes; - checkMetaAttr = + let + # Map attrs directly to the verify function for performance + metaTypes' = mapAttrs (_: t: t.verify) metaTypes; + in k: v: if metaTypes ? ${k} then if metaTypes'.${k} v then @@ -420,80 +467,81 @@ let concatMapStringsSep ", " (x: "'${x}'") (attrNames metaTypes) }]" ]; - - checkMeta = meta: concatMap (attr: checkMetaAttr attr meta.${attr}) (attrNames meta); - - metaInvalid = - if config.checkMeta then - meta: !all (attr: metaTypes ? ${attr} && metaTypes'.${attr} meta.${attr}) (attrNames meta) - else - meta: false; + checkMeta = + meta: + optionals config.checkMeta (concatMap (attr: checkMetaAttr attr meta.${attr}) (attrNames meta)); checkOutputsToInstall = - if config.checkMeta then - attrs: - let - actualOutputs = attrs.outputs or [ "out" ]; - in - any (output: !elem output actualOutputs) (attrs.meta.outputsToInstall or [ ]) - else - attrs: false; + attrs: + let + expectedOutputs = attrs.meta.outputsToInstall or [ ]; + actualOutputs = attrs.outputs or [ "out" ]; + missingOutputs = builtins.filter (output: !builtins.elem output actualOutputs) expectedOutputs; + in + if config.checkMeta then builtins.length missingOutputs > 0 else false; # Check if a derivation is valid, that is whether it passes checks for # e.g brokenness or license. # # Return { valid: "yes", "warn" or "no" } and additionally - # { reason: String; errormsg: String, remediation: String } if it is not valid, where + # { reason: String; errormsg: String } if it is not valid, where # reason is one of "unfree", "blocklisted", "broken", "insecure", ... # !!! reason strings are hardcoded into OfBorg, make sure to keep them in sync # Along with a boolean flag for each reason checkValidity = + let + validYes = { + valid = "yes"; + handled = true; + }; + in attrs: # Check meta attribute types first, to make sure it is always called even when there are other issues # Note that this is not a full type check and functions below still need to by careful about their inputs! - if metaInvalid (attrs.meta or { }) then + let + res = checkMeta (attrs.meta or { }); + in + if res != [ ] then { + valid = "no"; reason = "unknown-meta"; - errormsg = "has an invalid meta attrset:${ - concatMapStrings (x: "\n - " + x) (checkMeta attrs.meta) - }\n"; - remediation = ""; + errormsg = "has an invalid meta attrset:${concatMapStrings (x: "\n - " + x) res}\n"; } # --- Put checks that cannot be ignored here --- else if checkOutputsToInstall attrs then { + valid = "no"; reason = "broken-outputs"; errormsg = "has invalid meta.outputsToInstall"; - remediation = remediateOutputsToInstall attrs; } # --- Put checks that can be ignored here --- else if hasDeniedUnfreeLicense attrs && !(hasAllowlistedLicense attrs) then { + valid = "no"; reason = "unfree"; errormsg = "has an unfree license (‘${showLicense attrs.meta.license}’)"; - remediation = remediate_allowlist "Unfree" (remediate_predicate "allowUnfreePredicate") attrs; } else if hasBlocklistedLicense attrs then { + valid = "no"; reason = "blocklisted"; errormsg = "has a blocklisted license (‘${showLicense attrs.meta.license}’)"; - remediation = ""; } else if hasDeniedNonSourceProvenance attrs then { + valid = "no"; reason = "non-source"; errormsg = "contains elements not built from source (‘${showSourceType attrs.meta.sourceProvenance}’)"; - remediation = remediate_allowlist "NonSource" (remediate_predicate "allowNonSourcePredicate") attrs; } else if hasDeniedBroken attrs then { + valid = "no"; reason = "broken"; errormsg = "is marked as broken"; - remediation = remediate_allowlist "Broken" (x: ""); } - else if hasUnsupportedPlatform attrs && !allowUnsupportedSystem then + else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then let toPretty' = toPretty { allowPrettyValues = true; @@ -501,6 +549,7 @@ let }; in { + valid = "no"; reason = "unsupported"; errormsg = '' is not available on the requested hostPlatform: @@ -508,28 +557,25 @@ let package.meta.platforms = ${toPretty' (attrs.meta.platforms or [ ])} package.meta.badPlatforms = ${toPretty' (attrs.meta.badPlatforms or [ ])} ''; - remediation = remediate_allowlist "UnsupportedSystem" (x: "") attrs; } - else if hasDisallowedInsecure attrs then + else if !(hasAllowedInsecure attrs) then { + valid = "no"; reason = "insecure"; errormsg = "is marked as insecure"; - remediation = remediate_insecure attrs; } - else - null; - # Please also update the type in /pkgs/top-level/config.nix alongside this. - checkWarnings = - attrs: - if hasNoMaintainers attrs then + # --- warnings --- + # Please also update the type in /pkgs/top-level/config.nix alongside this. + else if hasNoMaintainers attrs then { + valid = "warn"; reason = "maintainerless"; errormsg = "has no maintainers or teams"; - remediation = ""; } + # ----- else - null; + validYes; # Helper functions and declarations to handle identifiers, extracted to reduce allocations hasAllCPEParts = @@ -684,57 +730,34 @@ let available = validity.valid != "no" - && ((config.checkMetaRecursively or false) -> all (d: d.meta.available or true) references); + && ( + if config.checkMetaRecursively or false then all (d: d.meta.available or true) references else true + ); }; - validYes = { - valid = "yes"; - handled = true; - }; - assertValidity = { meta, attrs }: let - invalid = checkValidity attrs; - warning = checkWarnings attrs; + validity = checkValidity attrs; + inherit (validity) valid; in - if isNull invalid then - if isNull warning then - validYes - else - let - msg = - if inHydra then - "Warning while evaluating ${getNameWithVersion attrs}: «${warning.reason}»: ${warning.errormsg}" - else - "Package ${getNameWithVersion attrs} in ${pos_str meta} ${warning.errormsg}, continuing anyway." - + (optionalString (warning.remediation != "") "\n${warning.remediation}"); - - handled = if elem warning.reason showWarnings then trace msg true else true; - in - warning - // { - valid = "warn"; - handled = handled; - } + if validity ? handled then + validity else - let - msg = - if inHydra then - "Failed to evaluate ${getNameWithVersion attrs}: «${invalid.reason}»: ${invalid.errormsg}" - else - '' - Package ‘${getNameWithVersion attrs}’ in ${pos_str meta} ${invalid.errormsg}, refusing to evaluate. - - '' - + invalid.remediation; - - handled = if config ? handleEvalIssue then config.handleEvalIssue invalid.reason msg else throw msg; - in - invalid + validity // { - valid = "no"; - handled = handled; + # Throw an error if trying to evaluate a non-valid derivation + # or, alternatively, just output a warning message. + handled = ( + if valid == "yes" then + true + else if valid == "no" then + (handleEvalIssue { inherit meta attrs; } { inherit (validity) reason errormsg; }) + else if valid == "warn" then + (handleEvalWarning { inherit meta attrs; } { inherit (validity) reason errormsg; }) + else + throw "Unknown validity: '${valid}'" + ); }; in From 23d1d19d6c879cd1bc9c92bc589f855e3a47d7f1 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 9 Dec 2025 10:55:13 +0300 Subject: [PATCH 71/74] jellyfin-media-player: 1.12.0 -> 2.0.0, build with Qt6, clean up --- .../video/jellyfin-media-player/default.nix | 91 +++++++------------ .../disable-update-notifications.patch | 13 --- .../jellyfin-media-player/fix-web-path.patch | 38 -------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 32 insertions(+), 112 deletions(-) delete mode 100644 pkgs/applications/video/jellyfin-media-player/disable-update-notifications.patch delete mode 100644 pkgs/applications/video/jellyfin-media-player/fix-web-path.patch diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 771a101512d5..4927d2c563f0 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -1,88 +1,59 @@ { lib, fetchFromGitHub, - fetchpatch, - mkDerivation, stdenv, - SDL2, cmake, - libGL, - libX11, - libXrandr, - libvdpau, - mpv, ninja, - pkg-config, - python3, + wrapQtAppsHook, qtbase, - qtwayland, + qtdeclarative, qtwebchannel, qtwebengine, - qtx11extras, - jellyfin-web, - withDbus ? stdenv.hostPlatform.isLinux, + mpvqt, + libcec, + SDL2, + libXrandr, }: - -mkDerivation rec { +stdenv.mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.12.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-IXinyenadnW+a+anQ9e61h+N8vG2r77JPboHm5dN4Iw="; + hash = "sha256-tdjmOeuC3LFEIDSH8X9LG/myvE1FoxwR1zpDQRyaTkQ="; }; - patches = [ - # fix the location of the jellyfin-web path - ./fix-web-path.patch - # disable update notifications since the end user can't simply download the release artifacts to update - ./disable-update-notifications.patch - - # cmake 4 compatibility - (fetchpatch { - url = "https://github.com/jellyfin/jellyfin-media-player/commit/6c5c603a1db489872832ed560581d98fdee89d6f.patch"; - hash = "sha256-Blq7y7kOygbZ6uKxPJl9aDXJWqhE0jnM5GNEAwyQEA0="; - }) - ]; - - buildInputs = [ - SDL2 - libGL - libX11 - libXrandr - libvdpau - mpv - qtbase - qtwebchannel - qtwebengine - qtx11extras - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - qtwayland - ]; - nativeBuildInputs = [ cmake ninja - pkg-config - python3 + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtdeclarative + qtwebchannel + qtwebengine + + mpvqt + + # input sources + libcec + SDL2 + + # frame rate switching + libXrandr ]; cmakeFlags = [ - "-DQTROOT=${qtbase}" - "-GNinja" - ] - ++ lib.optionals (!withDbus) [ - "-DLINUX_X11POWER=ON" + "-DCHECK_FOR_UPDATES=OFF" + "-DUSE_STATIC_MPVQT=OFF" + # workaround for Qt cmake weirdness + "-DQT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES=ON" ]; - preConfigure = '' - # link the jellyfin-web files to be copied by cmake (see fix-web-path.patch) - ln -s ${jellyfin-web}/share/jellyfin-web . - ''; - postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin $out/Applications mv "$out/Jellyfin Media Player.app" $out/Applications @@ -91,7 +62,7 @@ mkDerivation rec { meta = { homepage = "https://github.com/jellyfin/jellyfin-media-player"; - description = "Jellyfin Desktop Client based on Plex Media Player"; + description = "Jellyfin Desktop Client"; license = with lib.licenses; [ gpl2Only mit diff --git a/pkgs/applications/video/jellyfin-media-player/disable-update-notifications.patch b/pkgs/applications/video/jellyfin-media-player/disable-update-notifications.patch deleted file mode 100644 index 82978b65c677..000000000000 --- a/pkgs/applications/video/jellyfin-media-player/disable-update-notifications.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/resources/settings/settings_description.json b/resources/settings/settings_description.json -index 3329d0d..ccd5718 100644 ---- a/resources/settings/settings_description.json -+++ b/resources/settings/settings_description.json -@@ -127,7 +127,7 @@ - "value": "checkForUpdates", - "display_name": "Check For Updates", - "help": "Allows user to disable update check plugin script.", -- "default": true -+ "default": false - }, - { - "value": "enableInputRepeat", diff --git a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch b/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch deleted file mode 100644 index 3f182fd407ef..000000000000 --- a/pkgs/applications/video/jellyfin-media-player/fix-web-path.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9df49da..be1c479 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -106,7 +106,8 @@ endif() - set(RESOURCE_ROOT .) - if(APPLE) - set(RESOURCE_ROOT Resources) -- add_resources(TARGET ${MAIN_TARGET} SOURCES ${CMAKE_SOURCE_DIR}/native/ DEST ${RESOURCE_ROOT}/web-client/extension) -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${RESOURCE_ROOT}/web-client/desktop) -+ install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${RESOURCE_ROOT}/web-client/extension) - endif() - - if(NOT APPLE) -@@ -119,6 +120,7 @@ if(NOT APPLE) - install(FILES ${loc}/qtwebengine_devtools_resources.pak DESTINATION resources) - endif() - endforeach() -+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../jellyfin-web/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/desktop) - install(DIRECTORY ${CMAKE_SOURCE_DIR}/native/ DESTINATION ${INSTALL_RESOURCE_DIR}/web-client/extension) - endif() - -diff --git a/src/settings/SettingsComponent.cpp b/src/settings/SettingsComponent.cpp -index c398523..7023948 100644 ---- a/src/settings/SettingsComponent.cpp -+++ b/src/settings/SettingsComponent.cpp -@@ -748,7 +748,7 @@ QString SettingsComponent::getWebClientUrl(bool desktop) - - if (url == "bundled") - { -- auto path = Paths::webExtensionPath() + "find-webclient.html"; -+ auto path = Paths::webClientPath("desktop"); - - url = "file:///" + path; - } --- -2.36.0 - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index addbfcaa78f9..56b684baa014 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2046,7 +2046,7 @@ with pkgs; intensity-normalization = with python3Packages; toPythonApplication intensity-normalization; - jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { }; + jellyfin-media-player = kdePackages.callPackage ../applications/video/jellyfin-media-player { }; jellyfin-mpv-shim = python3Packages.callPackage ../applications/video/jellyfin-mpv-shim { }; From a526d941d254f3b5fe239b8856eda498595f2a84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 16:02:33 +0000 Subject: [PATCH 72/74] zlcompressor: 0.2.1 -> 0.3.1 --- pkgs/by-name/zl/zlcompressor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zl/zlcompressor/package.nix b/pkgs/by-name/zl/zlcompressor/package.nix index a6bda5c5f0fe..435b54286ce9 100644 --- a/pkgs/by-name/zl/zlcompressor/package.nix +++ b/pkgs/by-name/zl/zlcompressor/package.nix @@ -29,13 +29,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "zlcompressor"; - version = "0.2.1"; + version = "0.3.1"; src = fetchFromGitHub { owner = "ZL-Audio"; repo = "ZLCompressor"; tag = "${finalAttrs.version}"; - hash = "sha256-0Z29+jLtAtThFaVVqvuqUJkj1VRI69WOvIbEfE45db4="; + hash = "sha256-G7tgRenRB6aYpi+BSiQzwSsekvCw4JPUuy1iXVj7HN0="; fetchSubmodules = true; }; From 8a1a887dca31ebfb88cea238acb8d0f83148efce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Dec 2025 16:02:34 +0000 Subject: [PATCH 73/74] zlsplitter: 0.2.0 -> 0.2.1 --- pkgs/by-name/zl/zlsplitter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zl/zlsplitter/package.nix b/pkgs/by-name/zl/zlsplitter/package.nix index 6a9f36a5d63d..c28ceac5a8dc 100644 --- a/pkgs/by-name/zl/zlsplitter/package.nix +++ b/pkgs/by-name/zl/zlsplitter/package.nix @@ -29,13 +29,13 @@ clangStdenv.mkDerivation (finalAttrs: { pname = "zlsplitter"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "ZL-Audio"; repo = "ZLSplitter"; tag = "${finalAttrs.version}"; - hash = "sha256-8a/t1yJG5CUr4udnKIy80exQejDy0HzOi7uMjelPldg="; + hash = "sha256-6ICXL1jX6MMYf5VasTW9osJ2BNb6jqWfeAtmmEp6L/4="; fetchSubmodules = true; }; From 3e1f5d9b0fbd7ada62385770814143b05dcf5d95 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 Dec 2025 20:32:08 +0300 Subject: [PATCH 74/74] Revert "kdePackages.libplasma: fix build nondeterminism" --- pkgs/kde/plasma/libplasma/default.nix | 5 --- .../plasma/libplasma/rb-extracomponents.patch | 37 ------------------- 2 files changed, 42 deletions(-) delete mode 100644 pkgs/kde/plasma/libplasma/rb-extracomponents.patch diff --git a/pkgs/kde/plasma/libplasma/default.nix b/pkgs/kde/plasma/libplasma/default.nix index 453c9d328f9e..f13240876725 100644 --- a/pkgs/kde/plasma/libplasma/default.nix +++ b/pkgs/kde/plasma/libplasma/default.nix @@ -8,11 +8,6 @@ mkKdeDerivation { pname = "libplasma"; - patches = [ - # https://invent.kde.org/plasma/libplasma/-/merge_requests/1406 - ./rb-extracomponents.patch - ]; - extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ diff --git a/pkgs/kde/plasma/libplasma/rb-extracomponents.patch b/pkgs/kde/plasma/libplasma/rb-extracomponents.patch deleted file mode 100644 index 393a4df780f0..000000000000 --- a/pkgs/kde/plasma/libplasma/rb-extracomponents.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 49d9faf0b11b3957d36c21f90b9f34933f507438 -Author: Arnout Engelen -Date: Sun Dec 14 10:43:57 2025 +0100 - - reproducible builds: make qml dependencies explicit - - Similar to https://qt-project.atlassian.net/browse/QTBUG-137440 - - To fix https://bugs.kde.org/show_bug.cgi?id=512868 - - I'll admit I don't quite know what I'm doing here, I'm mostly guessing and mimicking, but it does seem to remove the nondeterminism :) - -diff --git a/src/declarativeimports/plasmaextracomponents/CMakeLists.txt b/src/declarativeimports/plasmaextracomponents/CMakeLists.txt -index 1a7827819..a8e335af7 100644 ---- a/src/declarativeimports/plasmaextracomponents/CMakeLists.txt -+++ b/src/declarativeimports/plasmaextracomponents/CMakeLists.txt -@@ -1,4 +1,8 @@ --ecm_add_qml_module(plasmaextracomponentsplugin VERSION 2.0 URI "org.kde.plasma.extras" GENERATE_PLUGIN_SOURCE) -+ecm_add_qml_module(plasmaextracomponentsplugin URI "org.kde.plasma.extras" -+ VERSION 2.0 -+ GENERATE_PLUGIN_SOURCE -+ LIBRARIES org_kde_plasmacomponents3 -+) - - target_sources(plasmaextracomponentsplugin PRIVATE - qmenu.cpp -@@ -42,7 +46,9 @@ target_link_libraries(plasmaextracomponentsplugin PRIVATE - Qt6::Qml - Qt6::Widgets - KF6::WidgetsAddons -- Plasma::Plasma) -+ Plasma::Plasma -+ org_kde_plasmacomponents3 -+) - - ecm_finalize_qml_module(plasmaextracomponentsplugin DESTINATION ${KDE_INSTALL_QMLDIR}) -