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) 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; 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" 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"; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 376724be47c6..af8b2895dd41 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -257,8 +257,8 @@ let mktplcRef = { name = "ng-template"; publisher = "Angular"; - version = "19.2.1"; - hash = "sha256-X4ZDKgUyoBU8LIh+aM3JyvqGE9LnXVhvOXtAdX6gUv4="; + version = "19.2.2"; + hash = "sha256-WoNrKcK9Gr9gVWH/pwKyEUHuzcVNKh6zQwwpG4BuVCg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog"; @@ -524,8 +524,8 @@ let mktplcRef = { name = "vscode-bazel"; publisher = "bazelbuild"; - version = "0.10.0"; - sha256 = "sha256-8SUOzsUmfgt9fAy037qLVNrGJPvTnIeMNz2tbN5psbs="; + version = "0.11.0"; + sha256 = "sha256-c1Uvu9qBsQabdfhNxG0tCmCq3ub3wfgdoGor0cATo0c="; }; meta = { description = "Bazel support for Visual Studio Code"; @@ -720,8 +720,8 @@ let mktplcRef = { publisher = "bmalehorn"; name = "vscode-fish"; - version = "1.0.38"; - hash = "sha256-QEifCTlzYMX+5H6+k2o1lsQrhW3vxVpn+KFg/3WVVFo="; + version = "1.0.39"; + hash = "sha256-T5wD4btQ2HSq3vB1m/qHM7VcvHfZmMD9OV93ZwxXcQg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bmalehorn.vscode-fish/changelog"; @@ -781,8 +781,8 @@ let mktplcRef = { name = "vscode-tailwindcss"; publisher = "bradlc"; - version = "0.14.11"; - hash = "sha256-sZcbUIAs4m96rBfYJbyZegqAqL71+OjVykqna+QMdu0="; + version = "0.14.12"; + hash = "sha256-Dn+Z5uZYoWSriNnkYK1rRoHv8sjr7ui70UeTA3e0wIs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog"; @@ -877,8 +877,8 @@ let mktplcRef = { name = "catppuccin-vsc"; publisher = "catppuccin"; - version = "3.16.1"; - hash = "sha256-qEwQ583DW17dlJbODN8SNUMbDMCR1gUH4REaFkQT65I="; + version = "3.17.0"; + hash = "sha256-udDbsXAEsJUt3WUU8aBvCi8Pu+8gu+xQkimlmvRZ9pg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Catppuccin.catppuccin-vsc/changelog"; @@ -1424,8 +1424,8 @@ let mktplcRef = { name = "profiler-php-vscode"; publisher = "devsense"; - version = "1.41.14332"; - hash = "sha256-u2lNqG6FUhWnnNGtv+sjTbP/hbu4Da/8xjLzmPZkZOA="; + version = "1.57.17031"; + hash = "sha256-fC+8trGmvgYjsnJA6+L6sxFoE6Cr91Q7xdparE9JKyg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.profiler-php-vscode/changelog"; @@ -1725,8 +1725,8 @@ let mktplcRef = { name = "elm-ls-vscode"; publisher = "Elmtooling"; - version = "2.6.0"; - hash = "sha256-iNFc7YJFl3d4/BJE9TPJfL0iqEkUtyEyVt4v1J2bXts="; + version = "2.8.0"; + hash = "sha256-81tHgNjYc0LJjsgsQfo5xyh20k/i3PKcgYp9GZTvwfs="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/Elmtooling.elm-ls-vscode/changelog"; @@ -1830,8 +1830,8 @@ let mktplcRef = { name = "vscode-open-in-github"; publisher = "fabiospampinato"; - version = "2.3.0"; - hash = "sha256-vrW6uZyeEJipGtfz7BEeeAwiwtBlfQLjC7jAP1v5GoE="; + version = "2.3.1"; + hash = "sha256-wqY8AArlTpQzoZ9OfV9MzlHIr9M/Ac4QUZL99n327EI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/fabiospampinato.vscode-open-in-github/changelog"; @@ -1914,8 +1914,8 @@ let mktplcRef = { name = "foam-vscode"; publisher = "foam"; - version = "0.26.8"; - hash = "sha256-DI0iPx/Wan3cgUCWgRvXt0uESCIJBR6lF3y/TRgYFnc="; + version = "0.26.10"; + hash = "sha256-vhQtdc0553TyPkQnTHwg7Nr+UbDMf9yR+2jj40ANPdQ="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; @@ -2038,8 +2038,8 @@ let mktplcRef = { name = "godot-tools"; publisher = "geequlim"; - version = "2.3.0"; - hash = "sha256-iuSec4PoVxyu1KB2jfCYOd98UrqQjH3q24zOR4VCPgs="; + version = "2.5.1"; + hash = "sha256-kAzRSNZw1zaECblJv7NzXnE2JXSy9hzdT2cGX+uwleY="; }; meta = { description = "VS Code extension for game development with Godot Engine and GDScript"; @@ -2078,8 +2078,8 @@ let mktplcRef = { name = "chatgpt-vscode"; publisher = "genieai"; - version = "0.0.8"; - sha256 = "RKvmZkegFs4y+sEVaamPRO1F1E+k4jJyI0Q9XqKowrQ="; + version = "0.0.13"; + sha256 = "sha256-aoVICzU5sfA96FCU4ysUGmULruGWLaVo2lFpiPhdtGA="; }; }; @@ -2105,8 +2105,8 @@ let publisher = "github"; name = "copilot"; # Verify which version is available with nix run nixpkgs#vsce -- show github.copilot --json - version = "1.292.0"; - hash = "sha256-bgyDMEbIceTGtZ6CqUehkJLMAL8Osega6kMwb+buTAU="; + version = "1.293.0"; + hash = "sha256-LwgINocPHA9jL6pMw40BgaZ3lOUwWPoOJWTDr+27h5Q="; }; meta = { @@ -2199,8 +2199,8 @@ let mktplcRef = { name = "gleam"; publisher = "gleam"; - version = "2.3.0"; - hash = "sha256-dhRS8fLKY0plRwnrAUWT4g/LfH6IpODTNhT79g4Nm+0="; + version = "2.11.1"; + hash = "sha256-tySY6vPg71QQKeKivCoJzcAH73nML/NWhtr+TgaSKRg="; }; meta = { description = "Support for the Gleam programming language"; @@ -2263,8 +2263,8 @@ let mktplcRef = { name = "vscode-graphql-syntax"; publisher = "GraphQL"; - version = "1.3.6"; - hash = "sha256-74Y/LpOhAj3TSplohhJqBwJDT87nCAiKrWsF90bc8jU="; + version = "1.3.8"; + hash = "sha256-10x2kX9Gc7O/tGRDPZfy1cKdCIvGTCXcD2bDokIz7TU="; }; meta = { description = "Adds full GraphQL syntax highlighting and language support such as bracket matching"; @@ -2622,8 +2622,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "10.8.0"; - sha256 = "sha256-tdQ3Z/OfNH0UgpHcn8Zq5rQxoetD61dossEh8hRygew="; + version = "10.9.0"; + sha256 = "sha256-hexky9ZZt+u0H8HVcNiI2Jmx9HL5+uKHLVBNqEbgqLo="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; @@ -3283,8 +3283,8 @@ let mktplcRef = { name = "goto-next-previous-member"; publisher = "mishkinf"; - version = "0.0.6"; - sha256 = "07rpnbkb51835gflf4fpr0v7fhj8hgbhsgcz2wpag8wdzdxc3025"; + version = "0.0.10"; + sha256 = "sha256-mRPWEU/M5uhiDUl9KwQi6w5hfzIZxKMhO48ssVfICoQ="; }; meta = { license = lib.licenses.mit; @@ -3512,8 +3512,8 @@ let mktplcRef = { name = "anycode"; publisher = "ms-vscode"; - version = "0.0.73"; - hash = "sha256-83qz4wYnRK/KtrQMHwMAFhOnVyLXG1/EwUvVW2v30ho="; + version = "0.0.74"; + hash = "sha256-rTWAOvIsrl0DSqxoQy5eU6EREJovU1oRMC8/2Q6x4Hk="; }; meta = { license = lib.licenses.mit; @@ -3756,8 +3756,8 @@ let mktplcRef = { name = "color-highlight"; publisher = "naumovs"; - version = "2.6.0"; - hash = "sha256-TcPQOAHCYeFHPdR85GIXsy3fx70p8cLdO2UNO0krUOs="; + version = "2.8.0"; + hash = "sha256-mT2P1lEdW66YkDRN6fi0rmmvvyBfXiJjAUHns8a8ipE="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/naumovs.color-highlight/changelog"; @@ -4433,8 +4433,8 @@ let mktplcRef = { publisher = "shopify"; name = "ruby-lsp"; - version = "0.9.12"; - hash = "sha256-ahfVRbTAKmmqOWV7vHK0+KLwYSUVgKqlIG1+lV3E5c4="; + version = "0.9.13"; + hash = "sha256-Lde17QPuaubrvomwZjWA9f34/Dn0qyG5MQxMLJFWBQ8="; }; meta = { description = "VS Code plugin for connecting with the Ruby LSP"; @@ -4678,8 +4678,8 @@ let mktplcRef = { name = "vscode-stylelint"; publisher = "stylelint"; - version = "1.4.0"; - hash = "sha256-CsQBRoVDtNLlkHa6NLmOspkswB/JUMfMuU2dMYDlDnc="; + version = "1.5.0"; + hash = "sha256-SHUb7+eL0PWlw/KUidXPvE5+MFsJz1Fi7Csptiw8j4M="; }; meta = { description = "Official Stylelint extension for Visual Studio Code"; @@ -4751,8 +4751,8 @@ let mktplcRef = { name = "tabnine-vscode"; publisher = "tabnine"; - version = "3.247.0"; - hash = "sha256-TOpdiqkOUmC+CXJn0H3+NYqTHkeuNf2Y37F0OgN6YzM="; + version = "3.249.0"; + hash = "sha256-Pp1LlVAkozh2kIEvmPxg4LuuT08MeGbMN77M5Mx81qI="; }; meta = { license = lib.licenses.mit; @@ -5201,8 +5201,8 @@ let mktplcRef = { name = "vstuc"; publisher = "VisualStudioToolsForUnity"; - version = "1.1.0"; - hash = "sha256-86KDksbTKlPgKC1joUc7uQTsDe2w9AIL0fekZP0z6gE="; + version = "1.1.1"; + hash = "sha256-iE/o6hkDwT7jLTVvJbviQZgV+KnhSAGEZ2mf3gsua38="; }; meta = { description = "Integrates Visual Studio Code for Unity"; @@ -5344,8 +5344,8 @@ let mktplcRef = { name = "vscode-icons"; publisher = "vscode-icons-team"; - version = "12.11.0"; - hash = "sha256-RpuCHJBLqhAXAdvC0qGDUJIy5ww1yqlSb7hKwCALidM="; + version = "12.12.0"; + hash = "sha256-C73ZpmVJ9ltzbfV3LmawV2X/2e+e1F3dxaYZzKMBZdQ="; }; meta = { description = "Bring real icons to your Visual Studio Code"; @@ -5681,8 +5681,8 @@ let mktplcRef = { name = "vscode-zig"; publisher = "ziglang"; - version = "0.6.6"; - hash = "sha256-UxbCRsTp7Fz6iAeC3lwojWrLPMJx5b7cNXxOFY7k0pk="; + version = "0.6.7"; + hash = "sha256-l8pu348v2JUg/7+Qy5B41eyraPUj9WQ1WuW1aumgM9w="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix index a552111931e5..423e0c23c81f 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-pyright"; name = "pyright"; - version = "1.1.397"; - hash = "sha256-Z6iKOgAglxDdPz9D4pL1STj3+uy8S89oOalqfdV1reI="; + version = "1.1.398"; + hash = "sha256-fSBn4c1e1e4atJUV6STmEYB/++WXZFsN2v5+zyfYnZA="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix index 9ddb2152c907..f6e9f59ddf3b 100644 --- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix +++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "claude-dev"; publisher = "saoudrizwan"; - version = "3.8.3"; - hash = "sha256-0FAxQ67AKcSbCp8vQr2KUOIRw8LEQ3TQyJkfJwtmdoY="; + version = "3.8.4"; + hash = "sha256-Ona7JntYaHbh7/1Q3Y+7UxmI+X0H93Y/cIW73DXxA1M="; }; meta = { diff --git a/pkgs/applications/misc/blender/draco.patch b/pkgs/applications/misc/blender/draco.patch deleted file mode 100644 index a5abed18453f..000000000000 --- a/pkgs/applications/misc/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/au/authenticator/package.nix b/pkgs/by-name/au/authenticator/package.nix index 93612f60099d..53946da43883 100644 --- a/pkgs/by-name/au/authenticator/package.nix +++ b/pkgs/by-name/au/authenticator/package.nix @@ -1,55 +1,48 @@ -{ 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 { +stdenv.mkDerivation (finalAttrs: { 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="; + tag = finalAttrs.version; + hash = "sha256-UvHIVUed4rxmjliaZ7jnwCjiHyvUDihoJyG3G+fYtow="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; - name = "${pname}-${version}"; - hash = "sha256-SQDr4jdCZzuizYWwJ5crrunqN8O2bCUv5gIslBduAZY="; + 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 @@ -81,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 { }; }; @@ -93,4 +95,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ austinbutler ] ++ lib.teams.gnome-circle.members; platforms = lib.platforms.linux; }; -} +}) 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/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 89% rename from pkgs/applications/misc/blender/default.nix rename to pkgs/by-name/bl/blender/package.nix index c5a4aa8405b2..6d4516c07a6e 100644 --- a/pkgs/applications/misc/blender/default.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 \ 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/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. diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix index 574517a2e904..e565479fe648 100644 --- a/pkgs/by-name/im/immich-machine-learning/package.nix +++ b/pkgs/by-name/im/immich-machine-learning/package.nix @@ -22,7 +22,7 @@ python.pkgs.buildPythonApplication rec { ]; build-system = with python.pkgs; [ - poetry-core + hatchling cython ]; 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" ''; diff --git a/pkgs/by-name/im/immich/sources.json b/pkgs/by-name/im/immich/sources.json index 9ee7d455a446..e84018224f45 100644 --- a/pkgs/by-name/im/immich/sources.json +++ b/pkgs/by-name/im/immich/sources.json @@ -1,26 +1,26 @@ { - "version": "1.129.0", - "hash": "sha256-cBTWmbJLbpUPLCfa0WsO87p79mZycS/vxPD55gdEYI4=", + "version": "1.130.3", + "hash": "sha256-qMRX8gwoagZJwhMg/1X+ZItFyC73qxLR8pHujWu1rog=", "components": { "cli": { - "npmDepsHash": "sha256-dMa0ZcLu2oU9jpYl3EEXTz0mY0YoK41mm6o0AGNaroU=", - "version": "2.2.53" + "npmDepsHash": "sha256-l8Aw9V6bwj/kauBmmKGiqytzjGwyXL1qlEg54eQcddQ=", + "version": "2.2.57" }, "server": { - "npmDepsHash": "sha256-VoY+/nUtjHcgeD66DHoRR53eTLqLsGrI3V3LCO1H934=", - "version": "1.129.0" + "npmDepsHash": "sha256-4FiD1+lVqth3MNzityx3oAo/LLXkfTaA57vG4KUhUcM=", + "version": "1.130.3" }, "web": { - "npmDepsHash": "sha256-xRKKRDq0T321tbAGIrVojiVVtjYmg2p2RjoXteRIVoQ=", - "version": "1.129.0" + "npmDepsHash": "sha256-nUMXNdEK8Dyai0/NKcXD8bB+aH/ZeiDcQmRKVzo9cqc=", + "version": "1.130.3" }, "open-api/typescript-sdk": { - "npmDepsHash": "sha256-ZcsVTxmMzy3fGlnHMUIzZxyXw9rDgWMcfeqqkYuF7hQ=", - "version": "1.129.0" + "npmDepsHash": "sha256-B8NqGLgmT126Cf0uPx4Eka60i3mNPskvHnfVTEqf0BY=", + "version": "1.130.3" }, "geonames": { - "timestamp": "20250306005539", - "hash": "sha256-2JYoUVF2w4RCyPn/PRoJ0/bv/hADwoLhrwY1K/51c64=" + "timestamp": "20250325151913", + "hash": "sha256-bg+KON+ydWlRJ8MsIL7Ue0c97aqiiItuK8+kFngd6W0=" } } } 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"; }; 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"; }; -} +}) diff --git a/pkgs/by-name/li/livepeer/package.nix b/pkgs/by-name/li/livepeer/package.nix index 5934c1c3b0ce..f905830802a8 100644 --- a/pkgs/by-name/li/livepeer/package.nix +++ b/pkgs/by-name/li/livepeer/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "livepeer"; - version = "0.8.3"; + version = "0.8.4"; proxyVendor = true; - vendorHash = "sha256-bHlBHoofFBd34tp3Qsefr4Bpo7Zp1xn5F4z8kFtKeWQ="; + vendorHash = "sha256-9BxLyl8lZTKx/2Qw0NR4+1GdmD9FQPfnVU+x/RWEIvA="; src = fetchFromGitHub { owner = "livepeer"; repo = "go-livepeer"; tag = "v${version}"; - hash = "sha256-93sy+NX934Dh2vJwYpzlmz69yzbThpAw+eSQsZ1bMd0="; + hash = "sha256-slM3StvePwCyKXFmbxyZAZ4tTtLea4SMBXCojK8zrdM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/om/om4/include-exit.patch b/pkgs/by-name/om/om4/include-exit.patch new file mode 100644 index 000000000000..8b5e2f9b4f54 --- /dev/null +++ b/pkgs/by-name/om/om4/include-exit.patch @@ -0,0 +1,14 @@ +Index: a/parser.y +=================================================================== +--- a/parser.y ++++ a/parser.y +@@ -16,8 +16,9 @@ + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + #include + #include ++#include + #define YYSTYPE int32_t + extern int32_t end_result; + extern int yylex(void); + extern int yyerror(const char *); diff --git a/pkgs/by-name/om/om4/package.nix b/pkgs/by-name/om/om4/package.nix index 078bc8510a4a..1efc9047ec26 100644 --- a/pkgs/by-name/om/om4/package.nix +++ b/pkgs/by-name/om/om4/package.nix @@ -13,10 +13,15 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ibara"; repo = "m4"; - rev = "${pname}-${version}"; - sha256 = "04h76hxwb5rs3ylkw1dv8k0kmkzl84ccqlwdwxb6i0x57rrqbgzx"; + tag = "om4-${version}"; + hash = "sha256-/b+Fcz6lg2hW541TzBhB9M86wUS7BT6pHzqXxTs0BxI="; }; + patches = [ + # parser.y:51:25: error: implicit declaration of function 'exit' [] + ./include-exit.patch + ]; + strictDeps = true; nativeBuildInputs = [ bison @@ -25,17 +30,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-m4" ]; - meta = with lib; { + meta = { description = "Portable OpenBSD m4 macro processor"; homepage = "https://github.com/ibara/m4"; - license = with licenses; [ + license = with lib.licenses; [ bsd2 bsd3 isc publicDomain ]; mainProgram = "m4"; - platforms = platforms.unix; + platforms = lib.platforms.unix; maintainers = [ ]; }; } 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; + }; +} diff --git a/pkgs/by-name/op/opencollada/package.nix b/pkgs/by-name/op/opencollada/package.nix index 2e12e13f56c4..58d743702fee 100644 --- a/pkgs/by-name/op/opencollada/package.nix +++ b/pkgs/by-name/op/opencollada/package.nix @@ -1,18 +1,16 @@ { - lib, - stdenv, + cmake, 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 +30,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 +41,16 @@ stdenv.mkDerivation rec { --replace math.h cmath ''; + nativeBuildInputs = [ + cmake + pkg-config + ]; + + propagatedBuildInputs = [ + libxml2 + pcre + ]; + meta = { description = "Library for handling the COLLADA file format"; homepage = "https://github.com/KhronosGroup/OpenCOLLADA/"; diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 47dc46e7c405..f1bfef2201b5 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -8,16 +8,16 @@ php.buildComposerProject2 (finalAttrs: { pname = "phpactor"; - version = "2025.02.21.0"; + version = "2025.03.28.0"; src = fetchFromGitHub { owner = "phpactor"; repo = "phpactor"; rev = finalAttrs.version; - hash = "sha256-c/tYyWTfMGfylhm0DCr8zCN8Qh0xGAb5aiMSou4khdg="; + hash = "sha256-K3phBiu2D3DbOm7mApqqSNnVCsfYRQtN/o3bCVubN9I="; }; - vendorHash = "sha256-+Yar3FLE5Fhvj24vCBd9+2vEfNXlhaGPbP33Zpz5hzM="; + vendorHash = "sha256-7wFlS+a97tdhfxfc/IElzOVH25MAgf42UZBC1giBAls="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix index 3b5cbc11e155..8f79261a6b37 100644 --- a/pkgs/by-name/py/pywal16/package.nix +++ b/pkgs/by-name/py/pywal16/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pywal16"; - version = "3.8.3"; + version = "3.8.4"; pyproject = true; src = fetchFromGitHub { owner = "eylles"; repo = "pywal16"; tag = version; - hash = "sha256-yF90HkRg44pPRO/7Gj5BEgj44Qgs4OIM+GR7inJVKMI="; + hash = "sha256-gdFHAvZD1jBc2ZA5NujRUN1nortlzAj3sLh9B+dMJlk="; }; build-system = [ python3.pkgs.setuptools ]; diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix index a7804f7bf050..dc3321ce0050 100644 --- a/pkgs/by-name/ro/root/package.nix +++ b/pkgs/by-name/ro/root/package.nix @@ -18,7 +18,6 @@ gnugrep, gnused, gsl, - lapack, libGLU, libGL, libxcrypt, @@ -29,7 +28,6 @@ xorg, xz, man, - openblas, openssl, pcre, nlohmann_json, @@ -53,7 +51,7 @@ stdenv.mkDerivation rec { pname = "root"; - version = "6.34.04"; + version = "6.34.06"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -61,7 +59,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-4yDFNzqOh7sptygJVMqDVa2MQpXPSSNWBvDIsgCss3Q="; + hash = "sha256-p5nWMtrlux7Ifq5uvARqEiaMaEnyqIN5IcEY/FG2z/M="; }; clad_src = fetchgit { @@ -90,7 +88,6 @@ stdenv.mkDerivation rec { gl2ps glew gsl - lapack libjpeg libpng libtiff @@ -98,7 +95,6 @@ stdenv.mkDerivation rec { libxml2 llvm_18 lz4 - openblas openssl patchRcPathCsh patchRcPathFish @@ -132,10 +128,6 @@ stdenv.mkDerivation rec { substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ --replace-fail 'set(lcgpackages ' '#set(lcgpackages ' - # Make sure that clad is finding the right llvm version - substituteInPlace interpreter/cling/tools/plugins/clad/CMakeLists.txt \ - --replace-fail '-DLLVM_DIR=''${LLVM_BINARY_DIR}' '-DLLVM_DIR=''${LLVM_CMAKE_PATH}' - substituteInPlace interpreter/llvm-project/clang/tools/driver/CMakeLists.txt \ --replace-fail 'add_clang_symlink(''${link} clang)' "" 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="; diff --git a/pkgs/by-name/st/strip-ansi/package.nix b/pkgs/by-name/st/strip-ansi/package.nix new file mode 100644 index 000000000000..466046295c80 --- /dev/null +++ b/pkgs/by-name/st/strip-ansi/package.nix @@ -0,0 +1,46 @@ +{ + stdenv, + buildPackages, + lib, + fetchFromGitHub, + rustPlatform, + nix-update-script, + installShellFiles, +}: +let + canRunStripAnsi = stdenv.hostPlatform.emulatorAvailable buildPackages; + stripAnsiCompletions = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/strip-ansi-completions"; +in +rustPlatform.buildRustPackage { + pname = "strip-ansi"; + version = "0.1.0-unstable-2024-09-01"; + + src = fetchFromGitHub { + owner = "KSXGitHub"; + repo = "strip-ansi-cli"; + rev = "60dbdbc22b41f743c237cb75b11e72cf7884b792"; + hash = "sha256-FvozEjNWXE1XEIq/06JehES7LVKoWmzIoaB4fD1kUsY="; + }; + + useFetchCargoVendor = true; + cargoHash = "sha256-kebx9OrAeh4c01VDUmlfTVn0EgFfzewiXjaQ3qtJrPY="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString canRunStripAnsi '' + installShellCompletion --cmd strip-ansi \ + --bash <(${stripAnsiCompletions} bash) \ + --fish <(${stripAnsiCompletions} fish) \ + --zsh <(${stripAnsiCompletions} zsh) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/KSXGitHub/strip-ansi-cli"; + description = "Strip ANSI escape sequences from text"; + license = [ lib.licenses.mit ]; + maintainers = [ lib.maintainers._9999years ]; + mainProgram = "strip-ansi"; + }; +} 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="; diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix index dfcecd106095..7b531ed4fd84 100644 --- a/pkgs/by-name/wa/wait4x/package.nix +++ b/pkgs/by-name/wa/wait4x/package.nix @@ -11,7 +11,7 @@ buildGoModule { inherit pname version; src = fetchFromGitHub { - owner = "atkrad"; + owner = "wait4x"; repo = pname; rev = "v${version}"; hash = "sha256-UVs8tCOgPU/IwM3Z3/ehFnAbHTSOHGAO9VpcB/NItGM="; @@ -24,7 +24,7 @@ buildGoModule { meta = with lib; { description = "Wait4X allows you to wait for a port or a service to enter the requested state"; - homepage = "https://github.com/atkrad/wait4x"; + homepage = "https://github.com/wait4x/wait4x"; license = licenses.asl20; maintainers = with maintainers; [ jfvillablanca ]; mainProgram = "wait4x"; 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