diff options
Diffstat (limited to 'pkgs/applications')
58 files changed, 147 insertions, 115 deletions
diff --git a/pkgs/applications/audio/ledfx/default.nix b/pkgs/applications/audio/ledfx/default.nix index f45c7dc3af558..593fd72c6d0ce 100644 --- a/pkgs/applications/audio/ledfx/default.nix +++ b/pkgs/applications/audio/ledfx/default.nix @@ -26,7 +26,6 @@ python3.pkgs.buildPythonPackage rec { poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ aiohttp diff --git a/pkgs/applications/audio/pd-plugins/gem/default.nix b/pkgs/applications/audio/pd-plugins/gem/default.nix index 7bfdb1bd8a8a4..5cb308988a4f7 100644 --- a/pkgs/applications/audio/pd-plugins/gem/default.nix +++ b/pkgs/applications/audio/pd-plugins/gem/default.nix @@ -7,7 +7,7 @@ , libGL , libGLU , glew -, freeglut +, libglut , libv4l , libX11 , file @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libGL libGLU glew - freeglut + libglut libv4l libX11 ]; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 97ea40d7438b4..09ed89bb2ba21 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -45,7 +45,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = [ - python3.pkgs.pythonRelaxDepsHook wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix index c65208343aff7..7cf8636ad1074 100644 --- a/pkgs/applications/audio/sndpeek/default.nix +++ b/pkgs/applications/audio/sndpeek/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libsndfile, freeglut, alsa-lib, mesa, libGLU, libX11, libXmu +{ lib, stdenv, fetchurl, libsndfile, libglut, alsa-lib, mesa, libGLU, libX11, libXmu , libXext, libXi }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./pthread.patch ]; buildInputs = [ - freeglut + libglut alsa-lib mesa libGLU diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix index 4981d509e236d..fdac36e492f25 100644 --- a/pkgs/applications/backup/unifi-protect-backup/default.nix +++ b/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -40,7 +40,6 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = with python.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python.pkgs; [ diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index 6af16ffac8a46..9b18e6d13de18 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -92,8 +92,5 @@ rustPlatform.buildRustPackage rec { maintainers = with maintainers; [ akru andresilva FlorianFranzen RaghavSood ]; # See Iso::from_arch in src/isa/mod.rs in cranelift-codegen-meta. platforms = intersectLists platforms.unix (platforms.aarch64 ++ platforms.s390x ++ platforms.riscv64 ++ platforms.x86); - # See comment about wasm32-unknown-unknown in rustc.nix. - broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix index 36576f7c12398..391065ccfb20d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix @@ -79,7 +79,8 @@ in { lib.nameValuePair ename ( self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs: melpaBuild { - inherit pname ename commit; + inherit pname ename; + inherit (sourceArgs) commit; version = lib.optionalString (version != null) (lib.concatStringsSep "." (map toString # Hack: Melpa archives contains versions with parse errors such as [ 4 4 -4 413 ] which should be 4.4-413 diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 487d8a3680a6d..da243044b689a 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -104,10 +104,10 @@ in emacs29 = import ./make-emacs.nix (mkArgs { pname = "emacs"; - version = "29.3"; + version = "29.4"; variant = "mainline"; - rev = "29.3"; - hash = "sha256-4yN81djeKb9Hlr6MvaDdXqf4XOl0oolXEYGqkA+KUO0="; + rev = "29.4"; + hash = "sha256-FCP6ySkN9mAdp2T09n6foS2OciqZXc/54guRZ0B4Z2s="; }); emacs28-macport = import ./make-emacs.nix (mkArgs { diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index b07f517ea474a..c2e6b565de282 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -43,6 +43,14 @@ let ''; }; + nvim-with-luasnip = wrapNeovim2 "-with-lua-packages" (makeNeovimConfig { + plugins = [ { + plugin = vimPlugins.luasnip; + + } + ]; + }); + nvimAutoDisableWrap = makeNeovimConfig { }; wrapNeovim2 = suffix: config: @@ -281,4 +289,16 @@ rec { export HOME=$TMPDIR ${nvim_with_opt_plugin}/bin/nvim -i NONE +quit! -e ''; + + inherit nvim-with-luasnip; + + # check that bringing in one plugin with lua deps makes those deps visible from wrapper + # for instance luasnip has a dependency on jsregexp + can_require_transitive_deps = + runTest nvim-with-luasnip '' + export HOME=$TMPDIR + cat ${nvim-with-luasnip}/bin/nvim + ${nvim-with-luasnip}/bin/nvim -i NONE --cmd "lua require'jsregexp'" -e + ''; + }) diff --git a/pkgs/applications/editors/neovim/utils.nix b/pkgs/applications/editors/neovim/utils.nix index 8f9a5b880032c..902d62d9486a0 100644 --- a/pkgs/applications/editors/neovim/utils.nix +++ b/pkgs/applications/editors/neovim/utils.nix @@ -229,12 +229,36 @@ let ln -s ${grammar}/parser $out/parser/${name}.so ''); + /* + Fork of vimUtils.packDir that additionnally generates a propagated-build-inputs-file that + can be used by the lua hooks to generate a proper LUA_PATH + + Generates a packpath folder as expected by vim + Example: + packDir ( {myVimPackage = { start = [ vimPlugins.vim-fugitive ]; opt = []; }; }) + => "/nix/store/xxxxx-pack-dir" + */ + packDir = packages: + let + rawPackDir = vimUtils.packDir packages; + + in + rawPackDir.override ({ + postBuild = '' + mkdir $out/nix-support + for i in $(find -L $out -name propagated-build-inputs ); do + cat "$i" >> $out/nix-support/propagated-build-inputs + done + '';}); + + in { inherit makeNeovimConfig; inherit generateProviderRc; inherit legacyWrapper; inherit grammarToPlugin; + inherit packDir; inherit buildNeovimPlugin; buildNeovimPluginFrom2Nix = lib.warn "buildNeovimPluginFrom2Nix was renamed to buildNeovimPlugin" buildNeovimPlugin; diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index e877f1e1f764a..d86de46c87385 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -13,6 +13,9 @@ neovim-unwrapped: let + # inherit interpreter from neovim + lua = neovim-unwrapped.lua; + wrapper = { extraName ? "" # should contain all args but the binary. Can be either a string or list @@ -24,6 +27,8 @@ let , withNodeJs ? false , withPerl ? false , rubyEnv ? null + + # wether to create symlinks in $out/bin/vi(m) -> $out/bin/nvim , vimAlias ? false , viAlias ? false @@ -45,6 +50,8 @@ let stdenv.mkDerivation (finalAttrs: let + finalPackdir = neovimUtils.packDir packpathDirs; + rcContent = '' ${luaRcContent} '' + lib.optionalString (!isNull neovimRcContent) '' @@ -57,10 +64,10 @@ let # vim accepts a limited number of commands so we join them all [ "--add-flags" ''--cmd "lua ${providerLuaRc}"'' - # (lib.intersperse "|" hostProviderViml) - ] ++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [ - "--add-flags" ''--cmd "set packpath^=${vimUtils.packDir packpathDirs}"'' - "--add-flags" ''--cmd "set rtp^=${vimUtils.packDir packpathDirs}"'' + ] + ++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [ + "--add-flags" ''--cmd "set packpath^=${finalPackdir}"'' + "--add-flags" ''--cmd "set rtp^=${finalPackdir}"'' ] ; @@ -160,7 +167,17 @@ let + '' rm $out/bin/nvim touch $out/rplugin.vim - makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} + + echo "Looking for lua dependencies..." + source ${lua}/nix-support/utils.sh + + _addToLuaPath "${finalPackdir}" + + echo "LUA_PATH towards the end of packdir: $LUA_PATH" + + makeWrapper ${lib.escapeShellArgs finalMakeWrapperArgs} ${wrapperArgsStr} \ + --prefix LUA_PATH ';' "$LUA_PATH" \ + --prefix LUA_CPATH ';' "$LUA_CPATH" ''; buildPhase = '' diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index d2e3013a782d9..50de9c6bfb79e 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0412"; + version = "9.1.0509"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-uLdXFZ8eW+iMXrvkaEkArZmRfAiyORaEZxFFPt0TrdI="; + hash = "sha256-CATjUalRjvVjEfWT5evFAk//Oj4iB1fDBsRU5MhDyn4="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index dfc72683d7d3b..54fea4cc901ea 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -176,7 +176,7 @@ lib.optionalAttrs (buildScript != null) { builder = buildScript; } # https://bugs.winehq.org/show_bug.cgi?id=43530 # https://github.com/NixOS/nixpkgs/issues/31989 - hardeningDisable = [ "bindnow" ] + hardeningDisable = [ "bindnow" "stackclashprotection" ] ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify" ++ lib.optional (supportFlags.mingwSupport) "format"; diff --git a/pkgs/applications/emulators/yabause/default.nix b/pkgs/applications/emulators/yabause/default.nix index 53fcc870f1a16..7623cc49efb9a 100644 --- a/pkgs/applications/emulators/yabause/default.nix +++ b/pkgs/applications/emulators/yabause/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, cmake, pkg-config, qtbase, qt5, libGLU, libGL -, freeglut ? null, openal ? null, SDL2 ? null }: +, libglut ? null, openal ? null, SDL2 ? null }: mkDerivation rec { pname = "yabause"; @@ -11,7 +11,7 @@ mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL freeglut openal SDL2 ]; + buildInputs = [ qtbase qt5.qtmultimedia libGLU libGL libglut openal SDL2 ]; patches = [ ./linkage-rwx-linux-elf.patch diff --git a/pkgs/applications/file-managers/browsr/default.nix b/pkgs/applications/file-managers/browsr/default.nix index ba88f782ef657..92895378c355e 100644 --- a/pkgs/applications/file-managers/browsr/default.nix +++ b/pkgs/applications/file-managers/browsr/default.nix @@ -18,7 +18,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ hatchling - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index 99810a8d496f4..722363a9b0706 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeatureAs (arch != null) "gcc-arch" arch) (lib.withFeature librsvgSupport "rsvg") (lib.withFeature liblqr1Support "lqr") - (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript}/share/ghostscript/fonts") + (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts") (lib.withFeature ghostscriptSupport "gslib") ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ # due to libxml2 being without DLLs ATM diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 671affec32d53..0819a314bd274 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.withFeature librsvgSupport "pango") (lib.withFeature liblqr1Support "lqr") (lib.withFeature libjxlSupport "jxl") - (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript}/share/ghostscript/fonts") + (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts") (lib.withFeature ghostscriptSupport "gslib") ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ # due to libxml2 being without DLLs ATM diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index 5491305fad2c8..dfa518c5c5741 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -3,7 +3,7 @@ , fetchFromGitLab , alsa-lib , fftw -, freeglut +, libglut , freetype , glew , libjack2 @@ -33,17 +33,17 @@ stdenv.mkDerivation { buildInputs = [ alsa-lib fftw - freeglut.dev + libglut freetype glew libjack2 - libjpeg.dev + libjpeg liblo - libsndfile.dev - libtiff.dev + libsndfile + libtiff ode openal - openssl.dev + openssl racket_7_9 ]; nativeBuildInputs = [ scons ]; diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index def7e3e9dd867..1ff0fd5146df0 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -4,7 +4,7 @@ , libjpeg , libGLU , libGL -, freeglut +, libglut , zlib , cmake , libX11 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ libjpeg libGLU libGL freeglut zlib libX11 libxml2 libpng libXxf86vm ]; + buildInputs = [ libjpeg libGLU libGL libglut zlib libX11 libxml2 libpng libXxf86vm ]; postPatch = '' sed -i -e '/GECKO/d' CMakeLists.txt diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix index 1dd460c2e1d2b..a474550820ba3 100644 --- a/pkgs/applications/graphics/opentoonz/default.nix +++ b/pkgs/applications/graphics/opentoonz/default.nix @@ -1,7 +1,7 @@ { boost , cmake , fetchFromGitHub -, freeglut +, libglut , freetype , glew , libjpeg @@ -93,7 +93,7 @@ stdenv.mkDerivation { buildInputs = [ boost - freeglut + libglut freetype glew libjpeg diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix index c81d4f65d785e..0bb9a89325e54 100644 --- a/pkgs/applications/misc/archivy/default.nix +++ b/pkgs/applications/misc/archivy/default.nix @@ -32,7 +32,6 @@ buildPythonApplication rec { hash = "sha256-ns1Y0DqqnTAQMEt+oBJ/P2gqKqPsX9P3/Z4561qzuns"; }; - nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRelaxDeps = true; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index e54cae9e56a24..18d76788dadf6 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -341,10 +341,10 @@ stdenv.mkDerivation (finalAttrs: { }; tests = { - render = runCommand "${finalAttrs.pname}-test" { } '' + render = runCommand "${finalAttrs.pname}-test" { + nativeBuildInputs = [ mesa.llvmpipeHook ]; + } '' set -euo pipefail - export LIBGL_DRIVERS_PATH=${mesa.drivers}/lib/dri - export __EGL_VENDOR_LIBRARY_FILENAMES=${mesa.drivers}/share/glvnd/egl_vendor.d/50_mesa.json cat <<'PYTHON' > scene-config.py import bpy bpy.context.scene.eevee.taa_render_samples = 32 diff --git a/pkgs/applications/misc/dbx/default.nix b/pkgs/applications/misc/dbx/default.nix index 9dc19941a0720..95fd50b1e2411 100644 --- a/pkgs/applications/misc/dbx/default.nix +++ b/pkgs/applications/misc/dbx/default.nix @@ -30,7 +30,6 @@ python.pkgs.buildPythonApplication rec { build-system = with python.pkgs; [ setuptools ]; - nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ]; propagatedBuildInputs = with python.pkgs; diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index 1a079ab8274c3..aeeb82ba581fb 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -1,8 +1,8 @@ -{ stdenv, lib, fetchzip, freeglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM +{ stdenv, lib, fetchzip, libglut, libXmu, libXi, libX11, libICE, libGLU, libGL, libSM , libXext, glibc, lua, luabind, glfw, libgccjit, dialog, makeWrapper }: let - lpath = lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU libGL libSM libXext glibc lua glfw luabind libgccjit ]; + lpath = lib.makeLibraryPath [ libXmu libXi libX11 libglut libICE libGLU libGL libSM libXext glibc lua glfw luabind libgccjit ]; in stdenv.mkDerivation rec { pname = "iceSL"; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index acdbf8835e31f..6f9d023204012 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -62,7 +62,7 @@ in buildFHSEnv { fontconfig SDL2_ttf # Mednafen - freeglut mesa_glu + libglut mesa_glu # MESS expat diff --git a/pkgs/applications/misc/mupdf/1.17/default.nix b/pkgs/applications/misc/mupdf/1.17/default.nix index b8cb75b057fd1..a3848ccc078b7 100644 --- a/pkgs/applications/misc/mupdf/1.17/default.nix +++ b/pkgs/applications/misc/mupdf/1.17/default.nix @@ -2,7 +2,7 @@ , jbig2dec, libjpeg , darwin , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl -, enableGL ? true, freeglut, libGLU +, enableGL ? true, libglut, libGLU }: let @@ -33,14 +33,14 @@ in stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg libglut libGLU ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( if stdenv.isDarwin then with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] else - [ freeglut libGLU ]) + [ libglut libGLU ]) ; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix index aa0fb08984edc..2da4e5eb7eb10 100644 --- a/pkgs/applications/misc/pagefind/default.nix +++ b/pkgs/applications/misc/pagefind/default.nix @@ -8,7 +8,6 @@ , gzip , nodejs , rustc -, stdenv , wasm-bindgen-cli , wasm-pack }: @@ -121,9 +120,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ pbsds ]; platforms = platforms.unix; - # See comment about wasm32-unknown-unknown in rustc.nix. - broken = lib.any (a: lib.hasAttr a stdenv.hostPlatform.gcc) [ "cpu" "float-abi" "fpu" ] || - !stdenv.hostPlatform.gcc.thumb or true; mainProgram = "pagefind"; }; } diff --git a/pkgs/applications/misc/pysentation/default.nix b/pkgs/applications/misc/pysentation/default.nix index ad2d9c02e683a..41568d0295b32 100644 --- a/pkgs/applications/misc/pysentation/default.nix +++ b/pkgs/applications/misc/pysentation/default.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/applications/misc/rusty-psn/default.nix b/pkgs/applications/misc/rusty-psn/default.nix index 058e4a9c028a9..d72905fe094f0 100644 --- a/pkgs/applications/misc/rusty-psn/default.nix +++ b/pkgs/applications/misc/rusty-psn/default.nix @@ -56,7 +56,6 @@ rustPlatform.buildRustPackage rec { xorg.libXi xorg.libxcb libGL - libGL.dev ]; buildNoDefaultFeatures = true; diff --git a/pkgs/applications/misc/shell-genie/default.nix b/pkgs/applications/misc/shell-genie/default.nix index 728a4aabed381..df4833199d8c0 100644 --- a/pkgs/applications/misc/shell-genie/default.nix +++ b/pkgs/applications/misc/shell-genie/default.nix @@ -25,10 +25,6 @@ buildPythonPackage rec { poetry-core ]; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - dependencies = [ colorama openai diff --git a/pkgs/applications/misc/snagboot/default.nix b/pkgs/applications/misc/snagboot/default.nix index 353712d5ba896..11f49d8506b5e 100644 --- a/pkgs/applications/misc/snagboot/default.nix +++ b/pkgs/applications/misc/snagboot/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, pythonRelaxDepsHook , python3 , snagboot , testers @@ -21,7 +20,6 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook ]; pythonRemoveDeps = [ diff --git a/pkgs/applications/misc/yubioath-flutter/helper.nix b/pkgs/applications/misc/yubioath-flutter/helper.nix index 2fe6bd7904d7e..378981ae84107 100644 --- a/pkgs/applications/misc/yubioath-flutter/helper.nix +++ b/pkgs/applications/misc/yubioath-flutter/helper.nix @@ -4,7 +4,6 @@ , zxing-cpp , pillow , poetry-core -, pythonRelaxDepsHook , src , version @@ -21,7 +20,6 @@ buildPythonApplication { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = true; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3616189374d30..fab1bbdff39e9 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -199,7 +199,7 @@ let pciutils protobuf speechd libXdamage at-spi2-core pipewire libva - libdrm wayland mesa.drivers libxkbcommon + libdrm wayland libxkbcommon curl libepoxy libffi @@ -227,7 +227,7 @@ let pciutils protobuf speechd libXdamage at-spi2-core pipewire libva - libdrm wayland mesa.drivers libxkbcommon + libdrm wayland libxkbcommon curl libepoxy libffi diff --git a/pkgs/applications/networking/cluster/tftui/default.nix b/pkgs/applications/networking/cluster/tftui/default.nix index 9af694c683fd9..097476446676c 100644 --- a/pkgs/applications/networking/cluster/tftui/default.nix +++ b/pkgs/applications/networking/cluster/tftui/default.nix @@ -24,7 +24,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ makeWrapper poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/dyndns/dyndnsc/default.nix b/pkgs/applications/networking/dyndns/dyndnsc/default.nix index 930fc34603192..18e5847e67094 100644 --- a/pkgs/applications/networking/dyndns/dyndnsc/default.nix +++ b/pkgs/applications/networking/dyndns/dyndnsc/default.nix @@ -24,7 +24,6 @@ python3Packages.buildPythonApplication rec { build-system = with python3Packages; [ setuptools ]; - nativeBuildInputs = with python3Packages; [ pythonRelaxDepsHook ]; dependencies = with python3Packages; [ daemonocle diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index c94bbc8780188..c635c6fefb2a3 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -16,10 +16,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-BmHChLWWnrtg0p4WH8bANwpo+p4RTwjYbXfyPnz6mp8="; }; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - pythonRelaxDeps = true; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index f12a51d751913..f5118bb968634 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -24,7 +24,6 @@ python3Packages.buildPythonApplication rec { installShellFiles ] ++ (with python3Packages; [ setuptools - pythonRelaxDepsHook ]); pythonRelaxDeps = [ diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix index 86136dbb36d6a..e577aa110fc94 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { libnotify libpulseaudio libxkbcommon - mesa.drivers nss xorg.libX11 xorg.libXScrnSaver diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix index cc3273dcdca90..878ecbf4ee5d8 100644 --- a/pkgs/applications/networking/mailreaders/alot/default.nix +++ b/pkgs/applications/networking/mailreaders/alot/default.nix @@ -1,5 +1,5 @@ { lib -, python3 +, python311 , fetchFromGitHub , file , gnupg @@ -9,7 +9,7 @@ , withManpage ? false }: -with python3.pkgs; buildPythonApplication rec { +with python311.pkgs; buildPythonApplication rec { pname = "alot"; version = "0.10"; diff --git a/pkgs/applications/networking/p2p/pyrosimple/default.nix b/pkgs/applications/networking/p2p/pyrosimple/default.nix index c08f6ae4b64b1..21448538edf65 100644 --- a/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -27,7 +27,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index d679b168e24ff..81acbb4ed6ae1 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,8 +1,9 @@ { stdenv , fetchurl +, fetchpatch2 , lib , pam -, python3 +, python311 , libxslt , perl , perlPackages @@ -244,6 +245,11 @@ in stdenv.mkDerivation (finalAttrs: { # - the remaining tests have notes in the patch # FIXME: get rid of this ASAP ./skip-broken-tests.patch + (fetchpatch2 { + name = "icu74-compat.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch"; + hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y="; + }) ] ++ lib.optionals (variant == "still") [ # Remove build config to reduce the amount of `-dev` outputs in the # runtime closure. This behavior was introduced by upstream in commit @@ -372,7 +378,7 @@ in stdenv.mkDerivation (finalAttrs: { perl poppler postgresql - python3 + python311 sane-backends unixODBC unzip diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 8b40196fdbff5..3347fa5356b5d 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, freeglut, gtk2, gtkglext +{ lib, stdenv, fetchFromGitHub, pkg-config, libglut, gtk2, gtkglext , libjpeg_turbo, libtheora, libXmu, lua, libGLU, libGL, perl, autoreconfHook }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ - freeglut gtk2 gtkglext lua perl + libglut gtk2 gtkglext lua perl libjpeg_turbo libtheora libXmu libGLU libGL ]; diff --git a/pkgs/applications/science/biology/macs2/default.nix b/pkgs/applications/science/biology/macs2/default.nix index 26ec138048f7e..153f85535f943 100644 --- a/pkgs/applications/science/biology/macs2/default.nix +++ b/pkgs/applications/science/biology/macs2/default.nix @@ -1,9 +1,11 @@ -{ lib, python3, fetchpatch, fetchPypi }: +{ lib, python311, fetchpatch, fetchPypi }: -python3.pkgs.buildPythonPackage rec { +# pin python311 because macs2 does not support python 3.12 +# https://github.com/macs3-project/MACS/issues/598#issuecomment-1812622572 +python311.pkgs.buildPythonPackage rec { pname = "macs2"; version = "2.2.9.1"; - format = "pyproject"; + pyproject = true; src = fetchPypi { pname = lib.toUpper pname; @@ -20,20 +22,19 @@ python3.pkgs.buildPythonPackage rec { }) ]; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python311.pkgs; [ cython_0 numpy setuptools - wheel ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python311.pkgs; [ numpy ]; __darwinAllowLocalNetworking = true; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python311.pkgs; [ unittestCheckHook ]; diff --git a/pkgs/applications/science/geometry/antiprism/default.nix b/pkgs/applications/science/geometry/antiprism/default.nix index 62ffc099dc6cd..9d4c6fc6a4091 100644 --- a/pkgs/applications/science/geometry/antiprism/default.nix +++ b/pkgs/applications/science/geometry/antiprism/default.nix @@ -4,7 +4,7 @@ , libX11 , libGL , libGLU -, freeglut }: +, libglut }: stdenv.mkDerivation rec { pname = "antiprism"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libX11 libGLU libGL.dev freeglut.dev ]; + buildInputs = [ libX11 libGLU libGL libglut ]; meta = with lib; { homepage = "https://www.antiprism.com"; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 38caee5805b43..0edaa32babd70 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -5,7 +5,7 @@ , makeWrapper , libGLU , libGL -, freeglut +, libglut , mpfr , gmp , pkgsHostTarget @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]); buildInputs = [ - freeglut + libglut libGL libGLU mpfr diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 1552de773d014..f54c6a92300c3 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -6,7 +6,6 @@ , perl , pkg-config , sage-setup -, pythonRelaxDepsHook , gd , iml , libpng @@ -103,7 +102,6 @@ buildPythonPackage rec { pip # needed to query installed packages pkg-config sage-setup - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 68134a99a2035..199759437e911 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -10,7 +10,7 @@ , libGL , libXmu , libXi -, freeglut +, libglut , libjpeg , libtool , wxGTK32 @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { libGL libXmu libXi - freeglut + libglut libjpeg wxGTK32 gtk3 diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index 7f28c8d1b1463..bb2c3c0abe30e 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -2,7 +2,7 @@ , autoPatchelfHook , dpkg , fetchurl -, freeglut +, libglut , gcc-unwrapped , libGL , libGLU @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - freeglut + libglut gcc-unwrapped.lib libGL libGLU diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index 6b68e6bdc0f5b..48f175e67e7c4 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -51,16 +51,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.39"; + version = "0.1.0"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-pnU2wxgopHMWgJ7JGdO2P/MCfxqCY7MTEE39qtD0XKw="; + hash = "sha256-Jp8f8u9CkY+pz6QaoWp6P6+OqsIjhzXH0eeoBiSDR0k="; }; - cargoHash = "sha256-GwI2zHX1YcR4pC+qtkDoxx2U+zipbqqxsCI8/XNg2BU="; + cargoHash = "sha256-3FirYpHxTRvXgRQACVvmwlaCNTyJ8dLbZ258qv5vbsc="; nativeBuildInputs = [ ncurses diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 303c6d1b77da5..9992a6bae95da 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "390"; + version = "392"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-dRF8PMUXSgnEJe8QbmlATXL17wXgOl2gCq8VeS1vnA8="; + hash = "sha256-TVc3LvCOr6n7doLbjQe+D+BRPljoR4wuyOm2JIbn/l4="; }; strictDeps = true; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index f0cfc626c4fa7..10a2ad2adcbe0 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -24,12 +24,12 @@ python3.pkgs.buildPythonApplication rec { }; pythonRelaxDeps = [ + "argcomplete" "decli" ]; nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook installShellFiles ]; diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index d7e008d656fde..f0386bd4a273c 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.45.1"; + version = "2.45.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-5k00Co5ieuIs+4vMZRzKC0l88en99SNzVUT/SnMvEr8="; + hash = "sha256-Ub/ofrHAL+0UhAUYdTZe6rIpgx0w0M7F2JoU+eQOmts="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; diff --git a/pkgs/applications/version-management/git/update.sh b/pkgs/applications/version-management/git/update.sh index 1f70dcff42940..7aa1e90d53b3b 100755 --- a/pkgs/applications/version-management/git/update.sh +++ b/pkgs/applications/version-management/git/update.sh @@ -4,7 +4,7 @@ set -eu -o pipefail oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion git" | tr -d '"')" -latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" +latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/git/git.git | grep -v '{}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" targetVersion="${1:-$latestTag}" if [ ! "${oldVersion}" = "${targetVersion}" ]; then diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix index 8bbb0eee971de..93014402a2ebd 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/gitless/default.nix @@ -15,7 +15,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-XDB1i2b1reMCM6i1uK3IzTnsoLXO7jldYtNlYUo1AoQ="; }; - nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ pygit2 diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 25c2df1ad71be..5057e725010e5 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -23,11 +23,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.6.3"; + version = "6.7.4"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - hash = "sha256-911qSnWCOht9cTpJZ+yi9Zb0ZuWPxrwG1yZCky/X4wc="; + hash = "sha256-dHCPhzQFwSJy/sEWxt1Shi6O0RwQARx+V19eqBJj6l4="; }; format = "other"; @@ -37,7 +37,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-G5tzwoIGOgpVI35rYXDeelnBgTbAiq7BDcXCHQzqSrs="; + hash = "sha256-FRa7frX2z9jQGFBXS2TpOUANs0+xwegNETUAQIU0S4o="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/pkgs/applications/video/animdl/default.nix b/pkgs/applications/video/animdl/default.nix index c8ba0264e36aa..ebe13e8b12e26 100644 --- a/pkgs/applications/video/animdl/default.nix +++ b/pkgs/applications/video/animdl/default.nix @@ -2,7 +2,6 @@ buildPythonApplication, fetchFromGitHub, poetry-core, - pythonRelaxDepsHook, anchor-kr, anitopy, click, @@ -47,7 +46,6 @@ buildPythonApplication { nativeBuildInputs = [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = [ anchor-kr diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 825ae0de85e42..a67588fea1fd0 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, cmake, pkg-config, python3, libX11, libXext, libXinerama, libXrandr, libXft, libXrender, libXdmcp, libXfixes, freetype, asciidoc -, xdotool, xorgserver, xsetroot, xterm, runtimeShell +, xdotool, xorg, xsetroot, xterm, runtimeShell , fetchpatch , nixosTests }: @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { nativeCheckInputs = [ (python3.withPackages (ps: with ps; [ ewmh pytest xlib ])) xdotool - xorgserver + xorg.xvfb xsetroot xterm python3.pkgs.pytestCheckHook diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index 16dd2e6485e77..8ced173b22234 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -1,7 +1,7 @@ { fetchurl, lib, stdenv, pkg-config, makeWrapper, meson, ninja, installShellFiles, libxcb, xcbutilkeysyms , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre2, libev , yajl, xcb-util-cursor, perl, pango, perlPackages, libxkbcommon -, xorgserver, xvfb-run +, xvfb-run , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libstartup_notification libX11 pcre2 libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.InlineC - xorgserver xvfb-run + xvfb-run ]; configureFlags = [ "--disable-builddir" ]; |