diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 2aac65900b9a..3e3f4e8bf4ac 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -296,7 +296,7 @@ Usually, we need to create a `shell.nix` file and do our development inside of t with pkgs; let - elixir = beam.packages.erlang_24.elixir_1_12; + elixir = beam.packages.erlang_24.elixir_1_18; in mkShell { buildInputs = [ elixir ]; @@ -311,18 +311,18 @@ If you need to use an overlay to change some attributes of a derivation, e.g. if ```nix let - elixir_1_13_1_overlay = (self: super: { - elixir_1_13 = super.elixir_1_13.override { - version = "1.13.1"; - sha256 = "sha256-t0ic1LcC7EV3avWGdR7VbyX7pGDpnJSW1ZvwvQUPC3w="; + elixir_1_18_1_overlay = (self: super: { + elixir_1_18 = super.elixir_1_18.override { + version = "1.18.1"; + sha256 = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; }; }); - pkgs = import { overlays = [ elixir_1_13_1_overlay ]; }; + pkgs = import { overlays = [ elixir_1_18_1_overlay ]; }; in with pkgs; mkShell { buildInputs = [ - elixir_1_13 + elixir_1_18 ]; } ``` @@ -338,7 +338,7 @@ let # define packages to install basePackages = [ git - # replace with beam.packages.erlang.elixir_1_13 if you need + # replace with beam.packages.erlang.elixir_1_18 if you need beam.packages.erlang.elixir nodejs postgresql_14 diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 1caa762d4ebf..a358e5d1007a 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -121,6 +121,8 @@ - `linuxPackages.nvidiaPackages.dc_520` has been removed since it is marked broken and there are better newer alternatives. +- `minetest` has been renamed to `luanti` to match the upstream name change but aliases have been added. The new name hasn't resulted in many changes as of yet but older references to minetest should be sunset. See the [new name announcement](https://blog.minetest.net/2024/10/13/Introducing-Our-New-Name/) for more details. + - `racket_7_9` has been removed, as it is insecure. It is recommended to use Racket 8 instead. - `ente-auth` now uses the name `enteauth` for its binary. The previous name was `ente_auth`. diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index f353e39d2d17..f88249db0a54 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -32,11 +32,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "8.2"; + version = "8.3"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - hash = "sha256-1a0H3YYvrK4DBRxUxlNeVMftdAcxh4P8rRrS1wdv/+s="; + hash = "sha256-VRtxey4o9+kPdJMjaGobW7vYTPoTkGBNhUo8o3ePER4="; }; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; diff --git a/pkgs/build-support/fetchgitiles/default.nix b/pkgs/build-support/fetchgitiles/default.nix index 7dc26dfdf2f9..409f2f4e2bd6 100644 --- a/pkgs/build-support/fetchgitiles/default.nix +++ b/pkgs/build-support/fetchgitiles/default.nix @@ -3,24 +3,36 @@ lib.makeOverridable ( { url, - rev, + rev ? null, + tag ? null, name ? "source", ... }@args: + assert ( + lib.assertMsg (lib.xor (tag == null) ( + rev == null + )) "fetchFromGitiles requires one of either `rev` or `tag` to be provided (not both)." + ); + + let + realrev = (if tag != null then "refs/tags/" + tag else rev); + in + fetchzip ( { inherit name; - url = "${url}/+archive/${rev}.tar.gz"; + url = "${url}/+archive/${realrev}.tar.gz"; stripRoot = false; meta.homepage = url; } // removeAttrs args [ "url" + "tag" "rev" ] ) // { - inherit rev; + inherit rev tag; } ) diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix index 749883f2365e..aef76270d5ec 100644 --- a/pkgs/build-support/fetchgitlab/default.nix +++ b/pkgs/build-support/fetchgitlab/default.nix @@ -1,36 +1,103 @@ -{ lib, fetchgit, fetchzip }: +{ + lib, + fetchgit, + fetchzip, +}: lib.makeOverridable ( -# gitlab example -{ owner, repo, rev, protocol ? "https", domain ? "gitlab.com", name ? "source", group ? null -, fetchSubmodules ? false, leaveDotGit ? false -, deepClone ? false, forceFetchGit ? false -, sparseCheckout ? [] -, ... # For hash agility -} @ args: + # gitlab example + { + owner, + repo, + rev ? null, + tag ? null, + protocol ? "https", + domain ? "gitlab.com", + name ? "source", + group ? null, + fetchSubmodules ? false, + leaveDotGit ? false, + deepClone ? false, + forceFetchGit ? false, + sparseCheckout ? [ ], + ... # For hash agility + }@args: -let - slug = lib.concatStringsSep "/" ((lib.optional (group != null) group) ++ [ owner repo ]); - escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug; - escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] rev; - passthruAttrs = removeAttrs args [ "protocol" "domain" "owner" "group" "repo" "rev" "fetchSubmodules" "forceFetchGit" "leaveDotGit" "deepClone" ]; + assert ( + lib.assertMsg (lib.xor (tag == null) ( + rev == null + )) "fetchFromGitLab requires one of either `rev` or `tag` to be provided (not both)." + ); - useFetchGit = fetchSubmodules || leaveDotGit || deepClone || forceFetchGit || (sparseCheckout != []); - fetcher = if useFetchGit then fetchgit else fetchzip; + let + slug = lib.concatStringsSep "/" ( + (lib.optional (group != null) group) + ++ [ + owner + repo + ] + ); + escapedSlug = lib.replaceStrings [ "." "/" ] [ "%2E" "%2F" ] slug; + escapedRev = lib.replaceStrings [ "+" "%" "/" ] [ "%2B" "%25" "%2F" ] ( + if tag != null then "refs/tags/" + tag else rev + ); + passthruAttrs = removeAttrs args [ + "protocol" + "domain" + "owner" + "group" + "repo" + "rev" + "tag" + "fetchSubmodules" + "forceFetchGit" + "leaveDotGit" + "deepClone" + ]; - gitRepoUrl = "${protocol}://${domain}/${slug}.git"; + useFetchGit = + fetchSubmodules || leaveDotGit || deepClone || forceFetchGit || (sparseCheckout != [ ]); + fetcher = if useFetchGit then fetchgit else fetchzip; - fetcherArgs = (if useFetchGit then { - inherit rev deepClone fetchSubmodules sparseCheckout leaveDotGit; - url = gitRepoUrl; - } else { - url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}"; + gitRepoUrl = "${protocol}://${domain}/${slug}.git"; - passthru = { - inherit gitRepoUrl; - }; - }) // passthruAttrs // { inherit name; }; -in + fetcherArgs = + ( + if useFetchGit then + { + inherit + rev + deepClone + tag + fetchSubmodules + sparseCheckout + leaveDotGit + ; + url = gitRepoUrl; + } + else + { + url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}"; -fetcher fetcherArgs // { meta.homepage = "${protocol}://${domain}/${slug}/"; inherit rev owner repo; } + passthru = { + inherit gitRepoUrl; + }; + } + ) + // passthruAttrs + // { + inherit name; + }; + in + + fetcher fetcherArgs + // { + meta.homepage = "${protocol}://${domain}/${slug}/"; + inherit + tag + rev + owner + repo + ; + } ) diff --git a/pkgs/by-name/al/alglib/package.nix b/pkgs/by-name/al/alglib/package.nix index 414a884ce0d9..270e0195c306 100644 --- a/pkgs/by-name/al/alglib/package.nix +++ b/pkgs/by-name/al/alglib/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "alglib3"; - version = "4.03.0"; + version = "4.04.0"; src = fetchurl { url = "https://www.alglib.net/translator/re/alglib-${version}.cpp.gpl.tgz"; - sha256 = "sha256-k7/U9Tq2ND8+qd8tHZP9Gq1okJF3tMNej3WE/6NkBYI="; + sha256 = "sha256-nPHllbcr1Hi3RzyOqvkZtACLJT2Gutu8WlItFJpnIUQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index 41c63a54bc4f..df3bb7986b35 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -16,6 +16,7 @@ # buildInputs SDL2, adwaita-icon-theme, + alsa-lib, cairo, curl, exiv2, @@ -31,9 +32,14 @@ json-glib, lcms2, lensfun, + lerc, libaom, libavif, + libdatrie, + libepoxy, libexif, + libgcrypt, + libgpg-error, libgphoto2, libheif, libjpeg, @@ -42,21 +48,29 @@ librsvg, libsecret, libsoup_2_4, + libsysprof-capture, + libthai, libtiff, libwebp, libxslt, lua, + util-linux, openexr_3, openjpeg, osm-gps-map, - pcre, + pcre2, portmidi, pugixml, sqlite, # Linux only colord, colord-gtk, + libselinux, + libsepol, libX11, + libXdmcp, + libxkbcommon, + libXtst, ocl-icd, # Darwin only gtk-mac-integration, @@ -89,6 +103,7 @@ stdenv.mkDerivation rec { [ SDL2 adwaita-icon-theme + alsa-lib cairo curl exiv2 @@ -104,9 +119,14 @@ stdenv.mkDerivation rec { json-glib lcms2 lensfun + lerc libaom libavif + libdatrie + libepoxy libexif + libgcrypt + libgpg-error libgphoto2 libheif libjpeg @@ -115,14 +135,17 @@ stdenv.mkDerivation rec { librsvg libsecret libsoup_2_4 + libsysprof-capture + libthai libtiff libwebp libxslt lua + util-linux openexr_3 openjpeg osm-gps-map - pcre + pcre2 portmidi pugixml sqlite @@ -130,7 +153,12 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.hostPlatform.isLinux [ colord colord-gtk + libselinux + libsepol libX11 + libXdmcp + libxkbcommon + libXtst ocl-icd ] ++ lib.optional stdenv.hostPlatform.isDarwin gtk-mac-integration @@ -173,7 +201,8 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { rev-prefix = "release-"; - url = "https://github.com/darktable-org/darktable"; + odd-unstable = true; + url = "https://github.com/darktable-org/darktable.git"; }; meta = { diff --git a/pkgs/by-name/lu/luanti/0000-mark-rm-for-substitution.patch b/pkgs/by-name/lu/luanti/0000-mark-rm-for-substitution.patch new file mode 100644 index 000000000000..8890dc2544a0 --- /dev/null +++ b/pkgs/by-name/lu/luanti/0000-mark-rm-for-substitution.patch @@ -0,0 +1,13 @@ +diff --git a/src/filesys.cpp b/src/filesys.cpp +index 8881eb2ca..e02d87a9f 100644 +--- a/src/filesys.cpp ++++ b/src/filesys.cpp +@@ -384,7 +384,7 @@ bool RecursiveDelete(const std::string &path) + if (child_pid == 0) { + // Child + std::array argv = { +- "rm", ++ "@RM_COMMAND@", + "-rf", + path.c_str(), + nullptr diff --git a/pkgs/by-name/lu/luanti/package.nix b/pkgs/by-name/lu/luanti/package.nix new file mode 100644 index 000000000000..e370c28dc14c --- /dev/null +++ b/pkgs/by-name/lu/luanti/package.nix @@ -0,0 +1,168 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gitUpdater, + substitute, + cmake, + coreutils, + libpng, + bzip2, + curl, + libogg, + jsoncpp, + libjpeg, + libGLU, + openal, + libvorbis, + sqlite, + luajit, + freetype, + gettext, + doxygen, + ncurses, + graphviz, + xorg, + gmp, + libspatialindex, + leveldb, + postgresql, + hiredis, + libiconv, + ninja, + prometheus-cpp, + darwin, + buildClient ? true, + buildServer ? true, + SDL2, + useSDL2 ? false, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "luanti"; + version = "5.10.0"; + + src = fetchFromGitHub { + owner = "minetest"; + repo = "minetest"; + rev = finalAttrs.version; + hash = "sha256-sumwm8mJghpSriVflMQSHQM4BTmAhfI/Wl/FroLTVts="; + }; + + patches = [ + (substitute { + src = ./0000-mark-rm-for-substitution.patch; + substitutions = [ + "--subst-var-by" + "RM_COMMAND" + "${coreutils}/bin/rm" + ]; + }) + ]; + + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt + ''; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_CLIENT" buildClient) + (lib.cmakeBool "BUILD_SERVER" buildServer) + (lib.cmakeBool "BUILD_UNITTESTS" (finalAttrs.doCheck or false)) + (lib.cmakeBool "ENABLE_PROMETHEUS" buildServer) + (lib.cmakeBool "USE_SDL2" useSDL2) + # Ensure we use system libraries + (lib.cmakeBool "ENABLE_SYSTEM_GMP" true) + (lib.cmakeBool "ENABLE_SYSTEM_JSONCPP" true) + # Updates are handled by nix anyway + (lib.cmakeBool "ENABLE_UPDATE_CHECKER" false) + # ...but make it clear that this is a nix package + (lib.cmakeFeature "VERSION_EXTRA" "NixOS") + + # Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed + (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") + (lib.cmakeFeature "CMAKE_INSTALL_DATADIR" "share") + (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/doc/luanti") + (lib.cmakeFeature "CMAKE_INSTALL_MANDIR" "share/man") + (lib.cmakeFeature "CMAKE_INSTALL_LOCALEDIR" "share/locale") + + ]; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + ninja + ]; + + buildInputs = + [ + jsoncpp + gettext + freetype + sqlite + curl + bzip2 + ncurses + gmp + libspatialindex + ] + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.OpenGL + darwin.apple_sdk.frameworks.OpenAL + darwin.apple_sdk.frameworks.Carbon + darwin.apple_sdk.frameworks.Cocoa + darwin.apple_sdk.frameworks.Kernel + ] + ++ lib.optionals buildClient [ + libpng + libjpeg + libGLU + openal + libogg + libvorbis + ] + ++ lib.optionals (buildClient && useSDL2) [ + SDL2 + ] + ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin && !useSDL2) [ + xorg.libX11 + xorg.libXi + ] + ++ lib.optionals buildServer [ + leveldb + postgresql + hiredis + prometheus-cpp + ]; + + postInstall = + lib.optionalString stdenv.hostPlatform.isLinux '' + patchShebangs $out + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/Applications + mv $out/luanti.app $out/Applications + ''; + + doCheck = true; + + passthru.updateScript = gitUpdater { + allowedVersions = "\\."; + ignoredVersions = "-android$"; + }; + + meta = with lib; { + homepage = "https://www.luanti.org/"; + description = "An open source voxel game engine (formerly Minetest)"; + license = licenses.lgpl21Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ + fpletz + fgaz + jk + ]; + mainProgram = if buildClient then "luanti" else "luantiserver"; + }; +}) diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix index 8cb41fabfd3b..951682cc3e74 100644 --- a/pkgs/by-name/ne/newsboat/package.nix +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -99,6 +99,13 @@ rustPlatform.buildRustPackage rec { updateScript = nix-update-script { }; }; + installPhase = '' + runHook preInstall + install -Dm755 newsboat $out/bin/newsboat + install -Dm755 podboat $out/bin/podboat + runHook postInstall + ''; + meta = { homepage = "https://newsboat.org/"; changelog = "https://github.com/newsboat/newsboat/blob/${src.rev}/CHANGELOG.md"; diff --git a/pkgs/by-name/ni/nixos-anywhere/package.nix b/pkgs/by-name/ni/nixos-anywhere/package.nix index 051992de6746..a9d60383bad4 100644 --- a/pkgs/by-name/ni/nixos-anywhere/package.nix +++ b/pkgs/by-name/ni/nixos-anywhere/package.nix @@ -31,12 +31,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nixos-anywhere"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-anywhere"; rev = finalAttrs.version; - hash = "sha256-LrCxIU6laEf4JD1QtOBNr+PASY6CbNPpUrjLIUizt+Y="; + hash = "sha256-aoTJqEImmpgsol+TyDASuyHW6tuL7NIS8gusUJ/kxyk="; }; nativeBuildInputs = [ makeWrapper ]; installPhase = '' diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix index 272a0b225708..88ce164999ae 100644 --- a/pkgs/by-name/os/osu-lazer-bin/package.nix +++ b/pkgs/by-name/os/osu-lazer-bin/package.nix @@ -10,23 +10,23 @@ let pname = "osu-lazer-bin"; - version = "2024.1219.2"; + version = "2024.1224.1"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-kzGerNcaop39zqv3+w5hkgLZzhH6PfCPhZfGk9f9/Z8="; + hash = "sha256-p/1rmz+CnuVl72wOKJpHFkJv64vKRoMSV15KRUgjhu0="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-kWcdynu3m8MehpNjkk10VN9/z8ixu/cZI9HuTY/79dk="; + hash = "sha256-jVEjqpKJsFC+rSwSNokKxYarwB4CybWSG8gdtxocFZ4="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-qNkuiDA4LiWqwpYFrBDvV5VoOwO6Ei8jHGIgVKSErdo="; + hash = "sha256-9qZ5XNAII2I4PemNGrWuUCY1Syq5PH3NBc2/Jj5tcoQ="; }; } .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported."); diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json index 0e7be190c28d..20e4fd1fbccf 100644 --- a/pkgs/by-name/os/osu-lazer/deps.json +++ b/pkgs/by-name/os/osu-lazer/deps.json @@ -581,23 +581,23 @@ }, { "pname": "OpenTabletDriver", - "version": "0.6.4", - "hash": "sha256-tTk8ezYrMs/Kj+snMvWq9Ae7WLU4pq5NpFHEZV8WjJM=" + "version": "0.6.5", + "hash": "sha256-tn24wONDXJOL3lhSOGI1ZS1sVsdKGr798r35DgmU+pA=" }, { "pname": "OpenTabletDriver.Configurations", - "version": "0.6.4", - "hash": "sha256-9QqvSck5Ofn3clWQzwGoTHX6k5d1nUxjD56UeIBx+1A=" + "version": "0.6.5", + "hash": "sha256-+6y3GkGaIYqEgzAV/Q04vxvB5UyrsT7NQR5mIWOIhCI=" }, { "pname": "OpenTabletDriver.Native", - "version": "0.6.4", - "hash": "sha256-4vNnamnIVNpVBOPXyyJcbj0pe/aixGLmvXzq3vkUXMs=" + "version": "0.6.5", + "hash": "sha256-QLWzpV1YeMozcR38guHv5rT8cNnuwm92NGAvdXua1U4=" }, { "pname": "OpenTabletDriver.Plugin", - "version": "0.6.4", - "hash": "sha256-9jORi42+oYFdNEin9lYWMBGrktyTBMAl5sfr1jxAbVE=" + "version": "0.6.5", + "hash": "sha256-czzfFsCBu9989ML7FvDUZrBtaf3K4bBhmuaU9Y1h3vk=" }, { "pname": "PolySharp", @@ -636,8 +636,8 @@ }, { "pname": "ppy.osu.Framework", - "version": "2024.1206.0", - "hash": "sha256-2XouXC/uahqY1ldHvNWyobxGYXEQJky65g8EL7fL5Zw=" + "version": "2024.1224.0", + "hash": "sha256-Ci0tblihnKxv8c0vgYvTDTfu2Fl6huEsl/2/SDdh5CQ=" }, { "pname": "ppy.osu.Framework.NativeLibs", @@ -651,8 +651,8 @@ }, { "pname": "ppy.osu.Game.Resources", - "version": "2024.1219.1", - "hash": "sha256-KyZeNkTissfZAusvWYUdZ3+YujrcTfkZDyzt99i4fkg=" + "version": "2024.1224.0", + "hash": "sha256-EtruxGvWQQzWGtpQAb58j6Hdsv2GKNf/eSwPV3qti/Q=" }, { "pname": "ppy.osuTK.NS20", diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix index 417b890b8b9a..f375bd2a3ddd 100644 --- a/pkgs/by-name/os/osu-lazer/package.nix +++ b/pkgs/by-name/os/osu-lazer/package.nix @@ -21,13 +21,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2024.1219.2"; + version = "2024.1224.1"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; tag = version; - hash = "sha256-uRaMVd3FH6094MxplLNG0JJnO+7s805TI0aeDN/rRVY="; + hash = "sha256-T9KYb+fVcCWtb33ImHyoipJqsLr2em4GoYyvsSgIWx0="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix index 43420e572d59..6e7e8c7e761d 100644 --- a/pkgs/by-name/py/pylyzer/package.nix +++ b/pkgs/by-name/py/pylyzer/package.nix @@ -14,17 +14,17 @@ rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.74"; + version = "0.0.75"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; tag = "v${version}"; - hash = "sha256-NVCFwISPRTNgs4hn9ezp2Xb4r7xytziIByVSKyqt/lo="; + hash = "sha256-N0a13nuHL6UuaSTowiEGu0VszW9QTqAmgsUOJXDhj8Q="; }; useFetchCargoVendor = true; - cargoHash = "sha256-mNFRP6mT4mKKKg05nJcdd8qy6YFxWVADHIU9uGrEcng="; + cargoHash = "sha256-LJaAcMajDLrpAKmYATN2xWKmoXaZzOyACzVe4vi4+vU="; nativeBuildInputs = [ git @@ -76,7 +76,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Fast static code analyzer & language server for Python"; homepage = "https://github.com/mtshiba/pylyzer"; - changelog = "https://github.com/mtshiba/pylyzer/releases/tag/${src.tag}"; + changelog = "https://github.com/mtshiba/pylyzer/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ natsukium ]; mainProgram = "pylyzer"; diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix index 50a47c9be9b0..ca982ef4187e 100644 --- a/pkgs/by-name/sl/slint-lsp/package.nix +++ b/pkgs/by-name/sl/slint-lsp/package.nix @@ -37,14 +37,14 @@ let in rustPlatform.buildRustPackage rec { pname = "slint-lsp"; - version = "1.8.0"; + version = "1.9.1"; src = fetchCrate { inherit pname version; - hash = "sha256-Shgcjr0mlUNAobMAarZ7dFnXgPGzBHXs2KnUDT/8I2A="; + hash = "sha256-/Upnl3VcR5ynT70gWMGAs/xvolMKsZeaGd+TWgxl/Pg="; }; - cargoHash = "sha256-wyzrFg3hwsJ7SV8KGLKo+gNHzLFpnMx9/jgMalGkufY="; + cargoHash = "sha256-JgKK+NyRF3mIRarHmwCk2b1HsBUXZX/l2e843exZk2g="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 5b987702f8f8..d9819c60973d 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-gqNWdZUQHT7Oa222+cbFgbmTBeg9nM/ot0WSVSCzMn8="; + hash = "sha256-M3VUpe8M2O2EXjD9/+YNa7Q7l0Q/WXbIhObyFa/Wg18="; }; - vendorHash = "sha256-f7SkRCe8AknhCCJ79iKqC4BeSW/jM33LdA6HTQpa+3o="; + vendorHash = "sha256-eAyex6OqQc/nLWpCbmjyjxPf3pdK9wPAc8eARwiCrIs="; subPackages = [ "." ]; diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index 904885189d23..c0c823371cc7 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "2.62.1"; + version = "2.63.10"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-0R9Vfjo4/tC6Wh4YSQdv4BG5hMD9ZI/rjrbg1/LX5k8="; + hash = "sha256-LGikCupqzUZ2CG63c8aEeJHX+8nNMUaaYzAGQC+YHqM="; }; postPatch = '' diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index ca0675c1be5b..58c02c2afe9e 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zpaqfranz"; - version = "60.9"; + version = "60.10"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-7X1nmJ6X1oRMzB3L/oKe3ARY02ZimUD09KO4fukxTyg="; + hash = "sha256-crUXsIFQwGwH6hxqaO1KLzRRWphcUxmkvNlRT6lXlBg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 23649ca76f26..e8e7d9edceaa 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -45,6 +45,11 @@ let # BEAM-based languages. elixir = elixir_1_17; + elixir_1_18 = lib'.callElixir ../interpreters/elixir/1.18.nix { + inherit erlang; + debugInfo = true; + }; + elixir_1_17 = lib'.callElixir ../interpreters/elixir/1.17.nix { inherit erlang; debugInfo = true; @@ -65,26 +70,6 @@ let debugInfo = true; }; - elixir_1_13 = lib'.callElixir ../interpreters/elixir/1.13.nix { - inherit erlang; - debugInfo = true; - }; - - elixir_1_12 = lib'.callElixir ../interpreters/elixir/1.12.nix { - inherit erlang; - debugInfo = true; - }; - - elixir_1_11 = lib'.callElixir ../interpreters/elixir/1.11.nix { - inherit erlang; - debugInfo = true; - }; - - elixir_1_10 = lib'.callElixir ../interpreters/elixir/1.10.nix { - inherit erlang; - debugInfo = true; - }; - # Remove old versions of elixir, when the supports fades out: # https://hexdocs.pm/elixir/compatibility-and-deprecations.html diff --git a/pkgs/development/interpreters/elixir/1.10.nix b/pkgs/development/interpreters/elixir/1.10.nix deleted file mode 100644 index 04f4b5af240b..000000000000 --- a/pkgs/development/interpreters/elixir/1.10.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ mkDerivation }: - -# How to obtain `sha256`: -# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz -mkDerivation { - version = "1.10.4"; - sha256 = "16j4rmm3ix088fvxhvyjqf1hnfg7wiwa87gml3b2mrwirdycbinv"; - minimumOTPVersion = "21"; -} diff --git a/pkgs/development/interpreters/elixir/1.11.nix b/pkgs/development/interpreters/elixir/1.11.nix deleted file mode 100644 index 6e5a30a9dd7d..000000000000 --- a/pkgs/development/interpreters/elixir/1.11.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ mkDerivation }: - -# How to obtain `sha256`: -# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz -mkDerivation { - version = "1.11.4"; - sha256 = "sha256-qCX6hRWUbW+E5xaUhcYxRAnhnvncASUJck8lESlcDvk="; - minimumOTPVersion = "21"; -} diff --git a/pkgs/development/interpreters/elixir/1.12.nix b/pkgs/development/interpreters/elixir/1.12.nix deleted file mode 100644 index 0ea014e36d70..000000000000 --- a/pkgs/development/interpreters/elixir/1.12.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ mkDerivation }: - -# How to obtain `sha256`: -# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz -mkDerivation { - version = "1.12.3"; - sha256 = "sha256-Jo9ZC5cSBVpjVnGZ8tEIUKOhW9uvJM/h84+VcnrT0R0="; - minimumOTPVersion = "22"; -} diff --git a/pkgs/development/interpreters/elixir/1.13.nix b/pkgs/development/interpreters/elixir/1.13.nix deleted file mode 100644 index 452c3c5413ec..000000000000 --- a/pkgs/development/interpreters/elixir/1.13.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ mkDerivation }: - -# How to obtain `sha256`: -# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz -mkDerivation { - version = "1.13.4"; - sha256 = "sha256-xGKq62wzaIfgZN2j808fL3b8ykizQVPuePWzsy2HKfw="; - minimumOTPVersion = "22"; -} diff --git a/pkgs/development/interpreters/elixir/1.14.nix b/pkgs/development/interpreters/elixir/1.14.nix index 1b20938a6108..173941779e40 100644 --- a/pkgs/development/interpreters/elixir/1.14.nix +++ b/pkgs/development/interpreters/elixir/1.14.nix @@ -5,4 +5,5 @@ mkDerivation { sha256 = "sha256-bCCTjFT+FG1hz+0H6k/izbCmi0JgO3Kkqc3LWWCs5Po="; # https://hexdocs.pm/elixir/1.14.5/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "23"; + maximumOTPVersion = "26"; } diff --git a/pkgs/development/interpreters/elixir/1.15.nix b/pkgs/development/interpreters/elixir/1.15.nix index fe11d552a837..4ed8e67bb8e4 100644 --- a/pkgs/development/interpreters/elixir/1.15.nix +++ b/pkgs/development/interpreters/elixir/1.15.nix @@ -4,5 +4,6 @@ mkDerivation { sha256 = "sha256-6GfZycylh+sHIuiQk/GQr1pRQRY1uBycSQdsVJ0J13k="; # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "24"; + maximumOTPVersion = "26"; escriptPath = "lib/elixir/scripts/generate_app.escript"; } diff --git a/pkgs/development/interpreters/elixir/1.16.nix b/pkgs/development/interpreters/elixir/1.16.nix index fdd9dff12700..1fdb4094494e 100644 --- a/pkgs/development/interpreters/elixir/1.16.nix +++ b/pkgs/development/interpreters/elixir/1.16.nix @@ -4,5 +4,6 @@ mkDerivation { sha256 = "sha256-WUBqoz3aQvBlSG3pTxGBpWySY7I0NUcDajQBgq5xYTU="; # https://hexdocs.pm/elixir/1.16.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp minimumOTPVersion = "24"; + maximumOTPVersion = "26"; escriptPath = "lib/elixir/scripts/generate_app.escript"; } diff --git a/pkgs/development/interpreters/elixir/1.18.nix b/pkgs/development/interpreters/elixir/1.18.nix new file mode 100644 index 000000000000..640181a6a2af --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.18.nix @@ -0,0 +1,8 @@ +{ mkDerivation }: +mkDerivation { + version = "1.18.1"; + sha256 = "sha256-zJNAoyqSj/KdJ1Cqau90QCJihjwHA+HO7nnD1Ugd768="; + # https://hexdocs.pm/elixir/1.18.0/compatibility-and-deprecations.html#between-elixir-and-erlang-otp + minimumOTPVersion = "25"; + escriptPath = "lib/elixir/scripts/generate_app.escript"; +} diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 64582c98c45b..fb7d83c8cf42 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -16,6 +16,7 @@ version, erlang ? inputs.erlang, minimumOTPVersion, + maximumOTPVersion ? null, sha256 ? null, rev ? "v${version}", src ? fetchFromGitHub { @@ -28,14 +29,37 @@ let inherit (lib) - getVersion - versionAtLeast - optional + assertMsg concatStringsSep + getVersion + optional + optionalString + toInt + versions + versionAtLeast + versionOlder ; + compatibilityMsg = '' + Unsupported elixir and erlang OTP combination. + + elixir ${version} + erlang OTP ${getVersion erlang} is not >= ${minimumOTPVersion} ${ + optionalString (maximumOTPVersion != null) "and <= ${maximumOTPVersion}" + } + + See https://hexdocs.pm/elixir/${version}/compatibility-and-deprecations.html + ''; + + maxShiftMajor = builtins.toString ((toInt (versions.major maximumOTPVersion)) + 1); + maxAssert = + if (maximumOTPVersion == null) then + true + else + versionOlder (versions.major (getVersion erlang)) maxShiftMajor; in -assert versionAtLeast (getVersion erlang) minimumOTPVersion; +assert assertMsg (versionAtLeast (getVersion erlang) minimumOTPVersion) compatibilityMsg; +assert assertMsg maxAssert compatibilityMsg; stdenv.mkDerivation ({ pname = "${baseName}"; diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix index d1c6e0aff3c9..dd2e5e945bb4 100644 --- a/pkgs/development/interpreters/erlang/25.nix +++ b/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.15"; - sha256 = "sha256-y1QZZ+W5jkAygTRtXVu6FyG4I98SGXXourDfPPlEfg8="; + version = "25.3.2.16"; + sha256 = "sha256-fo2wRC+Yb5Tfw6dgDhHv77SFtFMYYKnAZqQSapkWkEw="; } diff --git a/pkgs/development/interpreters/erlang/26.nix b/pkgs/development/interpreters/erlang/26.nix index e7c256d1de78..6a91f3795d09 100644 --- a/pkgs/development/interpreters/erlang/26.nix +++ b/pkgs/development/interpreters/erlang/26.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "26.2.5.4"; - sha256 = "sha256-fvpSvsr7wWgFKa8vODVz4RUn8JKe8NuT9sjvau38B+Y="; + version = "26.2.5.6"; + sha256 = "sha256-5FsLAhbWqXjP18UQGNkbNQmFXlHiNoLY1aTzutLubZI="; } diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix index 91845a1bc28a..9085ecf4017c 100644 --- a/pkgs/development/interpreters/erlang/27.nix +++ b/pkgs/development/interpreters/erlang/27.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "27.1.2"; - sha256 = "sha256-urHJMPo9XG+sIBuCaWvEhAcykGxlVSdKKem7vCiMjcg="; + version = "27.2"; + sha256 = "sha256-8kRneNkDErUX/AiWy8WDCpFxxS1w4DfM+5V6Hz8D8wM="; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 499d3b7f879f..df349d965743 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -250,7 +250,7 @@ stdenv.mkDerivation ( if [ "$latest" != "${version}" ]; then nixpkgs="$(git rev-parse --show-toplevel)" nix_file="$nixpkgs/pkgs/development/interpreters/erlang/${major}.nix" - update-source-version ${baseName}R${major} "$latest" --version-key=version --print-changes --file="$nix_file" + update-source-version ${baseName}_${major} "$latest" --version-key=version --print-changes --file="$nix_file" else echo "${baseName}R${major} is already up-to-date" fi diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix index 1ec6ce71ed5d..939759afb2b4 100644 --- a/pkgs/development/python-modules/langchain-chroma/default.nix +++ b/pkgs/development/python-modules/langchain-chroma/default.nix @@ -28,7 +28,10 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - pythonRelaxDeps = [ "chromadb" ]; + pythonRelaxDeps = [ + "chromadb" + "numpy" + ]; dependencies = [ langchain-core diff --git a/pkgs/development/python-modules/langchain-community/default.nix b/pkgs/development/python-modules/langchain-community/default.nix index cccbca601e32..50b3992a9b61 100644 --- a/pkgs/development/python-modules/langchain-community/default.nix +++ b/pkgs/development/python-modules/langchain-community/default.nix @@ -53,6 +53,7 @@ buildPythonPackage rec { build-system = [ poetry-core ]; pythonRelaxDeps = [ + "numpy" "pydantic-settings" "tenacity" ]; @@ -107,6 +108,12 @@ buildPythonPackage rec { # See https://github.com/NixOS/nixpkgs/pull/326337 and https://github.com/wasmerio/wasmer-python/issues/778 "test_table_info" "test_sql_database_run" + # pydantic.errors.PydanticUserError: `SQLDatabaseToolkit` is not fully defined; you should define `BaseCache`, then call `SQLDatabaseToolkit.model_rebuild()`. + "test_create_sql_agent" + # pydantic.errors.PydanticUserError: `NatBotChain` is not fully defined; you should define `BaseCache`, then call `NatBotChain.model_rebuild()`. + "test_proper_inputs" + # pydantic.errors.PydanticUserError: `NatBotChain` is not fully defined; you should define `BaseCache`, then call `NatBotChain.model_rebuild()`. + "test_variable_key_naming" ]; meta = { diff --git a/pkgs/development/python-modules/langchain-mongodb/default.nix b/pkgs/development/python-modules/langchain-mongodb/default.nix index 0c1422bbeb59..78a3a9b06431 100644 --- a/pkgs/development/python-modules/langchain-mongodb/default.nix +++ b/pkgs/development/python-modules/langchain-mongodb/default.nix @@ -36,6 +36,10 @@ buildPythonPackage rec { build-system = [ poetry-core ]; + pythonRelaxDeps = [ + "numpy" + ]; + dependencies = [ langchain-core numpy diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix index ad7821606b96..c9788da19f19 100644 --- a/pkgs/development/python-modules/langchain/default.nix +++ b/pkgs/development/python-modules/langchain/default.nix @@ -59,7 +59,10 @@ buildPythonPackage rec { buildInputs = [ bash ]; - pythonRelaxDeps = [ "tenacity" ]; + pythonRelaxDeps = [ + "numpy" + "tenacity" + ]; dependencies = [ aiohttp @@ -118,6 +121,21 @@ buildPythonPackage rec { "test_aliases_hidden" ]; + disabledTestPaths = [ + # pydantic.errors.PydanticUserError: `ConversationSummaryMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryMemory.model_rebuild()`. + "tests/unit_tests/chains/test_conversation.py" + # pydantic.errors.PydanticUserError: `ConversationSummaryMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryMemory.model_rebuild()`. + "tests/unit_tests/chains/test_memory.py" + # pydantic.errors.PydanticUserError: `ConversationSummaryBufferMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryBufferMemory.model_rebuild()`. + "tests/unit_tests/chains/test_summary_buffer_memory.py" + "tests/unit_tests/output_parsers/test_fix.py" + "tests/unit_tests/chains/test_llm_checker.py" + # TypeError: Can't instantiate abstract class RunnableSerializable[RetryOutputParserRetryChainInput, str] without an implementation for abstract method 'invoke' + "tests/unit_tests/output_parsers/test_retry.py" + # pydantic.errors.PydanticUserError: `LLMSummarizationCheckerChain` is not fully defined; you should define `BaseCache`, then call `LLMSummarizationCheckerChain.model_rebuild()`. + "tests/unit_tests/chains/test_llm_summarization_checker.py" + ]; + pythonImportsCheck = [ "langchain" ]; passthru = { diff --git a/pkgs/development/tools/marksman/default.nix b/pkgs/development/tools/marksman/default.nix index 6b0d61ee8913..73404de17624 100644 --- a/pkgs/development/tools/marksman/default.nix +++ b/pkgs/development/tools/marksman/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "marksman"; - version = "2024-12-04"; + version = "2024-12-18"; src = fetchFromGitHub { owner = "artempyanykh"; repo = "marksman"; rev = version; - sha256 = "sha256-0GpEspf6CuswWCjFdzQ+T3GXFKclL7GLmx9HeO4hdA8="; + sha256 = "sha256-2OisUZHmf7k8vLkBGJG1HXNxaXmRF64x//bDK57S9to="; }; projectFile = "Marksman/Marksman.fsproj"; diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix deleted file mode 100644 index b783765df88b..000000000000 --- a/pkgs/games/minetest/default.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, gitUpdater -, cmake -, coreutils -, libpng -, bzip2 -, curl -, libogg -, jsoncpp -, libjpeg -, libGLU -, openal -, libvorbis -, sqlite -, luajit -, freetype -, gettext -, doxygen -, ncurses -, graphviz -, xorg -, gmp -, libspatialindex -, leveldb -, postgresql -, hiredis -, libiconv -, ninja -, prometheus-cpp -, OpenGL -, OpenAL ? openal -, Carbon -, Cocoa -, Kernel -, buildClient ? true -, buildServer ? true -, SDL2 -, useSDL2 ? false -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "minetest"; - version = "5.9.1"; - - src = fetchFromGitHub { - owner = "minetest"; - repo = "minetest"; - rev = finalAttrs.version; - hash = "sha256-0WTDhFt7GDzN4AK8U17iLkjeSMK+gOWZRq46HBTeO3w="; - }; - - cmakeFlags = [ - (lib.cmakeBool "BUILD_CLIENT" buildClient) - (lib.cmakeBool "BUILD_SERVER" buildServer) - (lib.cmakeBool "BUILD_UNITTESTS" (finalAttrs.doCheck or false)) - (lib.cmakeBool "ENABLE_PROMETHEUS" buildServer) - (lib.cmakeBool "USE_SDL2" useSDL2) - # Ensure we use system libraries - (lib.cmakeBool "ENABLE_SYSTEM_GMP" true) - (lib.cmakeBool "ENABLE_SYSTEM_JSONCPP" true) - # Updates are handled by nix anyway - (lib.cmakeBool "ENABLE_UPDATE_CHECKER" false) - # ...but make it clear that this is a nix package - (lib.cmakeFeature "VERSION_EXTRA" "NixOS") - - # Remove when https://github.com/NixOS/nixpkgs/issues/144170 is fixed - (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin") - (lib.cmakeFeature "CMAKE_INSTALL_DATADIR" "share") - (lib.cmakeFeature "CMAKE_INSTALL_DOCDIR" "share/doc/minetest") - (lib.cmakeFeature "CMAKE_INSTALL_MANDIR" "share/man") - (lib.cmakeFeature "CMAKE_INSTALL_LOCALEDIR" "share/locale") - - ]; - - nativeBuildInputs = [ - cmake - doxygen - graphviz - ninja - ]; - - buildInputs = [ - jsoncpp - gettext - freetype - sqlite - curl - bzip2 - ncurses - gmp - libspatialindex - ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - libiconv - OpenGL - OpenAL - Carbon - Cocoa - Kernel - ] ++ lib.optionals buildClient [ - libpng - libjpeg - libGLU - openal - libogg - libvorbis - ] ++ lib.optionals (buildClient && useSDL2) [ - SDL2 - ] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin && !useSDL2) [ - xorg.libX11 - xorg.libXi - ] ++ lib.optionals buildServer [ - leveldb - postgresql - hiredis - prometheus-cpp - ]; - - postPatch = '' - substituteInPlace src/filesys.cpp \ - --replace-fail "/bin/rm" "${coreutils}/bin/rm" - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt - ''; - - postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' - patchShebangs $out - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/Applications - mv $out/minetest.app $out/Applications - ''; - - doCheck = true; - - passthru.updateScript = gitUpdater { - allowedVersions = "\\."; - ignoredVersions = "-android$"; - }; - - meta = with lib; { - homepage = "https://minetest.net/"; - description = "Infinite-world block sandbox game"; - license = licenses.lgpl21Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ fpletz fgaz ]; - mainProgram = if buildClient then "minetest" else "minetestserver"; - }; -}) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index eab87fd8c5b5..1d3e9c26a610 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -22,7 +22,7 @@ }: let - version = "0.100.0"; + version = "0.101.0"; in rustPlatform.buildRustPackage { @@ -33,10 +33,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = "refs/tags/${version}"; - hash = "sha256-lbVvKpaG9HSm2W+NaVUuEOxTNUIf0iRATTVDKFPjqV4="; + hash = "sha256-Ptctp2ECypmSd0BHa6l09/U7wEjtLsvRSQV/ISz9+3w="; }; - cargoHash = "sha256-omC/qcpgy65Md1MC0QGUVCRVNl9sWlFcCRxdS4aeU+g="; + cargoHash = "sha256-KOIVlF8V5bdtGIFbboTQpVSieETegA6iF7Hi6/F+2bE="; nativeBuildInputs = [ pkg-config ] diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index a16ed6995e52..7e2112d491a5 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-Ftjcic/2rN5cYlzD7C9HyWWm4a37+s/mqRMHH4+4uBA="; + cargoHash = "sha256-igmSU2ziLfQbcEvHiQcuU8I8SeEN34gimBlcXtfuC0o="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 4d18ec9e971d..47ab2ea27ead 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-IGOT3tlFUjnD5DBbi8zERPcL7OiP8lwKtK4GVOR53xU="; + cargoHash = "sha256-xoiKsn3XkKkw+KpgnIPFw78JN3ERxkj+2SgrCoe9HOU="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix index a63ba5e7f82f..efb7bb99087d 100644 --- a/pkgs/shells/nushell/plugins/highlight.nix +++ b/pkgs/shells/nushell/plugins/highlight.nix @@ -11,15 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_highlight"; - version = "1.3.2+0.99.0"; + version = "1.4.2+0.101.0"; src = fetchFromGitHub { repo = "nu-plugin-highlight"; owner = "cptpiepmatz"; rev = "refs/tags/v${version}"; - hash = "sha256-rYS5Nqk+No1BhmEPzl+MX+aCH8fzHqdp8U8PKYSWVcc="; + hash = "sha256-YE8O3KL0SSu6FYFyMCNpyd4WLefVQP7FSNr82D+Jwqs="; + fetchSubmodules = true; }; - cargoHash = "sha256-VHx+DLS+v4p++KI+ZLzJpFk4A5Omwy6E0vJ/lgP3pC0="; + + cargoHash = "sha256-LDVKZLktP4+W04O8EDkMs8dgViHyzA/b7k+/oJS2pro="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ @@ -35,7 +37,7 @@ rustPlatform.buildRustPackage rec { passthru.updateScript = nix-update-script { }; meta = with lib; { - description = "A nushell plugin that will inspect a file and return information based on it's magic number."; + description = "A nushell plugin for syntax highlighting."; mainProgram = "nu_plugin_highlight"; homepage = "https://github.com/cptpiepmatz/nu-plugin-highlight"; license = licenses.mit; diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix index b69cddcacce9..caccd2f62f00 100644 --- a/pkgs/shells/nushell/plugins/polars.nix +++ b/pkgs/shells/nushell/plugins/polars.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_polars"; inherit (nushell) version src; - cargoHash = "sha256-CMrq0UVJxXoyHo9OvatW9tlknqzOuK70NI8H/ZgbYBY="; + cargoHash = "sha256-rzTXVde0ZqgJQb1Hs3nvo9v1k+0UKkgKlTym4pukvuk="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 75af8490dedb..041c26db8754 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-xztQzfe/ZjG3YvQMDN3ADtWIcjUr3thPxbPjOKKvB9Q="; + cargoHash = "sha256-OuunFi3zUIgxWol30btAR71TU7Jc++IhlZuM56KpM/Q="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/pkgs/shells/nushell/plugins/units.nix b/pkgs/shells/nushell/plugins/units.nix index bf1211e56128..d929d0286071 100644 --- a/pkgs/shells/nushell/plugins/units.nix +++ b/pkgs/shells/nushell/plugins/units.nix @@ -11,15 +11,15 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_units"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { repo = "nu_plugin_units"; owner = "JosephTLyons"; rev = "v${version}"; - hash = "sha256-zPN18ECzh2/l0kxp+Vyp3d9kCq3at/7SqMYbV3WDV3I="; + hash = "sha256-iDRrA8bvufV92ADeG+eF3xu7I/4IinJcSxEkwuhkHlg="; }; - cargoHash = "sha256-6NWyuErdxj7//wW4L7ijW4RiWqdwbeTrelIjpisAGkg="; + cargoHash = "sha256-if8uvDRwr6p5VENdls9mIfECiu/zDybcpkphZLHRHe8="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 05c5d2924793..d7a6b1472926 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -828,9 +828,10 @@ mapAliases { MIDIVisualizer = midivisualizer; # Added 2024-06-12 mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01 mime-types = mailcap; # Added 2022-01-21 - minetest-touch = minetestclient; # Added 2024-08-12 - minetestclient_5 = minetestclient; # Added 2023-12-11 - minetestserver_5 = minetestserver; # Added 2023-12-11 + minetest = luanti; # Added 2024-11-11 + minetestclient = luanti-client; # Added 2024-11-11 + minetestserver = luanti-server; # Added 2024-11-11 + minetest-touch = luanti-client; # Added 2024-08-12 minizip2 = pkgs.minizip-ng; # Added 2022-12-28 mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17 mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 883fe720e293..a76481a69dff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7175,7 +7175,7 @@ with pkgs; inherit (beam.interpreters) erlang erlang_27 erlang_26 erlang_25 erlang_24 - elixir elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14 elixir_1_13 elixir_1_12 elixir_1_11 elixir_1_10 + elixir elixir_1_18 elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14 elixir-ls; erlang_nox = beam_nox.interpreters.erlang; @@ -16774,11 +16774,8 @@ with pkgs; minecraftServers = import ../games/minecraft-servers { inherit callPackage lib javaPackages; }; minecraft-server = minecraftServers.vanilla; # backwards compatibility - minetest = callPackage ../games/minetest { - inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa Kernel; - }; - minetestclient = minetest.override { buildServer = false; }; - minetestserver = minetest.override { buildClient = false; }; + luanti-client = luanti.override { buildServer = false; }; + luanti-server = luanti.override { buildClient = false; }; mnemosyne = callPackage ../games/mnemosyne { python = python3; @@ -17032,6 +17029,8 @@ with pkgs; wesnoth = callPackage ../games/wesnoth { inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; + # fails to build against latest boost + boost = boost183; # wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234 lua = lua5_4.override { postConfigure = '' diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index 59aeda1931b3..92aac4a8d8ee 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -64,14 +64,11 @@ in # `beam.packages.erlang_24.elixir`. inherit (self.packages.erlang) elixir + elixir_1_18 elixir_1_17 elixir_1_16 elixir_1_15 elixir_1_14 - elixir_1_13 - elixir_1_12 - elixir_1_11 - elixir_1_10 elixir-ls lfe lfe_2_1