From 2854768f67f4c914d99d3bd214daeb00dfd8d0fd Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Tue, 25 Mar 2025 21:53:42 -0700 Subject: [PATCH 01/60] bazel_7: 7.4.1 -> 7.6.0 --- .../tools/build-managers/bazel/bazel_7/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix index 72e323f71bcf..613f04f84c91 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_7/default.nix @@ -44,7 +44,7 @@ # Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). # Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). enableNixHacks ? false, - version ? "7.4.1", + version ? "7.6.0", }: let @@ -52,7 +52,7 @@ let src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-gzhmGLxIn02jYmbvJiDsZKUmxobPBwQTMsr/fJU6+vU="; + hash = "sha256-eQKNB38G8ziDuorzoj5Rne/DZQL22meVLrdK0z7B2FI="; }; defaultShellUtils = From 31454fdc7bf743664271aa3912929bc340d79a98 Mon Sep 17 00:00:00 2001 From: Rishik Yalamanchili <73787402+Rishik-Y@users.noreply.github.com> Date: Fri, 28 Mar 2025 15:03:19 +0530 Subject: [PATCH 02/60] inko: 0.15.0 -> 0.18.1 --- pkgs/by-name/in/inko/package.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/in/inko/package.nix b/pkgs/by-name/in/inko/package.nix index 86569b6d3ca1..f843be0e7bdd 100644 --- a/pkgs/by-name/in/inko/package.nix +++ b/pkgs/by-name/in/inko/package.nix @@ -2,7 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - llvm_16, + llvm_17, libffi, libz, libxml2, @@ -10,21 +10,22 @@ stdenv, makeWrapper, callPackage, + nix-update-script, }: rustPlatform.buildRustPackage rec { pname = "inko"; - version = "0.15.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "inko-lang"; repo = "inko"; - rev = "v${version}"; - hash = "sha256-Iojv8pTyILYpLFnoTlgUGmlfWWH0DgsGBRxzd3oRNwA="; + tag = "v${version}"; + hash = "sha256-jVfAfR02R2RaTtzFSBoLuq/wdPaaI/eochrZaRVdmHY="; }; useFetchCargoVendor = true; - cargoHash = "sha256-BTfg3uPLvbeKPgb7qF9WFYLzUCZ6AVRk9I0T2hxuVqU="; + cargoHash = "sha256-IOMhwcZHB5jVYDM65zifxCjVHWl1EBbxNA3WVmarWcs="; buildInputs = [ libffi @@ -35,7 +36,7 @@ rustPlatform.buildRustPackage rec { ]; nativeBuildInputs = [ - llvm_16 + llvm_17 makeWrapper ]; @@ -55,15 +56,18 @@ rustPlatform.buildRustPackage rec { cp -r std/src/* $out/lib/ ''; - passthru.tests = { - simple = callPackage ./test.nix { }; + passthru = { + updateScript = nix-update-script { }; + tests = { + simple = callPackage ./test.nix { }; + }; }; meta = { description = "Language for building concurrent software with confidence"; homepage = "https://inko-lang.org/"; license = lib.licenses.mpl20; - maintainers = [ lib.maintainers.feathecutie ]; + maintainers = [ lib.maintainers.feathecutie ] ++ lib.teams.ngi.members; platforms = lib.platforms.unix; mainProgram = "inko"; }; From 5aa5cf90ce13bbece4f72945db841c81705d4d59 Mon Sep 17 00:00:00 2001 From: Rishik Yalamanchili <73787402+Rishik-Y@users.noreply.github.com> Date: Fri, 28 Mar 2025 16:20:31 +0530 Subject: [PATCH 03/60] ivm: Add update script, tag in src, rev -> finalAttr --- pkgs/by-name/iv/ivm/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/iv/ivm/package.nix b/pkgs/by-name/iv/ivm/package.nix index 532483df6915..0b77216beae2 100644 --- a/pkgs/by-name/iv/ivm/package.nix +++ b/pkgs/by-name/iv/ivm/package.nix @@ -10,16 +10,17 @@ libz, libxml2, ncurses, + nix-update-script, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttr: { pname = "ivm"; version = "0.6.0"; src = fetchFromGitHub { owner = "inko-lang"; repo = "ivm"; - rev = "v${version}"; + tag = "v${finalAttr.version}"; hash = "sha256-pqqUvHK6mPrK1Mir2ILANxtih9OrAKDJPE0nRWc5JOY="; }; @@ -53,12 +54,14 @@ rustPlatform.buildRustPackage rec { } ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Cross-platform Inko version manager"; homepage = "https://github.com/inko-lang/ivm"; license = lib.licenses.mpl20; - maintainers = [ lib.maintainers.feathecutie ]; + maintainers = [ lib.maintainers.feathecutie ] ++ lib.teams.ngi.members; platforms = lib.platforms.unix; mainProgram = "ivm"; }; -} +}) From f975409e9ee9900677f4c140630a5cc950fe0312 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 28 Mar 2025 20:54:00 +0000 Subject: [PATCH 04/60] buf: 1.50.1 -> 1.51.0 --- pkgs/by-name/bu/buf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix index a63c8f2b29c9..8caab640a499 100644 --- a/pkgs/by-name/bu/buf/package.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.50.1"; + version = "1.51.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-n4X8Wgi/5z6fteR+uxr68R3kD7eorMzlAW8jacTZGHg="; + hash = "sha256-/6SDsIVyorDWjOkdUB1t0vAA2VLy6MiGyiFo+2rUfEU="; }; - vendorHash = "sha256-HU4Di8ri2d93EUscCx8/gRiEJdLTcnKUaQ4kesKfZ+w="; + vendorHash = "sha256-4GD2yNfYTQobPeJ+zPQ+ECDTeNUi4PK8oXSxpBF/4Wk="; patches = [ # Skip a test that requires networking to be available to work. From 3576f97367828cf7bcb25fa7786a80f9ae62429a Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 25 Mar 2025 22:48:55 +0100 Subject: [PATCH 05/60] immich: fix npmDeps build failure It seems like c++filt and readelf are not always in PATH. npmDeps fails to build because of that. We add `|| true` to be resilient to this and move to prePatch because npmConfigHook is a postPatch hook. --- pkgs/by-name/im/immich/package.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index 0bba7243bf87..41184f4fb8d1 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -120,6 +120,16 @@ let sourceRoot = "${src.name}/web"; inherit (sources.components.web) npmDepsHash; + # prePatch is needed because npmConfigHook is a postPatch + prePatch = '' + # some part of the build wants to use un-prefixed binaries. let them. + mkdir -p $TMP/bin + ln -s "$(type -p ${stdenv.cc.targetPrefix}pkg-config)" $TMP/bin/pkg-config || true + ln -s "$(type -p ${stdenv.cc.targetPrefix}c++filt)" $TMP/bin/c++filt || true + ln -s "$(type -p ${stdenv.cc.targetPrefix}readelf)" $TMP/bin/readelf || true + export PATH="$TMP/bin:$PATH" + ''; + preBuild = '' rm node_modules/@immich/sdk ln -s ${openapi} node_modules/@immich/sdk @@ -161,7 +171,8 @@ buildNpmPackage' { src = "${src}/server"; inherit (sources.components.server) npmDepsHash; - postPatch = '' + # prePatch is needed because npmConfigHook is a postPatch + prePatch = '' # pg_dumpall fails without database root access # see https://github.com/immich-app/immich/issues/13971 substituteInPlace src/services/backup.service.ts \ @@ -169,9 +180,9 @@ buildNpmPackage' { # some part of the build wants to use un-prefixed binaries. let them. mkdir -p $TMP/bin - ln -s "$(type -p ${stdenv.cc.targetPrefix}pkg-config)" $TMP/bin/pkg-config - ln -s "$(type -p ${stdenv.cc.targetPrefix}c++filt)" $TMP/bin/c++filt - ln -s "$(type -p ${stdenv.cc.targetPrefix}readelf)" $TMP/bin/readelf + ln -s "$(type -p ${stdenv.cc.targetPrefix}pkg-config)" $TMP/bin/pkg-config || true + ln -s "$(type -p ${stdenv.cc.targetPrefix}c++filt)" $TMP/bin/c++filt || true + ln -s "$(type -p ${stdenv.cc.targetPrefix}readelf)" $TMP/bin/readelf || true export PATH="$TMP/bin:$PATH" ''; From c464d0577ed3582bdd4edee2e698b7d0e9f14361 Mon Sep 17 00:00:00 2001 From: BirdeeHub Date: Fri, 28 Mar 2025 20:12:56 -0700 Subject: [PATCH 06/60] vimPlugins.lzextras: 0.2.5 -> 0.3.0 --- pkgs/development/lua-modules/generated-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 2beeb6f0548f..7bf08ed28ff8 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2613,14 +2613,14 @@ buildLuarocksPackage { lzextras = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }: buildLuarocksPackage { pname = "lzextras"; - version = "0.2.5-1"; + version = "0.3.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lzextras-0.2.5-1.rockspec"; - sha256 = "0aqvly57k99fgcxhs1dfqyrf8bl7v6x75vdcjqpqsm3pkpvs1nl4"; + url = "mirror://luarocks/lzextras-0.3.0-1.rockspec"; + sha256 = "1w8ar8qi1hnbnj70f3lhrzf0hp1d0jbvya9v318pqcd16wh7x6ii"; }).outPath; src = fetchzip { - url = "https://github.com/BirdeeHub/lzextras/archive/v0.2.5.zip"; - sha256 = "1lk2k0iml8livwn1sjabn8d808alvd0axx6p9xcsb83x69g8a0dj"; + url = "https://github.com/BirdeeHub/lzextras/archive/v0.3.0.zip"; + sha256 = "0942wnlk7cf74z2ni3dhv2zm8ld4nazs9ciaql00vvbswh4a9z2w"; }; disabled = luaOlder "5.1"; From c0f55b6a07ed24c626b74af726b45998d1e4e48f Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Sat, 29 Mar 2025 03:20:33 +0000 Subject: [PATCH 07/60] authenticator: 4.6.0 -> 4.6.2 Diff: https://gitlab.gnome.org/World/Authenticator/-/compare/4.6.0..4.6.2 --- pkgs/by-name/au/authenticator/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/au/authenticator/package.nix b/pkgs/by-name/au/authenticator/package.nix index 93612f60099d..b0fd32a342a7 100644 --- a/pkgs/by-name/au/authenticator/package.nix +++ b/pkgs/by-name/au/authenticator/package.nix @@ -26,20 +26,20 @@ stdenv.mkDerivation rec { pname = "authenticator"; - version = "4.6.0"; + version = "4.6.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "Authenticator"; rev = version; - hash = "sha256-Kq/J/1+ROibR6NjfH/g760/CT4DZg1hIcsXQ4MHzrDc="; + hash = "sha256-UvHIVUed4rxmjliaZ7jnwCjiHyvUDihoJyG3G+fYtow="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit src; name = "${pname}-${version}"; - hash = "sha256-SQDr4jdCZzuizYWwJ5crrunqN8O2bCUv5gIslBduAZY="; + hash = "sha256-iOIGm3egVtVM6Eb3W5/ys9nQV5so0dnv2ZODjQwrVyw="; }; preFixup = '' From 75de78d637ca8ca050e251c3e3fac8e889558a80 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Fri, 28 Mar 2025 23:52:10 -0400 Subject: [PATCH 08/60] authenticator: format with nixfmt --- pkgs/by-name/au/authenticator/package.nix | 49 ++++++++++++----------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/au/authenticator/package.nix b/pkgs/by-name/au/authenticator/package.nix index b0fd32a342a7..3ae7d08e7195 100644 --- a/pkgs/by-name/au/authenticator/package.nix +++ b/pkgs/by-name/au/authenticator/package.nix @@ -1,27 +1,28 @@ -{ lib -, stdenv -, fetchFromGitLab -, appstream-glib -, cargo -, desktop-file-utils -, meson -, ninja -, pkg-config -, rustPlatform -, rustc -, wrapGAppsHook4 -, gdk-pixbuf -, glib -, gst_all_1 -, gtk4 -, libadwaita -, openssl -, pipewire -, sqlite -, wayland -, zbar -, glycin-loaders -, nix-update-script +{ + lib, + stdenv, + fetchFromGitLab, + appstream-glib, + cargo, + desktop-file-utils, + meson, + ninja, + pkg-config, + rustPlatform, + rustc, + wrapGAppsHook4, + gdk-pixbuf, + glib, + gst_all_1, + gtk4, + libadwaita, + openssl, + pipewire, + sqlite, + wayland, + zbar, + glycin-loaders, + nix-update-script, }: stdenv.mkDerivation rec { From dbb90e1bf64a34678120bdaa2d06cd6b78c35722 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Fri, 28 Mar 2025 23:54:50 -0400 Subject: [PATCH 09/60] authenticator: modernize --- pkgs/by-name/au/authenticator/package.nix | 27 ++++++++++++----------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/au/authenticator/package.nix b/pkgs/by-name/au/authenticator/package.nix index 3ae7d08e7195..53946da43883 100644 --- a/pkgs/by-name/au/authenticator/package.nix +++ b/pkgs/by-name/au/authenticator/package.nix @@ -25,7 +25,7 @@ nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "authenticator"; version = "4.6.2"; @@ -33,24 +33,16 @@ stdenv.mkDerivation rec { domain = "gitlab.gnome.org"; owner = "World"; repo = "Authenticator"; - rev = version; + tag = finalAttrs.version; hash = "sha256-UvHIVUed4rxmjliaZ7jnwCjiHyvUDihoJyG3G+fYtow="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; + inherit (finalAttrs) pname version src; hash = "sha256-iOIGm3egVtVM6Eb3W5/ys9nQV5so0dnv2ZODjQwrVyw="; }; - preFixup = '' - gappsWrapperArgs+=( - # vp8enc preset - --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" - # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44 - --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" - ) - ''; + strictDeps = true; nativeBuildInputs = [ appstream-glib @@ -82,6 +74,15 @@ stdenv.mkDerivation rec { zbar ]; + preFixup = '' + gappsWrapperArgs+=( + # vp8enc preset + --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets" + # See https://gitlab.gnome.org/sophie-h/glycin/-/blob/0.1.beta.2/glycin/src/config.rs#L44 + --prefix XDG_DATA_DIRS : "${glycin-loaders}/share" + ) + ''; + passthru = { updateScript = nix-update-script { }; }; @@ -94,4 +95,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ austinbutler ] ++ lib.teams.gnome-circle.members; platforms = lib.platforms.linux; }; -} +}) From 6e5f9e8b49fea75838cc29a1d9a944ab211b79a3 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 20 Mar 2025 04:40:23 +0800 Subject: [PATCH 10/60] emacs: bump package-build used by melpaBuild This bump causes a few build failures because package--description-file cannot correctly parse some package names. We report that to upstream Emacs as bug#77143. Refer to that bug for more information. A dirty patch is vendored in elpa2nix.el to fix those build failures. This bump also fixes magit-p4 build failure[1]. [1]: https://hydra.nix-community.org/build/4516070 --- .../editors/emacs/build-support/elpa2nix.el | 10 +++++++++ .../editors/emacs/build-support/melpa.nix | 9 +++++--- .../editors/emacs/build-support/melpa2nix.el | 8 +++---- .../package-build-dont-use-mtime.patch | 21 ------------------- 4 files changed, 19 insertions(+), 29 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch diff --git a/pkgs/applications/editors/emacs/build-support/elpa2nix.el b/pkgs/applications/editors/emacs/build-support/elpa2nix.el index 5b363b7b6640..40d822fdb6dc 100644 --- a/pkgs/applications/editors/emacs/build-support/elpa2nix.el +++ b/pkgs/applications/editors/emacs/build-support/elpa2nix.el @@ -1,6 +1,16 @@ (require 'package) (package-initialize) +;; TODO remove this patch when Emacs bug#77143 is fixed +;; see that bug for more info +(defun package--description-file (dir) + "Return package description file name for package DIR." + (concat (let ((subdir (file-name-nondirectory + (directory-file-name dir)))) + (if (string-match "\\([^.].*?\\)-\\([0-9]+\\(?:[.][0-9]+\\|\\(?:pre\\|beta\\|alpha\\|snapshot\\)[0-9]+\\)*\\)\\'" subdir) + (match-string 1 subdir) subdir)) + "-pkg.el")) + (defun elpa2nix-install-package () (if (not noninteractive) (error "`elpa2nix-install-package' is to be used only with -batch")) diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix index 876cf9a46ddc..0c77acc9d6b4 100644 --- a/pkgs/applications/editors/emacs/build-support/melpa.nix +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -24,11 +24,14 @@ let src = fetchFromGitHub { owner = "melpa"; repo = "package-build"; - rev = "d5661f1f1996a893fbcbacb4d290c57acab4fb0e"; - hash = "sha256-zVhFR2kLLkCKC+esPBbIk3qOa033YND1HF9GiNI4JM8="; + rev = "d1722503145facf96631ac118ec0213a73082b76"; + hash = "sha256-utsZLm9IF9UkTwxFWvJmwA3Ox4tlMeNNTo+f/CqYJGA="; }; - patches = [ ./package-build-dont-use-mtime.patch ]; + prePatch = '' + substituteInPlace package-build.el \ + --replace-fail '(format "--mtime=@%d" time)' '"--mtime=@0"' + ''; dontConfigure = true; dontBuild = true; diff --git a/pkgs/applications/editors/emacs/build-support/melpa2nix.el b/pkgs/applications/editors/emacs/build-support/melpa2nix.el index 91706e92f733..f2cb334f4c41 100644 --- a/pkgs/applications/editors/emacs/build-support/melpa2nix.el +++ b/pkgs/applications/editors/emacs/build-support/melpa2nix.el @@ -12,11 +12,9 @@ (let* ((default-directory (package-recipe--working-tree rcp))) (unwind-protect (let ((files (package-build-expand-files-spec rcp t))) - (unless files - (error "Unable to find files matching recipe patterns")) - (if (> (length files) 1) - (package-build--build-multi-file-package rcp files) - (package-build--build-single-file-package rcp files)))))) + (if files + (funcall package-build-build-function rcp files) + (error "Unable to find files matching recipe patterns")))))) (defun melpa2nix-build-package () (unless noninteractive diff --git a/pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch b/pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch deleted file mode 100644 index 1ace7771ea3a..000000000000 --- a/pkgs/applications/editors/emacs/build-support/package-build-dont-use-mtime.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/package-build.el b/package-build.el -index 29cdb61..c19be1b 100644 ---- a/package-build.el -+++ b/package-build.el -@@ -923,7 +923,6 @@ DIRECTORY is a temporary directory that contains the directory - that is put in the tarball." - (let* ((name (oref rcp name)) - (version (oref rcp version)) -- (time (oref rcp time)) - (tar (expand-file-name (concat name "-" version ".tar") - package-build-archive-dir)) - (dir (concat name "-" version))) -@@ -939,7 +938,7 @@ that is put in the tarball." - ;; prevent a reproducible tarball as described at - ;; https://reproducible-builds.org/docs/archives. - "--sort=name" -- (format "--mtime=@%d" time) -+ "--mtime=@0" - "--owner=0" "--group=0" "--numeric-owner" - "--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime")) - (when (and package-build-verbose noninteractive) From 23984b23151c4ed9035f2856180e5c465184f376 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 20 Mar 2025 06:36:55 +0800 Subject: [PATCH 11/60] emacs.pkgs.color-theme-solarized: fix build --- .../manual-packages/color-theme-solarized/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix index e544c4cca18b..0d3903fb81f9 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix @@ -6,6 +6,7 @@ melpaBuild { pname = "color-theme-solarized"; + ename = "solarized-theme"; version = "0-unstable-2023-02-09"; src = fetchFromGitHub { @@ -15,6 +16,8 @@ melpaBuild { hash = "sha256-7E8r56dzfD06tsQEnqU5mWSbwz9x9QPbzken2J/fhlg="; }; + files = ''(:defaults (:exclude "color-theme-solarized-pkg.el"))''; + # https://github.com/NixOS/nixpkgs/issues/335408 ignoreCompilationError = true; From bcdc68e3410d7ae6cdce8e05cf7775fc2bc5e94a Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 29 Mar 2025 13:58:07 +0800 Subject: [PATCH 12/60] emacs.pkgs.session-management-for-emacs: fix build --- .../manual-packages/session-management-for-emacs/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix index 495e274735f4..9896e8bd4b35 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix @@ -8,6 +8,7 @@ melpaBuild rec { pname = "session-management-for-emacs"; ename = "session"; version = "2.2a"; + melpaVersion = "2.2"; # default value derived from version is not valid for Emacs src = fetchzip { url = "mirror://sourceforge/emacs-session/session-${version}.tar.gz"; From 4a760ed59d235769c666a56f072e9a27d41f4c43 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 29 Mar 2025 15:51:27 +0800 Subject: [PATCH 13/60] emacs.pkgs.pod-mode: fix build --- .../emacs/elisp-packages/manual-packages/pod-mode/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix index bf6d2aef72ce..88bf60e1cc16 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix @@ -15,6 +15,7 @@ let in melpaBuild { inherit pname version src; + melpaVersion = "1.4"; # upstream versions such as 1.04 are not supported outputs = [ "out" From 911956b3164b902f10a0275fffe6e4c4eac53277 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Mar 2025 11:32:53 +0000 Subject: [PATCH 14/60] starlark: 0-unstable-2025-02-25 -> 0-unstable-2025-03-18 --- pkgs/by-name/st/starlark/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix index 8af3be625f35..5b795b307130 100644 --- a/pkgs/by-name/st/starlark/package.nix +++ b/pkgs/by-name/st/starlark/package.nix @@ -6,13 +6,13 @@ }: buildGoModule { pname = "starlark"; - version = "0-unstable-2025-02-25"; + version = "0-unstable-2025-03-18"; src = fetchFromGitHub { owner = "google"; repo = "starlark-go"; - rev = "0d3f41d403af5d6607cdf241f12b7e0572f2cb58"; - hash = "sha256-ZZR89U2+LhzAptNz/S2qMBKNGdf5xUbXLcLCHizhQ2A="; + rev = "d9371fef63fe912333a96a4e54ff72d071cb71ad"; + hash = "sha256-gbhn9bvt5SjOvdIEyQzMitLpS3KdOvvvR73l4E6Hap8="; }; vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo="; From c708851f958291434fec18289dfc9ce91e94d4fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Mar 2025 11:33:14 +0000 Subject: [PATCH 15/60] txtpbfmt: 0-unstable-2025-03-17 -> 0-unstable-2025-03-26 --- pkgs/by-name/tx/txtpbfmt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tx/txtpbfmt/package.nix b/pkgs/by-name/tx/txtpbfmt/package.nix index 92f7b5ccbf3d..2ef1368bc4ed 100644 --- a/pkgs/by-name/tx/txtpbfmt/package.nix +++ b/pkgs/by-name/tx/txtpbfmt/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "txtpbfmt"; - version = "0-unstable-2025-03-17"; + version = "0-unstable-2025-03-26"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "txtpbfmt"; - rev = "bcaa21031d50b90bf873b5e952f30b4721fadfc0"; - hash = "sha256-KqIkenKJwn6QssUOJDwusDU/h9K5DSWPxflbmoWUMEY="; + rev = "a5fe55684d52b017a494471a2a08264d778166ad"; + hash = "sha256-e8tDQOr6CtGjVhhiPjSG14adrqi5geBitD1SnqL6Tx8="; }; vendorHash = "sha256-iWY0b6PAw9BhA8WrTEECnVAKWTGXuIiGvOi9uhJO4PI="; From e6bcd21f1f792390ed20c73c296cb1f8b0116e44 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 29 Mar 2025 08:23:29 -0400 Subject: [PATCH 16/60] opencollada: formatting Alphabetize params, reorder attrs to be more idiomatic, adjust spacing. --- pkgs/by-name/op/opencollada/package.nix | 38 ++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/op/opencollada/package.nix b/pkgs/by-name/op/opencollada/package.nix index 2e12e13f56c4..274c258ca85c 100644 --- a/pkgs/by-name/op/opencollada/package.nix +++ b/pkgs/by-name/op/opencollada/package.nix @@ -1,18 +1,17 @@ { - lib, - stdenv, + cmake, + darwin, fetchFromGitHub, fetchurl, - cmake, - pkg-config, + lib, libxml2, pcre, - darwin, + pkg-config, + stdenv, }: stdenv.mkDerivation rec { pname = "opencollada"; - version = "1.6.68"; src = fetchFromGitHub { @@ -32,19 +31,6 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ AGL ] - ); - - propagatedBuildInputs = [ - libxml2 - pcre - ]; - postPatch = '' # Drop blanket -Werror as it tends to fail on newer toolchain for @@ -56,6 +42,20 @@ stdenv.mkDerivation rec { --replace math.h cmath ''; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; [ AGL ] + ); + + propagatedBuildInputs = [ + libxml2 + pcre + ]; + meta = { description = "Library for handling the COLLADA file format"; homepage = "https://github.com/KhronosGroup/OpenCOLLADA/"; From 625c383164dca6eb553a7edbc246a00153798aee Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 29 Mar 2025 08:25:59 -0400 Subject: [PATCH 17/60] opencollada: remove unneeded Apple SDK Per PR review: > Our darwin SDK has been reworked, so these frameworks are not needed > and provide empty dummies. --- pkgs/by-name/op/opencollada/package.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/by-name/op/opencollada/package.nix b/pkgs/by-name/op/opencollada/package.nix index 274c258ca85c..58d743702fee 100644 --- a/pkgs/by-name/op/opencollada/package.nix +++ b/pkgs/by-name/op/opencollada/package.nix @@ -1,6 +1,5 @@ { cmake, - darwin, fetchFromGitHub, fetchurl, lib, @@ -47,10 +46,6 @@ stdenv.mkDerivation rec { pkg-config ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin ( - with darwin.apple_sdk.frameworks; [ AGL ] - ); - propagatedBuildInputs = [ libxml2 pcre From 7380fd09432e846e6ebb987bc06780b3c375db5c Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 2 Mar 2025 21:44:24 -0500 Subject: [PATCH 18/60] opencollada-blender: init at unstable-2025-01-30 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Blender is now using a fork of OpenCOLLADA. They have done so since 4.2, but in the upcoming Blender 4.4, Blender will fail to build with the original and needs this fork. This fork “removes everything (a lot!) that is not actually needed by Blender” and so is likely not suitable for use by other projects (of which there are a few within Nixpkgs). See more in [upstream README][1]. [1]: https://github.com/aras-p/OpenCOLLADA/blob/4526eb8aaa6462c71fbedd23103976c151a01c50/README.md --- .../op/opencollada-blender/package.nix | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/op/opencollada-blender/package.nix diff --git a/pkgs/by-name/op/opencollada-blender/package.nix b/pkgs/by-name/op/opencollada-blender/package.nix new file mode 100644 index 000000000000..0048aaa2ea2c --- /dev/null +++ b/pkgs/by-name/op/opencollada-blender/package.nix @@ -0,0 +1,39 @@ +{ + cmake, + fetchFromGitHub, + lib, + libxml2, + pcre, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation { + pname = "opencollada"; + version = "unstable-2025-01-30"; + + src = fetchFromGitHub { + owner = "aras-p"; + repo = "OpenCOLLADA"; + rev = "4526eb8aaa6462c71fbedd23103976c151a01c50"; + sha256 = "sha256-ctr+GjDzxOJxBfaMwjwayPkAOcF+FMsP1X72QCOwvTY="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + propagatedBuildInputs = [ + libxml2 + pcre + ]; + + meta = { + description = "Library for handling the COLLADA file format"; + homepage = "https://github.com/KhronosGroup/OpenCOLLADA/"; + maintainers = [ lib.maintainers.amarshall ]; + platforms = lib.platforms.unix; + license = lib.licenses.mit; + }; +} From 12be955b9e3e029f0c6274122b5fc040324f898a Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 20 Mar 2025 11:20:07 -0400 Subject: [PATCH 19/60] blender: move to pkgs/by-name --- pkgs/{applications/misc => by-name/bl}/blender/darwin.patch | 0 pkgs/{applications/misc => by-name/bl}/blender/draco.patch | 0 pkgs/{applications/misc => by-name/bl}/blender/libdecor.patch | 0 .../misc/blender/default.nix => by-name/bl/blender/package.nix} | 0 pkgs/{applications/misc => by-name/bl}/blender/test-cuda.py | 0 pkgs/{applications/misc => by-name/bl}/blender/wrapper.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 7 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{applications/misc => by-name/bl}/blender/darwin.patch (100%) rename pkgs/{applications/misc => by-name/bl}/blender/draco.patch (100%) rename pkgs/{applications/misc => by-name/bl}/blender/libdecor.patch (100%) rename pkgs/{applications/misc/blender/default.nix => by-name/bl/blender/package.nix} (100%) rename pkgs/{applications/misc => by-name/bl}/blender/test-cuda.py (100%) rename pkgs/{applications/misc => by-name/bl}/blender/wrapper.nix (100%) diff --git a/pkgs/applications/misc/blender/darwin.patch b/pkgs/by-name/bl/blender/darwin.patch similarity index 100% rename from pkgs/applications/misc/blender/darwin.patch rename to pkgs/by-name/bl/blender/darwin.patch diff --git a/pkgs/applications/misc/blender/draco.patch b/pkgs/by-name/bl/blender/draco.patch similarity index 100% rename from pkgs/applications/misc/blender/draco.patch rename to pkgs/by-name/bl/blender/draco.patch diff --git a/pkgs/applications/misc/blender/libdecor.patch b/pkgs/by-name/bl/blender/libdecor.patch similarity index 100% rename from pkgs/applications/misc/blender/libdecor.patch rename to pkgs/by-name/bl/blender/libdecor.patch diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/by-name/bl/blender/package.nix similarity index 100% rename from pkgs/applications/misc/blender/default.nix rename to pkgs/by-name/bl/blender/package.nix diff --git a/pkgs/applications/misc/blender/test-cuda.py b/pkgs/by-name/bl/blender/test-cuda.py similarity index 100% rename from pkgs/applications/misc/blender/test-cuda.py rename to pkgs/by-name/bl/blender/test-cuda.py diff --git a/pkgs/applications/misc/blender/wrapper.nix b/pkgs/by-name/bl/blender/wrapper.nix similarity index 100% rename from pkgs/applications/misc/blender/wrapper.nix rename to pkgs/by-name/bl/blender/wrapper.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 966a08bebffb..25f2bc972aae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12624,7 +12624,7 @@ with pkgs; pinentry = pinentry-curses; }; - blender = callPackage ../applications/misc/blender { + blender = callPackage ../by-name/bl/blender/package.nix { openexr = openexr_3; python3Packages = python311Packages; inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics ForceFeedback OpenAL OpenGL; From 310df2b3acd7c7ec29118f3621d4fdd676cda6eb Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Thu, 20 Mar 2025 11:28:22 -0400 Subject: [PATCH 20/60] blender: 4.3.2 -> 4.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changelog: https://developer.blender.org/docs/release_notes/4.4/ Diff: https://projects.blender.org/blender/blender/compare/v4.3.2..v4.4.0 - Blender now needs its fork of OpenCOLLADA to build successfully - Blender is now bundling assets with the release tarballs again, so go back to single src - Blender changed Draco location so we can have it work out-of-the-box and don’t have to move the Python dir around anymore; see upstream faaa12a10131b93757a8395f3448040436981e5f - Other patches we backported are now applied and unneeded - Blender added Pipewire support, but it’s off in their release builds currently so turn it off as well --- pkgs/by-name/bl/blender/draco.patch | 33 ------------------- pkgs/by-name/bl/blender/package.nix | 51 ++++++----------------------- 2 files changed, 10 insertions(+), 74 deletions(-) delete mode 100644 pkgs/by-name/bl/blender/draco.patch diff --git a/pkgs/by-name/bl/blender/draco.patch b/pkgs/by-name/bl/blender/draco.patch deleted file mode 100644 index a5abed18453f..000000000000 --- a/pkgs/by-name/bl/blender/draco.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 97596dbee8d..d1ad6ac5de0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1237,13 +1237,6 @@ set_and_warn_dependency(WITH_PYTHON WITH_CYCLES OFF) - set_and_warn_dependency(WITH_PYTHON WITH_DRACO OFF) - set_and_warn_dependency(WITH_PYTHON WITH_MOD_FLUID OFF) - --if(NOT WITH_PYTHON_MODULE) -- if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL) -- message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now") -- set(WITH_DRACO OFF) -- endif() --endif() -- - # enable boost for cycles, audaspace or i18n - # otherwise if the user disabled - -diff --git a/scripts/addons_core/io_scene_gltf2/io/com/draco.py b/scripts/addons_core/io_scene_gltf2/io/com/draco.py -index 75e23162c67..875596c3d2f 100644 ---- a/scripts/addons_core/io_scene_gltf2/io/com/draco.py -+++ b/scripts/addons_core/io_scene_gltf2/io/com/draco.py -@@ -31,8 +31,8 @@ def dll_path() -> Path: - :return: DLL path. - """ - lib_name = 'extern_draco' -- blender_root = Path(bpy.app.binary_path).parent -- python_lib = Path('{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version)) -+ blender_root = Path(bpy.app.binary_path).parent.parent -+ python_lib = Path('share/blender/{v[0]}.{v[1]}/python/lib'.format(v=bpy.app.version)) - python_version = 'python{v[0]}.{v[1]}'.format(v=sys.version_info) - - path = os.environ.get('BLENDER_EXTERN_DRACO_LIBRARY_PATH') diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index c5a4aa8405b2..6d4516c07a6e 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -18,8 +18,6 @@ cudaSupport ? config.cudaSupport, dbus, embree, - fetchgit, - fetchpatch2, fetchzip, ffmpeg, fftw, @@ -56,7 +54,7 @@ makeWrapper, mesa, openal, - opencollada, + opencollada-blender, opencolorio, openexr, openimagedenoise, @@ -114,42 +112,15 @@ in stdenv'.mkDerivation (finalAttrs: { pname = "blender"; - version = "4.3.2"; + version = "4.4.0"; - srcs = [ - (fetchzip { - name = "source"; - url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; - hash = "sha256-LCU2JpQbvQ+W/jC+H8J2suh+X5sTLOG9TcE2EeHqVh4="; - }) - (fetchgit { - name = "assets"; - url = "https://projects.blender.org/blender/blender-assets.git"; - rev = "v${finalAttrs.version}"; - fetchLFS = true; - hash = "sha256-B/UibETNBEUAO1pLCY6wR/Mmdk2o9YyNs6z6pV8dBJI="; - }) - ]; + srcs = fetchzip { + name = "source"; + url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; + hash = "sha256-pAzOayAPyRYgTixAyg2prkUtI70uFulRuBYhgU9ZNw4="; + }; - postUnpack = '' - chmod -R u+w * - rm -r assets/working - mv assets --target-directory source/release/datafiles/ - ''; - - sourceRoot = "source"; - - patches = [ - ./draco.patch - (fetchpatch2 { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/raw/4b6214600e11851d7793256e2f6846a594e6f223/ffmpeg-7-1.patch"; - hash = "sha256-YXXqP/+79y3f41n3cJ3A1RBzgdoYqfKZD/REqmWYdgQ="; - }) - (fetchpatch2 { - url = "https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/raw/4b6214600e11851d7793256e2f6846a594e6f223/ffmpeg-7-2.patch"; - hash = "sha256-mF6IA/dbHdNEkBN5XXCRcLIZ/8kXoirNwq7RDuLRAjw="; - }) - ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; + patches = [ ] ++ lib.optional stdenv.hostPlatform.isDarwin ./darwin.patch; postPatch = (lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -201,6 +172,7 @@ stdenv'.mkDerivation (finalAttrs: { "-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}" "-DWITH_OPENSUBDIV=ON" "-DWITH_OPENVDB=ON" + "-DWITH_PIPEWIRE=OFF" "-DWITH_PULSEAUDIO=OFF" "-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL_NUMPY=OFF" @@ -330,7 +302,7 @@ stdenv'.mkDerivation (finalAttrs: { wayland wayland-protocols ] - ++ lib.optional colladaSupport opencollada + ++ lib.optional colladaSupport opencollada-blender ++ lib.optional jackaudioSupport libjack2 ++ lib.optional spaceNavSupport libspnav ++ lib.optionals vulkanSupport [ @@ -365,9 +337,6 @@ stdenv'.mkDerivation (finalAttrs: { mkdir $out/Applications mv $out/Blender.app $out/Applications '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - mv $out/share/blender/${lib.versions.majorMinor finalAttrs.version}/python{,-ext} - '' + '' buildPythonPath "$pythonPath" wrapProgram $blenderExecutable \ From 05d78e5d2f691136d1553a32b488bb2e973d0290 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Thu, 27 Mar 2025 08:23:39 +0100 Subject: [PATCH 21/60] xtensor: Fix darwin build with clang --- ...001-Fix-clang-build-errors-on-darwin.patch | 66 +++++++++++++++++++ pkgs/by-name/xt/xtensor/package.nix | 3 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/by-name/xt/xtensor/0001-Fix-clang-build-errors-on-darwin.patch diff --git a/pkgs/by-name/xt/xtensor/0001-Fix-clang-build-errors-on-darwin.patch b/pkgs/by-name/xt/xtensor/0001-Fix-clang-build-errors-on-darwin.patch new file mode 100644 index 000000000000..3636d2bd1431 --- /dev/null +++ b/pkgs/by-name/xt/xtensor/0001-Fix-clang-build-errors-on-darwin.patch @@ -0,0 +1,66 @@ +From 475bedb15252a3732683f3a62c45cc3f1abbab5c Mon Sep 17 00:00:00 2001 +From: Mykola Vankovych +Date: Tue, 14 Jan 2025 16:48:47 +0100 +Subject: [PATCH] Added fixes for building with clang 19 (more strict template + matching rules) + +--- + include/xtensor/xexpression_traits.hpp | 7 +++---- + include/xtensor/xstorage.hpp | 4 ++-- + include/xtensor/xutils.hpp | 3 ++- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/include/xtensor/xexpression_traits.hpp b/include/xtensor/xexpression_traits.hpp +index 205de67a5..2f84ae234 100644 +--- a/include/xtensor/xexpression_traits.hpp ++++ b/include/xtensor/xexpression_traits.hpp +@@ -103,16 +103,15 @@ namespace xt + using type = xarray; + }; + +-#if defined(__GNUC__) && (__GNUC__ > 6) +-#if __cplusplus == 201703L ++// Workaround for rebind_container problems when C++17 feature is enabled ++#ifdef __cpp_template_template_args + template