jiebi/CodeConvo huggingface dataset:
# Simple check tootctl commands # Check Mastodon version <del> server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl version' | grep '${pkgs.mastodon.version}'") </del> <ins> server.succeed("mastodon-tootctl version | grep '${pkgs.mastodon.version}'") </ins> # Manage accounts <del> server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl email_domain_blocks add example.com'") server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl email_domain_blocks list' | grep 'example.com'") server.fail("su - mastodon -s /bin/sh -c 'mastodon-env tootctl email_domain_blocks list' | grep 'mastodon.local'") server.fail("su - mastodon -s /bin/sh -c 'mastodon-env tootctl accounts create alice --email=alice@example.com'") server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl email_domain_blocks remove example.com'") server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl accounts create bob --email=bob@example.com'") server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl accounts approve bob'") server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl accounts delete bob'") </del> <ins> server.succeed("mastodon-tootctl email_domain_blocks add example.com") server.succeed("mastodon-tootctl email_domain_blocks list | grep example.com") server.fail("mastodon-tootctl email_domain_blocks list | grep mastodon.local") server.fail("mastodon-tootctl accounts create alice --email=alice@example.com") server.succeed("mastodon-tootctl email_domain_blocks remove example.com") server.succeed("mastodon-tootctl accounts create bob --email=bob@example.com") server.succeed("mastodon-tootctl accounts approve bob") server.succeed("mastodon-tootctl accounts delete bob") </ins> # Manage IP access <del> server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl ip_blocks add 192.168.0.0/16 --severity=no_access'") server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl ip_blocks export' | grep '192.168.0.0/16'") server.fail("su - mastodon -s /bin/sh -c 'mastodon-env tootctl ip_blocks export' | grep '172.16.0.0/16'") </del> <ins> server.succeed("mastodon-tootctl ip_blocks add 192.168.0.0/16 --severity=no_access") server.succeed("mastodon-tootctl ip_blocks export | grep 192.168.0.0/16") server.fail("mastodon-tootctl ip_blocks export | grep 172.16.0.0/16") </ins> client.fail("curl --fail https://mastodon.local/about") <del> server.succeed("su - mastodon -s /bin/sh -c 'mastodon-env tootctl ip_blocks remove 192.168.0.0/16'") </del> <ins> server.succeed("mastodon-tootctl ip_blocks remove 192.168.0.0/16") </ins> client.succeed("curl --fail https://mastodon.local/about") server.shutdown()
installPhase = '' runHook preInstall <del> mkdir -p $out/bin $out/share/${pname} $out/share/applications cp -a ${appimageContents}/{locales,resources} $out/share/${pname} </del> <ins> mkdir -p $out/bin $out/share/${pname} $out/share/applications $out/share/${pname}/resources/app/icons cp -a ${appimageContents}/resources/app/icons/logseq.png $out/share/${pname}/resources/app/icons/logseq.png </ins> cp -a ${appimageContents}/Logseq.desktop $out/share/applications/${pname}.desktop <del> # remove the `git` in `dugite` because we want the `git` in `nixpkgs` chmod +w -R $out/share/${pname}/resources/app/node_modules/dugite/git chmod +w $out/share/${pname}/resources/app/node_modules/dugite rm -rf $out/share/${pname}/resources/app/node_modules/dugite/git chmod -w $out/share/${pname}/resources/app/node_modules/dugite </del> <ins> # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs makeWrapper ${appimage-run}/bin/appimage-run $out/bin/logseq  --set "LOCAL_GIT_DIRECTORY" ${git}  --add-flags ${src} # Make the desktop entry run the app using appimage-run </ins> substituteInPlace $out/share/applications/${pname}.desktop  <del> --replace Exec=Logseq Exec=${pname}  </del> <ins> --replace Exec=Logseq "Exec=$out/bin/logseq"  </ins> --replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png runHook postInstall ''; <del> postFixup = '' # set the env "LOCAL_GIT_DIRECTORY" for dugite so that we can use the git in nixpkgs makeWrapper ${electron}/bin/electron $out/bin/${pname}  --set "LOCAL_GIT_DIRECTORY" ${git}  --add-flags $out/share/${pname}/resources/app ''; </del> passthru.updateScript = ./update.sh; meta = with lib; {
'' + optionalString isDarwin '' sed -i '/qemucapabilitiestest/d' tests/meson.build sed -i '/vircryptotest/d' tests/meson.build <ins> sed -i '/domaincapstest/d' tests/meson.build sed -i '/qemufirmwaretest/d' tests/meson.build sed -i '/qemuvhostusertest/d' tests/meson.build </ins> '' + optionalString (isDarwin && isx86_64) '' sed -i '/qemucaps2xmltest/d' tests/meson.build sed -i '/qemuhotplugtest/d' tests/meson.build
python3.pkgs.buildPythonApplication rec { pname = "sticky"; <del> version = "1.14"; </del> <ins> version = "1.16"; </ins> format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; <del> hash = "sha256-7UZbCbzQ1ZrSzxTUdbA+wsH3p27qj/c/cM4GY/kzG6E="; </del> <ins> hash = "sha256-+opzjvSdGwwn1imNzSsfD9rfs4naSXzcMBJRPhKW2WM="; </ins> }; postPatch = ''
stdenv.mkDerivation rec { pname = "bulky"; <del> version = "2.8"; </del> <ins> version = "2.9"; </ins> src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; <del> hash = "sha256-DZjX4xPyA30TTyOX+VyGSY/FWPX2316CYImDWRma9r0="; </del> <ins> hash = "sha256-eCu7AgL4bzstu8vsqBJImRZm1qMVnnycuOShY5fB+C4="; </ins> }; nativeBuildInputs = [
-e s,/usr/share/locale,/run/current-system/sw/share/locale,g  {} + <del> sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py sed "s|'python3'|'${pythonEnv.interpreter}'|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/CinnamonGtkSettings.py sed "s|/usr/bin/cinnamon-screensaver-command|/run/current-system/sw/bin/cinnamon-screensaver-command|g"  -i ./files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js -i ./files/usr/share/cinnamon/applets/user@cinnamon.org/applet.js sed "s|"/usr/lib"|"${cinnamon-control-center}/lib"|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/capi.py sed 's|"lspci"|"${pciutils}/bin/lspci"|g' -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py </del> <ins> # All optional and may introduce circular dependency. find ./files/usr/share/cinnamon/applets -type f -exec sed -i  -e '/^#/!s,/usr/bin,/run/current-system/sw/bin,g'  {} + </ins> <del> sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon  -i ./files/usr/bin/cinnamon-session-cinnamon2d </del> <ins> pushd ./files/usr/share/cinnamon/cinnamon-settings substituteInPlace ./bin/capi.py                     --replace '"/usr/lib"' '"${cinnamon-control-center}/lib"' substituteInPlace ./bin/CinnamonGtkSettings.py      --replace "'python3'" "'${pythonEnv.interpreter}'" substituteInPlace ./bin/SettingsWidgets.py          --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds" substituteInPlace ./bin/Spices.py                   --replace "msgfmt" "${gettext}/bin/msgfmt" substituteInPlace ./modules/cs_info.py              --replace "lspci" "${pciutils}/bin/lspci" popd </ins> <del> sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py </del> <ins> sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} </ins> patchShebangs src/data-to-c.pl '';
--prefix XDG_DATA_DIRS : "${gnome.caribou}/share" ) <ins> buildPythonPath "$out ${python3.pkgs.xapp}" # https://github.com/NixOS/nixpkgs/issues/200397 patchPythonScript $out/bin/cinnamon-spice-updater </ins> # https://github.com/NixOS/nixpkgs/issues/129946 <del> buildPythonPath "${python3.pkgs.xapp}" </del> patchPythonScript $out/share/cinnamon/cinnamon-desktop-editor/cinnamon-desktop-editor.py <ins> # Called as `pkexec cinnamon-settings-users.py`. wrapGApp $out/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py </ins> ''; passthru = {
stdenvNoCC.mkDerivation rec { pname = "mint-cursor-themes"; <del> version = "1.0.1"; </del> <ins> version = "1.0.2"; </ins> src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # They don't really do tags, this is just a named commit. <del> rev = "e17f8a4620827235dabbe5221bd0ee8c44dad0d5"; hash = "sha256-yLUmIVh884uDVkNil7qxf6t/gykipzBvPgzwmY3zvQk="; </del> <ins> rev = "d2c1428b499a347c291dafb13c89699fdbdd4be7"; hash = "sha256-i2Wf+OKwal9G5hkcAdmGSgX6txu1AHajqqPJdhpJoA0="; </ins> }; installPhase = ''
in stdenv.mkDerivation rec { pname = "warpinator"; <del> version = "1.6.2"; </del> <ins> version = "1.6.3"; </ins> src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; <del> hash = "sha256-crGW1FBfTEiKqx981EzG414we4icyBv/keGtMlr8UFc="; </del> <ins> hash = "sha256-iCq2cwZgsq5/bJqjYuZ6dZLqz2nIpgHCrIQeMVxJNXY="; </ins> }; nativeBuildInputs = [
# Patch pastebin & inxi location sed "s|/usr/bin/pastebin|$out/bin/pastebin|" -i scripts/upload-system-info sed "s|'inxi'|'${inxi}/bin/inxi'|" -i scripts/upload-system-info <del> # Patch gtk3 module target dir substituteInPlace libxapp/meson.build  --replace "gtk3_dep.get_pkgconfig_variable('libdir')" "'$out'" </del> ''; <ins> # Fix gtk3 module target dir. Proper upstream solution should be using define_variable. PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib"; </ins> meta = with lib; { homepage = "https://github.com/linuxmint/xapp"; description = "Cross-desktop libraries and common resources";
, cudatoolkit , libdrm , ncurses <ins> , nvtop , testers , udev </ins> , addOpenGLRunpath , amd ? true , nvidia ? true <del> , udev </del> }: let pname-suffix = if amd && nvidia then "" else if amd then "-amd" else "-nvidia"; nvidia-postFixup = "addOpenGLRunpath $out/bin/nvtop"; <del> libPath = lib.makeLibraryPath [ libdrm ncurses ]; </del> <ins> libPath = lib.makeLibraryPath [ libdrm ncurses udev ]; </ins> amd-postFixup = '' patchelf  --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)"
cmakeFlags = with lib; [ "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_TESTING=ON" <ins> "-DUSE_LIBUDEV_OVER_LIBSYSTEMD=ON" </ins> ] ++ optional nvidia "-DNVML_INCLUDE_DIRS=${cudatoolkit}/include" ++ optional nvidia "-DNVML_LIBRARIES=${cudatoolkit}/targets/x86_64-linux/lib/stubs/libnvidia-ml.so" ++ optional (!amd) "-DAMDGPU_SUPPORT=OFF"
<del> { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, openssl, libp11, pam, libintl }: </del> <ins> { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libp11, pam, libintl }: </ins> stdenv.mkDerivation rec { pname = "pam_p11";
++ lib.optionals stdenv.hostPlatform.isMusl [ argp-standalone ] ++ lib.optionals withJitterEntropy [ jitterentropy ] ++ lib.optionals withNistBeacon    [ curl jansson libxml2 ] <del> ++ lib.optionals withPkcs11        [ libp11 openssl ] </del> <ins> ++ lib.optionals withPkcs11        [ libp11 libp11.passthru.openssl ] </ins> ++ lib.optionals withRtlsdr        [ librtlsdr ]; enableParallelBuilding = true;
pam_mysql = callPackage ../os-specific/linux/pam_mysql { }; <del> pam_p11 = callPackage ../os-specific/linux/pam_p11 { openssl = openssl_1_1; }; </del> <ins> pam_p11 = callPackage ../os-specific/linux/pam_p11 { }; </ins> pam_pgsql = callPackage ../os-specific/linux/pam_pgsql { };
{ fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms <del> , xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl , xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon </del> <ins> , xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification, libX11, pcre, libev , yajl, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon </ins> , xorgserver, xvfb_run, dmenu, i3status }: stdenv.mkDerivation rec { name = "i3-${version}"; <del> version = "4.12"; </del> <ins> version = "4.13"; </ins> src = fetchurl { url = "http://i3wm.org/downloads/${name}.tar.bz2"; <del> sha256 = "1d3q3lgpjbkmcwzjhp0dfr0jq847silcfg087slcnj95ikh1r7p1"; </del> <ins> sha256 = "12ngz32swh9n85xy0cz1lq16aqi9ys5hq19v589q9a97wn1k3hcl"; </ins> }; <ins> nativeBuildInputs = [ which pkgconfig makeWrapper ]; </ins> buildInputs = [ <del> which pkgconfig makeWrapper libxcb xcbutilkeysyms xcbutil xcbutilwm libxkbcommon </del> <ins> libxcb xcbutilkeysyms xcbutil xcbutilwm xcbutilxrm libxkbcommon </ins> libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC xorgserver xvfb_run ]; <ins> configureFlags = [ "--disable-builddir" ]; enableParallelBuilding = true; </ins> postPatch = '' patchShebangs . '';
! grep -q '^not ok' testcases/latest/complete-run.log ''; <del> configurePhase = "makeFlags=PREFIX=$out"; </del> postInstall = '' wrapProgram "$out/bin/i3-save-tree" --prefix PERL5LIB ":" "$PERL5LIB" <del> mkdir -p $out/man/man1 cp man/*.1 $out/man/man1 </del> for program in $out/bin/i3-sensible-*; do sed -i 's/which/command -v/' $program done
<ins> diff --git a/CMakeLists.txt b/CMakeLists.txt index 915912af5..f5c2cf9cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,11 +91,6 @@ if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) endif() endif() else() -	CPMAddPackage( -		NAME Ccache.cmake -		GITHUB_REPOSITORY TheLartians/Ccache.cmake -		VERSION 1.2 -	) endif() # Dependencies -- 2.40.1 </ins>
, SDL2 , SDL2_mixer , zlib <ins> , unzip , makeWrapper , makeDesktopItem , copyDesktopItems </ins> }: <del> let assets_version = "2.2.5"; assets = fetchurl { url = "https://github.com/mazmazz/SRB2/releases/download/SRB2_assets_220/srb2-${assets_version}-assets.7z"; sha256 = "1m9xf3vraq9nipsi09cyvvfa4i37gzfxg970rnqfswd86z9v6v00"; }; assets_optional = fetchurl { url = "https://github.com/mazmazz/SRB2/releases/download/SRB2_assets_220/srb2-${assets_version}-optional-assets.7z"; sha256 = "1j29jrd0r1k2bb11wyyl6yv9b90s2i6jhrslnh77qkrhrwnwcdz4"; }; in stdenv.mkDerivation rec { </del> <ins> stdenv.mkDerivation (finalAttrs: { </ins> pname = "srb2"; <del> version = "2.2.10"; </del> <ins> version = "2.2.11"; </ins> src = fetchFromGitHub { owner = "STJr"; repo = "SRB2"; <del> rev = "SRB2_release_${version}"; sha256 = "03388n094d2yr5si6ngnggbqhm8b2l0s0qvfnkz49li9bd6a81gg"; </del> <ins> rev = "SRB2_release_${finalAttrs.version}"; hash = "sha256-tyiXivJWjNnL+4YynUV6k6iaMs8o9HkHrp+qFj2+qvQ="; </ins> }; nativeBuildInputs = [ cmake nasm p7zip <ins> makeWrapper copyDesktopItems </ins> ]; buildInputs = [
zlib ]; <ins> assets = stdenv.mkDerivation { pname = "srb2-data"; version = finalAttrs.version; nativeBuildInputs = [ unzip ]; src = fetchurl { url = "https://github.com/STJr/SRB2/releases/download/SRB2_release_${finalAttrs.version}/SRB2-v${lib.replaceStrings ["."] [""] finalAttrs.version}-Full.zip"; hash = "sha256-KsJIkCczD/HyIwEy5dI3zsHbWFCMBaCoCHizfupFoWM="; }; sourceRoot = "."; installPhase = '' mkdir -p $out/share/srb2 cp -r *pk3 *dta *dat models/ $out/share/srb2/ ''; }; </ins> cmakeFlags = [ <del> "-DSRB2_ASSET_DIRECTORY=/build/source/assets" </del> <ins> "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}/share/srb2" </ins> "-DGME_INCLUDE_DIR=${game-music-emu}/include" "-DOPENMPT_INCLUDE_DIR=${libopenmpt.dev}/include" "-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2" <del> "-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2" </del> <ins> "-DSDL2_INCLUDE_DIR=${lib.getDev SDL2.dev}/include/SDL2" </ins> ]; patches = [ <del> ./wadlocation.patch </del> <ins> # Fix unknown command "CPMAddPackage" by not using Ccache.cmake ./cmake.patch </ins> ]; <del> postPatch = '' substituteInPlace src/sdl/i_system.c  --replace '@wadlocation@' $out ''; </del> <ins> desktopItems = [ (makeDesktopItem rec { name = "Sonic Robo Blast 2"; exec = finalAttrs.pname; icon = finalAttrs.pname; comment = finalAttrs.meta.description; desktopName = name; genericName = name; categories = [ "Game" ]; }) ]; </ins> <del> preConfigure = '' 7z x ${assets} -o"/build/source/assets" -aos 7z x ${assets_optional} -o"/build/source/assets" -aos ''; </del> <ins> installPhase = '' mkdir -p $out/bin $out/share/applications $out/share/pixmaps $out/share/icons copyDesktopItems cp ../srb2.png $out/share/pixmaps/. cp ../srb2.png $out/share/icons/. </ins> <del> postInstall = '' mkdir $out/bin mv $out/lsdlsrb2-${version} $out/bin/srb2 </del> <ins> cp bin/lsdlsrb2 $out/bin/srb2 wrapProgram $out/bin/srb2 --set SRB2WADDIR "${finalAttrs.assets}/share/srb2" </ins> ''; meta = with lib; {
<del> diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c index 10c0747bf..861f00728 100644 --- a/src/sdl/i_system.c +++ b/src/sdl/i_system.c @@ -145,13 +145,7 @@ int TimeFunction(int requested_frequency); // Locations for searching the srb2.pk3 #if defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) -#define DEFAULTWADLOCATION1 "/usr/local/share/games/SRB2" -#define DEFAULTWADLOCATION2 "/usr/local/games/SRB2" -#define DEFAULTWADLOCATION3 "/usr/share/games/SRB2" -#define DEFAULTWADLOCATION4 "/usr/games/SRB2" -#define DEFAULTSEARCHPATH1 "/usr/local/games" -#define DEFAULTSEARCHPATH2 "/usr/games" -#define DEFAULTSEARCHPATH3 "/usr/local" +#define DEFAULTWADLOCATION1 "@wadlocation@" #elif defined (_WIN32) #define DEFAULTWADLOCATION1 "c:gamessrb2" #define DEFAULTWADLOCATION2 "gamessrb2" @@ -2812,34 +2806,6 @@ static const char *locateWad(void) if (((envstr = I_GetEnv("SRB2WADDIR")) != NULL) && isWadPathOk(envstr)) return envstr; -#ifndef NOCWD -	I_OutputMsg(",."); -	// examine current dir -	strcpy(returnWadPath, "."); -	if (isWadPathOk(returnWadPath)) -		return NULL; -#endif - - -#ifdef CMAKECONFIG -#ifndef NDEBUG -	I_OutputMsg(","CMAKE_ASSETS_DIR); -	strcpy(returnWadPath, CMAKE_ASSETS_DIR); -	if (isWadPathOk(returnWadPath)) -	{ -		return returnWadPath; -	} -#endif -#endif - -#ifdef __APPLE__ -	OSX_GetResourcesPath(returnWadPath); -	I_OutputMsg(",%s", returnWadPath); -	if (isWadPathOk(returnWadPath)) -	{ -		return returnWadPath; -	} -#endif // examine default dirs #ifdef DEFAULTWADLOCATION1 @@ -2884,16 +2850,7 @@ static const char *locateWad(void) if (isWadPathOk(returnWadPath)) return returnWadPath; #endif -#ifndef NOHOME -	// find in $HOME -	I_OutputMsg(",HOME"); -	if ((envstr = I_GetEnv("HOME")) != NULL) -	{ -		WadPath = searchWad(envstr); -		if (WadPath) -			return WadPath; -	} -#endif + #ifdef DEFAULTSEARCHPATH1 // find in /usr/local I_OutputMsg(", in:"DEFAULTSEARCHPATH1); </del>
<del> https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2d7ed98add14f75041499ac189696c9bd3d757fe --- a/Makeconfig +++ b/Makeconfig @@ -43,6 +43,22 @@ else $(error objdir must be defined by the build-directory Makefile) endif +# Did we request 'make -s' run? "yes" or "no". +# Starting from make-4.4 MAKEFLAGS now contains long +# options like '--shuffle'. To detect presence of 's' +# we pick first word with short options. Long options +# are guaranteed to come after whitespace. We use '-' +# prefix to always have a word before long options +# even if no short options were passed. +# Typical MAKEFLAGS values to watch for: +#   "rs --shuffle=42" (silent) +#   " --shuffle" (not silent) +ifeq ($(findstring s, $(firstword -$(MAKEFLAGS))),) +silent-make := no +else +silent-make := yes +endif + # Root of the sysdeps tree. sysdep_dir := $(..)sysdeps export sysdep_dir := $(sysdep_dir) @@ -917,7 +933,7 @@ endif # umpteen zillion filenames along with it (we use `...' instead) # but we don't want this echoing done when the user has said # he doesn't want to see commands echoed by using -s. -ifneq	"$(findstring s,$(MAKEFLAGS))" ""	# if -s +ifeq ($(silent-make),yes)			# if -s +cmdecho	:= echo >/dev/null else						# not -s +cmdecho	:= echo --- a/Makerules +++ b/Makerules @@ -794,7 +794,7 @@ endif # Maximize efficiency by minimizing the number of rules. .SUFFIXES:	# Clear the suffix list.  We don't use suffix rules. # Don't define any builtin rules. -MAKEFLAGS := $(MAKEFLAGS)r +MAKEFLAGS := $(MAKEFLAGS) -r # Generic rule for making directories. %/: @@ -811,7 +811,7 @@ MAKEFLAGS := $(MAKEFLAGS)r .PRECIOUS: $(foreach l,$(libtypes),$(patsubst %,$(common-objpfx)$l,c)) # Use the verbose option of ar and tar when not running silently. -ifeq	"$(findstring s,$(MAKEFLAGS))" ""	# if not -s +ifeq ($(silent-make),no)			# if not -s verbose := v else	   					# -s verbose	:= --- a/elf/rtld-Rules +++ b/elf/rtld-Rules @@ -52,7 +52,7 @@ $(objpfx)rtld-libc.a: $(foreach dir,$(rtld-subdirs), mv -f $@T $@ # Use the verbose option of ar and tar when not running silently. -ifeq	"$(findstring s,$(MAKEFLAGS))" ""	# if not -s +ifeq ($(silent-make),no)			# if not -s verbose := v else						# -s verbose	:= </del>
*/ ./2.35-master.patch.gz <del> /* Can be removed after next snapshot update or release update.  */ ./2.35-make-4.4.patch </del> <ins> /* Revert this patch contained in the previous bundle.  For now, until we know more. */ ./revert-mktime.patch </ins> /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch
<ins> commit f6d4c1ac648c4ff8baad94500df0bb13108a4f79 Author: Paul Eggert <eggert@cs.ucla.edu> Date:   Thu Sep 8 20:08:32 2022 -0500 REVERT: mktime: improve heuristic for ca-1986 Indiana DST This patch syncs mktime.c from Gnulib, fixing a problem reported by Mark Krenz <https://bugs.gnu.org/48085>, and it should fix BZ#29035 too. * time/mktime.c (__mktime_internal): Be more generous about accepting arguments with the wrong value of tm_isdst, by falling back to a one-hour DST difference if we find no nearby DST that is unusual.  This fixes a problem where "1986-04-28 00:00 EDT" was rejected when TZ="America/Indianapolis" because the nearest DST timestamp occurred in 1970, a temporal distance too great for the old heuristic.  This also also narrows the search a bit, which is a minor performance win. (cherry picked from commit 83859e1115269cf56d21669361d4ddbe2687831c) diff --git b/time/mktime.c a/time/mktime.c index e9a6006710..494c89bf54 100644 --- b/time/mktime.c +++ a/time/mktime.c @@ -429,13 +429,8 @@ __mktime_internal (struct tm *tp, time with the right value, and use its UTC offset. Heuristic: probe the adjacent timestamps in both directions, -	 looking for the desired isdst.  If none is found within a -	 reasonable duration bound, assume a one-hour DST difference. -	 This should work for all real time zone histories in the tz -	 database.  */ - -      /* +1 if we wanted standard time but got DST, -1 if the reverse.  */ -      int dst_difference = (isdst == 0) - (tm.tm_isdst == 0); +	 looking for the desired isdst.  This should work for all real +	 time zone histories in the tz database.  */ /* Distance between probes when looking for a DST boundary.  In tzdata2003a, the shortest period of DST is 601200 seconds @@ -446,14 +441,12 @@ __mktime_internal (struct tm *tp, periods when probing.  */ int stride = 601200; -      /* In TZDB 2021e, the longest period of DST (or of non-DST), in -	 which the DST (or adjacent DST) difference is not one hour, -	 is 457243209 seconds: e.g., America/Cambridge_Bay with leap -	 seconds, starting 1965-10-31 00:00 in a switch from -	 double-daylight time (-05) to standard time (-07), and -	 continuing to 1980-04-27 02:00 in a switch from standard time -	 (-07) to daylight time (-06).  */ -      int duration_max = 457243209; +      /* The longest period of DST in tzdata2003a is 536454000 seconds +	 (e.g., America/Jujuy starting 1946-10-01 01:00).  The longest +	 period of non-DST is much longer, but it makes no real sense +	 to search for more than a year of non-DST, so use the DST +	 max.  */ +      int duration_max = 536454000; /* Search in both directions, so the maximum distance is half the duration; add the stride to avoid off-by-1 problems.  */ @@ -490,11 +483,6 @@ __mktime_internal (struct tm *tp, } } -      /* No unusual DST offset was found nearby.  Assume one-hour DST.  */ -      t += 60 * 60 * dst_difference; -      if (mktime_min <= t && t <= mktime_max && convert_time (convert, t, &tm)) -	goto offset_found; - __set_errno (EOVERFLOW); return -1; } </ins>
settings_ = lib.recursiveUpdate { init = { <del> PRINT_MODE = if enableTextMode then "TEXT" else if enableTWBT then "TWBT" else null; </del> <ins> PRINT_MODE = if enableTextMode then "TEXT" else if enableTWBT then "TWBT" else if stdenv.hostPlatform.isDarwin then "STANDARD" # https://www.bay12games.com/dwarves/mantisbt/view.php?id=11680 else null; </ins> INTRO = enableIntro; TRUETYPE = enableTruetype; FPS = enableFPS;