nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2024-07-02 12:01:23 +00:00 committed by GitHub
commit f1dc7c9537
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 231 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/services/networking/syncthing.nix
View File

@ -368,6 +368,15 @@ in {
''; '';
}; };
type = mkOption {
type = types.enum [ "sendreceive" "sendonly" "receiveonly" "receiveencrypted" ];
default = "sendreceive";
description = ''
Controls how the folder is handled by Syncthing.
See <https://docs.syncthing.net/users/config.html#config-option-folder.type>.
'';
};
devices = mkOption { devices = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = []; default = [];

2
nixos/modules/system/boot/systemd/journald.nix
View File

@ -72,7 +72,7 @@ in {
type = types.lines; type = types.lines;
example = "Storage=volatile"; example = "Storage=volatile";
description = '' description = ''
Extra config options for systemd-journald. See man journald.conf Extra config options for systemd-journald. See {manpage}`journald.conf(5)`
for available options. for available options.
''; '';
}; };

5
pkgs/applications/editors/vim/macvim-configurable.nix
View File

@ -1,8 +1,6 @@
{ lib, stdenv, callPackage, vimUtils, buildEnv, makeWrapper }: { lib, stdenv, callPackage, vimUtils, buildEnv, makeWrapper }:
let let
macvim = callPackage ./macvim.nix { inherit stdenv; };
makeCustomizable = macvim: macvim // { makeCustomizable = macvim: macvim // {
# configure expects the same args as vimUtils.vimrcFile. # configure expects the same args as vimUtils.vimrcFile.
# This is the same as the value given to neovim.override { configure = … } # This is the same as the value given to neovim.override { configure = … }
@ -62,5 +60,4 @@ let
override = f: makeCustomizable (macvim.override f); override = f: makeCustomizable (macvim.override f);
overrideAttrs = f: makeCustomizable (macvim.overrideAttrs f); overrideAttrs = f: makeCustomizable (macvim.overrideAttrs f);
}; };
in in { inherit makeCustomizable; }
makeCustomizable macvim

154
pkgs/applications/editors/vim/macvim.nix
View File

