jiebi/CodeConvo huggingface dataset:
Enabled Fcitx5 addons. ''; }; <ins> waylandFrontend = mkOption { type = types.bool; default = false; description = lib.mdDoc '' Use the Wayland input method frontend. See [Using Fcitx 5 on Wayland](https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland). ''; }; </ins> quickPhrase = mkOption { type = with types; attrsOf str; default = { };
]; environment.variables = { <del> GTK_IM_MODULE = "fcitx"; QT_IM_MODULE = "fcitx"; </del> XMODIFIERS = "@im=fcitx"; QT_PLUGIN_PATH = [ "${fcitx5Package}/${pkgs.qt6.qtbase.qtPluginPrefix}" ]; <ins> } // lib.optionalAttrs (!cfg.waylandFrontend) { GTK_IM_MODULE = "fcitx"; QT_IM_MODULE = "fcitx"; </ins> } // lib.optionalAttrs cfg.ignoreUserConfig { SKIP_FCITX_USER_PATH = "1"; };
buildPythonPackage rec { pname = "qdarkstyle"; <del> version = "3.1"; </del> <ins> version = "3.2.3"; </ins> src = fetchPypi { inherit version; pname = "QDarkStyle"; <del> hash = "sha256-YAWE1iU0Pg3dEo3gg5PTw1Y3eGpJgn8XTSmqfKqCecE="; </del> <ins> hash = "sha256-DAt/dKbpISEAiZKzabq2BGgVfbHALNMNZKXpo7QC8a4="; </ins> }; # No tests available
if pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform then '' echo "Ignoring validation for cross-compilation" '' <del> else '' </del> <ins> else let showCommand = if isNixAtLeast "2.20pre" then "config show" else "show-config"; in '' </ins> echo "Validating generated nix.conf" ln -s $out ./nix.conf set -e set +o pipefail NIX_CONF_DIR=$PWD  <del> ${cfg.package}/bin/nix show-config ${optionalString (isNixAtLeast "2.3pre") "--no-net"}  </del> <ins> ${cfg.package}/bin/nix ${showCommand} ${optionalString (isNixAtLeast "2.3pre") "--no-net"}  </ins> ${optionalString (isNixAtLeast "2.4pre") "--option experimental-features nix-command"}  |& sed -e 's/^warning:/error:/'  | (! grep '${if cfg.checkAllErrors then "^error:" else "^error: unknown setting"}')
<ins> { lib , buildGoModule , fetchFromGitHub }: buildGoModule rec { pname = "certmgr"; version = "3.0.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = "certmgr"; rev = "v${version}"; hash = "sha256-MgNPU06bv31tdfUnigcmct8UTVztNLXcmTg3H/J7mic="; }; vendorHash = null; ldflags = [ "-s" "-w" ]; meta = with lib; { homepage = "https://cfssl.org/"; description = "Cloudflare's automated certificate management using a CFSSL CA"; platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ johanot srhb ]; }; } </ins>
<del> { lib, buildGoPackage, fetchFromGitHub, fetchpatch }: let generic = { patches ? [] }: buildGoPackage rec { version = "1.6.4"; pname = "certmgr"; goPackagePath = "github.com/cloudflare/certmgr/"; src = fetchFromGitHub { owner = "cloudflare"; repo = "certmgr"; rev = "v${version}"; sha256 = "0glvyp61ya21pdm2bsvq3vfhmmxc2998vxc6hiyc79ijsv9n6jqi"; }; inherit patches; meta = with lib; { homepage = "https://cfssl.org/"; description = "Cloudflare's certificate manager"; platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ johanot srhb ]; }; }; in { certmgr = generic {}; certmgr-selfsigned = generic { # The following patch makes it possible to use a self-signed x509 cert # for the cfssl apiserver. # TODO: remove patch when PR is merged. patches = [ (fetchpatch { # https://github.com/cloudflare/certmgr/pull/51 name   = "cloudflare-certmgr-pull-51.patch"; url    = "https://github.com/cloudflare/certmgr/compare/232e0adf8379db28ab74c46e0dd3eddb3cd8f2ea...55c595a4a2dc871726b3c8337469daf5597718a3.patch"; sha256 = "0jhsw159d2mgybvbbn6pmvj4yqr5cwcal5fjwkcn9m4f4zlb6qrs"; }) ]; }; } </del>
catfish = throw "'catfish' has been renamed to/replaced by 'xfce.catfish'"; # Converted to throw 2023-09-10 cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; ccloud-cli = throw "ccloud-cli has been removed, please use confluent-cli instead"; # Added 2023-06-09 <ins> certmgr-selfsigned = certmgr; # Added 2023-11-30 </ins> chefdk = throw "chefdk has been removed due to being deprecated upstream by Chef Workstation"; # Added 2023-03-22 chocolateDoom = chocolate-doom; # Added 2023-05-01 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27
description = '' Specifies the hashed password for the MQTT User. <option>hashedPassword</option> overrides <option>password</option>. <del> To generate hashed password install <literal>mkpasswd</literal> package and run <literal>mkpasswd -m sha-512</literal>. </del> <ins> To generate hashed password install <literal>mosquitto</literal> package and use <literal>mosquitto_passwd</literal>. </ins> ''; };
{ <del> "packageVersion": "120.0-1", </del> <ins> "packageVersion": "120.0.1-1", </ins> "source": { <del> "rev": "120.0-1", "sha256": "1wms3kyimmfzl64rbphgap2sm87lwkl0pr24rx4rxf3px3bq97f3" </del> <ins> "rev": "120.0.1-1", "sha256": "0kvfa97m7dq1b030d62zblpb445fkbgb2w19bckxwxv7mx36awy7" </ins> }, "settings": { <del> "rev": "b587388bdbe63511c478cb8b5f82c2e80040414c", "sha256": "03cw6wh7358pgld4qgs534pl2lnfvwc0xl2yyb3n3pyvmba6cyrp" </del> <ins> "rev": "9dac02778ebed3e2614da52c36b7cede45f4f602", "sha256": "0flk6v50cyiaajzcz9gm1hig00vkw9xdbjd5rdxidrmhcqxy24vy" </ins> }, "firefox": { <del> "version": "120.0", "sha512": "31d5f9e1d4173280c8de6d9b8551bc6bba5e2c49b84f944f50d42002d5b39c2fb743bc130f26c81160388a102b8301b94a0a378ecdfa6f943860f971a860df8c" </del> <ins> "version": "120.0.1", "sha512": "dd0e3eb234d58c39431d1f100834ef4bcc8cfb89ff471a37b948eda4dd3874b63b1979cda39a0db0dd3b4a579b5f09a7d2d1f39d26fd9f2b8d5635e4b8738b6c" </ins> } }
if builtins.isNull (baseConfig.server.override_resource_path or null) then "${unwrapped}/${python3.sitePackages}/maubot/management/frontend/build" else baseConfig.server.override_resource_path; <del> })})} $out/${python3.sitePackages}/maubot/example-config.yaml </del> <ins> })} $out/${python3.sitePackages}/maubot/example-config.yaml </ins> rm -rf $out/bin ''} mkdir -p $out/bin
overlays, crossOverlays ? [ ], # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools <del> bootstrapFiles ? </del> <ins> bootstrapFiles ? (config.replaceBootstrapFiles or lib.id) ( </ins> if localSystem.isAarch64 then import ./bootstrap-files/aarch64-apple-darwin.nix else <del> import ./bootstrap-files/x86_64-apple-darwin.nix, </del> <ins> import ./bootstrap-files/x86_64-apple-darwin.nix ), </ins> }: assert crossSystem == localSystem;
feature = "build packages with CUDA support by default"; }; <ins> replaceBootstrapFiles = mkMassRebuild { type = types.functionTo (types.attrsOf types.package); default = lib.id; defaultText = literalExpression "lib.id"; description = '' Use the bootstrap files returned instead of the default bootstrap files. The default bootstrap files are passed as an argument. ''; example = literalExpression '' prevFiles: let replacements = { "sha256-YQlr088HPoVWBU2jpPhpIMyOyoEDZYDw1y60SGGbUM0=" = import <nix/fetchurl.nix> { url = "(custom glibc linux x86_64 bootstrap-tools.tar.xz)"; hash = "(...)"; }; "sha256-QrTEnQTBM1Y/qV9odq8irZkQSD9uOMbs2Q5NgCvKCNQ=" = import <nix/fetchurl.nix> { url = "(custom glibc linux x86_64 busybox)"; hash = "(...)"; executable = true; }; }; in builtins.mapAttrs (name: prev: replacements.''${prev.outputHash} or prev) prevFiles ''; }; </ins> rocmSupport = mkMassRebuild { type = types.bool; default = false;
buildNpmPackage rec { pname = "bitwarden-cli"; <del> version = "2023.10.0"; </del> <ins> version = "2023.12.0"; </ins> src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; <del> hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ="; </del> <ins> hash = "sha256-WYhLKV3j3Ktite5u1H4fSku38hCCrMzKoxtjq6aT9yo="; </ins> }; nodejs = nodejs_18; <del> npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o="; </del> <ins> npmDepsHash = "sha256-bnYpvHO9Pnob+MbrSshv03mSwXCADH/2xw33nLVKMdg="; </ins> nativeBuildInputs = [ python3
let description = "A secure and free password manager for all of your devices"; icon = "bitwarden"; <del> electron = electron_25; </del> <ins> electron = electron_26; </ins> in buildNpmPackage rec { pname = "bitwarden"; <del> version = "2023.10.1"; </del> <ins> version = "2023.12.0"; # TODO add back Electron version check below </ins> src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; <del> hash = "sha256-cwSIMN40d1ySUSxBl8jXLVndnJJvPnLiTxkYnA3Pqws="; </del> <ins> hash = "sha256-WYhLKV3j3Ktite5u1H4fSku38hCCrMzKoxtjq6aT9yo="; </ins> }; patches = [
makeCacheWritable = true; npmWorkspace = "apps/desktop"; <del> npmDepsHash = "sha256-KN8C9Y0tfhHVagk+CUMpI/bIRChhzxC9M27HkU4aTEc="; </del> <ins> npmDepsHash = "sha256-bnYpvHO9Pnob+MbrSshv03mSwXCADH/2xw33nLVKMdg="; </ins> cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit patches src; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; <del> hash = "sha256-AmtdmOR3aZJTZiFbkwRXjeTOJdcN40bTmWx4Ss3JNJ8="; </del> <ins> hash = "sha256-pCy3hGhI3mXm4uTOaFMykOzJqK2PC0t0hE8MrJKtA/k="; </ins> }; cargoRoot = "apps/desktop/desktop_native";
libsecret ]; <del> preBuild = '' </del> <ins> # FIXME add back once upstream moves to Electron >= 26 # we use electron_26 because electron_25 is EOL /*preBuild = '' </ins> if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then echo 'ERROR: electron version mismatch' exit 1 fi <del> ''; </del> <ins> '';*/ </ins> postBuild = '' pushd apps/desktop
<ins> diff --git a/CMakeLists.txt b/CMakeLists.txt index 80a3bdcd6..380a1573a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,7 @@ option( "Link dependencies using CMake's find_package and do not use internal builds" ${SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT} ) -option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" ON) +option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" OFF) # This option isn't recommended for distribution builds and probably won't work (yet). cmake_dependent_option( SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES @@ -80,25 +80,6 @@ option(SRB2_CONFIG_ZDEBUG "Compile with ZDEBUG defined." OFF) option(SRB2_CONFIG_PROFILEMODE "Compile for profiling (GCC only)." OFF) set(SRB2_CONFIG_ASSET_DIRECTORY "" CACHE PATH "Path to directory that contains all asset files for the installer. If set, assets will be part of installation and cpack.") -if(SRB2_CONFIG_ENABLE_TESTS) -	# https://github.com/catchorg/Catch2 -	CPMAddPackage( -		NAME Catch2 -		VERSION 3.4.0 -		GITHUB_REPOSITORY catchorg/Catch2 -		OPTIONS -			"CATCH_INSTALL_DOCS OFF" -	) -	list(APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/extras") -	include(CTest) -	include(Catch) -	add_executable(srb2tests) -	# To add tests, use target_sources to add individual test files to the target in subdirs. -	target_link_libraries(srb2tests PRIVATE Catch2::Catch2 Catch2::Catch2WithMain) -	target_compile_features(srb2tests PRIVATE c_std_11 cxx_std_17) -	catch_discover_tests(srb2tests) -endif() - # Enable CCache # (Set USE_CCACHE=ON to use, CCACHE_OPTIONS for options) if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) @@ -113,12 +94,6 @@ if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) message(WARNING "USE_CCACHE was set but ccache is not found (set CCACHE_TOOL_PATH)") endif() endif() -else() -	CPMAddPackage( -		NAME Ccache.cmake -		GITHUB_REPOSITORY TheLartians/Ccache.cmake -		VERSION 1.2 -	) endif() # Dependencies @@ -179,7 +154,7 @@ include(GitUtilities) if("${SRB2_SDL2_EXE_NAME}" STREQUAL "") # cause a reconfigure if the branch changes get_git_dir(SRB2_GIT_DIR) -	configure_file("${SRB2_GIT_DIR}/HEAD" HEAD COPYONLY) +	#configure_file("${SRB2_GIT_DIR}/HEAD" HEAD COPYONLY) git_current_branch(SRB2_GIT_REVISION) </ins>
<ins> { lib , stdenv , fetchgit , fetchFromGitHub , cmake , curl , nasm , libopenmpt , game-music-emu , libpng , SDL2 , SDL2_mixer , zlib , makeWrapper , makeDesktopItem , copyDesktopItems }: stdenv.mkDerivation (finalAttrs: { pname = "srb2"; version = "2.2.13"; src = fetchFromGitHub { owner = "STJr"; repo = "SRB2"; rev = "SRB2_release_${finalAttrs.version}"; hash = "sha256-OSkkjCz7ZW5+0vh6l7+TpnHLzXmd/5QvTidRQSHJYX8="; }; nativeBuildInputs = [ cmake nasm makeWrapper copyDesktopItems ]; buildInputs = [ curl game-music-emu libpng libopenmpt SDL2 SDL2_mixer zlib ]; assets = stdenv.mkDerivation { pname = "srb2-data"; version = finalAttrs.version; src = fetchgit { url = "https://git.do.srb2.org/STJr/srb2assets-public"; rev = "SRB2_release_${finalAttrs.version}"; hash = "sha256-OXvO5ZlujIYmYevc62Dtx192dxoujQMNFUCrH5quBBg="; fetchLFS = true; }; installPhase = '' runHook preInstall mkdir -p $out/share/srb2 cp -r * $out/share/srb2 runHook postInstall ''; }; cmakeFlags = [ "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}/share/srb2" "-DGME_INCLUDE_DIR=${game-music-emu}/include" "-DOPENMPT_INCLUDE_DIR=${libopenmpt.dev}/include" "-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2" "-DSDL2_INCLUDE_DIR=${lib.getDev SDL2.dev}/include/SDL2" ]; patches = [ # Make the build work without internet connectivity # See: https://build.opensuse.org/request/show/1109889 ./cmake.patch ./thirdparty.patch ]; desktopItems = [ (makeDesktopItem rec { name = "Sonic Robo Blast 2"; exec = finalAttrs.pname; icon = finalAttrs.pname; comment = finalAttrs.meta.description; desktopName = name; genericName = name; categories = [ "Game" ]; startupWMClass = ".srb2-wrapped"; }) ]; installPhase = '' runHook preInstall 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/. cp bin/lsdlsrb2 $out/bin/srb2 wrapProgram $out/bin/srb2 --set SRB2WADDIR "${finalAttrs.assets}/share/srb2" runHook postInstall ''; meta = with lib; { description = "Sonic Robo Blast 2 is a 3D Sonic the Hedgehog fangame based on a modified version of Doom Legacy"; homepage = "https://www.srb2.org/"; platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ zeratax donovanglover ]; mainProgram = "srb2"; }; }) </ins>
<ins> diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index f33b3bf3f..1214f179c 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -16,6 +16,5 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") include("cpm-png.cmake") include("cpm-curl.cmake") include("cpm-openmpt.cmake") +	include("cpm-libgme.cmake") endif() - -include("cpm-libgme.cmake") </ins>
<del> diff --git a/CMakeLists.txt b/CMakeLists.txt index 80a3bdcd6..380a1573a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,7 @@ option( "Link dependencies using CMake's find_package and do not use internal builds" ${SRB2_CONFIG_SYSTEM_LIBRARIES_DEFAULT} ) -option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" ON) +option(SRB2_CONFIG_ENABLE_TESTS "Build the test suite" OFF) # This option isn't recommended for distribution builds and probably won't work (yet). cmake_dependent_option( SRB2_CONFIG_SHARED_INTERNAL_LIBRARIES @@ -80,25 +80,6 @@ option(SRB2_CONFIG_ZDEBUG "Compile with ZDEBUG defined." OFF) option(SRB2_CONFIG_PROFILEMODE "Compile for profiling (GCC only)." OFF) set(SRB2_CONFIG_ASSET_DIRECTORY "" CACHE PATH "Path to directory that contains all asset files for the installer. If set, assets will be part of installation and cpack.") -if(SRB2_CONFIG_ENABLE_TESTS) -	# https://github.com/catchorg/Catch2 -	CPMAddPackage( -		NAME Catch2 -		VERSION 3.4.0 -		GITHUB_REPOSITORY catchorg/Catch2 -		OPTIONS -			"CATCH_INSTALL_DOCS OFF" -	) -	list(APPEND CMAKE_MODULE_PATH "${Catch2_SOURCE_DIR}/extras") -	include(CTest) -	include(Catch) -	add_executable(srb2tests) -	# To add tests, use target_sources to add individual test files to the target in subdirs. -	target_link_libraries(srb2tests PRIVATE Catch2::Catch2 Catch2::Catch2WithMain) -	target_compile_features(srb2tests PRIVATE c_std_11 cxx_std_17) -	catch_discover_tests(srb2tests) -endif() - # Enable CCache # (Set USE_CCACHE=ON to use, CCACHE_OPTIONS for options) if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) @@ -113,12 +94,6 @@ if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL Windows) message(WARNING "USE_CCACHE was set but ccache is not found (set CCACHE_TOOL_PATH)") endif() endif() -else() -	CPMAddPackage( -		NAME Ccache.cmake -		GITHUB_REPOSITORY TheLartians/Ccache.cmake -		VERSION 1.2 -	) endif() # Dependencies @@ -179,7 +154,7 @@ include(GitUtilities) if("${SRB2_SDL2_EXE_NAME}" STREQUAL "") # cause a reconfigure if the branch changes get_git_dir(SRB2_GIT_DIR) -	configure_file("${SRB2_GIT_DIR}/HEAD" HEAD COPYONLY) +	#configure_file("${SRB2_GIT_DIR}/HEAD" HEAD COPYONLY) git_current_branch(SRB2_GIT_REVISION) </del>
<del> { lib , stdenv , fetchurl , fetchFromGitHub , cmake , curl , nasm , libopenmpt , p7zip , game-music-emu , libpng , SDL2 , SDL2_mixer , zlib , unzip , makeWrapper , makeDesktopItem , copyDesktopItems }: stdenv.mkDerivation (finalAttrs: { pname = "srb2"; version = "2.2.13"; src = fetchFromGitHub { owner = "STJr"; repo = "SRB2"; rev = "SRB2_release_${finalAttrs.version}"; hash = "sha256-OSkkjCz7ZW5+0vh6l7+TpnHLzXmd/5QvTidRQSHJYX8="; }; nativeBuildInputs = [ cmake nasm p7zip makeWrapper copyDesktopItems ]; buildInputs = [ curl game-music-emu libpng libopenmpt SDL2 SDL2_mixer zlib ]; 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-g7kaNRE1tjcF5J2v+kTnrDzz4zs5f1b/NH67ce2ifUo="; }; sourceRoot = "."; installPhase = '' mkdir -p $out/share/srb2 cp -r *pk3 *dta *dat models/ $out/share/srb2/ ''; }; cmakeFlags = [ "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}/share/srb2" "-DGME_INCLUDE_DIR=${game-music-emu}/include" "-DOPENMPT_INCLUDE_DIR=${libopenmpt.dev}/include" "-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2" "-DSDL2_INCLUDE_DIR=${lib.getDev SDL2.dev}/include/SDL2" ]; patches = [ # Make the build work without internet connectivity # See: https://build.opensuse.org/request/show/1109889 ./cmake.patch ./thirdparty.patch ]; desktopItems = [ (makeDesktopItem rec { name = "Sonic Robo Blast 2"; exec = finalAttrs.pname; icon = finalAttrs.pname; comment = finalAttrs.meta.description; desktopName = name; genericName = name; categories = [ "Game" ]; }) ]; 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/. cp bin/lsdlsrb2 $out/bin/srb2 wrapProgram $out/bin/srb2 --set SRB2WADDIR "${finalAttrs.assets}/share/srb2" ''; meta = with lib; { description = "Sonic Robo Blast 2 is a 3D Sonic the Hedgehog fangame based on a modified version of Doom Legacy"; homepage = "https://www.srb2.org/"; platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ zeratax donovanglover ]; mainProgram = "srb2"; }; }) </del>
<del> diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index f33b3bf3f..1214f179c 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -16,6 +16,5 @@ if(NOT "${SRB2_CONFIG_SYSTEM_LIBRARIES}") include("cpm-png.cmake") include("cpm-curl.cmake") include("cpm-openmpt.cmake") +	include("cpm-libgme.cmake") endif() - -include("cpm-libgme.cmake") </del>
sed -i '/-ffloat-store/d' cmake/pcl_find_sse.cmake ''; <del> nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ]; </del> <ins> nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook ] ++ lib.optionals withCuda [ cudaPackages.cuda_nvcc ]; </ins> buildInputs = [ eigen libusb1
''; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 <del> ./modtool-newmod-permissions.patch </del> <ins> ./modtool-newmod-permissions.3_9.patch </ins> ]; passthru = shared.passthru // { # Deps that are potentially overridden and are used inside GR plugins - the same version must
# If one wishes to use a different src or name for a very custom build , overrideSrc ? {} , pname ? "gnuradio" <del> , version ? "3.10.7.0" </del> <ins> , version ? "3.10.8.0" </ins> }: let <del> sourceSha256 = "sha256-7fIQMcx90wI4mAZmR26/rkBKPKhNxgu3oWpJTV3C+Ek="; </del> <ins> sourceSha256 = "sha256-4BoJciL3ffd9Dgk3HxXCOOwnGHqCEVuo+a1AtzJG4IY="; </ins> featuresInfo = { # Needed always basic = {
patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.patch <del> # https://github.com/gnuradio/gnuradio/pull/6808 (fetchpatch { name = "gnuradio-fmt10.1.patch"; url = "https://github.com/gnuradio/gnuradio/commit/9357c17721a27cc0aae3fe809af140c84e492f37.patch"; hash = "sha256-w3b22PTqoORyYQ3RKRG+2htQWbITzQiOdSDyuejUtHQ="; }) </del> ]; passthru = shared.passthru // { # Deps that are potentially overridden and are used inside GR plugins - the same version must
<ins> diff --git c/gr-utils/modtool/core/newmod.py w/gr-utils/modtool/core/newmod.py index babebfcde..9a02f663e 100644 --- c/gr-utils/modtool/core/newmod.py +++ w/gr-utils/modtool/core/newmod.py @@ -62,7 +62,9 @@ class ModToolNewModule(ModTool): self._setup_scm(mode='new') logger.info(f"Creating out-of-tree module in {self.dir}...") try: -            shutil.copytree(self.srcdir, self.dir) +            # https://stackoverflow.com/a/17022146/4935114 +            shutil.copystat = lambda x, y: x +            shutil.copytree(self.srcdir, self.dir, copy_function=shutil.copyfile) try: shutil.copyfile(os.path.join(gr.prefix(), 'share', 'gnuradio', 'clang-format.conf'), os.path.join(self.dir, '.clang-format')) </ins>
<del> diff --git c/gr-utils/modtool/core/newmod.py w/gr-utils/modtool/core/newmod.py index babebfcde..9a02f663e 100644 --- c/gr-utils/modtool/core/newmod.py </del> <ins> diff --git i/gr-utils/modtool/core/newmod.py w/gr-utils/modtool/core/newmod.py index 8b222473f..c82fcd538 100644 --- i/gr-utils/modtool/core/newmod.py </ins> +++ w/gr-utils/modtool/core/newmod.py <del> @@ -62,7 +62,9 @@ class ModToolNewModule(ModTool): </del> <ins> @@ -66,7 +66,9 @@ class ModToolNewModule(ModTool): </ins> self._setup_scm(mode='new') logger.info(f"Creating out-of-tree module in {self.dir}...") try:
+            # https://stackoverflow.com/a/17022146/4935114 +            shutil.copystat = lambda x, y: x +            shutil.copytree(self.srcdir, self.dir, copy_function=shutil.copyfile) <del> try: shutil.copyfile(os.path.join(gr.prefix(), 'share', 'gnuradio', 'clang-format.conf'), os.path.join(self.dir, '.clang-format')) </del> <ins> source_dir = os.path.join(gr.prefix(), "share", "gnuradio") for source_name, target_name in ( ("clang-format.conf", ".clang-format"), </ins>
cgal = cgal_5.override { boost = boost'; }; <del> in mkDerivation rec { </del> <ins> in stdenv.mkDerivation (finalAttrs: { </ins> pname = "gplates"; <del> version = "2.3.0"; </del> <ins> version = "2.4"; </ins> <del> src = fetchurl { name = "gplates_${version}_src.tar.bz2"; url = "https://www.earthbyte.org/download/8421/?uid=b89bb31428"; sha256 = "0lrcmcxc924ixddii8cyglqlwwxvk7f00g4yzbss5i3fgcbh8n96"; </del> <ins> src = fetchFromGitHub { owner = "GPlates"; repo = "GPlates"; rev = "GPlates-${finalAttrs.version}"; hash = "sha256-BRvrqczGguE2z44ZboxeJxgWEA+t02XkzvU+yF4ki6s="; </ins> }; <del> patches = [ ./boost-placeholders.patch ]; </del> nativeBuildInputs = [ cmake doxygen graphviz <ins> wrapQtAppsHook </ins> ]; buildInputs = [
homepage = "https://www.gplates.org"; license = licenses.gpl2Only; platforms = platforms.all; <del> broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/gplates.x86_64-darwin </del> <ins> broken = stdenv.isDarwin; # FIX: this check: https://github.com/GPlates/GPlates/blob/gplates/cmake/modules/Config_h.cmake#L72 </ins> }; <del> } </del> <ins> }) </ins>