@ -6,15 +6,23 @@
, gettext , gettext
, pkg-config , pkg-config
, cscope , cscope
, ruby , ruby_3_2
, tcl , tcl
, perl , perl536
, luajit , luajit
, darwin , darwin
, libiconv , libiconv
, python3 , python3
}: }:
# Try to match MacVim's documented script interface compatibility
let
# Perl 5.30 - closest we get is 5.36. 5.38 is currently failing
perl = perl536;
# Ruby 3.2
ruby = ruby_3_2;
in
let let
# Building requires a few system tools to be in PATH. # Building requires a few system tools to be in PATH.
# Some of these we could patch into the relevant source files (such as xcodebuild and # Some of these we could patch into the relevant source files (such as xcodebuild and
@ -26,16 +34,16 @@ let
''; '';
in in
stdenv.mkDerivation { stdenv.mkDerivation (finalAttrs: {
pname = "macvim"; pname = "macvim";
version = "8.2.3455"; version = "178";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "macvim-dev"; owner = "macvim-dev";
repo = "macvim"; repo = "macvim";
rev = "snapshot-172"; rev = "release-${finalAttrs.version}";
sha256 = "sha256-LLLQ/V1vyKTuSXzHW3SOlOejZD5AV16NthEdMoTnfko="; hash = "sha256-JYh5fyaYuME/Lk67vrf1hYOIcAkEbwtslcnI9KRzHa8=";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -48,26 +56,26 @@ stdenv.mkDerivation {
patches = [ ./macvim.patch ]; patches = [ ./macvim.patch ];
configureFlags = [ configureFlags = [
"--enable-cscope" "--enable-cscope"
"--enable-fail-if-missing" "--enable-fail-if-missing"
"--with-features=huge" "--with-features=huge"
"--enable-gui=macvim" "--enable-gui=macvim"
"--enable-multibyte" "--enable-multibyte"
"--enable-nls" "--enable-nls"
"--enable-luainterp=dynamic" "--enable-luainterp=dynamic"
"--enable-python3interp=dynamic" "--enable-python3interp=dynamic"
"--enable-perlinterp=dynamic" "--enable-perlinterp=dynamic"
"--enable-rubyinterp=dynamic" "--enable-rubyinterp=dynamic"
"--enable-tclinterp=yes" "--enable-tclinterp=yes"
"--without-local-dir" "--without-local-dir"
"--with-luajit" "--with-luajit"
"--with-lua-prefix=${luajit}" "--with-lua-prefix=${luajit}"
"--with-python3-command=${python3}/bin/python3" "--with-python3-command=${python3}/bin/python3"
"--with-ruby-command=${ruby}/bin/ruby" "--with-ruby-command=${ruby}/bin/ruby"
"--with-tclsh=${tcl}/bin/tclsh" "--with-tclsh=${tcl}/bin/tclsh"
"--with-tlib=ncurses" "--with-tlib=ncurses"
"--with-compiledby=Nix" "--with-compiledby=Nix"
"--disable-sparkle" "--disable-sparkle"
]; ];
# Remove references to Sparkle.framework from the project. # Remove references to Sparkle.framework from the project.
@ -78,37 +86,45 @@ stdenv.mkDerivation {
sed -e '/Sparkle\.framework/d' -i src/MacVim/MacVim.xcodeproj/project.pbxproj sed -e '/Sparkle\.framework/d' -i src/MacVim/MacVim.xcodeproj/project.pbxproj
''; '';
# This is unfortunate, but we need to use the same compiler as Xcode, # This is unfortunate, but we need to use the same compiler as Xcode, but Xcode doesn't provide a
# but Xcode doesn't provide a way to configure the compiler. # way to configure the compiler. We also need to pull in lib/include paths for some of our build
preConfigure = '' # inputs since we don't have cc-wrapper to do that for us.
CC=/usr/bin/clang preConfigure =
let
# ideally we'd recurse, but we don't need that right now
inputs = [ ncurses ] ++ perl.propagatedBuildInputs;
ldflags = map (drv: "-L${lib.getLib drv}/lib") inputs;
cppflags = map (drv: "-isystem ${lib.getDev drv}/include") inputs;
in
''
CC=/usr/bin/clang
DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer
configureFlagsArray+=( configureFlagsArray+=(
--with-developer-dir="$DEV_DIR" --with-developer-dir="$DEV_DIR"
LDFLAGS="-L${ncurses}/lib" LDFLAGS=${lib.escapeShellArg ldflags}
CPPFLAGS="-isystem ${ncurses.dev}/include" CPPFLAGS=${lib.escapeShellArg cppflags}
CFLAGS="-Wno-error=implicit-function-declaration" CFLAGS="-Wno-error=implicit-function-declaration"
) )
'' ''
# For some reason having LD defined causes PSMTabBarControl to fail at link-time as it # For some reason having LD defined causes PSMTabBarControl to fail at link-time as it
# passes arguments to ld that it meant for clang. # passes arguments to ld that it meant for clang.
+ '' + ''
unset LD unset LD
'' ''
# When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use # When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use
# a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath # a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath
# by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim # by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim
# by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default # by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default
# behavior to build the first target in the project. Experimentally, there seems to be a scheme # behavior to build the first target in the project. Experimentally, there seems to be a scheme
# called MacVim, so we'll explicitly select that. We also need to specify the configuration too # called MacVim, so we'll explicitly select that. We also need to specify the configuration too
# as the scheme seems to have the wrong default. # as the scheme seems to have the wrong default.
+ '' + ''
configureFlagsArray+=( configureFlagsArray+=(
XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData" XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData"
--with-xcodecfg="Release" --with-xcodecfg="Release"
) )
'' ''
; ;
# Because we're building with system clang, this means we're building against Xcode's SDK and # Because we're building with system clang, this means we're building against Xcode's SDK and
@ -124,7 +140,7 @@ stdenv.mkDerivation {
# Xcode project or pass it as a flag to xcodebuild as well. # Xcode project or pass it as a flag to xcodebuild as well.
postConfigure = '' postConfigure = ''
substituteInPlace src/auto/config.mk \ substituteInPlace src/auto/config.mk \
--replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include" \ --replace "PERL_CFLAGS${"\t"}=" "PERL_CFLAGS${"\t"}= -I${darwin.libutil}/include" \
--replace " -L${stdenv.cc.libc}/lib" "" \ --replace " -L${stdenv.cc.libc}/lib" "" \
--replace " -L${darwin.libobjc}/lib" "" \ --replace " -L${darwin.libobjc}/lib" "" \
--replace " -L${darwin.libunwind}/lib" "" \ --replace " -L${darwin.libunwind}/lib" "" \
@ -143,17 +159,25 @@ stdenv.mkDerivation {
substituteInPlace src/MacVim/vimrc --subst-var-by CSCOPE ${cscope}/bin/cscope substituteInPlace src/MacVim/vimrc --subst-var-by CSCOPE ${cscope}/bin/cscope
''; '';
# Note that $out/MacVim.app has a misnamed set of binaries in the Contents/bin folder (the V is
# capitalized) and is missing a bunch of them. This is why we're grabbing the version from the
# build folder.
postInstall = '' postInstall = ''
mkdir -p $out/Applications mkdir -p $out/Applications
cp -r src/MacVim/build/Release/MacVim.app $out/Applications cp -r src/MacVim/build/Release/MacVim.app $out/Applications
rm -rf $out/MacVim.app rm -rf $out/MacVim.app
rm $out/bin/* mkdir -p $out/bin
for prog in ex vi {,g,m,r}vi{m,mdiff,ew}; do
cp src/vimtutor $out/bin
for prog in mvim ex vi vim vimdiff view rvim rvimdiff rview; do
ln -s $out/Applications/MacVim.app/Contents/bin/mvim $out/bin/$prog ln -s $out/Applications/MacVim.app/Contents/bin/mvim $out/bin/$prog
done done
for prog in {,g}vimtutor xxd; do
ln -s $out/Applications/MacVim.app/Contents/bin/$prog $out/bin/$prog
done
ln -s $out/Applications/MacVim.app/Contents/bin/gvimtutor $out/bin/mvimtutor
mkdir -p $out/share
ln -s $out/Applications/MacVim.app/Contents/man $out/share/man
# Fix rpaths # Fix rpaths
exe="$out/Applications/MacVim.app/Contents/MacOS/Vim" exe="$out/Applications/MacVim.app/Contents/MacOS/Vim"
@ -165,7 +189,7 @@ stdenv.mkDerivation {
install_name_tool -add_rpath ${ruby}/lib $exe install_name_tool -add_rpath ${ruby}/lib $exe
# Remove manpages from tools we aren't providing # Remove manpages from tools we aren't providing
find $out/share/man \( -name eVim.1 -or -name xxd.1 \) -delete find $out/Applications/MacVim.app/Contents/man -name evim.1 -delete
''; '';
# We rely on the user's Xcode install to build. It may be located in an arbitrary place, and # We rely on the user's Xcode install to build. It may be located in an arbitrary place, and
@ -179,10 +203,10 @@ stdenv.mkDerivation {
meta = with lib; { meta = with lib; {
description = "Vim - the text editor - for macOS"; description = "Vim - the text editor - for macOS";
homepage = "https://github.com/macvim-dev/macvim"; homepage = "https://macvim.org/";
license = licenses.vim; license = licenses.vim;
maintainers = with maintainers; [ lilyball ]; maintainers = with maintainers; [ lilyball ];
platforms = platforms.darwin; platforms = platforms.darwin;
hydraPlatforms = []; # hydra can't build this as long as we rely on Xcode and sandboxProfile hydraPlatforms = []; # hydra can't build this as long as we rely on Xcode and sandboxProfile
}; };
} })

94
pkgs/applications/editors/vim/macvim.patch
View File

@ -1,50 +1,60 @@
diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc
index 32c89b387..c2af70127 100644 index 162af04..4322049 100644
--- a/src/MacVim/vimrc --- a/src/MacVim/vimrc
+++ b/src/MacVim/vimrc +++ b/src/MacVim/vimrc
@@ -9,35 +9,5 @@ set nocompatible @@ -9,45 +9,7 @@ set nocompatible
" more sensible value. Add "set backspace&" to your ~/.vimrc to reset it. " more sensible value. Add "set backspace&" to your ~/.vimrc to reset it.
set backspace+=indent,eol,start set backspace+=indent,eol,start
-" Python2 -" Python2
-" MacVim is configured by default to use the pre-installed System python2 -" MacVim is configured by default in the binary release to use the
-" version. However, following code tries to find a Homebrew, MacPorts or -" pre-installed System python2 version. However, following code tries to
-" an installation from python.org: -" find a Homebrew, MacPorts or an installation from python.org:
-if exists("&pythondll") && exists("&pythonhome") -if exists("&pythondll") && exists("&pythonhome")
- " Homebrew python 2.7
- if filereadable("/usr/local/Frameworks/Python.framework/Versions/2.7/Python") - if filereadable("/usr/local/Frameworks/Python.framework/Versions/2.7/Python")
- " Homebrew python 2.7
- set pythondll=/usr/local/Frameworks/Python.framework/Versions/2.7/Python - set pythondll=/usr/local/Frameworks/Python.framework/Versions/2.7/Python
-
- " MacPorts python 2.7
- elseif filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python") - elseif filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python")
- " MacPorts python 2.7
- set pythondll=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python - set pythondll=/opt/local/Library/Frameworks/Python.framework/Versions/2.7/Python
-
- " https://www.python.org/downloads/mac-osx/
- elseif filereadable("/Library/Frameworks/Python.framework/Versions/2.7/Python") - elseif filereadable("/Library/Frameworks/Python.framework/Versions/2.7/Python")
- " https://www.python.org/downloads/mac-osx/
- set pythondll=/Library/Frameworks/Python.framework/Versions/2.7/Python - set pythondll=/Library/Frameworks/Python.framework/Versions/2.7/Python
- endif - endif
-endif -endif
- -
-" Python3 -" Python3
-" MacVim is configured by default to use Homebrew python3 version -" MacVim is configured by default in the binary release to set
-" If this cannot be found, following code tries to find a MacPorts -" pythonthreedll to Homebrew python3. If it cannot be found, the following
-" or an installation from python.org: -" code tries to find Python3 from other popular locations. Note that we are
-" using "Current" for the version, because Vim supports the stable ABI and
-" therefore any new version of Python3 will work.
-if exists("&pythonthreedll") && exists("&pythonthreehome") && -if exists("&pythonthreedll") && exists("&pythonthreehome") &&
- \ !filereadable(&pythonthreedll) - \ !filereadable(&pythonthreedll)
- if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python") - " MacPorts python
- " MacPorts python 3.9 - if filereadable("/opt/local/Library/Frameworks/Python.framework/Versions/Current/Python")
- set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/3.9/Python - set pythonthreedll=/opt/local/Library/Frameworks/Python.framework/Versions/Current/Python
- elseif filereadable("/Library/Frameworks/Python.framework/Versions/3.9/Python") -
- " https://www.python.org/downloads/mac-osx/ - " macOS default Python, installed by 'xcode-select --install'
- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/3.9/Python - elseif filereadable("/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/Current/Python3")
- set pythonthreedll=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/Current/Python3
-
- " https://www.python.org/downloads/mac-osx/
- elseif filereadable("/Library/Frameworks/Python.framework/Versions/Current/Python")
- set pythonthreedll=/Library/Frameworks/Python.framework/Versions/Current/Python
- endif - endif
-endif -endif
-
+" Default cscopeprg to the Nix-installed path +" Default cscopeprg to the Nix-installed path
+set cscopeprg=@CSCOPE@ +set cscopeprg=@CSCOPE@
" vim: sw=2 ts=2 et
diff --git a/src/Makefile b/src/Makefile diff --git a/src/Makefile b/src/Makefile
index c4a3ada37..06ee3de44 100644 index 5b4cdff..72fee3a 100644
--- a/src/Makefile --- a/src/Makefile
+++ b/src/Makefile +++ b/src/Makefile
@@ -1402,7 +1402,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ @@ -1290,7 +1290,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \
MacVim/MacVim.m MacVim/MacVim.m
MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \
objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o
@ -54,10 +64,10 @@ index c4a3ada37..06ee3de44 100644
MACVIMGUI_LIBS_DIR = MACVIMGUI_LIBS_DIR =
MACVIMGUI_LIBS1 = MACVIMGUI_LIBS1 =
diff --git a/src/auto/configure b/src/auto/configure diff --git a/src/auto/configure b/src/auto/configure
index 39ef81449..d8fa7ec2f 100755 index ecf10c4..4b691d0 100755
--- a/src/auto/configure --- a/src/auto/configure
+++ b/src/auto/configure +++ b/src/auto/configure
@@ -5896,10 +5896,7 @@ $as_echo "not found" >&6; } @@ -6247,10 +6247,7 @@ printf "%s\n" "not found" >&6; }
for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do
if test "X$path" != "X"; then if test "X$path" != "X"; then
@ -69,7 +79,7 @@ index 39ef81449..d8fa7ec2f 100755
MZSCHEME_LIBS="${path}/libmzscheme3m.a" MZSCHEME_LIBS="${path}/libmzscheme3m.a"
MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" MZSCHEME_CFLAGS="-DMZ_PRECISE_GC"
elif test -f "${path}/libracket3m.a"; then elif test -f "${path}/libracket3m.a"; then
@@ -6287,23 +6284,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } @@ -6646,23 +6643,6 @@ printf "%s\n" ">>> too old; need Perl version 5.003_01 or later <<<" >&6; }
fi fi
if test "x$MACOS_X" = "xyes"; then if test "x$MACOS_X" = "xyes"; then
@ -93,7 +103,7 @@ index 39ef81449..d8fa7ec2f 100755
PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
fi fi
@@ -6526,13 +6506,6 @@ __: @@ -6902,13 +6882,7 @@ __:
eof eof
eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
rm -f -- "${tmp_mkf}" rm -f -- "${tmp_mkf}"
@ -104,10 +114,11 @@ index 39ef81449..d8fa7ec2f 100755
- vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" - vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
- fi - fi
- else - else
+
vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'`
@@ -6547,7 +6520,6 @@ eof @@ -6923,7 +6897,6 @@ eof
fi fi
vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}"
vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//`
@ -115,8 +126,8 @@ index 39ef81449..d8fa7ec2f 100755
fi fi
@@ -6626,13 +6598,6 @@ rm -f core conftest.err conftest.$ac_objext \ @@ -7004,13 +6977,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \
$as_echo "no" >&6; } printf "%s\n" "no" >&6; }
fi fi
- if test -n "$MACSDK"; then - if test -n "$MACSDK"; then
@ -126,13 +137,13 @@ index 39ef81449..d8fa7ec2f 100755
- PYTHON_GETPATH_CFLAGS= - PYTHON_GETPATH_CFLAGS=
- fi - fi
- -
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5
$as_echo_n "checking if compile and link flags for Python are sane... " >&6; } printf %s "checking if compile and link flags for Python are sane... " >&6; }
cflags_save=$CFLAGS cflags_save=$CFLAGS
@@ -7557,11 +7522,7 @@ $as_echo "$tclver - OK" >&6; }; @@ -8060,11 +8026,7 @@ printf "%s\n" "$tclver - OK" >&6; };
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5
$as_echo_n "checking for location of Tcl include... " >&6; } printf %s "checking for location of Tcl include... " >&6; }
- if test "x$MACOS_X" != "xyes"; then - if test "x$MACOS_X" != "xyes"; then
tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver"
- else - else
@ -141,10 +152,10 @@ index 39ef81449..d8fa7ec2f 100755
TCL_INC= TCL_INC=
for try in $tclinc; do for try in $tclinc; do
if test -f "$try/tcl.h"; then if test -f "$try/tcl.h"; then
@@ -7579,13 +7540,8 @@ $as_echo "<not found>" >&6; } @@ -8082,13 +8044,8 @@ printf "%s\n" "<not found>" >&6; }
if test -z "$SKIP_TCL"; then if test -z "$SKIP_TCL"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5
$as_echo_n "checking for location of tclConfig.sh script... " >&6; } printf %s "checking for location of tclConfig.sh script... " >&6; }
- if test "x$MACOS_X" != "xyes"; then - if test "x$MACOS_X" != "xyes"; then
tclcnf=`echo $tclinc | sed s/include/lib/g` tclcnf=`echo $tclinc | sed s/include/lib/g`
tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
@ -154,8 +165,8 @@ index 39ef81449..d8fa7ec2f 100755
- fi - fi
for try in $tclcnf; do for try in $tclcnf; do
if test -f "$try/tclConfig.sh"; then if test -f "$try/tclConfig.sh"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5
@@ -7774,10 +7730,6 @@ $as_echo "$rubyhdrdir" >&6; } @@ -8285,10 +8242,6 @@ printf "%s\n" "$rubyhdrdir" >&6; }
rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"` rubylibdir=`$vi_cv_path_ruby -r rbconfig -e "print $ruby_rbconfig.expand($ruby_rbconfig::CONFIG['libdir'])"`
if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then if test -f "$rubylibdir/$librubya" || expr "$librubyarg" : "-lruby"; then
RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" RUBY_LIBS="$RUBY_LIBS -L$rubylibdir"
@ -167,10 +178,10 @@ index 39ef81449..d8fa7ec2f 100755
if test "X$librubyarg" != "X"; then if test "X$librubyarg" != "X"; then
diff --git a/src/vim.h b/src/vim.h diff --git a/src/vim.h b/src/vim.h
index 4ff59f201..f91cb9836 100644 index 6e33142..6185f45 100644
--- a/src/vim.h --- a/src/vim.h
+++ b/src/vim.h +++ b/src/vim.h
@@ -244,17 +244,6 @@ @@ -270,17 +270,6 @@
# define SUN_SYSTEM # define SUN_SYSTEM
#endif #endif
@ -189,10 +200,10 @@ index 4ff59f201..f91cb9836 100644
# include "os_amiga.h" # include "os_amiga.h"
#endif #endif
diff --git a/src/vimtutor b/src/vimtutor diff --git a/src/vimtutor b/src/vimtutor
index 3b154f288..e89f26060 100755 index 3b154f2..e89f260 100755
--- a/src/vimtutor --- a/src/vimtutor
+++ b/src/vimtutor +++ b/src/vimtutor
@@ -16,6 +16,6 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" @@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
if test "$1" = "-g"; then if test "$1" = "-g"; then
# Try to use the GUI version of Vim if possible, it will fall back # Try to use the GUI version of Vim if possible, it will fall back
# on Vim if Gvim is not installed. # on Vim if Gvim is not installed.
@ -200,3 +211,4 @@ index 3b154f288..e89f26060 100755
+ seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq" + seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
shift shift
fi fi

4
pkgs/by-name/ce/cemu/package.nix
View File

@ -48,13 +48,13 @@ let
}; };
in stdenv.mkDerivation (finalAttrs: { in stdenv.mkDerivation (finalAttrs: {
pname = "cemu"; pname = "cemu";
version = "2.0-86"; version = "2.0-88";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cemu-project"; owner = "cemu-project";
repo = "Cemu"; repo = "Cemu";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-AS5Qo4J0U1MeTYWl4jiJMi879bhBuioU1BikxGKtUrE="; hash = "sha256-ZXJrxfTgwDmHUk3UqA4H4MSEvNNq9lXHXxf9rgWqkro=";
}; };
patches = [ patches = [

4
pkgs/by-name/fo/fooyin/package.nix
View File

@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "fooyin"; pname = "fooyin";
version = "0.4.5"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ludouzi"; owner = "ludouzi";
repo = "fooyin"; repo = "fooyin";
rev = "v" + finalAttrs.version; rev = "v" + finalAttrs.version;
hash = "sha256-hrPbJnN4Ooq5unA9VbX0UjRZQjPz93X/IQdBSfTUIGk="; hash = "sha256-OgO0o3OaL/1MOgpi5QIDzVQI8eM0zPgPVLWzICMgV7w=";
}; };
buildInputs = [ buildInputs = [

4
pkgs/by-name/ov/ovn/generic.nix
View File

@ -58,6 +58,10 @@ stdenv.mkDerivation rec {
popd popd
''; '';
configureFlags = [
"--localstatedir=/var"
];
enableParallelBuilding = true; enableParallelBuilding = true;
# disable tests due to networking issues and because individual tests can't be skipped easily # disable tests due to networking issues and because individual tests can't be skipped easily

4
pkgs/development/libraries/nsync/default.nix
View File

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nsync"; pname = "nsync";
version = "1.28.1"; version = "1.29.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-PAUgT1SoMiPMA4MH8zHxBtTFdg8Jn6H+w0HA64i2vPk="; hash = "sha256-RAwrS8Vz5fZwZRvF4OQfn8Ls11S8OIV2TmJpNrBE4MI=";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/development/python-modules/keras/default.nix
View File

@ -23,7 +23,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "keras"; pname = "keras";
version = "3.4.0"; version = "3.4.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "keras-team"; owner = "keras-team";
repo = "keras"; repo = "keras";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-P/TRczWi/prv5D0/I6yLChIDfc6QdGcRSaF4Dd1Iowk="; hash = "sha256-Pp84wTvcrWnxuksYUrzs9amapwBC8yU1PA0PE5dRl6k=";
}; };
build-system = [ build-system = [

4
pkgs/development/python-modules/marimo/default.nix
View File

@ -23,14 +23,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "marimo"; pname = "marimo";
version = "0.6.24"; version = "0.6.25";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-4m4Xufrj99eYo/clmwCPzbKsFkDHlHRkgZG/6szdHEs="; hash = "sha256-zv1mlaR/3nRhZBjjcXaOSR574NE2um48DqHhHirRfSU=";
}; };
build-system = [ setuptools ]; build-system = [ setuptools ];

16
pkgs/development/python-modules/pymc/default.nix
View File

@ -1,24 +1,28 @@
{ {
lib, lib,
arviz,
buildPythonPackage, buildPythonPackage,
pythonOlder,
fetchFromGitHub,
# build-system
setuptools,
# dependencies
arviz,
cachetools, cachetools,
cloudpickle, cloudpickle,
fetchFromGitHub,
numpy, numpy,
pandas, pandas,
pytensor, pytensor,
pythonOlder,
rich, rich,
scipy, scipy,
setuptools,
threadpoolctl, threadpoolctl,
typing-extensions, typing-extensions,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pymc"; pname = "pymc";
version = "5.15.1"; version = "5.16.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.10"; disabled = pythonOlder "3.10";
@ -27,7 +31,7 @@ buildPythonPackage rec {
owner = "pymc-devs"; owner = "pymc-devs";
repo = "pymc"; repo = "pymc";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-TAQv3BNSYt750JSZWQibjqzhQ0zXOJDVENMharjr6gQ="; hash = "sha256-C3D07uouV8QZLplIonmViZoCXb4AAEN+uGvNly2hcMc=";
}; };
postPatch = '' postPatch = ''

10
pkgs/development/python-modules/pytensor/default.nix
View File

@ -2,8 +2,12 @@
lib, lib,
buildPythonPackage, buildPythonPackage,
fetchFromGitHub, fetchFromGitHub,
# build-system
cython, cython,
versioneer, versioneer,
# dependencies
cons, cons,
etuples, etuples,
filelock, filelock,
@ -12,6 +16,8 @@
numpy, numpy,
scipy, scipy,
typing-extensions, typing-extensions,
# checks
jax, jax,
jaxlib, jaxlib,
numba, numba,
@ -23,7 +29,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytensor"; pname = "pytensor";
version = "2.22.1"; version = "2.23.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.10"; disabled = pythonOlder "3.10";
@ -32,7 +38,7 @@ buildPythonPackage rec {
owner = "pymc-devs"; owner = "pymc-devs";
repo = "pytensor"; repo = "pytensor";
rev = "refs/tags/rel-${version}"; rev = "refs/tags/rel-${version}";
hash = "sha256-FG95+3g+DcqQkyJX3PavfyUWTINFLrgAPTaHYN/jk90="; hash = "sha256-r7ooPwZSEsypYAf+oWu7leuoIK39gFfHZACrxsbcIV0=";
}; };
postPatch = '' postPatch = ''

4
pkgs/servers/http/angie/default.nix
View File

@ -8,12 +8,12 @@
}@args: }@args:
callPackage ../nginx/generic.nix args rec { callPackage ../nginx/generic.nix args rec {
version = "1.5.2"; version = "1.6.0";
pname = if withQuic then "angieQuic" else "angie"; pname = if withQuic then "angieQuic" else "angie";
src = fetchurl { src = fetchurl {
url = "https://download.angie.software/files/angie-${version}.tar.gz"; url = "https://download.angie.software/files/angie-${version}.tar.gz";
hash = "sha256-jX0WBIdL3RQpgdeVf4oZByDNKQbrEjKbImC86Ceqkoc="; hash = "sha256-yzEbYOxvt2SPTYD/Dw4SJDg94muKGan+QX51sf6xuU4=";
}; };
configureFlags = lib.optionals withAcme [ configureFlags = lib.optionals withAcme [

66
pkgs/tools/archivers/peazip/default.nix
View File

@ -6,6 +6,7 @@
, lazarus , lazarus
, xorg , xorg
, libqt5pas , libqt5pas
, runCommand
, _7zz , _7zz
, archiver , archiver
, brotli , brotli
@ -16,16 +17,21 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "peazip"; pname = "peazip";
version = "9.6.0"; version = "9.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "peazip"; owner = "peazip";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-75EkVRx6bX1ZZzeNSR7IvKNjTA5NvzFzUJdORiAVHBo="; hash = "sha256-HxRpoT+O9nWL4FzB6CjJ0DqnZALaaYtXGb82GkgF2JA=";
}; };
sourceRoot = "${src.name}/peazip-sources"; sourceRoot = "${src.name}/peazip-sources";
postPatch = ''
# set it to use compression programs from $PATH
substituteInPlace dev/peach.pas --replace " HSYSBIN = 0;" " HSYSBIN = 2;"
'';
nativeBuildInputs = [ nativeBuildInputs = [
wrapQtAppsHook wrapQtAppsHook
lazarus lazarus
@ -40,43 +46,48 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}"; NIX_LDFLAGS = "--as-needed -rpath ${lib.makeLibraryPath buildInputs}";
buildPhase = '' buildPhase = ''
# lazarus tries to create files in $HOME/.lazarus
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
cd dev pushd dev
lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_pea.lpi && [ -f pea ] lazbuild --lazarusdir=${lazarus}/share/lazarus --add-package metadarkstyle/metadarkstyle.lpk
lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_peach.lpi && [ -f peazip ] lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_pea.lpi
cd .. lazbuild --lazarusdir=${lazarus}/share/lazarus --widgetset=qt5 --build-all project_peach.lpi
popd
'';
# peazip looks for the "7z", not "7zz"
_7z = runCommand "7z" {} ''
mkdir -p $out/bin
ln -s ${_7zz}/bin/7zz $out/bin/7z
''; '';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
# Executables
## Main programs
install -D dev/{pea,peazip} -t $out/lib/peazip install -D dev/{pea,peazip} -t $out/lib/peazip
wrapProgram $out/lib/peazip/peazip --prefix PATH : ${lib.makeBinPath [
_7z
archiver
brotli
upx
zpaq
zstd
]}
mkdir -p $out/bin mkdir -p $out/bin
ln -s $out/lib/peazip/{pea,peazip} $out/bin/ ln -s $out/lib/peazip/{pea,peazip} $out/bin/
## Symlink the available compression algorithm programs. mkdir -p $out/share/peazip $out/lib/peazip/res/share
mkdir -p $out/lib/peazip/res/bin/7z
ln -s ${_7zz}/bin/7zz $out/lib/peazip/res/bin/7z/7z
mkdir -p $out/lib/peazip/res/bin/arc
ln -s ${archiver}/bin/arc $out/lib/peazip/res/bin/arc/
mkdir -p $out/lib/peazip/res/bin/brotli
ln -s ${brotli}/bin/brotli $out/lib/peazip/res/bin/brotli/
mkdir -p $out/lib/peazip/res/bin/upx
ln -s ${upx}/bin/upx $out/lib/peazip/res/bin/upx/
mkdir -p $out/lib/peazip/res/bin/zpaq
ln -s ${zpaq}/bin/zpaq $out/lib/peazip/res/bin/zpaq/
mkdir -p $out/lib/peazip/res/bin/zstd
ln -s ${zstd}/bin/zstd $out/lib/peazip/res/bin/zstd/
mkdir -p $out/share/peazip
ln -s $out/share/peazip $out/lib/peazip/res/share ln -s $out/share/peazip $out/lib/peazip/res/share
cp -r res/share/{icons,lang,themes,presets} $out/share/peazip/ cp -r res/share/{icons,lang,themes,presets} $out/share/peazip/
install -D res/share/batch/freedesktop_integration/peazip.png -t "$out/share/icons/hicolor/256x256/apps" # Install desktop entries
install -D res/share/icons/peazip_{7z,rar,zip}.png -t "$out/share/icons/hicolor/256x256/mimetypes" install -D res/share/batch/freedesktop_integration/*.desktop -t $out/share/applications
install -D res/share/batch/freedesktop_integration/peazip_{add,extract}.png -t "$out/share/icons/hicolor/256x256/actions" # Install desktop entries's icons
install -D res/share/batch/freedesktop_integration/*.desktop -t "$out/share/applications" mkdir -p $out/share/icons/hicolor/256x256/apps
ln -s $out/share/peazip/icons/peazip.png -t $out/share/icons/hicolor/256x256/apps/
mkdir $out/share/icons/hicolor/256x256/mimetypes
ln -s $out/share/peazip/icons/peazip_{7z,zip,cd}.png $out/share/icons/hicolor/256x256/mimetypes/
mkdir $out/share/icons/hicolor/256x256/actions
ln -s $out/share/peazip/icons/peazip_{add,extract,convert}.png $out/share/icons/hicolor/256x256/actions/
runHook postInstall runHook postInstall
''; '';
@ -94,5 +105,6 @@ stdenv.mkDerivation rec {
homepage = "https://peazip.github.io"; homepage = "https://peazip.github.io";
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ annaaurora ]; maintainers = with maintainers; [ annaaurora ];
mainProgram = "peazip";
}; };
} }

6
pkgs/top-level/all-packages.nix
View File

@ -34845,7 +34845,11 @@ with pkgs;
vimiv-qt = callPackage ../applications/graphics/vimiv-qt { }; vimiv-qt = callPackage ../applications/graphics/vimiv-qt { };
macvim = callPackage ../applications/editors/vim/macvim-configurable.nix { stdenv = clangStdenv; }; macvim = let
macvimUtils = callPackage ../applications/editors/vim/macvim-configurable.nix { };
in macvimUtils.makeCustomizable (callPackage ../applications/editors/vim/macvim.nix {
stdenv = clangStdenv;
});
vim-full = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/full.nix { vim-full = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/full.nix {
inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData; inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;